diff options
-rw-r--r-- | editors/sam/Makefile | 6 | ||||
-rw-r--r-- | editors/ssam/Makefile | 6 | ||||
-rw-r--r-- | editors/vile/Makefile | 8 | ||||
-rw-r--r-- | misc/libutf/Makefile | 3 | ||||
-rw-r--r-- | misc/libutf/buildlink3.mk | 18 |
5 files changed, 30 insertions, 11 deletions
diff --git a/editors/sam/Makefile b/editors/sam/Makefile index b7e31a5693b..0f19e713d8a 100644 --- a/editors/sam/Makefile +++ b/editors/sam/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.25 2004/01/20 12:14:05 agc Exp $ +# $NetBSD: Makefile,v 1.26 2004/04/12 11:17:15 xtraeme Exp $ # FreeBSD Id: Makefile,v 1.3 1996/11/12 02:19:40 obrien Exp # DISTNAME= sam PKGNAME= sam-4.3 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= editors plan9 MASTER_SITES= ftp://ftp.ecf.toronto.edu/pub/plan9/matty/ EXTRACT_SUFX= .msg.gz @@ -18,7 +18,7 @@ WRKSRC= ${WRKDIR} EXTRACT_CMD= ${GZCAT} ${DOWNLOADED_DISTFILE} | ${SH} MANCOMPRESSED= yes -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes USE_X11BASE= yes MAKE_ENV+= X11PREFIX=${X11PREFIX} diff --git a/editors/ssam/Makefile b/editors/ssam/Makefile index a1f28ab1193..b7bd012c3b4 100644 --- a/editors/ssam/Makefile +++ b/editors/ssam/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2003/07/17 21:34:49 grant Exp $ +# $NetBSD: Makefile,v 1.12 2004/04/12 11:19:47 xtraeme Exp $ # DISTNAME= ssam-1.9 @@ -11,7 +11,7 @@ COMMENT= UTF-8-aware stream editor like sed(1), using the sam command set GNU_CONFIGURE= yes ALL_TARGET= tst -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes -.include "../../misc/libutf/buildlink2.mk" +.include "../../misc/libutf/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/vile/Makefile b/editors/vile/Makefile index 58c6b80e5c9..cff0b2ca720 100644 --- a/editors/vile/Makefile +++ b/editors/vile/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2003/09/28 09:13:56 jlam Exp $ +# $NetBSD: Makefile,v 1.36 2004/04/12 11:22:46 xtraeme Exp $ # FreeBSD Id: Makefile,v 1.13 1997/09/06 19:55:09 gj Exp DISTNAME= vile-9.4 @@ -11,7 +11,7 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://dickey.his.com/vile/vile.html COMMENT= VI Like Emacs. a vi "workalike", with many additional features -USE_BUILDLINK2= # defined +USE_BUILDLINK3= yes GNU_CONFIGURE= # defined CONFIGURE_ARGS+= --with-perl CONFIGURE_ARGS+= --datadir=${DATADIR} @@ -37,6 +37,6 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/$$f ${EGDIR}; \ done -.include "../../devel/ncurses/buildlink2.mk" -.include "../../lang/perl5/buildlink2.mk" +.include "../../devel/ncurses/buildlink3.mk" +.include "../../lang/perl5/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/libutf/Makefile b/misc/libutf/Makefile index 11426096f0e..708fdff4d22 100644 --- a/misc/libutf/Makefile +++ b/misc/libutf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2003/07/17 21:49:25 grant Exp $ +# $NetBSD: Makefile,v 1.13 2004/04/12 11:19:12 xtraeme Exp $ # DISTNAME= libutf-2.10 @@ -14,6 +14,7 @@ USE_PKGINSTALL= yes GNU_CONFIGURE= yes USE_LIBTOOL= yes ALL_TARGET= tst +USE_BUILDLINK3= yes CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} diff --git a/misc/libutf/buildlink3.mk b/misc/libutf/buildlink3.mk new file mode 100644 index 00000000000..0dfe5fcb02b --- /dev/null +++ b/misc/libutf/buildlink3.mk @@ -0,0 +1,18 @@ +# $NetBSD: buildlink3.mk,v 1.1 2004/04/12 11:19:12 xtraeme Exp $ + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +LIBUTF_BUILDLINK3_MK:= ${LIBUTF_BUILDLINK3_MK}+ + +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= libutf +.endif + +BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibutf} +BUILDLINK_PACKAGES+= libutf + +.if !empty(LIBUTF_BUILDLINK3_MK:M+) +BUILDLINK_DEPENDS.libutf+= libutf>=2.10nb1 +BUILDLINK_PKGSRCDIR.libutf?= ../../misc/libutf +.endif # LIBUTF_BUILDLINK3_MK + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} |