Sun Jan 4 23:10:06 2009 UTC ()
convert to use libtool
additional fixes to compile on osx


(dbj)
diff -r1.2 -r1.3 pkgsrc/devel/libvolume_id/Makefile
diff -r1.2 -r1.3 pkgsrc/devel/libvolume_id/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/devel/libvolume_id/PLIST
diff -r1.2 -r1.3 pkgsrc/devel/libvolume_id/patches/patch-aa
diff -r1.2 -r1.3 pkgsrc/devel/libvolume_id/patches/patch-ab
diff -r1.2 -r1.3 pkgsrc/devel/libvolume_id/patches/patch-ac
diff -r1.2 -r1.3 pkgsrc/devel/libvolume_id/patches/patch-ad
diff -r0 -r1.1 pkgsrc/devel/libvolume_id/patches/patch-ae
cvs diff -r1.2 -r1.3 pkgsrc/devel/libvolume_id/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/libvolume_id/Makefile 2008/11/26 07:47:56 1.2
+++ pkgsrc/devel/libvolume_id/Makefile 2009/01/04 23:10:06 1.3
@@ -1,30 +1,20 @@ @@ -1,30 +1,20 @@
1# $NetBSD: Makefile,v 1.2 2008/11/26 07:47:56 hasso Exp $ 1# $NetBSD: Makefile,v 1.3 2009/01/04 23:10:06 dbj Exp $
2# 2#
3 3
4DISTNAME= libvolume_id-0.81.0 4DISTNAME= libvolume_id-0.81.0
 5PKGREVISION= 1
5CATEGORIES= sysutils 6CATEGORIES= sysutils
6MASTER_SITES= http://www.marcuscom.com/downloads/ 7MASTER_SITES= http://www.marcuscom.com/downloads/
7EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
8 9
9MAINTAINER= jmcneill@NetBSD.org 10MAINTAINER= jmcneill@NetBSD.org
10HOMEPAGE= ${MASTER_SITES} 11HOMEPAGE= ${MASTER_SITES}
11COMMENT= Library to provide file system type information 12COMMENT= Library to provide file system type information
12 13
13PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
14INSTALLATION_DIRS= include lib lib/pkgconfig  15INSTALLATION_DIRS= include lib lib/pkgconfig
15USE_TOOLS+= gmake pkg-config ranlib 16USE_TOOLS+= gmake pkg-config
16 17
17MAKE_ENV+= E=@${ECHO} 18USE_LIBTOOL=yes
18MAKE_ENV+= RANLIB=ranlib 
19MAKE_ENV+= AR=ar 
20MAKE_ENV+= Q=@ 
21MAKE_ENV+= prefix=${PREFIX} 
22 
23do-install: 
24 ${INSTALL_DATA} ${WRKSRC}/libvolume_id.pc ${DESTDIR}${PREFIX}/lib/pkgconfig/libvolume_id.pc 
25 ${INSTALL_DATA} ${WRKSRC}/libvolume_id.h ${DESTDIR}${PREFIX}/include/libvolume_id.h 
26 ${INSTALL_DATA} ${WRKSRC}/libvolume_id.a ${DESTDIR}${PREFIX}/lib/libvolume_id.a 
27 ${INSTALL_LIB} ${WRKSRC}/libvolume_id.so.0 ${DESTDIR}${PREFIX}/lib/libvolume_id.so.0 
28 ${LN} -sf ${PREFIX}/lib/libvolume_id.so.0 ${DESTDIR}${PREFIX}/lib/libvolume_id.so 
29 19
30.include "../../mk/bsd.pkg.mk" 20.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/devel/libvolume_id/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/libvolume_id/distinfo 2008/11/23 16:07:16 1.2
+++ pkgsrc/devel/libvolume_id/distinfo 2009/01/04 23:10:06 1.3
@@ -1,9 +1,10 @@ @@ -1,9 +1,10 @@
1$NetBSD: distinfo,v 1.2 2008/11/23 16:07:16 hasso Exp $ 1$NetBSD: distinfo,v 1.3 2009/01/04 23:10:06 dbj Exp $
2 2
3SHA1 (libvolume_id-0.81.0.tar.bz2) = e6d61d734dab9a305637ba8379ca04df3fd4e398 3SHA1 (libvolume_id-0.81.0.tar.bz2) = e6d61d734dab9a305637ba8379ca04df3fd4e398
4RMD160 (libvolume_id-0.81.0.tar.bz2) = f0dfe8aab157f155b242eff6e20b29c65bb279b5 4RMD160 (libvolume_id-0.81.0.tar.bz2) = f0dfe8aab157f155b242eff6e20b29c65bb279b5
5Size (libvolume_id-0.81.0.tar.bz2) = 23274 bytes 5Size (libvolume_id-0.81.0.tar.bz2) = 23274 bytes
6SHA1 (patch-aa) = 8850ccda617472ad46cb3386e4a016e11222b49c 6SHA1 (patch-aa) = f1bc3a47df3d98bba4b08e96f957e11f56155c18
7SHA1 (patch-ab) = 5c44d5f2877d37b53b8b243c248b520462f221a7 7SHA1 (patch-ab) = f9f80eeeb67b8f8babf777bf59226249b03576b8
8SHA1 (patch-ac) = 33287bf3c1a92a75df2ac2aa8a6cdac357bd0c71 8SHA1 (patch-ac) = 4a47119e7d84093970747cdc699c49236df7bd35
9SHA1 (patch-ad) = 20e5d03294d50ef9a26eed0ae49fda085a2e5e2a 9SHA1 (patch-ad) = c09ecb39f154c37e72dfb6bb6241ec33d77c0b60
 10SHA1 (patch-ae) = 82d0bdd10818ed75eb1c555891c093eddbffaa7a
