diff options
| author | jlam <jlam> | 2002-08-25 19:43:33 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2002-08-25 19:43:33 +0000 |
| commit | 7bbcecd0e8cca65a7e685fb087e4611039d894f6 (patch) | |
| tree | f3dd80b594e158134a545b6d04e86e6bc9bb1047 /pkgtools | |
| parent | 8143973602fc355819a98442e2ce9a90814e37af (diff) | |
| download | pkgsrc-7bbcecd0e8cca65a7e685fb087e4611039d894f6.tar.gz | |
Revert previous change now that the buildlink2.mk files have hit the main
trunk. These packages can now safely use buildlink2.mk files.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkgdiff/Makefile | 6 | ||||
| -rw-r--r-- | pkgtools/rpm2pkg/Makefile | 17 | ||||
| -rw-r--r-- | pkgtools/x11-links/Makefile | 6 |
3 files changed, 16 insertions, 13 deletions
diff --git a/pkgtools/pkgdiff/Makefile b/pkgtools/pkgdiff/Makefile index c8220834ea5..a512cc259f5 100644 --- a/pkgtools/pkgdiff/Makefile +++ b/pkgtools/pkgdiff/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2002/08/23 14:32:13 abs Exp $ +# $NetBSD: Makefile,v 1.28 2002/08/25 19:43:33 jlam Exp $ # DISTNAME= pkgdiff-0.106 @@ -11,7 +11,6 @@ HOMEPAGE= ftp://ftp.netbsd.org/pub/NetBSD/packages/pkgsrc/Packages.txt COMMENT= Tools to ease creating and maintaining patches for pkgsrc PERL5_REQD= 5.6.0 -USE_PERL5= YES EXTRACT_ONLY= # empty WRKSRC= ${WRKDIR} @@ -19,6 +18,8 @@ NO_CHECKSUM= yes NO_PATCH= yes NO_CONFIGURE= yes +USE_BUILDLINK2= yes + MAKE_ENV= PKGSRCDIR=${_PKGSRCDIR} .include "../../mk/bsd.prefs.mk" @@ -58,4 +59,5 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/${FILE}.1 ${PREFIX}/man/man1 .endfor +.include "../../lang/perl5/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/pkgtools/rpm2pkg/Makefile b/pkgtools/rpm2pkg/Makefile index 3bd235fe95f..2ed0fbe972a 100644 --- a/pkgtools/rpm2pkg/Makefile +++ b/pkgtools/rpm2pkg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2002/08/23 14:28:43 abs Exp $ +# $NetBSD: Makefile,v 1.13 2002/08/25 19:43:33 jlam Exp $ DISTNAME= rpm2pkg-1.2 CATEGORIES= pkgtools @@ -11,9 +11,9 @@ COMMENT= Convert RPM archives to NetBSD packages CONFLICTS+= suse-base<=6.4 -USE_BUILDLINK_ONLY= YES -NO_CHECKSUM= YES -WRKSRC= ${WRKDIR} +USE_BUILDLINK2= YES +NO_CHECKSUM= YES +WRKSRC= ${WRKDIR} RPMLIB= ${BUILDLINK_DIR}/lib/librpm.a @@ -21,13 +21,14 @@ CFLAGS+= -I${BUILDLINK_DIR}/include/rpm LIBS= ${RPMLIB} -lintl -lz do-build: - ${CC} ${FILESDIR}/rpm2pkg.c ${CFLAGS} ${LDFLAGS} ${LIBS} \ - -o ${WRKSRC}/rpm2pkg + ${BUILDLINK_CC} ${FILESDIR}/rpm2pkg.c \ + ${CFLAGS} ${LDFLAGS} ${LIBS} -o ${WRKSRC}/rpm2pkg do-install: ${INSTALL_PROGRAM} ${WRKSRC}/rpm2pkg ${PREFIX}/sbin ${INSTALL_MAN} ${FILESDIR}/rpm2pkg.8 ${PREFIX}/man/man8 -.include "../../devel/zlib/buildlink.mk" -.include "../../misc/rpm/buildlink.mk" +.include "../../devel/zlib/buildlink2.mk" +.include "../../misc/rpm/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile index 83d04b3e28c..a55990ea595 100644 --- a/pkgtools/x11-links/Makefile +++ b/pkgtools/x11-links/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2002/08/23 14:27:14 abs Exp $ +# $NetBSD: Makefile,v 1.15 2002/08/25 19:43:33 jlam Exp $ # # NOTE: If you update this package, then you'll likely need to also update # the x11-links dependency in x11.buildlink.mk to the correct version, @@ -42,8 +42,8 @@ do-install: ${ECHO} "@unexec ${RM} -rf %D/${BUILDLINK_X11_SUBDIR}" >> ${PLIST_SRC} .if !empty(X11BASE:M*openwin) -. include "openwin.buildlink.mk" +. include "openwin.buildlink2.mk" .else -. include "xfree.buildlink.mk" +. include "xfree.buildlink2.mk" .endif .include "../../mk/bsd.pkg.mk" |