update and fix build on OpenBSD host

6 files changed, 129 insertions, 101 deletions

diff --git a/package/lvm/patches/patch-Makefile_in b/package/lvm/patches/patch-Makefile_in
deleted file mode 100644
index fd15b0060..000000000
--- a/package/lvm/patches/patch-Makefile_in
+++ /dev/null
@@ -1,20 +0,0 @@
---- LVM2.2.02.61.orig/Makefile.in	2009-10-02 21:10:31.000000000 +0200
-+++ LVM2.2.02.61/Makefile.in	2010-03-03 19:43:58.976123551 +0100
-@@ -17,7 +17,7 @@ top_srcdir = @top_srcdir@
- top_builddir = @top_builddir@
- VPATH = @srcdir@
- 
--SUBDIRS = doc include man scripts
-+SUBDIRS = include
- 
- ifeq ("@UDEV_RULES@", "yes")
-   SUBDIRS += udev
-@@ -64,7 +64,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..0f5ca59fc
--- /dev/null
+++ b/package/lvm/patches/patch-doc_Makefile_in
@@ -0,0 +1,14 @@
+--- LVM2.2.02.72.orig/doc/Makefile.in	Thu May 20 13:45:57 2010
++++ LVM2.2.02.72/doc/Makefile.in	Fri Jul 30 09:23:26 2010
+@@ -22,8 +22,9 @@ include $(top_builddir)/make.tmpl
+ 
+ install_lvm2: $(CONFSRC)
+ 	@if [ ! -e $(confdir)/$(CONFDEST) ]; then \
+-		echo "$(INSTALL_WDATA) -D $< $(confdir)/$(CONFDEST)"; \
+-		$(INSTALL_WDATA) -D $< $(confdir)/$(CONFDEST); \
++		echo "$(INSTALL_WDATA) $< $(confdir)/$(CONFDEST)"; \
++		$(INSTALL_DIR) $(confdir); \
++		$(INSTALL_WDATA) $< $(confdir)/$(CONFDEST); \
+ 	fi
+ 
+ install: install_lvm2
diff --git a/package/lvm/patches/patch-libdm_Makefile_in b/package/lvm/patches/patch-libdm_Makefile_in
index 52a52a0fd..9a999133b 100644
--- a/package/lvm/patches/patch-libdm_Makefile_in
+++ b/package/lvm/patches/patch-libdm_Makefile_in
@@ -1,60 +1,51 @@
---- LVM2.2.02.61.orig/libdm/Makefile.in	2009-10-02 21:10:36.000000000 +0200
-+++ LVM2.2.02.61/libdm/Makefile.in	2010-03-08 06:27:03.000000000 +0100
-@@ -35,9 +35,7 @@ SOURCES =\
+--- LVM2.2.02.72.orig/libdm/Makefile.in	Fri Jun 25 20:17:39 2010
++++ LVM2.2.02.72/libdm/Makefile.in	Fri Jul 30 10:34:15 2010
+@@ -34,10 +34,7 @@ SOURCES =\
  
  INCLUDES = -I$(srcdir)/$(interface) -I$(srcdir)
  
 -ifeq ("@STATIC_LINK@", "yes")
  LIB_STATIC = $(interface)/libdevmapper.a
 -endif
- 
- ifeq ("@LIB_SUFFIX@","dylib")
-   LIB_SHARED = $(interface)/libdevmapper.dylib
-@@ -60,9 +58,7 @@ device-mapper: all
+-
+ LIB_SHARED = $(interface)/libdevmapper.$(LIB_SUFFIX)
+ LIB_VERSION = $(LIB_VERSION_DM)
+ TARGETS += libdevmapper.$(LIB_SUFFIX) libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION)
+@@ -65,11 +62,8 @@ libdevmapper.$(LIB_SUFFIX) libdevmapper.$(LIB_SUFFIX).
+ 	install_pkgconfig
  
  INSTALL_TYPE = install_dynamic
