merge of c680327153be372712b73770b77507e942065816

     and dca105f1fe9254d31ccb9591f46b4c0cefcb2ecd

6 files changed, 28 insertions, 3 deletions

diff --git a/packages/ipkg/files/libdir.patch b/packages/ipkg/files/libdir.patch
new file mode 100644
index 0000000000..38f0b4d286
--- /dev/null
+++ b/packages/ipkg/files/libdir.patch
@@ -0,0 +1,11 @@
+--- C/ipkg.h.in.old	2005-04-02 17:11:02.762413624 +0100
++++ C/ipkg.h.in	2005-04-02 17:11:06.314873568 +0100
+@@ -36,7 +36,7 @@
+ #define IPKG_LEGAL_PKG_NAME_CHARS "abcdefghijklmnopqrstuvwxyz0123456789.+-"
+ #define IPKG_PKG_VERSION_SEP_CHAR '_'
+ 
+-#define IPKG_STATE_DIR_PREFIX LIBDIR"/ipkg"
++#define IPKG_STATE_DIR_PREFIX "/usr/lib/ipkg"
+ #define IPKG_LISTS_DIR_SUFFIX "lists"
+ #define IPKG_INFO_DIR_SUFFIX "info"
+ #define IPKG_STATUS_FILE_SUFFIX "status"
diff --git a/packages/ipkg/ipkg_0.99.153.bb b/packages/ipkg/ipkg_0.99.153.bb
index 1898c6656e..f629b85f00 100644
--- a/packages/ipkg/ipkg_0.99.153.bb
+++ b/packages/ipkg/ipkg_0.99.153.bb
@@ -1 +1,3 @@
+DEFAULT_PREFERENCE=-1
+
 include ipkg.inc
diff --git a/packages/libmimedir/libmimedir_cvs.bb b/packages/libmimedir/libmimedir_cvs.bb
index 1d32f65574..bdfef7d58e 100644
--- a/packages/libmimedir/libmimedir_cvs.bb
+++ b/packages/libmimedir/libmimedir_cvs.bb
@@ -15,7 +15,7 @@ inherit autotools pkgconfig
 
 EXTRA_OECONF = "--disable-gtk-doc"
 
-headers = "mimedir-attachment.h mimedir-attendee.h mimedir-attribute.h mimedir-datetime.h mimedir-init.h mimedir-period.h mimedir-profile.h mimedir-valarm.h mimedir-vcal.h mimedir-vcard-address.h mimedir-vcard-email.h mimedir-vcard-phone.h mimedir-vcard.h mimedir-vcomponent.h mimedir-vevent.h mimedir-vfreebusy.h mimedir-vjournal.h mimedir-vtimezone.h mimedir-vtodo.h mimedir.h"
+headers = "mimedir-recurrence.h  mimedir-attachment.h mimedir-attendee.h mimedir-attribute.h mimedir-datetime.h mimedir-init.h mimedir-period.h mimedir-profile.h mimedir-valarm.h mimedir-vcal.h mimedir-vcard-address.h mimedir-vcard-email.h mimedir-vcard-phone.h mimedir-vcard.h mimedir-vcomponent.h mimedir-vevent.h mimedir-vfreebusy.h mimedir-vjournal.h mimedir-vtimezone.h mimedir-vtodo.h mimedir.h"
 
 do_stage() {
 	install -d ${STAGING_INCDIR}/mimedir-1.0/mimedir
diff --git a/packages/zd1211/zd1211-20050822/.mtn2git_empty b/packages/zd1211/zd1211-20050822/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/zd1211/zd1211-20050822/.mtn2git_empty
diff --git a/packages/zd1211/zd1211-20050822/makefile.patch b/packages/zd1211/zd1211-20050822/makefile.patch
new file mode 100644
index 0000000000..91f3192d4d
--- /dev/null
+++ b/packages/zd1211/zd1211-20050822/makefile.patch
@@ -0,0 +1,11 @@
+--- zd1211/Makefile.orig	2005-04-15 12:34:32.000000000 -1000
++++ zd1211/Makefile	2005-09-02 02:40:41.857339000 -1000
+@@ -90,7 +90,7 @@
+ ifeq ($(KVER), 2.6) # we're on a 2.6.x kernel
+ 	$(MAKE) V=0 -C $(KSRC) SUBDIRS=$(SUBDIRS) modules
+ else
+-	$(MAKE) -C $(KSRC) SUBDIRS=$(SUBDIRS) depend modules
++	$(MAKE) -C $(KSRC) SUBDIRS=$(SUBDIRS) modules
+ endif
+ 
+ $(SRC_DIR)/zddevlist.h:	$(SRC_DIR)/zddevlist
diff --git a/packages/zd1211/zd1211_20050822.bb b/packages/zd1211/zd1211_20050822.bb
index 3b01d8e317..8651ab026e 100644
--- a/packages/zd1211/zd1211_20050822.bb
+++ b/packages/zd1211/zd1211_20050822.bb
@@ -3,10 +3,11 @@ PRIORITY = "optional"
 SECTION = "kernel/modules"
 MAINTAINER = "dyoung <dyoung8888@yahoo.com>"
 LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
 DEPENDS = "wireless-tools"
 
-SRC_URI = "http://download.sourceforge.net/zd1211/sf_zd1211_${PV}_src.tar.gz"
+SRC_URI = "http://download.sourceforge.net/zd1211/sf_zd1211_${PV}_src.tar.gz \
+	file://makefile.patch;patch=1" 
 
 S = "${WORKDIR}/zd1211"