diff options
33 files changed, 219 insertions, 100 deletions
diff --git a/graphics/gnome2-pixmaps/Makefile b/graphics/gnome2-pixmaps/Makefile index 617abf24a5c..1fd8e92df17 100644 --- a/graphics/gnome2-pixmaps/Makefile +++ b/graphics/gnome2-pixmaps/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2003/12/14 22:10:53 xtraeme Exp $ +# $NetBSD: Makefile,v 1.13 2004/02/11 04:40:49 xtraeme Exp $ # DISTNAME= gnome-desktop-2.4.1.1 @@ -20,7 +20,7 @@ CONFLICTS+= gnome-pixmaps-[0-9]* CONFLICTS+= gnome-pixmaps-2.0.8 .endif -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES USE_X11= YES NO_CONFIGURE= YES NO_BUILD= YES diff --git a/graphics/gnome2-pixmaps/buildlink3.mk b/graphics/gnome2-pixmaps/buildlink3.mk new file mode 100644 index 00000000000..c7e2f8c6444 --- /dev/null +++ b/graphics/gnome2-pixmaps/buildlink3.mk @@ -0,0 +1,22 @@ +# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 04:40:49 xtraeme Exp $ +# +# This Makefile fragment is included by packages that use gnome2-pixmaps. +# +# This file was created automatically using createbuildlink-3.1. +# + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +GNOME2_PIXMAPS_BUILDLINK3_MK:= ${GNOME2_PIXMAPS_BUILDLINK3_MK}+ + +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= gnome2-pixmaps +.endif + +.if !empty(GNOME2_PIXMAPS_BUILDLINK3_MK:M+) +BUILDLINK_PACKAGES+= gnome2-pixmaps +BUILDLINK_DEPENDS.gnome2-pixmaps+= gnome2-pixmaps>=2.4.1.1 +BUILDLINK_PKGSRCDIR.gnome2-pixmaps?= ../../graphics/gnome2-pixmaps + +.endif # GNOME2_PIXMAPS_BUILDLINK3_MK + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile index 65d73150701..c38d1fbdf46 100644 --- a/mail/balsa2/Makefile +++ b/mail/balsa2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2004/02/11 04:02:48 xtraeme Exp $ +# $NetBSD: Makefile,v 1.20 2004/02/11 04:36:58 xtraeme Exp $ # DISTNAME= balsa-2.0.16 @@ -16,7 +16,7 @@ BUILD_USES_MSGFMT= yes USE_PERL5= build USE_PKGINSTALL= yes -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes LIBTOOL_OVERRIDE= ${WRKSRC}/libtool @@ -36,20 +36,21 @@ CONF_FILES+= ${EGDIR}/${cnf} ${PKG_SYSCONFDIR}/sound/events/${cnf} .if defined(USE_OPENLDAP) && ${USE_OPENLDAP} == YES CONFIGURE_ARGS+= --enable-ldap -.include "../../databases/openldap/buildlink2.mk" +.include "../../databases/openldap/buildlink3.mk" .endif -.include "../../security/gpgme/buildlink2.mk" -.include "../../devel/pcre/buildlink2.mk" -.include "../../devel/glib2/buildlink2.mk" -.include "../../devel/libgnomeui/buildlink2.mk" -.include "../../devel/gettext-lib/buildlink2.mk" -.include "../../sysutils/gnome-vfs2/buildlink2.mk" -.include "../../print/libgnomeprintui/buildlink2.mk" -.include "../../security/openssl/buildlink2.mk" -.include "../../textproc/aspell/buildlink2.mk" +.include "../../security/gpgme/buildlink3.mk" +.include "../../devel/pcre/buildlink3.mk" +.include "../../devel/glib2/buildlink3.mk" +.include "../../devel/libgnomeui/buildlink3.mk" +.include "../../devel/libtool/buildlink3.mk" +.include "../../devel/gettext-lib/buildlink3.mk" +.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../print/libgnomeprintui/buildlink3.mk" +.include "../../security/openssl/buildlink3.mk" +.include "../../textproc/aspell/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" -.include "../../www/gtkhtml3/buildlink2.mk" -.include "../../mail/libesmtp/buildlink2.mk" -.include "../../mk/pthread.buildlink2.mk" +.include "../../www/gtkhtml3/buildlink3.mk" +.include "../../mail/libesmtp/buildlink3.mk" +.include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/aspell-breton/Makefile b/textproc/aspell-breton/Makefile index 3349cfb86e5..84fc2fccf92 100644 --- a/textproc/aspell-breton/Makefile +++ b/textproc/aspell-breton/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/07/17 22:54:01 grant Exp $ +# $NetBSD: Makefile,v 1.7 2004/02/11 04:35:20 xtraeme Exp $ # DISTNAME= aspell-br-0.50-2 @@ -12,11 +12,11 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://aspell.net/ COMMENT= Breton language support for aspell -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES HAS_CONFIGURE= YES CONFIGURE_ENV+= ASPELL=${PREFIX}/bin/aspell CONFIGURE_ENV+= WORD_LIST_COMPRESS=${PREFIX}/bin/word-list-compress -.include "../../textproc/aspell/buildlink2.mk" +.include "../../textproc/aspell/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/aspell-catalan/Makefile b/textproc/aspell-catalan/Makefile index 5c5122cd048..e01d8de306f 100644 --- a/textproc/aspell-catalan/Makefile +++ b/textproc/aspell-catalan/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/07/17 22:54:01 grant Exp $ +# $NetBSD: Makefile,v 1.7 2004/02/11 04:35:20 xtraeme Exp $ # DISTNAME= aspell-ca-0.50-2 @@ -12,11 +12,11 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://aspell.net/ COMMENT= Catalan language support for aspell -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES HAS_CONFIGURE= YES CONFIGURE_ENV+= ASPELL=${PREFIX}/bin/aspell CONFIGURE_ENV+= WORD_LIST_COMPRESS=${PREFIX}/bin/word-list-compress -.include "../../textproc/aspell/buildlink2.mk" +.include "../../textproc/aspell/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/aspell-czech/Makefile b/textproc/aspell-czech/Makefile index f0e6a34ee1c..55f43625f98 100644 --- a/textproc/aspell-czech/Makefile +++ b/textproc/aspell-czech/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/07/17 22:54:02 grant Exp $ +# $NetBSD: Makefile,v 1.7 2004/02/11 04:35:20 xtraeme Exp $ # DISTNAME= aspell-cs-0.50-2 @@ -12,11 +12,11 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://aspell.net/ COMMENT= Czech language support for aspell -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES HAS_CONFIGURE= YES CONFIGURE_ENV+= ASPELL=${PREFIX}/bin/aspell CONFIGURE_ENV+= WORD_LIST_COMPRESS=${PREFIX}/bin/word-list-compress -.include "../../textproc/aspell/buildlink2.mk" +.include "../../textproc/aspell/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/aspell-danish/Makefile b/textproc/aspell-danish/Makefile index 8050dfc0e50..09f85975cdc 100644 --- a/textproc/aspell-danish/Makefile +++ b/textproc/aspell-danish/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/07/17 22:54:02 grant Exp $ +# $NetBSD: Makefile,v 1.7 2004/02/11 04:35:20 xtraeme Exp $ # DISTNAME= aspell-da-0.50-2 @@ -12,11 +12,11 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://aspell.net/ COMMENT= Danish language support for aspell -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES HAS_CONFIGURE= YES CONFIGURE_ENV+= ASPELL=${PREFIX}/bin/aspell CONFIGURE_ENV+= WORD_LIST_COMPRESS=${PREFIX}/bin/word-list-compress -.include "../../textproc/aspell/buildlink2.mk" +.include "../../textproc/aspell/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/aspell-dutch/Makefile b/textproc/aspell-dutch/Makefile index 48cbf76cf5a..440e7e3e9ea 100644 --- a/textproc/aspell-dutch/Makefile +++ b/textproc/aspell-dutch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/07/17 22:54:02 grant Exp $ +# $NetBSD: Makefile,v 1.7 2004/02/11 04:35:20 xtraeme Exp $ # DISTNAME= aspell-nl-0.50-2 @@ -12,11 +12,11 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://aspell.net/ COMMENT= Dutch language support for aspell -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES HAS_CONFIGURE= YES CONFIGURE_ENV+= ASPELL=${PREFIX}/bin/aspell CONFIGURE_ENV+= WORD_LIST_COMPRESS=${PREFIX}/bin/word-list-compress -.include "../../textproc/aspell/buildlink2.mk" +.include "../../textproc/aspell/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/aspell-english/Makefile b/textproc/aspell-english/Makefile index 279176ad7a6..4a55803021d 100644 --- a/textproc/aspell-english/Makefile +++ b/textproc/aspell-english/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/07/17 22:54:03 grant Exp $ +# $NetBSD: Makefile,v 1.7 2004/02/11 04:35:20 xtraeme Exp $ # DISTNAME= aspell-en-0.51-0 @@ -12,11 +12,11 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://aspell.net/ COMMENT= English language support for aspell -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES HAS_CONFIGURE= YES CONFIGURE_ENV+= ASPELL=${PREFIX}/bin/aspell CONFIGURE_ENV+= WORD_LIST_COMPRESS=${PREFIX}/bin/word-list-compress -.include "../../textproc/aspell/buildlink2.mk" +.include "../../textproc/aspell/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/aspell-esperanto/Makefile b/textproc/aspell-esperanto/Makefile index 254bd1778a2..80579e688a9 100644 --- a/textproc/aspell-esperanto/Makefile +++ b/textproc/aspell-esperanto/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/07/17 22:54:04 grant Exp $ +# $NetBSD: Makefile,v 1.7 2004/02/11 04:35:20 xtraeme Exp $ # DISTNAME= aspell-eo-0.50-2 @@ -12,11 +12,11 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://aspell.net/ COMMENT= Esperanto language support for aspell -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES HAS_CONFIGURE= YES CONFIGURE_ENV+= ASPELL=${PREFIX}/bin/aspell CONFIGURE_ENV+= WORD_LIST_COMPRESS=${PREFIX}/bin/word-list-compress -.include "../../textproc/aspell/buildlink2.mk" +.include "../../textproc/aspell/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/aspell-faroese/Makefile b/textproc/aspell-faroese/Makefile index 5a649debfe3..32b0d9d5774 100644 --- a/textproc/aspell-faroese/Makefile +++ b/textproc/aspell-faroese/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/07/17 22:54:05 grant Exp $ +# $NetBSD: Makefile,v 1.7 2004/02/11 04:35:20 xtraeme Exp $ # DISTNAME= aspell-fo-0.50-2 @@ -12,11 +12,11 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://aspell.net/ COMMENT= Faroese language support for aspell -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES HAS_CONFIGURE= YES CONFIGURE_ENV+= ASPELL=${PREFIX}/bin/aspell CONFIGURE_ENV+= WORD_LIST_COMPRESS=${PREFIX}/bin/word-list-compress -.include "../../textproc/aspell/buildlink2.mk" +.include "../../textproc/aspell/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/aspell-francais/Makefile b/textproc/aspell-francais/Makefile index f54541e67d3..56983e8b2f3 100644 --- a/textproc/aspell-francais/Makefile +++ b/textproc/aspell-francais/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/07/17 22:54:05 grant Exp $ +# $NetBSD: Makefile,v 1.7 2004/02/11 04:35:20 xtraeme Exp $ # DISTNAME= aspell-fr-0.50-3 @@ -12,11 +12,11 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://aspell.net/ COMMENT= French language support for aspell -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES HAS_CONFIGURE= YES CONFIGURE_ENV+= ASPELL=${PREFIX}/bin/aspell CONFIGURE_ENV+= WORD_LIST_COMPRESS=${PREFIX}/bin/word-list-compress -.include "../../textproc/aspell/buildlink2.mk" +.include "../../textproc/aspell/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/aspell-gaeilge/Makefile b/textproc/aspell-gaeilge/Makefile index 9f789da5276..9754cfff753 100644 --- a/textproc/aspell-gaeilge/Makefile +++ b/textproc/aspell-gaeilge/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2003/07/17 22:54:05 grant Exp $ +# $NetBSD: Makefile,v 1.8 2004/02/11 04:35:20 xtraeme Exp $ DISTNAME= aspell-gaeilge-2.0 PKGREVISION= 3 @@ -9,7 +9,7 @@ MAINTAINER= jschauma@NetBSD.org HOMEPAGE= http://borel.slu.edu/~kps/ispell/ COMMENT= Irish language support for aspell -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES ASPELLDATA= ${PREFIX}/share/aspell/ @@ -18,5 +18,5 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/gaeilge_phonet.dat ${ASPELLDATA} ${INSTALL_DATA} ${WRKSRC}/gaeilge ${PREFIX}/lib/aspell -.include "../../textproc/aspell/buildlink2.mk" +.include "../../textproc/aspell/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/aspell-german/Makefile b/textproc/aspell-german/Makefile index 7628926885a..d9719a54428 100644 --- a/textproc/aspell-german/Makefile +++ b/textproc/aspell-german/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2003/09/14 18:13:49 recht Exp $ +# $NetBSD: Makefile,v 1.6 2004/02/11 04:35:20 xtraeme Exp $ # DISTNAME= aspell-de-0.50-2 @@ -12,11 +12,11 @@ MAINTAINER= recht@NetBSD.org HOMEPAGE= http://aspell.net/ COMMENT= German language support for aspell -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES HAS_CONFIGURE= YES CONFIGURE_ENV+= ASPELL=${PREFIX}/bin/aspell CONFIGURE_ENV+= WORD_LIST_COMPRESS=${PREFIX}/bin/word-list-compress -.include "../../textproc/aspell/buildlink2.mk" +.include "../../textproc/aspell/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/aspell-greek/Makefile b/textproc/aspell-greek/Makefile index 34e70c58cb5..2a1cbcda3e9 100644 --- a/textproc/aspell-greek/Makefile +++ b/textproc/aspell-greek/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/07/17 22:54:06 grant Exp $ +# $NetBSD: Makefile,v 1.7 2004/02/11 04:35:20 xtraeme Exp $ # DISTNAME= aspell-el-0.50-3 @@ -12,11 +12,11 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://aspell.net/ COMMENT= Greek language support for aspell -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES HAS_CONFIGURE= YES CONFIGURE_ENV+= ASPELL=${PREFIX}/bin/aspell CONFIGURE_ENV+= WORD_LIST_COMPRESS=${PREFIX}/bin/word-list-compress -.include "../../textproc/aspell/buildlink2.mk" +.include "../../textproc/aspell/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/aspell-italian/Makefile b/textproc/aspell-italian/Makefile index 7073c00468f..d3435a1ea99 100644 --- a/textproc/aspell-italian/Makefile +++ b/textproc/aspell-italian/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/07/17 22:54:06 grant Exp $ +# $NetBSD: Makefile,v 1.7 2004/02/11 04:35:20 xtraeme Exp $ # DISTNAME= aspell-it-0.50-2 @@ -12,11 +12,11 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://aspell.net/ COMMENT= Italian language support for aspell -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES HAS_CONFIGURE= YES CONFIGURE_ENV+= ASPELL=${PREFIX}/bin/aspell CONFIGURE_ENV+= WORD_LIST_COMPRESS=${PREFIX}/bin/word-list-compress -.include "../../textproc/aspell/buildlink2.mk" +.include "../../textproc/aspell/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/aspell-norwegian/Makefile b/textproc/aspell-norwegian/Makefile index 6241853cd28..15ffbb0fefd 100644 --- a/textproc/aspell-norwegian/Makefile +++ b/textproc/aspell-norwegian/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/07/17 22:54:06 grant Exp $ +# $NetBSD: Makefile,v 1.7 2004/02/11 04:35:20 xtraeme Exp $ # DISTNAME= aspell-no-0.50-2 @@ -12,11 +12,11 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://aspell.net/ COMMENT= Norwegian language support for aspell -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES HAS_CONFIGURE= YES CONFIGURE_ENV+= ASPELL=${PREFIX}/bin/aspell CONFIGURE_ENV+= WORD_LIST_COMPRESS=${PREFIX}/bin/word-list-compress -.include "../../textproc/aspell/buildlink2.mk" +.include "../../textproc/aspell/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/aspell-polish/Makefile b/textproc/aspell-polish/Makefile index d78fca67670..4164d793640 100644 --- a/textproc/aspell-polish/Makefile +++ b/textproc/aspell-polish/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/07/17 22:54:07 grant Exp $ +# $NetBSD: Makefile,v 1.7 2004/02/11 04:35:20 xtraeme Exp $ # DISTNAME= aspell-pl-0.50-2 @@ -12,11 +12,11 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://aspell.net/ COMMENT= Polish language support for aspell -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES HAS_CONFIGURE= YES CONFIGURE_ENV+= ASPELL=${PREFIX}/bin/aspell CONFIGURE_ENV+= WORD_LIST_COMPRESS=${PREFIX}/bin/word-list-compress -.include "../../textproc/aspell/buildlink2.mk" +.include "../../textproc/aspell/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/aspell-portuguese/Makefile b/textproc/aspell-portuguese/Makefile index be37506730e..fc1bd0ebe62 100644 --- a/textproc/aspell-portuguese/Makefile +++ b/textproc/aspell-portuguese/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/07/17 22:54:07 grant Exp $ +# $NetBSD: Makefile,v 1.7 2004/02/11 04:35:20 xtraeme Exp $ # DISTNAME= aspell-pt-0.50-2 @@ -12,11 +12,11 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://aspell.net/ COMMENT= Portuguese language support for aspell -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES HAS_CONFIGURE= YES CONFIGURE_ENV+= ASPELL=${PREFIX}/bin/aspell CONFIGURE_ENV+= WORD_LIST_COMPRESS=${PREFIX}/bin/word-list-compress -.include "../../textproc/aspell/buildlink2.mk" +.include "../../textproc/aspell/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/aspell-romanian/Makefile b/textproc/aspell-romanian/Makefile index f731e8cc5e9..51ba98e1488 100644 --- a/textproc/aspell-romanian/Makefile +++ b/textproc/aspell-romanian/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/07/17 22:54:08 grant Exp $ +# $NetBSD: Makefile,v 1.7 2004/02/11 04:35:20 xtraeme Exp $ # DISTNAME= aspell-ro-0.50-2 @@ -12,11 +12,11 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://aspell.net/ COMMENT= Romanian language support for aspell -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES HAS_CONFIGURE= YES CONFIGURE_ENV+= ASPELL=${PREFIX}/bin/aspell CONFIGURE_ENV+= WORD_LIST_COMPRESS=${PREFIX}/bin/word-list-compress -.include "../../textproc/aspell/buildlink2.mk" +.include "../../textproc/aspell/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/aspell-russian/Makefile b/textproc/aspell-russian/Makefile index aba8de2287c..ab3fd13393f 100644 --- a/textproc/aspell-russian/Makefile +++ b/textproc/aspell-russian/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/07/17 22:54:08 grant Exp $ +# $NetBSD: Makefile,v 1.7 2004/02/11 04:35:21 xtraeme Exp $ # DISTNAME= aspell-ru-0.50-2 @@ -12,11 +12,11 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://aspell.net/ COMMENT= Russian language support for aspell -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES HAS_CONFIGURE= YES CONFIGURE_ENV+= ASPELL=${PREFIX}/bin/aspell CONFIGURE_ENV+= WORD_LIST_COMPRESS=${PREFIX}/bin/word-list-compress -.include "../../textproc/aspell/buildlink2.mk" +.include "../../textproc/aspell/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/aspell-slovak/Makefile b/textproc/aspell-slovak/Makefile index 9dba17fdca6..9d850acf29a 100644 --- a/textproc/aspell-slovak/Makefile +++ b/textproc/aspell-slovak/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2003/07/17 22:54:08 grant Exp $ +# $NetBSD: Makefile,v 1.8 2004/02/11 04:35:21 xtraeme Exp $ # DISTNAME= aspell-sk-0.50.3-1.1 @@ -12,7 +12,7 @@ MAINTAINER= salo@NetBSD.org HOMEPAGE= http://ispell.hq.sk/homepage/ COMMENT= Slovak language support for aspell -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES HAS_CONFIGURE= YES CONFIGURE_ENV+= ASPELL=${PREFIX}/bin/aspell @@ -20,5 +20,5 @@ CONFIGURE_ENV+= WORD_LIST_COMPRESS=${PREFIX}/bin/word-list-compress MAKE_ENV+= SORT="${SORT}" -.include "../../textproc/aspell/buildlink2.mk" +.include "../../textproc/aspell/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/aspell-spanish/Makefile b/textproc/aspell-spanish/Makefile index f9a7638772e..7ab255ad8a7 100644 --- a/textproc/aspell-spanish/Makefile +++ b/textproc/aspell-spanish/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/07/17 22:54:08 grant Exp $ +# $NetBSD: Makefile,v 1.7 2004/02/11 04:35:21 xtraeme Exp $ # DISTNAME= aspell-es-0.50-2 @@ -12,11 +12,11 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://aspell.net/ COMMENT= Spanish language support for aspell -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES HAS_CONFIGURE= YES CONFIGURE_ENV+= ASPELL=${PREFIX}/bin/aspell CONFIGURE_ENV+= WORD_LIST_COMPRESS=${PREFIX}/bin/word-list-compress -.include "../../textproc/aspell/buildlink2.mk" +.include "../../textproc/aspell/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/aspell-svenska/Makefile b/textproc/aspell-svenska/Makefile index be17536cdc1..6136336aaac 100644 --- a/textproc/aspell-svenska/Makefile +++ b/textproc/aspell-svenska/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/07/17 22:54:09 grant Exp $ +# $NetBSD: Makefile,v 1.7 2004/02/11 04:35:21 xtraeme Exp $ # DISTNAME= aspell-sv-0.50-2 @@ -12,11 +12,11 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://aspell.net/ COMMENT= Swedish language support for aspell -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES HAS_CONFIGURE= YES CONFIGURE_ENV+= ASPELL=${PREFIX}/bin/aspell CONFIGURE_ENV+= WORD_LIST_COMPRESS=${PREFIX}/bin/word-list-compress -.include "../../textproc/aspell/buildlink2.mk" +.include "../../textproc/aspell/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/aspell-ukrainian/Makefile b/textproc/aspell-ukrainian/Makefile index 361f315dbd1..cb3f2916a78 100644 --- a/textproc/aspell-ukrainian/Makefile +++ b/textproc/aspell-ukrainian/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/07/17 22:54:09 grant Exp $ +# $NetBSD: Makefile,v 1.7 2004/02/11 04:35:21 xtraeme Exp $ # DISTNAME= aspell-uk-0.50-3 @@ -12,11 +12,11 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://aspell.net/ COMMENT= Ukrainian language support for aspell -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES HAS_CONFIGURE= YES CONFIGURE_ENV+= ASPELL=${PREFIX}/bin/aspell CONFIGURE_ENV+= WORD_LIST_COMPRESS=${PREFIX}/bin/word-list-compress -.include "../../textproc/aspell/buildlink2.mk" +.include "../../textproc/aspell/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/aspell-welsh/Makefile b/textproc/aspell-welsh/Makefile index 26915767496..1f2f4ed1166 100644 --- a/textproc/aspell-welsh/Makefile +++ b/textproc/aspell-welsh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/07/17 22:54:09 grant Exp $ +# $NetBSD: Makefile,v 1.7 2004/02/11 04:35:21 xtraeme Exp $ # DISTNAME= aspell-cy-0.50-3 @@ -12,11 +12,11 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://aspell.net/ COMMENT= Welsh language support for aspell -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES HAS_CONFIGURE= YES CONFIGURE_ENV+= ASPELL=${PREFIX}/bin/aspell CONFIGURE_ENV+= WORD_LIST_COMPRESS=${PREFIX}/bin/word-list-compress -.include "../../textproc/aspell/buildlink2.mk" +.include "../../textproc/aspell/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile index 56296fee663..6a0e5268219 100644 --- a/textproc/aspell/Makefile +++ b/textproc/aspell/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2004/02/11 01:46:30 abs Exp $ +# $NetBSD: Makefile,v 1.19 2004/02/11 04:35:20 xtraeme Exp $ # DISTNAME= aspell-0.50.4.1 @@ -11,7 +11,7 @@ COMMENT= Spell checker with good multi-language support CONFLICTS= libpspell-[0-9]* -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes GNU_CONFIGURE= yes USE_GCC_SHLIB= yes USE_GNU_TOOLS+= make @@ -29,5 +29,5 @@ REPLACE_PERL= scripts/aspell-import post-install: ${INSTALL_DATA_DIR} ${PREFIX}/lib/aspell -.include "../../devel/ncurses/buildlink2.mk" +.include "../../devel/ncurses/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/aspell/buildlink3.mk b/textproc/aspell/buildlink3.mk new file mode 100644 index 00000000000..cd556d3646c --- /dev/null +++ b/textproc/aspell/buildlink3.mk @@ -0,0 +1,24 @@ +# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 04:35:20 xtraeme Exp $ +# +# This Makefile fragment is included by packages that use aspell. +# +# This file was created automatically using createbuildlink-3.1. +# + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +ASPELL_BUILDLINK3_MK:= ${ASPELL_BUILDLINK3_MK}+ + +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= aspell +.endif + +.if !empty(ASPELL_BUILDLINK3_MK:M+) +BUILDLINK_PACKAGES+= aspell +BUILDLINK_DEPENDS.aspell+= aspell>=0.50.3nb2 +BUILDLINK_PKGSRCDIR.aspell?= ../../textproc/aspell + +.include "../../devel/ncurses/buildlink3.mk" + +.endif # ASPELL_BUILDLINK3_MK + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile index b0c8558e54f..1adc9208f55 100644 --- a/textproc/scrollkeeper/Makefile +++ b/textproc/scrollkeeper/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2004/01/24 15:13:20 grant Exp $ +# $NetBSD: Makefile,v 1.20 2004/02/11 04:35:21 xtraeme Exp $ # DISTNAME= scrollkeeper-0.3.14 @@ -15,7 +15,7 @@ BUILD_USES_MSGFMT= yes DEPENDS= docbook-xml>=4.2:../../textproc/docbook-xml GNU_CONFIGURE= yes -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes USE_GNU_TOOLS+= make USE_LIBTOOL= yes USE_PKGINSTALL= yes @@ -48,10 +48,10 @@ FILES_SUBST+= SCROLLKEEPER_REBUILDDB="${SCROLLKEEPER_REBUILDDB}" EGDIR= ${PREFIX}/share/examples/scrollkeeper CONF_FILES= ${EGDIR}/scrollkeeper.conf ${PKG_SYSCONFDIR}/scrollkeeper.conf -.include "../../devel/gettext-lib/buildlink2.mk" -.include "../../textproc/libxml2/buildlink2.mk" -.include "../../textproc/libxslt/buildlink2.mk" -.include "../../textproc/intltool/buildlink2.mk" -.include "../../textproc/xmlcatmgr/buildlink2.mk" +.include "../../devel/gettext-lib/buildlink3.mk" +.include "../../textproc/libxml2/buildlink3.mk" +.include "../../textproc/libxslt/buildlink3.mk" +.include "../../textproc/intltool/buildlink3.mk" +.include "../../textproc/xmlcatmgr/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/scrollkeeper/buildlink3.mk b/textproc/scrollkeeper/buildlink3.mk new file mode 100644 index 00000000000..281bcfb96c8 --- /dev/null +++ b/textproc/scrollkeeper/buildlink3.mk @@ -0,0 +1,50 @@ +# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 04:35:21 xtraeme Exp $ +# +# This Makefile fragment is included by packages that use scrollkeeper. +# +# This file was created automatically using createbuildlink-3.1. +# + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +SCROLLKEEPER_BUILDLINK3_MK:= ${SCROLLKEEPER_BUILDLINK3_MK}+ + +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= scrollkeeper +.endif + +.if !empty(SCROLLKEEPER_BUILDLINK3_MK:M+) +BUILDLINK_PACKAGES+= scrollkeeper +BUILDLINK_DEPENDS.scrollkeeper+= scrollkeeper>=0.3.12nb2 +BUILDLINK_PKGSRCDIR.scrollkeeper?= ../../textproc/scrollkeeper + +.include "../../devel/gettext-lib/buildlink3.mk" +.include "../../textproc/libxml2/buildlink3.mk" +.include "../../textproc/libxslt/buildlink3.mk" +.include "../../textproc/xmlcatmgr/buildlink3.mk" + +BUILDLINK_TARGETS+= scrollkeeper-buildlink-fake + +_SK_FAKE_UPDATE= ${BUILDLINK_DIR}/bin/scrollkeeper-update +_SK_FAKE_REBUILDDB= ${BUILDLINK_DIR}/bin/scrollkeeper-rebuilddb + +scrollkeeper-buildlink-fake: + ${_PKG_SILENT}${_PKG_DEBUG} \ + if [ ! -f ${_SK_FAKE_UPDATE} ]; then \ + ${ECHO_BUILDLINK_MSG} "Creating ${_SK_FAKE_UPDATE}"; \ + ${MKDIR} ${_SK_FAKE_UPDATE:H}; \ + ${ECHO} "#!/bin/sh" > ${_SK_FAKE_UPDATE}; \ + ${ECHO} "echo '[pkgsrc] Doing nothing for scrollkeeper-update' \$$*" >> ${_SK_FAKE_UPDATE}; \ + ${CHMOD} +x ${_SK_FAKE_UPDATE}; \ + fi + ${_PKG_SILENT}${_PKG_DEBUG} \ + if [ ! -f ${_SK_FAKE_REBUILDDB} ]; then \ + ${ECHO_BUILDLINK_MSG} "Creating ${_SK_FAKE_REBUILDDB}"; \ + ${MKDIR} ${_SK_FAKE_REBUILDDB:H}; \ + ${ECHO} "#!/bin/sh" > ${_SK_FAKE_REBUILDDB}; \ + ${ECHO} "echo '[pkgsrc] Doing nothing for scrollkeeper-rebuilddb' \$$*" >> ${_SK_FAKE_REBUILDDB}; \ + ${CHMOD} +x ${_SK_FAKE_REBUILDDB}; \ + fi + +.endif # SCROLLKEEPER_BUILDLINK3_MK + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/textproc/scrollkeeper/omf.mk b/textproc/scrollkeeper/omf.mk index d68ad268c10..7120bf694f3 100644 --- a/textproc/scrollkeeper/omf.mk +++ b/textproc/scrollkeeper/omf.mk @@ -1,4 +1,4 @@ -# $NetBSD: omf.mk,v 1.1 2003/02/18 14:39:03 jmmv Exp $ +# $NetBSD: omf.mk,v 1.2 2004/02/11 04:35:21 xtraeme Exp $ # # This Makefile fragment is intended to be included by packages that install # OMF files. It takes care of registering them in scrollkeeper's global @@ -28,6 +28,6 @@ FILES_SUBST+= SCROLLKEEPER_DATADIR="${SCROLLKEEPER_DATADIR}" FILES_SUBST+= SCROLLKEEPER_REBUILDDB="${SCROLLKEEPER_REBUILDDB}" FILES_SUBST+= SCROLLKEEPER_UPDATEDB="${SCROLLKEEPER_UPDATEDB}" -.include "../../textproc/scrollkeeper/buildlink2.mk" +.include "../../textproc/scrollkeeper/buildlink3.mk" .endif # SCROLLKEEPER_OMF_MK diff --git a/x11/startup-notification/Makefile b/x11/startup-notification/Makefile index 87f21e442e4..d402b588bb6 100644 --- a/x11/startup-notification/Makefile +++ b/x11/startup-notification/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2003/04/11 11:25:53 jmmv Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/11 04:43:38 xtraeme Exp $ DISTNAME= startup-notification-0.5 CATEGORIES= x11 gnome @@ -10,7 +10,7 @@ HOMEPAGE= http://www.gnome.org/ COMMENT= X11 application startup notification library GNU_CONFIGURE= yes -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes USE_LIBTOOL= yes USE_X11= yes diff --git a/x11/startup-notification/buildlink3.mk b/x11/startup-notification/buildlink3.mk new file mode 100644 index 00000000000..df749c73bef --- /dev/null +++ b/x11/startup-notification/buildlink3.mk @@ -0,0 +1,22 @@ +# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 04:43:38 xtraeme Exp $ +# +# This Makefile fragment is included by packages that use startup-notification. +# +# This file was created automatically using createbuildlink-3.1. +# + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +STARTUP_NOTIFICATION_BUILDLINK3_MK:= ${STARTUP_NOTIFICATION_BUILDLINK3_MK}+ + +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= startup-notification +.endif + +.if !empty(STARTUP_NOTIFICATION_BUILDLINK3_MK:M+) +BUILDLINK_PACKAGES+= startup-notification +BUILDLINK_DEPENDS.startup-notification+= startup-notification>=0.5 +BUILDLINK_PKGSRCDIR.startup-notification?= ../../x11/startup-notification + +.endif # STARTUP_NOTIFICATION_BUILDLINK3_MK + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} |