cvs diff -r1.1.1.1 -r1.2 pkgsrc/devel/libvolume_id/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/libvolume_id/PLIST 2008/11/22 13:48:23 1.1.1.1
+++ pkgsrc/devel/libvolume_id/PLIST 2009/01/04 23:10:06 1.2
@@ -1,6 +1,4 @@ @@ -1,6 +1,4 @@
1@comment $NetBSD: PLIST,v 1.1.1.1 2008/11/22 13:48:23 jmcneill Exp $ 1@comment $NetBSD: PLIST,v 1.2 2009/01/04 23:10:06 dbj Exp $
2include/libvolume_id.h 2include/libvolume_id.h
3lib/libvolume_id.a 3lib/libvolume_id.la
4lib/libvolume_id.so 
5lib/libvolume_id.so.0 
6lib/pkgconfig/libvolume_id.pc 4lib/pkgconfig/libvolume_id.pc
cvs diff -r1.2 -r1.3 pkgsrc/devel/libvolume_id/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/devel/libvolume_id/patches/patch-aa 2008/11/23 16:07:16 1.2
+++ pkgsrc/devel/libvolume_id/patches/patch-aa 2009/01/04 23:10:06 1.3
@@ -1,13 +1,16 @@ @@ -1,13 +1,16 @@
1$NetBSD: patch-aa,v 1.2 2008/11/23 16:07:16 hasso Exp $ 1$NetBSD: patch-aa,v 1.3 2009/01/04 23:10:06 dbj Exp $
2 2
3--- ddf_raid.c.orig 2008-11-22 08:33:28.000000000 -0500 3--- ddf_raid.c.orig 2007-12-26 17:05:32.000000000 -0800
4+++ ddf_raid.c 4+++ ddf_raid.c 2008-12-28 16:50:36.000000000 -0800
5@@ -22,7 +22,7 @@ 5@@ -22,9 +22,9 @@
6 #include <string.h> 6 #include <string.h>
7 #include <errno.h> 7 #include <errno.h>
8 #include <ctype.h> 8 #include <ctype.h>
9-#ifdef __FreeBSD__ 9-#ifdef __FreeBSD__
10+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) 10+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
11 #include <sys/endian.h> 11 #include <sys/endian.h>
12 #else 12-#else
 13+#elif !defined(__APPLE__)
13 #include <byteswap.h> 14 #include <byteswap.h>
 15 #endif /* __FreeBSD__ */
 16
