FreeBSD compatibility patches

- update ipset and libpri to latest upstream

4 files changed, 94 insertions, 1 deletions

diff --git a/package/lvm/patches/patch-Makefile_in b/package/lvm/patches/patch-Makefile_in
new file mode 100644
index 000000000..e22bc814b
--- /dev/null
+++ b/package/lvm/patches/patch-Makefile_in
@@ -0,0 +1,20 @@
+--- LVM2.2.02.45.orig/Makefile.in	2008-11-18 14:16:03.000000000 +0100
++++ LVM2.2.02.45/Makefile.in	2009-06-11 23:21:31.000000000 +0200
+@@ -16,7 +16,7 @@ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ 
+-SUBDIRS = doc include man scripts
++SUBDIRS = doc include
+ 
+ ifeq ("@INTL@", "yes")
+   SUBDIRS += po
+@@ -49,7 +49,7 @@ po: tools daemons
+ libdm.device-mapper: include.device-mapper
+ daemons.device-mapper: libdm.device-mapper
+ tools.device-mapper: libdm.device-mapper
+-device-mapper: tools.device-mapper daemons.device-mapper man.device-mapper
++device-mapper: tools.device-mapper daemons.device-mapper
+ 
+ ifeq ("@INTL@", "yes")
+ lib.pofile: include.pofile
diff --git a/package/lvm/patches/patch-doc_Makefile_in b/package/lvm/patches/patch-doc_Makefile_in
new file mode 100644
index 000000000..758eb54e4
--- /dev/null
+++ b/package/lvm/patches/patch-doc_Makefile_in
@@ -0,0 +1,12 @@
+--- LVM2.2.02.45.orig/doc/Makefile.in	2007-09-21 12:16:43.000000000 +0200
++++ LVM2.2.02.45/doc/Makefile.in	2009-06-11 23:17:13.000000000 +0200
+@@ -23,7 +23,8 @@ include $(top_srcdir)/make.tmpl
+ install:
+ 	@if [ ! -e $(confdir)/$(CONFDEST) ]; then \
+ 		echo "Installing $(CONFSRC) as $(confdir)/$(CONFDEST)"; \
+-		@INSTALL@ -D $(OWNER) $(GROUP) -m 644 $(CONFSRC) \
++		@INSTALL@ -d $(confdir); \
++		@INSTALL@ $(OWNER) $(GROUP) -m 644 $(CONFSRC) \
+ 			$(confdir)/$(CONFDEST); \
+ 	fi
+ 
diff --git a/package/lvm/patches/patch-libdm_Makefile_in b/package/lvm/patches/patch-libdm_Makefile_in
new file mode 100644
index 000000000..c6d63a3fe
--- /dev/null
+++ b/package/lvm/patches/patch-libdm_Makefile_in
@@ -0,0 +1,33 @@
+--- LVM2.2.02.45.orig/libdm/Makefile.in	2008-11-14 21:59:56.000000000 +0100
++++ LVM2.2.02.45/libdm/Makefile.in	2009-06-11 23:26:48.000000000 +0200
+@@ -70,7 +70,8 @@ install: $(INSTALL_TYPE) install_include
+ install_device-mapper: install
+ 
+ install_include:
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 libdevmapper.h \
++	$(INSTALL) -d $(includedir)
++	$(INSTALL) $(OWNER) $(GROUP) -m 444 libdevmapper.h \
+ 		$(includedir)/libdevmapper.h
+ 
+ install_dynamic: install_@interface@
+@@ -81,15 +82,17 @@ install_static: install_@interface@_stat
+ 	$(LN_S) -f libdevmapper.a.$(LIB_VERSION_DM) $(libdir)/libdevmapper.a
+ 
+ install_ioctl: ioctl/libdevmapper.$(LIB_SUFFIX)
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
++	$(INSTALL) -d $(libdir)
++	$(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
+ 		$(libdir)/libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION_DM)
+ 
+ install_pkgconfig:
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 libdevmapper.pc \
++	$(INSTALL) -d $(usrlibdir)/pkgconfig
++	$(INSTALL) $(OWNER) $(GROUP) -m 444 libdevmapper.pc \
+ 		$(usrlibdir)/pkgconfig/devmapper.pc
+ 
+ install_ioctl_static: ioctl/libdevmapper.a
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
++	$(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
+ 		$(libdir)/libdevmapper.a.$(LIB_VERSION_DM)
+ 
+ $(VERSIONED_SHLIB): %.$(LIB_SUFFIX).$(LIB_VERSION_DM): $(interface)/%.$(LIB_SUFFIX)
diff --git a/package/lvm/patches/patch-tools_Makefile_in b/package/lvm/patches/patch-tools_Makefile_in
index 7961bcf24..ed2a2c974 100644
--- a/package/lvm/patches/patch-tools_Makefile_in
+++ b/package/lvm/patches/patch-tools_Makefile_in
@@ -1,6 +1,6 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 --- LVM2.2.02.45.orig/tools/Makefile.in	2009-02-17 12:07:59.000000000 +0100
-+++ LVM2.2.02.45/tools/Makefile.in	2009-05-16 21:29:01.474640998 +0200
++++ LVM2.2.02.45/tools/Makefile.in	2009-06-11 23:24:12.000000000 +0200
 @@ -62,19 +62,18 @@ SOURCES =\
  	vgscan.c \
  	vgsplit.c
@@ -27,3 +27,31 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  endif
  
  LVMLIBS = -llvm
+@@ -170,7 +169,8 @@ install_cmdlib_static: liblvm2cmd-static
+ 		$(includedir)/lvm2cmd.h
+ 
+ install_tools_dynamic: lvm .commands
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) lvm \
++	$(INSTALL) -d $(sbindir)
++	$(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) lvm \
+ 		$(sbindir)/lvm
+ 	@echo Creating symbolic links for individual commands in $(sbindir)
+ 	@( \
+@@ -181,14 +181,14 @@ install_tools_dynamic: lvm .commands
+ 	)
+ 
+ install_tools_static: lvm.static
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) lvm.static \
++	$(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) lvm.static \
+ 		$(staticdir)/lvm.static
+ 
+ install_dmsetup_dynamic: dmsetup
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$<
++	$(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$<
+ 
+ install_dmsetup_static: dmsetup.static
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$<
++	$(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$<
+ 
+ install_device-mapper: $(INSTALL_DMSETUP_TARGETS)
+