diff options
-rw-r--r-- | textproc/catdoc-tk/Makefile | 4 | ||||
-rw-r--r-- | textproc/catdoc/Makefile.common | 4 | ||||
-rw-r--r-- | textproc/chasen-base/Makefile | 4 | ||||
-rw-r--r-- | textproc/chasen/buildlink2.mk | 20 | ||||
-rw-r--r-- | textproc/chasen/buildlink3.mk | 20 | ||||
-rw-r--r-- | textproc/expatobjc/Makefile | 6 | ||||
-rw-r--r-- | textproc/kdoc/Makefile | 6 | ||||
-rw-r--r-- | textproc/p5-Text-ChaSen/Makefile | 6 | ||||
-rw-r--r-- | textproc/postgresql-autodoc/Makefile | 4 |
9 files changed, 37 insertions, 37 deletions
diff --git a/textproc/catdoc-tk/Makefile b/textproc/catdoc-tk/Makefile index a3f8ab118c9..05be5b35b4f 100644 --- a/textproc/catdoc-tk/Makefile +++ b/textproc/catdoc-tk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2004/03/08 20:27:16 minskim Exp $ +# $NetBSD: Makefile,v 1.3 2004/05/05 00:28:50 snj Exp $ # .include "../../textproc/catdoc/Makefile.common" @@ -17,5 +17,5 @@ CONFIGURE_ENV+= enable_wordview=yes do-install: ${INSTALL_SCRIPT} ${WRKSRC}/src/wordview ${PREFIX}/bin/wordview -.include "../../x11/tk83/buildlink2.mk" +.include "../../x11/tk83/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/catdoc/Makefile.common b/textproc/catdoc/Makefile.common index 523e64a9f8c..0e1c419ceb9 100644 --- a/textproc/catdoc/Makefile.common +++ b/textproc/catdoc/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.2 2004/01/20 12:26:49 agc Exp $ +# $NetBSD: Makefile.common,v 1.3 2004/05/05 00:28:50 snj Exp $ # DISTNAME= catdoc-0.91.4 @@ -13,7 +13,7 @@ DISTINFO_FILE= ${.CURDIR}/../../textproc/catdoc/distinfo PATCHDIR= ${.CURDIR}/../../textproc/catdoc/patches WRKSRC= ${WRKDIR}/catdoc -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --libdir=${PREFIX}/share diff --git a/textproc/chasen-base/Makefile b/textproc/chasen-base/Makefile index 939d4bc4ed2..7554e5bf92c 100644 --- a/textproc/chasen-base/Makefile +++ b/textproc/chasen-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2003/07/17 22:54:11 grant Exp $ +# $NetBSD: Makefile,v 1.5 2004/05/05 00:28:50 snj Exp $ # DISTNAME= chasen-${CHASEN_VERSION} @@ -16,7 +16,7 @@ COMMENT= ChaSen, Japanese Morphological Analysis System GNU_CONFIGURE= yes USE_LIBTOOL= yes -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes USE_PKGINSTALL= yes OWN_DIRS= ${CHASEN_DICDIR} diff --git a/textproc/chasen/buildlink2.mk b/textproc/chasen/buildlink2.mk deleted file mode 100644 index d1eb463224e..00000000000 --- a/textproc/chasen/buildlink2.mk +++ /dev/null @@ -1,20 +0,0 @@ -# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:24 jlam Exp $ - -.if !defined(CHASEN_BUILDLINK2_MK) -CHASEN_BUILDLINK2_MK= # defined - -BUILDLINK_PACKAGES+= chasen -BUILDLINK_DEPENDS.chasen?= chasen>=2.0 -BUILDLINK_PKGSRCDIR.chasen?= ../../textproc/chasen - -EVAL_PREFIX+= BUILDLINK_PREFIX.chasen=chasen -BUILDLINK_PREFIX.chasen_DEFAULT= ${LOCALBASE} - -BUILDLINK_FILES.chasen= include/chasen.h -BUILDLINK_FILES.chasen+= lib/libchasen.* - -BUILDLINK_TARGETS+= chasen-buildlink - -chasen-buildlink: _BUILDLINK_USE - -.endif # CHASEN_BUILDLINK2_MK diff --git a/textproc/chasen/buildlink3.mk b/textproc/chasen/buildlink3.mk new file mode 100644 index 00000000000..4dd29740836 --- /dev/null +++ b/textproc/chasen/buildlink3.mk @@ -0,0 +1,20 @@ +# $NetBSD: buildlink3.mk,v 1.1 2004/05/05 00:28:50 snj Exp $ + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +CHASEN_BUILDLINK3_MK:= ${CHASEN_BUILDLINK3_MK}+ + +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= chasen +.endif + +BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nchasen} +BUILDLINK_PACKAGES+= chasen + +.if !empty(CHASEN_BUILDLINK3_MK:M+) +BUILDLINK_DEPENDS.chasen+= chasen>=2.0 +BUILDLINK_PKGSRCDIR.chasen?= ../../textproc/chasen +BUILDLINK_FILES.chasen= include/chasen.h +BUILDLINK_FILES.chasen+= lib/libchasen.* +.endif # CHASEN_BUILDLINK3_MK + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/textproc/expatobjc/Makefile b/textproc/expatobjc/Makefile index e3e13a76b3b..d27529b5299 100644 --- a/textproc/expatobjc/Makefile +++ b/textproc/expatobjc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2004/01/24 15:13:19 grant Exp $ +# $NetBSD: Makefile,v 1.6 2004/05/05 00:28:50 snj Exp $ # DISTNAME= expatobjc-1.0 @@ -10,12 +10,12 @@ MAINTAINER= rh@NetBSD.org HOMEPAGE= http://expatobjc.sourceforge.net/ COMMENT= Objective-C Wrapper for Expat -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes USE_PKGLOCALEDIR= yes USE_GNU_TOOLS+= make GNU_CONFIGURE= yes CONFIGURE_ENV+= objc_works=yes -.include "../../textproc/expat/buildlink2.mk" +.include "../../textproc/expat/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/kdoc/Makefile b/textproc/kdoc/Makefile index 4a93b70c03c..1a885dfbe52 100644 --- a/textproc/kdoc/Makefile +++ b/textproc/kdoc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2003/07/30 15:45:39 markd Exp $ +# $NetBSD: Makefile,v 1.16 2004/05/05 00:28:50 snj Exp $ DISTNAME= kdoc-2.0a54 PKGNAME= kdoc-3.0 @@ -14,7 +14,7 @@ COMMENT= C++ and IDL Class Documentation Tool .include "../../meta-pkgs/kde3/Makefile.kde3" -USE_BUILDLINK2= # defined +USE_BUILDLINK3= # defined -.include "../../lang/perl5/buildlink2.mk" +.include "../../lang/perl5/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/p5-Text-ChaSen/Makefile b/textproc/p5-Text-ChaSen/Makefile index e6e2c440212..43a9d9789dc 100644 --- a/textproc/p5-Text-ChaSen/Makefile +++ b/textproc/p5-Text-ChaSen/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2003/07/21 17:27:41 martti Exp $ +# $NetBSD: Makefile,v 1.5 2004/05/05 00:28:50 snj Exp $ DISTNAME= Text-ChaSen-1.03 PKGNAME= p5-${DISTNAME} @@ -14,9 +14,9 @@ MAINTAINER= kei@NetBSD.org HOMEPAGE= http://www.daionet.gr.jp/~knok/chasen/ COMMENT= Perl5 module to use ChaSen -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Text/ChaSen/.packlist -.include "../../textproc/chasen/buildlink2.mk" +.include "../../textproc/chasen/buildlink3.mk" .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/postgresql-autodoc/Makefile b/textproc/postgresql-autodoc/Makefile index 387484c623b..abe191f21bd 100644 --- a/textproc/postgresql-autodoc/Makefile +++ b/textproc/postgresql-autodoc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2004/03/26 02:27:55 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2004/05/05 00:28:50 snj Exp $ # DISTNAME= postgresql_autodoc-1.21 @@ -16,7 +16,7 @@ DEPENDS+= p5-HTML-Template-[0-9]*:../../www/p5-HTML-Template WRKSRC= ${WRKDIR}/postgresql_autodoc USE_PERL5= yes USE_GNU_TOOLS+= make -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --datadir=${PREFIX}/share/${PKGBASE} |