cvs diff -r1.2 -r1.3 pkgsrc/devel/libvolume_id/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/devel/libvolume_id/patches/patch-ab 2008/11/23 16:07:16 1.2
+++ pkgsrc/devel/libvolume_id/patches/patch-ab 2009/01/04 23:10:06 1.3
@@ -1,13 +1,16 @@ @@ -1,13 +1,16 @@
1$NetBSD: patch-ab,v 1.2 2008/11/23 16:07:16 hasso Exp $ 1$NetBSD: patch-ab,v 1.3 2009/01/04 23:10:06 dbj Exp $
2 2
3--- linux_raid.c.orig 2008-11-22 08:33:51.000000000 -0500 3--- linux_raid.c.orig 2007-12-26 17:03:43.000000000 -0800
4+++ linux_raid.c 4+++ linux_raid.c 2008-12-28 17:45:50.000000000 -0800
5@@ -22,7 +22,7 @@ 5@@ -22,9 +22,9 @@
6 #include <string.h> 6 #include <string.h>
7 #include <errno.h> 7 #include <errno.h>
8 #include <ctype.h> 8 #include <ctype.h>
9-#ifdef __FreeBSD__ 9-#ifdef __FreeBSD__
10+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) 10+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
11 #include <sys/endian.h> 11 #include <sys/endian.h>
12 #else 12-#else
 13+#elif !defined(__APPLE__)
13 #include <byteswap.h> 14 #include <byteswap.h>
 15 #endif /* __FreeBSD__ */
 16
