diff options
| author | rillig <rillig> | 2005-12-05 20:49:47 +0000 |
|---|---|---|
| committer | rillig <rillig> | 2005-12-05 20:49:47 +0000 |
| commit | b4f920543059af038598712771c3211999ef42a6 (patch) | |
| tree | dac5b1dd14794d86b061d26b9503adb2552ed3f8 /textproc | |
| parent | 5bf026ec112f405b514a2d69a72e10fa92c4c524 (diff) | |
| download | pkgsrc-b4f920543059af038598712771c3211999ef42a6.tar.gz | |
Fixed pkglint warnings. The warnings are mostly quoting issues, for
example MAKE_ENV+=FOO=${BAR} is changed to MAKE_ENV+=FOO=${BAR:Q}. Some
other changes are outlined in
http://mail-index.netbsd.org/tech-pkg/2005/12/02/0034.html
Diffstat (limited to 'textproc')
64 files changed, 146 insertions, 154 deletions
diff --git a/textproc/aiksaurus/Makefile b/textproc/aiksaurus/Makefile index 329a2508327..a64a7d8e410 100644 --- a/textproc/aiksaurus/Makefile +++ b/textproc/aiksaurus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/04/11 21:47:31 tv Exp $ +# $NetBSD: Makefile,v 1.12 2005/12/05 20:51:02 rillig Exp $ # DISTNAME= aiksaurus-1.2.1 @@ -14,7 +14,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews USE_LIBTOOL= YES USE_LANGUAGES= c c++ GNU_CONFIGURE= YES -CONFIGURE_ARGS= --without-gtk +CONFIGURE_ARGS+= --without-gtk PKGCONFIG_OVERRIDE= base/aiksaurus-1.0.pc.in .include "../../mk/bsd.pkg.mk" diff --git a/textproc/biblook/Makefile b/textproc/biblook/Makefile index 3d7e842959a..677f454a583 100644 --- a/textproc/biblook/Makefile +++ b/textproc/biblook/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/10/12 07:10:57 seb Exp $ +# $NetBSD: Makefile,v 1.10 2005/12/05 20:51:02 rillig Exp $ # DISTNAME= biblook @@ -12,7 +12,7 @@ COMMENT= Indexing and searching tools for BibTeX bibliography databases WRKSRC= ${WRKDIR} MAKE_ENV+= MANDIR=${PREFIX}/${PKGMANDIR}/man1 -MAKE_FLAGS= CC="${CC}" +MAKE_FLAGS+= CC=${CC:Q} # override definitions in the package's Makefile via command line MAKE_FLAGS+= OPT="${CFLAGS} -Dunix" diff --git a/textproc/chasen-base/Makefile b/textproc/chasen-base/Makefile index 8c33fd19515..24eec9366f8 100644 --- a/textproc/chasen-base/Makefile +++ b/textproc/chasen-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/08/18 15:37:17 taca Exp $ +# $NetBSD: Makefile,v 1.13 2005/12/05 20:51:02 rillig Exp $ # DISTNAME= chasen-${CHASEN_VERSION} @@ -23,7 +23,7 @@ OWN_DIRS= ${CHASEN_DICDIR} LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig -.include "../chasen/Makefile.common" +.include "../../textproc/chasen/Makefile.common" .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/darts/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/dict-dictionaries/Makefile b/textproc/dict-dictionaries/Makefile index 3544900bab6..83b16bb4d75 100644 --- a/textproc/dict-dictionaries/Makefile +++ b/textproc/dict-dictionaries/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:34 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:51:02 rillig Exp $ DISTNAME= # PKGNAME= dict-data-1.8.0 @@ -15,7 +15,7 @@ MAINTAINER= mike@ethmoid.org HOMEPAGE= http://www.dict.org/ COMMENT= Dictionary data for DICTD -DEPENDS= dict-server>=1.8.0nb1:../../textproc/dict-server +DEPENDS+= dict-server>=1.8.0nb1:../../textproc/dict-server USE_TOOLS+= gmake diff --git a/textproc/docbook-xml/Makefile b/textproc/docbook-xml/Makefile index e8bb9c7763e..e7c99823784 100644 --- a/textproc/docbook-xml/Makefile +++ b/textproc/docbook-xml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/10/02 15:07:45 jmmv Exp $ +# $NetBSD: Makefile,v 1.22 2005/12/05 20:51:02 rillig Exp $ # DISTNAME= docbook-xml-4.4 @@ -13,7 +13,7 @@ MAINTAINER= jmmv@NetBSD.org HOMEPAGE= http://www.oasis-open.org/docbook/ COMMENT= XML DTD designed for computer documentation -BUILD_DEPENDS= unzip-[0-9]*:../../archivers/unzip +BUILD_DEPENDS+= unzip-[0-9]*:../../archivers/unzip PKG_INSTALLATION_TYPES= overwrite pkgviews diff --git a/textproc/docbook-xsl/Makefile b/textproc/docbook-xsl/Makefile index f490e3753b2..5351c0d197f 100644 --- a/textproc/docbook-xsl/Makefile +++ b/textproc/docbook-xsl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2005/09/29 19:40:41 kristerw Exp $ +# $NetBSD: Makefile,v 1.31 2005/12/05 20:51:02 rillig Exp $ # DISTNAME= docbook-xsl-1.69.1 @@ -11,7 +11,7 @@ MAINTAINER= jmmv@NetBSD.org HOMEPAGE= http://docbook.sourceforge.net/ COMMENT= Docbook XSL modular stylesheet -DEPENDS= docbook-xml>=4.2:../../textproc/docbook-xml +DEPENDS+= docbook-xml>=4.2:../../textproc/docbook-xml USE_LANGUAGES= # empty NO_BUILD= YES diff --git a/textproc/docbook/Makefile b/textproc/docbook/Makefile index c811d4047fd..0f88e6c9b00 100644 --- a/textproc/docbook/Makefile +++ b/textproc/docbook/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2005/04/11 21:47:33 tv Exp $ +# $NetBSD: Makefile,v 1.34 2005/12/05 20:51:02 rillig Exp $ DISTNAME= docbook-4.4 CATEGORIES= textproc @@ -19,7 +19,7 @@ MAINTAINER= rh@NetBSD.org HOMEPAGE= http://www.oasis-open.org/docbook COMMENT= SGML DTD designed for computer documentation -BUILD_DEPENDS= unzip-[0-9]*:../../archivers/unzip +BUILD_DEPENDS+= unzip-[0-9]*:../../archivers/unzip DEPENDS+= iso8879>=1986:../../textproc/iso8879 WRKSRC= ${WRKDIR} @@ -34,7 +34,6 @@ SGML_CATALOGS= .for ver in 2.4.1 3.0 3.1 4.0 4.1 4.2 4.3 4.4 SGML_CATALOGS+= ${INSTDIR}/${ver}/catalog .endfor -.undef ver do-build: .for ver in 241 30 31 40 41 42 43 44 diff --git a/textproc/eb/Makefile b/textproc/eb/Makefile index 520fe4aff80..2ffd0f0b64d 100644 --- a/textproc/eb/Makefile +++ b/textproc/eb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2005/07/16 01:19:23 jlam Exp $ +# $NetBSD: Makefile,v 1.34 2005/12/05 20:51:02 rillig Exp $ DISTNAME= eb-4.1.3 CATEGORIES= textproc japanese @@ -67,7 +67,7 @@ EGDIR= ${PREFIX}/share/examples/eb # XXX Better than having unflexible/static patches. IMO. # - ZLIBLIBS="-L$z_libdir -lz" # + ZLIBLIBS="-Wl,-R$z_libdir -L$z_libdir -lz" -SUBST_CLASSES= runpath +SUBST_CLASSES+= runpath SUBST_STAGE.runpath= post-patch SUBST_FILES.runpath= configure configure.ac SUBST_SED.runpath= -e 's|^\(.*LIBS=['\''"]\)-L\(\$$[^[:blank:]][^[:blank:]]*\)\(.*\)$$|\1-Wl,-R\2 -L\2\3|' diff --git a/textproc/flyspell/Makefile b/textproc/flyspell/Makefile index fa8ebb340f8..be42717b7cf 100644 --- a/textproc/flyspell/Makefile +++ b/textproc/flyspell/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/09/05 17:04:53 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2005/12/05 20:51:02 rillig Exp $ # DISTNAME= flyspell-1.7j.el @@ -11,7 +11,7 @@ MAINTAINER= wiz@NetBSD.org HOMEPAGE= http://www-sop.inria.fr/mimosa/personnel/Manuel.Serrano/flyspell/flyspell.html COMMENT= Emacs/Xemacs on-the-fly spell checker -DEPENDS= ${EMACS_PKGNAME_PREFIX}ispell-emacs-[0-9]*:../../textproc/ispell-emacs +DEPENDS+= ${EMACS_PKGNAME_PREFIX}ispell-emacs-[0-9]*:../../textproc/ispell-emacs EXTRACT_ONLY= # None diff --git a/textproc/fop/Makefile b/textproc/fop/Makefile index 5d26e113ec5..3e681462292 100644 --- a/textproc/fop/Makefile +++ b/textproc/fop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/04/11 21:47:34 tv Exp $ +# $NetBSD: Makefile,v 1.24 2005/12/05 20:51:02 rillig Exp $ # # Note: we currently use the pre-built (-bin) distribution of FOP, # because although FOP runs fine under JDK 1.1, JDK 1.2 or greater is @@ -22,8 +22,8 @@ COMMENT= The Apache Project's XSL Formatting Objects implementation WRKSRC= ${WRKDIR} USE_JAVA= run -NO_CONFIGURE= -NO_BUILD= +NO_CONFIGURE= yes +NO_BUILD= yes .include "../../mk/bsd.prefs.mk" diff --git a/textproc/freepwing/Makefile b/textproc/freepwing/Makefile index 913ed541b39..18af8c5eb97 100644 --- a/textproc/freepwing/Makefile +++ b/textproc/freepwing/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/08/09 01:52:32 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2005/12/05 20:51:03 rillig Exp $ DISTNAME= freepwing-1.4.4 PKGREVISION= 3 @@ -15,6 +15,6 @@ USE_TOOLS+= gmake perl:run GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-perllibdir=${PERL5_INSTALLVENDORLIB} CONFIGURE_ARGS+= --with-pkgdocdir=${PREFIX}/share/doc/freepwing -CONFIGURE_ENV+= GNUMAKE="${GMAKE}" +CONFIGURE_ENV+= GNUMAKE=${GMAKE:Q} .include "../../mk/bsd.pkg.mk" diff --git a/textproc/gdome2/Makefile b/textproc/gdome2/Makefile index 2121f31e428..8e78f3e6443 100644 --- a/textproc/gdome2/Makefile +++ b/textproc/gdome2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/11/14 15:12:59 adam Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 20:51:03 rillig Exp $ DISTNAME= gdome2-0.8.1 PKGREVISION= 1 @@ -10,7 +10,7 @@ HOMEPAGE= http://gdome2.cs.unibo.it/ COMMENT= Gnome DOM (Document Object Model) engine USE_LIBTOOL= yes -USE_TOOLS= pkg-config +USE_TOOLS+= pkg-config GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html PKGCONFIG_OVERRIDE= ${WRKSRC}/gdome2.pc.in diff --git a/textproc/gnome-doc-utils/Makefile b/textproc/gnome-doc-utils/Makefile index 8e4d3b3a4e0..daa7e715849 100644 --- a/textproc/gnome-doc-utils/Makefile +++ b/textproc/gnome-doc-utils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/10/07 15:56:46 drochner Exp $ +# $NetBSD: Makefile,v 1.8 2005/12/05 20:51:03 rillig Exp $ # DISTNAME= gnome-doc-utils-0.4.2 @@ -18,7 +18,7 @@ GNU_CONFIGURE= YES USE_LANGUAGES= # empty USE_PKGLOCALEDIR= YES -CONFIGURE_ARGS+= PYTHON=${PYTHONBIN} +CONFIGURE_ARGS+= PYTHON=${PYTHONBIN:Q} PKGCONFIG_OVERRIDE= gnome-doc-utils.pc.in PKGCONFIG_OVERRIDE+= xml2po/xml2po.pc.in diff --git a/textproc/grep/Makefile b/textproc/grep/Makefile index b9fc1a33cdb..ce801c06c35 100644 --- a/textproc/grep/Makefile +++ b/textproc/grep/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/04/11 21:47:34 tv Exp $ +# $NetBSD: Makefile,v 1.18 2005/12/05 20:51:03 rillig Exp $ # DISTNAME= grep-2.5.1 @@ -26,7 +26,7 @@ INFO_FILES= grep.info .if defined(GNU_PROGRAM_PREFIX) CONFIGURE_ARGS+= --program-prefix=${GNU_PROGRAM_PREFIX} .endif -PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX} +PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q} BUILD_DEFS+= GNU_PROGRAM_PREFIX .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/textproc/groff/Makefile b/textproc/groff/Makefile index 3070ded6c7f..143de948036 100644 --- a/textproc/groff/Makefile +++ b/textproc/groff/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2005/11/28 06:41:22 jlam Exp $ +# $NetBSD: Makefile,v 1.29 2005/12/05 20:51:03 rillig Exp $ # DISTNAME= groff-1.19.1 @@ -15,15 +15,15 @@ DEPENDS+= psutils>=1.17:../../print/psutils USE_LANGUAGES= c c++ GNU_CONFIGURE= YES -CONFIGURE_ENV+= PERLPATH="${PERL5}" +CONFIGURE_ENV+= PERLPATH=${PERL5:Q} USE_TOOLS+= gs:run perl:run INFO_FILES= groff .include "../../mk/bsd.prefs.mk" -.ifdef PAPERSIZE -CONFIGURE_ENV+= PAGE=${PAPERSIZE} +.if defined(PAPERSIZE) +CONFIGURE_ENV+= PAGE=${PAPERSIZE:Q} .endif # Usually the mdoc.local "volume-operating-system" definition is for diff --git a/textproc/gsed/Makefile b/textproc/gsed/Makefile index 4c670771e73..0050ad3ea47 100644 --- a/textproc/gsed/Makefile +++ b/textproc/gsed/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/05/22 20:08:34 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2005/12/05 20:51:03 rillig Exp $ # DISTNAME= sed-4.1.1 @@ -28,7 +28,7 @@ TEST_TARGET= check .if defined(GNU_PROGRAM_PREFIX) CONFIGURE_ARGS+= --program-prefix=${GNU_PROGRAM_PREFIX} .endif -PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX} +PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q} BUILD_DEFS+= GNU_PROGRAM_PREFIX .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/textproc/helpdeco/Makefile b/textproc/helpdeco/Makefile index fe22be2f2e5..8b26859dc09 100644 --- a/textproc/helpdeco/Makefile +++ b/textproc/helpdeco/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/12/04 15:50:13 ben Exp $ +# $NetBSD: Makefile,v 1.19 2005/12/05 20:51:03 rillig Exp $ # DISTNAME= helpdeco-2.1.3 @@ -15,7 +15,7 @@ COMMENT= Windows .hlp to .rtf converter CFLAGS+= -DHAVE_STRLCPY .endif -MAKE_ENV+= CFLAGS="${CFLAGS}" +MAKE_ENV+= CFLAGS=${CFLAGS:M*:Q} BUILD_TARGET= build USE_TOOLS+= gmake diff --git a/textproc/html2text/Makefile b/textproc/html2text/Makefile index 7983579ff84..a574a153ca4 100644 --- a/textproc/html2text/Makefile +++ b/textproc/html2text/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/07/15 18:27:53 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2005/12/05 20:51:03 rillig Exp $ DISTNAME= html2text-1.3.2a CATEGORIES= textproc @@ -9,9 +9,9 @@ HOMEPAGE= http://userpage.fu-berlin.de/~mbayer/tools/html2text.html COMMENT= Advanced HTML-to-text converter USE_LANGUAGES= c c++ -GCC_REQD= 3.0 +GCC_REQD+= 3.0 HAS_CONFIGURE= yes -CONFIGURE_ENV+= ECHO="${ECHO}" +CONFIGURE_ENV+= ECHO=${ECHO:Q} USE_TOOLS+= gunzip INSTALLATION_DIRS= bin man/man1 man/man5 diff --git a/textproc/icu/Makefile b/textproc/icu/Makefile index 12a114e6674..56fe6384c02 100644 --- a/textproc/icu/Makefile +++ b/textproc/icu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2005/08/19 18:12:39 jlam Exp $ +# $NetBSD: Makefile,v 1.43 2005/12/05 20:51:03 rillig Exp $ # DISTNAME= icu-3.2 @@ -19,7 +19,7 @@ TEST_TARGET= check GNU_CONFIGURE= YES CONFIGURE_ARGS+= --enable-static -CONFIGURE_ENV+= U_MAKE="${TOOLS_GMAKE}" +CONFIGURE_ENV+= U_MAKE=${TOOLS_GMAKE:Q} # ICU's configure script will automatically append "/icu" to the sysconfdir. CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR} diff --git a/textproc/intltool/buildlink3.mk b/textproc/intltool/buildlink3.mk index fb4e612b0a8..21d280f6bc9 100644 --- a/textproc/intltool/buildlink3.mk +++ b/textproc/intltool/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.9 2005/10/08 17:18:47 jmmv Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2005/12/05 20:51:03 rillig Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ INTLTOOL_BUILDLINK3_MK:= ${INTLTOOL_BUILDLINK3_MK}+ @@ -19,7 +19,7 @@ BUILDLINK_DEPMETHOD.intltool?= build USE_TOOLS+= perl .if !empty(INTLTOOL_BUILDLINK3_MK:M+) -CONFIGURE_ENV+= INTLTOOL_PERL="${PERL5}" +CONFIGURE_ENV+= INTLTOOL_PERL=${PERL5:Q} INTLTOOLIZE= ${BUILDLINK_PREFIX.intltool}/bin/intltoolize INTLTOOL_OVERRIDE?= intltool-* */intltool-* diff --git a/textproc/iso12083/Makefile b/textproc/iso12083/Makefile index 8a70d9e306d..d14d867f448 100644 --- a/textproc/iso12083/Makefile +++ b/textproc/iso12083/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/04/11 21:47:35 tv Exp $ +# $NetBSD: Makefile,v 1.15 2005/12/05 20:51:03 rillig Exp $ DISTNAME= iso12083-1993 PKGREVISION= 4 @@ -8,7 +8,7 @@ MASTER_SITES= ftp://info.ex.ac.uk/pub/SGML/ISO-12083/ \ ftp://ftp.oit.unc.edu/pub/packages/SGML/oslo-mirror/ISO12083/ DISTFILES= article.dtd book.dtd maths.dtd serial.dtd -MAINTAINER= rh@NetBSD.ORG +MAINTAINER= rh@NetBSD.org HOMEPAGE= http://www.oasis-open.org/cover/sgml-xml.html COMMENT= SGML DTDs from the The Electronic Publishing Special Interest Group diff --git a/textproc/iso8879/Makefile b/textproc/iso8879/Makefile index 16f068ff272..a17801f73c6 100644 --- a/textproc/iso8879/Makefile +++ b/textproc/iso8879/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/04/11 21:47:36 tv Exp $ +# $NetBSD: Makefile,v 1.22 2005/12/05 20:51:03 rillig Exp $ DISTNAME= ISOEnts PKGNAME= iso8879-1986 @@ -7,7 +7,7 @@ CATEGORIES= textproc MASTER_SITES= http://www.oasis-open.org/cover/ EXTRACT_SUFX= .zip -MAINTAINER= rh@NetBSD.ORG +MAINTAINER= rh@NetBSD.org HOMEPAGE= http://www.iso.ch/cate/d16387.html COMMENT= Character entity sets from ISO 8879:1986 (SGML) diff --git a/textproc/ispell-base/Makefile b/textproc/ispell-base/Makefile index 62848b3aaa6..8f315bef9ef 100644 --- a/textproc/ispell-base/Makefile +++ b/textproc/ispell-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/07/15 20:14:03 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2005/12/05 20:51:03 rillig Exp $ # DISTNAME= ispell-3.3.02 @@ -14,7 +14,7 @@ CONFLICTS+= ispell-[0-9]* USE_TOOLS+= mktemp:run -MAKE_FLAGS+= TMPDIR="${WRKDIR}" +MAKE_FLAGS+= TMPDIR=${WRKDIR:Q} .include "../../mk/bsd.prefs.mk" diff --git a/textproc/ispell-british/Makefile b/textproc/ispell-british/Makefile index 59c9fbf1996..9b6ce483e78 100644 --- a/textproc/ispell-british/Makefile +++ b/textproc/ispell-british/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/07/07 12:44:44 markd Exp $ +# $NetBSD: Makefile,v 1.14 2005/12/05 20:51:03 rillig Exp $ # DISTNAME= ispell-3.3.02 @@ -16,7 +16,7 @@ BUILD_TARGET= config.sh all-languages DICT_LANG= british -MAKE_FLAGS+= TMPDIR="${WRKDIR}" +MAKE_FLAGS+= TMPDIR=${WRKDIR:Q} .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "SunOS" @@ -33,7 +33,7 @@ do-configure: ${ECHO} "#define LANGUAGES \"{${DICT_LANG},MASTERDICTS=${DICT_LANG}.xlg,HASHFILES=${DICT_LANG}xlg.hash,EXTRADICT=}\"" >>local.h; \ ${ECHO} '#define MASTERHASH "${DICT_LANG}xlg.hash"' >> local.h ; \ ${ECHO} "#undef WORDS" >> local.h ; \ - ${ECHO} '#define WORDS "${WORDS}"' >> local.h ; \ + ${ECHO} '#define WORDS "${WORDS}"' >> local.h do-install: ${CP} ${WRKSRC}/languages/${DICT_LANG}/${DICT_LANG}xlg.hash ${PREFIX}/lib diff --git a/textproc/ispell-emacs/Makefile b/textproc/ispell-emacs/Makefile index f5c9feb800c..72f2bcf6089 100644 --- a/textproc/ispell-emacs/Makefile +++ b/textproc/ispell-emacs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/08/28 04:25:31 uebayasi Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 20:51:03 rillig Exp $ # DISTNAME= ispell.el @@ -11,13 +11,13 @@ MAINTAINER= wiz@NetBSD.org HOMEPAGE= http://kdstevens.com/~stevens/ispell-page.html COMMENT= Emacs interface for ispell spell checker -DEPENDS= ispell-base-[0-9]*:../../textproc/ispell-base +DEPENDS+= ispell-base-[0-9]*:../../textproc/ispell-base DIST_SUBDIR= ${PKGNAME_NOREV:C|^xemacs-||} WRKSRC= ${WRKDIR} -NO_CONFIGURE= # -NO_BUILD= # +NO_CONFIGURE= yes +NO_BUILD= yes do-install: ${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX}/ispell diff --git a/textproc/ispell-russian/Makefile.common b/textproc/ispell-russian/Makefile.common index 33190b119c5..0d859116cc8 100644 --- a/textproc/ispell-russian/Makefile.common +++ b/textproc/ispell-russian/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.1 2004/01/23 15:02:07 agc Exp $ +# $NetBSD: Makefile.common,v 1.2 2005/12/05 20:51:03 rillig Exp $ DISTNAME= rus-ispell-0.99f5 CATEGORIES= textproc @@ -14,6 +14,6 @@ PATCHDIR= ${.CURDIR}/../../textproc/ispell-russian/patches DISTINFO_FILE= ${.CURDIR}/../../textproc/ispell-russian/distinfo WRKSRC= ${WRKDIR} -MAKE_ENV+= CAT=${CAT} RM=${RM} SED=${SED} TR=${TR} UNIQ="uniq" +MAKE_ENV+= CAT=${CAT:Q} RM=${RM:Q} SED=${SED:Q} TR=${TR:Q} UNIQ="uniq" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/ispell-slovak/Makefile b/textproc/ispell-slovak/Makefile index ebc1149133e..18f2dd43cd2 100644 --- a/textproc/ispell-slovak/Makefile +++ b/textproc/ispell-slovak/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2004/09/12 20:57:41 salo Exp $ +# $NetBSD: Makefile,v 1.10 2005/12/05 20:51:03 rillig Exp $ # DISTNAME= ispell-sk-0.2.2 @@ -12,6 +12,6 @@ COMMENT= Slovak dictionary for ispell DEPENDS+= ispell-base>=3.1.20:../../textproc/ispell-base -MAKE_ENV+= CAT=${CAT} SORT=${SORT} +MAKE_ENV+= CAT=${CAT:Q} SORT=${SORT:Q} .include "../../mk/bsd.pkg.mk" diff --git a/textproc/ispell-spanish/Makefile b/textproc/ispell-spanish/Makefile index 5b6bdc1abb9..d90c63da3a7 100644 --- a/textproc/ispell-spanish/Makefile +++ b/textproc/ispell-spanish/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2004/09/12 21:37:27 jmmv Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:51:03 rillig Exp $ # DISTNAME= espa~nol-1.7 @@ -12,6 +12,6 @@ COMMENT= Spanish dictionary for interactive spelling checker DEPENDS+= ispell-base>=3.1.20:../../textproc/ispell-base -MAKE_FLAGS+= TMPDIR="${WRKDIR}" +MAKE_FLAGS+= TMPDIR=${WRKDIR:Q} .include "../../mk/bsd.pkg.mk" diff --git a/textproc/jade/Makefile b/textproc/jade/Makefile index b0c7fd1dc55..4751c4e5e00 100644 --- a/textproc/jade/Makefile +++ b/textproc/jade/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2005/05/30 14:43:03 minskim Exp $ +# $NetBSD: Makefile,v 1.40 2005/12/05 20:51:03 rillig Exp $ DISTNAME= jade-1.2.1 PKGREVISION= 9 @@ -25,7 +25,7 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/config/ltconfig SGML_CATALOGS= ${PREFIX}/share/sgml/jade/catalog -CONFIGURE_ARGS= --enable-default-catalog=${PREFIX}/share/sgml/jade/catalog +CONFIGURE_ARGS+= --enable-default-catalog=${PREFIX:Q}/share/sgml/jade/catalog CONFIGURE_ARGS+= --enable-mif CXXFLAGS+= ${CFLAGS} diff --git a/textproc/jade/hacks.mk b/textproc/jade/hacks.mk index 5d904d51402..0275c79cd05 100644 --- a/textproc/jade/hacks.mk +++ b/textproc/jade/hacks.mk @@ -1,6 +1,6 @@ -# $NetBSD: hacks.mk,v 1.1 2005/01/25 20:26:06 tv Exp $ +# $NetBSD: hacks.mk,v 1.2 2005/12/05 20:51:03 rillig Exp $ -.ifndef JADE_HACKS_MK +.if !defined(JADE_HACKS_MK) JADE_HACKS_MK= # defined ### [Tue Jan 25 20:25:41 UTC 2005 : tv] diff --git a/textproc/libpathan/Makefile b/textproc/libpathan/Makefile index f0089ac8b20..0c534926d8e 100644 --- a/textproc/libpathan/Makefile +++ b/textproc/libpathan/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/07/20 04:50:46 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2005/12/05 20:51:05 rillig Exp $ DISTNAME= libpathan-1.2-2-src PKGNAME= ${DISTNAME:S/-2-src/.2/} @@ -18,7 +18,7 @@ USE_TOOLS+= bison gmake perl USE_LIBTOOL= YES USE_LANGUAGES= c++ -CONFIGURE_ARGS+= XERCESCROOT=${LOCALBASE} +CONFIGURE_ARGS+= XERCESCROOT=${LOCALBASE:Q} .include "../../textproc/xerces-c/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile index 510d1876b94..9f59b28b273 100644 --- a/textproc/libxml2/Makefile +++ b/textproc/libxml2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.74 2005/09/30 19:58:00 wiz Exp $ +# $NetBSD: Makefile,v 1.75 2005/12/05 20:51:06 rillig Exp $ DISTNAME= libxml2-2.6.22 CATEGORIES= textproc @@ -28,7 +28,7 @@ CONFIGURE_ARGS+= --without-threads # NetBSD-sparc64-1.6*'s f77 makes configure failing and as f77 is not # needed for this package the following does no harm on other platforms. -CONFIGURE_ENV+= F77=${FALSE} +CONFIGURE_ENV+= F77=${FALSE:Q} MAKE_ENV+= PAX=${PAX:Q} diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile index 02f83057b0b..33066e8a378 100644 --- a/textproc/libxslt/Makefile +++ b/textproc/libxslt/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.60 2005/09/05 07:38:25 recht Exp $ +# $NetBSD: Makefile,v 1.61 2005/12/05 20:51:07 rillig Exp $ DISTNAME= libxslt-1.1.15 -PKGNAME= ${DISTNAME} CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libxslt/1.1/} EXTRACT_SUFX= .tar.bz2 diff --git a/textproc/namazu2/Makefile b/textproc/namazu2/Makefile index 8c17009cf6b..7e253922e7d 100644 --- a/textproc/namazu2/Makefile +++ b/textproc/namazu2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/08/18 15:46:24 taca Exp $ +# $NetBSD: Makefile,v 1.23 2005/12/05 20:51:07 rillig Exp $ DISTNAME= namazu-2.0.14 PKGREVISION= 3 @@ -18,7 +18,7 @@ CONFLICTS+= namazu-[0-9]* USE_PKGLOCALEDIR= yes USE_PKGINSTALL= yes -USE_TOOLS= perl:run +USE_TOOLS+= perl:run GNU_CONFIGURE= yes USE_LANGUAGE= c USE_LIBTOOL= yes diff --git a/textproc/ndtpd/Makefile b/textproc/ndtpd/Makefile index d1d442ba99e..e41ba40c5d7 100644 --- a/textproc/ndtpd/Makefile +++ b/textproc/ndtpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/04/11 21:47:36 tv Exp $ +# $NetBSD: Makefile,v 1.19 2005/12/05 20:51:07 rillig Exp $ # DISTNAME= ndtpd-3.1.5 @@ -30,7 +30,7 @@ CONF_FILES= ${EGDIR}/ndtpd.conf.default ${PKG_SYSCONFDIR}/ndtpd.conf RCD_SCRIPTS= ndtpd # Will be also used for ndtpd.sh. -FILES_SUBST+= NDTPD_RUNDIR=${NDTPD_RUNDIR} +FILES_SUBST+= NDTPD_RUNDIR=${NDTPD_RUNDIR:Q} EGDIR= ${PREFIX}/share/examples/ndtpd NDTPD_LOGDIR= ${DESTDIR}/var/log diff --git a/textproc/openjade/Makefile b/textproc/openjade/Makefile index 118dbfe03b9..73a8701efda 100644 --- a/textproc/openjade/Makefile +++ b/textproc/openjade/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/07/16 01:19:24 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2005/12/05 20:51:07 rillig Exp $ # DISTNAME= openjade-1.3.2 @@ -15,7 +15,7 @@ USE_LANGUAGES= c c++ USE_LIBTOOL= YES GNU_CONFIGURE= YES -CONFIGURE_ENV+= CXXFLAGS="${CFLAGS}" +CONFIGURE_ENV+= CXXFLAGS=${CFLAGS:M*:Q} CONFIGURE_ARGS+= --enable-default-catalog=${OPENJADE_DATA_DIR}/catalog \ --datadir=${OPENJADE_DATA_DIR} diff --git a/textproc/p5-XML-Xerces/Makefile b/textproc/p5-XML-Xerces/Makefile index 4275ba4cb84..6c5232f18bf 100644 --- a/textproc/p5-XML-Xerces/Makefile +++ b/textproc/p5-XML-Xerces/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/11/03 13:45:46 rillig Exp $ +# $NetBSD: Makefile,v 1.15 2005/12/05 20:51:07 rillig Exp $ # DISTNAME= XML-Xerces-2.3.0-4 @@ -23,7 +23,7 @@ MAKE_ENV+= XERCESCROOT="${BUILDLINK_PREFIX.xerces-c}" LANG="" # Xerces-C is built unthreaded in pkgsrc (for now). BUILDLINK_TRANSFORM+= rm:-lpthread -BUILDLINK_DEPENDS.xerces-c= xerces-c>=2.3.0 +BUILDLINK_DEPENDS.xerces-c+= xerces-c>=2.3.0 .include "../../textproc/xerces-c/buildlink3.mk" .include "../../lang/perl5/module.mk" diff --git a/textproc/php-pspell/Makefile b/textproc/php-pspell/Makefile index c6cb66c6294..a1cb1136a35 100644 --- a/textproc/php-pspell/Makefile +++ b/textproc/php-pspell/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.1.1.1 2005/09/27 12:01:59 salo Exp $ +# $NetBSD: Makefile,v 1.2 2005/12/05 20:51:07 rillig Exp $ MODNAME= pspell CATEGORIES+= textproc -PKGREVISION= # empty COMMENT= PHP extension for pspell support diff --git a/textproc/php-wddx/Makefile b/textproc/php-wddx/Makefile index abbf09279f5..bfe4d90ce2e 100644 --- a/textproc/php-wddx/Makefile +++ b/textproc/php-wddx/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2005/04/11 21:47:41 tv Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:51:07 rillig Exp $ MODNAME= wddx CATEGORIES+= textproc -PKGREVISION= # empty COMMENT= PHP extension for WDDX support diff --git a/textproc/php4-domxml/Makefile b/textproc/php4-domxml/Makefile index 847d478da8d..83b7a127677 100644 --- a/textproc/php4-domxml/Makefile +++ b/textproc/php4-domxml/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.21 2005/04/11 21:47:41 tv Exp $ +# $NetBSD: Makefile,v 1.22 2005/12/05 20:51:07 rillig Exp $ MODNAME= domxml CATEGORIES+= textproc -PKGREVISION= # empty COMMENT= PHP4 extension for DOM support diff --git a/textproc/php4-xslt/Makefile b/textproc/php4-xslt/Makefile index f0938346fb8..8d57925bf3d 100644 --- a/textproc/php4-xslt/Makefile +++ b/textproc/php4-xslt/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.17 2005/09/04 12:46:01 jdolecek Exp $ +# $NetBSD: Makefile,v 1.18 2005/12/05 20:51:07 rillig Exp $ MODNAME= xslt CATEGORIES+= textproc -PKGREVISION= # empty COMMENT= PHP4 extension for XSLT functions (Sablotron backend) diff --git a/textproc/php5-dom/Makefile b/textproc/php5-dom/Makefile index dab377f69af..114c7eef179 100644 --- a/textproc/php5-dom/Makefile +++ b/textproc/php5-dom/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2005/04/11 21:47:41 tv Exp $ +# $NetBSD: Makefile,v 1.3 2005/12/05 20:51:07 rillig Exp $ MODNAME= dom CATEGORIES+= textproc -PKGREVISION= # empty COMMENT= PHP5 extension for DOM support diff --git a/textproc/php5-xsl/Makefile b/textproc/php5-xsl/Makefile index cf48a4075f3..567a3fa1712 100644 --- a/textproc/php5-xsl/Makefile +++ b/textproc/php5-xsl/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2005/04/11 21:47:41 tv Exp $ +# $NetBSD: Makefile,v 1.3 2005/12/05 20:51:07 rillig Exp $ MODNAME= xsl CATEGORIES+= textproc -PKGREVISION= # empty COMMENT= PHP5 extension for XSLT functions diff --git a/textproc/postgresql-autodoc/Makefile b/textproc/postgresql-autodoc/Makefile index 8c5fff560ff..4929c3a638b 100644 --- a/textproc/postgresql-autodoc/Makefile +++ b/textproc/postgresql-autodoc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/07/16 01:19:24 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2005/12/05 20:51:07 rillig Exp $ # DISTNAME= postgresql_autodoc-1.24 @@ -10,13 +10,13 @@ MAINTAINER= recht@NetBSD.org HOMEPAGE= http://www.rbt.ca/autodoc/ COMMENT= Generate HTML, DOT, and XML description of database structure -DEPENDS= p5-DBD-postgresql-[0-9]*:../../databases/p5-DBD-postgresql +DEPENDS+= p5-DBD-postgresql-[0-9]*:../../databases/p5-DBD-postgresql DEPENDS+= p5-HTML-Template-[0-9]*:../../www/p5-HTML-Template WRKSRC= ${WRKDIR}/postgresql_autodoc USE_TOOLS+= gmake perl:run GNU_CONFIGURE= yes -CONFIGURE_ARGS= --datadir=${PREFIX}/share/${PKGBASE} -CONFIGURE_ENV+= ac_cv_path_PERL=${PERL5} +CONFIGURE_ARGS+= --datadir=${PREFIX:Q}/share/${PKGBASE:Q} +CONFIGURE_ENV+= ac_cv_path_PERL=${PERL5:Q} .include "../../mk/bsd.pkg.mk" diff --git a/textproc/py-HappyDoc/Makefile b/textproc/py-HappyDoc/Makefile index bfe7d3462b6..d61436c0a21 100644 --- a/textproc/py-HappyDoc/Makefile +++ b/textproc/py-HappyDoc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/04/11 21:47:41 tv Exp $ +# $NetBSD: Makefile,v 1.12 2005/12/05 20:51:07 rillig Exp $ DISTNAME= HappyDoc_r2_1 PKGNAME= ${PYPKGPREFIX}-HappyDoc-2.1 @@ -11,7 +11,7 @@ COMMENT= Python tool to generate Python API documents WRKSRC= ${WRKDIR}/HappyDoc-r2_1 PYDISTUTILSPKG= # defined -PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} +PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q} post-extract: ${MV} ${WRKSRC}/happydoc ${WRKSRC}/happydoc${PYVERSSUFFIX} diff --git a/textproc/py-expat/Makefile b/textproc/py-expat/Makefile index 32f5875e4c6..227afd83057 100644 --- a/textproc/py-expat/Makefile +++ b/textproc/py-expat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/04/11 21:47:41 tv Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/05 20:51:07 rillig Exp $ # PKGNAME= ${PYPKGPREFIX}-expat-0 @@ -17,7 +17,7 @@ PY_PATCHPLIST= yes PY_SETUP_SUBST+= EXPATPREFIX=${BUILDLINK_DIR} PY_SETUP_SUBST+= EXPATRTPREFIX=${BUILDLINK_PREFIX.expat} -PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} +PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q} # ignore errors due to missing files (EXTRACT_ELEMENTS!) diff --git a/textproc/py-libxslt/Makefile b/textproc/py-libxslt/Makefile index cc31251dda6..c5b7edb6f64 100644 --- a/textproc/py-libxslt/Makefile +++ b/textproc/py-libxslt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/10/07 15:42:30 drochner Exp $ +# $NetBSD: Makefile,v 1.15 2005/12/05 20:51:07 rillig Exp $ DISTNAME= libxslt-1.1.15 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -17,7 +17,7 @@ PYDISTUTILSPKG= YES PYBINMODULE= YES NO_CONFIGURE= YES -MAKE_ENV+= PYLIBXSLTVERSION=${PKGVERSION} +MAKE_ENV+= PYLIBXSLTVERSION=${PKGVERSION:Q} SUBST_CLASSES+= setup SUBST_MESSAGE.setup= "Fixing hardcoded paths." @@ -25,9 +25,9 @@ SUBST_STAGE.setup= pre-build SUBST_FILES.setup= setup.py SUBST_SED.setup= -e "s,@LIBICONVDIR@,${BUILDLINK_PREFIX.iconv},g" \ -e "s,@LIBXML2DIR@,${BUILDLINK_PREFIX.libxml2},g" \ - -e "s,@LIBXSLTDIR@,${BUILDLINK_PREFIX.libxslt},g" \ + -e "s,@LIBXSLTDIR@,${BUILDLINK_PREFIX.libxslt},g" -BUILDLINK_DEPENDS.libxslt= libxslt>=${PKGVERSION} +BUILDLINK_DEPENDS.libxslt+= libxslt>=${PKGVERSION} .include "../../textproc/libxslt/buildlink3.mk" .include "../../lang/python/extension.mk" diff --git a/textproc/py-xml/Makefile b/textproc/py-xml/Makefile index ad86792bbfb..7e2bd36a934 100644 --- a/textproc/py-xml/Makefile +++ b/textproc/py-xml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/07/24 14:33:19 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2005/12/05 20:51:07 rillig Exp $ # DISTNAME= PyXML-0.8.4 @@ -14,7 +14,7 @@ CONFLICTS+= PyXML-[0-9]* PYDISTUTILSPKG= yes PYBINMODULE= yes -BUILDLINK_DEPENDS.expat= expat>=1.95.6 +BUILDLINK_DEPENDS.expat+= expat>=1.95.6 PYSETUPBUILDARGS+= --with-libexpat=${BUILDLINK_DIR} PYSETUPBUILDARGS+= --ldflags="${EXPAT_LDFLAGS}" EXPAT_LDFLAGS= ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.expat}/lib @@ -29,7 +29,7 @@ post-extract: .endfor PYTHON_PATCH_SCRIPTS= ${PYXML_SCRIPTS:S/$/${PYVERSSUFFIX}/g} -PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} +PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q} .include "../../textproc/expat/buildlink3.mk" .include "../../lang/python/extension.mk" diff --git a/textproc/py-xmltools/Makefile b/textproc/py-xmltools/Makefile index 460c3755f8d..3afcb947289 100644 --- a/textproc/py-xmltools/Makefile +++ b/textproc/py-xmltools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/04/11 21:47:42 tv Exp $ +# $NetBSD: Makefile,v 1.14 2005/12/05 20:51:07 rillig Exp $ # DISTNAME= xmltools-1.3.7 @@ -11,7 +11,7 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.logilab.org/xmltools/ COMMENT= High level tools to help using XML in python -DEPENDS= ${PYPKGPREFIX}-FourSuite>=0.12:../../textproc/py-FourSuite +DEPENDS+= ${PYPKGPREFIX}-FourSuite>=0.12:../../textproc/py-FourSuite PYDISTUTILSPKG= yes diff --git a/textproc/rman/Makefile b/textproc/rman/Makefile index ede65b225d5..a4a3f69c481 100644 --- a/textproc/rman/Makefile +++ b/textproc/rman/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/03/24 21:13:02 wiz Exp $ +# $NetBSD: Makefile,v 1.26 2005/12/05 20:51:08 rillig Exp $ DISTNAME= rman PKGNAME= rman-3.0.9 @@ -15,7 +15,7 @@ WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} .include "../../mk/bsd.prefs.mk" .if exists(${X11BASE}/bin/rman) -PKG_SKIP_REASON= "${PKGNAME} is part of your X11 distribution" +PKG_SKIP_REASON+= "${PKGNAME} is part of your X11 distribution" .endif post-install: diff --git a/textproc/robodoc/Makefile b/textproc/robodoc/Makefile index be311e2c8ad..49e0870135c 100644 --- a/textproc/robodoc/Makefile +++ b/textproc/robodoc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/11/08 19:45:54 tv Exp $ +# $NetBSD: Makefile,v 1.8 2005/12/05 20:51:08 rillig Exp $ # DISTNAME= robodoc-3.2.3 @@ -6,7 +6,7 @@ CATEGORIES= textproc devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=robodoc/} MAINTAINER= tech-pkg@NetBSD.org -HOMEPAGE= https://sourceforge.net/projects/robodoc/ +HOMEPAGE= http://sourceforge.net/projects/robodoc/ COMMENT= Tool to support project documentation within source code GNU_CONFIGURE= YES diff --git a/textproc/ruby-eruby/Makefile b/textproc/ruby-eruby/Makefile index 0133240bae0..80172e256ea 100644 --- a/textproc/ruby-eruby/Makefile +++ b/textproc/ruby-eruby/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/11/02 09:48:34 taca Exp $ +# $NetBSD: Makefile,v 1.17 2005/12/05 20:51:08 rillig Exp $ DISTNAME= eruby-${ERUBY_VERSION} PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME} @@ -20,9 +20,9 @@ CONFIGURE_SCRIPT= ${RUBY} configure.rb CONFIGURE_ARGS+= --enable-shared \ --with-charset="${ERUBY_DEFAULT_CHARSET}" INSTALL_TARGET= site-install -PLIST_SUBST+= ERUBY_MAJOR=${ERUBY_MAJOR} \ - ERUBY_MINOR=${ERUBY_MINOR} \ - ERUBY_TEENY=${ERUBY_TEENY} +PLIST_SUBST+= ERUBY_MAJOR=${ERUBY_MAJOR:Q} \ + ERUBY_MINOR=${ERUBY_MINOR:Q} \ + ERUBY_TEENY=${ERUBY_TEENY:Q} .include "../../mk/bsd.prefs.mk" diff --git a/textproc/ruby-rdtool/rdversion.mk b/textproc/ruby-rdtool/rdversion.mk index 70fb0e3c895..e5682519726 100644 --- a/textproc/ruby-rdtool/rdversion.mk +++ b/textproc/ruby-rdtool/rdversion.mk @@ -1,7 +1,7 @@ -# $NetBSD: rdversion.mk,v 1.4 2004/12/04 16:07:01 taca Exp $ +# $NetBSD: rdversion.mk,v 1.5 2005/12/05 20:51:08 rillig Exp $ # -.ifndef _RD_VERSION_MK +.if !defined(_RD_VERSION_MK) _RD_VERSION_MK= # defined .include "../../lang/ruby/rubyversion.mk" diff --git a/textproc/saxon/Makefile b/textproc/saxon/Makefile index aecd04d6447..47f0756eab0 100644 --- a/textproc/saxon/Makefile +++ b/textproc/saxon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/04/11 21:47:42 tv Exp $ +# $NetBSD: Makefile,v 1.14 2005/12/05 20:51:08 rillig Exp $ # DISTNAME= saxon @@ -12,10 +12,10 @@ HOMEPAGE= http://users.iclway.co.uk/mhkay/saxon/ COMMENT= Michael H. Kay's Java XSLT processor WRKSRC= ${WRKDIR} -DIST_SUBDIR= ${PKGNAME} +DIST_SUBDIR= ${PKGNAME_NOREV} USE_JAVA= run -NO_CONFIGURE= -NO_BUILD= +NO_CONFIGURE= yes +NO_BUILD= yes do-install: ${INSTALL_DATA_DIR} ${PREFIX}/lib/java diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile index bf11bd7b7e7..7297f5a12d4 100644 --- a/textproc/scrollkeeper/Makefile +++ b/textproc/scrollkeeper/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2005/05/22 20:08:35 jlam Exp $ +# $NetBSD: Makefile,v 1.30 2005/12/05 20:51:08 rillig Exp $ # DISTNAME= scrollkeeper-0.3.14 @@ -14,7 +14,7 @@ COMMENT= Open Document Cataloging Project PKG_INSTALLATION_TYPES= overwrite pkgviews BUILD_USES_MSGFMT= yes -DEPENDS= docbook-xml>=4.2nb7:../../textproc/docbook-xml +DEPENDS+= docbook-xml>=4.2nb7:../../textproc/docbook-xml GNU_CONFIGURE= yes USE_TOOLS+= gmake @@ -22,7 +22,7 @@ USE_LIBTOOL= yes USE_PKGINSTALL= yes USE_PKGLOCALEDIR= yes -CONFIGURE_ARGS= --localstatedir=${SCROLLKEEPER_DATADIR} +CONFIGURE_ARGS+= --localstatedir=${SCROLLKEEPER_DATADIR} CONFIGURE_ARGS+= --sharedstatedir=${SCROLLKEEPER_DATADIR} CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --with-partial-db-dir=db @@ -41,8 +41,8 @@ DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL SCROLLKEEPER_DATADIR= ${PREFIX}/libdata/scrollkeeper SCROLLKEEPER_REBUILDDB= ${PREFIX}/bin/scrollkeeper-rebuilddb -FILES_SUBST+= SCROLLKEEPER_DATADIR="${SCROLLKEEPER_DATADIR}" -FILES_SUBST+= SCROLLKEEPER_REBUILDDB="${SCROLLKEEPER_REBUILDDB}" +FILES_SUBST+= SCROLLKEEPER_DATADIR=${SCROLLKEEPER_DATADIR:Q} +FILES_SUBST+= SCROLLKEEPER_REBUILDDB=${SCROLLKEEPER_REBUILDDB:Q} EGDIR= ${PREFIX}/share/examples/scrollkeeper CONF_FILES= ${EGDIR}/scrollkeeper.conf ${PKG_SYSCONFDIR}/scrollkeeper.conf diff --git a/textproc/scrollkeeper/omf.mk b/textproc/scrollkeeper/omf.mk index a3f48d39ad0..120f4910c38 100644 --- a/textproc/scrollkeeper/omf.mk +++ b/textproc/scrollkeeper/omf.mk @@ -1,4 +1,4 @@ -# $NetBSD: omf.mk,v 1.8 2005/03/24 22:42:58 jlam Exp $ +# $NetBSD: omf.mk,v 1.9 2005/12/05 20:51:08 rillig 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 @@ -26,9 +26,9 @@ USE_PKGINSTALL= YES INSTALL_EXTRA_TMPL+= ${.CURDIR}/../../textproc/scrollkeeper/files/install.tmpl DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/../../textproc/scrollkeeper/files/install.tmpl -FILES_SUBST+= SCROLLKEEPER_DATADIR="${SCROLLKEEPER_DATADIR}" -FILES_SUBST+= SCROLLKEEPER_REBUILDDB="${SCROLLKEEPER_REBUILDDB}" -FILES_SUBST+= SCROLLKEEPER_UPDATEDB="${SCROLLKEEPER_UPDATEDB}" +FILES_SUBST+= SCROLLKEEPER_DATADIR=${SCROLLKEEPER_DATADIR:Q} +FILES_SUBST+= SCROLLKEEPER_REBUILDDB=${SCROLLKEEPER_REBUILDDB:Q} +FILES_SUBST+= SCROLLKEEPER_UPDATEDB=${SCROLLKEEPER_UPDATEDB:Q} PRINT_PLIST_AWK+= /^libdata\/scrollkeeper/ { next; } PRINT_PLIST_AWK+= /^@dirrm libdata\/scrollkeeper/ { next; } diff --git a/textproc/tcl-dom/Makefile b/textproc/tcl-dom/Makefile index 5e6f0b0b7c4..c5d62fc7cbd 100644 --- a/textproc/tcl-dom/Makefile +++ b/textproc/tcl-dom/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2003/07/17 22:54:52 grant Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 20:51:08 rillig Exp $ # DISTNAME= TclDOM-1.6 @@ -15,8 +15,8 @@ DEPENDS+= tcl-xml-[0-9]*:../../textproc/tcl-xml # old name for this package... CONFLICTS+= TclDom-[0-9]* -NO_CONFIGURE= -NO_BUILD= +NO_CONFIGURE= yes +NO_BUILD= yes do-install: ${INSTALL_DATA_DIR} ${PREFIX}/lib/tcl/TclDOM diff --git a/textproc/tcl-xml/Makefile b/textproc/tcl-xml/Makefile index ef3b290246d..9f0fc58fd89 100644 --- a/textproc/tcl-xml/Makefile +++ b/textproc/tcl-xml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2004/03/09 01:22:58 minskim Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/05 20:51:08 rillig Exp $ # DISTNAME= TclXML-1.2 @@ -15,8 +15,8 @@ DEPENDS+= tcl>=8.3.2:../../lang/tcl # old name for this package... CONFLICTS+= TclXML-[0-9]* -NO_CONFIGURE= -NO_BUILD= +NO_CONFIGURE= yes +NO_BUILD= yes do-install: ${INSTALL_DATA_DIR} ${PREFIX}/lib/tcl/TclXML diff --git a/textproc/tei/Makefile b/textproc/tei/Makefile index 71e2da4cb5f..7064b4399ea 100644 --- a/textproc/tei/Makefile +++ b/textproc/tei/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/04/11 21:47:42 tv Exp $ +# $NetBSD: Makefile,v 1.8 2005/12/05 20:51:08 rillig Exp $ DISTNAME= dtd PKGNAME= tei-4 @@ -12,7 +12,7 @@ HOMEPAGE= http://www.tei-c.org/ COMMENT= DTD of the Text Encoding Initiative WRKSRC= ${WRKDIR}/dtd -DIST_SUBDIR= ${PKGNAME} +DIST_SUBDIR= ${PKGNAME_NOREV}nb3 NO_CONFIGURE= YES NO_BUILD= YES diff --git a/textproc/vis/Makefile b/textproc/vis/Makefile index b828c1ddb0a..bc596ae7d35 100644 --- a/textproc/vis/Makefile +++ b/textproc/vis/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/07/05 19:53:40 christos Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 20:51:08 rillig Exp $ # DISTNAME= vis-0.1 @@ -8,7 +8,7 @@ MASTER_SITES= ftp://ftp.astron.com/pub/people/christos/ MAINTAINER= christos@NetBSD.org COMMENT= Convert strings from/to a visual format -MAKE_ENV+= BINOWN=${BINOWN} BINGRP=${BINGRP} \ - MANOWN=${MANOWN} MANGRP=${MANGRP} +MAKE_ENV+= BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q} \ + MANOWN=${MANOWN:Q} MANGRP=${MANGRP:Q} .include "../../mk/bsd.pkg.mk" diff --git a/textproc/xalan-j/Makefile b/textproc/xalan-j/Makefile index ac5d7045f5d..e25ba3996bd 100644 --- a/textproc/xalan-j/Makefile +++ b/textproc/xalan-j/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/04/11 21:47:43 tv Exp $ +# $NetBSD: Makefile,v 1.21 2005/12/05 20:51:08 rillig Exp $ # # Note: we currently use the pre-built (-bin) distribution of Xalan-J, # because although Xalan runs fine under JDK 1.1, JDK 1.2 or greater is @@ -17,8 +17,8 @@ DEPENDS+= xerces-j>=1.2.0:../../textproc/xerces-j WRKSRC= ${WRKDIR} USE_JAVA= run -NO_CONFIGURE= -NO_BUILD= +NO_CONFIGURE= yes +NO_BUILD= yes do-install: ${INSTALL_DATA} ${WRKSRC}/xalan.jar ${PREFIX}/lib/java diff --git a/textproc/xmlcatmgr/Makefile b/textproc/xmlcatmgr/Makefile index abd34b4d5cd..30975c9a470 100644 --- a/textproc/xmlcatmgr/Makefile +++ b/textproc/xmlcatmgr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2005/08/20 19:16:21 jlam Exp $ +# $NetBSD: Makefile,v 1.27 2005/12/05 20:51:08 rillig Exp $ # DISTNAME= xmlcatmgr-2.2 @@ -15,7 +15,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews GNU_CONFIGURE= YES USE_PKGINSTALL= YES -CONFIGURE_ARGS= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} OWN_DIRS= ${PKG_SYSCONFDIR}/sgml ${PKG_SYSCONFDIR}/xml EGDIR= ${PREFIX}/share/examples/xmlcatmgr diff --git a/textproc/xmlcatmgr/catalogs.mk b/textproc/xmlcatmgr/catalogs.mk index 58f64883d99..8e74e33b0ed 100644 --- a/textproc/xmlcatmgr/catalogs.mk +++ b/textproc/xmlcatmgr/catalogs.mk @@ -1,4 +1,4 @@ -# $NetBSD: catalogs.mk,v 1.12 2005/05/22 21:54:59 rillig Exp $ +# $NetBSD: catalogs.mk,v 1.13 2005/12/05 20:51:08 rillig Exp $ # # This Makefile fragment is intended to be included by packages that install # catalog files or DTDs. It takes care of registering them into the right @@ -47,7 +47,7 @@ XML_ENTRIES+= nextCatalog ${PREFIX:=${c}} -- # use pkginstall framework. # .if !empty(SGML_ENTRIES) || !empty(XML_ENTRIES) -FILES_SUBST+= XMLCATMGR="${XMLCATMGR}" +FILES_SUBST+= XMLCATMGR=${XMLCATMGR:Q} FILES_SUBST+= SGML_CATALOG="${XMLCATMGR_PREFIX}/share/sgml/catalog" FILES_SUBST+= XML_CATALOG="${XMLCATMGR_PREFIX}/share/xml/catalog" FILES_SUBST+= SGML_ENTRIES=${SGML_ENTRIES:Q} diff --git a/textproc/xmlindent/Makefile b/textproc/xmlindent/Makefile index 297a7f465ba..83c446d40fd 100644 --- a/textproc/xmlindent/Makefile +++ b/textproc/xmlindent/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:42 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 20:51:08 rillig Exp $ # DISTNAME= xmlindent-0.2.16 @@ -13,7 +13,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews USE_TOOLS+= lex -GCC_REQD= 3.0 +GCC_REQD+= 3.0 INSTALLATION_DIRS= bin man/man1 |