From a020ed9056d4d74e13cd2a99898f3dec09c162b7 Mon Sep 17 00:00:00 2001 From: jlam Date: Sun, 25 Aug 2002 21:50:52 +0000 Subject: Merge packages from the buildlink2 branch back into the main trunk that have been converted to USE_BUILDLINK2. --- textproc/bibclean/Makefile | 6 +++--- textproc/bibparse/Makefile | 6 +++--- textproc/chasen-base/Makefile | 4 ++-- textproc/chasen-base/PLIST | 2 +- textproc/chasen-base/distinfo | 2 +- textproc/chasen-base/patches/patch-ag | 2 +- textproc/chasen-base/patches/patch-ah | 2 +- textproc/chasen-base/patches/patch-ai | 2 +- textproc/chasen-base/patches/patch-aj | 2 +- textproc/chasen-base/patches/patch-ak | 2 +- textproc/gsed/Makefile | 3 ++- textproc/ispell-base/Makefile | 4 ++-- textproc/ispell-base/distinfo | 2 +- textproc/ispell-base/patches/patch-al | 2 +- textproc/ispell-base/patches/patch-am | 2 +- textproc/ispell-base/patches/patch-an | 2 +- textproc/ispell-base/patches/patch-ao | 2 +- textproc/ispell-base/patches/patch-ap | 2 +- textproc/ispell-base/patches/patch-aq | 2 +- textproc/lq-sp/Makefile | 4 ++-- textproc/source-highlight/Makefile | 6 +++--- textproc/texi2html/Makefile | 6 +++--- textproc/urlview/Makefile | 9 ++++----- textproc/xml-i18n-tools/Makefile | 6 +++--- 24 files changed, 41 insertions(+), 41 deletions(-) (limited to 'textproc') diff --git a/textproc/bibclean/Makefile b/textproc/bibclean/Makefile index 57864bb3f90..89583d9b285 100644 --- a/textproc/bibclean/Makefile +++ b/textproc/bibclean/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/08/15 00:18:48 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2002/08/25 21:51:11 jlam Exp $ # DISTNAME= bibclean-2.11.4 @@ -9,7 +9,7 @@ MAINTAINER= seb@pbox.org HOMEPAGE= http://www.math.utah.edu/~beebe/software/bibtex-bibliography-tools.html COMMENT= prettyprinter and syntax checker for BibTeX bibliography databases -GNU_CONFIGURE= YES -USE_BUILDLINK_ONLY= YES +GNU_CONFIGURE= YES +USE_BUILDLINK2= YES .include "../../mk/bsd.pkg.mk" diff --git a/textproc/bibparse/Makefile b/textproc/bibparse/Makefile index bb384e0af80..0a05bd50003 100644 --- a/textproc/bibparse/Makefile +++ b/textproc/bibparse/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2001/07/24 13:47:34 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2002/08/25 21:51:12 jlam Exp $ # DISTNAME= bibparse-1.04 @@ -9,7 +9,7 @@ MAINTAINER= seb@pbox.org HOMEPAGE= http://www.math.utah.edu/~beebe/software/bibtex-bibliography-tools.html COMMENT= syntax checking tools for BibTeX bibliography databases -GNU_CONFIGURE= YES -USE_BUILDLINK_ONLY= YES +GNU_CONFIGURE= YES +USE_BUILDLINK2= YES .include "../../mk/bsd.pkg.mk" diff --git a/textproc/chasen-base/Makefile b/textproc/chasen-base/Makefile index 5fe454f61f9..b5250bd2de8 100644 --- a/textproc/chasen-base/Makefile +++ b/textproc/chasen-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/05/31 13:00:50 seb Exp $ +# $NetBSD: Makefile,v 1.2 2002/08/25 21:51:12 jlam Exp $ # DISTNAME= chasen-${CHASEN_VERSION} @@ -16,7 +16,7 @@ COMMENT= ChaSen, Japanese Morphological Analysis System GNU_CONFIGURE= # defined USE_LIBTOOL= # defined -USE_BUILDLINK_ONLY= # defined +USE_BUILDLINK2= # defined OWN_DIRS= ${CHASEN_DICDIR} LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig diff --git a/textproc/chasen-base/PLIST b/textproc/chasen-base/PLIST index 43ea8c03b80..19f19e24343 100644 --- a/textproc/chasen-base/PLIST +++ b/textproc/chasen-base/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/31 13:00:50 seb Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/08/25 21:51:13 jlam Exp $ bin/chasen bin/chasen-config include/chasen.h diff --git a/textproc/chasen-base/distinfo b/textproc/chasen-base/distinfo index c4937d86bec..9476aba5c2e 100644 --- a/textproc/chasen-base/distinfo +++ b/textproc/chasen-base/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/05/31 13:00:50 seb Exp $ +$NetBSD: distinfo,v 1.2 2002/08/25 21:51:13 jlam Exp $ SHA1 (chasen-2.2.9.tar.gz) = bd17162f2fcb4254ded6eebf35c6aa06caecbaeb Size (chasen-2.2.9.tar.gz) = 578068 bytes diff --git a/textproc/chasen-base/patches/patch-ag b/textproc/chasen-base/patches/patch-ag index f0f9542a75e..0b8ba1c8a44 100644 --- a/textproc/chasen-base/patches/patch-ag +++ b/textproc/chasen-base/patches/patch-ag @@ -1,4 +1,4 @@ -$NetBSD: patch-ag,v 1.1.1.1 2002/05/31 13:00:50 seb Exp $ +$NetBSD: patch-ag,v 1.2 2002/08/25 21:51:14 jlam Exp $ --- Makefile.am.orig Sat Feb 2 10:08:19 2002 +++ Makefile.am diff --git a/textproc/chasen-base/patches/patch-ah b/textproc/chasen-base/patches/patch-ah index e8ef6435974..5e2812ae186 100644 --- a/textproc/chasen-base/patches/patch-ah +++ b/textproc/chasen-base/patches/patch-ah @@ -1,4 +1,4 @@ -$NetBSD: patch-ah,v 1.1.1.1 2002/05/31 13:00:50 seb Exp $ +$NetBSD: patch-ah,v 1.2 2002/08/25 21:51:14 jlam Exp $ --- Makefile.in.orig Fri Feb 8 15:31:20 2002 +++ Makefile.in diff --git a/textproc/chasen-base/patches/patch-ai b/textproc/chasen-base/patches/patch-ai index f3614f16a21..9d788fa1283 100644 --- a/textproc/chasen-base/patches/patch-ai +++ b/textproc/chasen-base/patches/patch-ai @@ -1,4 +1,4 @@ -$NetBSD: patch-ai,v 1.1.1.1 2002/05/31 13:00:50 seb Exp $ +$NetBSD: patch-ai,v 1.2 2002/08/25 21:51:14 jlam Exp $ --- chasen-config.in.orig Thu Mar 1 08:54:17 2001 +++ chasen-config.in diff --git a/textproc/chasen-base/patches/patch-aj b/textproc/chasen-base/patches/patch-aj index 3c2cdb950ab..4d8b571386f 100644 --- a/textproc/chasen-base/patches/patch-aj +++ b/textproc/chasen-base/patches/patch-aj @@ -1,4 +1,4 @@ -$NetBSD: patch-aj,v 1.1.1.1 2002/05/31 13:00:50 seb Exp $ +$NetBSD: patch-aj,v 1.2 2002/08/25 21:51:14 jlam Exp $ --- mkchadic/Makefile.am.orig Sun Jun 24 15:19:02 2001 +++ mkchadic/Makefile.am diff --git a/textproc/chasen-base/patches/patch-ak b/textproc/chasen-base/patches/patch-ak index a28f6ae8494..f3078d588ef 100644 --- a/textproc/chasen-base/patches/patch-ak +++ b/textproc/chasen-base/patches/patch-ak @@ -1,4 +1,4 @@ -$NetBSD: patch-ak,v 1.1.1.1 2002/05/31 13:00:50 seb Exp $ +$NetBSD: patch-ak,v 1.2 2002/08/25 21:51:14 jlam Exp $ --- mkchadic/Makefile.in.orig Fri Feb 8 15:31:51 2002 +++ mkchadic/Makefile.in diff --git a/textproc/gsed/Makefile b/textproc/gsed/Makefile index 826f86cfb1e..ac43bc48abb 100644 --- a/textproc/gsed/Makefile +++ b/textproc/gsed/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2002/02/18 15:14:43 seb Exp $ +# $NetBSD: Makefile,v 1.6 2002/08/25 21:51:15 jlam Exp $ # DISTNAME= sed-3.02 @@ -10,6 +10,7 @@ MAINTAINER= seb@netbsd.org HOMEPAGE= http://www.gnu.org/software/sed/sed.html COMMENT= GNU version of sed +USE_BUILDLINK2= YES GNU_CONFIGURE= YES CONFIGURE_ARGS= --program-prefix=g INFO_FILES= sed.info diff --git a/textproc/ispell-base/Makefile b/textproc/ispell-base/Makefile index ea0b8436596..7af20d0a31b 100644 --- a/textproc/ispell-base/Makefile +++ b/textproc/ispell-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2002/07/22 10:31:30 agc Exp $ +# $NetBSD: Makefile,v 1.9 2002/08/25 21:51:16 jlam Exp $ # DISTNAME= ispell-3.1.20 @@ -26,7 +26,7 @@ INFO_FILES= ispell.info CFLAGS+= -DHAVE_INTTYPES_H .endif -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes do-configure: cd ${WRKSRC}; \ diff --git a/textproc/ispell-base/distinfo b/textproc/ispell-base/distinfo index 0477a63da93..7386f8c52b3 100644 --- a/textproc/ispell-base/distinfo +++ b/textproc/ispell-base/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2002/07/22 10:31:30 agc Exp $ +$NetBSD: distinfo,v 1.6 2002/08/25 21:51:16 jlam Exp $ SHA1 (ispell-3.1.20.tar.gz) = f8f849a3868ef3d88c1ba6fe5b49505f75de786e Size (ispell-3.1.20.tar.gz) = 677987 bytes diff --git a/textproc/ispell-base/patches/patch-al b/textproc/ispell-base/patches/patch-al index a43db6a201f..887eacd3dee 100644 --- a/textproc/ispell-base/patches/patch-al +++ b/textproc/ispell-base/patches/patch-al @@ -1,4 +1,4 @@ -$NetBSD: patch-al,v 1.1 2002/07/22 10:31:30 agc Exp $ +$NetBSD: patch-al,v 1.2 2002/08/25 21:51:17 jlam Exp $ --- config.X.orig Fri Jul 19 21:47:10 2002 +++ config.X Fri Jul 19 21:48:05 2002 diff --git a/textproc/ispell-base/patches/patch-am b/textproc/ispell-base/patches/patch-am index 3949623df07..23562fe7dff 100644 --- a/textproc/ispell-base/patches/patch-am +++ b/textproc/ispell-base/patches/patch-am @@ -1,4 +1,4 @@ -$NetBSD: patch-am,v 1.1 2002/07/22 10:31:30 agc Exp $ +$NetBSD: patch-am,v 1.2 2002/08/25 21:51:17 jlam Exp $ --- munchlist.X.orig Fri Jul 19 21:47:10 2002 +++ munchlist.X Fri Jul 19 21:48:24 2002 diff --git a/textproc/ispell-base/patches/patch-an b/textproc/ispell-base/patches/patch-an index eb30943b7d1..2737617d80e 100644 --- a/textproc/ispell-base/patches/patch-an +++ b/textproc/ispell-base/patches/patch-an @@ -1,4 +1,4 @@ -$NetBSD: patch-an,v 1.1 2002/07/22 10:31:31 agc Exp $ +$NetBSD: patch-an,v 1.2 2002/08/25 21:51:18 jlam Exp $ --- splitdict.orig Fri Jul 19 21:49:28 2002 +++ splitdict Fri Jul 19 21:48:33 2002 diff --git a/textproc/ispell-base/patches/patch-ao b/textproc/ispell-base/patches/patch-ao index f78b24c0b5b..32fb2aa3edb 100644 --- a/textproc/ispell-base/patches/patch-ao +++ b/textproc/ispell-base/patches/patch-ao @@ -1,4 +1,4 @@ -$NetBSD: patch-ao,v 1.1 2002/07/22 10:31:31 agc Exp $ +$NetBSD: patch-ao,v 1.2 2002/08/25 21:51:18 jlam Exp $ --- subset.X.orig Fri Jul 19 21:47:10 2002 +++ subset.X Fri Jul 19 21:48:52 2002 diff --git a/textproc/ispell-base/patches/patch-ap b/textproc/ispell-base/patches/patch-ap index f7170f46df2..bfc8abba611 100644 --- a/textproc/ispell-base/patches/patch-ap +++ b/textproc/ispell-base/patches/patch-ap @@ -1,4 +1,4 @@ -$NetBSD: patch-ap,v 1.1 2002/07/22 10:31:31 agc Exp $ +$NetBSD: patch-ap,v 1.2 2002/08/25 21:51:18 jlam Exp $ --- tryaffix.X.orig Fri Jul 19 21:47:10 2002 +++ tryaffix.X Fri Jul 19 21:49:02 2002 diff --git a/textproc/ispell-base/patches/patch-aq b/textproc/ispell-base/patches/patch-aq index 2c609ae8b84..3c87eea4d8c 100644 --- a/textproc/ispell-base/patches/patch-aq +++ b/textproc/ispell-base/patches/patch-aq @@ -1,4 +1,4 @@ -$NetBSD: patch-aq,v 1.1 2002/07/22 10:31:31 agc Exp $ +$NetBSD: patch-aq,v 1.2 2002/08/25 21:51:19 jlam Exp $ --- zapdups.X.orig Fri Jul 19 21:47:10 2002 +++ zapdups.X Fri Jul 19 21:49:09 2002 diff --git a/textproc/lq-sp/Makefile b/textproc/lq-sp/Makefile index b25370aee18..6255459fdd7 100644 --- a/textproc/lq-sp/Makefile +++ b/textproc/lq-sp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2002/04/11 01:56:24 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.5 2002/08/25 21:51:19 jlam Exp $ # DISTNAME= lq-sp-1.3.4.7 @@ -9,7 +9,7 @@ MAINTAINER= norm@sandbox.org.uk HOMEPAGE= http://www.htmlhelp.com/tools/validator/offline/ COMMENT= Modified SP package -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES # doesn't build (LP64 bugs) NOT_FOR_PLATFORM= *-*-alpha diff --git a/textproc/source-highlight/Makefile b/textproc/source-highlight/Makefile index 8e9e965ae7f..6ba62bbb58d 100644 --- a/textproc/source-highlight/Makefile +++ b/textproc/source-highlight/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2002/01/22 10:40:01 agc Exp $ +# $NetBSD: Makefile,v 1.3 2002/08/25 21:51:19 jlam Exp $ # DISTNAME= source-highlight-1.2.1 @@ -10,8 +10,8 @@ MAINTAINER= seb@netbsd.org HOMEPAGE= http://www.gnu.org/software/src-highlite/source-highlight.html COMMENT= Highlight syntax of C, C++ or Java source into HTML document -GNU_CONFIGURE= YES -USE_BUILDLINK_ONLY= YES +GNU_CONFIGURE= YES +USE_BUILDLINK2= YES .include "../../mk/bsd.prefs.mk" diff --git a/textproc/texi2html/Makefile b/textproc/texi2html/Makefile index 251062c31b5..403a93cb4d9 100644 --- a/textproc/texi2html/Makefile +++ b/textproc/texi2html/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2002/08/01 02:37:42 jschauma Exp $ +# $NetBSD: Makefile,v 1.13 2002/08/25 21:51:20 jlam Exp $ # DISTNAME= texi2html-1.64 @@ -11,8 +11,8 @@ COMMENT= Texinfo-to-HTML direct translator CONFLICTS= teTeX-bin-1.0 teTeX-bin-1.0.[1234567] -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES GNU_CONFIGURE= YES -.include "../../lang/perl5/buildlink.mk" +.include "../../lang/perl5/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/urlview/Makefile b/textproc/urlview/Makefile index 9057e729213..3ae5a583ddc 100644 --- a/textproc/urlview/Makefile +++ b/textproc/urlview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/06/20 04:26:43 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2002/08/25 21:51:20 jlam Exp $ DISTNAME= urlview-0.9 CATEGORIES= textproc @@ -10,9 +10,8 @@ MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/contrib/ \ MAINTAINER= tron@netbsd.org COMMENT= extract URLs from text files and display them in a menu -GNU_CONFIGURE= yes -USE_NCURSES= yes -USE_BUILDLINK_ONLY= yes +GNU_CONFIGURE= yes +USE_BUILDLINK2= yes -.include "../../devel/ncurses/buildlink.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/xml-i18n-tools/Makefile b/textproc/xml-i18n-tools/Makefile index 8d767b91724..57684c7cf93 100644 --- a/textproc/xml-i18n-tools/Makefile +++ b/textproc/xml-i18n-tools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/11/29 13:27:47 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2002/08/25 21:51:21 jlam Exp $ DISTNAME= xml-i18n-tools-0.9 CATEGORIES= textproc gnome @@ -8,7 +8,7 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://news.gnome.org/gnome-news/979851911/ COMMENT= XML internationalisation tools -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES GNU_CONFIGURE= YES USE_GMAKE= YES @@ -20,5 +20,5 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/$${file} ${DOCDIR}; \ done -.include "../../lang/perl5/buildlink.mk" +.include "../../lang/perl5/buildlink2.mk" .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3