++INSTALL_TYPE += install_static
  
 -ifeq ("@STATIC_LINK@", "yes")
 -  INSTALL_TYPE += install_static
 -endif
-+INSTALL_TYPE += install_static
- 
+-
  ifeq ("@PKGCONFIG@", "yes")
    INSTALL_TYPE += install_pkgconfig
-@@ -73,26 +69,32 @@ install: $(INSTALL_TYPE) install_include
+ endif
+@@ -79,7 +73,8 @@ install: $(INSTALL_TYPE) install_include
  install_device-mapper: install
  
- install_include:
--	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 $(srcdir)/libdevmapper.h \
-+	$(INSTALL) -d $(includedir)
-+	$(INSTALL) $(OWNER) $(GROUP) -m 444 $(srcdir)/libdevmapper.h \
- 		$(includedir)/libdevmapper.h
+ install_include: $(srcdir)/libdevmapper.h
+-	$(INSTALL_DATA) -D $< $(includedir)/$(<F)
++	$(INSTALL_DIR) $(includedir)
++	$(INSTALL_DATA) $< $(includedir)/$(<F)
  
  install_dynamic: install_@interface@
-+	$(INSTALL) -d $(libdir)
- 	$(LN_S) -f libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION_DM) \
- 		$(libdir)/libdevmapper.$(LIB_SUFFIX)
- 
- install_static: install_@interface@_static
-+	$(INSTALL) -d $(libdir)
- 	$(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) -d $(libdir)
-+	$(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
- 		$(libdir)/libdevmapper.a.$(LIB_VERSION_DM)
- 
- $(VERSIONED_SHLIB): %.$(LIB_SUFFIX).$(LIB_VERSION_DM): $(interface)/%.$(LIB_SUFFIX)
+ 
+@@ -88,10 +83,12 @@ install_static: install_@interface@_static
+ install_ioctl: install_lib_shared
+ 
+ install_pkgconfig: libdevmapper.pc
+-	$(INSTALL_DATA) -D $< $(pkgconfigdir)/devmapper.pc
++	$(INSTALL_DIR) $(pkgconfigdir)
++	$(INSTALL_DATA) $< $(pkgconfigdir)/devmapper.pc
+ 
+ install_ioctl_static: $(LIB_STATIC)
+-	$(INSTALL_DATA) -D $< $(usrlibdir)/$(<F)
++	$(INSTALL_DIR) $(usrlibdir)
++	$(INSTALL_DATA) $< $(usrlibdir)/$(<F)
+ 
+ CLEAN_TARGETS += ioctl/libdevmapper.a
+ DISTCLEAN_TARGETS += libdevmapper.pc
diff --git a/package/lvm/patches/patch-make_tmpl_in b/package/lvm/patches/patch-make_tmpl_in
new file mode 100644
index 000000000..7ffbb36b5
--- /dev/null
+++ b/package/lvm/patches/patch-make_tmpl_in
@@ -0,0 +1,28 @@
+--- LVM2.2.02.72.orig/make.tmpl.in	Tue Jul 20 16:38:44 2010
++++ LVM2.2.02.72/make.tmpl.in	Fri Jul 30 10:22:54 2010
+@@ -312,7 +312,8 @@ $(LIB_SHARED): $(LIB_SHARED).$(LIB_VERSION)
+ 	$(LN_S) -f $(<F) $@
+ 
+ install_lib_shared: $(LIB_SHARED)
+-	$(INSTALL_PROGRAM) -D $< $(libdir)/$(<F).$(LIB_VERSION)
++	$(INSTALL_DIR) $(libdir)
++	$(INSTALL_PROGRAM) $< $(libdir)/$(<F).$(LIB_VERSION)
+ 	$(INSTALL_DIR) $(usrlibdir)
+ 	$(LN_S) -f $(USRLIB_RELPATH)$(<F).$(LIB_VERSION) $(usrlibdir)/$(<F)
+ 
+@@ -320,11 +321,13 @@ install_lib_shared: $(LIB_SHARED)
+ #        and for compatibility links in libdir are created
+ #        when the code is fixed links could be removed.
+ install_dm_plugin: $(LIB_SHARED)
+-	$(INSTALL_PROGRAM) -D $< $(libdir)/device-mapper/$(<F)
++	$(INSTALL_DIR) $(libdir)
++	$(INSTALL_PROGRAM) $< $(libdir)/device-mapper/$(<F)
+ 	$(LN_S) -f device-mapper/$(<F) $(libdir)/$(<F)
+ 
+ install_lvm2_plugin: $(LIB_SHARED)
+-	$(INSTALL_PROGRAM) -D $< $(libdir)/lvm2/$(<F)
++	$(INSTALL_DIR) $(libdir)
++	$(INSTALL_PROGRAM) $< $(libdir)/lvm2/$(<F)
+ 	$(LN_S) -f lvm2/$(<F) $(libdir)/$(<F)
+ 	$(LN_S) -f $(<F) $(libdir)/$(<F).$(LIB_VERSION)
+ endif
diff --git a/package/lvm/patches/patch-scripts_Makefile_in b/package/lvm/patches/patch-scripts_Makefile_in
new file mode 100644
index 000000000..1886a1930
--- /dev/null
+++ b/package/lvm/patches/patch-scripts_Makefile_in
@@ -0,0 +1,12 @@
+--- LVM2.2.02.72.orig/scripts/Makefile.in	Thu May 20 16:45:17 2010
++++ LVM2.2.02.72/scripts/Makefile.in	Fri Jul 30 09:26:25 2010
+@@ -25,7 +25,8 @@ endif
+ vpath %.sh $(srcdir)
+ 
+ %_install: %.sh
+-	$(INSTALL_PROGRAM) -D $< $(sbindir)/$(basename $(<F))
++	$(INSTALL_DIR) $(sbindir)
++	$(INSTALL_PROGRAM) $< $(sbindir)/$(basename $(<F))
+ 
+ install_lvm2: $(SCRIPTS:.sh=_install)
+ 
diff --git a/package/lvm/patches/patch-tools_Makefile_in b/package/lvm/patches/patch-tools_Makefile_in
index ae6fcbf8f..81b1efc97 100644
--- a/package/lvm/patches/patch-tools_Makefile_in
+++ b/package/lvm/patches/patch-tools_Makefile_in
@@ -1,55 +1,58 @@
---- LVM2.2.02.61.orig/tools/Makefile.in	2010-01-19 02:10:47.000000000 +0100
-+++ LVM2.2.02.61/tools/Makefile.in	2010-03-03 19:46:06.396138753 +0100
-@@ -165,21 +165,26 @@ cflow: lvm.cflow lvm.xref lvm.tree lvm.r
- endif
+--- LVM2.2.02.72.orig/tools/Makefile.in	Fri Jun 25 20:23:10 2010
++++ LVM2.2.02.72/tools/Makefile.in	Fri Jul 30 10:13:24 2010
+@@ -157,7 +157,7 @@ liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION): liblvm2cmd.$(
+ 
+ .commands: $(srcdir)/commands.h $(srcdir)/cmdnames.h Makefile
+ 	$(CC) -E -P $(srcdir)/cmdnames.h 2> /dev/null | \
+-		egrep -v '^ *(|#.*|dumpconfig|formats|help|pvdata|segtypes|version) *$$' > .commands
++		egrep -v '^ *(#.*|dumpconfig|formats|help|pvdata|segtypes|version) *$$' > .commands
+ 
+ ifneq ("$(CFLOW_CMD)", "")
+ CFLOW_SOURCES = $(addprefix $(srcdir)/, $(SOURCES))
+@@ -170,18 +170,22 @@ endif
+ 	install_dmsetup_dynamic install_dmsetup_static
+ 
+ install_cmdlib_include: $(srcdir)/lvm2cmd.h
+-	$(INSTALL_DATA) -D $< $(includedir)/$(<F)
++	$(INSTALL_DIR) $(includedir)
++	$(INSTALL_DATA) $< $(includedir)/$(<F)
  
  install_cmdlib_dynamic: liblvm2cmd.$(LIB_SUFFIX)
--	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
-+	$(INSTALL) -d $(libdir)
-+	$(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
- 		$(libdir)/liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION)
- 	$(LN_S) -f liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION) $(libdir)/liblvm2cmd.$(LIB_SUFFIX)
--	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 $(srcdir)/lvm2cmd.h \
-+	$(INSTALL) -d $(includedir)
-+	$(INSTALL) $(OWNER) $(GROUP) -m 444 $(srcdir)/lvm2cmd.h \
- 		$(includedir)/lvm2cmd.h
+-	$(INSTALL_PROGRAM) -D $< $(libdir)/$(<F).$(LIB_VERSION)
++	$(INSTALL_DIR) $(libdir)
++	$(INSTALL_PROGRAM) $< $(libdir)/$(<F).$(LIB_VERSION)
+ 	$(INSTALL_DIR) $(usrlibdir)
+ 	$(LN_S) -f $(USRLIB_RELPATH)$(<F).$(LIB_VERSION) $(usrlibdir)/$(<F)
  
  install_cmdlib_static: liblvm2cmd-static.a
