diff options
| author | rillig <rillig@pkgsrc.org> | 2019-11-04 21:43:32 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2019-11-04 21:43:32 +0000 |
| commit | 481997d3135ddf5a3b17274a3fc1f45480c939bd (patch) | |
| tree | 9553862a9cfe74c1c14f87da190c9d55fb2772ea | |
| parent | 15bb5ef0c0e2649c11f1265cb3267780466dd29d (diff) | |
| download | pkgsrc-481997d3135ddf5a3b17274a3fc1f45480c939bd.tar.gz | |
textproc: align variable assignments
pkglint -Wall -F --only aligned --only indent -r
No manual corrections.
155 files changed, 504 insertions, 504 deletions
diff --git a/textproc/CRF++/hacks.mk b/textproc/CRF++/hacks.mk index ca8ce5414d4..9182c548ade 100644 --- a/textproc/CRF++/hacks.mk +++ b/textproc/CRF++/hacks.mk @@ -1,11 +1,11 @@ -# $NetBSD: hacks.mk,v 1.1 2013/05/22 13:07:47 obache Exp $ +# $NetBSD: hacks.mk,v 1.2 2019/11/04 21:43:32 rillig Exp $ .if !defined(CRFPP_HACKS_MK) CRFPP_HACKS_MK= # defined # No TLS support on NetBSD<6 .if !empty(MACHINE_PLATFORM:MNetBSD-[0-5].*-*) -PKG_HACKS+= netbsd5-disable_tls +PKG_HACKS+= netbsd5-disable_tls SUBST_CLASSES+= disable_tls SUBST_STAGE.disable_tls= pre-configure SUBST_FILES.disable_tls= configure diff --git a/textproc/GutenMark-words/Makefile b/textproc/GutenMark-words/Makefile index 9852b8934af..ec0a23f334d 100644 --- a/textproc/GutenMark-words/Makefile +++ b/textproc/GutenMark-words/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2012/10/25 06:55:38 asau Exp $ +# $NetBSD: Makefile,v 1.12 2019/11/04 21:43:33 rillig Exp $ # DISTNAME= GutenMark-words-20030107 @@ -10,13 +10,13 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.sandroid.org/GutenMark/ COMMENT= Word lists for GutenMark -WORDLISTS= special.words.gz english.names.gz US.places.gz \ - french.names.gz english.words.gz french.words.gz \ - german2.words.gz german.words.gz latin.words.gz \ - italian.words.gz spanish.words.gz NonUS.places.gz \ - norwegian.words.gz gaelic.words.gz danish.words.gz \ - swedish.words.gz finnish.words.gz nonenglish.words.gz -SITES.GutenMark.cfg=http://www.sandroid.org/GutenMark/ +WORDLISTS= special.words.gz english.names.gz US.places.gz \ + french.names.gz english.words.gz french.words.gz \ + german2.words.gz german.words.gz latin.words.gz \ + italian.words.gz spanish.words.gz NonUS.places.gz \ + norwegian.words.gz gaelic.words.gz danish.words.gz \ + swedish.words.gz finnish.words.gz nonenglish.words.gz +SITES.GutenMark.cfg= http://www.sandroid.org/GutenMark/ WRKSRC= ${WRKDIR} DIST_SUBDIR= ${DISTNAME} diff --git a/textproc/LDoc/Makefile b/textproc/LDoc/Makefile index 793dd039f43..1d62bcb45f7 100644 --- a/textproc/LDoc/Makefile +++ b/textproc/LDoc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2017/09/16 19:53:51 alnsn Exp $ +# $NetBSD: Makefile,v 1.6 2019/11/04 21:43:33 rillig Exp $ DISTNAME= LDoc-1.4.6 PKGNAME= ${DISTNAME:S/LDoc/${LUA_PKGPREFIX}-LDoc/} @@ -28,7 +28,7 @@ FILES_SUBST+= LUADOTVER=${_LUA_DOT_VERSION} INSTALLATION_DIRS+= bin ${LUA_LDIR} -WRKSRC=${WRKDIR}/${DISTNAME} +WRKSRC= ${WRKDIR}/${DISTNAME} do-install: ${INSTALL_SCRIPT} ${WRKSRC}/ldoc.lua \ diff --git a/textproc/Markdown/Makefile b/textproc/Markdown/Makefile index b8e6c331c25..c45a5fa1ab2 100644 --- a/textproc/Markdown/Makefile +++ b/textproc/Markdown/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2019/08/11 13:23:21 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2019/11/04 21:43:33 rillig Exp $ # DISTNAME= Markdown_1.0.1 @@ -19,8 +19,8 @@ USE_TOOLS+= perl:run REPLACE_PERL+= Markdown.pl -PERL5_SITELIB= ${PERL5_SUB_INSTALLVENDORLIB:Q} -PLIST_SUBST+= PERL5_SITELIB=${PERL5_SITELIB:Q} +PERL5_SITELIB= ${PERL5_SUB_INSTALLVENDORLIB:Q} +PLIST_SUBST+= PERL5_SITELIB=${PERL5_SITELIB:Q} INSTALLATION_DIRS= bin ${PERL5_INSTALLVENDORLIB} share/doc/Markdown .include "../../mk/bsd.prefs.mk" diff --git a/textproc/aiksaurus/Makefile b/textproc/aiksaurus/Makefile index ae73129aa7a..706d01782c7 100644 --- a/textproc/aiksaurus/Makefile +++ b/textproc/aiksaurus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2019/07/21 22:25:48 wiz Exp $ +# $NetBSD: Makefile,v 1.28 2019/11/04 21:43:33 rillig Exp $ # DISTNAME= aiksaurus-1.2.1 @@ -11,9 +11,9 @@ HOMEPAGE= http://aiksaurus.sourceforge.net/ COMMENT= English-language thesaurus LICENSE= gnu-gpl-v2 -USE_LIBTOOL= YES -USE_LANGUAGES= c c++ -GNU_CONFIGURE= YES +USE_LIBTOOL= YES +USE_LANGUAGES= c c++ +GNU_CONFIGURE= YES PKGCONFIG_OVERRIDE= base/aiksaurus-1.0.pc.in .include "options.mk" diff --git a/textproc/artha/Makefile b/textproc/artha/Makefile index 32057ccfb63..dde28a16539 100644 --- a/textproc/artha/Makefile +++ b/textproc/artha/Makefile @@ -1,20 +1,20 @@ -# $NetBSD: Makefile,v 1.10 2019/07/21 22:25:49 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2019/11/04 21:43:33 rillig Exp $ -DISTNAME= artha-1.0.3 -PKGREVISION= 9 -CATEGORIES= textproc -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=artha/} -EXTRACT_SUFX= .tar.bz2 +DISTNAME= artha-1.0.3 +PKGREVISION= 9 +CATEGORIES= textproc +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=artha/} +EXTRACT_SUFX= .tar.bz2 -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://artha.sourceforge.net/ -COMMENT= Open Source WordNet-based thesaurus -LICENSE= gnu-gpl-v2 +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= http://artha.sourceforge.net/ +COMMENT= Open Source WordNet-based thesaurus +LICENSE= gnu-gpl-v2 -GNU_CONFIGURE= yes -USE_LIBTOOL= yes -USE_TOOLS+= autoconf automake gmake pkg-config -USE_LANGUAGES= c +GNU_CONFIGURE= yes +USE_LIBTOOL= yes +USE_TOOLS+= autoconf automake gmake pkg-config +USE_LANGUAGES= c .include "options.mk" diff --git a/textproc/artha/options.mk b/textproc/artha/options.mk index 2c78989f060..b4b55737b49 100644 --- a/textproc/artha/options.mk +++ b/textproc/artha/options.mk @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.1 2015/06/08 11:16:38 wiz Exp $ +# $NetBSD: options.mk,v 1.2 2019/11/04 21:43:33 rillig Exp $ -PKG_OPTIONS_VAR= PKG_OPTIONS.artha -PKG_SUPPORTED_OPTIONS= libnotify -PKG_SUGGESTED_OPTIONS= libnotify +PKG_OPTIONS_VAR= PKG_OPTIONS.artha +PKG_SUPPORTED_OPTIONS= libnotify +PKG_SUGGESTED_OPTIONS= libnotify .include "../../mk/bsd.options.mk" diff --git a/textproc/btparse/Makefile b/textproc/btparse/Makefile index 057e23509d5..27caf1b3fcf 100644 --- a/textproc/btparse/Makefile +++ b/textproc/btparse/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2019/08/11 13:23:22 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2019/11/04 21:43:33 rillig Exp $ # DISTNAME= btparse-0.35 @@ -11,7 +11,7 @@ HOMEPAGE= http://www.gerg.ca/software/btOOL/ COMMENT= BibTeX parsing library USE_TOOLS+= perl pod2man -USE_LIBTOOL=YES +USE_LIBTOOL= YES GNU_CONFIGURE= YES PKGCONFIG_OVERRIDE+= btparse.pc.in diff --git a/textproc/cabocha/Makefile.common b/textproc/cabocha/Makefile.common index e3fbd991af6..39620c45231 100644 --- a/textproc/cabocha/Makefile.common +++ b/textproc/cabocha/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.11 2016/09/09 02:13:59 taca Exp $ +# $NetBSD: Makefile.common,v 1.12 2019/11/04 21:43:33 rillig Exp $ # used by textproc/cabocha/Makefile # used by textproc/p5-cabocha/Makefile # used by textproc/py-cabocha/Makefile @@ -21,6 +21,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://taku910.github.io/cabocha/ LICENSE= gnu-lgpl-v2.1 OR modified-bsd -RESTRICTED= Included model is not re-distributed without prior permission. +RESTRICTED= Included model is not re-distributed without prior permission. NO_SRC_ON_FTP= ${RESTRICTED} NO_SRC_ON_CDROM= ${RESTRICTED} diff --git a/textproc/cabocha/hacks.mk b/textproc/cabocha/hacks.mk index 19339f7badc..c2b552cffda 100644 --- a/textproc/cabocha/hacks.mk +++ b/textproc/cabocha/hacks.mk @@ -1,11 +1,11 @@ -# $NetBSD: hacks.mk,v 1.1 2013/05/22 13:14:29 obache Exp $ +# $NetBSD: hacks.mk,v 1.2 2019/11/04 21:43:33 rillig Exp $ .if !defined(CABOCHA_HACKS_MK) CABOCHA_HACKS_MK= # defined # No TLS support on NetBSD<6 .if !empty(MACHINE_PLATFORM:MNetBSD-[0-5].*-*) -PKG_HACKS+= netbsd5-disable_tls +PKG_HACKS+= netbsd5-disable_tls SUBST_CLASSES+= disable_tls SUBST_STAGE.disable_tls= pre-configure SUBST_FILES.disable_tls= configure diff --git a/textproc/catdoc-tk/Makefile b/textproc/catdoc-tk/Makefile index 05cde824616..f7f51b3b7bc 100644 --- a/textproc/catdoc-tk/Makefile +++ b/textproc/catdoc-tk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2018/03/12 11:17:40 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2019/11/04 21:43:33 rillig Exp $ .include "../../textproc/catdoc/Makefile.common" @@ -9,8 +9,8 @@ COMMENT= Tk interface for MS-Word to plain text converter DEPENDS+= catdoc>=0.94.4:../../textproc/catdoc CONFIGURE_ARGS+= --enable-wordview -CONFIGURE_ENV+= WISH="${BUILDLINK_PREFIX.tk}/bin/wish" -CONFIGURE_ENV+= enable_wordview=yes +CONFIGURE_ENV+= WISH="${BUILDLINK_PREFIX.tk}/bin/wish" +CONFIGURE_ENV+= enable_wordview=yes INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 diff --git a/textproc/cjose/Makefile b/textproc/cjose/Makefile index b034a2217d1..bbdb9fb3484 100644 --- a/textproc/cjose/Makefile +++ b/textproc/cjose/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.1 2019/03/16 08:03:56 bsiegert Exp $ +# $NetBSD: Makefile,v 1.2 2019/11/04 21:43:33 rillig Exp $ -DISTNAME= cjose-0.6.1 +DISTNAME= cjose-0.6.1 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_GITHUB:=cisco/} diff --git a/textproc/cmigemo/Makefile b/textproc/cmigemo/Makefile index e48d4871ab2..293256896d5 100644 --- a/textproc/cmigemo/Makefile +++ b/textproc/cmigemo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2019/08/11 13:23:22 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2019/11/04 21:43:34 rillig Exp $ # DISTNAME= cmigemo-default-src-20110227 @@ -17,11 +17,11 @@ LICENSE= mit MAKE_JOBS_SAFE= no # sync with inputmethod/skk-jisyo-cdb -SKKJISYO_VERS= 201102 -JISYOFILE= SKK-JISYO.L.${SKKJISYO_VERS}.bz2 +SKKJISYO_VERS= 201102 +JISYOFILE= SKK-JISYO.L.${SKKJISYO_VERS}.bz2 SITES.${SKKJISYO_FILE}= ${MASTER_SITE_FREEBSD_LOCAL:=matusita/skk-jisyo/} -TOOL_DEPENDS+= nkf>=2.06:../../converters/nkf +TOOL_DEPENDS+= nkf>=2.06:../../converters/nkf HAS_CONFIGURE= yes USE_TOOLS+= perl gzip gmake @@ -34,7 +34,7 @@ CONFIGURE_ENV+= PROGRAM_ENCODEFILTER="nkf -x" CONFIGURE_ENV+= PROGRAM_HTTP=${TRUE:Q} INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} -SUBST_CLASSES+= prefix +SUBST_CLASSES+= prefix SUBST_STAGE.prefix= post-configure SUBST_FILES.prefix= compile/config_default.mk compile/Make_gcc.mak compile/Make_sun.mak doc/README* tools/migemo.vim SUBST_SED.prefix= -e 's,/usr/local,${PREFIX},g' diff --git a/textproc/convertlit/Makefile b/textproc/convertlit/Makefile index 90ed154c272..bfa47023f55 100644 --- a/textproc/convertlit/Makefile +++ b/textproc/convertlit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2015/09/17 14:06:12 tnn Exp $ +# $NetBSD: Makefile,v 1.12 2019/11/04 21:43:34 rillig Exp $ # # In order to ensure compliance with U.S. and international law, please # do not modify this file to provide pointers to the source or homepage @@ -24,13 +24,13 @@ USE_TOOLS+= gmake SUBST_CLASSES+= d2u SUBST_STAGE.d2u= pre-configure SUBST_MESSAGE.d2u= Stripping CRLF line ends. -SUBST_FILES.d2u+= *.h *.c */*.h */*.c */*/*.h */*/*.c +SUBST_FILES.d2u+= *.h *.c */*.h */*.c */*/*.h */*/*.c SUBST_FILTER_CMD.d2u= ${TR} -d '\r' SUBST_CLASSES+= flags SUBST_STAGE.flags= pre-configure SUBST_MESSAGE.flags= Fixing CFLAGS and compiler invocation. -SUBST_FILES.flags+= clit18/Makefile +SUBST_FILES.flags+= clit18/Makefile SUBST_SED.flags+= -e 's,^CFLAGS=.*,CFLAGS+=-funsigned-char -Wall -I ../lib -I ../lib/des -I .,' SUBST_SED.flags+= -e 's,gcc -o clit .. ../libtommath-0.30/libtommath.a,gcc $$(LDFLAGS) -o clit $$^ -ltommath,' diff --git a/textproc/csvkit/Makefile b/textproc/csvkit/Makefile index 789502dca4e..7560749144a 100644 --- a/textproc/csvkit/Makefile +++ b/textproc/csvkit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2019/04/25 07:33:23 maya Exp $ +# $NetBSD: Makefile,v 1.9 2019/11/04 21:43:34 rillig Exp $ DISTNAME= 0.9.0 PKGREVISION= 2 @@ -21,7 +21,7 @@ DEPENDS+= ${PYPKGPREFIX}-openpyxl>=2.0.3:../../textproc/py-openpyxl DEPENDS+= ${PYPKGPREFIX}-jdcal>=0.9.3:../../time/py-jdcal DEPENDS+= ${PYPKGPREFIX}-simplejson>=3.6.3:../../converters/py-simplejson DEPENDS+= ${PYPKGPREFIX}-six>=1.6.1:../../lang/py-six -#DEPENDS+= ${PYPKGPREFIX}-tox>=1.3:../../*/py-tox +#DEPENDS+= ${PYPKGPREFIX}-tox>=1.3:../../*/py-tox # csvkit publishes files like "0.9.0.tar.gz" DIST_SUBDIR= ${PKGNAME_NOREV} diff --git a/textproc/cwdiff/Makefile b/textproc/cwdiff/Makefile index a03a2e62b38..bb568a5590c 100644 --- a/textproc/cwdiff/Makefile +++ b/textproc/cwdiff/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2016/07/15 11:17:04 mef Exp $ +# $NetBSD: Makefile,v 1.6 2019/11/04 21:43:34 rillig Exp $ VERSION= 0.4.0 DISTNAME= cwdiff-${VERSION} @@ -16,7 +16,7 @@ NO_BUILD= yes REPLACE_BASH= cwdiff INSTALLATION_DIRS+= share/examples/cwdiff/ -AUTO_MKDIRS= yes +AUTO_MKDIRS= yes do-install: (cd ${WRKSRC} ;\ diff --git a/textproc/dblatex/Makefile b/textproc/dblatex/Makefile index 0fdc813bf84..66b4832dd7b 100644 --- a/textproc/dblatex/Makefile +++ b/textproc/dblatex/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2019/09/02 13:20:13 adam Exp $ +# $NetBSD: Makefile,v 1.34 2019/11/04 21:43:34 rillig Exp $ DISTNAME= dblatex-0.3.10 PKGREVISION= 2 @@ -43,7 +43,7 @@ USE_TOOLS+= gmake .include "options.mk" -REPLACE_PYTHON+= scripts/dblatex lib/dbtexmf/dblatex/xetex/*.py +REPLACE_PYTHON+= scripts/dblatex lib/dbtexmf/dblatex/xetex/*.py PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 0.3.2 SUBST_CLASSES+= man diff --git a/textproc/dict-mueller7/Makefile b/textproc/dict-mueller7/Makefile index 2d5a43ba132..fd8d8050b4b 100644 --- a/textproc/dict-mueller7/Makefile +++ b/textproc/dict-mueller7/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2019/08/11 13:23:22 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2019/11/04 21:43:34 rillig Exp $ DISTNAME= Mueller7GPL PKGNAME= dict-mueller7-1.2 @@ -17,7 +17,7 @@ DEPENDS+= dict-server>=1.9.14:../../textproc/dict-server BUILD_DEPENDS+= dict-server>=1.10.2:../../textproc/dict-server BUILD_DEPENDS+= p5-Unicode-Map8-[0-9]*:../../converters/p5-Unicode-Map8 -BUILD_DEPENDS+= coreutils-[0-9]*:../../sysutils/coreutils # we need GNU fmt +BUILD_DEPENDS+= coreutils-[0-9]*:../../sysutils/coreutils # we need GNU fmt WRKSRC= ${WRKDIR}/usr/local/share/dict diff --git a/textproc/dict-server/Makefile b/textproc/dict-server/Makefile index b52c70290f1..eac90992276 100644 --- a/textproc/dict-server/Makefile +++ b/textproc/dict-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2018/02/28 21:03:06 cheusov Exp $ +# $NetBSD: Makefile,v 1.33 2019/11/04 21:43:34 rillig Exp $ .include "../../textproc/dict-server/Makefile.common" @@ -33,7 +33,7 @@ PKG_GROUPS= ${DICTD_GROUP} PKG_USERS= ${DICTD_USER}:${DICTD_GROUP} PKG_GECOS.${DICTD_USER}= Dictionary\ protocol\ server\ user #PKG_HOME.${DICT_USER}= /nonexistent -#PKG_SHELL.${DICT_USER}= ${NOLOGIN} +#PKG_SHELL.${DICT_USER}= ${NOLOGIN} RCD_SCRIPTS= dictd diff --git a/textproc/docbook-xml/Makefile b/textproc/docbook-xml/Makefile index 04f150c1799..bbded5ad8d2 100644 --- a/textproc/docbook-xml/Makefile +++ b/textproc/docbook-xml/Makefile @@ -1,14 +1,14 @@ -# $NetBSD: Makefile,v 1.36 2014/10/09 14:07:01 wiz Exp $ +# $NetBSD: Makefile,v 1.37 2019/11/04 21:43:34 rillig Exp $ # -DISTNAME= docbook-xml-4.5 -CATEGORIES= textproc -MASTER_SITES= http://www.oasis-open.org/docbook/xml/4.5/ +DISTNAME= docbook-xml-4.5 +CATEGORIES= textproc +MASTER_SITES= http://www.oasis-open.org/docbook/xml/4.5/ SITES.docbook-xml-4.4.zip= http://www.oasis-open.org/docbook/xml/4.4/ SITES.docbook-xml-4.3.zip= http://www.oasis-open.org/docbook/xml/4.3/ SITES.docbook-xml-4.2.zip= http://www.oasis-open.org/docbook/xml/4.2/ -DISTFILES= docbook-xml-4.2.zip docbook-xml-4.3.zip docbook-xml-4.4.zip -DISTFILES+= docbook-xml-4.5.zip +DISTFILES= docbook-xml-4.2.zip docbook-xml-4.3.zip docbook-xml-4.4.zip +DISTFILES+= docbook-xml-4.5.zip MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.oasis-open.org/docbook/ @@ -28,14 +28,14 @@ VER= 4.2 4.3 4.4 4.5 XML_CATALOGS= XML_ENTRIES= .for ver in ${VER} -XML_CATALOGS+= ${DTDDIR}/${ver}/catalog +XML_CATALOGS+= ${DTDDIR}/${ver}/catalog XML_ENTRIES+= rewriteSystem http://www.oasis-open.org/docbook/xml/${ver} \ ${DTDDIR}/${ver} .endfor # 4.2 is backwards-compatible with 4.1.2, so we just make 4.1.2 be an alias # for 4.2. -XML_CATALOGS+= ${DTDDIR}/4.2/catalog-4.1.2 +XML_CATALOGS+= ${DTDDIR}/4.2/catalog-4.1.2 XML_ENTRIES+= rewriteSystem http://www.oasis-open.org/docbook/xml/4.1.2 \ ${DTDDIR}/4.2 diff --git a/textproc/docbook/Makefile b/textproc/docbook/Makefile index 282c933c63e..13948e6403e 100644 --- a/textproc/docbook/Makefile +++ b/textproc/docbook/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.46 2014/10/09 14:07:01 wiz Exp $ +# $NetBSD: Makefile,v 1.47 2019/11/04 21:43:34 rillig Exp $ -DISTNAME= docbook-4.5 -CATEGORIES= textproc +DISTNAME= docbook-4.5 +CATEGORIES= textproc MASTER_SITES= http://www.oasis-open.org/docbook/sgml/4.5/ SITES.docbook-4.4.zip= http://www.oasis-open.org/docbook/sgml/4.4/ SITES.docbook-4.3.zip= http://www.oasis-open.org/docbook/sgml/4.3/ @@ -11,7 +11,7 @@ SITES.docbk40.zip= http://www.oasis-open.org/docbook/sgml/4.0/ SITES.docbk31.zip= http://www.oasis-open.org/docbook/sgml/3.1/ SITES.docbk30.zip= http://www.oasis-open.org/docbook/sgml/3.0/ SITES.docbk241.zip= http://www.oasis-open.org/docbook/sgml/2.4.1/ -DISTFILES= docbk241.zip docbk30.zip docbk31.zip docbk40.zip docbk41.zip \ +DISTFILES= docbk241.zip docbk30.zip docbk31.zip docbk40.zip docbk41.zip \ docbook-4.2.zip docbook-4.3.zip docbook-4.4.zip docbook-4.5.zip MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/textproc/docbook2odf/Makefile b/textproc/docbook2odf/Makefile index e7181e418fa..0cb6c18d046 100644 --- a/textproc/docbook2odf/Makefile +++ b/textproc/docbook2odf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2019/08/11 13:23:23 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2019/11/04 21:43:35 rillig Exp $ DISTNAME= docbook2odf-0.244 PKGREVISION= 2 @@ -10,7 +10,7 @@ HOMEPAGE= http://open.comsultia.com/docbook2odf COMMENT= Convert DocBook documentation into ODF documents LICENSE= gnu-gpl-v2 OR gnu-gpl-v3 -NO_BUILD= yes +NO_BUILD= yes INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 INSTALLATION_DIRS+= ${PREFIX}/share/applications INSTALLATION_DIRS+= ${PREFIX}/share/doc/${PKGBASE} @@ -30,7 +30,7 @@ SUBST_STAGE.xsl_path= pre-configure SUBST_FILES.xsl_path= utils/docbook2odf SUBST_SED.xsl_path= -e 's,/usr/share/docbook2odf/xsl,${PREFIX}/share/${PKGBASE}/xsl,g' -REPLACE_PERL+= utils/docbook2odf utils/maketests +REPLACE_PERL+= utils/docbook2odf utils/maketests do-install: ${INSTALL_SCRIPT} ${WRKSRC}/utils/docbook2odf ${DESTDIR}${PREFIX}/bin/docbook2odf diff --git a/textproc/eblook/Makefile b/textproc/eblook/Makefile index fa3ecfe64cb..fd40fe2fac9 100644 --- a/textproc/eblook/Makefile +++ b/textproc/eblook/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2014/10/09 14:07:01 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2019/11/04 21:43:35 rillig Exp $ # DISTNAME= eblook-1.6.1 @@ -10,10 +10,10 @@ MAINTAINER= uebayasi@NetBSD.org HOMEPAGE= http://openlab.ring.gr.jp/edict/eblook/ COMMENT= Interactive command-line interface for EPWING electric dictionaries -GNU_CONFIGURE= YES -INFO_FILES= yes -CONFIGURE_ARGS+=--with-eb-conf=${PKG_SYSCONFDIR}/eb.conf -LIBS+= ${BUILDLINK_LDADD.iconv} +GNU_CONFIGURE= YES +INFO_FILES= yes +CONFIGURE_ARGS+= --with-eb-conf=${PKG_SYSCONFDIR}/eb.conf +LIBS+= ${BUILDLINK_LDADD.iconv} .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/textproc/emacs-muse/Makefile b/textproc/emacs-muse/Makefile index 54ebe51283d..e1dec5a2a2c 100644 --- a/textproc/emacs-muse/Makefile +++ b/textproc/emacs-muse/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2017/09/09 06:06:13 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2019/11/04 21:43:35 rillig Exp $ DISTNAME= muse-3.20 PKGNAME= ${EMACS_PKGNAME_PREFIX}emacs-${DISTNAME} @@ -15,7 +15,7 @@ USE_LANGUAGES= # none USE_TOOLS+= gmake makeinfo INFO_FILES= yes -MAKE_FLAGS+= -I.. +MAKE_FLAGS+= -I.. INSTALLATION_DIRS= share/doc/emacs-muse share/examples/emacs-muse pre-build: diff --git a/textproc/enchant/options.mk b/textproc/enchant/options.mk index d2f9cebb4f9..4ec11d0585b 100644 --- a/textproc/enchant/options.mk +++ b/textproc/enchant/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.7 2018/11/22 14:56:07 nia Exp $ +# $NetBSD: options.mk,v 1.8 2019/11/04 21:43:35 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.enchant PKG_SUPPORTED_OPTIONS= aspell enchant-zemberek hunspell ispell @@ -33,7 +33,7 @@ PLIST.hunspell= yes CONFIGURE_ARGS+= --disable-myspell .endif -PLIST_VARS+= ispell +PLIST_VARS+= ispell .if !empty(PKG_OPTIONS:Mispell) CONFIGURE_ARGS+= --enable-ispell PLIST.ispell= yes diff --git a/textproc/enchant2/buildlink3.mk b/textproc/enchant2/buildlink3.mk index 1543ff1fce0..36686406af4 100644 --- a/textproc/enchant2/buildlink3.mk +++ b/textproc/enchant2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2019/10/10 11:44:38 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2019/11/04 21:43:35 rillig Exp $ BUILDLINK_TREE+= enchant2 @@ -7,7 +7,7 @@ ENCHANT2_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.enchant2+= enchant2>=2 BUILDLINK_ABI_DEPENDS.enchant2+= enchant2>=2.2.3 -BUILDLINK_PKGSRCDIR.enchant2?= ../../textproc/enchant2 +BUILDLINK_PKGSRCDIR.enchant2?= ../../textproc/enchant2 # Lots of older software looks for enchant.pc instead of enchant-2.pc. ${BUILDLINK_DIR}/lib/pkgconfig/enchant.pc: diff --git a/textproc/epubcheck/Makefile b/textproc/epubcheck/Makefile index e04eb2fb70b..98b737a51af 100644 --- a/textproc/epubcheck/Makefile +++ b/textproc/epubcheck/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2017/08/01 17:40:17 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2019/11/04 21:43:35 rillig Exp $ DISTNAME= epubcheck-${VER} VER= 1.2 @@ -11,9 +11,9 @@ HOMEPAGE= https://github.com/IDPF/epubcheck COMMENT= Tool to validate IDPF Epub files LICENSE= mit -WRKSRC= ${WRKDIR} -USE_JAVA= run -INSTALLATION_DIRS= bin libexec/epubcheck/lib share/doc/epubcheck +WRKSRC= ${WRKDIR} +USE_JAVA= run +INSTALLATION_DIRS= bin libexec/epubcheck/lib share/doc/epubcheck do-build: ${ECHO} "#!/bin/sh" > ${WRKSRC}/epubcheck diff --git a/textproc/epubpreflight/Makefile b/textproc/epubpreflight/Makefile index 2fe4c97a0f9..8bf2bda215d 100644 --- a/textproc/epubpreflight/Makefile +++ b/textproc/epubpreflight/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2017/08/01 17:40:17 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2019/11/04 21:43:35 rillig Exp $ DISTNAME= epubpreflight-0.1.0 CATEGORIES= textproc @@ -10,9 +10,9 @@ HOMEPAGE= https://github.com/IDPF/epubcheck COMMENT= Tool to validate IDPF EPUB files LICENSE= modified-bsd AND mit -WRKSRC= ${WRKDIR} -USE_JAVA= run -INSTALLATION_DIRS= bin libexec/epubpreflight/lib share/doc/epubpreflight +WRKSRC= ${WRKDIR} +USE_JAVA= run +INSTALLATION_DIRS= bin libexec/epubpreflight/lib share/doc/epubpreflight do-build: ${ECHO} "#!/bin/sh" > ${WRKSRC}/epubpreflight diff --git a/textproc/expat/builtin.mk b/textproc/expat/builtin.mk index 80aecf78145..9c0f5fc8ca2 100644 --- a/textproc/expat/builtin.mk +++ b/textproc/expat/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.19 2015/02/04 23:44:34 tnn Exp $ +# $NetBSD: builtin.mk,v 1.20 2019/11/04 21:43:35 rillig Exp $ BUILTIN_PKG:= expat @@ -18,7 +18,7 @@ IS_BUILTIN.expat= yes IS_BUILTIN.expat= no . endif .endif -MAKEVARS+= IS_BUILTIN.expat +MAKEVARS+= IS_BUILTIN.expat ### ### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to @@ -35,7 +35,7 @@ BUILTIN_VERSION.expat!= \ ${H_EXPAT} BUILTIN_PKG.expat= expat-${BUILTIN_VERSION.expat} .endif -MAKEVARS+= BUILTIN_PKG.expat +MAKEVARS+= BUILTIN_PKG.expat ### ### Determine whether we should use the built-in implementation if it @@ -62,7 +62,7 @@ USE_BUILTIN.expat!= \ . endif . endif # PREFER.expat .endif -MAKEVARS+= USE_BUILTIN.expat +MAKEVARS+= USE_BUILTIN.expat ### ### The section below only applies if we are not including this file diff --git a/textproc/fop/Makefile b/textproc/fop/Makefile index aa2901da1c3..afc82b340aa 100644 --- a/textproc/fop/Makefile +++ b/textproc/fop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2018/09/27 22:44:31 tnn Exp $ +# $NetBSD: Makefile,v 1.38 2019/11/04 21:43:35 rillig Exp $ # # Note: we currently use the pre-built (-bin) distribution of FOP, # @@ -14,10 +14,10 @@ HOMEPAGE= https://xmlgraphics.apache.org/fop/ COMMENT= Print formatter driven by XSL Formatting Objects (XSL-FO) LICENSE= apache-2.0 -USE_JAVA= run -USE_TOOLS+= pax -NO_CONFIGURE= yes -NO_BUILD= yes +USE_JAVA= run +USE_TOOLS+= pax +NO_CONFIGURE= yes +NO_BUILD= yes INSTALLATION_DIRS= bin share/java/fop WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} diff --git a/textproc/fop/options.mk b/textproc/fop/options.mk index 3228415ec12..1b611a7c3b6 100644 --- a/textproc/fop/options.mk +++ b/textproc/fop/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2014/01/22 09:18:40 ryoon Exp $ +# $NetBSD: options.mk,v 1.4 2019/11/04 21:43:35 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.fop PKG_SUPPORTED_OPTIONS= doc @@ -11,7 +11,7 @@ PLIST_SRC+= ${PKGDIR}/PLIST.docs post-extract: fop-ttfreader .if empty(PKG_OPTIONS:Mdoc) -.for subdir in docs javadocs +. for subdir in docs javadocs cd ${WRKSRC} && ${RM} -rf ${subdir} -.endfor +. endfor .endif diff --git a/textproc/glimpse/Makefile b/textproc/glimpse/Makefile index 6b0c3e4c336..b5516514806 100644 --- a/textproc/glimpse/Makefile +++ b/textproc/glimpse/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2016/01/26 09:01:28 dbj Exp $ +# $NetBSD: Makefile,v 1.42 2019/11/04 21:43:36 rillig Exp $ DISTNAME= glimpse-4.18.6 CATEGORIES= textproc databases @@ -14,9 +14,9 @@ CONFLICTS+= tre>=0.7.5nb6 MAKE_JOBS_SAFE= no -USE_TOOLS+= gmake lex -GNU_CONFIGURE= yes -MAKE_FLAGS= mandir=${PREFIX}/${PKGMANDIR}/man1 +USE_TOOLS+= gmake lex +GNU_CONFIGURE= yes +MAKE_FLAGS= mandir=${PREFIX}/${PKGMANDIR}/man1 INSTALLATION_DIRS= share/doc/glimpse post-install: diff --git a/textproc/gnome-doc-utils/Makefile b/textproc/gnome-doc-utils/Makefile index 502347ecbe9..662a13bb91b 100644 --- a/textproc/gnome-doc-utils/Makefile +++ b/textproc/gnome-doc-utils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.70 2019/09/02 13:20:12 adam Exp $ +# $NetBSD: Makefile,v 1.71 2019/11/04 21:43:36 rillig Exp $ DISTNAME= gnome-doc-utils-0.20.10 PKGREVISION= 3 @@ -16,7 +16,7 @@ DEPENDS+= ${PYPKGPREFIX}-libxslt>=1.1.12:../../textproc/py-libxslt DEPENDS+= docbook-xml>=4.5:../../textproc/docbook-xml DEPENDS+= getopt-[0-9]*:../../misc/getopt -PYTHON_VERSIONS_ACCEPTED= 27 # py-libxslt +PYTHON_VERSIONS_ACCEPTED= 27 # py-libxslt USE_TOOLS+= intltool pkg-config gmake gawk msgfmt bash:run GNU_CONFIGURE= YES diff --git a/textproc/go-inflect/Makefile b/textproc/go-inflect/Makefile index 1bfc4bb8913..51def4b36b6 100644 --- a/textproc/go-inflect/Makefile +++ b/textproc/go-inflect/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2019/10/18 14:58:57 bsiegert Exp $ +# $NetBSD: Makefile,v 1.17 2019/11/04 21:43:36 rillig Exp $ DISTNAME= inflect-0.0.20170411 PKGNAME= go-${DISTNAME} @@ -6,7 +6,7 @@ PKGREVISION= 13 MASTER_SITES= ${MASTER_SITE_GITHUB:=markbates/} CATEGORIES= textproc GITHUB_TAG= 6cacb66d100482ef7cc366289ccb156020e57e76 -GITHUB_PROJECT= ${PKGBASE:S/^go-//} +GITHUB_PROJECT= ${PKGBASE:S/^go-//} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://github.com/markbates/inflect diff --git a/textproc/go-mmark/Makefile b/textproc/go-mmark/Makefile index 494e3752c46..416fcaed45c 100644 --- a/textproc/go-mmark/Makefile +++ b/textproc/go-mmark/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2019/10/18 14:58:58 bsiegert Exp $ +# $NetBSD: Makefile,v 1.16 2019/11/04 21:43:36 rillig Exp $ DISTNAME= mmark-1.3.6 PKGNAME= go-${DISTNAME} @@ -6,7 +6,7 @@ PKGREVISION= 13 MASTER_SITES= ${MASTER_SITE_GITHUB:=miekg/} CATEGORIES= textproc GITHUB_TAG= v${PKGVERSION_NOREV} -GITHUB_PROJECT= ${PKGBASE:S/^go-//} +GITHUB_PROJECT= ${PKGBASE:S/^go-//} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://github.com/miekg/mmark diff --git a/textproc/go-prose/Makefile b/textproc/go-prose/Makefile index a2b6f656226..f87cdf009fc 100644 --- a/textproc/go-prose/Makefile +++ b/textproc/go-prose/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2019/10/18 14:58:58 bsiegert Exp $ +# $NetBSD: Makefile,v 1.17 2019/11/04 21:43:36 rillig Exp $ DISTNAME= prose-0.0.20170806 PKGNAME= go-${DISTNAME} @@ -6,7 +6,7 @@ PKGREVISION= 13 MASTER_SITES= ${MASTER_SITE_GITHUB:=jdkato/} CATEGORIES= textproc GITHUB_TAG= a678fc7b3ceb0f38ff832c337dea083902c349b2 -GITHUB_PROJECT= ${PKGBASE:S/^go-//} +GITHUB_PROJECT= ${PKGBASE:S/^go-//} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://github.com/jdkato/prose diff --git a/textproc/go-sentences/Makefile b/textproc/go-sentences/Makefile index a60c3a54215..1cb316cf570 100644 --- a/textproc/go-sentences/Makefile +++ b/textproc/go-sentences/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2019/10/18 14:58:58 bsiegert Exp $ +# $NetBSD: Makefile,v 1.17 2019/11/04 21:43:36 rillig Exp $ DISTNAME= sentences-1.0.6 PKGNAME= go-${DISTNAME} @@ -6,7 +6,7 @@ PKGREVISION= 13 MASTER_SITES= ${MASTER_SITE_GITHUB:=neurosnap/} CATEGORIES= textproc GITHUB_TAG= v${PKGVERSION_NOREV} -GITHUB_PROJECT= ${PKGBASE:S/^go-//} +GITHUB_PROJECT= ${PKGBASE:S/^go-//} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://github.com/neurosnap/sentences diff --git a/textproc/go-text/buildlink3.mk b/textproc/go-text/buildlink3.mk index 3dd768ae55b..312341014ee 100644 --- a/textproc/go-text/buildlink3.mk +++ b/textproc/go-text/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.3 2018/07/08 17:15:42 bsiegert Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2019/11/04 21:43:36 rillig Exp $ BUILDLINK_TREE+= go-text .if !defined(GO_TEXT_BUILDLINK3_MK) GO_TEXT_BUILDLINK3_MK:= -BUILDLINK_CONTENTS_FILTER.go-text= ${EGREP} gopkg/ -BUILDLINK_DEPMETHOD.go-text?= build +BUILDLINK_CONTENTS_FILTER.go-text= ${EGREP} gopkg/ +BUILDLINK_DEPMETHOD.go-text?= build BUILDLINK_API_DEPENDS.go-text+= go-text>=0.3.0 BUILDLINK_PKGSRCDIR.go-text?= ../../textproc/go-text diff --git a/textproc/groff/Makefile b/textproc/groff/Makefile index 71afad3e1f2..ddaa3cbe01c 100644 --- a/textproc/groff/Makefile +++ b/textproc/groff/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.90 2019/08/11 13:23:24 wiz Exp $ +# $NetBSD: Makefile,v 1.91 2019/11/04 21:43:36 rillig Exp $ DISTNAME= groff-1.22.4 PKGREVISION= 2 @@ -72,10 +72,10 @@ post-patch: # It also installs wrappers around the system macros for a variety of # other traditional macro packages, if those macros don't have an FSF # copyright. -SYMLINK_FILES= chem diffmk eqn grn indxbib lookbib neqn nroff pic refer \ +SYMLINK_FILES= chem diffmk eqn grn indxbib lookbib neqn nroff pic refer \ soelim tbl troff SYMLINK_MANFILES= chem.1 eqn.1 grn.1 indxbib.1 lookbib.1 neqn.1 nroff.1 \ - pic.1 refer.1 soelim.1 tbl.1 troff.1 + pic.1 refer.1 soelim.1 tbl.1 troff.1 INSTALLATION_DIRS= ${PKGGNUDIR}bin ${PKGGNUDIR}${PKGMANDIR}/man1 diff --git a/textproc/gtkspell3/buildlink3.mk b/textproc/gtkspell3/buildlink3.mk index d3e1ee4a86b..b418d342308 100644 --- a/textproc/gtkspell3/buildlink3.mk +++ b/textproc/gtkspell3/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2019/07/21 22:24:13 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2019/11/04 21:43:37 rillig Exp $ BUILDLINK_TREE+= gtkspell3 @@ -6,7 +6,7 @@ BUILDLINK_TREE+= gtkspell3 GTKSPELL3_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.gtkspell3+= gtkspell3>=3.0 -BUILDLINK_ABI_DEPENDS.gtkspell3?= gtkspell3>=3.0.10nb2 +BUILDLINK_ABI_DEPENDS.gtkspell3?= gtkspell3>=3.0.10nb2 BUILDLINK_PKGSRCDIR.gtkspell3?= ../../textproc/gtkspell3 .include "../../textproc/enchant2/buildlink3.mk" diff --git a/textproc/html2text/Makefile b/textproc/html2text/Makefile index 64be8a4a7a1..9cf54293a6b 100644 --- a/textproc/html2text/Makefile +++ b/textproc/html2text/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2017/01/19 18:52:27 agc Exp $ +# $NetBSD: Makefile,v 1.20 2019/11/04 21:43:37 rillig Exp $ DISTNAME= html2text-1.3.2a CATEGORIES= textproc @@ -17,13 +17,13 @@ HAS_CONFIGURE= yes CONFIGURE_ENV+= ECHO=${ECHO:Q} INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 -SUBST_CLASSES+= configure -SUBST_STAGE.configure= pre-configure -SUBST_MESSAGE.configure=Fixing 'configure' script -SUBST_FILES.configure= configure -SUBST_SED.configure= -e 's,^$$echo,$$echo -n,' -SUBST_SED.configure+= -e 's,\\c,,' -SUBST_SED.configure+= -e 's,$$CXX $$tmp_file.C,$$CXX $$LDFLAGS $$tmp_file.C,' +SUBST_CLASSES+= configure +SUBST_STAGE.configure= pre-configure +SUBST_MESSAGE.configure= Fixing 'configure' script +SUBST_FILES.configure= configure +SUBST_SED.configure= -e 's,^$$echo,$$echo -n,' +SUBST_SED.configure+= -e 's,\\c,,' +SUBST_SED.configure+= -e 's,$$CXX $$tmp_file.C,$$CXX $$LDFLAGS $$tmp_file.C,' post-build: ${GUNZIP_CMD} -d ${WRKSRC}/html2text.1.gz ${WRKSRC}/html2textrc.5.gz diff --git a/textproc/hunspell-de/Makefile b/textproc/hunspell-de/Makefile index 9f4c0da6fd8..a84acee2772 100644 --- a/textproc/hunspell-de/Makefile +++ b/textproc/hunspell-de/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2019/08/11 13:23:24 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2019/11/04 21:43:37 rillig Exp $ DISTNAME= igerman98-20161207 PKGNAME= ${DISTNAME:S/igerman98/hunspell-de/} @@ -17,9 +17,9 @@ DEPENDS+= hunspell>=1.1.5:../../textproc/hunspell USE_LANGUAGES= # none -BUILD_TARGET= hunspell-all -USE_TOOLS+= gmake perl sed -REPLACE_PERL= bin/clear_affix.pl bin/dic2iso.pl bin/grepl bin/lcfirst.pl \ +BUILD_TARGET= hunspell-all +USE_TOOLS+= gmake perl sed +REPLACE_PERL= bin/clear_affix.pl bin/dic2iso.pl bin/grepl bin/lcfirst.pl \ bin/sq.pl bin/uniqflag.pl bin/unsq.pl bin/extractlines.pl \ bin/hunspell-optimize-roothelper.pl bin/myspellfixprefix.pl diff --git a/textproc/hyperestraier/Makefile.common b/textproc/hyperestraier/Makefile.common index 1d16fe51b21..77f760e715a 100644 --- a/textproc/hyperestraier/Makefile.common +++ b/textproc/hyperestraier/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.10 2017/01/19 18:52:27 agc Exp $ +# $NetBSD: Makefile.common,v 1.11 2019/11/04 21:43:37 rillig Exp $ # # used by textproc/java-native-hyperestraier/Makefile # used by textproc/java-pure-hyperestraier/Makefile @@ -6,11 +6,11 @@ # used by textproc/ruby-native-hyperestraier/Makefile # used by textproc/ruby-pure-hyperestraier/Makefile -DISTNAME= hyperestraier-${HYPERESTRAIER_VERSION} -CATEGORIES= japanese textproc www -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hyperestraier/} -MASTER_SITES+= http://hyperestraier.sourceforge.net/ -HYPERESTRAIER_VERSION=1.4.13 +DISTNAME= hyperestraier-${HYPERESTRAIER_VERSION} +CATEGORIES= japanese textproc www +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hyperestraier/} +MASTER_SITES+= http://hyperestraier.sourceforge.net/ +HYPERESTRAIER_VERSION= 1.4.13 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://hyperestraier.sourceforge.net/ diff --git a/textproc/icu/Makefile b/textproc/icu/Makefile index c8f59bda3d1..01a99873262 100644 --- a/textproc/icu/Makefile +++ b/textproc/icu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.126 2019/05/13 14:55:05 martin Exp $ +# $NetBSD: Makefile,v 1.127 2019/11/04 21:43:37 rillig Exp $ DISTNAME= icu4c-64_2-src PKGNAME= ${DISTNAME:S/4c//:S/-src//:S/_/./g} @@ -93,12 +93,12 @@ PLIST_SUBST+= MH_NAME=mh-qnx PLIST_SUBST+= MH_NAME=mh-unknown .endif -PKGCONFIG_OVERRIDE+= config/icu-i18n.pc -PKGCONFIG_OVERRIDE+= config/icu-io.pc -PKGCONFIG_OVERRIDE+= config/icu-le.pc -PKGCONFIG_OVERRIDE+= config/icu-lx.pc -PKGCONFIG_OVERRIDE+= config/icu-uc.pc -PKGCONFIG_OVERRIDE+= config/icu.pc +PKGCONFIG_OVERRIDE+= config/icu-i18n.pc +PKGCONFIG_OVERRIDE+= config/icu-io.pc +PKGCONFIG_OVERRIDE+= config/icu-le.pc +PKGCONFIG_OVERRIDE+= config/icu-lx.pc +PKGCONFIG_OVERRIDE+= config/icu-uc.pc +PKGCONFIG_OVERRIDE+= config/icu.pc PKGCONFIG_OVERRIDE_STAGE= post-build # work around ICU-20533 (build failure on big endian machines) diff --git a/textproc/ispell-lt/Makefile b/textproc/ispell-lt/Makefile index 13e20a4d754..9d9fea7ab1f 100644 --- a/textproc/ispell-lt/Makefile +++ b/textproc/ispell-lt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2019/09/02 13:20:12 adam Exp $ +# $NetBSD: Makefile,v 1.12 2019/11/04 21:43:37 rillig Exp $ DISTNAME= ispell-lt-1.3 PKGREVISION= 1 @@ -12,8 +12,8 @@ LICENSE= modified-bsd DEPENDS+= ispell-[0-9]*:../../textproc/ispell -USE_TOOLS+= gmake -REPLACE_PYTHON+= tools/*.py +USE_TOOLS+= gmake +REPLACE_PYTHON+= tools/*.py PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 1.3 SUBST_CLASSES+= install diff --git a/textproc/ispell/Makefile b/textproc/ispell/Makefile index 4ba12ea6961..72fa485c335 100644 --- a/textproc/ispell/Makefile +++ b/textproc/ispell/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2015/03/14 07:55:32 ryoon Exp $ +# $NetBSD: Makefile,v 1.28 2019/11/04 21:43:37 rillig Exp $ # DISTNAME= ispell-3.4.00 @@ -9,8 +9,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://ficus-www.cs.ucla.edu/geoff/ispell.html COMMENT= Interactive spelling checker -CONFLICTS+= ispell-base-[0-9]* -USE_TOOLS+= gmake mktemp:run yacc +CONFLICTS+= ispell-base-[0-9]* +USE_TOOLS+= gmake mktemp:run yacc INSTALLATION_DIRS= bin lib ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 MAKE_FLAGS+= TMPDIR=${WRKDIR:Q} @@ -24,9 +24,9 @@ CFLAGS+= -DHAVE_INTTYPES_H .if ${OPSYS} == "SunOS" -EXTRADICT=/usr/dict/words +EXTRADICT= /usr/dict/words .else -EXTRADICT=/usr/share/dict/words +EXTRADICT= /usr/share/dict/words .endif .if !exists(${EXTRADICT}) diff --git a/textproc/ja-grep/Makefile b/textproc/ja-grep/Makefile index feed93f7bb2..ec426d623f8 100644 --- a/textproc/ja-grep/Makefile +++ b/textproc/ja-grep/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2013/04/06 20:27:29 rodent Exp $ +# $NetBSD: Makefile,v 1.14 2019/11/04 21:43:37 rillig Exp $ DISTNAME= grep-2.4.2 PKGNAME= ja-grep-2.4.2 @@ -6,8 +6,8 @@ PKGREVISION= 1 CATEGORIES= japanese textproc MASTER_SITES= ${MASTER_SITE_GNU:=grep/} -PATCH_SITES= http://www.hinadori.atnifty.com/~wills/program/ -PATCHFILES= grep-2.4.2-mlb2.patch.gz +PATCH_SITES= http://www.hinadori.atnifty.com/~wills/program/ +PATCHFILES= grep-2.4.2-mlb2.patch.gz PATCH_DIST_STRIP= -p1 CONFLICTS+= grep-[0-9]* @@ -16,12 +16,12 @@ MAINTAINER= tech-pkg-ja@jp.NetBSD.org HOMEPAGE= http://www.gnu.org/software/grep/grep.html COMMENT= GNU grep + multi-byte extension -GNU_CONFIGURE= yes +GNU_CONFIGURE= yes USE_PKGLOCALEDIR= yes -USE_TOOLS+= msgfmt +USE_TOOLS+= msgfmt CONFIGURE_ARGS+= --program-transform-name='s,^,j,' -TEST_TARGET= check -INFO_FILES= yes +TEST_TARGET= check +INFO_FILES= yes INSTALLATION_DIRS= share/doc/ja-grep diff --git a/textproc/ja-groff/Makefile b/textproc/ja-groff/Makefile index d6804309d27..83f4c227709 100644 --- a/textproc/ja-groff/Makefile +++ b/textproc/ja-groff/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2019/08/11 13:23:25 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2019/11/04 21:43:37 rillig Exp $ DISTNAME= groff-1.10 PKGNAME= ja-groff-0.99 @@ -6,9 +6,9 @@ PKGREVISION= 9 CATEGORIES= japanese textproc MASTER_SITES= ${MASTER_SITE_GNU:=groff/} -PATCH_SITES= ftp://ftp.ae.keio.ac.jp/pub/GNU/ \ - ftp://ftp.tohoku.ac.jp/pub/GNU/japanese/ -PATCHFILES= jgroff-0.99.diff.gz +PATCH_SITES= ftp://ftp.ae.keio.ac.jp/pub/GNU/ \ + ftp://ftp.tohoku.ac.jp/pub/GNU/japanese/ +PATCHFILES= jgroff-0.99.diff.gz PATCH_DIST_STRIP= -p1 MAINTAINER= pkgsrc-users@NetBSD.org @@ -17,12 +17,12 @@ COMMENT= Japanese enhancement of GNU groff MAKE_JOBS_SAFE= no -USE_TOOLS+= gmake perl:run yacc -USE_LANGUAGES= c c++03 -GNU_CONFIGURE= yes +USE_TOOLS+= gmake perl:run yacc +USE_LANGUAGES= c c++03 +GNU_CONFIGURE= yes CONFIGURE_HAS_MANDIR= no -#CONFIGURE_ENV+= CXXFLAGS="-fno-rtti -fno-exceptions -O" -MAKE_FLAGS+= manroot=${DESTDIR}${PREFIX}/${PKGMANDIR} +#CONFIGURE_ENV+= CXXFLAGS="-fno-rtti -fno-exceptions -O" +MAKE_FLAGS+= manroot=${DESTDIR}${PREFIX}/${PKGMANDIR} INSTALL_MAKE_FLAGS+= bindir=${DESTDIR}${PREFIX}/bin \ datadir=${DESTDIR}${PREFIX}/share diff --git a/textproc/ja-sed/Makefile b/textproc/ja-sed/Makefile index 4c1d29558bc..f05d0ba0640 100644 --- a/textproc/ja-sed/Makefile +++ b/textproc/ja-sed/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2017/08/18 01:15:02 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2019/11/04 21:43:38 rillig Exp $ DISTNAME= sed-3.02 PKGNAME= ja-sed-3.02 @@ -6,8 +6,8 @@ PKGREVISION= 3 CATEGORIES= japanese textproc MASTER_SITES= ${MASTER_SITE_GNU:=sed/} -PATCH_SITES= http://www.hinadori.atnifty.com/~wills/program/ -PATCHFILES= sedmb109.diff.gz +PATCH_SITES= http://www.hinadori.atnifty.com/~wills/program/ +PATCHFILES= sedmb109.diff.gz PATCH_DIST_STRIP= -p1 MAINTAINER= tech-pkg-ja@jp.NetBSD.org @@ -16,10 +16,10 @@ COMMENT= GNU sed + multi-byte extension CONFLICTS+= gsed-[0-9]* -USE_TOOLS+= gmake -GNU_CONFIGURE= yes +USE_TOOLS+= gmake +GNU_CONFIGURE= yes CONFIGURE_ARGS+= --program-transform-name='s,^,j,' -INFO_FILES= yes +INFO_FILES= yes INSTALLATION_DIRS= share/doc/ja-sed diff --git a/textproc/libclucene/Makefile b/textproc/libclucene/Makefile index 9987589f07a..24e61adc97f 100644 --- a/textproc/libclucene/Makefile +++ b/textproc/libclucene/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2019/08/22 12:23:49 ryoon Exp $ +# $NetBSD: Makefile,v 1.25 2019/11/04 21:43:38 rillig Exp $ DISTNAME= clucene-core-2.3.3.4 PKGNAME= lib${DISTNAME:S/-core-/-/} @@ -13,11 +13,11 @@ LICENSE= gnu-lgpl-v2.1 OR apache-2.0 PKGCONFIG_OVERRIDE+= libclucene-core.pc.in -USE_LANGUAGES= c c++ -USE_CMAKE= yes -CMAKE_ARGS+= -DBUILD_CONTRIBS_LIB=ON +USE_LANGUAGES= c c++ +USE_CMAKE= yes +CMAKE_ARGS+= -DBUILD_CONTRIBS_LIB=ON #BUILD_TARGET+= clucene-contribs-lib -USE_LIBTOOL= yes +USE_LIBTOOL= yes .include "../../devel/boost-libs/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" diff --git a/textproc/libhighlight/Makefile b/textproc/libhighlight/Makefile index 87b28845305..2563af8dd88 100644 --- a/textproc/libhighlight/Makefile +++ b/textproc/libhighlight/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.3 2019/05/21 21:56:57 schmonz Exp $ +# $NetBSD: Makefile,v 1.4 2019/11/04 21:43:38 rillig Exp $ .include "../../textproc/libhighlight/Makefile.common" -PKGNAME= libhighlight-${VERSION} -COMMENT+= (shared library) +PKGNAME= libhighlight-${VERSION} +COMMENT+= (shared library) BUILD_TARGET= lib-shared diff --git a/textproc/libnxml/Makefile b/textproc/libnxml/Makefile index f44963f402b..3e5c4aa66eb 100644 --- a/textproc/libnxml/Makefile +++ b/textproc/libnxml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2019/08/22 12:23:49 ryoon Exp $ +# $NetBSD: Makefile,v 1.20 2019/11/04 21:43:38 rillig Exp $ # DISTNAME= libnxml-0.18.3 @@ -14,7 +14,7 @@ LICENSE= gnu-lgpl-v2.1 GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_TOOLS+= pkg-config -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++ PKGCONFIG_OVERRIDE+= nxml.pc.in diff --git a/textproc/libodfgen/Makefile b/textproc/libodfgen/Makefile index e5033663067..0f19ca8724d 100644 --- a/textproc/libodfgen/Makefile +++ b/textproc/libodfgen/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2019/08/22 12:23:50 ryoon Exp $ +# $NetBSD: Makefile,v 1.24 2019/11/04 21:43:38 rillig Exp $ DISTNAME= libodfgen-0.1.6 PKGREVISION= 10 @@ -29,7 +29,7 @@ CONFIGURE_ARGS+= --with-sharedptr=tr1 # Avoid erroring out due to multiple -Werror=parentheses with gcc8 .if !empty(CC_VERSION:Mgcc-[89]*) -CONFIGURE_ARGS+=--disable-werror +CONFIGURE_ARGS+= --disable-werror .endif .include "../../converters/libetonyek/buildlink3.mk" diff --git a/textproc/libplist/Makefile b/textproc/libplist/Makefile index 30268a0efe9..84d871df9cc 100644 --- a/textproc/libplist/Makefile +++ b/textproc/libplist/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2019/09/02 13:20:11 adam Exp $ +# $NetBSD: Makefile,v 1.23 2019/11/04 21:43:38 rillig Exp $ DISTNAME= libplist-1.12 PKGREVISION= 1 @@ -17,9 +17,9 @@ USE_TOOLS+= bash gmake pkg-config USE_LIBTOOL= yes USE_LANGUAGES= c c++ -PKGCONFIG_OVERRIDE+= libplist++.pc.in -PKGCONFIG_OVERRIDE+= libplist.pc.in -PY_PATCHPLIST= yes +PKGCONFIG_OVERRIDE+= libplist++.pc.in +PKGCONFIG_OVERRIDE+= libplist.pc.in +PY_PATCHPLIST= yes PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 1.8 .include "../../devel/py-cython/buildlink3.mk" diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile index 59641abad54..6718ade25ef 100644 --- a/textproc/libxml2/Makefile +++ b/textproc/libxml2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.153 2019/07/03 16:54:32 sevan Exp $ +# $NetBSD: Makefile,v 1.154 2019/11/04 21:43:38 rillig Exp $ .include "../../textproc/libxml2/Makefile.common" @@ -35,7 +35,7 @@ SUBST_FILES.cat= catalog.c xmlcatalog.c SUBST_SED.cat= -e "s,@@SGML_DEFAULT_CATALOG@@,${SGML_DEFAULT_CATALOG},g" SUBST_SED.cat+= -e "s,@@XML_DEFAULT_CATALOG@@,${XML_DEFAULT_CATALOG},g" -BUILDLINK_TRANSFORM.Darwin+= rm:-Wno-array-bounds +BUILDLINK_TRANSFORM.Darwin+= rm:-Wno-array-bounds BUILDLINK_TRANSFORM.SunOS+= rm:-Werror=format=2 LDFLAGS.SCO_SV+= -lm diff --git a/textproc/lout/Makefile b/textproc/lout/Makefile index cf44fee3900..ef6deae80b6 100644 --- a/textproc/lout/Makefile +++ b/textproc/lout/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2013/12/16 06:33:06 dholland Exp $ +# $NetBSD: Makefile,v 1.20 2019/11/04 21:43:38 rillig Exp $ DISTNAME= lout-3.40 PKGREVISION= 1 @@ -10,9 +10,9 @@ HOMEPAGE= http://savannah.nongnu.org/projects/lout COMMENT= Basser Lout, a TeX/troff-like formatter with PostScript/PDF output LICENSE= gnu-gpl-v3 -MAKE_FILE= makefile -NO_CONFIGURE= yes -INSTALL_TARGET= allinstall +MAKE_FILE= makefile +NO_CONFIGURE= yes +INSTALL_TARGET= allinstall INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/doc .include "../../devel/zlib/buildlink3.mk" diff --git a/textproc/marisa/Makefile b/textproc/marisa/Makefile index 3a80f3b665a..48490514427 100644 --- a/textproc/marisa/Makefile +++ b/textproc/marisa/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.1 2014/05/24 10:21:13 obache Exp $ +# $NetBSD: Makefile,v 1.2 2019/11/04 21:43:38 rillig Exp $ .include "Makefile.common" COMMENT= C++ library to provide an implementation of MARISA GNU_CONFIGURE= yes USE_LIBTOOL= yes -USE_TOOLS+= pkg-config +USE_TOOLS+= pkg-config USE_LANGUAGES= c c++ #TEST_TARGET= check diff --git a/textproc/markdown2social/Makefile b/textproc/markdown2social/Makefile index dc5e047e30c..ea7b873f363 100644 --- a/textproc/markdown2social/Makefile +++ b/textproc/markdown2social/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2019/09/02 13:20:11 adam Exp $ +# $NetBSD: Makefile,v 1.9 2019/11/04 21:43:39 rillig Exp $ DISTNAME= markdown2social-0.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -15,7 +15,7 @@ DEPENDS+= ${PYPKGPREFIX}-markdown>=2.6:../../textproc/py-markdown USE_LANGUAGES= # none -PYTHON_VERSIONS_ACCEPTED= 27 +PYTHON_VERSIONS_ACCEPTED= 27 .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/migemo/Makefile b/textproc/migemo/Makefile index 3510c6bbb37..b3469f5f78a 100644 --- a/textproc/migemo/Makefile +++ b/textproc/migemo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2016/03/13 09:36:59 taca Exp $ +# $NetBSD: Makefile,v 1.10 2019/11/04 21:43:39 rillig Exp $ .include "../../textproc/migemo/Makefile.common" @@ -7,7 +7,7 @@ PKGREVISION= 2 COMMENT= Japanese text search tool/library -LICENSE= gnu-gpl-v2 +LICENSE= gnu-gpl-v2 DEPENDS+= ${RUBY_PKGPREFIX}-bsearch-[0-9]*:../../devel/ruby-bsearch DEPENDS+= ${RUBY_PKGPREFIX}-romkan-[0-9]*:../../converters/ruby-romkan diff --git a/textproc/mxml/Makefile b/textproc/mxml/Makefile index 68186cdfc73..11d7da4fc9d 100644 --- a/textproc/mxml/Makefile +++ b/textproc/mxml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2016/07/15 13:14:10 mef Exp $ +# $NetBSD: Makefile,v 1.7 2019/11/04 21:43:39 rillig Exp $ DISTNAME= mxml-2.10 CATEGORIES= textproc @@ -13,8 +13,8 @@ GNU_CONFIGURE= yes USE_LANGUAGES= c c++ USE_LIBTOOL= yes -PKGCONFIG_OVERRIDE+= mxml.pc -PKGCONFIG_OVERRIDE_STAGE=post-configure +PKGCONFIG_OVERRIDE+= mxml.pc +PKGCONFIG_OVERRIDE_STAGE= post-configure INSTALL_MAKE_FLAGS+= BUILDROOT=${DESTDIR} diff --git a/textproc/mxml/options.mk b/textproc/mxml/options.mk index bfe65222ba0..9537a8f0b45 100644 --- a/textproc/mxml/options.mk +++ b/textproc/mxml/options.mk @@ -1,9 +1,9 @@ -# $NetBSD: options.mk,v 1.1 2016/03/08 13:52:36 nros Exp $ +# $NetBSD: options.mk,v 1.2 2019/11/04 21:43:39 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.mxml PKG_SUPPORTED_OPTIONS= debug .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mdebug) -CONFIGURE_ARGS+= --enable-debug=yes +CONFIGURE_ARGS+= --enable-debug=yes .endif diff --git a/textproc/ocaml-csv/Makefile b/textproc/ocaml-csv/Makefile index de3a9f6a330..1286b2e67b2 100644 --- a/textproc/ocaml-csv/Makefile +++ b/textproc/ocaml-csv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2019/03/05 19:40:33 jaapb Exp $ +# $NetBSD: Makefile,v 1.23 2019/11/04 21:43:39 rillig Exp $ VERSION= 2.2 GITHUB_PROJECT= ocaml-csv @@ -15,7 +15,7 @@ LICENSE= gnu-lgpl-v2.1 #HAS_CONFIGURE= yes USE_LANGUAGES= c -OCAML_USE_DUNE= yes +OCAML_USE_DUNE= yes DUNE_BUILD_PACKAGES= csv OPAM_INSTALL_FILES= csv diff --git a/textproc/ocaml-csv/buildlink3.mk b/textproc/ocaml-csv/buildlink3.mk index 5143db20470..ffc2ce90b41 100644 --- a/textproc/ocaml-csv/buildlink3.mk +++ b/textproc/ocaml-csv/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2019/03/05 19:40:33 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2019/11/04 21:43:39 rillig Exp $ BUILDLINK_TREE+= ocaml-csv @@ -7,7 +7,7 @@ OCAML_CSV_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml-csv+= ocaml-csv>=2.0 BUILDLINK_ABI_DEPENDS.ocaml-csv+= ocaml-csv>=2.2nb1 -BUILDLINK_PKGSRCDIR.ocaml-csv?= ../../textproc/ocaml-csv +BUILDLINK_PKGSRCDIR.ocaml-csv?= ../../textproc/ocaml-csv .endif # OCAML_CSV_BUILDLINK3_MK diff --git a/textproc/ocaml-csv/options.mk b/textproc/ocaml-csv/options.mk index 8ceb11eb8ef..c209d380021 100644 --- a/textproc/ocaml-csv/options.mk +++ b/textproc/ocaml-csv/options.mk @@ -1,9 +1,9 @@ -# $NetBSD: options.mk,v 1.2 2018/11/27 19:49:45 jaapb Exp $ +# $NetBSD: options.mk,v 1.3 2019/11/04 21:43:39 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.ocaml-csv PKG_SUPPORTED_OPTIONS= lwt PKG_SUGGESTED_OPTIONS= # empty -PLIST_VARS+= lwt +PLIST_VARS+= lwt .include "../../mk/bsd.prefs.mk" diff --git a/textproc/ocaml-expat/Makefile b/textproc/ocaml-expat/Makefile index ceb9f31ad41..5362734862f 100644 --- a/textproc/ocaml-expat/Makefile +++ b/textproc/ocaml-expat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2018/11/12 16:10:27 jaapb Exp $ +# $NetBSD: Makefile,v 1.19 2019/11/04 21:43:39 rillig Exp $ # VERSION= 1.0.0 @@ -14,8 +14,8 @@ HOMEPAGE= https://github.com/whitequark/ocaml-expat COMMENT= OCaml bindings for the expat library LICENSE= mit -USE_TOOLS+= gmake -USE_LANGUAGES= c +USE_TOOLS+= gmake +USE_LANGUAGES= c OCAML_USE_FINDLIB= yes .include "../../mk/ocaml.mk" diff --git a/textproc/ocaml-markup/Makefile b/textproc/ocaml-markup/Makefile index 0c897a413c0..00275698acc 100644 --- a/textproc/ocaml-markup/Makefile +++ b/textproc/ocaml-markup/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2019/03/05 17:08:08 jaapb Exp $ +# $NetBSD: Makefile,v 1.11 2019/11/04 21:43:39 rillig Exp $ GITHUB_PROJECT= markup.ml GITHUB_TAG= ${PKGVERSION_NOREV} @@ -16,7 +16,7 @@ LICENSE= 2-clause-bsd #HAS_CONFIGURE= yes USE_LANGUAGES= # none -OCAML_USE_DUNE= yes +OCAML_USE_DUNE= yes DUNE_BUILD_PACKAGES= markup OPAM_INSTALL_FILES= markup diff --git a/textproc/ocaml-markup/options.mk b/textproc/ocaml-markup/options.mk index 67b1f2baff3..cf36563fdbd 100644 --- a/textproc/ocaml-markup/options.mk +++ b/textproc/ocaml-markup/options.mk @@ -1,9 +1,9 @@ -# $NetBSD: options.mk,v 1.1 2018/11/27 17:20:09 jaapb Exp $ +# $NetBSD: options.mk,v 1.2 2019/11/04 21:43:39 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.ocaml-markup PKG_SUPPORTED_OPTIONS= lwt PKG_SUGGESTED_OPTIONS= # empty -PLIST_VARS+= lwt +PLIST_VARS+= lwt .include "../../mk/bsd.prefs.mk" diff --git a/textproc/ocaml-text/Makefile b/textproc/ocaml-text/Makefile index ac425695536..33ad7315e58 100644 --- a/textproc/ocaml-text/Makefile +++ b/textproc/ocaml-text/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2018/11/12 16:10:28 jaapb Exp $ +# $NetBSD: Makefile,v 1.24 2019/11/04 21:43:39 rillig Exp $ # DISTNAME= ocaml-text-0.8 @@ -13,7 +13,7 @@ LICENSE= modified-bsd HAS_CONFIGURE= yes -#SUBST_CLASSES+= destdir +#SUBST_CLASSES+= destdir #SUBST_STAGE.destdir= post-configure #SUBST_MESSAGE.destdir= Changing install location to DESTDIR #SUBST_FILES.destdir= setup.ml diff --git a/textproc/ocaml-tyxml/buildlink3.mk b/textproc/ocaml-tyxml/buildlink3.mk index 9adc70096b6..7b831caad60 100644 --- a/textproc/ocaml-tyxml/buildlink3.mk +++ b/textproc/ocaml-tyxml/buildlink3.mk @@ -1,13 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.11 2019/03/05 17:10:04 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2019/11/04 21:43:39 rillig Exp $ BUILDLINK_TREE+= ocaml-tyxml .if !defined(OCAML_TYXML_BUILDLINK3_MK) OCAML_TYXML_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.ocaml-tyxml+= ocaml-tyxml>=4.0.1 -BUILDLINK_ABI_DEPENDS.ocaml-tyxml+= ocaml-tyxml>=4.3.0nb1 -BUILDLINK_PKGSRCDIR.ocaml-tyxml?= ../../textproc/ocaml-tyxml +BUILDLINK_API_DEPENDS.ocaml-tyxml+= ocaml-tyxml>=4.0.1 +BUILDLINK_ABI_DEPENDS.ocaml-tyxml+= ocaml-tyxml>=4.3.0nb1 +BUILDLINK_PKGSRCDIR.ocaml-tyxml?= ../../textproc/ocaml-tyxml .endif # OCAML_TYXML_BUILDLINK3_MK diff --git a/textproc/ocaml-uchar/Makefile b/textproc/ocaml-uchar/Makefile index 60a01bd35fc..643fee81d9f 100644 --- a/textproc/ocaml-uchar/Makefile +++ b/textproc/ocaml-uchar/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2018/11/27 16:46:05 jaapb Exp $ +# $NetBSD: Makefile,v 1.9 2019/11/04 21:43:39 rillig Exp $ VERSION= 0.0.2 GITHUB_PROJECT= uchar @@ -18,9 +18,9 @@ INSTALLATION_DIRS= ${OCAML_SITELIBDIR}/uchar .include "../../mk/ocaml.mk" .if ${OCAML_USE_OPT_COMPILER} == "yes" -NATIVE= true +NATIVE= true .else -NATIVE= false +NATIVE= false .endif do-build: diff --git a/textproc/p5-Alien-Hunspell/Makefile b/textproc/p5-Alien-Hunspell/Makefile index 0d14b53819d..f4db5f3f6a1 100644 --- a/textproc/p5-Alien-Hunspell/Makefile +++ b/textproc/p5-Alien-Hunspell/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2019/08/11 13:23:26 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2019/11/04 21:43:40 rillig Exp $ DISTNAME= Alien-Hunspell-0.11 PKGNAME= p5-${DISTNAME} @@ -17,7 +17,7 @@ DEPENDS+= p5-Sort-Versions-[0-9]*:../../devel/p5-Sort-Versions DEPENDS+= p5-Net-SSLeay-[0-9]*:../../security/p5-Net-SSLeay DEPENDS+= p5-IO-Socket-SSL-[0-9]*:../../security/p5-IO-Socket-SSL -PERL5_PACKLIST= auto/Alien/Hunspell/.packlist +PERL5_PACKLIST= auto/Alien/Hunspell/.packlist USE_TOOLS+= pkg-config .include "../../textproc/hunspell/buildlink3.mk" diff --git a/textproc/p5-Dist-Zilla-Plugin-PodWeaver/Makefile b/textproc/p5-Dist-Zilla-Plugin-PodWeaver/Makefile index f595be2e5d9..40f6ba44529 100644 --- a/textproc/p5-Dist-Zilla-Plugin-PodWeaver/Makefile +++ b/textproc/p5-Dist-Zilla-Plugin-PodWeaver/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2019/08/11 13:23:28 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2019/11/04 21:43:40 rillig Exp $ DISTNAME= Dist-Zilla-Plugin-PodWeaver-4.008 PKGNAME= p5-${DISTNAME} @@ -21,10 +21,10 @@ DEPENDS+= p5-Pod-Elemental-PerlMunger-[0-9]*:../../textproc/p5-Pod-Elemental-Per DEPENDS+= p5-Pod-Weaver>=4:../../textproc/p5-Pod-Weaver DEPENDS+= p5-namespace-autoclean-[0-9]*:../../devel/p5-namespace-autoclean -BUILD_DEPENDS+= p5-File-Find-Rule-[0-9]*:../../devel/p5-File-Find-Rule +BUILD_DEPENDS+= p5-File-Find-Rule-[0-9]*:../../devel/p5-File-Find-Rule #BUILD_DEPENDS+= {perl>=5.10.1,p5-Test-Simple-[0-9]*}:../../devel/p5-Test-Simple # for make test -BUILD_DEPENDS+= p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager +BUILD_DEPENDS+= p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager PERL5_PACKLIST= auto/Dist/Zilla/Plugin/PodWeaver/.packlist diff --git a/textproc/p5-Encode-HanExtra/Makefile b/textproc/p5-Encode-HanExtra/Makefile index 79059df3605..652b0a00c0d 100644 --- a/textproc/p5-Encode-HanExtra/Makefile +++ b/textproc/p5-Encode-HanExtra/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2019/08/11 13:23:28 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2019/11/04 21:43:40 rillig Exp $ DISTNAME= Encode-HanExtra-0.23 PKGNAME= p5-${DISTNAME} @@ -13,7 +13,7 @@ LICENSE= mit # wants both Module::Install and Module::Build PERL5_MODULE_TYPE= Module::Install -BUILD_DEPENDS+= p5-Module-Build-[0-9]*:../../devel/p5-Module-Build +BUILD_DEPENDS+= p5-Module-Build-[0-9]*:../../devel/p5-Module-Build #BUILD_DEPENDS+= p5-Module-Install-[0-9]*:../../devel/p5-Module-Install PERL5_PACKLIST= auto/Encode/HanExtra/.packlist diff --git a/textproc/p5-FormValidator-Simple/Makefile b/textproc/p5-FormValidator-Simple/Makefile index 9aa293df841..9f08df5ddf2 100644 --- a/textproc/p5-FormValidator-Simple/Makefile +++ b/textproc/p5-FormValidator-Simple/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2019/08/11 13:23:29 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2019/11/04 21:43:40 rillig Exp $ DISTNAME= FormValidator-Simple-0.29 PKGNAME= p5-${DISTNAME} @@ -26,8 +26,8 @@ DEPENDS+= p5-List-MoreUtils>=0.16:../../devel/p5-List-MoreUtils DEPENDS+= p5-UNIVERSAL-require>=0.10:../../devel/p5-UNIVERSAL-require DEPENDS+= p5-YAML>=0.39:../../textproc/p5-YAML -USE_LANGUAGES= # empty -PERL5_PACKLIST= auto/FormValidator/Simple/.packlist +USE_LANGUAGES= # empty +PERL5_PACKLIST= auto/FormValidator/Simple/.packlist PERL5_MODULE_TYPE= Module::Install::Bundled MAKE_ENV+= PERL_USE_UNSAFE_INC=1 diff --git a/textproc/p5-Lingua-EN-FindNumber/Makefile b/textproc/p5-Lingua-EN-FindNumber/Makefile index ec18af154e8..6993a052c00 100644 --- a/textproc/p5-Lingua-EN-FindNumber/Makefile +++ b/textproc/p5-Lingua-EN-FindNumber/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.11 2019/08/11 13:23:30 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2019/11/04 21:43:40 rillig Exp $ # DISTNAME= Lingua-EN-FindNumber-1.32 PKGNAME= p5-${DISTNAME} PKGREVISION= 4 CATEGORIES= textproc perl5 -MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Lingua/} +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Lingua/} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://metacpan.org/release/Lingua-EN-FindNumber diff --git a/textproc/p5-Lingua-EN-Inflect-Number/Makefile b/textproc/p5-Lingua-EN-Inflect-Number/Makefile index 2d84fb91485..aa8f2f88fb7 100644 --- a/textproc/p5-Lingua-EN-Inflect-Number/Makefile +++ b/textproc/p5-Lingua-EN-Inflect-Number/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.15 2019/08/11 13:23:30 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2019/11/04 21:43:40 rillig Exp $ # DISTNAME= Lingua-EN-Inflect-Number-1.12 PKGNAME= p5-${DISTNAME} PKGREVISION= 4 CATEGORIES= textproc perl5 -MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=../../authors/id/N/NE/NEILB/} +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=../../authors/id/N/NE/NEILB/} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://cpan.metacpan.org/authors/id/S/SI/SIMON/ diff --git a/textproc/p5-Lingua-EN-Inflect-Phrase/Makefile b/textproc/p5-Lingua-EN-Inflect-Phrase/Makefile index 9132d34137a..13bfc175445 100644 --- a/textproc/p5-Lingua-EN-Inflect-Phrase/Makefile +++ b/textproc/p5-Lingua-EN-Inflect-Phrase/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.18 2019/08/11 13:23:30 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2019/11/04 21:43:40 rillig Exp $ DISTNAME= Lingua-EN-Inflect-Phrase-0.20 PKGNAME= p5-${DISTNAME} PKGREVISION= 2 CATEGORIES= textproc perl5 -MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Lingua/} +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Lingua/} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://metacpan.org/release/Lingua-EN-Inflect-Phrase @@ -18,7 +18,7 @@ DEPENDS+= p5-Lingua-EN-Number-IsOrdinal-[0-9]*:../../textproc/p5-Lingua-EN-Numbe DEPENDS+= p5-Lingua-EN-Tagger-[0-9]*:../../textproc/p5-Lingua-EN-Tagger #BUILD_DEPENDS+= {perl>=5.12.0,p5-Test-Simple>=0.94}:../../devel/p5-Test-Simple -BUILD_DEPENDS+= p5-Test-NoWarnings-[0-9]*:../../devel/p5-Test-NoWarnings +BUILD_DEPENDS+= p5-Test-NoWarnings-[0-9]*:../../devel/p5-Test-NoWarnings USE_LANGUAGES= # empty PERL5_PACKLIST= auto/Lingua/EN/Inflect/Phrase/.packlist diff --git a/textproc/p5-Lingua-Stem-Snowball/Makefile b/textproc/p5-Lingua-Stem-Snowball/Makefile index 11ac94c5524..974dd5c9baa 100644 --- a/textproc/p5-Lingua-Stem-Snowball/Makefile +++ b/textproc/p5-Lingua-Stem-Snowball/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2019/08/11 13:23:32 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2019/11/04 21:43:40 rillig Exp $ DISTNAME= Lingua-Stem-Snowball-0.952 PKGNAME= p5-${DISTNAME} @@ -11,8 +11,8 @@ HOMEPAGE= https://metacpan.org/release/Lingua-Stem-Snowball COMMENT= Lingua::Stem::Snowball - Perl interface to Snowball stemmers PERL5_MODULE_TYPE= Module::Build -PERL5_REQD+= 5.8.0 -PERL5_PACKLIST= auto/Lingua/Stem/Snowball/.packlist +PERL5_REQD+= 5.8.0 +PERL5_PACKLIST= auto/Lingua/Stem/Snowball/.packlist .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/p5-Pod-Elemental/Makefile b/textproc/p5-Pod-Elemental/Makefile index e9dca09420b..dfa89b68b5e 100644 --- a/textproc/p5-Pod-Elemental/Makefile +++ b/textproc/p5-Pod-Elemental/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2019/08/11 13:23:35 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2019/11/04 21:43:41 rillig Exp $ DISTNAME= Pod-Elemental-0.103004 PKGNAME= p5-${DISTNAME} @@ -26,7 +26,7 @@ BUILD_DEPENDS+= p5-Test-Deep-[0-9]*:../../devel/p5-Test-Deep BUILD_DEPENDS+= p5-Test-Differences-[0-9]*:../../devel/p5-Test-Differences BUILD_DEPENDS+= p5-Text-Diff-[0-9]*:../../textproc/p5-Text-Diff # for make test -BUILD_DEPENDS+=p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager +BUILD_DEPENDS+= p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager PERL5_PACKLIST= auto/Pod/Elemental/.packlist diff --git a/textproc/p5-Pod-Strip/Makefile b/textproc/p5-Pod-Strip/Makefile index 4c443987141..584404d4b76 100644 --- a/textproc/p5-Pod-Strip/Makefile +++ b/textproc/p5-Pod-Strip/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2019/08/11 13:23:36 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2019/11/04 21:43:41 rillig Exp $ # DISTNAME= Pod-Strip-1.02 @@ -13,7 +13,7 @@ COMMENT= Perl5 module to remove POD from Perl code #DEPENDS+= {perl>=5.9.3,p5-Pod-Simple>=3.0}:../../textproc/p5-Pod-Simple -PERL5_PACKLIST= auto/Pod/Strip/.packlist +PERL5_PACKLIST= auto/Pod/Strip/.packlist PERL5_MODULE_TYPE= Module::Build .include "../../lang/perl5/module.mk" diff --git a/textproc/p5-Pod-Weaver/Makefile b/textproc/p5-Pod-Weaver/Makefile index 7e461122234..64c4018641e 100644 --- a/textproc/p5-Pod-Weaver/Makefile +++ b/textproc/p5-Pod-Weaver/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2019/08/11 13:23:37 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2019/11/04 21:43:41 rillig Exp $ DISTNAME= Pod-Weaver-4.015 PKGNAME= p5-${DISTNAME} @@ -26,9 +26,9 @@ DEPENDS+= p5-String-RewritePrefix-[0-9]*:../../textproc/p5-String-RewritePrefix DEPENDS+= p5-namespace-autoclean-[0-9]*:../../devel/p5-namespace-autoclean #BUILD_DEPENDS+= {perl>=5.10.1,p5-File-Temp-[0-9]*}:../../devel/p5-File-Temp -BUILD_DEPENDS+= p5-PPI-[0-9]*:../../devel/p5-PPI -BUILD_DEPENDS+= p5-Software-License-[0-9]*:../../devel/p5-Software-License -BUILD_DEPENDS+= p5-Test-Differences-[0-9]*:../../devel/p5-Test-Differences +BUILD_DEPENDS+= p5-PPI-[0-9]*:../../devel/p5-PPI +BUILD_DEPENDS+= p5-Software-License-[0-9]*:../../devel/p5-Software-License +BUILD_DEPENDS+= p5-Test-Differences-[0-9]*:../../devel/p5-Test-Differences #BUILD_DEPENDS+= {perl>=5.10.1,p5-Test-Simple>=0.96}:../../devel/p5-Test-Simple PERL5_PACKLIST= auto/Pod/Weaver/.packlist diff --git a/textproc/p5-String-Errf/Makefile b/textproc/p5-String-Errf/Makefile index c626f04626f..ef78a46e7bb 100644 --- a/textproc/p5-String-Errf/Makefile +++ b/textproc/p5-String-Errf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2019/08/11 13:23:38 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2019/11/04 21:43:41 rillig Exp $ # DISTNAME= String-Errf-0.008 @@ -17,11 +17,11 @@ DEPENDS+= p5-String-Formatter>=0.102081:../../textproc/p5-String-Formatter DEPENDS+= p5-Sub-Exporter-[0-9]*:../../devel/p5-Sub-Exporter #DEPENDS+= {perl>=5.10.1,p5-Time-Piece-[0-9]*}:../../time/p5-Time-Piece -BUILD_DEPENDS+= p5-TimeDate-[0-9]*:../../time/p5-TimeDate +BUILD_DEPENDS+= p5-TimeDate-[0-9]*:../../time/p5-TimeDate #BUILD_DEPENDS+= {perl>=5.14.1,p5-Test-Simple>=0.96}:../../devel/p5-Test-Simple # autodie is in core since 5.10 # for make test -BUILD_DEPENDS+= p5-JSON-MaybeXS-[0-9]*:../../converters/p5-JSON-MaybeXS +BUILD_DEPENDS+= p5-JSON-MaybeXS-[0-9]*:../../converters/p5-JSON-MaybeXS PERL5_PACKLIST= auto/String/Errf/.packlist diff --git a/textproc/p5-String-Expand/Makefile b/textproc/p5-String-Expand/Makefile index d755ba6d4c8..e86400f36e2 100644 --- a/textproc/p5-String-Expand/Makefile +++ b/textproc/p5-String-Expand/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2019/08/11 13:23:38 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2019/11/04 21:43:41 rillig Exp $ DISTNAME= String-Expand-0.04 PKGNAME= p5-${DISTNAME} @@ -14,9 +14,9 @@ LICENSE= ${PERL5_LICENSE} DEPENDS+= p5-Test-More-Behaviour-[0-9]*:../../devel/p5-Test-More-Behaviour DEPENDS+= p5-Test-Exception-[0-9]*:../../devel/p5-Test-Exception -PERL5_MODULE_TYPE= Module::Build -PERL5_PACKLIST= auto/String/Expand/.packlist -USE_LANGUAGES= # none +PERL5_MODULE_TYPE= Module::Build +PERL5_PACKLIST= auto/String/Expand/.packlist +USE_LANGUAGES= # none .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/p5-String-ToIdentifier-EN/Makefile b/textproc/p5-String-ToIdentifier-EN/Makefile index ecaffb40af5..dc725d1a81a 100644 --- a/textproc/p5-String-ToIdentifier-EN/Makefile +++ b/textproc/p5-String-ToIdentifier-EN/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2019/08/11 13:23:39 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2019/11/04 21:43:41 rillig Exp $ DISTNAME= String-ToIdentifier-EN-0.12 PKGNAME= p5-${DISTNAME} @@ -11,7 +11,7 @@ HOMEPAGE= https://metacpan.org/release/String-ToIdentifier-EN COMMENT= Convert Strings to English Program Identifiers LICENSE= ${PERL5_LICENSE} -DEPENDS+= p5-Lingua-EN-Inflect-Phrase>=0.07:../../textproc/p5-Lingua-EN-Inflect-Phrase +DEPENDS+= p5-Lingua-EN-Inflect-Phrase>=0.07:../../textproc/p5-Lingua-EN-Inflect-Phrase DEPENDS+= p5-Text-Unidecode>=0.04:../../textproc/p5-Text-Unidecode DEPENDS+= p5-namespace-clean>=0.20:../../devel/p5-namespace-clean diff --git a/textproc/p5-Text-BibTeX/Makefile b/textproc/p5-Text-BibTeX/Makefile index 0cdcc071cf3..4076e71c15e 100644 --- a/textproc/p5-Text-BibTeX/Makefile +++ b/textproc/p5-Text-BibTeX/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.52 2019/08/11 13:23:42 wiz Exp $ +# $NetBSD: Makefile,v 1.53 2019/11/04 21:43:41 rillig Exp $ DISTNAME= Text-BibTeX-0.87 PKGNAME= p5-${DISTNAME} @@ -29,9 +29,9 @@ pre-configure: .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "Darwin" post-build: -.for f in bin/biblex bin/bibparse bin/dumpnames usrlib/libbtparse.dylib +. for f in bin/biblex bin/bibparse bin/dumpnames usrlib/libbtparse.dylib ${CHMOD} u+w ${WRKSRC}/blib/${f} -.endfor +. endfor .endif .include "../../lang/perl5/module.mk" diff --git a/textproc/p5-Text-Emoticon-MSN/Makefile b/textproc/p5-Text-Emoticon-MSN/Makefile index 3062b2d6b74..43bdff6e283 100644 --- a/textproc/p5-Text-Emoticon-MSN/Makefile +++ b/textproc/p5-Text-Emoticon-MSN/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.18 2019/08/11 13:23:44 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2019/11/04 21:43:41 rillig Exp $ -DISTNAME= Text-Emoticon-MSN-0.04 -PKGNAME= p5-${DISTNAME} +DISTNAME= Text-Emoticon-MSN-0.04 +PKGNAME= p5-${DISTNAME} PKGREVISION= 11 CATEGORIES= textproc perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=../../authors/id/M/MI/MIYAGAWA/} @@ -10,8 +10,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://metacpan.org/release/Text-Emoticon-MSN COMMENT= Emoticon filter of MSN Messenger -#DEPENDS+= {perl>=5.7.3,p5-Test-Simple>=0.32}:../../devel/p5-Test-Simple -DEPENDS+= p5-Text-Emoticon>=0.02:../../textproc/p5-Text-Emoticon +#DEPENDS+= {perl>=5.7.3,p5-Test-Simple>=0.32}:../../devel/p5-Test-Simple +DEPENDS+= p5-Text-Emoticon>=0.02:../../textproc/p5-Text-Emoticon PERL5_PACKLIST= auto/Text/Emoticon/MSN/.packlist diff --git a/textproc/p5-Text-Emoticon/Makefile b/textproc/p5-Text-Emoticon/Makefile index f8bf432800e..a7ca58151aa 100644 --- a/textproc/p5-Text-Emoticon/Makefile +++ b/textproc/p5-Text-Emoticon/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.15 2019/08/11 13:23:44 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2019/11/04 21:43:41 rillig Exp $ -DISTNAME= Text-Emoticon-0.04 -PKGNAME= p5-${DISTNAME} +DISTNAME= Text-Emoticon-0.04 +PKGNAME= p5-${DISTNAME} PKGREVISION= 11 CATEGORIES= textproc perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=../../authors/id/M/MI/MIYAGAWA/} diff --git a/textproc/p5-Text-FindIndent/Makefile b/textproc/p5-Text-FindIndent/Makefile index c348e8e5b98..1566c2d9e40 100644 --- a/textproc/p5-Text-FindIndent/Makefile +++ b/textproc/p5-Text-FindIndent/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2019/08/11 13:23:44 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2019/11/04 21:43:42 rillig Exp $ DISTNAME= Text-FindIndent-0.11 PKGNAME= p5-${DISTNAME} @@ -11,7 +11,7 @@ HOMEPAGE= https://metacpan.org/release/Text-FindIndent COMMENT= Heuristically determine the indent style LICENSE= ${PERL5_LICENSE} -#BUILD_DEPENDS+= {perl>=5.10.1,p5-Test-Simple>=0.80}:../../devel/p5-Test-Simple +#BUILD_DEPENDS+= {perl>=5.10.1,p5-Test-Simple>=0.80}:../../devel/p5-Test-Simple USE_LANGUAGES= # empty MAKE_ENV+= PERL_USE_UNSAFE_INC=1 diff --git a/textproc/p5-Text-Hunspell/Makefile b/textproc/p5-Text-Hunspell/Makefile index 2ecd9635b76..764fa2cb38f 100644 --- a/textproc/p5-Text-Hunspell/Makefile +++ b/textproc/p5-Text-Hunspell/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2019/08/11 13:23:44 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2019/11/04 21:43:42 rillig Exp $ DISTNAME= Text-Hunspell-2.14 PKGNAME= p5-${DISTNAME} @@ -13,7 +13,7 @@ LICENSE= ${PERL5_LICENSE} BUILD_DEPENDS+= p5-Alien-Hunspell-[0-9]*:../../textproc/p5-Alien-Hunspell -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++ PERL5_PACKLIST= auto/Text/Hunspell/.packlist diff --git a/textproc/p5-Text-Markdown/Makefile b/textproc/p5-Text-Markdown/Makefile index 7bdc72e7b09..41ac0c85c0c 100644 --- a/textproc/p5-Text-Markdown/Makefile +++ b/textproc/p5-Text-Markdown/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2019/08/11 13:23:45 wiz Exp $ +# $NetBSD: Makefile,v 1.26 2019/11/04 21:43:42 rillig Exp $ DISTNAME= Text-Markdown-1.000031 PKGNAME= p5-${DISTNAME:S/000031/0.31/} @@ -13,7 +13,7 @@ LICENSE= modified-bsd BUILD_DEPENDS+= p5-List-MoreUtils-[0-9]*:../../devel/p5-List-MoreUtils BUILD_DEPENDS+= p5-Test-Exception-[0-9]*:../../devel/p5-Test-Exception -BUILD_DEPENDS+= p5-Test-Differences-[0-9]*:../../devel/p5-Test-Differences +BUILD_DEPENDS+= p5-Test-Differences-[0-9]*:../../devel/p5-Test-Differences PERL5_PACKLIST= auto/Text/Markdown/.packlist USE_LANGUAGES= # none diff --git a/textproc/p5-Text-Microformat/Makefile b/textproc/p5-Text-Microformat/Makefile index 43e1590c761..811b509ba22 100644 --- a/textproc/p5-Text-Microformat/Makefile +++ b/textproc/p5-Text-Microformat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2019/08/11 13:23:45 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2019/11/04 21:43:42 rillig Exp $ DISTNAME= Text-Microformat-0.04 PKGNAME= p5-${DISTNAME} @@ -11,8 +11,8 @@ HOMEPAGE= https://metacpan.org/release/Text-Microformat COMMENT= Perl 5 Microformat parser LICENSE= ${PERL5_LICENSE} -USE_LANGUAGES= # empty -PERL5_PACKLIST= auto/Text/Microformat/.packlist +USE_LANGUAGES= # empty +PERL5_PACKLIST= auto/Text/Microformat/.packlist PERL5_MODULE_TYPE= Module::Build DEPENDS+= p5-Class-Accessor>=0.25:../../devel/p5-Class-Accessor diff --git a/textproc/p5-Text-RecordParser/Makefile b/textproc/p5-Text-RecordParser/Makefile index 7c83522c1df..9e15f69f168 100644 --- a/textproc/p5-Text-RecordParser/Makefile +++ b/textproc/p5-Text-RecordParser/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2019/08/11 13:23:46 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2019/11/04 21:43:42 rillig Exp $ # DISTNAME= Text-RecordParser-1.6.5 @@ -30,7 +30,7 @@ DEPENDS+= p5-Text-TabularDisplay>=1.22:../../textproc/p5-Text-TabularDisplay USE_LANGUAGES= # empty PERL5_PACKLIST= auto/Text/RecordParser/.packlist -USE_TOOLS+=perl +USE_TOOLS+= perl REPLACE_PERL+= bin/tab2graph REPLACE_PERL+= bin/tablify diff --git a/textproc/p5-Text-SimpleTable-AutoWidth/Makefile b/textproc/p5-Text-SimpleTable-AutoWidth/Makefile index 5aeae55868c..459bf65db17 100644 --- a/textproc/p5-Text-SimpleTable-AutoWidth/Makefile +++ b/textproc/p5-Text-SimpleTable-AutoWidth/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2019/08/11 13:23:47 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2019/11/04 21:43:42 rillig Exp $ DISTNAME= Text-SimpleTable-AutoWidth-0.09 PKGNAME= p5-${DISTNAME} @@ -15,7 +15,7 @@ DEPENDS+= p5-Text-SimpleTable-[0-9]*:../../textproc/p5-Text-SimpleTable DEPENDS+= p5-Moo-[0-9]*:../../devel/p5-Moo USE_LANGUAGES= # empty -PERL5_PACKLIST= auto/Text/SimpleTable/AutoWidth/.packlist +PERL5_PACKLIST= auto/Text/SimpleTable/AutoWidth/.packlist .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/p5-Text-SimpleTable/Makefile b/textproc/p5-Text-SimpleTable/Makefile index 587cbb699e6..dc15ffe5271 100644 --- a/textproc/p5-Text-SimpleTable/Makefile +++ b/textproc/p5-Text-SimpleTable/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2019/08/11 13:23:47 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2019/11/04 21:43:42 rillig Exp $ DISTNAME= Text-SimpleTable-2.07 PKGNAME= p5-${DISTNAME} @@ -12,7 +12,7 @@ COMMENT= Simple Eyecandy ASCII Tables LICENSE= artistic-2.0 USE_LANGUAGES= # empty -PERL5_PACKLIST= auto/Text/SimpleTable/.packlist +PERL5_PACKLIST= auto/Text/SimpleTable/.packlist .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/p5-Text-Table/Makefile b/textproc/p5-Text-Table/Makefile index 27810cc1b93..5963822313f 100644 --- a/textproc/p5-Text-Table/Makefile +++ b/textproc/p5-Text-Table/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2019/08/11 13:23:47 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2019/11/04 21:43:42 rillig Exp $ DISTNAME= Text-Table-1.133 PKGNAME= p5-${DISTNAME} @@ -11,11 +11,11 @@ HOMEPAGE= https://metacpan.org/release/Text-Table COMMENT= Perl module to generate formatted text tables LICENSE= mit -BUILD_DEPENDS+= p5-Module-Build-[0-9]*:../../devel/p5-Module-Build +BUILD_DEPENDS+= p5-Module-Build-[0-9]*:../../devel/p5-Module-Build DEPENDS+= p5-Text-Aligner-[0-9]*:../../textproc/p5-Text-Aligner -PERL5_PACKLIST= auto/Text/Table/.packlist +PERL5_PACKLIST= auto/Text/Table/.packlist .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/p5-Text-Xslate/Makefile b/textproc/p5-Text-Xslate/Makefile index 1e48f6cdf42..fddcc2115f5 100644 --- a/textproc/p5-Text-Xslate/Makefile +++ b/textproc/p5-Text-Xslate/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2019/08/11 13:23:49 wiz Exp $ +# $NetBSD: Makefile,v 1.38 2019/11/04 21:43:42 rillig Exp $ DISTNAME= Text-Xslate-v3.5.6 PKGNAME= p5-${DISTNAME:S/-v/-/} @@ -22,9 +22,9 @@ DEPENDS+= p5-File-Copy-Recursive>=0:../../sysutils/p5-File-Copy-Recursive DEPENDS+= p5-Test-LeakTrace>=0:../../devel/p5-Test-LeakTrace DEPENDS+= p5-Module-Build-XSUtil-[0-9]*:../../devel/p5-Module-Build-XSUtil -PERL5_PACKLIST= auto/Text/Xslate/.packlist +PERL5_PACKLIST= auto/Text/Xslate/.packlist PERL5_MODULE_TYPE= Module::Build -USE_LANGUAGES= c +USE_LANGUAGES= c PERL5_MODULE_TYPE= Module::Build diff --git a/textproc/p5-XML-Atom-Stream/Makefile b/textproc/p5-XML-Atom-Stream/Makefile index 0e06fe17f33..833f7579c88 100644 --- a/textproc/p5-XML-Atom-Stream/Makefile +++ b/textproc/p5-XML-Atom-Stream/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2019/08/11 13:23:50 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2019/11/04 21:43:43 rillig Exp $ DISTNAME= XML-Atom-Stream-0.11 PKGNAME= p5-${DISTNAME} @@ -12,10 +12,10 @@ COMMENT= Client interface for AtomStream #really: Test::More >= 0.32 #BUILD_DEPENDS+= {perl>=5.6.2,p5-Test-Simple>=0.32}:../../devel/p5-Test-Simple -DEPENDS+= p5-libwww>=5.0:../../www/p5-libwww -DEPENDS+= p5-XML-SAX>=0.12:../../textproc/p5-XML-SAX -DEPENDS+= p5-XML-Handler-Trees>=0.02:../../textproc/p5-XML-Handler-Trees -DEPENDS+= p5-XML-Atom>=0.20:../../textproc/p5-XML-Atom +DEPENDS+= p5-libwww>=5.0:../../www/p5-libwww +DEPENDS+= p5-XML-SAX>=0.12:../../textproc/p5-XML-SAX +DEPENDS+= p5-XML-Handler-Trees>=0.02:../../textproc/p5-XML-Handler-Trees +DEPENDS+= p5-XML-Atom>=0.20:../../textproc/p5-XML-Atom PERL5_PACKLIST= auto/XML/Atom/Stream/.packlist diff --git a/textproc/p5-XML-Clean/Makefile b/textproc/p5-XML-Clean/Makefile index 7932e17b46f..ce679ff4932 100644 --- a/textproc/p5-XML-Clean/Makefile +++ b/textproc/p5-XML-Clean/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2019/08/11 13:23:51 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2019/11/04 21:43:43 rillig Exp $ DISTNAME= XML-Clean-1.06 PKGNAME= p5-${DISTNAME} @@ -10,7 +10,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://metacpan.org/release/XML-Clean COMMENT= Ensure, that *(HTML)* text pass throught an XML parser -PERL5_PACKLIST= auto/XML/Clean/.packlist +PERL5_PACKLIST= auto/XML/Clean/.packlist .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/p5-XML-Compile-Cache/Makefile b/textproc/p5-XML-Compile-Cache/Makefile index 097de0bd412..de1b82f77f1 100644 --- a/textproc/p5-XML-Compile-Cache/Makefile +++ b/textproc/p5-XML-Compile-Cache/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2019/08/11 13:23:51 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2019/11/04 21:43:43 rillig Exp $ DISTNAME= XML-Compile-Cache-1.06 PKGNAME= p5-${DISTNAME} @@ -11,13 +11,13 @@ HOMEPAGE= https://metacpan.org/release/XML-Compile-Cache COMMENT= Perl module for caching compilation based XML processing LICENSE= ${PERL5_LICENSE} -DEPENDS+= p5-XML-LibXML-Simple-[0-9]*:../../textproc/p5-XML-LibXML-Simple -DEPENDS+= p5-Log-Report-[0-9]*:../../devel/p5-Log-Report -#DEPENDS+= p5-Log-Report-Optional-[0-9]*:../../devel/p5-Log-Report-Optional -DEPENDS+= p5-XML-Compile-[0-9]*:../../textproc/p5-XML-Compile -#DEPENDS+= p5-Devel-GlobalDestruction-[0-9]*:../../devel/p5-Devel-GlobalDestruction +DEPENDS+= p5-XML-LibXML-Simple-[0-9]*:../../textproc/p5-XML-LibXML-Simple +DEPENDS+= p5-Log-Report-[0-9]*:../../devel/p5-Log-Report +#DEPENDS+= p5-Log-Report-Optional-[0-9]*:../../devel/p5-Log-Report-Optional +DEPENDS+= p5-XML-Compile-[0-9]*:../../textproc/p5-XML-Compile +#DEPENDS+= p5-Devel-GlobalDestruction-[0-9]*:../../devel/p5-Devel-GlobalDestruction # TEST_DEPENDS -BUILD_DEPENDS+= p5-XML-Compile-Tester-[0-9]*:../../textproc/p5-XML-Compile-Tester +BUILD_DEPENDS+= p5-XML-Compile-Tester-[0-9]*:../../textproc/p5-XML-Compile-Tester #BUILD_DEPENDS+= p5-Test-Deep-[0-9]*:../../devel/p5-Test-Deep PERL5_PACKLIST= auto/XML/Compile/Cache/.packlist diff --git a/textproc/p5-XML-Descent/Makefile b/textproc/p5-XML-Descent/Makefile index 51ca08f1132..68a179bc70d 100644 --- a/textproc/p5-XML-Descent/Makefile +++ b/textproc/p5-XML-Descent/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2019/08/11 13:23:52 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2019/11/04 21:43:43 rillig Exp $ DISTNAME= XML-Descent-1.04 PKGNAME= p5-${DISTNAME} @@ -12,7 +12,7 @@ COMMENT= Recursive descent XML parsing DEPENDS+= p5-XML-TokeParser>=0.05:../../textproc/p5-XML-TokeParser -PERL5_PACKLIST= auto/XML/Descent/.packlist +PERL5_PACKLIST= auto/XML/Descent/.packlist .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/p5-XML-Filter-BufferText/Makefile b/textproc/p5-XML-Filter-BufferText/Makefile index 7fb63303df4..3e74016f35d 100644 --- a/textproc/p5-XML-Filter-BufferText/Makefile +++ b/textproc/p5-XML-Filter-BufferText/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2019/08/11 13:23:53 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2019/11/04 21:43:43 rillig Exp $ DISTNAME= XML-Filter-BufferText-1.01 PKGNAME= p5-${DISTNAME} @@ -12,7 +12,7 @@ COMMENT= Perl5 module XML parser filter to put all characters() in one event DEPENDS+= p5-XML-SAX>=0.04:../../textproc/p5-XML-SAX -USE_LANGUAGES= # empty +USE_LANGUAGES= # empty PERL5_PACKLIST= auto/XML/Filter/BufferText/.packlist .include "../../lang/perl5/module.mk" diff --git a/textproc/p5-XML-Filter-DOMFilter-LibXML/Makefile b/textproc/p5-XML-Filter-DOMFilter-LibXML/Makefile index 7fad6512e27..e3fa841c7b6 100644 --- a/textproc/p5-XML-Filter-DOMFilter-LibXML/Makefile +++ b/textproc/p5-XML-Filter-DOMFilter-LibXML/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2019/08/11 13:23:53 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2019/11/04 21:43:43 rillig Exp $ DISTNAME= XML-Filter-DOMFilter-LibXML-0.04 PKGNAME= p5-${DISTNAME} @@ -15,7 +15,7 @@ DEPENDS+= p5-XML-LibXML>=1.53:../../textproc/p5-XML-LibXML EXTRACT_USING= gtar -USE_LANGUAGES= # empty +USE_LANGUAGES= # empty PERL5_PACKLIST= auto/XML/Filter/DOMFilter/LibXML/.packlist .include "../../lang/perl5/module.mk" diff --git a/textproc/p5-XML-Rabbit/Makefile b/textproc/p5-XML-Rabbit/Makefile index 17c82cdc7c8..76e447d615e 100644 --- a/textproc/p5-XML-Rabbit/Makefile +++ b/textproc/p5-XML-Rabbit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2019/08/11 13:23:55 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2019/11/04 21:43:43 rillig Exp $ DISTNAME= XML-Rabbit-0.4.1 PKGNAME= p5-${DISTNAME} @@ -12,7 +12,7 @@ COMMENT= Perl 5 module to consume XML with Moose and xpath queries LICENSE= ${PERL5_LICENSE} USE_LANGUAGES= # empty -PERL5_PACKLIST= auto/XML/Rabbit/.packlist +PERL5_PACKLIST= auto/XML/Rabbit/.packlist REPLACE_PERL+= bin/* diff --git a/textproc/p5-XML-SemanticDiff/Makefile b/textproc/p5-XML-SemanticDiff/Makefile index 71c6bb0f644..5426bf92c6f 100644 --- a/textproc/p5-XML-SemanticDiff/Makefile +++ b/textproc/p5-XML-SemanticDiff/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2019/08/11 13:23:56 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2019/11/04 21:43:43 rillig Exp $ DISTNAME= XML-SemanticDiff-1.0007 PKGNAME= p5-${DISTNAME} @@ -13,7 +13,7 @@ LICENSE= ${PERL5_LICENSE} DEPENDS+= p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser -PERL5_PACKLIST= auto/XML/SemanticDiff/.packlist +PERL5_PACKLIST= auto/XML/SemanticDiff/.packlist PERL5_MODULE_TYPE= Module::Build .include "../../lang/perl5/module.mk" diff --git a/textproc/p5-XML-Stream/Makefile b/textproc/p5-XML-Stream/Makefile index 5fb143423ec..e7f81f1fb31 100644 --- a/textproc/p5-XML-Stream/Makefile +++ b/textproc/p5-XML-Stream/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2019/08/11 13:23:56 wiz Exp $ +# $NetBSD: Makefile,v 1.29 2019/11/04 21:43:44 rillig Exp $ # DISTNAME= XML-Stream-1.24 @@ -16,7 +16,7 @@ DEPENDS+= p5-Authen-SASL-[0-9]*:../../security/p5-Authen-SASL #DEPENDS+= {perl>=5.7.3,p5-MIME-Base64>0}:../../converters/p5-MIME-Base64 PERL5_MODULE_TYPE= Module::Build -PERL5_PACKLIST= auto/XML/Stream/.packlist +PERL5_PACKLIST= auto/XML/Stream/.packlist .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/p5-XML-Tidy/Makefile b/textproc/p5-XML-Tidy/Makefile index 82062894029..cce3d93c0df 100644 --- a/textproc/p5-XML-Tidy/Makefile +++ b/textproc/p5-XML-Tidy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2019/08/11 13:23:57 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2019/11/04 21:43:44 rillig Exp $ # DISTNAME= XML-Tidy-1.20 @@ -13,8 +13,8 @@ HOMEPAGE= https://metacpan.org/release/XML-Tidy COMMENT= Tidy indenting of XML documents LICENSE= gnu-gpl-v3 -DEPENDS+= p5-XML-XPath-[0-9]*:../../textproc/p5-XML-XPath -DEPENDS+= p5-Math-BaseCnv-[0-9]*:../../math/p5-Math-BaseCnv +DEPENDS+= p5-XML-XPath-[0-9]*:../../textproc/p5-XML-XPath +DEPENDS+= p5-Math-BaseCnv-[0-9]*:../../math/p5-Math-BaseCnv PERL5_PACKLIST= auto/XML/Tidy/.packlist diff --git a/textproc/p5-XML-TokeParser/Makefile b/textproc/p5-XML-TokeParser/Makefile index 98cb1ff50e4..8e4a67405bd 100644 --- a/textproc/p5-XML-TokeParser/Makefile +++ b/textproc/p5-XML-TokeParser/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2019/08/11 13:23:57 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2019/11/04 21:43:44 rillig Exp $ DISTNAME= XML-TokeParser-0.05 PKGNAME= p5-${DISTNAME} @@ -12,7 +12,7 @@ COMMENT= Simplified interface to XML::Parser DEPENDS+= p5-XML-Parser>=2.44:../../textproc/p5-XML-Parser -PERL5_PACKLIST= auto/XML/TokeParser/.packlist +PERL5_PACKLIST= auto/XML/TokeParser/.packlist .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/p5-XML-TreeBuilder/Makefile b/textproc/p5-XML-TreeBuilder/Makefile index 28902f8ce6f..72424fe7aa2 100644 --- a/textproc/p5-XML-TreeBuilder/Makefile +++ b/textproc/p5-XML-TreeBuilder/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2019/08/11 13:23:57 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2019/11/04 21:43:44 rillig Exp $ DISTNAME= XML-TreeBuilder-5.4 PKGNAME= p5-${DISTNAME} @@ -12,7 +12,7 @@ COMMENT= Perl 5 parser that builds a tree of XML::Element objects LICENSE= ${PERL5_LICENSE} USE_LANGUAGES= # empty -PERL5_PACKLIST= auto/XML/TreeBuilder/.packlist +PERL5_PACKLIST= auto/XML/TreeBuilder/.packlist DEPENDS+= p5-HTML-Tree>=4.1:../../www/p5-HTML-Tree DEPENDS+= p5-HTML-Tagset>=3.02:../../www/p5-HTML-Tagset diff --git a/textproc/p5-XML-XPathEngine/Makefile b/textproc/p5-XML-XPathEngine/Makefile index 00b410b604e..9f00178669f 100644 --- a/textproc/p5-XML-XPathEngine/Makefile +++ b/textproc/p5-XML-XPathEngine/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2019/08/11 13:23:58 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2019/11/04 21:43:44 rillig Exp $ DISTNAME= XML-XPathEngine-0.14 PKGNAME= p5-${DISTNAME} @@ -12,7 +12,7 @@ COMMENT= Perl 5 re-usable XPath engine for DOM-like trees LICENSE= ${PERL5_LICENSE} USE_LANGUAGES= # empty -PERL5_PACKLIST= auto/XML/XPathEngine/.packlist +PERL5_PACKLIST= auto/XML/XPathEngine/.packlist .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/p5-highlight/Makefile b/textproc/p5-highlight/Makefile index 3aa6b04f9e9..b0b70eef15f 100644 --- a/textproc/p5-highlight/Makefile +++ b/textproc/p5-highlight/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.14 2019/08/13 01:48:49 schmonz Exp $ +# $NetBSD: Makefile,v 1.15 2019/11/04 21:43:44 rillig Exp $ .include "../../textproc/libhighlight/Makefile.common" -PKGNAME= p5-highlight-${VERSION} -COMMENT+= (Perl bindings) +PKGNAME= p5-highlight-${VERSION} +COMMENT+= (Perl bindings) BUILD_DEPENDS+= swig3-[0-9]*:../../devel/swig3 diff --git a/textproc/p5-native-hyperestraier/Makefile b/textproc/p5-native-hyperestraier/Makefile index 7b3dc5fd85e..2cabd2b1cba 100644 --- a/textproc/p5-native-hyperestraier/Makefile +++ b/textproc/p5-native-hyperestraier/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2019/08/11 13:24:00 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2019/11/04 21:43:44 rillig Exp $ # .include "../../textproc/hyperestraier/Makefile.common" @@ -16,12 +16,12 @@ MY_SUBDIR= perlnative BUILD_DIRS= ${MY_SUBDIR} CONFIGURE_DIRS= ${MY_SUBDIR} -GNU_CONFIGURE= yes -USE_TOOLS+= perl -PERL5_CONFIGURE=no -TEST_TARGET= check +GNU_CONFIGURE= yes +USE_TOOLS+= perl +PERL5_CONFIGURE= no +TEST_TARGET= check -PERL5_PACKLIST= auto/Estraier/.packlist +PERL5_PACKLIST= auto/Estraier/.packlist REPLACE_PERL= ${MY_SUBDIR}/estcmd.pl .include "../../textproc/hyperestraier/buildlink3.mk" diff --git a/textproc/php-mecab/Makefile b/textproc/php-mecab/Makefile index db2c70200b5..0ea6fd17815 100644 --- a/textproc/php-mecab/Makefile +++ b/textproc/php-mecab/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2016/11/27 14:55:30 taca Exp $ +# $NetBSD: Makefile,v 1.13 2019/11/04 21:43:44 rillig Exp $ # PECL_DISTNAME= ${MODNAME}-${PECL_VERSION} @@ -7,7 +7,7 @@ PECL_VERSION= 0.6.0 PECL_LEGACY_VERSION_SCHEME= yes PKGREVISION= 1 CATEGORIES= textproc japanese -MASTER_SITES= http://pecl.opendogs.org/get/ +MASTER_SITES= http://pecl.opendogs.org/get/ #EXTRACT_SUFX= .tar.gz MAINTAINER= taca@NetBSD.org diff --git a/textproc/postgresql-autodoc/Makefile b/textproc/postgresql-autodoc/Makefile index a115cac7702..fda7a3cb2d0 100644 --- a/textproc/postgresql-autodoc/Makefile +++ b/textproc/postgresql-autodoc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2019/08/11 13:24:01 wiz Exp $ +# $NetBSD: Makefile,v 1.34 2019/11/04 21:43:44 rillig Exp $ # DISTNAME= postgresql_autodoc-1.30 @@ -14,11 +14,11 @@ DEPENDS+= p5-Term-ReadKey-[0-9]*:../../devel/p5-Term-ReadKey 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 +WRKSRC= ${WRKDIR}/postgresql_autodoc +USE_TOOLS+= gmake perl:run +GNU_CONFIGURE= yes CONFIGURE_ARGS+= --datadir=${PREFIX:Q}/share -CONFIGURE_ENV+= ac_cv_path_PERL=${PERL5:Q} +CONFIGURE_ENV+= ac_cv_path_PERL=${PERL5:Q} INSTALL_MAKE_FLAGS= prefix=${DESTDIR}${PREFIX} \ datadir=${DESTDIR}${PREFIX}/share/postgresql_autodoc diff --git a/textproc/py-4Suite/Makefile b/textproc/py-4Suite/Makefile index 23aeb0a79a7..ea05c42340d 100644 --- a/textproc/py-4Suite/Makefile +++ b/textproc/py-4Suite/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2019/09/02 13:20:11 adam Exp $ +# $NetBSD: Makefile,v 1.17 2019/11/04 21:43:45 rillig Exp $ VER= 1.0.2 DISTNAME= 4Suite-XML-${VER} @@ -24,7 +24,7 @@ SUBST_FILES.python+= test/test.py SUBST_STAGE.python= post-build SUBST_SED.python= -e 's,\#![^ ]* python,\#! ${PYTHONBIN},' -#PYTHON_SELF_CONFLICT= yes +#PYTHON_SELF_CONFLICT= yes PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 1.0.2 do-configure: diff --git a/textproc/py-Excelerator/Makefile b/textproc/py-Excelerator/Makefile index b1a7b80864a..9e270c71fff 100644 --- a/textproc/py-Excelerator/Makefile +++ b/textproc/py-Excelerator/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2019/09/02 13:20:11 adam Exp $ +# $NetBSD: Makefile,v 1.21 2019/11/04 21:43:45 rillig Exp $ DISTNAME= pyexcelerator-${VERSION} PKGNAME= ${PYPKGPREFIX}-Excelerator-${VERSION} @@ -14,7 +14,7 @@ COMMENT= Python library for generating Excel 97/2000/XP/2003 files USE_LANGUAGES= #none -PYTHON_VERSIONS_ACCEPTED= 27 +PYTHON_VERSIONS_ACCEPTED= 27 EGG_NAME= pyExcelerator-${VERSION} diff --git a/textproc/py-X/Makefile b/textproc/py-X/Makefile index e09b78d2e6c..c9f985c32c7 100644 --- a/textproc/py-X/Makefile +++ b/textproc/py-X/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2015/04/13 23:12:43 rodent Exp $ +# $NetBSD: Makefile,v 1.17 2019/11/04 21:43:45 rillig Exp $ DISTNAME= PyX-0.13 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/Py//} @@ -20,7 +20,7 @@ USE_LANGUAGES= #none CONF_FILES= ${PYSITELIB}/pyx/data/pyxrc \ ${PKG_SYSCONFDIR}/pyxrc -PYTHON_SELF_CONFLICT= yes +PYTHON_SELF_CONFLICT= yes PYTHON_VERSIONS_INCOMPATIBLE= 27 PYTHON_VERSIONS_INCLUDE_3X= yes diff --git a/textproc/py-X2/Makefile b/textproc/py-X2/Makefile index db5d5dab671..82917e1203e 100644 --- a/textproc/py-X2/Makefile +++ b/textproc/py-X2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2019/09/02 13:20:12 adam Exp $ +# $NetBSD: Makefile,v 1.9 2019/11/04 21:43:45 rillig Exp $ DISTNAME= PyX-0.12.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/Py//} @@ -20,8 +20,8 @@ USE_LANGUAGES= #none CONF_FILES= ${PYSITELIB}/pyx/data/pyxrc \ ${PKG_SYSCONFDIR}/pyxrc -PYTHON_SELF_CONFLICT= yes -PYTHON_VERSIONS_ACCEPTED= 27 +PYTHON_SELF_CONFLICT= yes +PYTHON_VERSIONS_ACCEPTED= 27 .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/py-antlr4/Makefile b/textproc/py-antlr4/Makefile index f5907ab953c..6151373c2c6 100644 --- a/textproc/py-antlr4/Makefile +++ b/textproc/py-antlr4/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2018/12/27 15:10:51 joerg Exp $ +# $NetBSD: Makefile,v 1.3 2019/11/04 21:43:45 rillig Exp $ DISTNAME= antlr4-python3-runtime-4.7.1 -PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/-python3-runtime//1} +PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/-python3-runtime//1} CATEGORIES= textproc python MASTER_SITES= ${MASTER_SITE_PYPI:=a/antlr4-python3-runtime/} diff --git a/textproc/py-cElementTree/Makefile b/textproc/py-cElementTree/Makefile index 8e557288635..2a689634829 100644 --- a/textproc/py-cElementTree/Makefile +++ b/textproc/py-cElementTree/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2019/10/21 13:19:29 adam Exp $ +# $NetBSD: Makefile,v 1.15 2019/11/04 21:43:45 rillig Exp $ PKGNAME= ${PYPKGPREFIX}-cElementTree-${PY_DISTVERSION} CATEGORIES= textproc python @@ -13,13 +13,13 @@ EXTRACT_ELEMENTS= ${PYSUBDIR}/Modules/_elementtree.c EXTRACT_ELEMENTS+= ${PYSUBDIR}/Modules/clinic/_elementtree.c.h .endif -USE_GCC_RUNTIME=yes -USE_TOOLS+= patch +USE_GCC_RUNTIME= yes +USE_TOOLS+= patch -PYDISTUTILSPKG= yes -PY_PATCHPLIST= yes -PY_SETUP_SUBST+= EXPATPREFIX=${BUILDLINK_DIR} -PY_SETUP_SUBST+= EXPATRTPREFIX=${BUILDLINK_PREFIX.expat} +PYDISTUTILSPKG= yes +PY_PATCHPLIST= yes +PY_SETUP_SUBST+= EXPATPREFIX=${BUILDLINK_DIR} +PY_SETUP_SUBST+= EXPATRTPREFIX=${BUILDLINK_PREFIX.expat} PYSETUPINSTALLARGS+= --install-lib ${PREFIX}/${PYLIB}/lib-dynload diff --git a/textproc/py-elementtree/Makefile b/textproc/py-elementtree/Makefile index ca8510786cd..651c4a6bec3 100644 --- a/textproc/py-elementtree/Makefile +++ b/textproc/py-elementtree/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2019/09/02 13:20:13 adam Exp $ +# $NetBSD: Makefile,v 1.21 2019/11/04 21:43:45 rillig Exp $ DISTNAME= elementtree-1.2.6-20050316 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/-20050316//} @@ -16,7 +16,7 @@ USE_LANGUAGES= # empty EGG_NAME= elementtree-1.2.6_20050316 -PYTHON_VERSIONS_ACCEPTED= 27 +PYTHON_VERSIONS_ACCEPTED= 27 .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/py-empy/Makefile b/textproc/py-empy/Makefile index 4690d7af2e3..6fc8fb38b89 100644 --- a/textproc/py-empy/Makefile +++ b/textproc/py-empy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2019/09/02 13:20:12 adam Exp $ +# $NetBSD: Makefile,v 1.15 2019/11/04 21:43:45 rillig Exp $ DISTNAME= empy-3.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -12,13 +12,13 @@ COMMENT= Powerful and robust templating system for Python LICENSE= gnu-lgpl-v2.1 INSTALLATION_DIRS= bin share/doc/empy -REPLACE_PYTHON+= em.py +REPLACE_PYTHON+= em.py USE_TOOLS+= pax PYDISTUTILSPKG= # yes -PYTHON_SELF_CONFLICT= yes -PYTHON_VERSIONS_ACCEPTED= 27 +PYTHON_SELF_CONFLICT= yes +PYTHON_VERSIONS_ACCEPTED= 27 # Fix html path in documentation SUBST_CLASSES+= doc diff --git a/textproc/py-expat/Makefile b/textproc/py-expat/Makefile index 451186d8b5f..6bd45f8df2d 100644 --- a/textproc/py-expat/Makefile +++ b/textproc/py-expat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2019/10/21 13:19:29 adam Exp $ +# $NetBSD: Makefile,v 1.29 2019/11/04 21:43:45 rillig Exp $ PKGNAME= ${PYPKGPREFIX}-expat-${PY_DISTVERSION} CATEGORIES= textproc python @@ -15,10 +15,10 @@ EXTRACT_ELEMENTS+= ${PYSUBDIR}/Modules/clinic/pyexpat.c.h USE_GCC_RUNTIME= yes -PYDISTUTILSPKG= yes -PY_PATCHPLIST= yes -PY_SETUP_SUBST+= EXPATPREFIX=${BUILDLINK_DIR} -PY_SETUP_SUBST+= EXPATRTPREFIX=${BUILDLINK_PREFIX.expat} +PYDISTUTILSPKG= yes +PY_PATCHPLIST= yes +PY_SETUP_SUBST+= EXPATPREFIX=${BUILDLINK_DIR} +PY_SETUP_SUBST+= EXPATRTPREFIX=${BUILDLINK_PREFIX.expat} PYSETUPINSTALLARGS+= --install-lib ${PREFIX}/${PYLIB}/lib-dynload diff --git a/textproc/py-iniparse/Makefile b/textproc/py-iniparse/Makefile index 215955fd2ea..efcbf907d05 100644 --- a/textproc/py-iniparse/Makefile +++ b/textproc/py-iniparse/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2019/09/02 13:20:13 adam Exp $ +# $NetBSD: Makefile,v 1.13 2019/11/04 21:43:46 rillig Exp $ DISTNAME= iniparse-0.4 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -12,7 +12,7 @@ LICENSE= mit AND python-software-foundation USE_LANGUAGES= # none -PYTHON_VERSIONS_ACCEPTED= 27 +PYTHON_VERSIONS_ACCEPTED= 27 post-install: ${CHMOD} -x ${DESTDIR}${PREFIX}/share/doc/iniparse-0.4/index.html diff --git a/textproc/py-jsonlib/Makefile b/textproc/py-jsonlib/Makefile index e8129b5bbb2..33ac9af2639 100644 --- a/textproc/py-jsonlib/Makefile +++ b/textproc/py-jsonlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2019/09/02 13:20:13 adam Exp $ +# $NetBSD: Makefile,v 1.15 2019/11/04 21:43:46 rillig Exp $ DISTNAME= jsonlib-1.6.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -12,7 +12,7 @@ LICENSE= gnu-gpl-v2 USE_LANGUAGES= c -PYTHON_VERSIONS_ACCEPTED= 27 +PYTHON_VERSIONS_ACCEPTED= 27 .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/py-jsonrpclib/Makefile b/textproc/py-jsonrpclib/Makefile index d3cc3903625..72c5d4fc469 100644 --- a/textproc/py-jsonrpclib/Makefile +++ b/textproc/py-jsonrpclib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2019/09/02 13:20:12 adam Exp $ +# $NetBSD: Makefile,v 1.6 2019/11/04 21:43:46 rillig Exp $ DISTNAME= jsonrpclib-0.1.7 PKGNAME= ${PYPKGPREFIX}-jsonrpclib-0.1.7 @@ -12,7 +12,7 @@ LICENSE= apache-2.0 USE_LANGUAGES= # none -PYTHON_VERSIONS_ACCEPTED= 27 # as of 0.1.7 +PYTHON_VERSIONS_ACCEPTED= 27 # as of 0.1.7 .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/py-loremipsum/Makefile b/textproc/py-loremipsum/Makefile index 803d2ddfc56..0a87b8b526b 100644 --- a/textproc/py-loremipsum/Makefile +++ b/textproc/py-loremipsum/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.1 2016/08/20 07:19:51 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2019/11/04 21:43:46 rillig Exp $ -DISTNAME= loremipsum-1.0.5 -PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +DISTNAME= loremipsum-1.0.5 +PKGNAME= ${PYPKGPREFIX}-${DISTNAME} CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_PYPI:=l/loremipsum/} diff --git a/textproc/py-xml/Makefile b/textproc/py-xml/Makefile index 49c1d9ad1b2..fe05c797812 100644 --- a/textproc/py-xml/Makefile +++ b/textproc/py-xml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2019/09/02 13:20:13 adam Exp $ +# $NetBSD: Makefile,v 1.34 2019/11/04 21:43:46 rillig Exp $ DISTNAME= PyXML-0.8.4 PKGNAME= ${PYPKGPREFIX}-xml-0.8.4 @@ -13,12 +13,12 @@ COMMENT= Collection of libraries to process XML with Python CONFLICTS+= PyXML-[0-9]* BUILDLINK_API_DEPENDS.expat+= expat>=1.95.6 -PYSETUPBUILDARGS+= --with-libexpat=${BUILDLINK_DIR} -PYSETUPBUILDARGS+= --ldflags="${EXPAT_LDFLAGS}" -EXPAT_LDFLAGS= ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.expat}/lib -FIX_RPATH+= EXPAT_LDFLAGS +PYSETUPBUILDARGS+= --with-libexpat=${BUILDLINK_DIR} +PYSETUPBUILDARGS+= --ldflags="${EXPAT_LDFLAGS}" +EXPAT_LDFLAGS= ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.expat}/lib +FIX_RPATH+= EXPAT_LDFLAGS -PYTHON_VERSIONS_ACCEPTED= 27 # dead upstream, no plans of porting +PYTHON_VERSIONS_ACCEPTED= 27 # dead upstream, no plans of porting PYXML_SCRIPTS= scripts/xmlproc_parse \ scripts/xmlproc_val diff --git a/textproc/qore-json-module/Makefile b/textproc/qore-json-module/Makefile index c3e38697ef9..8fad0c09cea 100644 --- a/textproc/qore-json-module/Makefile +++ b/textproc/qore-json-module/Makefile @@ -1,16 +1,16 @@ -# $NetBSD: Makefile,v 1.7 2018/06/08 19:53:30 nros Exp $ +# $NetBSD: Makefile,v 1.8 2019/11/04 21:43:46 rillig Exp $ DISTNAME= qore-json-module-1.7 CATEGORIES= textproc -MASTER_SITES= ${MASTER_SITE_GITHUB:=qorelanguage/} -EXTRACT_SUFX= .tar.bz2 +MASTER_SITES= ${MASTER_SITE_GITHUB:=qorelanguage/} +EXTRACT_SUFX= .tar.bz2 GITHUB_PROJECT= module-json GITHUB_RELEASE= v${PKGVERSION_NOREV} MAINTAINER= nros@NetBSD.org COMMENT= JSON module for Qore -HOMEPAGE= http://www.qore.org/ +HOMEPAGE= http://www.qore.org/ LICENSE= gnu-lgpl-v2.1 OR mit GNU_CONFIGURE= yes @@ -19,7 +19,7 @@ USE_LANGUAGES= c c++11 USE_TOOLS+= gmake pax PTHREAD_OPTS+= native -CONFIGURE_ARGS+=--with-libsuffix="" +CONFIGURE_ARGS+= --with-libsuffix="" #This is needed in order to comply the with MIT license and binary distribution #Install docs diff --git a/textproc/qore-json-module/options.mk b/textproc/qore-json-module/options.mk index 50cc400a9d7..754f68095ac 100644 --- a/textproc/qore-json-module/options.mk +++ b/textproc/qore-json-module/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2014/12/30 15:50:28 wiz Exp $ +# $NetBSD: options.mk,v 1.2 2019/11/04 21:43:46 rillig Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.qore-json-module @@ -6,7 +6,7 @@ PKG_SUPPORTED_OPTIONS= debug .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mdebug) -CONFIGURE_ARGS+= --enable-debug +CONFIGURE_ARGS+= --enable-debug .else -CONFIGURE_ARGS+= --disable-debug +CONFIGURE_ARGS+= --disable-debug .endif diff --git a/textproc/qore-xml-module/Makefile b/textproc/qore-xml-module/Makefile index 34b1c53fc4f..5d94c03eea5 100644 --- a/textproc/qore-xml-module/Makefile +++ b/textproc/qore-xml-module/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.7 2018/06/08 19:40:44 nros Exp $ +# $NetBSD: Makefile,v 1.8 2019/11/04 21:43:46 rillig Exp $ DISTNAME= qore-xml-module-1.4.1 CATEGORIES= textproc -MASTER_SITES= ${MASTER_SITE_GITHUB:=qorelanguage/} -EXTRACT_SUFX= .tar.bz2 +MASTER_SITES= ${MASTER_SITE_GITHUB:=qorelanguage/} +EXTRACT_SUFX= .tar.bz2 GITHUB_PROJECT= module-xml GITHUB_RELEASE= v${PKGVERSION_NOREV} @@ -19,7 +19,7 @@ USE_LANGUAGES= c c++11 USE_TOOLS+= gmake pax PTHREAD_OPTS+= native -CONFIGURE_ARGS+=--with-libsuffix="" +CONFIGURE_ARGS+= --with-libsuffix="" REPLACE_QORE= bin/soaputil diff --git a/textproc/qore-xml-module/options.mk b/textproc/qore-xml-module/options.mk index b80c068b5d7..b99c48ec0e0 100644 --- a/textproc/qore-xml-module/options.mk +++ b/textproc/qore-xml-module/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2014/12/30 15:51:11 wiz Exp $ +# $NetBSD: options.mk,v 1.2 2019/11/04 21:43:46 rillig Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.qore-xml-module @@ -6,7 +6,7 @@ PKG_SUPPORTED_OPTIONS= debug .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mdebug) -CONFIGURE_ARGS+= --enable-debug +CONFIGURE_ARGS+= --enable-debug .else -CONFIGURE_ARGS+= --disable-debug +CONFIGURE_ARGS+= --disable-debug .endif diff --git a/textproc/qore-yaml-module/Makefile b/textproc/qore-yaml-module/Makefile index c536cb8f442..68181008be7 100644 --- a/textproc/qore-yaml-module/Makefile +++ b/textproc/qore-yaml-module/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.7 2018/06/08 20:12:49 nros Exp $ +# $NetBSD: Makefile,v 1.8 2019/11/04 21:43:46 rillig Exp $ DISTNAME= qore-yaml-module-0.6 CATEGORIES= textproc -MASTER_SITES= ${MASTER_SITE_GITHUB:=qorelanguage/} -EXTRACT_SUFX= .tar.bz2 +MASTER_SITES= ${MASTER_SITE_GITHUB:=qorelanguage/} +EXTRACT_SUFX= .tar.bz2 GITHUB_PROJECT= module-yaml GITHUB_RELEASE= v${PKGVERSION_NOREV} @@ -19,7 +19,7 @@ USE_TOOLS+= gmake pax PTHREAD_OPTS+= native -CONFIGURE_ARGS+=--with-libsuffix="" +CONFIGURE_ARGS+= --with-libsuffix="" #This is needed in order to comply the with MIT license and binary distribution #Install docs. diff --git a/textproc/qore-yaml-module/options.mk b/textproc/qore-yaml-module/options.mk index 90cdfa15721..5bb3d450bd1 100644 --- a/textproc/qore-yaml-module/options.mk +++ b/textproc/qore-yaml-module/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2014/12/30 15:52:04 wiz Exp $ +# $NetBSD: options.mk,v 1.2 2019/11/04 21:43:46 rillig Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.qore-yaml-module @@ -6,7 +6,7 @@ PKG_SUPPORTED_OPTIONS= debug .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mdebug) -CONFIGURE_ARGS+= --enable-debug +CONFIGURE_ARGS+= --enable-debug .else -CONFIGURE_ARGS+= --disable-debug +CONFIGURE_ARGS+= --disable-debug .endif diff --git a/textproc/queequeg/Makefile b/textproc/queequeg/Makefile index 0db42ae387a..4c0ffb6bef1 100644 --- a/textproc/queequeg/Makefile +++ b/textproc/queequeg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2019/09/02 13:20:13 adam Exp $ +# $NetBSD: Makefile,v 1.14 2019/11/04 21:43:46 rillig Exp $ DISTNAME= queequeg-0.91 PKGREVISION= 2 @@ -15,7 +15,7 @@ BUILD_DEPENDS+= WordNet-[0-9]*:../../textproc/WordNet USE_LANGUAGES= # none PY_PATCHPLIST= yes -PYTHON_VERSIONS_ACCEPTED= 27 # py-cdb +PYTHON_VERSIONS_ACCEPTED= 27 # py-cdb SUBST_CLASSES+= fix-python SUBST_STAGE.fix-python= pre-configure diff --git a/textproc/rtf-tools/Makefile b/textproc/rtf-tools/Makefile index a15e113b865..a8232e878e7 100644 --- a/textproc/rtf-tools/Makefile +++ b/textproc/rtf-tools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2012/10/25 06:56:55 asau Exp $ +# $NetBSD: Makefile,v 1.25 2019/11/04 21:43:47 rillig Exp $ # DISTNAME= RTF-1.10 @@ -31,11 +31,11 @@ SUBST_SED.rtf+= -e 's|\(LOCALBINDIR =.*\)|\1/bin|' # turn this on when hacking or debugging the package #WARNFLAGS= -O2 -Wall -Wextra -Wwrite-strings -Wmissing-prototypes -#SUBST_CLASSES+= warn +#SUBST_CLASSES+= warn #SUBST_STAGE.warn= pre-build #SUBST_MESSAGE.warn= Enabling lots of warnings. #SUBST_FILES.warn= Makefile */Makefile -#SUBST_SED.warn= -e '/CDEBUGFLAGS/s/-O/${WARNFLAGS}/' +#SUBST_SED.warn= -e '/CDEBUGFLAGS/s/-O/${WARNFLAGS}/' do-install: ${INSTALL_DATA} ${WRKSRC}/h/standard-names ${DESTDIR}${PREFIX}/lib/rtf-tools diff --git a/textproc/ruby-mecab/Makefile b/textproc/ruby-mecab/Makefile index ab8584e22f6..15547cdccae 100644 --- a/textproc/ruby-mecab/Makefile +++ b/textproc/ruby-mecab/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2012/10/25 06:56:57 asau Exp $ +# $NetBSD: Makefile,v 1.9 2019/11/04 21:43:47 rillig Exp $ .include "../../textproc/mecab/Makefile.common" @@ -9,7 +9,7 @@ CATEGORIES+= ruby COMMENT= MeCab ruby module LICENSE= gnu-gpl-v2 OR gnu-lgpl-v2.1 OR modified-bsd -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++ REPLACE_RUBY+= test.rb USE_RUBY_EXTCONF= yes diff --git a/textproc/ruby-nqxml/Makefile b/textproc/ruby-nqxml/Makefile index 25bc6d25505..8bb67d2b9b9 100644 --- a/textproc/ruby-nqxml/Makefile +++ b/textproc/ruby-nqxml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2017/09/04 18:08:29 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2019/11/04 21:43:47 rillig Exp $ # DISTNAME= nqxml-1.1.3p1 @@ -12,18 +12,18 @@ HOMEPAGE= https://sourceforge.net/projects/nqxml/ COMMENT= XML parser written in pure Ruby LICENSE= ruby-license -NO_BUILD= yes -USE_RUBY_INSTALL= yes +NO_BUILD= yes +USE_RUBY_INSTALL= yes -DOC= README -EXAMPLES= data.xml doc.xml dumpXML.rb parseTestStream.rb \ - parseTestTree.rb printEntityClassNames.rb \ - reverseTags.rb reverseText.rb write.rb \ - write.rb writeManualDoc.rb writeParsedDoc.rb -CONTRIB_LIB= autodis_1.rb autodis_2.rb -TESTS= dispatchertester.rb oasis.rb streamingparsertester.rb test.rb \ - testresource.rb tokenizertester.rb treeparsertester.rb \ - writertester.rb +DOC= README +EXAMPLES= data.xml doc.xml dumpXML.rb parseTestStream.rb \ + parseTestTree.rb printEntityClassNames.rb \ + reverseTags.rb reverseText.rb write.rb \ + write.rb writeManualDoc.rb writeParsedDoc.rb +CONTRIB_LIB= autodis_1.rb autodis_2.rb +TESTS= dispatchertester.rb oasis.rb streamingparsertester.rb test.rb \ + testresource.rb tokenizertester.rb treeparsertester.rb \ + writertester.rb REPLACE_RUBY_DIRS= examples tests INSTALL_TARGET= install \ diff --git a/textproc/ruby-treetop/Makefile b/textproc/ruby-treetop/Makefile index 05ae1c0fa91..e0e4bba4ba7 100644 --- a/textproc/ruby-treetop/Makefile +++ b/textproc/ruby-treetop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2016/11/19 15:24:45 taca Exp $ +# $NetBSD: Makefile,v 1.9 2019/11/04 21:43:47 rillig Exp $ DISTNAME= treetop-1.4.15 CATEGORIES= textproc @@ -10,7 +10,7 @@ LICENSE= mit DEPENDS+= ${RUBY_PKGPREFIX}-polyglot>=0.3.1:../../devel/ruby-polyglot -CONFLICTS= ruby[1-9][0-9]-treetop-[0-9]* +CONFLICTS= ruby[1-9][0-9]-treetop-[0-9]* OVERRIDE_GEMSPEC+= polyglot: .include "../../lang/ruby/gem.mk" diff --git a/textproc/ruby-ultraviolet/Makefile b/textproc/ruby-ultraviolet/Makefile index 40d4b4c764d..a3550ee8dbd 100644 --- a/textproc/ruby-ultraviolet/Makefile +++ b/textproc/ruby-ultraviolet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2017/09/04 18:01:02 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2019/11/04 21:43:47 rillig Exp $ DISTNAME= ultraviolet-1.0.1 CATEGORIES= textproc @@ -8,7 +8,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Syntax highlighting engine based on Textpow LICENSE= mit -DEPENDS+= ${RUBY_PKGPREFIX}-textpow>=1.3.0:../../textproc/ruby-textpow +DEPENDS+= ${RUBY_PKGPREFIX}-textpow>=1.3.0:../../textproc/ruby-textpow .include "../../lang/ruby/gem.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/ruby-yard/Makefile b/textproc/ruby-yard/Makefile index d7555a4c69b..b01ac17a779 100644 --- a/textproc/ruby-yard/Makefile +++ b/textproc/ruby-yard/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2019/08/05 09:55:00 taca Exp $ +# $NetBSD: Makefile,v 1.12 2019/11/04 21:43:47 rillig Exp $ DISTNAME= yard-0.9.20 CATEGORIES= ruby textproc @@ -8,7 +8,7 @@ HOMEPAGE= https://yardoc.org/ COMMENT= Documentation generation tool for the Ruby programming language LICENSE= mit -USE_LANGUAGES= # none +USE_LANGUAGES= # none RUBYGEM_OPTIONS+= --format-executable .include "../../lang/ruby/gem.mk" diff --git a/textproc/sablotron/Makefile b/textproc/sablotron/Makefile index 3c1758aa68c..c8af406819e 100644 --- a/textproc/sablotron/Makefile +++ b/textproc/sablotron/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2019/08/11 13:24:01 wiz Exp $ +# $NetBSD: Makefile,v 1.51 2019/11/04 21:43:47 rillig Exp $ DISTNAME= Sablot-1.0.2 PKGNAME= ${DISTNAME:S/Sablot/sablotron/} @@ -12,7 +12,7 @@ COMMENT= XML toolkit implementing XSLT, DOM, and XPath BUILD_DEPENDS+= p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser -GNU_CONFIGURE= YES +GNU_CONFIGURE= YES USE_TOOLS+= gmake perl USE_LANGUAGES= c c++03 USE_LIBTOOL= YES diff --git a/textproc/saxon/Makefile b/textproc/saxon/Makefile index 8ddf86aa533..6fd77ff732a 100644 --- a/textproc/saxon/Makefile +++ b/textproc/saxon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2017/09/16 19:27:20 wiz Exp $ +# $NetBSD: Makefile,v 1.26 2019/11/04 21:43:47 rillig Exp $ DISTNAME= SaxonHE9-5-0-1J PKGNAME= ${DISTNAME:tl:S/-/./g:S/he/-/1} @@ -19,7 +19,7 @@ NO_BUILD= yes USE_TOOLS+= pax -INSTALLATION_DIRS= lib/java +INSTALLATION_DIRS= lib/java do-install: ${INSTALL_DATA} ${WRKSRC}/saxon9he.jar ${DESTDIR}${PREFIX}/lib/java/saxon.jar diff --git a/textproc/scrollkeeper-dtd/Makefile b/textproc/scrollkeeper-dtd/Makefile index a62da28fd20..2d4ece65716 100644 --- a/textproc/scrollkeeper-dtd/Makefile +++ b/textproc/scrollkeeper-dtd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2012/10/25 06:57:00 asau Exp $ +# $NetBSD: Makefile,v 1.3 2019/11/04 21:43:47 rillig Exp $ # DISTNAME= scrollkeeper-omf.dtd @@ -12,10 +12,10 @@ HOMEPAGE= http://scrollkeeper.sourceforge.net/ COMMENT= DTD from the Scrollkeeper package #LICENSE= # TODO: (see mk/license.mk) -USE_LANGUAGES= # none -NO_BUILD= yes -INSTALLATION_DIRS= share/xml -XML_ENTRIES= public "-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" \ +USE_LANGUAGES= # none +NO_BUILD= yes +INSTALLATION_DIRS= share/xml +XML_ENTRIES= public "-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" \ ${PREFIX}/share/xml/scrollkeeper-omf.dtd do-install: diff --git a/textproc/sgrep/Makefile b/textproc/sgrep/Makefile index b4ed0616a70..680fc894ec8 100644 --- a/textproc/sgrep/Makefile +++ b/textproc/sgrep/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2012/10/25 06:57:00 asau Exp $ +# $NetBSD: Makefile,v 1.3 2019/11/04 21:43:48 rillig Exp $ # DISTNAME= sgrep-1.94a @@ -10,7 +10,7 @@ HOMEPAGE= http://www.cs.helsinki.fi/u/jjaakkol/sgrep.html COMMENT= Tool for searching and indexing text, SGML,XML and HTML files LICENSE= gnu-gpl-v2 -GNU_CONFIGURE= yes +GNU_CONFIGURE= yes # only used for example files CONFIGURE_ARGS+= --datadir=${PREFIX}/share/examples/sgrep diff --git a/textproc/sphinxsearch/Makefile b/textproc/sphinxsearch/Makefile index 1def2a5420b..ad543905179 100644 --- a/textproc/sphinxsearch/Makefile +++ b/textproc/sphinxsearch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2019/05/23 19:23:18 rillig Exp $ +# $NetBSD: Makefile,v 1.15 2019/11/04 21:43:48 rillig Exp $ # DISTNAME= sphinx-2.2.11-release @@ -59,7 +59,7 @@ CONFIGURE_DIRS= . CONFIGURE_DIRS+= api/libsphinxclient CONFIGURE_ARGS+= --with-libexpat -CONFIGURE_ARGS+= --with-iconv +CONFIGURE_ARGS+= --with-iconv INSTALL_MAKE_FLAGS+= sysconfdir=${EGDIR} diff --git a/textproc/tei-xsl/Makefile b/textproc/tei-xsl/Makefile index 4ef52ba8063..8eb5c8ea81d 100644 --- a/textproc/tei-xsl/Makefile +++ b/textproc/tei-xsl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2012/10/25 06:57:03 asau Exp $ +# $NetBSD: Makefile,v 1.4 2019/11/04 21:43:48 rillig Exp $ # DISTNAME= tei-xsl-5.14 @@ -20,7 +20,7 @@ DOCDIR= ${PREFIX}/share/doc/tei-xsl INSTALLATION_DIRS= ${TEIXSLDIR} ${DOCDIR} XML_ENTRIES= rewriteURI http://www.tei-c.org/Stylesheets/ \ - ${TEIXSLDIR} + ${TEIXSLDIR} do-install: cd ${WRKSRC} && ${CP} -R p4 p5 ${DESTDIR}${TEIXSLDIR} diff --git a/textproc/tinyxml2/Makefile b/textproc/tinyxml2/Makefile index 9aed0a75329..f26e1f87b5e 100644 --- a/textproc/tinyxml2/Makefile +++ b/textproc/tinyxml2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2015/05/11 14:29:30 mef Exp $ +# $NetBSD: Makefile,v 1.5 2019/11/04 21:43:48 rillig Exp $ DISTNAME= tinyxml2-2.2.0 CATEGORIES= textproc @@ -13,6 +13,6 @@ LICENSE= zlib USE_CMAKE= yes USE_LANGUAGES= c c++ -PKGCONFIG_OVERRIDE=tinyxml2.pc.in +PKGCONFIG_OVERRIDE= tinyxml2.pc.in .include "../../mk/bsd.pkg.mk" diff --git a/textproc/tokyodystopia/Makefile b/textproc/tokyodystopia/Makefile index 20e9d1f27ff..edc20b7eb30 100644 --- a/textproc/tokyodystopia/Makefile +++ b/textproc/tokyodystopia/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2019/07/11 09:25:26 nia Exp $ +# $NetBSD: Makefile,v 1.20 2019/11/04 21:43:48 rillig Exp $ # DISTNAME= tokyodystopia-0.9.15 @@ -18,7 +18,7 @@ PKGCONFIG_OVERRIDE+= tokyodystopia.pc.in TEST_TARGET= check post-extract: - ${RM} -f ${WRKSRC}/doc/index.html~ + ${RM} -f ${WRKSRC}/doc/index.html~ BUILDLINK_API_DEPENDS.tokyocabinet+= tokyocabinet>=1.4.29 .include "../../databases/tokyocabinet/buildlink3.mk" diff --git a/textproc/uncrustify/Makefile b/textproc/uncrustify/Makefile index 9fe6d9aa55d..bd227c2460b 100644 --- a/textproc/uncrustify/Makefile +++ b/textproc/uncrustify/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2019/07/09 20:36:21 nia Exp $ +# $NetBSD: Makefile,v 1.6 2019/11/04 21:43:48 rillig Exp $ DISTNAME= uncrustify-uncrustify-0.69.0 PKGNAME= ${DISTNAME:S/uncrustify-//} @@ -20,7 +20,7 @@ CONFIGURE_DIRS= ${OBJDIR} CMAKE_ARG_PATH= ${WRKSRC} PYTHON_VERSIONS_ACCEPTED= 27 -PYTHON_FOR_BUILD_ONLY= yes +PYTHON_FOR_BUILD_ONLY= yes pre-configure: ${MKDIR} ${WRKSRC}/build diff --git a/textproc/xmlada/Makefile b/textproc/xmlada/Makefile index ff28f7b3409..9c5e23b57cc 100644 --- a/textproc/xmlada/Makefile +++ b/textproc/xmlada/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2019/10/21 22:15:10 adam Exp $ +# $NetBSD: Makefile,v 1.25 2019/11/04 21:43:48 rillig Exp $ DISTNAME= xmlada-${XMLADA_VERS} PKGREVISION= 5 @@ -23,7 +23,7 @@ MAKE_JOBS_SAFE= no # it doesn't support the concept of DESTDIR. # "-Wl,-R" adds a second rpath string. # -Wl,-rpath is a better choice, but synonym -Wl,-R works on all BSD and SunOS -SUBST_CLASSES+= rpath docs +SUBST_CLASSES+= rpath docs SUBST_STAGE.rpath= pre-configure SUBST_MESSAGE.rpath= Adjust rpaths of shared libraries SUBST_FILES.rpath= sax/sax.gpr diff --git a/textproc/xmlcatmgr/catalogs.mk b/textproc/xmlcatmgr/catalogs.mk index 1a3da181084..247fdfde19d 100644 --- a/textproc/xmlcatmgr/catalogs.mk +++ b/textproc/xmlcatmgr/catalogs.mk @@ -1,4 +1,4 @@ -# $NetBSD: catalogs.mk,v 1.21 2015/11/25 12:53:42 jperkin Exp $ +# $NetBSD: catalogs.mk,v 1.22 2019/11/04 21:43:48 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,11 +47,11 @@ XML_ENTRIES+= nextCatalog ${PREFIX:=${c}} -- # use pkginstall framework. # .if !empty(SGML_ENTRIES) || !empty(XML_ENTRIES) -FILES_SUBST+= XMLCATMGR=${XMLCATMGR:Q} -FILES_SUBST+= SGML_CATALOG="${LOCALBASE}/share/sgml/catalog" -FILES_SUBST+= XML_CATALOG="${LOCALBASE}/share/xml/catalog" -FILES_SUBST+= SGML_ENTRIES=${SGML_ENTRIES:Q} -FILES_SUBST+= XML_ENTRIES=${XML_ENTRIES:Q} +FILES_SUBST+= XMLCATMGR=${XMLCATMGR:Q} +FILES_SUBST+= SGML_CATALOG="${LOCALBASE}/share/sgml/catalog" +FILES_SUBST+= XML_CATALOG="${LOCALBASE}/share/xml/catalog" +FILES_SUBST+= SGML_ENTRIES=${SGML_ENTRIES:Q} +FILES_SUBST+= XML_ENTRIES=${XML_ENTRIES:Q} INSTALL_TEMPLATES+= ../../textproc/xmlcatmgr/files/install.tmpl DEINSTALL_TEMPLATES+= ../../textproc/xmlcatmgr/files/deinstall.tmpl .endif # !empty(SGML_ENTRIES) || !empty(XML_ENTRIES) diff --git a/textproc/xmlrpc-c/Makefile b/textproc/xmlrpc-c/Makefile index e936769e8d2..54f5ff859e4 100644 --- a/textproc/xmlrpc-c/Makefile +++ b/textproc/xmlrpc-c/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.53 2019/10/13 21:48:57 he Exp $ +# $NetBSD: Makefile,v 1.54 2019/11/04 21:43:49 rillig Exp $ DISTNAME= xmlrpc-c-1.51.04 # the "super stable" branch @@ -7,7 +7,7 @@ CATEGORIES= textproc devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xmlrpc-c/} EXTRACT_SUFX= .tgz # It's actually not a compressed tar file -EXTRACT_OPTS+= -c none +EXTRACT_OPTS+= -c none #/usr/bin/ld: ./libxmlrpc_server++.a(registry.o): relocation R_X86_64_32S against `_ZTVN8xmlrpc_c8callInfoE' can not be used when making a shared object; recompile with -fPIC #./libxmlrpc_server++.a: could not read symbols: Bad value diff --git a/textproc/xxdiff-scripts/Makefile b/textproc/xxdiff-scripts/Makefile index bfa017a9f7f..3cce5ee560d 100644 --- a/textproc/xxdiff-scripts/Makefile +++ b/textproc/xxdiff-scripts/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2019/04/25 07:33:25 maya Exp $ +# $NetBSD: Makefile,v 1.5 2019/11/04 21:43:49 rillig Exp $ PKGREVISION= 1 .include "../../textproc/xxdiff/Makefile.common" @@ -11,13 +11,13 @@ DEPENDS+= xxdiff-${XXDIFFVERSION}{,nb*}:../../textproc/xxdiff USE_TOOLS= # empty #PYTHON_VERSIONS_INCOMPATIBLE= # XXX unknown -REPLACE_PYTHON+= bin/svn-foreign -REPLACE_PYTHON+= bin/xx-cond-replace bin/xx-cvs-diff bin/xx-cvs-revcmp -REPLACE_PYTHON+= bin/xx-diff-proxy bin/xx-encrypted bin/xx-filter -REPLACE_PYTHON+= bin/xx-find-grep-sed bin/xx-hg-merge bin/xx-match -REPLACE_PYTHON+= bin/xx-p4-unmerge bin/xx-pyline bin/xx-rename -REPLACE_PYTHON+= bin/xx-sql-schemas bin/xx-svn-diff bin/xx-svn-resolve -REPLACE_PYTHON+= bin/xx-svn-review +REPLACE_PYTHON+= bin/svn-foreign +REPLACE_PYTHON+= bin/xx-cond-replace bin/xx-cvs-diff bin/xx-cvs-revcmp +REPLACE_PYTHON+= bin/xx-diff-proxy bin/xx-encrypted bin/xx-filter +REPLACE_PYTHON+= bin/xx-find-grep-sed bin/xx-hg-merge bin/xx-match +REPLACE_PYTHON+= bin/xx-p4-unmerge bin/xx-pyline bin/xx-rename +REPLACE_PYTHON+= bin/xx-sql-schemas bin/xx-svn-diff bin/xx-svn-resolve +REPLACE_PYTHON+= bin/xx-svn-review INSTALLATION_DIRS+= ${XXDIFFDOCDIR} diff --git a/textproc/xxdiff/Makefile b/textproc/xxdiff/Makefile index 63998dbf4cd..6b255bbf8af 100644 --- a/textproc/xxdiff/Makefile +++ b/textproc/xxdiff/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2018/03/12 11:17:40 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2019/11/04 21:43:49 rillig Exp $ PKGREVISION= 1 .include "../../textproc/xxdiff/Makefile.common" @@ -8,16 +8,16 @@ COMMENT= Graphical file comparator and merge tool USE_LANGUAGES= c c++ USE_TOOLS+= bison flex gmake -HAS_CONFIGURE= yes -CONFIG_SHELL= # empty -CONFIGURE_DIRS= src -CONFIGURE_SCRIPT= ${MAKE_PROGRAM} -CONFIGURE_ARGS= -f Makefile.bootstrap +HAS_CONFIGURE= yes +CONFIG_SHELL= # empty +CONFIGURE_DIRS= src +CONFIGURE_SCRIPT= ${MAKE_PROGRAM} +CONFIGURE_ARGS= -f Makefile.bootstrap BUILD_DIRS= src BUILD_TARGET= doc.h all -INSTALLATION_DIRS+= bin ${XXDIFFDOCDIR} ${PKGMANDIR}/man1 +INSTALLATION_DIRS+= bin ${XXDIFFDOCDIR} ${PKGMANDIR}/man1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/xxdiff ${DESTDIR}${PREFIX}/bin diff --git a/textproc/yelp-xsl/Makefile b/textproc/yelp-xsl/Makefile index bc2011ea1e1..e0c66a2cfc3 100644 --- a/textproc/yelp-xsl/Makefile +++ b/textproc/yelp-xsl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2019/07/18 16:00:45 prlw1 Exp $ +# $NetBSD: Makefile,v 1.19 2019/11/04 21:43:49 rillig Exp $ DISTNAME= yelp-xsl-3.32.1 CATEGORIES= textproc gnome @@ -10,8 +10,8 @@ HOMEPAGE= https://www.gnome.org/ COMMENT= XSL stylesheets for Yelp help browser LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 AND mit -GNU_CONFIGURE= yes -USE_TOOLS+= pkg-config intltool msgfmt +GNU_CONFIGURE= yes +USE_TOOLS+= pkg-config intltool msgfmt USE_PKGLOCALEDIR= yes PKGCONFIG_OVERRIDE+= yelp-xsl.pc.in |