cvs diff -r1.2 -r1.3 pkgsrc/devel/libvolume_id/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/devel/libvolume_id/patches/patch-ac 2008/11/23 16:07:16 1.2
+++ pkgsrc/devel/libvolume_id/patches/patch-ac 2009/01/04 23:10:06 1.3
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ac,v 1.2 2008/11/23 16:07:16 hasso Exp $ 1$NetBSD: patch-ac,v 1.3 2009/01/04 23:10:06 dbj Exp $
2 2
3--- util.c.orig 2008-11-22 08:34:15.000000000 -0500 3--- util.c.orig 2007-12-26 16:56:15.000000000 -0800
4+++ util.c 4+++ util.c 2008-12-28 17:46:24.000000000 -0800
5@@ -28,7 +28,7 @@ 5@@ -28,7 +28,7 @@
6 #include "libvolume_id.h" 6 #include "libvolume_id.h"
7 #include "util.h" 7 #include "util.h"
8  8
9-#ifdef __FreeBSD__ 9-#ifdef __FreeBSD__
10+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) 10+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__APPLE__)
11 static size_t strnlen (const char *s, size_t maxlen) 11 static size_t strnlen (const char *s, size_t maxlen)
12 { 12 {
13 size_t i; 13 size_t i;
cvs diff -r1.2 -r1.3 pkgsrc/devel/libvolume_id/patches/patch-ad (expand / switch to unified diff)

--- pkgsrc/devel/libvolume_id/patches/patch-ad 2008/11/23 16:07:17 1.2
+++ pkgsrc/devel/libvolume_id/patches/patch-ad 2009/01/04 23:10:06 1.3
@@ -1,13 +1,31 @@ @@ -1,13 +1,31 @@
1$NetBSD: patch-ad,v 1.2 2008/11/23 16:07:17 hasso Exp $ 1$NetBSD: patch-ad,v 1.3 2009/01/04 23:10:06 dbj Exp $
2 2
3--- util.h.orig 2008-11-22 08:32:52.000000000 -0500 3--- util.h.orig 2007-12-26 16:51:05.000000000 -0800
4+++ util.h 4+++ util.h 2008-12-28 17:47:48.000000000 -0800
5@@ -19,7 +19,7 @@ 5@@ -19,7 +19,7 @@
6 # include <config.h> 6 # include <config.h>
7 #endif 7 #endif
8  8
9-#ifdef __FreeBSD__ 9-#ifdef __FreeBSD__
10+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) 10+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
11 #include <sys/endian.h> 11 #include <sys/endian.h>
12  12
13 #define __BYTE_ORDER _BYTE_ORDER 13 #define __BYTE_ORDER _BYTE_ORDER
 14@@ -29,6 +29,17 @@
 15 #define bswap_16 bswap16
 16 #define bswap_32 bswap32
 17 #define bswap_64 bswap64
 18+#elif defined(__APPLE__)
 19+#include <machine/endian.h>
 20+#include <libkern/OSByteOrder.h>
 21+
 22+#define __BYTE_ORDER BYTE_ORDER
 23+#define __LITTLE_ENDIAN LITTLE_ENDIAN
 24+#define __BIG_ENDIAN BIG_ENDIAN
 25+
 26+#define bswap_16 OSSwapInt16
 27+#define bswap_32 OSSwapInt32
 28+#define bswap_64 OSSwapInt64
 29 #else
 30 #include <endian.h>
 31 #include <byteswap.h>
File Added: pkgsrc/devel/libvolume_id/patches/patch-ae
$NetBSD: patch-ae,v 1.1 2009/01/04 23:10:06 dbj Exp $

--- Makefile.orig	2007-12-26 16:52:36.000000000 -0800
+++ Makefile	2009-01-04 15:05:52.000000000 -0800
@@ -59,12 +59,19 @@ HEADERS=			\
 	libvolume_id.h		\
 	util.h
 
-all: libvolume_id.a $(SHLIB) libvolume_id.pc
+all: libvolume_id.la libvolume_id.pc
 .PHONY: all
 .DEFAULT: all
 
 .SUFFIXES:
 
+libvolume_id.la: $(OBJS:.o=.lo)
+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -o $@ \
+	    $^ -version-info $(SHLIB_CUR):$(SHLIB_REV):$(SHLIB_AGE) -rpath $(PREFIX)/lib
+
+%.lo: %.c
+	$(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) -o $@ $<
+
 %.o: %.c
 	$(E) "  CC      " $@
 	$(Q) $(CC) -c $(CFLAGS) $< -o $@
@@ -88,27 +95,22 @@ $(SHLIB): $(HEADERS) exported_symbols $(
 		$(addprefix .shlib/,$(OBJS))
 
 libvolume_id.pc:
-	$(E) "  GENPC   " $@
-	$(Q) echo "libdir=${usrlibdir}" >> $@
-	$(Q) echo "includedir=${includedir}" >> $@
-	$(Q) echo "" >> $@
-	$(Q) echo "Name: libvolume_id" >> $@
-	$(Q) echo "Description: Filesystem label and uuid access" >> $@
-	$(Q) echo "Version: $(SHLIB_CUR).$(SHLIB_REV).$(SHLIB_AGE)" >> $@
-	$(Q) echo "Libs: -L\$${libdir} -lvolume_id" >> $@
-	$(Q) echo "Cflags: -I\$${includedir}" >> $@
+	echo "prefix=$(PREFIX)" >> $@
+	echo "exec_prefix=\$${prefix}" >> $@
+	echo "libdir=\$${exec_prefix}/lib" >> $@
+	echo "includedir=\$${exec_prefix}/include" >> $@
+	echo "" >> $@
+	echo "Name: libvolume_id" >> $@
+	echo "Description: Filesystem label and uuid access" >> $@
+	echo "Version: $(SHLIB_CUR).$(SHLIB_REV).$(SHLIB_AGE)" >> $@
+	echo "" >> $@
+	echo "Libs: -L\$${libdir} -lvolume_id" >> $@
+	echo "Cflags: -I\$${includedir}" >> $@
 
 install: all
-	$(INSTALL_DATA) -D libvolume_id.h $(DESTDIR)$(includedir)/libvolume_id.h
-	$(INSTALL_LIB) -D $(SHLIB) $(DESTDIR)$(libdir)/$(SHLIB)
-	mkdir -p $(DESTDIR)$(usrlibdir)/
-	ln -sf $(SHLIB) $(DESTDIR)$(libdir)/libvolume_id.so.$(SHLIB_CUR)
-ifeq ($(libdir),$(usrlibdir))
-	ln -sf $(SHLIB) $(DESTDIR)$(usrlibdir)/libvolume_id.so
-else
-	ln -sf $(libdir)/$(SHLIB) $(DESTDIR)$(usrlibdir)/libvolume_id.so
-endif
-	$(INSTALL_DATA) -D libvolume_id.pc $(DESTDIR)$(usrlibdir)/pkgconfig/libvolume_id.pc
+	$(LIBTOOL) --mode=install $(INSTALL_LIB) libvolume_id.la $(DESTDIR)$(PREFIX)/lib
+	$(INSTALL_DATA) libvolume_id.h $(DESTDIR)$(PREFIX)/include
+	$(INSTALL_DATA) libvolume_id.pc $(DESTDIR)$(PREFIX)/lib/pkgconfig
 .PHONY: install
 
 uninstall: