diff options
| author | agc <agc@pkgsrc.org> | 2003-07-24 08:42:29 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 2003-07-24 08:42:29 +0000 |
| commit | 6a41393e05c097717ada9ef3907b794616159e63 (patch) | |
| tree | afb77a2da0f24aed804ee31834944f130d06589f /misc | |
| parent | 04dd0e805063f2610bc4f74d691f915d9f18e12f (diff) | |
| download | pkgsrc-6a41393e05c097717ada9ef3907b794616159e63.tar.gz | |
Attempt to be slightly more portable by using libtool to create the shared
object and install it.
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/dirdiff/Makefile | 4 | ||||
| -rw-r--r-- | misc/dirdiff/PLIST | 6 | ||||
| -rw-r--r-- | misc/dirdiff/distinfo | 4 | ||||
| -rw-r--r-- | misc/dirdiff/patches/patch-aa | 24 |
4 files changed, 31 insertions, 7 deletions
diff --git a/misc/dirdiff/Makefile b/misc/dirdiff/Makefile index 27137146c8e..2f4ff9bd98f 100644 --- a/misc/dirdiff/Makefile +++ b/misc/dirdiff/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2003/07/24 07:08:20 agc Exp $ +# $NetBSD: Makefile,v 1.2 2003/07/24 08:42:29 agc Exp $ # DISTNAME= dirdiff-1.6 @@ -10,6 +10,8 @@ HOMEPAGE= http://samba.org/ftp/paulus/ COMMENT= Displays differences between directories USE_BUILDLINK2= yes +USE_LIBTOOL= yes +LIBTOOL_OVERRIDE= ${WRKSRC}/libtool .include "../../x11/tk/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/dirdiff/PLIST b/misc/dirdiff/PLIST index 529e3da6165..a355efddf9b 100644 --- a/misc/dirdiff/PLIST +++ b/misc/dirdiff/PLIST @@ -1,3 +1,7 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2003/07/24 07:08:20 agc Exp $ +@comment $NetBSD: PLIST,v 1.2 2003/07/24 08:42:29 agc Exp $ bin/dirdiff +lib/libfilecmp.a +lib/libfilecmp.la +lib/libfilecmp.so +lib/libfilecmp.so.0 lib/libfilecmp.so.0.0 diff --git a/misc/dirdiff/distinfo b/misc/dirdiff/distinfo index 013a9399b45..74331487970 100644 --- a/misc/dirdiff/distinfo +++ b/misc/dirdiff/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2003/07/24 07:08:20 agc Exp $ +$NetBSD: distinfo,v 1.2 2003/07/24 08:42:29 agc Exp $ SHA1 (dirdiff-1.6.tar.gz) = b06003909ef50d4668660f3db4ba703ac17c4f14 Size (dirdiff-1.6.tar.gz) = 27965 bytes -SHA1 (patch-aa) = 5414ea8dfcd7509c1c76b2e7e33f5aca14a62435 +SHA1 (patch-aa) = 3d82bc63fe30b8c4eed2a84571d56f769d93a56a diff --git a/misc/dirdiff/patches/patch-aa b/misc/dirdiff/patches/patch-aa index 3bd242d7b94..86faee97255 100644 --- a/misc/dirdiff/patches/patch-aa +++ b/misc/dirdiff/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.1.1.1 2003/07/24 07:08:20 agc Exp $ +$NetBSD: patch-aa,v 1.2 2003/07/24 08:42:30 agc Exp $ --- Makefile 2003/07/24 07:02:17 1.1 +++ Makefile 2003/07/24 07:03:14 -@@ -2,12 +2,12 @@ +@@ -2,21 +2,25 @@ # # In fact all we have to make is the libfilecmp.so.0.0 library. @@ -16,5 +16,23 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/07/24 07:08:20 agc Exp $ -CFLAGS=-O3 -I/usr/include/tcl8.3/ -I/usr/include/tcl +CFLAGS=-O3 -I${PREFIX}/include - all: libfilecmp.so.0.0 +-all: libfilecmp.so.0.0 ++LIBS= libfilecmp.a ++OBJS= filecmp.o +-libfilecmp.so.0.0: filecmp.c +- $(CC) $(CFLAGS) -shared -o $@ filecmp.c ++all: ${LIBS} + +-install: dirdiff libfilecmp.so.0.0 ++${LIBS}: filecmp.c ++ ${LIBTOOL} --mode=compile ${CC} ${CFLAGS} -c filecmp.c ++ ${LIBTOOL} --mode=link ${CC} -o ${.TARGET:.a=.la} ${OBJS:.o=.lo} -rpath ${PREFIX}/lib -version-info 0:0 ++ ++install: dirdiff ${LIBS} + $(INSTALL) -c dirdiff $(BINDIR) +- $(INSTALL) -c libfilecmp.so.0.0 $(LIBDIR) ++ ${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} ${LIBS:.a=.la} ${LIBDIR} + + clean: + rm -f libfilecmp.so.0.0 |