From ce4bbe5f06174694c3b499219adedc4dab48cc15 Mon Sep 17 00:00:00 2001 From: jlam Date: Sun, 5 Mar 2006 16:27:22 +0000 Subject: * Teach the tools framework how to supply the pkgsrc version of makeinfo if no native makeinfo executable exists. Honor TEXINFO_REQD when determining whether the native makeinfo can be used. * Remove USE_MAKEINFO and replace it with USE_TOOLS+=makeinfo. * Get rid of all the "split" argument deduction for makeinfo since the PLIST module already handles varying numbers of split info files correctly. NOTE: Platforms that have "makeinfo" in the base system should check that the makeinfo entries of pkgsrc/mk/tools.${OPSYS}.mk are correct. --- lang/gauche/Makefile | 5 ++--- lang/gcc34/Makefile | 7 +++---- lang/guile/Makefile | 6 ++---- lang/ksi/Makefile | 4 ++-- lang/librep/Makefile | 5 ++--- lang/pnet/Makefile | 5 ++--- lang/sather/Makefile | 5 ++--- lang/smalltalk/Makefile | 5 ++--- 8 files changed, 17 insertions(+), 25 deletions(-) (limited to 'lang') diff --git a/lang/gauche/Makefile b/lang/gauche/Makefile index 26072b65b84..5d52a40a045 100644 --- a/lang/gauche/Makefile +++ b/lang/gauche/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2006/02/22 22:28:35 wiz Exp $ +# $NetBSD: Makefile,v 1.35 2006/03/05 16:27:26 jlam Exp $ # DISTNAME= Gauche-0.8.6 @@ -32,8 +32,7 @@ CONFIGURE_ENV+= AS="${CC} -x assembler-with-cpp -c" _WITH_ICONV_LIB= ${BUILDLINK_LIBICONV_LDADD:M-l*:C/-l//} LDFLAGS+= ${BUILDLINK_LIBICONV_LDADD} -USE_MAKEINFO= YES -USE_TOOLS+= gzip +USE_TOOLS+= gzip makeinfo INFO_FILES= gauche-refe.info gauche-refj.info post-install: diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile index d8eb781ce6d..d994ba269bf 100644 --- a/lang/gcc34/Makefile +++ b/lang/gcc34/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2006/02/05 23:09:45 joerg Exp $ +# $NetBSD: Makefile,v 1.32 2006/03/05 16:27:26 jlam Exp $ # DISTNAME= gcc-${GCC_VERSION} @@ -107,12 +107,11 @@ PTHREAD_OPTS+= native CONFIGURE_ARGS+= --disable-threads .endif -USE_TOOLS+= gmake +USE_TOOLS+= gmake makeinfo HAS_CONFIGURE= YES # no GNU_CONFIGURE! CONFIG_SHELL?= ${SH} CONFIGURE_ENV+= CONFIG_SHELL=${CONFIG_SHELL:Q} -USE_MAKEINFO= YES -PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC +PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC .if !empty(BUILD_ADA:M[Yy][Ee][Ss]) diff --git a/lang/guile/Makefile b/lang/guile/Makefile index 166c24e2e8f..2da536ce187 100644 --- a/lang/guile/Makefile +++ b/lang/guile/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.69 2006/02/05 23:09:45 joerg Exp $ +# $NetBSD: Makefile,v 1.70 2006/03/05 16:27:26 jlam Exp $ DISTNAME= guile-1.6.7 PKGREVISION= 3 @@ -12,12 +12,10 @@ COMMENT= GNU's Ubiquitous Intelligent Language for Extension CONFLICTS= guile14<1.4.1nb1 guile-oops-[0-9]* GNU_CONFIGURE= YES -USE_TOOLS+= gmake +USE_TOOLS+= gmake makeinfo USE_LIBTOOL= YES USE_GNU_READLINE= YES PTHREAD_AUTO_VARS= YES - -USE_MAKEINFO= YES INFO_FILES= guile.info guile-tut.info goops.info r5rs.info TEST_DIRS= ${WRKSRC} diff --git a/lang/ksi/Makefile b/lang/ksi/Makefile index 051395d9010..2cbb6972c89 100644 --- a/lang/ksi/Makefile +++ b/lang/ksi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/03/04 21:29:54 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2006/03/05 16:27:26 jlam Exp $ DISTNAME= ksi-3.4.1 PKGREVISION= 4 @@ -11,11 +11,11 @@ COMMENT= Portable, embeddable Scheme implementation written in C CPPFLAGS+= -Dunix GNU_CONFIGURE= yes +USE_TOOLS+= makeinfo INFO_FILES= ksi-lang.info ksi-lib.info ksi.info MAKE_ENV+= BUILDLINK_DIR=${BUILDLINK_DIR:Q} USE_GNU_READLINE= # uses rl_event_hook() interface USE_LIBTOOL= yes -USE_MAKEINFO= YES USE_NEW_TEXINFO= YES USE_PKGLOCALEDIR= yes diff --git a/lang/librep/Makefile b/lang/librep/Makefile index 4b0004790c7..47f088623d9 100644 --- a/lang/librep/Makefile +++ b/lang/librep/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2006/03/04 21:29:54 jlam Exp $ +# $NetBSD: Makefile,v 1.44 2006/03/05 16:27:26 jlam Exp $ # DISTNAME= librep-0.17 @@ -10,7 +10,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://librep.sourceforge.net/ COMMENT= Emacs Lisp-like runtime library, interpreter, compiler and VM -USE_TOOLS+= gmake +USE_TOOLS+= gmake makeinfo USE_GNU_READLINE= # uses rl_basic_quote_characters USE_LIBTOOL= yes @@ -23,7 +23,6 @@ CONFIGURE_ARGS+= --enable-static CONFIG_STATUS_OVERRIDE= # empty -USE_MAKEINFO= YES INFO_FILES= librep.info post-install: diff --git a/lang/pnet/Makefile b/lang/pnet/Makefile index a8e6f5d002e..00f8c216f18 100644 --- a/lang/pnet/Makefile +++ b/lang/pnet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/02/05 23:09:47 joerg Exp $ +# $NetBSD: Makefile,v 1.15 2006/03/05 16:27:26 jlam Exp $ DISTNAME= pnet-0.6.6 PKGREVISION= 2 @@ -13,9 +13,8 @@ BUILD_DEPENDS+= treecc>=0.2.6:../../devel/treecc CONFLICTS= mono-[0-9]* -USE_TOOLS+= gmake +USE_TOOLS+= gmake makeinfo USE_LIBTOOL= yes -USE_MAKEINFO= yes GNU_CONFIGURE= yes INFO_FILES= pnettools.info diff --git a/lang/sather/Makefile b/lang/sather/Makefile index e6fc08f0a26..bc6507da1b2 100644 --- a/lang/sather/Makefile +++ b/lang/sather/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2006/03/04 21:29:56 jlam Exp $ +# $NetBSD: Makefile,v 1.32 2006/03/05 16:27:26 jlam Exp $ DISTNAME= sather-1.2.1 PKGREVISION= 6 @@ -9,11 +9,10 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.gnu.org/software/sather/ COMMENT= Compiler for the Sather object oriented programming language -USE_TOOLS+= gmake +USE_TOOLS+= gmake makeinfo BUILD_TARGET= full optional -USE_MAKEINFO= YES INFO_FILES= sather.info sather-tutorial.info sather-mode.info REPLACE_PERL= Browser/Web/ps2gif diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile index 72def11a1ee..0ad3a708433 100644 --- a/lang/smalltalk/Makefile +++ b/lang/smalltalk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2006/03/04 21:29:56 jlam Exp $ +# $NetBSD: Makefile,v 1.38 2006/03/05 16:27:26 jlam Exp $ DISTNAME= smalltalk-2.1.9 PKGREVISION= 2 @@ -12,10 +12,9 @@ COMMENT= GNU Smalltalk: A smalltalk-80 implementation ONLY_FOR_PLATFORM= *-*-i386 *-*-sparc *-*-powerpc LIBTOOLIZE_PLIST= NO # Manually created libc.la breaks PLIST. -USE_TOOLS+= gawk gmake pkg-config +USE_TOOLS+= gawk gmake makeinfo pkg-config USE_GNU_READLINE= YES USE_LIBTOOL= YES -USE_MAKEINFO= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --with-gdbm=${BUILDLINK_PREFIX.gdbm}/lib CONFIGURE_ARGS+= --with-gmp=${BUILDLINK_PREFIX.gmp}/lib -- cgit v1.2.3