diff options
| author | jlam <jlam@pkgsrc.org> | 2002-11-01 08:48:26 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-11-01 08:48:26 +0000 |
| commit | 2175fc23b88cf29c5d352b642fa5f037404a0588 (patch) | |
| tree | ecd52950833c2d40fe6edcb69c02d16e06d582f2 /archivers | |
| parent | 3ea1f6abe7f92b29f86018227c8db15b821d4c84 (diff) | |
| download | pkgsrc-2175fc23b88cf29c5d352b642fa5f037404a0588.tar.gz | |
buildlink1 -> buildlink2
Diffstat (limited to 'archivers')
| -rw-r--r-- | archivers/jamjar/Makefile | 21 | ||||
| -rw-r--r-- | archivers/jamjar/distinfo | 4 | ||||
| -rw-r--r-- | archivers/jamjar/patches/patch-aa | 4 |
3 files changed, 16 insertions, 13 deletions
diff --git a/archivers/jamjar/Makefile b/archivers/jamjar/Makefile index 3b5d7fd0768..b42055e7433 100644 --- a/archivers/jamjar/Makefile +++ b/archivers/jamjar/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2002/08/22 17:31:03 skrll Exp $ +# $NetBSD: Makefile,v 1.3 2002/11/01 08:48:26 jlam Exp $ # DISTNAME= jamjar-0.6 @@ -11,18 +11,21 @@ COMMENT= Acunia version of the jar archiver. BUILD_DEPENDS+= acunia-jam>=1.0:../../devel/acunia-jam +USE_BUILDLINK2= YES WRKSRC= ${WRKDIR}/jamjar -do-build: - cd ${WRKSRC} && \ - ${PREFIX}/bin/jam \ - -sPREFIX="${PREFIX}" \ +JAM_COMMAND= \ + cd ${WRKSRC} && \ + ${SETENV} ${MAKE_ENV} \ + ${LOCALBASE}/bin/jam \ + -sPREFIX="${PREFIX}" \ -sCFLAGS="${CFLAGS}" +do-build: + ${JAM_COMMAND} + do-install: - cd ${WRKSRC} && \ - ${PREFIX}/bin/jam \ - -sPREFIX="${PREFIX}" \ - -sCFLAGS="${CFLAGS}" install + ${JAM_COMMAND} install +.include "../../devel/zlib/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/archivers/jamjar/distinfo b/archivers/jamjar/distinfo index ecb7a1b30b6..ea59c26b56a 100644 --- a/archivers/jamjar/distinfo +++ b/archivers/jamjar/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/08/22 17:25:07 skrll Exp $ +$NetBSD: distinfo,v 1.2 2002/11/01 08:48:26 jlam Exp $ SHA1 (jamjar-0.6.tar.gz) = 3cc58c25add175382e9022648590600db12f689a Size (jamjar-0.6.tar.gz) = 231879 bytes -SHA1 (patch-aa) = e4bcf0c19a12fa4d7cd6e14633e728c6a2275403 +SHA1 (patch-aa) = 9db8bef4191f3b1d82862ab7a1ed42977499a28e diff --git a/archivers/jamjar/patches/patch-aa b/archivers/jamjar/patches/patch-aa index ba276dda1d3..c3dd3116618 100644 --- a/archivers/jamjar/patches/patch-aa +++ b/archivers/jamjar/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/08/22 17:25:07 skrll Exp $ +$NetBSD: patch-aa,v 1.2 2002/11/01 08:48:27 jlam Exp $ --- Jamfile.orig Fri Aug 31 23:06:53 2001 +++ Jamfile @@ -16,6 +16,6 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/08/22 17:25:07 skrll Exp $ Main jamjar : jamjar.c class.c zip.c resource.c argument.c meta.c ; -LINKLIBS = /usr/lib/libz.a ; -+LINKLIBS = -lz ; ++LINKLIBS = $(LDFLAGS) -lz ; if $(BINDIR) { |