Merge oe-devel@oe-devel.bkbits.net:openembedded

into odin.sc.ti.com:/home/kergoth/code/user/oe/openembedded

2005/02/10 11:17:25-06:00 ti.com!kergoth
Add quilt 0.39.

BKrev: 420b9735QUqhHp3AHqprbuBk5hQOmg

7 files changed, 48 insertions, 26 deletions

diff --git a/packages/quilt/files/install.patch b/packages/quilt/files/install.patch
index e69de29bb2..4122370d6a 100644
--- a/packages/quilt/files/install.patch
+++ b/packages/quilt/files/install.patch
@@ -0,0 +1,19 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- quilt-0.32/Makefile.in~install
++++ quilt-0.32/Makefile.in
+@@ -9,9 +9,9 @@
+ libdir :=	@libdir@
+ datadir :=	@datadir@
+ docdir :=	@docdir@
+-mandir :=	$(datadir)/man
++mandir :=	@mandir@
+ localedir :=	$(datadir)/locale
+-etcdir :=	$(subst /usr/etc,/etc,$(prefix)/etc)
++etcdir :=	@sysconfdir@
+ 
+ QUILT_DIR =	$(datadir)/$(PACKAGE)
+ SCRIPTS_DIR =	$(QUILT_DIR)/scripts
diff --git a/packages/quilt/files/nostrip.patch b/packages/quilt/files/nostrip.patch
index e69de29bb2..4dedad96d4 100644
--- a/packages/quilt/files/nostrip.patch
+++ b/packages/quilt/files/nostrip.patch
@@ -0,0 +1,16 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- quilt-0.32/Makefile.in~nostrip
++++ quilt-0.32/Makefile.in
+@@ -240,7 +240,7 @@
+ 	@INSTALL@ -m 644 scripts/patchfns $(BUILD_ROOT)$(SCRIPTS_DIR)
+ 
+ 	@INSTALL@ -d $(BUILD_ROOT)$(LIB_DIR)
+-	@INSTALL@ -m 755 -s $(LIB:%=lib/%) $(BUILD_ROOT)$(LIB_DIR)/
++	@INSTALL@ -m 755 $(LIB:%=lib/%) $(BUILD_ROOT)$(LIB_DIR)/
+ 
+ 	@INSTALL@ -d $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/
+ 	@INSTALL@ -m 644 doc/README \
diff --git a/packages/quilt/quilt-native_0.37.bb b/packages/quilt/quilt-native_0.37.bb
deleted file mode 100644
index 30018be857..0000000000
--- a/packages/quilt/quilt-native_0.37.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-include quilt.inc
-
-INHIBIT_AUTOTOOLS_DEPS = "1"
-
-SRC_URI = "cvs://anoncvs:@savannah.nongnu.org/cvsroot/quilt;method=ext;rsh=ssh;module=quilt;tag=VER_0_37 \
-	   file://install.patch;patch=1 \
-	   file://nostrip.patch;patch=1 \
-	   file://wiggle.patch;patch=1 \
-	   file://autoreconf.patch;patch=1"
-S = "${WORKDIR}/quilt"
-
-inherit autotools native
-
-PATCHCLEANCMD = ""
-PATCHCMD = "num='%s'; name='%s'; file='%s'; patch -p "$num" -i "$file""
-EXTRA_OECONF = "--disable-nls"
-
-do_configure () {
-	chmod 755 configure
-	oe_runconf
-}
diff --git a/packages/quilt/quilt-native_0.39.bb b/packages/quilt/quilt-native_0.39.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/quilt/quilt-native_0.39.bb
diff --git a/packages/quilt/quilt-package.inc b/packages/quilt/quilt-package.inc
index e69de29bb2..bcdbcf026a 100644
--- a/packages/quilt/quilt-package.inc
+++ b/packages/quilt/quilt-package.inc
@@ -0,0 +1,10 @@
+PACKAGES += "guards guards-doc"
+FILES_${PN} = "${sysconfdir} ${datadir}/quilt \
+	       ${bindir}/quilt ${libdir}/quilt"
+FILES_guards = "${bindir}/guards"
+FILES_${PN}-doc = "${mandir}/man1/quilt.1 ${docdir}/${P}"
+FILES_guards-doc = "${mandir}/man1/guards.1"
+
+do_install () {
+	oe_runmake 'BUILD_ROOT=${D}' install
+}
diff --git a/packages/quilt/quilt_0.37.bb b/packages/quilt/quilt_0.37.bb
index 05056c4ce7..fde048a456 100644
--- a/packages/quilt/quilt_0.37.bb
+++ b/packages/quilt/quilt_0.37.bb
@@ -1,11 +1,9 @@
 include quilt.inc
 
-PR = "r1"
-RSUGGESTS += "wiggle"
-SRC_URI = "cvs://anoncvs:@savannah.nongnu.org/cvsroot/quilt;method=ext;rsh=ssh;module=quilt;tag=VER_0_37 \
+PR = "r2"
+SRC_URI = "cvs://anoncvs:@savannah.nongnu.org/cvsroot/quilt;method=ext;rsh=ssh;module=quilt;tag=VER_${@(bb.data.getVar('PV', d, 1) or '').replace('.', '_')} \
 	   file://install.patch;patch=1 \
-	   file://nostrip.patch;patch=1 \
-	   file://wiggle.patch;patch=1"
+	   file://nostrip.patch;patch=1"
 S = "${WORKDIR}/quilt"
 
 inherit autotools gettext
diff --git a/packages/quilt/quilt_0.39.bb b/packages/quilt/quilt_0.39.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/quilt/quilt_0.39.bb