Merge bk://openembedded@openembedded.bkbits.net/packages

into chrislaptop.(none):/home/chris/oe/oe/packages

2004/07/23 20:09:39+01:00 (none)!chris
Rename libetpan_0.33pre to libetpan_cvs for consistency

BKrev: 41016354NmFd6AXFp57LZ9Zn8n452A

diff --git a/libetpan/libetpan-0.33pre/destdir.patch b/libetpan/libetpan-0.33pre/destdir.patch
deleted file mode 100644 (file)
index c8cc60f..0000000
--- a/libetpan/libetpan-0.33pre/destdir.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- libetpan-0.33pre/Rules.in~destdir  2004-05-23 18:44:44.000000000 +0200
-+++ libetpan-0.33pre/Rules.in  2004-07-22 14:56:56.132455370 +0200
-@@ -3,6 +3,7 @@
- # each submakefile should define SOURCES and TARGET
- # optionnaly HEADRS and INCLUDES
- 
-+DESTDIR = 
- srcdir = $(top_builddir)/src
- prefix      = @prefix@
- includedir  = @includedir@/libetpan
-@@ -37,7 +38,7 @@
- # install headers here only
- install: $(HEADERS) install-recursive
-       for header in $(HEADERS); do \
--        $(INSTALL) -m 644 "$$header" $(includedir) ; \
-+          $(INSTALL) -m 644 $$header $(DESTDIR)$(includedir)/libetpan ; \
-       done
- 
- Makefile: $(top_builddir)/Rules
---- libetpan-0.33pre/Makefile.in~destdir       2004-05-23 18:44:44.000000000 +0200
-+++ libetpan-0.33pre/Makefile.in       2004-07-22 14:59:17.321980703 +0200
-@@ -51,13 +51,13 @@
-         done && test -z "$$fail"
- 
- install: all install-dirs install-recursive
--      $(INSTALL) -m 755 libetpan-config $(bindir)
--      $(INSTALL) -m 644 libetpan-config.h $(includedir)/libetpan
-+      $(INSTALL) -m 755 libetpan-config $(DESTDIR)$(bindir)
-+      $(INSTALL) -m 644 libetpan-config.h $(DESTDIR)$(includedir)/libetpan
- 
- install-dirs:
--      $(INSTALL) -d -m 755 $(includedir)
--      $(INSTALL) -d -m 755 $(includedir)/libetpan
--      $(INSTALL) -d -m 755 $(bindir)
-+      $(INSTALL) -d -m 755 $(DESTDIR)$(includedir)
-+      $(INSTALL) -d -m 755 $(DESTDIR)$(includedir)/libetpan
-+      $(INSTALL) -d -m 755 $(DESTDIR)$(bindir)
- 
- #realclean: maintainer-clean
- 
---- libetpan-0.33pre/src/Makefile.in~destdir   2004-05-02 18:16:58.000000000 +0200
-+++ libetpan-0.33pre/src/Makefile.in   2004-07-22 15:04:02.581981625 +0200
-@@ -38,10 +38,10 @@
- $(SUBLIBS): all-recursive
- 
- install: all install-dirs install-recursive
--      $(LIBTOOL) --mode=install $(INSTALL) -m 644 $(TARGET) $(libdir)
-+      $(LIBTOOL) --mode=install $(INSTALL) -m 644 $(TARGET) $(DESTDIR)$(libdir)
- 
- install-dirs:
--      $(INSTALL) -d -m 755 $(libdir)
-+      $(INSTALL) -d -m 755 $(DESTDIR)$(libdir)
- 
- clean: clean-recursive
-       rm $(TARGET)

diff --git a/libetpan/libetpan-0.33pre/gcc34.patch b/libetpan/libetpan-0.33pre/gcc34.patch
deleted file mode 100644 (file)
index 5420c2f..0000000
--- a/libetpan/libetpan-0.33pre/gcc34.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- libetpan-0.33pre/src/driver/implementation/imap/imapdriver_cached_message.c~gcc34  2003-12-08 16:36:36.000000000 +0100
-+++ libetpan-0.33pre/src/driver/implementation/imap/imapdriver_cached_message.c        2004-07-22 14:49:02.459902029 +0200
-@@ -212,7 +212,7 @@
-   mmap_string_free(gstr);
-  free_section:
-   mailmime_section_free(part);
-- err:
-+ err:;
- }
- 
- static void generate_key_from_section(char * key, size_t size,

diff --git a/libetpan/libetpan-0.33pre/config_iconv.patch b/libetpan/libetpan-cvs/config_iconv.patch
similarity index 100%
rename from libetpan/libetpan-0.33pre/config_iconv.patch
rename to libetpan/libetpan-cvs/config_iconv.patch

diff --git a/libetpan/libetpan-0.33pre/includedir.patch b/libetpan/libetpan-cvs/destdir.patch
similarity index 100%
rename from libetpan/libetpan-0.33pre/includedir.patch
rename to libetpan/libetpan-cvs/destdir.patch

diff --git a/libetpan/libetpan-0.33pre/mailstream_socket.patch b/libetpan/libetpan-cvs/gcc34.patch
similarity index 100%
rename from libetpan/libetpan-0.33pre/mailstream_socket.patch
rename to libetpan/libetpan-cvs/gcc34.patch

diff --git a/libetpan/libetpan-0.33pre/pkgconfig.patch b/libetpan/libetpan-cvs/includedir.patch
similarity index 100%
rename from libetpan/libetpan-0.33pre/pkgconfig.patch
rename to libetpan/libetpan-cvs/includedir.patch

diff --git a/libetpan/libetpan-0.33pre/smtptls.patch b/libetpan/libetpan-cvs/mailstream_socket.patch
similarity index 100%
rename from libetpan/libetpan-0.33pre/smtptls.patch
rename to libetpan/libetpan-cvs/mailstream_socket.patch

diff --git a/libetpan/libetpan-cvs/pkgconfig.patch b/libetpan/libetpan-cvs/pkgconfig.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/libetpan/libetpan-cvs/smtptls.patch b/libetpan/libetpan-cvs/smtptls.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/libetpan/libetpan_0.33pre.oe b/libetpan/libetpan_0.33pre.oe
deleted file mode 100644 (file)
index 79dee2d..0000000
--- a/libetpan/libetpan_0.33pre.oe
+++ /dev/null
@@ -1,20 +0,0 @@
-DESCRIPTION = "libetpan is a library for mail server functions"
-SECTION = "libs"
-DEPENDS = "gettext-native openssl"
-PR = "r3"
-S = "${WORKDIR}/libetpan"
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev = "${bindir} ${includedir} ${libdir}/lib*.so ${libdir}/*.la \
-                ${libdir}/*.a ${libdir}/pkgconfig"
-
-SRC_URI = "cvs://anonymous@cvs.libetpan.sourceforge.net/cvsroot/libetpan;module=libetpan;date=${CVSDATE} \
-          file://gcc34.patch;patch=1 \
-          file://destdir.patch;patch=1"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--with-openssl=${STAGING_LIBDIR}/.. --disable-db"
-
-do_stage () {
-       oe_runmake install includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} bindir=${STAGING_BINDIR}
-}

diff --git a/libetpan/libetpan_cvs.oe b/libetpan/libetpan_cvs.oe
new file mode 100644 (file)
index 0000000..e69de29