diff options
author | bjs <bjs@pkgsrc.org> | 2008-08-23 08:37:33 +0000 |
---|---|---|
committer | bjs <bjs@pkgsrc.org> | 2008-08-23 08:37:33 +0000 |
commit | f25ce1d240c574b11a7e7326b6327528d2fc76d3 (patch) | |
tree | 737fe986c1a0a6044c16d0bd418f42f4d8a24b8f /devel | |
parent | 007d87109e10db64a9d963d36e534ac861b9757a (diff) | |
download | pkgsrc-f25ce1d240c574b11a7e7326b6327528d2fc76d3.tar.gz |
wip/vlc-devel wants to create a dlopen()-able module linked against
this library; unfortunately, this package was only making a static
archive. This is bound to break on a fair number of platforms. Employ
libtool, as this is what vlc (and possibly other packages) are using
in the first place.
PKGREVISION++
Diffstat (limited to 'devel')
-rw-r--r-- | devel/libtar/Makefile | 5 | ||||
-rw-r--r-- | devel/libtar/PLIST | 4 | ||||
-rw-r--r-- | devel/libtar/distinfo | 4 | ||||
-rw-r--r-- | devel/libtar/patches/patch-ab | 33 | ||||
-rw-r--r-- | devel/libtar/patches/patch-ac | 38 |
5 files changed, 79 insertions, 5 deletions
diff --git a/devel/libtar/Makefile b/devel/libtar/Makefile index b985e18f7ef..1c4751d9492 100644 --- a/devel/libtar/Makefile +++ b/devel/libtar/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.13 2008/07/14 12:56:02 joerg Exp $ +# $NetBSD: Makefile,v 1.14 2008/08/23 08:37:33 bjs Exp $ # DISTNAME= libtar-1.2.11 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= devel archivers MASTER_SITES= ftp://ftp.feep.net/pub/software/libtar/ @@ -13,6 +13,7 @@ COMMENT= Library for manipulating POSIX tar files PKG_DESTDIR_SUPPORT= user-destdir GNU_CONFIGURE= YES +USE_LIBTOOL= yes .include "../../devel/zlib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/libtar/PLIST b/devel/libtar/PLIST index 380496cb24c..f36629fb569 100644 --- a/devel/libtar/PLIST +++ b/devel/libtar/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/04/22 17:14:48 seb Exp $ +@comment $NetBSD: PLIST,v 1.2 2008/08/23 08:37:33 bjs Exp $ bin/libtar include/libtar.h include/libtar_listhash.h -lib/libtar.a +lib/libtar.la man/man3/TH_ISBLK.3 man/man3/TH_ISCHR.3 man/man3/TH_ISDIR.3 diff --git a/devel/libtar/distinfo b/devel/libtar/distinfo index 1dc9324ad07..d6a1204259f 100644 --- a/devel/libtar/distinfo +++ b/devel/libtar/distinfo @@ -1,6 +1,8 @@ -$NetBSD: distinfo,v 1.6 2005/10/31 20:44:57 tv Exp $ +$NetBSD: distinfo,v 1.7 2008/08/23 08:37:33 bjs Exp $ SHA1 (libtar-1.2.11.tar.gz) = 9611f23024b0e89aad1cfea301122186b3c160f8 RMD160 (libtar-1.2.11.tar.gz) = 205d1213ed32f9708fb2135010afdd9e184c430e Size (libtar-1.2.11.tar.gz) = 145354 bytes SHA1 (patch-aa) = c07f32034bb5e84b0b90ac5ab322e800036d5fde +SHA1 (patch-ab) = 881344e3ddcd4a85eadc86e833bcc02c78c89b84 +SHA1 (patch-ac) = 936a26e718d3b16369a00a5997a97c355524c7e4 diff --git a/devel/libtar/patches/patch-ab b/devel/libtar/patches/patch-ab new file mode 100644 index 00000000000..a44b4ede9bb --- /dev/null +++ b/devel/libtar/patches/patch-ab @@ -0,0 +1,33 @@ +$NetBSD: patch-ab,v 1.1 2008/08/23 08:37:33 bjs Exp $ + +--- lib/Makefile.in.orig 2002-12-15 13:02:30.000000000 -0500 ++++ lib/Makefile.in +@@ -69,13 +69,15 @@ all: ${ALL} + .PHONY: clean distclean install + + libtar.a: ${LIBTAR_OBJS} ${LIBOBJS} +- ${AR} rc libtar.a ${LIBTAR_OBJS} ${LIBOBJS} +- ${RANLIB} libtar.a ++ ${LIBTOOL} --mode=link --tag=CC \ ++ ${CC} -o libtar.la ${LIBTAR_OBJS:.o=.lo} ${LIBOBJS:.o=.lo} \ ++ ${LDFLAGS} -rpath ${PREFIX}/lib -version-info 1:2 + + ${LIBTAR_OBJS}: ${LIBTAR_HDRS} + + .c.o: +- ${CC} ${CFLAGS} ${CPPFLAGS} -c -o $@ $< ++ ${LIBTOOL} --mode=compile --tag=CC \ ++ ${CC} ${CFLAGS} ${CPPFLAGS} -c -o ${@:.o=.lo} $< -prefer-pic + + clean: + rm -f *~ *.o ${ALL} core +@@ -85,7 +86,8 @@ distclean: clean + + install: ${ALL} + ${MKDIR} ${DESTDIR}${libdir} +- ${INSTALL_DATA} libtar.a ${DESTDIR}${libdir} ++ ${LIBTOOL} --mode=install \ ++ ${BSD_INSTALL_LIB} libtar.la ${DESTDIR}${libdir} + ${MKDIR} ${DESTDIR}${includedir} + ${INSTALL_DATA} ${srcdir}/libtar.h ${DESTDIR}${includedir} + ${INSTALL_DATA} ../listhash/libtar_listhash.h ${DESTDIR}${includedir} diff --git a/devel/libtar/patches/patch-ac b/devel/libtar/patches/patch-ac new file mode 100644 index 00000000000..36ec419b9fd --- /dev/null +++ b/devel/libtar/patches/patch-ac @@ -0,0 +1,38 @@ +$NetBSD: patch-ac,v 1.1 2008/08/23 08:37:33 bjs Exp $ + +--- libtar/Makefile.in.orig 2002-12-15 13:02:30.000000000 -0500 ++++ libtar/Makefile.in +@@ -45,7 +45,7 @@ LIBTAR_HDRS = ../config.h \ + ${top_srcdir}/compat/compat.h \ + ${top_srcdir}/lib/libtar.h \ + ../listhash/libtar_listhash.h +-LIBTAR_LIBS = ../lib/libtar.a ++LIBTAR_LIBS = ../lib/libtar.la + ALL = libtar + + +@@ -54,12 +54,15 @@ all: ${ALL} + .PHONY: clean distclean install + + libtar: ${LIBTAR_OBJS} ${LIBTAR_LIBS} ${LIBTAR_HDRS} +- ${CC} ${CFLAGS} ${LDFLAGS} -o libtar libtar.o ${LIBTAR_LIBS} ${LIBS} ++ ${LIBTOOL} --mode=link --tag=CC \ ++ ${CC} ${CFLAGS} ${LDFLAGS} -o libtar libtar.lo \ ++ ${LIBTAR_LIBS} ${LIBS} + + ${LIBTAR_OBJS}: ${LIBTAR_HDRS} + + .c.o: +- ${CC} ${CFLAGS} ${CPPFLAGS} -c -o $@ $< ++ ${LIBTOOL} --mode=compile \ ++ ${CC} ${CFLAGS} ${CPPFLAGS} -c -o ${@:.o=.lo} $< -prefer-pic + + clean: + rm -f *~ *.o ${ALL} core +@@ -69,5 +72,5 @@ distclean: clean + + install: ${ALL} + ${MKDIR} ${DESTDIR}${bindir} +- ${INSTALL_PROGRAM} libtar ${DESTDIR}${bindir} ++ ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} libtar ${DESTDIR}${bindir} + |