--	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
-+	$(INSTALL) -d $(libdir)
-+	$(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
- 		$(libdir)/liblvm2cmd.a.$(LIB_VERSION)
- 	$(LN_S) -f liblvm2cmd.a.$(LIB_VERSION) $(libdir)/liblvm2cmd.a
--	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 $(srcdir)/lvm2cmd.h \
-+	$(INSTALL) -d $(includedir)
-+	$(INSTALL) $(OWNER) $(GROUP) -m 444 $(srcdir)/lvm2cmd.h \
- 		$(includedir)/lvm2cmd.h
+-	$(INSTALL_DATA) -D $< $(usrlibdir)/liblvm2cmd.a
++	$(INSTALL_DIR) $(usrlibdir)
++	$(INSTALL_DATA) $< $(usrlibdir)/liblvm2cmd.a
  
  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
+-	$(INSTALL_PROGRAM) -D lvm $(sbindir)/lvm
++	$(INSTALL_DIR) $(sbindir)
++	$(INSTALL_PROGRAM) lvm $(sbindir)/lvm
  	@echo Creating symbolic links for individual commands in $(sbindir)
- 	@( \
-@@ -190,14 +195,17 @@ install_tools_dynamic: lvm .commands
- 	)
+ 	@for v in `cat .commands`; do \
+ 		echo "$(LN_S) -f lvm $(sbindir)/$$v"; \
+@@ -189,13 +193,16 @@ install_tools_dynamic: lvm .commands
+ 	done;
  
  install_tools_static: lvm.static
--	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
-+	$(INSTALL) -d $(sbindir)
-+	$(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
- 		$(staticdir)/lvm.static
+-	$(INSTALL_PROGRAM) -D $< $(staticdir)/$(<F)
++	$(INSTALL_DIR) $(staticdir)
++	$(INSTALL_PROGRAM) $< $(staticdir)/$(<F)
  
  install_dmsetup_dynamic: dmsetup
--	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$<
-+	$(INSTALL) -d $(sbindir)
-+	$(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$<
+-	$(INSTALL_PROGRAM) -D $< $(sbindir)/$(<F)
++	$(INSTALL_DIR) $(sbindir)
++	$(INSTALL_PROGRAM) $< $(sbindir)/$(<F)
  
  install_dmsetup_static: dmsetup.static
--	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$<
-+	$(INSTALL) -d $(sbindir)
-+	$(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$<
+-	$(INSTALL_PROGRAM) -D $< $(staticdir)/$(<F)
++	$(INSTALL_DIR) $(staticdir)
++	$(INSTALL_PROGRAM) $< $(staticdir)/$(<F)
  
  install_device-mapper: $(INSTALL_DMSETUP_TARGETS)