diff options
| author | rillig <rillig@pkgsrc.org> | 2019-11-02 15:37:59 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2019-11-02 15:37:59 +0000 |
| commit | 83afcf6321f293f292e4213f00426d6d4c410f16 (patch) | |
| tree | 127f4bd9b079761da1920a3b891f2702cece7229 | |
| parent | e60a51b78bae2407e2dbc73016f6bd4274676b81 (diff) | |
| download | pkgsrc-83afcf6321f293f292e4213f00426d6d4c410f16.tar.gz | |
databases: align variable assignments
pkglint -Wall -F --only aligned -r
No manual corrections.
115 files changed, 429 insertions, 429 deletions
diff --git a/databases/SQLiteCpp/buildlink3.mk b/databases/SQLiteCpp/buildlink3.mk index 7ce8ad28948..0bc13bc1870 100644 --- a/databases/SQLiteCpp/buildlink3.mk +++ b/databases/SQLiteCpp/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2019/04/03 00:32:29 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2019/11/02 15:37:59 rillig Exp $ BUILDLINK_TREE+= SQLiteCpp @@ -7,7 +7,7 @@ SQLITECPP_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.SQLiteCpp+= SQLiteCpp>=2.2.0 BUILDLINK_DEPMETHOD.SQLiteCpp?= build -BUILDLINK_ABI_DEPENDS.SQLiteCpp?= SQLiteCpp>=2.2.0nb3 +BUILDLINK_ABI_DEPENDS.SQLiteCpp?= SQLiteCpp>=2.2.0nb3 BUILDLINK_PKGSRCDIR.SQLiteCpp?= ../../databases/SQLiteCpp .include "../../databases/sqlite3/buildlink3.mk" diff --git a/databases/apache-cassandra/Makefile.common b/databases/apache-cassandra/Makefile.common index 2bcbee8c3b1..c15c225f764 100644 --- a/databases/apache-cassandra/Makefile.common +++ b/databases/apache-cassandra/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.3 2018/06/08 09:52:44 fhajny Exp $ +# $NetBSD: Makefile.common,v 1.4 2019/11/02 15:37:59 rillig Exp $ # used by databases/apache-cassandra/Makefile # used by databases/apache-cassandra2/Makefile # @@ -69,10 +69,10 @@ REPLACE_BASH+= bin/cassandra bin/cqlsh bin/cqlsh.py bin/debug-cql \ INSTALLATION_DIRS+= ${CASSANDRA_HOME} ${EGDIR} ${DOCDIR} INSTALLATION_DIRS+= ${CASSANDRA_HOME} ${CASSANDRA_HOME}/bin ${EGDIR} ${DOCDIR} -CHECK_SSP_SUPPORTED= no -CHECK_INTERPRETER_SKIP+=share/cassandra/interface/cassandra.thrift -CHECK_INTERPRETER_SKIP+=share/cassandra/pylib/setup.py -CHECK_INTERPRETER_SKIP+=share/cassandra/tools/bin/token-generator +CHECK_SSP_SUPPORTED= no +CHECK_INTERPRETER_SKIP+= share/cassandra/interface/cassandra.thrift +CHECK_INTERPRETER_SKIP+= share/cassandra/pylib/setup.py +CHECK_INTERPRETER_SKIP+= share/cassandra/tools/bin/token-generator # Skip checks on other arch libs to keep this simple CHECK_SHLIBS_SKIP+= share/cassandra/lib/sigar-bin/* diff --git a/databases/couchdb/Makefile b/databases/couchdb/Makefile index 0fef381ef0f..897cf8b2ae8 100644 --- a/databases/couchdb/Makefile +++ b/databases/couchdb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.60 2019/10/28 15:43:24 jperkin Exp $ +# $NetBSD: Makefile,v 1.61 2019/11/02 15:38:00 rillig Exp $ DISTNAME= apache-couchdb-2.3.1 PKGNAME= ${DISTNAME:S/apache-//} @@ -29,11 +29,11 @@ COUCH_RUNDIR?= ${VARBASE}/run/couchdb COUCH_USER?= couchdb COUCH_GROUP?= ${COUCH_USER} -PKG_GROUPS+= ${COUCH_GROUP} -PKG_USERS+= ${COUCH_USER}:${COUCH_GROUP} -PKG_GECOS.${COUCH_USER}=CouchDB Server User -PKG_HOME.${COUCH_USER}= ${COUCH_DBDIR} -PKG_SHELL.${COUCH_USER}=${COMMAND_SHELL} +PKG_GROUPS+= ${COUCH_GROUP} +PKG_USERS+= ${COUCH_USER}:${COUCH_GROUP} +PKG_GECOS.${COUCH_USER}= CouchDB Server User +PKG_HOME.${COUCH_USER}= ${COUCH_DBDIR} +PKG_SHELL.${COUCH_USER}= ${COMMAND_SHELL} FILES_SUBST+= COUCH_USER=${COUCH_USER} FILES_SUBST+= COUCH_GROUP=${COUCH_GROUP} diff --git a/databases/db3/Makefile b/databases/db3/Makefile index 162e7331fc4..d7bc0ca464c 100644 --- a/databases/db3/Makefile +++ b/databases/db3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2019/07/10 10:37:13 nia Exp $ +# $NetBSD: Makefile,v 1.42 2019/11/02 15:38:00 rillig Exp $ DISTNAME= db-3.3.11 PKGNAME= db3-3.11.2 @@ -11,9 +11,9 @@ HOMEPAGE= https://www.oracle.com/database/berkeley-db.html COMMENT= Sleepycat Software's Berkeley DB version 3 LICENSE= sleepycat-license # minus ASM stanza -PATCH_SITES= http://www.oracle.com/technology/products/berkeley-db/db/update/3.3.11/ -PATCHFILES= patch.3.3.11.1 patch.3.3.11.2 -PATCH_DIST_ARGS=-d ${WRKSRC}/.. --forward --quiet -p0 +PATCH_SITES= http://www.oracle.com/technology/products/berkeley-db/db/update/3.3.11/ +PATCHFILES= patch.3.3.11.1 patch.3.3.11.2 +PATCH_DIST_ARGS= -d ${WRKSRC}/.. --forward --quiet -p0 WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix USE_LIBTOOL= yes diff --git a/databases/gdbm/builtin.mk b/databases/gdbm/builtin.mk index e55165b0162..6f2c81d4e3e 100644 --- a/databases/gdbm/builtin.mk +++ b/databases/gdbm/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.3 2017/03/20 06:02:26 adam Exp $ +# $NetBSD: builtin.mk,v 1.4 2019/11/02 15:38:00 rillig Exp $ BUILTIN_PKG:= gdbm BUILTIN_FIND_HEADERS_VAR= GDBM_H @@ -16,7 +16,7 @@ IS_BUILTIN.gdbm= no IS_BUILTIN.gdbm= yes . endif .endif -MAKEVARS+= IS_BUILTIN.gdbm +MAKEVARS+= IS_BUILTIN.gdbm ### ### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to @@ -66,4 +66,4 @@ USE_BUILTIN.gdbm!= \ . endif . endif .endif -MAKEVARS+= USE_BUILTIN.gdbm +MAKEVARS+= USE_BUILTIN.gdbm diff --git a/databases/gdbm_compat/builtin.mk b/databases/gdbm_compat/builtin.mk index b5e7e864acc..0c0185bbdcf 100644 --- a/databases/gdbm_compat/builtin.mk +++ b/databases/gdbm_compat/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.5 2017/03/20 06:02:27 adam Exp $ +# $NetBSD: builtin.mk,v 1.6 2019/11/02 15:38:00 rillig Exp $ BUILTIN_PKG:= gdbm_compat BUILTIN_FIND_HEADERS_VAR= NDBM_H @@ -17,7 +17,7 @@ IS_BUILTIN.gdbm_compat= no IS_BUILTIN.gdbm_compat= yes . endif .endif -MAKEVARS+= IS_BUILTIN.gdbm_compat +MAKEVARS+= IS_BUILTIN.gdbm_compat ## ## Include databases/gdbm/builtin.mk so that BUILTIN_PKG.gdbm and @@ -62,4 +62,4 @@ USE_BUILTIN.gdbm_compat!= \ . endif . endif .endif -MAKEVARS+= USE_BUILTIN.gdbm_compat +MAKEVARS+= USE_BUILTIN.gdbm_compat diff --git a/databases/geneweb/Makefile b/databases/geneweb/Makefile index 9e0924c13dc..a7c085d1ebd 100644 --- a/databases/geneweb/Makefile +++ b/databases/geneweb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.53 2018/11/12 16:10:17 jaapb Exp $ +# $NetBSD: Makefile,v 1.54 2019/11/02 15:38:00 rillig Exp $ # DISTNAME= geneweb-5.01 @@ -37,7 +37,7 @@ CONFLICTS+= coreutils-[0-9]* # Stripped OCAML binaries don't seem to work any more. # Installing unstripped binaries until this is fixed. # (not checked in 5.01) -INSTALL_PROGRAM= ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} +INSTALL_PROGRAM= ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} INSTALLATION_DIRS= bin libexec sbin share/examples/geneweb \ share/doc/geneweb share/geneweb/etc \ diff --git a/databases/gourmet/Makefile b/databases/gourmet/Makefile index f11c87045e3..5434fcd28cc 100644 --- a/databases/gourmet/Makefile +++ b/databases/gourmet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2019/09/02 13:19:46 adam Exp $ +# $NetBSD: Makefile,v 1.59 2019/11/02 15:38:01 rillig Exp $ DISTNAME= gourmet-0.8.5.14 PKGREVISION= 40 @@ -9,8 +9,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://grecipe-manager.sourceforge.net/ COMMENT= Recipe database -USE_PKGLOCALEDIR= yes -PYTHON_VERSIONS_ACCEPTED= 27 # py-metakit, py-imaging, py-gtk2 +USE_PKGLOCALEDIR= yes +PYTHON_VERSIONS_ACCEPTED= 27 # py-metakit, py-imaging, py-gtk2 REPLACE_PYTHON+= build_rpms.py REPLACE_PYTHON+= setup.py diff --git a/databases/iodbc/Makefile b/databases/iodbc/Makefile index 050912fca0a..afe7918fee5 100644 --- a/databases/iodbc/Makefile +++ b/databases/iodbc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2014/08/21 19:38:55 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2019/11/02 15:38:01 rillig Exp $ DISTNAME= libiodbc-3.52.9 PKGNAME= ${DISTNAME:S/^lib//} @@ -10,13 +10,13 @@ HOMEPAGE= http://www.iodbc.org/dataspace/iodbc/wiki/iODBC/ COMMENT= ODBC 3.x driver manager LICENSE= gnu-lgpl-v2 -USE_LIBTOOL= yes -GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --disable-gui -CONFIGURE_ARGS+= --includedir=${PREFIX}/include/iodbc +USE_LIBTOOL= yes +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --disable-gui +CONFIGURE_ARGS+= --includedir=${PREFIX}/include/iodbc GNU_CONFIGURE_LIBSUBDIR= iodbc -CONFIGURE_ARGS+= --pkgconfigdir=${PREFIX}/lib/pkgconfig -CONFIGURE_ARGS+= --with-iodbc-inidir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --pkgconfigdir=${PREFIX}/lib/pkgconfig +CONFIGURE_ARGS+= --with-iodbc-inidir=${PKG_SYSCONFDIR} DL_AUTO_VARS= yes diff --git a/databases/ipa_sdb/options.mk b/databases/ipa_sdb/options.mk index fd3ff21f5d2..87a9896d1f1 100644 --- a/databases/ipa_sdb/options.mk +++ b/databases/ipa_sdb/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2007/01/22 12:23:39 obache Exp $ +# $NetBSD: options.mk,v 1.3 2019/11/02 15:38:01 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.ipa_sdb PKG_SUPPORTED_OPTIONS= ipa-without-autorules ipa-without-limits \ @@ -10,26 +10,26 @@ PKG_SUPPORTED_OPTIONS= ipa-without-autorules ipa-without-limits \ ### Disable dynamic rules support ### .if !empty(PKG_OPTIONS:Mipa-without-autorules) -CONFIGURE_ARGS+= --disable-autorules +CONFIGURE_ARGS+= --disable-autorules .endif ### ### Disable limits support ### .if !empty(PKG_OPTIONS:Mipa-without-limits) -CONFIGURE_ARGS+= --disable-limits +CONFIGURE_ARGS+= --disable-limits .endif ### ### Disable static rules support ### .if !empty(PKG_OPTIONS:Mipa-without-rules) -CONFIGURE_ARGS+= --disable-rules +CONFIGURE_ARGS+= --disable-rules .endif ### ### Disable thresholds support ### .if !empty(PKG_OPTIONS:Mipa-without-thresholds) -CONFIGURE_ARGS+= --disable-thresholds +CONFIGURE_ARGS+= --disable-thresholds .endif diff --git a/databases/jdbc-postgresql94/Makefile b/databases/jdbc-postgresql94/Makefile index 3a59a9b1b9b..303bdb4eac2 100644 --- a/databases/jdbc-postgresql94/Makefile +++ b/databases/jdbc-postgresql94/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2017/08/16 20:21:06 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2019/11/02 15:38:01 rillig Exp $ DISTNAME= postgresql-jdbc-9.4-${PGBUILD}.src PKGNAME= jdbc-postgresql94-${PGBUILD} @@ -21,7 +21,7 @@ USE_JAVA= run USE_JAVA2= 6 NO_BUILD= YES -DOCDIR= share/doc/java/${PKGBASE} +DOCDIR= share/doc/java/${PKGBASE} PLIST_SUBST+= JARFILE=${JARFILE:Q} PLIST_SUBST+= DOCDIR=${DOCDIR:Q} diff --git a/databases/kyotocabinet/Makefile b/databases/kyotocabinet/Makefile index 0c73c6bf593..b1597c524a2 100644 --- a/databases/kyotocabinet/Makefile +++ b/databases/kyotocabinet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2019/07/11 09:25:24 nia Exp $ +# $NetBSD: Makefile,v 1.5 2019/11/02 15:38:01 rillig Exp $ # DISTNAME= kyotocabinet-1.2.76 @@ -11,10 +11,10 @@ HOMEPAGE= https://fallabs.com/kyotocabinet/ COMMENT= Straightforward implementation of DBM LICENSE= gnu-gpl-v3 -GNU_CONFIGURE= yes -USE_GCC_RUNTIME=yes -USE_TOOLS+= gmake pkg-config -USE_LANGUAGES= c c++ +GNU_CONFIGURE= yes +USE_GCC_RUNTIME= yes +USE_TOOLS+= gmake pkg-config +USE_LANGUAGES= c c++ PKGCONFIG_OVERRIDE+= kyotocabinet.pc.in diff --git a/databases/kyotocabinet/options.mk b/databases/kyotocabinet/options.mk index 80796755cf5..95a681cbd08 100644 --- a/databases/kyotocabinet/options.mk +++ b/databases/kyotocabinet/options.mk @@ -1,11 +1,11 @@ -# $NetBSD: options.mk,v 1.1 2014/11/21 11:29:52 obache Exp $ +# $NetBSD: options.mk,v 1.2 2019/11/02 15:38:01 rillig Exp $ # -PKG_OPTIONS_VAR= PKG_OPTIONS.kyotocabinet -PKG_SUPPORTED_OPTIONS= zlib +PKG_OPTIONS_VAR= PKG_OPTIONS.kyotocabinet +PKG_SUPPORTED_OPTIONS= zlib PKG_OPTIONS_OPTIONAL_GROUPS= codec PKG_OPTIONS_GROUP.codec= lzma lzo -PKG_SUGGESTED_OPTIONS= zlib +PKG_SUGGESTED_OPTIONS= zlib .include "../../mk/bsd.options.mk" diff --git a/databases/lbdb/Makefile b/databases/lbdb/Makefile index 710fd785d1d..9225777fa6c 100644 --- a/databases/lbdb/Makefile +++ b/databases/lbdb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2019/08/11 13:18:19 wiz Exp $ +# $NetBSD: Makefile,v 1.36 2019/11/02 15:38:01 rillig Exp $ DISTNAME= lbdb_0.48.1 PKGNAME= ${DISTNAME:S/_/-/} @@ -16,13 +16,13 @@ DEPENDS+= p5-perl-ldap>=0.20:../../databases/p5-perl-ldap GNU_CONFIGURE= yes USE_TOOLS+= gmake perl:run -GNU_CONFIGURE_LIBSUBDIR=../libexec/lbdb -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} -CONFIGURE_ARGS+= --enable-lbdb_dotlock -CONFIGURE_ARGS+= --without-getent -CONFIGURE_ARGS+= --without-evolution-addressbook-export -CONFIGURE_ARGS+= --without-pgp -CONFIGURE_ARGS+= --without-pgpk +GNU_CONFIGURE_LIBSUBDIR= ../libexec/lbdb +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --enable-lbdb_dotlock +CONFIGURE_ARGS+= --without-getent +CONFIGURE_ARGS+= --without-evolution-addressbook-export +CONFIGURE_ARGS+= --without-pgp +CONFIGURE_ARGS+= --without-pgpk CONFIGURE_ENV+= SH=${TOOLS_SH} CONFIGURE_ENV+= AWK=${TOOLS_AWK} diff --git a/databases/libgda/Makefile b/databases/libgda/Makefile index c7701d85d7a..11355145b19 100644 --- a/databases/libgda/Makefile +++ b/databases/libgda/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2019/05/17 08:20:34 wiz Exp $ +# $NetBSD: Makefile,v 1.39 2019/11/02 15:38:01 rillig Exp $ .include "Makefile.common" .include "options.mk" @@ -10,8 +10,8 @@ CONFIGURE_ARGS+= --with-odbc=no --with-bdb=no --with-oracle=no TEST_TARGET= check -CHECK_INTERPRETER_SKIP= share/libgda-5.0/gda_trml2html/trml2html.py -CHECK_INTERPRETER_SKIP+= share/libgda-5.0/gda_trml2pdf/trml2pdf.py +CHECK_INTERPRETER_SKIP= share/libgda-5.0/gda_trml2html/trml2html.py +CHECK_INTERPRETER_SKIP+= share/libgda-5.0/gda_trml2pdf/trml2pdf.py PKG_SYSCONFSUBDIR= libgda-5.0 EGDIR= ${PREFIX}/share/examples/libgda diff --git a/databases/lua-sqlite3/Makefile b/databases/lua-sqlite3/Makefile index c1cc4394ab6..0dd022f1252 100644 --- a/databases/lua-sqlite3/Makefile +++ b/databases/lua-sqlite3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2019/04/03 00:32:30 ryoon Exp $ +# $NetBSD: Makefile,v 1.20 2019/11/02 15:38:01 rillig Exp $ DISTNAME= lua-sqlite3-0.4.1 PKGNAME= ${LUA_PKGPREFIX}-sqlite3-0.4.1 @@ -18,7 +18,7 @@ CONFIGURE_ARGS+= --with-lua=${LUA_INTERPRETER:Q} CFLAGS+= -fPIC -INSTALLATION_DIRS+= ${LUA_LDIR} ${LUA_CDIR} +INSTALLATION_DIRS+= ${LUA_LDIR} ${LUA_CDIR} post-install: mv ${DESTDIR}${PREFIX}/${LUA_CDIR}/*.lua \ diff --git a/databases/lua-tokyocabinet/Makefile b/databases/lua-tokyocabinet/Makefile index a60e8ada786..5f862211994 100644 --- a/databases/lua-tokyocabinet/Makefile +++ b/databases/lua-tokyocabinet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2019/07/11 09:25:24 nia Exp $ +# $NetBSD: Makefile,v 1.28 2019/11/02 15:38:01 rillig Exp $ # DISTNAME= tokyocabinet-lua-1.10 @@ -28,11 +28,11 @@ MAKE_ENV+= INCLUDEDIR=${BUILDLINK_PREFIX.tokyocabinet}/include .include "../../mk/bsd.prefs.mk" .if ${SHLIB_TYPE} == "dylib" -SOEXT= dylib +SOEXT= dylib .else -SOEXT= so +SOEXT= so .endif -PLIST_SUBST+= SOEXT=${SOEXT} +PLIST_SUBST+= SOEXT=${SOEXT} post-extract: ${CHMOD} -R go-w ${WRKSRC} diff --git a/databases/metakit-lib/Makefile b/databases/metakit-lib/Makefile index d212aec1c94..ceb0dea4440 100644 --- a/databases/metakit-lib/Makefile +++ b/databases/metakit-lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2012/10/02 21:25:22 asau Exp $ +# $NetBSD: Makefile,v 1.22 2019/11/02 15:38:02 rillig Exp $ # VERSION= 2.4.9.7 @@ -11,14 +11,14 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.equi4.com/metakit/ COMMENT= Embedded database library -GNU_CONFIGURE= yes -CONFIGURE_DIRS= builds -CONFIGURE_SCRIPT= ../unix/configure +GNU_CONFIGURE= yes +CONFIGURE_DIRS= builds +CONFIGURE_SCRIPT= ../unix/configure CONFIGURE_ARGS+= --without-tcl -BUILD_DIRS= builds -USE_LANGUAGES= c c++ -USE_LIBTOOL= yes -TEST_TARGET= test +BUILD_DIRS= builds +USE_LANGUAGES= c c++ +USE_LIBTOOL= yes +TEST_TARGET= test post-install: ${INSTALL_DATA} ${WRKSRC}/include/mk4io.h ${DESTDIR}${PREFIX}/include diff --git a/databases/myodbc/options.mk b/databases/myodbc/options.mk index f756f6d504e..d458bd51d2b 100644 --- a/databases/myodbc/options.mk +++ b/databases/myodbc/options.mk @@ -1,9 +1,9 @@ -# $NetBSD: options.mk,v 1.7 2017/09/26 09:40:10 wiz Exp $ +# $NetBSD: options.mk,v 1.8 2019/11/02 15:38:02 rillig Exp $ -PKG_OPTIONS_VAR= PKG_OPTIONS.myodbc +PKG_OPTIONS_VAR= PKG_OPTIONS.myodbc PKG_OPTIONS_REQUIRED_GROUPS= db -PKG_OPTIONS_GROUP.db= iodbc unixodbc -PKG_SUGGESTED_OPTIONS= iodbc +PKG_OPTIONS_GROUP.db= iodbc unixodbc +PKG_SUGGESTED_OPTIONS= iodbc .include "../../mk/bsd.options.mk" diff --git a/databases/mysql-cluster/Makefile.common b/databases/mysql-cluster/Makefile.common index bcd421c2667..72c405dc63d 100644 --- a/databases/mysql-cluster/Makefile.common +++ b/databases/mysql-cluster/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.15 2018/02/05 18:09:35 jperkin Exp $ +# $NetBSD: Makefile.common,v 1.16 2019/11/02 15:38:02 rillig Exp $ # # used by databases/mysql-cluster/Makefile @@ -121,9 +121,9 @@ SUBST_SED.fixpaths= -e "s,${WRAPPER_BINDIR}/gcc,${CCPATH},g" SUBST_SED.fixpaths+= -e "s,${WRAPPER_BINDIR}/g++,${CXXPATH},g" .if ${SHLIB_TYPE} == "dylib" -SOEXT="dylib" +SOEXT= "dylib" .else -SOEXT="so" +SOEXT= "so" .endif CMAKE_ARGS+= -DWITH_EDITLINE=bundled diff --git a/databases/mysql-workbench/Makefile b/databases/mysql-workbench/Makefile index 954036109f4..f272e040193 100644 --- a/databases/mysql-workbench/Makefile +++ b/databases/mysql-workbench/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.75 2019/07/21 22:24:35 wiz Exp $ +# $NetBSD: Makefile,v 1.76 2019/11/02 15:38:02 rillig Exp $ DISTNAME= mysql-workbench-gpl-5.2.33b-src PKGNAME= ${DISTNAME:S/-gpl//:S/b-src$//} @@ -13,15 +13,15 @@ LICENSE= gnu-gpl-v2 WRKSRC= ${WRKDIR}/${DISTNAME:S/b-src$/-src/} -USE_LANGUAGES= c c++11 -USE_LIBTOOL= yes -USE_TOOLS+= bash gmake pkg-config -GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-system-ctemplate +USE_LANGUAGES= c c++11 +USE_LIBTOOL= yes +USE_TOOLS+= bash gmake pkg-config +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --with-system-ctemplate LUA_VERSIONS_INCOMPATIBLE= 52 53 -CHECK_PORTABILITY_SKIP= build/make_dmg.sh -CHECK_PORTABILITY_SKIP+=ext/ctemplate/ctemplate-src/configure.ac +CHECK_PORTABILITY_SKIP= build/make_dmg.sh +CHECK_PORTABILITY_SKIP+= ext/ctemplate/ctemplate-src/configure.ac SUBST_CLASSES+= python SUBST_STAGE.python= pre-configure diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile index 05ef968908d..1f0531a6756 100644 --- a/databases/mysql51-server/Makefile +++ b/databases/mysql51-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2019/08/11 13:18:20 wiz Exp $ +# $NetBSD: Makefile,v 1.34 2019/11/02 15:38:02 rillig Exp $ PKGNAME= ${DISTNAME:S/-/-server-/} PKGREVISION= 4 @@ -19,13 +19,13 @@ PLIST.embedded= yes .endif .if !empty(PKG_OPTIONS:Mndb-cluster) -CONFIGURE_ARGS+= --with-plugins=innobase,ndbcluster -REPLACE_PERL+= storage/ndb/tools/ndb_error_reporter \ +CONFIGURE_ARGS+= --with-plugins=innobase,ndbcluster +REPLACE_PERL+= storage/ndb/tools/ndb_error_reporter \ storage/ndb/tools/ndb_size.pl -PLIST.ndb= yes +PLIST.ndb= yes BUILDLINK_DEPMETHOD.readline= full .else -CONFIGURE_ARGS+= --with-plugins=innobase +CONFIGURE_ARGS+= --with-plugins=innobase .endif .if !empty(PKG_OPTIONS:Mpstack) diff --git a/databases/mysql55-client/Makefile.common b/databases/mysql55-client/Makefile.common index 48336a4ef7f..2d42c6c4540 100644 --- a/databases/mysql55-client/Makefile.common +++ b/databases/mysql55-client/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.65 2019/04/30 14:09:52 abs Exp $ +# $NetBSD: Makefile.common,v 1.66 2019/11/02 15:38:02 rillig Exp $ # # used by databases/mysql55-client/Makefile # used by databases/mysql55-server/Makefile @@ -60,7 +60,7 @@ CMAKE_ARGS+= -DINSTALL_SCRIPTDIR="bin" CMAKE_ARGS+= -DINSTALL_SQLBENCHDIR="share/mysql/sql-bench" CMAKE_ARGS+= -DINSTALL_SUPPORTFILESDIR="share/mysql" CMAKE_ARGS+= -DMYSQL_DATADIR=${MYSQL_DATADIR} -CMAKE_ARGS+= -DWITH_SSL=system +CMAKE_ARGS+= -DWITH_SSL=system # always use our own readline, not MySQL bundled one CMAKE_ARGS+= -DWITH_LIBEDIT=OFF diff --git a/databases/mysql57-server/Makefile b/databases/mysql57-server/Makefile index dd1759c1962..2ed0d2a31f7 100644 --- a/databases/mysql57-server/Makefile +++ b/databases/mysql57-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2019/10/14 20:19:29 adam Exp $ +# $NetBSD: Makefile,v 1.28 2019/11/02 15:38:02 rillig Exp $ PKGNAME= ${DISTNAME:S/-/-server-/} COMMENT= MySQL 5, a free SQL database (server) @@ -10,10 +10,10 @@ CONFLICTS= mysql3-server-[0-9]* CMAKE_ARGS+= -DINSTALL_INFODIR=${PKGINFODIR} .if !empty(PKG_OPTIONS:Membedded-server) -CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER=ON -PLIST.embedded= yes +CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER=ON +PLIST.embedded= yes .else -CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER=OFF +CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER=OFF # We only need readline to placate the configure script if we don't build # the embedded server as it is the only binary linked against "readline". BUILDLINK_DEPMETHOD.editline= build diff --git a/databases/ocaml-dbm/Makefile b/databases/ocaml-dbm/Makefile index a52ddfd5f86..be74a5087f2 100644 --- a/databases/ocaml-dbm/Makefile +++ b/databases/ocaml-dbm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2018/11/12 16:10:16 jaapb Exp $ +# $NetBSD: Makefile,v 1.20 2019/11/02 15:38:02 rillig Exp $ # PKGNAME= ocaml-dbm-${VERSION} @@ -16,9 +16,9 @@ LICENSE= gnu-lgpl-v2 CONFLICTS= ocaml-findlib<1.4nb1 -HAS_CONFIGURE= yes -USE_TOOLS+= gmake -MAKE_ENV+= HAS_OCAMLOPT="${OCAML_USE_OPT_COMPILER}" +HAS_CONFIGURE= yes +USE_TOOLS+= gmake +MAKE_ENV+= HAS_OCAMLOPT="${OCAML_USE_OPT_COMPILER}" OCAML_USE_FINDLIB= yes post-install: diff --git a/databases/ocaml-ldap/Makefile b/databases/ocaml-ldap/Makefile index 62de8c04f41..ea1bd5b69b8 100644 --- a/databases/ocaml-ldap/Makefile +++ b/databases/ocaml-ldap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2018/11/12 16:10:17 jaapb Exp $ +# $NetBSD: Makefile,v 1.11 2019/11/02 15:38:02 rillig Exp $ VERSION= 2.3.0 GITHUB_PROJECT= ocamldap @@ -14,8 +14,8 @@ HOMEPAGE= http://ocamldap.sourceforge.net/ COMMENT= OCamL implementation of the LDAP protocol LICENSE= gnu-lgpl-v2.1 -HAS_CONFIGURE= yes -USE_LANGUAGES= # none +HAS_CONFIGURE= yes +USE_LANGUAGES= # none OCAML_USE_OASIS= yes .include "../../mk/ocaml.mk" diff --git a/databases/ocaml-macaque/Makefile b/databases/ocaml-macaque/Makefile index 5fef29c3ccf..c29ac1a000e 100644 --- a/databases/ocaml-macaque/Makefile +++ b/databases/ocaml-macaque/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2018/11/12 16:10:17 jaapb Exp $ +# $NetBSD: Makefile,v 1.4 2019/11/02 15:38:03 rillig Exp $ GITHUB_PROJECT= macaque DISTNAME= ${GITHUB_PROJECT}-0.7.4 @@ -12,8 +12,8 @@ HOMEPAGE= https://github.com/ocsigen/macaque/ COMMENT= Language for SQL queries in OCaml LICENSE= gnu-lgpl-v2.1 -HAS_CONFIGURE= yes -USE_LANGUAGES= c +HAS_CONFIGURE= yes +USE_LANGUAGES= c OCAML_USE_FINDLIB= yes OCAML_USE_OASIS_DYNRUN= yes diff --git a/databases/ocaml-mysql/Makefile b/databases/ocaml-mysql/Makefile index 5a79906398f..b1a8668d05f 100644 --- a/databases/ocaml-mysql/Makefile +++ b/databases/ocaml-mysql/Makefile @@ -1,13 +1,13 @@ -# $NetBSD: Makefile,v 1.28 2018/11/12 16:10:17 jaapb Exp $ +# $NetBSD: Makefile,v 1.29 2019/11/02 15:38:03 rillig Exp $ # VERSION= 1.2.0 GITHUB_PROJECT= ocaml-mysql GITHUB_TAG= v${VERSION} DISTNAME= ${GITHUB_PROJECT}-${VERSION} -PKGREVISION= 7 -CATEGORIES= databases -MASTER_SITES= ${MASTER_SITE_GITHUB:=ygrek/} +PKGREVISION= 7 +CATEGORIES= databases +MASTER_SITES= ${MASTER_SITE_GITHUB:=ygrek/} MAINTAINER= jaapb@NetBSD.org HOMEPAGE= http://ocaml-mysql.forge.ocamlcore.org/ diff --git a/databases/openldap-server/options.mk b/databases/openldap-server/options.mk index b6a26093236..171fcbf6ba1 100644 --- a/databases/openldap-server/options.mk +++ b/databases/openldap-server/options.mk @@ -1,10 +1,10 @@ -# $NetBSD: options.mk,v 1.22 2019/09/28 08:07:51 adam Exp $ +# $NetBSD: options.mk,v 1.23 2019/11/02 15:38:03 rillig Exp $ -PKG_OPTIONS_VAR= PKG_OPTIONS.openldap-server -PKG_SUPPORTED_OPTIONS= bdb dso inet6 sasl slapi slp smbk5pwd +PKG_OPTIONS_VAR= PKG_OPTIONS.openldap-server +PKG_SUPPORTED_OPTIONS= bdb dso inet6 sasl slapi slp smbk5pwd PKG_OPTIONS_OPTIONAL_GROUPS+= odbc -PKG_OPTIONS_GROUP.odbc= iodbc unixodbc -PKG_SUGGESTED_OPTIONS= bdb inet6 +PKG_OPTIONS_GROUP.odbc= iodbc unixodbc +PKG_SUGGESTED_OPTIONS= bdb inet6 .include "../../mk/bsd.options.mk" diff --git a/databases/oraedit/Makefile b/databases/oraedit/Makefile index ddde8ac0b9d..9d82dda019f 100644 --- a/databases/oraedit/Makefile +++ b/databases/oraedit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2019/04/25 07:32:41 maya Exp $ +# $NetBSD: Makefile,v 1.26 2019/11/02 15:38:03 rillig Exp $ DISTNAME= oraedit-0.1.4 PKGREVISION= 6 @@ -11,7 +11,7 @@ COMMENT= Editor of PL/SQL source stored in Oracle database NO_BUILD= yes -REPLACE_PYTHON= oraedit +REPLACE_PYTHON= oraedit INSTALLATION_DIRS= bin do-configure:; diff --git a/databases/p5-Class-DBI-Plugin-DeepAbstractSearch/Makefile b/databases/p5-Class-DBI-Plugin-DeepAbstractSearch/Makefile index 0ca3d14a51d..1ed1e995d43 100644 --- a/databases/p5-Class-DBI-Plugin-DeepAbstractSearch/Makefile +++ b/databases/p5-Class-DBI-Plugin-DeepAbstractSearch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2019/08/11 13:18:23 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2019/11/02 15:38:03 rillig Exp $ # DISTNAME= Class-DBI-Plugin-DeepAbstractSearch-0.08 @@ -11,9 +11,9 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://metacpan.org/pod/Class::DBI::Plugin::DeepAbstractSearch COMMENT= Implement deep_search_where() for Class::DBI -DEPENDS+= p5-Class-DBI>=0.96:../../databases/p5-Class-DBI -DEPENDS+= p5-Class-DBI-Plugin>=0.02:../../databases/p5-Class-DBI-Plugin -DEPENDS+= p5-SQL-Abstract>=1.18:../../databases/p5-SQL-Abstract +DEPENDS+= p5-Class-DBI>=0.96:../../databases/p5-Class-DBI +DEPENDS+= p5-Class-DBI-Plugin>=0.02:../../databases/p5-Class-DBI-Plugin +DEPENDS+= p5-SQL-Abstract>=1.18:../../databases/p5-SQL-Abstract #BUILD_DEPENDS+= {perl>=5.6.2,p5-Test-Simple>=0.32}:../../devel/p5-Test-Simple PERL5_PACKLIST= auto/Class/DBI/Plugin/DeepAbstractSearch/.packlist diff --git a/databases/p5-DBD-Sybase/Makefile b/databases/p5-DBD-Sybase/Makefile index b6688f55818..1460f11d837 100644 --- a/databases/p5-DBD-Sybase/Makefile +++ b/databases/p5-DBD-Sybase/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.54 2019/08/11 13:18:25 wiz Exp $ +# $NetBSD: Makefile,v 1.55 2019/11/02 15:38:03 rillig Exp $ DISTNAME= DBD-Sybase-1.15 PKGNAME= p5-${DISTNAME} @@ -18,13 +18,13 @@ BUILD_DEFS+= SYBASE .if defined(USE_SYBASE_OPENCLIENT) && empty(USE_SYBASE_OPENCLIENT:M[Nn][Oo]) . if defined(SYBASE) || exists(${SYBASE}/lib/libct.so) -BUILDLINK_PASSTHRU_DIRS=${SYBASE} -_SYBASE= ${SYBASE} +BUILDLINK_PASSTHRU_DIRS= ${SYBASE} +_SYBASE= ${SYBASE} . else -PKG_FAIL_REASON+= "You must define SYBASE to the base directory of your Open Client." +PKG_FAIL_REASON+= "You must define SYBASE to the base directory of your Open Client." . endif .else -_SYBASE= ${BUILDLINK_PREFIX.freetds} +_SYBASE= ${BUILDLINK_PREFIX.freetds} .endif PERL5_LDFLAGS+= ${COMPILER_RPATH_FLAG}${_SYBASE}/lib diff --git a/databases/p5-DBIx-Class-DigestColumns/Makefile b/databases/p5-DBIx-Class-DigestColumns/Makefile index 14a6e5d5f79..7eaa5b8df2d 100644 --- a/databases/p5-DBIx-Class-DigestColumns/Makefile +++ b/databases/p5-DBIx-Class-DigestColumns/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2019/08/11 13:18:26 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2019/11/02 15:38:03 rillig Exp $ DISTNAME= DBIx-Class-DigestColumns-0.06000 PKGNAME= p5-${DISTNAME} @@ -13,12 +13,12 @@ COMMENT= Automatic digest columns for DBIx::Class DEPENDS+= p5-DBIx-Class>=0.06002:../../databases/p5-DBIx-Class #DEPENDS+= {perl>=5.7.3,p5-Digest-MD5>=0}:../../security/p5-Digest-MD5 -BUILD_DEPENDS+= p5-DBD-SQLite>=1.11:../../databases/p5-DBD-SQLite +BUILD_DEPENDS+= p5-DBD-SQLite>=1.11:../../databases/p5-DBD-SQLite USE_LANGUAGES= # empty PERL5_PACKLIST= auto/DBIx/Class/DigestColumns/.packlist -PERL5_MODULE_TYPE= Module::Build +PERL5_MODULE_TYPE= Module::Build .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/p5-DBIx-Class-Fixtures/Makefile b/databases/p5-DBIx-Class-Fixtures/Makefile index b51400150ee..0edae9e2195 100644 --- a/databases/p5-DBIx-Class-Fixtures/Makefile +++ b/databases/p5-DBIx-Class-Fixtures/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2019/08/11 13:18:27 wiz Exp $ +# $NetBSD: Makefile,v 1.31 2019/11/02 15:38:03 rillig Exp $ DISTNAME= DBIx-Class-Fixtures-1.001039 PKGNAME= p5-${DISTNAME} @@ -34,8 +34,8 @@ DEPENDS+= p5-Test-Compile>=0:../../devel/p5-Test-Compile BUILD_DEPENDS+= p5-Test-TempDir-Tiny>=0:../../devel/p5-Test-TempDir-Tiny BUILD_DEPENDS+= p5-DBD-SQLite-[0-9]*:../../databases/p5-DBD-SQLite -USE_LANGUAGES= # empty -PERL5_PACKLIST= auto/DBIx/Class/Fixtures/.packlist +USE_LANGUAGES= # empty +PERL5_PACKLIST= auto/DBIx/Class/Fixtures/.packlist PERL5_MODULE_TYPE= Module::Install::Bundled .include "../../lang/perl5/module.mk" diff --git a/databases/p5-DBIx-Class-InflateColumn-FS/Makefile b/databases/p5-DBIx-Class-InflateColumn-FS/Makefile index 732c82af778..35cc0e92e8d 100644 --- a/databases/p5-DBIx-Class-InflateColumn-FS/Makefile +++ b/databases/p5-DBIx-Class-InflateColumn-FS/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2019/08/11 13:18:27 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2019/11/02 15:38:04 rillig Exp $ DISTNAME= DBIx-Class-InflateColumn-FS-0.01007 PKGNAME= p5-${DISTNAME} @@ -19,8 +19,8 @@ DEPENDS+= p5-DBIx-Class-UUIDColumns>=0.02005:../../databases/p5-DBIx-Class-UUIDC DEPENDS+= p5-Path-Class-[0-9]*:../../devel/p5-Path-Class # For test really -BUILD_DEPENDS+= p5-DBD-SQLite-[0-9]*:../../databases/p5-DBD-SQLite -BUILD_DEPENDS+= p5-DBICx-TestDatabase-[0-9]*:../../databases/p5-DBICx-TestDatabase +BUILD_DEPENDS+= p5-DBD-SQLite-[0-9]*:../../databases/p5-DBD-SQLite +BUILD_DEPENDS+= p5-DBICx-TestDatabase-[0-9]*:../../databases/p5-DBICx-TestDatabase MAKE_ENV+= PERL_USE_UNSAFE_INC=1 diff --git a/databases/p5-DBIx-Class-InflateColumn-IP/Makefile b/databases/p5-DBIx-Class-InflateColumn-IP/Makefile index fd9769e24c4..5cc45e1f218 100644 --- a/databases/p5-DBIx-Class-InflateColumn-IP/Makefile +++ b/databases/p5-DBIx-Class-InflateColumn-IP/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2019/08/11 13:18:27 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2019/11/02 15:38:04 rillig Exp $ DISTNAME= DBIx-Class-InflateColumn-IP-0.02003 PKGNAME= p5-${DISTNAME} @@ -18,7 +18,7 @@ PERL5_PACKLIST= auto/DBIx/Class/InflateColumn/IP/.packlist DEPENDS+= p5-DBIx-Class>=0.07005:../../databases/p5-DBIx-Class DEPENDS+= p5-NetAddr-IP-[0-9]*:../../net/p5-NetAddr-IP # For test really -BUILD_DEPENDS+= p5-DBD-SQLite-[0-9]*:../../databases/p5-DBD-SQLite +BUILD_DEPENDS+= p5-DBD-SQLite-[0-9]*:../../databases/p5-DBD-SQLite .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/p5-DBIx-Class-Schema-Loader/Makefile b/databases/p5-DBIx-Class-Schema-Loader/Makefile index 3e04c7af62b..4182a51a908 100644 --- a/databases/p5-DBIx-Class-Schema-Loader/Makefile +++ b/databases/p5-DBIx-Class-Schema-Loader/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2019/08/11 13:18:28 wiz Exp $ +# $NetBSD: Makefile,v 1.40 2019/11/02 15:38:04 rillig Exp $ DISTNAME= DBIx-Class-Schema-Loader-0.07049 PKGNAME= p5-${DISTNAME} @@ -13,20 +13,20 @@ LICENSE= ${PERL5_LICENSE} .include "options.mk" -BUILD_DEPENDS+= p5-Config-Any-[0-9]*:../../devel/p5-Config-Any -BUILD_DEPENDS+= p5-Config-General-[0-9]*:../../devel/p5-Config-General -BUILD_DEPENDS+= p5-DBD-SQLite>=1.29:../../databases/p5-DBD-SQLite +BUILD_DEPENDS+= p5-Config-Any-[0-9]*:../../devel/p5-Config-Any +BUILD_DEPENDS+= p5-Config-General-[0-9]*:../../devel/p5-Config-General +BUILD_DEPENDS+= p5-DBD-SQLite>=1.29:../../databases/p5-DBD-SQLite #BUILD_DEPENDS+= {perl>=5.10.1,p5-File-Path>=2.07}:../../devel/p5-File-Path -BUILD_DEPENDS+= p5-Moose>=1.1200:../../devel/p5-Moose -BUILD_DEPENDS+= p5-MooseX-MarkAsMethods>=0.13:../../devel/p5-MooseX-MarkAsMethods -BUILD_DEPENDS+= p5-MooseX-NonMoose>=0.16:../../devel/p5-MooseX-NonMoose +BUILD_DEPENDS+= p5-Moose>=1.1200:../../devel/p5-Moose +BUILD_DEPENDS+= p5-MooseX-MarkAsMethods>=0.13:../../devel/p5-MooseX-MarkAsMethods +BUILD_DEPENDS+= p5-MooseX-NonMoose>=0.16:../../devel/p5-MooseX-NonMoose #BUILD_DEPENDS+= {perl>=5.18.0,p5-Pod-Simple>=3.22}:../../textproc/p5-Pod-Simple -BUILD_DEPENDS+= p5-Text-Unidecode>=0:../../textproc/p5-Text-Unidecode -BUILD_DEPENDS+= p5-Test-Exception>=0.31:../../devel/p5-Test-Exception +BUILD_DEPENDS+= p5-Text-Unidecode>=0:../../textproc/p5-Text-Unidecode +BUILD_DEPENDS+= p5-Test-Exception>=0.31:../../devel/p5-Test-Exception # BUILD_DEPENDS+= p5-Test-Kwalitee-[0-9]*:../../devel/p5-Test-Kwalitee #BUILD_DEPENDS+= {perl>=5.12.0,p5-Test-Simple>=0.94}:../../devel/p5-Test-Simple -BUILD_DEPENDS+= p5-Test-Warn>=0.21:../../devel/p5-Test-Warn -BUILD_DEPENDS+= p5-namespace-autoclean>=0.09:../../devel/p5-namespace-autoclean +BUILD_DEPENDS+= p5-Test-Warn>=0.21:../../devel/p5-Test-Warn +BUILD_DEPENDS+= p5-namespace-autoclean>=0.09:../../devel/p5-namespace-autoclean DEPENDS+= p5-Carp-Clan-[0-9]*:../../devel/p5-Carp-Clan DEPENDS+= p5-Class-Accessor-Grouped>=0.10008:../../devel/p5-Class-Accessor-Grouped @@ -61,8 +61,8 @@ BUILD_DEPENDS+= p5-Text-Diff-[0-9]*:../../textproc/p5-Text-Diff # Avoid complaints if we do not have DB2, Oracle, Pg and mysql MAKE_ENV+= DBIC_FEATURE_NOQUESTIONS=1 -USE_LANGUAGES= # empty -PERL5_PACKLIST= auto/DBIx/Class/Schema/Loader/.packlist +USE_LANGUAGES= # empty +PERL5_PACKLIST= auto/DBIx/Class/Schema/Loader/.packlist PERL5_MODULE_TYPE= Module::Install::Bundled pre-configure: diff --git a/databases/p5-DBIx-Class-TimeStamp/Makefile b/databases/p5-DBIx-Class-TimeStamp/Makefile index e7c99af57cd..e0acbb4cbd1 100644 --- a/databases/p5-DBIx-Class-TimeStamp/Makefile +++ b/databases/p5-DBIx-Class-TimeStamp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2019/08/11 13:18:28 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2019/11/02 15:38:04 rillig Exp $ DISTNAME= DBIx-Class-TimeStamp-0.14 PKGNAME= p5-${DISTNAME} @@ -12,14 +12,14 @@ COMMENT= DBIx::Class component to automatically handle timestamp fields LICENSE= ${PERL5_LICENSE} PERL5_MODULE_TYPE= Module::Install::Bundled -USE_LANGUAGES= # empty -PERL5_PACKLIST= auto/DBIx/Class/TimeStamp/.packlist +USE_LANGUAGES= # empty +PERL5_PACKLIST= auto/DBIx/Class/TimeStamp/.packlist -BUILD_DEPENDS+= p5-Class-Accessor-Grouped-[0-9]*:../../devel/p5-Class-Accessor-Grouped -BUILD_DEPENDS+= p5-DateTime-Format-MySQL-[0-9]*:../../time/p5-DateTime-Format-MySQL -BUILD_DEPENDS+= p5-DateTime-Format-SQLite-[0-9]*:../../time/p5-DateTime-Format-SQLite +BUILD_DEPENDS+= p5-Class-Accessor-Grouped-[0-9]*:../../devel/p5-Class-Accessor-Grouped +BUILD_DEPENDS+= p5-DateTime-Format-MySQL-[0-9]*:../../time/p5-DateTime-Format-MySQL +BUILD_DEPENDS+= p5-DateTime-Format-SQLite-[0-9]*:../../time/p5-DateTime-Format-SQLite #BUILD_DEPENDS+= {perl>=5.10,p5-Time-HiRes-[0-9]*}:../../time/p5-Time-HiRes -BUILD_DEPENDS+= p5-Time-Warp-[0-9]*:../../time/p5-Time-Warp +BUILD_DEPENDS+= p5-Time-Warp-[0-9]*:../../time/p5-Time-Warp DEPENDS+= p5-DBIx-Class>=0.08009:../../databases/p5-DBIx-Class DEPENDS+= p5-DBIx-Class-DynamicDefault>=0.03:../../databases/p5-DBIx-Class-DynamicDefault diff --git a/databases/p5-DBIx-Class-UUIDColumns/Makefile b/databases/p5-DBIx-Class-UUIDColumns/Makefile index 8cefb8c7f86..e1ec51fe2e0 100644 --- a/databases/p5-DBIx-Class-UUIDColumns/Makefile +++ b/databases/p5-DBIx-Class-UUIDColumns/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2019/08/11 13:18:28 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2019/11/02 15:38:04 rillig Exp $ DISTNAME= DBIx-Class-UUIDColumns-0.02006 PKGNAME= p5-${DISTNAME} @@ -15,7 +15,7 @@ DEPENDS+= p5-DBIx-Class>=0.07005:../../databases/p5-DBIx-Class DEPENDS+= p5-Data-UUID>=0:../../devel/p5-Data-UUID DEPENDS+= p5-Class-Accessor-Grouped>=0:../../devel/p5-Class-Accessor-Grouped -BUILD_DEPENDS+= p5-DBD-SQLite>=1.11:../../databases/p5-DBD-SQLite +BUILD_DEPENDS+= p5-DBD-SQLite>=1.11:../../databases/p5-DBD-SQLite USE_LANGUAGES= # empty MAKE_ENV+= PERL_USE_UNSAFE_INC=1 diff --git a/databases/p5-DBIx-Class-Validation/Makefile b/databases/p5-DBIx-Class-Validation/Makefile index b79c0ae126b..a8f77842367 100644 --- a/databases/p5-DBIx-Class-Validation/Makefile +++ b/databases/p5-DBIx-Class-Validation/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2019/08/11 13:18:28 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2019/11/02 15:38:04 rillig Exp $ DISTNAME= DBIx-Class-Validation-0.02005 PKGNAME= p5-${DISTNAME} @@ -15,11 +15,11 @@ DEPENDS+= p5-DBIx-Class>=0.07005:../../databases/p5-DBIx-Class DEPENDS+= p5-FormValidator-Simple>=0.17:../../textproc/p5-FormValidator-Simple DEPENDS+= p5-Data-FormValidator-[0-9]*:../../textproc/p5-Data-FormValidator -BUILD_DEPENDS+= p5-DBD-SQLite>=1.11:../../databases/p5-DBD-SQLite +BUILD_DEPENDS+= p5-DBD-SQLite>=1.11:../../databases/p5-DBD-SQLite BUILD_DEPENDS+= p5-DateTime-Format-SQLite-[0-9]*:../../time/p5-DateTime-Format-SQLite -USE_LANGUAGES= # empty -PERL5_PACKLIST= auto/DBIx/Class/Validation/.packlist +USE_LANGUAGES= # empty +PERL5_PACKLIST= auto/DBIx/Class/Validation/.packlist PERL5_MODULE_TYPE= Module::Install::Bundled MAKE_ENV+= PERL_USE_UNSAFE_INC=1 diff --git a/databases/p5-DBIx-Class/Makefile b/databases/p5-DBIx-Class/Makefile index ab0e3f4c81b..2375e67401d 100644 --- a/databases/p5-DBIx-Class/Makefile +++ b/databases/p5-DBIx-Class/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2019/08/11 13:18:26 wiz Exp $ +# $NetBSD: Makefile,v 1.46 2019/11/02 15:38:03 rillig Exp $ DISTNAME= DBIx-Class-0.082841 PKGNAME= p5-${DISTNAME} @@ -33,16 +33,16 @@ DEPENDS+= p5-Sub-Name>=0.04:../../devel/p5-Sub-Name DEPENDS+= p5-Try-Tiny>=0.07:../../devel/p5-Try-Tiny DEPENDS+= p5-namespace-clean>=0.24:../../devel/p5-namespace-clean -BUILD_DEPENDS+= p5-DBD-SQLite>=1.40:../../databases/p5-DBD-SQLite -BUILD_DEPENDS+= p5-Package-Stash>=0.28:../../devel/p5-Package-Stash +BUILD_DEPENDS+= p5-DBD-SQLite>=1.40:../../databases/p5-DBD-SQLite +BUILD_DEPENDS+= p5-Package-Stash>=0.28:../../devel/p5-Package-Stash #BUILD_DEPENDS+= {perl>=5.10.1,p5-File-Temp>=0.22}:../../devel/p5-File-Temp -BUILD_DEPENDS+= p5-Test-Exception-[0-9]*:../../devel/p5-Test-Exception +BUILD_DEPENDS+= p5-Test-Exception-[0-9]*:../../devel/p5-Test-Exception #BUILD_DEPENDS+= {perl>=5.10.1,p5-Test-Simple>=0.92}:../../devel/p5-Test-Simple -BUILD_DEPENDS+= p5-Test-Warn>=0.21:../../devel/p5-Test-Warn -BUILD_DEPENDS+= p5-Class-DBI>=0:../../databases/p5-Class-DBI -BUILD_DEPENDS+= p5-SQL-Translator>=0.11018:../../databases/p5-SQL-Translator +BUILD_DEPENDS+= p5-Test-Warn>=0.21:../../devel/p5-Test-Warn +BUILD_DEPENDS+= p5-Class-DBI>=0:../../databases/p5-Class-DBI +BUILD_DEPENDS+= p5-SQL-Translator>=0.11018:../../databases/p5-SQL-Translator # for make test -BUILD_DEPENDS+= p5-Test-Deep-[0-9]*:../../devel/p5-Test-Deep +BUILD_DEPENDS+= p5-Test-Deep-[0-9]*:../../devel/p5-Test-Deep REPLACE_PERL= script/dbicadmin diff --git a/databases/p5-Net-FileMaker/Makefile b/databases/p5-Net-FileMaker/Makefile index 6a1ed5fb1ca..ba551106c30 100644 --- a/databases/p5-Net-FileMaker/Makefile +++ b/databases/p5-Net-FileMaker/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2019/08/11 13:18:31 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2019/11/02 15:38:04 rillig Exp $ DISTNAME= Net-FileMaker-0.064 PKGNAME= p5-${DISTNAME} @@ -12,9 +12,9 @@ COMMENT= Perl Module to interact with FileMaker services LICENSE= ${PERL5_LICENSE} # for make test -BUILD_DEPENDS+=p5-XML-Twig-[0-9]*:../../textproc/p5-XML-Twig -BUILD_DEPENDS+=p5-DateTime-[0-9]*:../../time/p5-DateTime -BUILD_DEPENDS+=p5-DateTime-Format-CLDR-[0-9]*:../../time/p5-DateTime-Format-CLDR +BUILD_DEPENDS+= p5-XML-Twig-[0-9]*:../../textproc/p5-XML-Twig +BUILD_DEPENDS+= p5-DateTime-[0-9]*:../../time/p5-DateTime +BUILD_DEPENDS+= p5-DateTime-Format-CLDR-[0-9]*:../../time/p5-DateTime-Format-CLDR PERL5_PACKLIST= auto/Net/FileMaker/.packlist diff --git a/databases/p5-Net-MySQL/Makefile b/databases/p5-Net-MySQL/Makefile index 0c3c863145f..5bd2618b4cb 100644 --- a/databases/p5-Net-MySQL/Makefile +++ b/databases/p5-Net-MySQL/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2019/08/11 13:18:31 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2019/11/02 15:38:04 rillig Exp $ # DISTNAME= Net-MySQL-0.11 @@ -11,7 +11,7 @@ MAINTAINER= ficovh@yahoo.com HOMEPAGE= https://cpan.metacpan.org/authors/id/O/OY/OYAMA/ COMMENT= Net::MySQL - Pure Perl MySQL network protocol interface -DEPENDS+= p5-Digest-SHA1-[0-9]*:../../security/p5-Digest-SHA1 +DEPENDS+= p5-Digest-SHA1-[0-9]*:../../security/p5-Digest-SHA1 PERL5_PACKLIST= auto/Net/MySQL/.packlist USE_LANGUAGES= # none diff --git a/databases/p5-ORLite-Migrate/Makefile b/databases/p5-ORLite-Migrate/Makefile index fc6b51c00e0..523ed0055f5 100644 --- a/databases/p5-ORLite-Migrate/Makefile +++ b/databases/p5-ORLite-Migrate/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2019/08/11 13:18:31 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2019/11/02 15:38:05 rillig Exp $ DISTNAME= ORLite-Migrate-1.10 PKGNAME= p5-${DISTNAME} @@ -23,7 +23,7 @@ DEPENDS+= p5-Probe-Perl>=0.01:../../devel/p5-Probe-Perl BUILDLINK_API_DEPENDS.p5-DBI+= p5-DBI>=1.580 USE_LANGUAGES= # empty -PERL5_PACKLIST= auto/ORLite/Migrate/.packlist +PERL5_PACKLIST= auto/ORLite/Migrate/.packlist MAKE_ENV+= PERL_USE_UNSAFE_INC=1 diff --git a/databases/p5-Parse-Dia-SQL/Makefile b/databases/p5-Parse-Dia-SQL/Makefile index b40cc257a6b..030c00388d5 100644 --- a/databases/p5-Parse-Dia-SQL/Makefile +++ b/databases/p5-Parse-Dia-SQL/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2019/08/11 13:18:32 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2019/11/02 15:38:05 rillig Exp $ DISTNAME= Parse-Dia-SQL-0.30 PKGNAME= p5-${DISTNAME} @@ -11,7 +11,7 @@ HOMEPAGE= https://metacpan.org/release/Parse-Dia-SQL COMMENT= Perl module to convert Dia diagrams to SQL LICENSE= gnu-gpl-v2 OR gnu-gpl-v3 -BUILD_DEPENDS+= p5-CPAN-Meta-[0-9]*:../../devel/p5-CPAN-Meta +BUILD_DEPENDS+= p5-CPAN-Meta-[0-9]*:../../devel/p5-CPAN-Meta DEPENDS+= p5-Log-Log4perl-[0-9]*:../../devel/p5-Log-Log4perl DEPENDS+= p5-Test-Exception-[0-9]*:../../devel/p5-Test-Exception @@ -19,7 +19,7 @@ DEPENDS+= p5-Text-Table-[0-9]*:../../textproc/p5-Text-Table DEPENDS+= p5-XML-DOM-[0-9]*:../../textproc/p5-XML-DOM DEPENDS+= p5-HTML-Lint-[0-9]*:../../www/p5-HTML-Lint -PERL5_PACKLIST= auto/Parse/Dia/SQL/.packlist +PERL5_PACKLIST= auto/Parse/Dia/SQL/.packlist REPLACE_PERL+= bin/parsediasql diff --git a/databases/p5-RRD-Simple/Makefile b/databases/p5-RRD-Simple/Makefile index ccd9b58dc9c..35175992906 100644 --- a/databases/p5-RRD-Simple/Makefile +++ b/databases/p5-RRD-Simple/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2019/08/11 13:18:32 wiz Exp $ +# $NetBSD: Makefile,v 1.43 2019/11/02 15:38:05 rillig Exp $ DISTNAME= RRD-Simple-1.44 PKGNAME= p5-${DISTNAME} @@ -11,10 +11,10 @@ HOMEPAGE= https://metacpan.org/release/RRD-Simple COMMENT= RRD::Simple implementation for Perl LICENSE= apache-2.0 -BUILD_DEPENDS+= p5-Test-Pod>=1.26:../../devel/p5-Test-Pod -BUILD_DEPENDS+= p5-Pod-Coverage>=0.18:../../textproc/p5-Pod-Coverage -BUILD_DEPENDS+= p5-Test-Pod-Coverage>=1.08:../../devel/p5-Test-Pod-Coverage -BUILD_DEPENDS+= p5-Test-Deep>=0.096:../../devel/p5-Test-Deep +BUILD_DEPENDS+= p5-Test-Pod>=1.26:../../devel/p5-Test-Pod +BUILD_DEPENDS+= p5-Pod-Coverage>=0.18:../../textproc/p5-Pod-Coverage +BUILD_DEPENDS+= p5-Test-Pod-Coverage>=1.08:../../devel/p5-Test-Pod-Coverage +BUILD_DEPENDS+= p5-Test-Deep>=0.096:../../devel/p5-Test-Deep PERL5_MODULE_TYPE= Module::Build PERL5_PACKLIST= auto/RRD/Simple/.packlist diff --git a/databases/p5-Rose-DB-Object/Makefile b/databases/p5-Rose-DB-Object/Makefile index 019d1ca7e4f..56f0d6d90b9 100644 --- a/databases/p5-Rose-DB-Object/Makefile +++ b/databases/p5-Rose-DB-Object/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2019/08/11 13:18:32 wiz Exp $ +# $NetBSD: Makefile,v 1.28 2019/11/02 15:38:05 rillig Exp $ DISTNAME= Rose-DB-Object-0.815 PKGNAME= p5-${DISTNAME} @@ -21,7 +21,7 @@ DEPENDS+= p5-Rose-Object>=0.854:../../devel/p5-Rose-Object DEPENDS+= p5-Time-Clock-[0-9]*:../../time/p5-Time-Clock USE_LANGUAGES= # empty -PERL5_PACKLIST= auto/Rose/DB/Object/.packlist +PERL5_PACKLIST= auto/Rose/DB/Object/.packlist post-extract: ${FIND} ${WRKSRC} -name "*.pm" -type f -exec ${CHMOD} -x {} \; diff --git a/databases/p5-Rose-DB/Makefile b/databases/p5-Rose-DB/Makefile index 5a8a35ab3a6..050850a84e4 100644 --- a/databases/p5-Rose-DB/Makefile +++ b/databases/p5-Rose-DB/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2019/08/11 13:18:32 wiz Exp $ +# $NetBSD: Makefile,v 1.31 2019/11/02 15:38:05 rillig Exp $ DISTNAME= Rose-DB-0.778 PKGNAME= p5-${DISTNAME} @@ -23,7 +23,7 @@ DEPENDS+= p5-SQL-ReservedWords-[0-9]*:../../databases/p5-SQL-ReservedWords DEPENDS+= p5-Time-Clock-[0-9]*:../../time/p5-Time-Clock USE_LANGUAGES= # empty -PERL5_PACKLIST= auto/Rose/DB/.packlist +PERL5_PACKLIST= auto/Rose/DB/.packlist post-extract: ${FIND} ${WRKSRC} -name "*.pm" -type f -exec ${CHMOD} -x {} \; diff --git a/databases/p5-Rose-DBx-Garden-Catalyst/Makefile b/databases/p5-Rose-DBx-Garden-Catalyst/Makefile index 0ebcc92f6fb..214395a30d2 100644 --- a/databases/p5-Rose-DBx-Garden-Catalyst/Makefile +++ b/databases/p5-Rose-DBx-Garden-Catalyst/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2019/08/11 13:18:33 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2019/11/02 15:38:05 rillig Exp $ DISTNAME= Rose-DBx-Garden-Catalyst-0.180 PKGNAME= p5-${DISTNAME} @@ -36,17 +36,17 @@ DEPENDS+= p5-Tree-Simple-VisitorFactory-[0-9]*:../../devel/p5-Tree-Simple-Visito #DEPENDS+= {perl>=5.10,p5-Scalar-List-Utils>=0}:../../devel/p5-Scalar-List-Utils # For tests: -BUILD_DEPENDS+= sqlite3>=0:../../databases/sqlite3 +BUILD_DEPENDS+= sqlite3>=0:../../databases/sqlite3 #BUILD_DEPENDS+= {perl>5.10,p5-IPC-Cmd>=0}:../../devel/p5-IPC-Cmd -SUBST_CLASSES+= sqlite3 +SUBST_CLASSES+= sqlite3 SUBST_MESSAGE.sqlite3= Fixing sqlite3-using test SUBST_STAGE.sqlite3= post-configure SUBST_FILES.sqlite3= t/lib/MyDB.pm SUBST_SED.sqlite3= -e "s!\"sqlite3!\"${PREFIX}/bin/sqlite3!" USE_LANGUAGES= # empty -PERL5_PACKLIST= auto/Rose/DBx/Garden/Catalyst/.packlist +PERL5_PACKLIST= auto/Rose/DBx/Garden/Catalyst/.packlist .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/p5-Rose-DBx-Object-MoreHelpers/Makefile b/databases/p5-Rose-DBx-Object-MoreHelpers/Makefile index 330b093cdf2..c2658d5407e 100644 --- a/databases/p5-Rose-DBx-Object-MoreHelpers/Makefile +++ b/databases/p5-Rose-DBx-Object-MoreHelpers/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2019/08/11 13:18:33 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2019/11/02 15:38:05 rillig Exp $ DISTNAME= Rose-DBx-Object-MoreHelpers-0.100 PKGNAME= p5-${DISTNAME} @@ -16,7 +16,7 @@ DEPENDS+= p5-Rose-DB-Object>=0.770:../../databases/p5-Rose-DB-Object DEPENDS+= p5-Rose-DBx-TestDB-[0-9]*:../../databases/p5-Rose-DBx-TestDB USE_LANGUAGES= # empty -PERL5_PACKLIST= auto/Rose/DBx/Object/MoreHelpers/.packlist +PERL5_PACKLIST= auto/Rose/DBx/Object/MoreHelpers/.packlist .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/p5-Rose-DBx-TestDB/Makefile b/databases/p5-Rose-DBx-TestDB/Makefile index 693e3be1523..337a4e50a9a 100644 --- a/databases/p5-Rose-DBx-TestDB/Makefile +++ b/databases/p5-Rose-DBx-TestDB/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2019/08/11 13:18:33 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2019/11/02 15:38:05 rillig Exp $ DISTNAME= Rose-DBx-TestDB-0.05 PKGNAME= p5-${DISTNAME} @@ -16,7 +16,7 @@ DEPENDS+= p5-Rose-DB-[0-9]*:../../databases/p5-Rose-DB #DEPENDS+= {perl>=5.6.1,p5-File-Temp-[0-9]*}:../../devel/p5-File-Temp USE_LANGUAGES= # empty -PERL5_PACKLIST= auto/Rose/DBx/TestDB/.packlist +PERL5_PACKLIST= auto/Rose/DBx/TestDB/.packlist .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/p5-SQL-Abstract/Makefile b/databases/p5-SQL-Abstract/Makefile index e402990a2a4..d8d3954fdc1 100644 --- a/databases/p5-SQL-Abstract/Makefile +++ b/databases/p5-SQL-Abstract/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2019/08/11 13:18:33 wiz Exp $ +# $NetBSD: Makefile,v 1.45 2019/11/02 15:38:05 rillig Exp $ DISTNAME= SQL-Abstract-1.86 PKGNAME= p5-${DISTNAME} @@ -16,12 +16,12 @@ DEPENDS+= p5-Getopt-Long-Descriptive>=0.091:../../devel/p5-Getopt-Long-Descripti DEPENDS+= p5-Hash-Merge>=0.12:../../devel/p5-Hash-Merge #DEPENDS+= {perl>=5.7.3,p5-Scalar-List-Utils-[0-9]*}:../../devel/p5-Scalar-List-Utils -BUILD_DEPENDS+= p5-Moo-[0-9]*:../../devel/p5-Moo -BUILD_DEPENDS+= p5-Test-Deep>=0.101:../../devel/p5-Test-Deep -BUILD_DEPENDS+= p5-Test-Exception-[0-9]*:../../devel/p5-Test-Exception +BUILD_DEPENDS+= p5-Moo-[0-9]*:../../devel/p5-Moo +BUILD_DEPENDS+= p5-Test-Deep>=0.101:../../devel/p5-Test-Deep +BUILD_DEPENDS+= p5-Test-Exception-[0-9]*:../../devel/p5-Test-Exception #BUILD_DEPENDS+= {perl>=5.10.1,p5-Test-Simple>=0.92}:../../devel/p5-Test-Simple -BUILD_DEPENDS+= p5-Test-Warn-[0-9]*:../../devel/p5-Test-Warn -BUILD_DEPENDS+= p5-Tree-DAG_Node>=0:../../devel/p5-Tree-DAG_Node +BUILD_DEPENDS+= p5-Test-Warn-[0-9]*:../../devel/p5-Test-Warn +BUILD_DEPENDS+= p5-Tree-DAG_Node>=0:../../devel/p5-Tree-DAG_Node PERL5_PACKLIST= auto/SQL/Abstract/.packlist PERL5_MODULE_TYPE= Module::Install::Bundled diff --git a/databases/p5-SQL-Translator/Makefile b/databases/p5-SQL-Translator/Makefile index 6c03e957b30..7c859269e7d 100644 --- a/databases/p5-SQL-Translator/Makefile +++ b/databases/p5-SQL-Translator/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2019/09/15 06:27:08 mef Exp $ +# $NetBSD: Makefile,v 1.38 2019/11/02 15:38:06 rillig Exp $ DISTNAME= SQL-Translator-1.60 PKGNAME= p5-${DISTNAME} @@ -37,15 +37,15 @@ DEPENDS+= p5-XML-LibXML>=1.69:../../textproc/p5-XML-LibXML DEPENDS+= p5-YAML>=0.66:../../textproc/p5-YAML #BUILD_DEPENDS+= {perl>=5.10,p5-PathTools-[0-9]*}:../../devel/p5-PathTools -BUILD_DEPENDS+= p5-Test-Differences-[0-9]*:../../devel/p5-Test-Differences -BUILD_DEPENDS+= p5-Test-Exception-[0-9]*:../../devel/p5-Test-Exception -BUILD_DEPENDS+= p5-XML-Writer>=0.500:../../textproc/p5-XML-Writer +BUILD_DEPENDS+= p5-Test-Differences-[0-9]*:../../devel/p5-Test-Differences +BUILD_DEPENDS+= p5-Test-Exception-[0-9]*:../../devel/p5-Test-Exception +BUILD_DEPENDS+= p5-XML-Writer>=0.500:../../textproc/p5-XML-Writer # for make test -BUILD_DEPENDS+= p5-Text-Diff-[0-9]*:../../textproc/p5-Text-Diff +BUILD_DEPENDS+= p5-Text-Diff-[0-9]*:../../textproc/p5-Text-Diff -USE_LANGUAGES= # empty -PERL5_MODULE_TYPE= Module::Install::Bundled -PERL5_PACKLIST= auto/SQL/Translator/.packlist +USE_LANGUAGES= # empty +PERL5_MODULE_TYPE= Module::Install::Bundled +PERL5_PACKLIST= auto/SQL/Translator/.packlist REPLACE_PERL+= script/* diff --git a/databases/p5-Search-QueryParser/Makefile b/databases/p5-Search-QueryParser/Makefile index 5f4a3c231d8..0e66ee951e4 100644 --- a/databases/p5-Search-QueryParser/Makefile +++ b/databases/p5-Search-QueryParser/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2019/08/11 13:18:34 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2019/11/02 15:38:06 rillig Exp $ DISTNAME= Search-QueryParser-0.94 PKGNAME= p5-${DISTNAME} @@ -9,7 +9,7 @@ MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=../../authors/id/D/DA/DAMI/} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://metacpan.org/release/Search-QueryParser COMMENT= Parses a query string into a data suitable for search engines -LICENSE= ${PERL5_LICENSE} +LICENSE= ${PERL5_LICENSE} PERL5_PACKLIST= auto/Search/QueryParser/.packlist diff --git a/databases/p5-Sort-SQL/Makefile b/databases/p5-Sort-SQL/Makefile index a15c4538517..bd816557da0 100644 --- a/databases/p5-Sort-SQL/Makefile +++ b/databases/p5-Sort-SQL/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2019/08/11 13:18:34 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2019/11/02 15:38:06 rillig Exp $ DISTNAME= Sort-SQL-0.08 PKGNAME= p5-${DISTNAME} @@ -12,7 +12,7 @@ COMMENT= Manipulate SQL sort strings LICENSE= ${PERL5_LICENSE} USE_LANGUAGES= # empty -PERL5_PACKLIST= auto/Sort/SQL/.packlist +PERL5_PACKLIST= auto/Sort/SQL/.packlist .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/p5-qdbm/Makefile b/databases/p5-qdbm/Makefile index 2a2cd45c7a5..8d22e30e1c3 100644 --- a/databases/p5-qdbm/Makefile +++ b/databases/p5-qdbm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2019/08/11 13:18:35 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2019/11/02 15:38:06 rillig Exp $ # PKGREVISION= 5 @@ -14,7 +14,7 @@ LICENSE= gnu-lgpl-v2.1 MAKE_JOBS_SAFE= no -MY_SUBDIR=perl +MY_SUBDIR= perl BUILD_DIRS= ${MY_SUBDIR} CONFIGURE_DIRS= ${MY_SUBDIR} @@ -23,7 +23,7 @@ USE_TOOLS+= perl PERL5_CONFIGURE= no TEST_TARGET= check -PERL5_PACKLIST= auto/Curia/.packlist auto/Depot/.packlist auto/Villa/.packlist +PERL5_PACKLIST= auto/Curia/.packlist auto/Depot/.packlist auto/Villa/.packlist REPLACE_PERL= ${MY_SUBDIR}/curia/plcrtest ${MY_SUBDIR}/depot/pldptest \ ${MY_SUBDIR}/villa/plvltest diff --git a/databases/p5-sybperl/Makefile b/databases/p5-sybperl/Makefile index 4e749f78f5d..061bb84784b 100644 --- a/databases/p5-sybperl/Makefile +++ b/databases/p5-sybperl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2019/08/11 13:18:35 wiz Exp $ +# $NetBSD: Makefile,v 1.39 2019/11/02 15:38:06 rillig Exp $ DISTNAME= sybperl-2.19 PKGNAME= p5-${DISTNAME} @@ -17,13 +17,13 @@ BUILD_DEFS+= SYBASE .if defined(USE_SYBASE_OPENCLIENT) && empty(USE_SYBASE_OPENCLIENT:M[Nn][Oo]) . if defined(SYBASE) || exists(${SYBASE}/lib/libct.so) -BUILDLINK_PASSTHRU_DIRS=${SYBASE} -_SYBASE= ${SYBASE} +BUILDLINK_PASSTHRU_DIRS= ${SYBASE} +_SYBASE= ${SYBASE} . else -PKG_FAIL_REASON+= "You must define SYBASE to the base directory of your Open Client." +PKG_FAIL_REASON+= "You must define SYBASE to the base directory of your Open Client." . endif .else -_SYBASE= ${BUILDLINK_PREFIX.freetds} +_SYBASE= ${BUILDLINK_PREFIX.freetds} .endif PERL5_LDFLAGS+= ${COMPILER_RPATH_FLAG}${_SYBASE}/lib diff --git a/databases/pgocaml/Makefile b/databases/pgocaml/Makefile index 0127ee2654a..3d818478629 100644 --- a/databases/pgocaml/Makefile +++ b/databases/pgocaml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2019/07/04 09:18:37 jaapb Exp $ +# $NetBSD: Makefile,v 1.15 2019/11/02 15:38:06 rillig Exp $ GITHUB_PROJECT= pgocaml GITHUB_TAG= v${PKGVERSION_NOREV} @@ -12,12 +12,12 @@ HOMEPAGE= http://pgocaml.forge.ocamlcore.org/ COMMENT= Native PostgreSQL binding for OCaml LICENSE= gnu-lgpl-v2 -HAS_CONFIGURE= yes -USE_LANGUAGES= c -USE_TOOLS+= gmake +HAS_CONFIGURE= yes +USE_LANGUAGES= c +USE_TOOLS+= gmake CONFIGURE_ARGS+= --disable-p4 -OCAML_USE_OASIS= yes +OCAML_USE_OASIS= yes .include "../../mk/ocaml.mk" .include "../../devel/ocamlbuild/buildlink3.mk" diff --git a/databases/pgpool/Makefile b/databases/pgpool/Makefile index 8852c0b6295..5496dd75059 100644 --- a/databases/pgpool/Makefile +++ b/databases/pgpool/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2017/09/03 08:36:52 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2019/11/02 15:38:06 rillig Exp $ DISTNAME= pgpool-3.4.1 CATEGORIES= databases @@ -10,7 +10,7 @@ COMMENT= Connection pooling/replication server for PostgreSQL GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFDIR:Q} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} INSTALLATION_DIRS= share/examples diff --git a/databases/pgtclng/Makefile b/databases/pgtclng/Makefile index f3281cdb940..6ddbb9386b1 100644 --- a/databases/pgtclng/Makefile +++ b/databases/pgtclng/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2017/09/03 08:36:52 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2019/11/02 15:38:06 rillig Exp $ # VER= 1.5.3 @@ -22,7 +22,7 @@ CONFIGURE_ARGS+= --with-postgres-lib=${PREFIX:Q}/lib CPPFLAGS+= -DUSE_INTERP_ERRORLINE -PGTCLLIBNAME = libpgtcl${VER:C/\.//g}.so +PGTCLLIBNAME = libpgtcl${VER:C/\.//g}.so post-install: cd ${DESTDIR}${PREFIX}/lib && ln -s pgtcl${VER}/${PGTCLLIBNAME} libpgtcl.so diff --git a/databases/php-oci8/Makefile b/databases/php-oci8/Makefile index a8656b2b7be..89e81b69776 100644 --- a/databases/php-oci8/Makefile +++ b/databases/php-oci8/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2016/10/05 22:09:39 jdolecek Exp $ +# $NetBSD: Makefile,v 1.5 2019/11/02 15:38:07 rillig Exp $ MODNAME= oci8 CATEGORIES+= databases @@ -14,10 +14,10 @@ PKG_FAIL_REASON+= "You must set ORACLE_HOME to the location of your Oracle insta PKG_FAIL_REASON+= "The location of ORACLE_HOME does not exist" .endif -BUILDLINK_PASSTHRU_DIRS+= ${ORACLE_HOME} +BUILDLINK_PASSTHRU_DIRS+= ${ORACLE_HOME} CONFIGURE_ARGS+= --with-${MODNAME}=shared,${ORACLE_HOME} -ONLY_FOR_PLATFORM= Linux-*-* SunOS-*-* +ONLY_FOR_PLATFORM= Linux-*-* SunOS-*-* .include "../../lang/php/ext.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/phpldapadmin/Makefile b/databases/phpldapadmin/Makefile index e58e7195947..dff04fada19 100644 --- a/databases/phpldapadmin/Makefile +++ b/databases/phpldapadmin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2015/11/29 11:25:53 taca Exp $ +# $NetBSD: Makefile,v 1.40 2019/11/02 15:38:07 rillig Exp $ DISTNAME= phpldapadmin-${VERSION} PKGREVISION= 1 @@ -24,7 +24,7 @@ USE_TOOLS+= pax VERSION= 1.2.3 NO_BUILD= YES -CONF_FILES+= ${PREFIX}/share/examples/phpldapadmin/config.php.example \ +CONF_FILES+= ${PREFIX}/share/examples/phpldapadmin/config.php.example \ ${PREFIX}/share/phpldapadmin/config/config.php CONF_FILES+= ${PREFIX}/share/examples/phpldapadmin/phpldapadmin.conf \ ${PKG_SYSCONFDIR}/phpldapadmin.conf diff --git a/databases/phppgadmin/Makefile b/databases/phppgadmin/Makefile index aeacbe18432..41b7b25b461 100644 --- a/databases/phppgadmin/Makefile +++ b/databases/phppgadmin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2014/09/17 10:50:15 wiz Exp $ +# $NetBSD: Makefile,v 1.32 2019/11/02 15:38:07 rillig Exp $ DISTNAME= phpPgAdmin-5.1 PKGNAME= ${DISTNAME:S/PgAdmin/pgadmin/} @@ -25,9 +25,9 @@ CONF_FILES= ${EGDIR}/config.inc.php-dist ${PHPPGBASE}/conf/config.inc.php DOC_FILES= CREDITS DEVELOPERS FAQ HISTORY INSTALL LICENSE TODO \ TRANSLATORS -REPLACE_INTERPRETER+= pkgsrc-php -REPLACE.pkgsrc-php.old= .*php -REPLACE.pkgsrc-php.new= ${PREFIX}/bin/php +REPLACE_INTERPRETER+= pkgsrc-php +REPLACE.pkgsrc-php.old= .*php +REPLACE.pkgsrc-php.new= ${PREFIX}/bin/php REPLACE_FILES.pkgsrc-php= build_tests.php do-configure: diff --git a/databases/poco-data-mysql/Makefile b/databases/poco-data-mysql/Makefile index c13722d3bba..dd97afeeef7 100644 --- a/databases/poco-data-mysql/Makefile +++ b/databases/poco-data-mysql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2018/07/04 13:40:13 jperkin Exp $ +# $NetBSD: Makefile,v 1.13 2019/11/02 15:38:07 rillig Exp $ # PKGNAME= poco-data-mysql-${POCO_VERSION} @@ -33,8 +33,8 @@ SUBST_CLASSES+= paths SUBST_MESSAGE.paths= pkgsrc-izing paths SUBST_STAGE.paths= pre-configure SUBST_FILES.paths= Data/MySQL/Makefile -SUBST_SED.paths= -e 's,@MYSQLLIBDIR@,${BUILDLINK_DIR}/${BUILDLINK_LIBDIRS.mysql-client},g' -SUBST_SED.paths+= -e 's,@MYSQLINCDIR@,${BUILDLINK_DIR}/${BUILDLINK_INCDIRS.mysql-client},g' +SUBST_SED.paths= -e 's,@MYSQLLIBDIR@,${BUILDLINK_DIR}/${BUILDLINK_LIBDIRS.mysql-client},g' +SUBST_SED.paths+= -e 's,@MYSQLINCDIR@,${BUILDLINK_DIR}/${BUILDLINK_INCDIRS.mysql-client},g' .include "../../mk/mysql.buildlink3.mk" .include "../../databases/poco-data/buildlink3.mk" diff --git a/databases/postgresql10-contrib/Makefile b/databases/postgresql10-contrib/Makefile index fadce4050d1..7a417f4000d 100644 --- a/databases/postgresql10-contrib/Makefile +++ b/databases/postgresql10-contrib/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.4 2019/03/04 07:21:55 markd Exp $ +# $NetBSD: Makefile,v 1.5 2019/11/02 15:38:07 rillig Exp $ PKGNAME= ${DISTNAME:C/-/10-contrib-/} COMMENT= Contrib subtree of tools and plug-ins .include "../../databases/postgresql10/Makefile.common" -DEPENDS+= postgresql10-server>=${PKGVERSION_NOREV}:../../databases/postgresql10-server +DEPENDS+= postgresql10-server>=${PKGVERSION_NOREV}:../../databases/postgresql10-server BUILD_MAKE_FLAGS= USE_PGXS=1 diff --git a/databases/postgresql10/Makefile.common b/databases/postgresql10/Makefile.common index ec211dfdd22..c135af7c1be 100644 --- a/databases/postgresql10/Makefile.common +++ b/databases/postgresql10/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.16 2019/10/25 12:01:19 triaxx Exp $ +# $NetBSD: Makefile.common,v 1.17 2019/11/02 15:38:07 rillig Exp $ # # This Makefile fragment is included by all PostgreSQL packages built from # the main sources of the PostgreSQL distribution except jdbc-postgresql. @@ -80,8 +80,8 @@ CONFIGURE_ENV+= pgac_cv_prog_cc_ldflags__Wl___as_needed=no .endif # configure fails on OpenBSD and MirBSD if thread safety is enabled. -CONFIGURE_ARGS.MirBSD+= --disable-thread-safety -CONFIGURE_ARGS.OpenBSD+=--disable-thread-safety +CONFIGURE_ARGS.MirBSD+= --disable-thread-safety +CONFIGURE_ARGS.OpenBSD+= --disable-thread-safety # PGSQL_BLCKSZ is the size in bytes of a PostgreSQL disk page or block. # This also limits the size of a tuple. The valid values are powers diff --git a/databases/postgresql11-contrib/Makefile b/databases/postgresql11-contrib/Makefile index 139cc6324fa..b776704db01 100644 --- a/databases/postgresql11-contrib/Makefile +++ b/databases/postgresql11-contrib/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.1 2018/10/23 16:02:52 adam Exp $ +# $NetBSD: Makefile,v 1.2 2019/11/02 15:38:07 rillig Exp $ PKGNAME= ${DISTNAME:C/-/11-contrib-/} COMMENT= Contrib subtree of tools and plug-ins .include "../../databases/postgresql11/Makefile.common" -DEPENDS+= postgresql11-server>=${PKGVERSION_NOREV}:../../databases/postgresql11-server +DEPENDS+= postgresql11-server>=${PKGVERSION_NOREV}:../../databases/postgresql11-server BUILD_MAKE_FLAGS= USE_PGXS=1 diff --git a/databases/postgresql11/Makefile.common b/databases/postgresql11/Makefile.common index 52229dc57d9..5c342cbf9c6 100644 --- a/databases/postgresql11/Makefile.common +++ b/databases/postgresql11/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.9 2019/10/25 08:00:46 triaxx Exp $ +# $NetBSD: Makefile.common,v 1.10 2019/11/02 15:38:07 rillig Exp $ # # This Makefile fragment is included by all PostgreSQL packages built from # the main sources of the PostgreSQL distribution except jdbc-postgresql. @@ -80,8 +80,8 @@ CONFIGURE_ENV+= pgac_cv_prog_cc_ldflags__Wl___as_needed=no .endif # configure fails on OpenBSD and MirBSD if thread safety is enabled. -CONFIGURE_ARGS.MirBSD+= --disable-thread-safety -CONFIGURE_ARGS.OpenBSD+=--disable-thread-safety +CONFIGURE_ARGS.MirBSD+= --disable-thread-safety +CONFIGURE_ARGS.OpenBSD+= --disable-thread-safety # PGSQL_BLCKSZ is the size in bytes of a PostgreSQL disk page or block. # This also limits the size of a tuple. The valid values are powers diff --git a/databases/postgresql12-contrib/Makefile b/databases/postgresql12-contrib/Makefile index 605f081e6f8..946efb64e2e 100644 --- a/databases/postgresql12-contrib/Makefile +++ b/databases/postgresql12-contrib/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.1 2019/10/07 19:21:49 adam Exp $ +# $NetBSD: Makefile,v 1.2 2019/11/02 15:38:08 rillig Exp $ PKGNAME= ${DISTNAME:C/-/12-contrib-/} COMMENT= Contrib subtree of tools and plug-ins .include "../../databases/postgresql12/Makefile.common" -DEPENDS+= postgresql12-server>=${PKGVERSION_NOREV}:../../databases/postgresql12-server +DEPENDS+= postgresql12-server>=${PKGVERSION_NOREV}:../../databases/postgresql12-server BUILD_MAKE_FLAGS= USE_PGXS=1 diff --git a/databases/postgresql12/Makefile.common b/databases/postgresql12/Makefile.common index e249b5174a1..4b94165a9bd 100644 --- a/databases/postgresql12/Makefile.common +++ b/databases/postgresql12/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.2 2019/10/24 07:57:13 triaxx Exp $ +# $NetBSD: Makefile.common,v 1.3 2019/11/02 15:38:07 rillig Exp $ # # This Makefile fragment is included by all PostgreSQL packages built from # the main sources of the PostgreSQL distribution except jdbc-postgresql. @@ -83,8 +83,8 @@ CONFIGURE_ENV+= pgac_cv_prog_cc_ldflags__Wl___as_needed=no .endif # configure fails on OpenBSD and MirBSD if thread safety is enabled. -CONFIGURE_ARGS.MirBSD+= --disable-thread-safety -CONFIGURE_ARGS.OpenBSD+=--disable-thread-safety +CONFIGURE_ARGS.MirBSD+= --disable-thread-safety +CONFIGURE_ARGS.OpenBSD+= --disable-thread-safety # PGSQL_BLCKSZ is the size in bytes of a PostgreSQL disk page or block. # This also limits the size of a tuple. The valid values are powers diff --git a/databases/postgresql94-contrib/Makefile b/databases/postgresql94-contrib/Makefile index edf938aa2d1..f9b1568a9ae 100644 --- a/databases/postgresql94-contrib/Makefile +++ b/databases/postgresql94-contrib/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.3 2018/11/09 18:12:26 adam Exp $ +# $NetBSD: Makefile,v 1.4 2019/11/02 15:38:08 rillig Exp $ PKGNAME= ${DISTNAME:C/-/94-contrib-/} COMMENT= Contrib subtree of tools and plug-ins .include "../../databases/postgresql94/Makefile.common" -DEPENDS+= postgresql94-server>=${PKGVERSION_NOREV}:../../databases/postgresql94-server +DEPENDS+= postgresql94-server>=${PKGVERSION_NOREV}:../../databases/postgresql94-server BUILD_MAKE_FLAGS= USE_PGXS=1 diff --git a/databases/postgresql94/Makefile.common b/databases/postgresql94/Makefile.common index 8da96d41b08..2b66c0c7b7e 100644 --- a/databases/postgresql94/Makefile.common +++ b/databases/postgresql94/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.34 2019/10/31 21:33:35 triaxx Exp $ +# $NetBSD: Makefile.common,v 1.35 2019/11/02 15:38:08 rillig Exp $ # # This Makefile fragment is included by all PostgreSQL packages built from # the main sources of the PostgreSQL distribution except jdbc-postgresql. @@ -84,14 +84,14 @@ CONFIGURE_ENV+= pgac_cv_prog_cc_ldflags__Wl___as_needed=no .endif # configure fails on OpenBSD and MirBSD if thread safety is enabled. -CONFIGURE_ARGS.MirBSD+= --disable-thread-safety -CONFIGURE_ARGS.OpenBSD+=--disable-thread-safety +CONFIGURE_ARGS.MirBSD+= --disable-thread-safety +CONFIGURE_ARGS.OpenBSD+= --disable-thread-safety # PGSQL_BLCKSZ is the size in bytes of a PostgreSQL disk page or block. # This also limits the size of a tuple. The valid values are powers # of 2 up to 32768, and the default size is 8196. Please don't change # this value unless you know what you are doing. -BUILD_DEFS+= PGSQL_BLCKSZ +BUILD_DEFS+= PGSQL_BLCKSZ .if defined(PGSQL_BLCKSZ) CONFIGURE_ARGS+= --with-blocksize=${PGSQL_BLCKSZ} .endif diff --git a/databases/postgresql95-contrib/Makefile b/databases/postgresql95-contrib/Makefile index c9691a293e8..d9a6f444715 100644 --- a/databases/postgresql95-contrib/Makefile +++ b/databases/postgresql95-contrib/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.5 2018/11/09 18:12:26 adam Exp $ +# $NetBSD: Makefile,v 1.6 2019/11/02 15:38:08 rillig Exp $ PKGNAME= ${DISTNAME:C/-/95-contrib-/} COMMENT= Contrib subtree of tools and plug-ins .include "../../databases/postgresql95/Makefile.common" -DEPENDS+= postgresql95-server>=${PKGVERSION_NOREV}:../../databases/postgresql95-server +DEPENDS+= postgresql95-server>=${PKGVERSION_NOREV}:../../databases/postgresql95-server BUILD_MAKE_FLAGS= USE_PGXS=1 diff --git a/databases/postgresql95/Makefile.common b/databases/postgresql95/Makefile.common index 2a838a8d984..5d5321200d9 100644 --- a/databases/postgresql95/Makefile.common +++ b/databases/postgresql95/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.27 2019/10/07 19:28:29 adam Exp $ +# $NetBSD: Makefile.common,v 1.28 2019/11/02 15:38:08 rillig Exp $ # # This Makefile fragment is included by all PostgreSQL packages built from # the main sources of the PostgreSQL distribution except jdbc-postgresql. @@ -84,14 +84,14 @@ CONFIGURE_ENV+= pgac_cv_prog_cc_ldflags__Wl___as_needed=no .endif # configure fails on OpenBSD and MirBSD if thread safety is enabled. -CONFIGURE_ARGS.MirBSD+= --disable-thread-safety -CONFIGURE_ARGS.OpenBSD+=--disable-thread-safety +CONFIGURE_ARGS.MirBSD+= --disable-thread-safety +CONFIGURE_ARGS.OpenBSD+= --disable-thread-safety # PGSQL_BLCKSZ is the size in bytes of a PostgreSQL disk page or block. # This also limits the size of a tuple. The valid values are powers # of 2 up to 32768, and the default size is 8196. Please don't change # this value unless you know what you are doing. -BUILD_DEFS+= PGSQL_BLCKSZ +BUILD_DEFS+= PGSQL_BLCKSZ .if defined(PGSQL_BLCKSZ) CONFIGURE_ARGS+= --with-blocksize=${PGSQL_BLCKSZ} .endif diff --git a/databases/postgresql96-contrib/Makefile b/databases/postgresql96-contrib/Makefile index 698147d11dc..a92869e73c3 100644 --- a/databases/postgresql96-contrib/Makefile +++ b/databases/postgresql96-contrib/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.5 2018/11/09 18:12:27 adam Exp $ +# $NetBSD: Makefile,v 1.6 2019/11/02 15:38:08 rillig Exp $ PKGNAME= ${DISTNAME:C/-/96-contrib-/} COMMENT= Contrib subtree of tools and plug-ins .include "../../databases/postgresql96/Makefile.common" -DEPENDS+= postgresql96-server>=${PKGVERSION_NOREV}:../../databases/postgresql96-server +DEPENDS+= postgresql96-server>=${PKGVERSION_NOREV}:../../databases/postgresql96-server BUILD_MAKE_FLAGS= USE_PGXS=1 diff --git a/databases/postgresql96/Makefile.common b/databases/postgresql96/Makefile.common index 3d32796b705..17893063a4d 100644 --- a/databases/postgresql96/Makefile.common +++ b/databases/postgresql96/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.21 2019/10/07 19:28:29 adam Exp $ +# $NetBSD: Makefile.common,v 1.22 2019/11/02 15:38:08 rillig Exp $ # # This Makefile fragment is included by all PostgreSQL packages built from # the main sources of the PostgreSQL distribution except jdbc-postgresql. @@ -84,14 +84,14 @@ CONFIGURE_ENV+= pgac_cv_prog_cc_ldflags__Wl___as_needed=no .endif # configure fails on OpenBSD and MirBSD if thread safety is enabled. -CONFIGURE_ARGS.MirBSD+= --disable-thread-safety -CONFIGURE_ARGS.OpenBSD+=--disable-thread-safety +CONFIGURE_ARGS.MirBSD+= --disable-thread-safety +CONFIGURE_ARGS.OpenBSD+= --disable-thread-safety # PGSQL_BLCKSZ is the size in bytes of a PostgreSQL disk page or block. # This also limits the size of a tuple. The valid values are powers # of 2 up to 32768, and the default size is 8196. Please don't change # this value unless you know what you are doing. -BUILD_DEFS+= PGSQL_BLCKSZ +BUILD_DEFS+= PGSQL_BLCKSZ .if defined(PGSQL_BLCKSZ) CONFIGURE_ARGS+= --with-blocksize=${PGSQL_BLCKSZ} .endif diff --git a/databases/pxtools/Makefile b/databases/pxtools/Makefile index 9d572373ba2..0a56a3722ce 100644 --- a/databases/pxtools/Makefile +++ b/databases/pxtools/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.16 2012/10/02 21:25:48 asau Exp $ +# $NetBSD: Makefile,v 1.17 2019/11/02 15:38:08 rillig Exp $ # -DISTNAME= pxtools-0.0.20 +DISTNAME= pxtools-0.0.20 PKGREVISION= 3 -CATEGORIES= databases -MASTER_SITES= http://jan.kneschke.de/projects/pxtools/download/ +CATEGORIES= databases +MASTER_SITES= http://jan.kneschke.de/projects/pxtools/download/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://jan.kneschke.de/projects/pxtools/ diff --git a/databases/py-PgSQL/Makefile b/databases/py-PgSQL/Makefile index 7e44bcddf73..192dc93aa55 100644 --- a/databases/py-PgSQL/Makefile +++ b/databases/py-PgSQL/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2019/09/02 13:19:47 adam Exp $ +# $NetBSD: Makefile,v 1.32 2019/11/02 15:38:08 rillig Exp $ DISTNAME= pyPgSQL-2.4 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//} @@ -11,7 +11,7 @@ HOMEPAGE= http://pypgsql.sourceforge.net/ COMMENT= Python DB-API 2.0 compliant interface to PostgreSQL WRKSRC= ${WRKDIR}/pypgsql -PYTHON_VERSIONS_ACCEPTED= 27 # py-mxDateTime +PYTHON_VERSIONS_ACCEPTED= 27 # py-mxDateTime .include "../../lang/python/application.mk" .include "../../lang/python/distutils.mk" diff --git a/databases/py-carbon/Makefile b/databases/py-carbon/Makefile index 6d636c6dea9..a18fe2c7c2c 100644 --- a/databases/py-carbon/Makefile +++ b/databases/py-carbon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2019/09/02 13:19:47 adam Exp $ +# $NetBSD: Makefile,v 1.10 2019/11/02 15:38:09 rillig Exp $ DISTNAME= carbon-0.9.15 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -16,7 +16,7 @@ DEPENDS+= ${PYPKGPREFIX}-whisper>=${PKGVERSION_NOREV}:../../databases/py-whisper USE_LANGUAGES= # none -PYTHON_VERSIONS_ACCEPTED= 27 # py-whisper +PYTHON_VERSIONS_ACCEPTED= 27 # py-whisper .include "../../mk/bsd.prefs.mk" .include "options.mk" @@ -27,12 +27,12 @@ RCD_SCRIPTS= carbon-aggregator carbon-cache carbon-relay FILES_SUBST+= GRAPHITE_USER=${GRAPHITE_USER} GRAPHITE_GROUP=${GRAPHITE_GROUP} \ GRAPHITE_DIR=${GRAPHITE_DIR} -OWN_DIRS_PERMS+= ${GRAPHITE_DIR} ${WWW_USER} ${GRAPHITE_GROUP} 0775 -OWN_DIRS_PERMS+= ${GRAPHITE_DIR}/lists ${GRAPHITE_USER} ${GRAPHITE_GROUP} 0755 -OWN_DIRS_PERMS+= ${GRAPHITE_DIR}/rrd ${GRAPHITE_USER} ${GRAPHITE_GROUP} 0755 -OWN_DIRS_PERMS+= ${GRAPHITE_DIR}/whisper ${GRAPHITE_USER} ${GRAPHITE_GROUP} 0755 -OWN_DIRS_PERMS+= ${GRAPHITE_LOG_DIR} ${GRAPHITE_USER} ${GRAPHITE_GROUP} 0755 -OWN_DIRS_PERMS+= ${VARBASE}/run/graphite ${GRAPHITE_USER} ${GRAPHITE_GROUP} 0755 +OWN_DIRS_PERMS+= ${GRAPHITE_DIR} ${WWW_USER} ${GRAPHITE_GROUP} 0775 +OWN_DIRS_PERMS+= ${GRAPHITE_DIR}/lists ${GRAPHITE_USER} ${GRAPHITE_GROUP} 0755 +OWN_DIRS_PERMS+= ${GRAPHITE_DIR}/rrd ${GRAPHITE_USER} ${GRAPHITE_GROUP} 0755 +OWN_DIRS_PERMS+= ${GRAPHITE_DIR}/whisper ${GRAPHITE_USER} ${GRAPHITE_GROUP} 0755 +OWN_DIRS_PERMS+= ${GRAPHITE_LOG_DIR} ${GRAPHITE_USER} ${GRAPHITE_GROUP} 0755 +OWN_DIRS_PERMS+= ${VARBASE}/run/graphite ${GRAPHITE_USER} ${GRAPHITE_GROUP} 0755 SUBST_CLASSES+= dirs @@ -43,11 +43,11 @@ SUBST_VARS.dirs= GRAPHITE_DIR GRAPHITE_EGDIR GRAPHITE_USER PREFIX \ PKG_SYSCONFDIR VARBASE # NetBSD has posix_fallocate in libc, but fs can't actually use it. -SUBST_CLASSES.NetBSD+= fallocate -SUBST_STAGE.fallocate= pre-configure -SUBST_MESSAGE.fallocate=Patching for NetBSD defaults -SUBST_FILES.fallocate= conf/carbon.conf.example -SUBST_SED.fallocate= -e 's,^\(WHISPER_FALLOCATE_CREATE *= *\)\(.*\),\1False,' +SUBST_CLASSES.NetBSD+= fallocate +SUBST_STAGE.fallocate= pre-configure +SUBST_MESSAGE.fallocate= Patching for NetBSD defaults +SUBST_FILES.fallocate= conf/carbon.conf.example +SUBST_SED.fallocate= -e 's,^\(WHISPER_FALLOCATE_CREATE *= *\)\(.*\),\1False,' PKG_SYSCONFSUBDIR= graphite diff --git a/databases/py-carbon/options.mk b/databases/py-carbon/options.mk index d30d9f49d6e..546ad0cefe2 100644 --- a/databases/py-carbon/options.mk +++ b/databases/py-carbon/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.6 2019/09/02 13:19:47 adam Exp $ +# $NetBSD: options.mk,v 1.7 2019/11/02 15:38:09 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.py-carbon PKG_SUPPORTED_OPTIONS= amqp ldap memcached @@ -18,7 +18,7 @@ DEPENDS+= ${PYPKGPREFIX}-txamqp-[0-9]*:../../net/py-txamqp ### .if !empty(PKG_OPTIONS:Mldap) DEPENDS+= ${PYPKGPREFIX}-ldap-[0-9]*:../../databases/py-ldap -PYTHON_VERSIONS_ACCEPTED= 27 # py-ldap +PYTHON_VERSIONS_ACCEPTED= 27 # py-ldap .endif ### @@ -26,5 +26,5 @@ PYTHON_VERSIONS_ACCEPTED= 27 # py-ldap ### .if !empty(PKG_OPTIONS:Mmemcached) DEPENDS+= ${PYPKGPREFIX}-memcached-[0-9]*:../../devel/py-memcached -PYTHON_VERSIONS_ACCEPTED= 27 # py-memcached +PYTHON_VERSIONS_ACCEPTED= 27 # py-memcached .endif diff --git a/databases/py-cassa/Makefile b/databases/py-cassa/Makefile index 2cfcd977ce7..f7811f6b454 100644 --- a/databases/py-cassa/Makefile +++ b/databases/py-cassa/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2019/09/02 13:19:48 adam Exp $ +# $NetBSD: Makefile,v 1.16 2019/11/02 15:38:09 rillig Exp $ DISTNAME= pycassa-0.3.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/^py//} @@ -10,7 +10,7 @@ HOMEPAGE= https://github.com/pycassa/pycassa COMMENT= Python client library for Cassandra PYDISTUTILSPKG= yes -PYTHON_VERSIONS_ACCEPTED= 27 +PYTHON_VERSIONS_ACCEPTED= 27 .include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/py-couchdb/Makefile b/databases/py-couchdb/Makefile index c599b184300..d3fd1fcc181 100644 --- a/databases/py-couchdb/Makefile +++ b/databases/py-couchdb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2019/09/02 13:19:48 adam Exp $ +# $NetBSD: Makefile,v 1.13 2019/11/02 15:38:09 rillig Exp $ DISTNAME= CouchDB-0.9 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} @@ -13,7 +13,7 @@ LICENSE= modified-bsd DEPENDS+= ${PYPKGPREFIX}-simplejson>=2.0.9:../../converters/py-simplejson DEPENDS+= ${PYPKGPREFIX}-httplib2>=0.5.0:../../www/py-httplib2 -PYTHON_VERSIONS_ACCEPTED= 27 +PYTHON_VERSIONS_ACCEPTED= 27 USE_LANGUAGES= # none diff --git a/databases/py-cx_Oracle/Makefile b/databases/py-cx_Oracle/Makefile index 019198e6b74..50f6ae08479 100644 --- a/databases/py-cx_Oracle/Makefile +++ b/databases/py-cx_Oracle/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2013/04/06 12:08:38 rodent Exp $ +# $NetBSD: Makefile,v 1.4 2019/11/02 15:38:09 rillig Exp $ # DISTNAME= cx_Oracle-5.0.2 @@ -22,7 +22,7 @@ PKG_FAIL_REASON+= "The location of ORACLE_HOME does not exist" BUILDLINK_PASSTHRU_DIRS+= ${ORACLE_HOME} BUILDLINK_PASSTHRU_RPATHDIRS+= ${ORACLE_HOME} -LDFLAGS+= -Wl,-rpath,${ORACLE_HOME}/lib +LDFLAGS+= -Wl,-rpath,${ORACLE_HOME}/lib ALL_ENV+= ORACLE_HOME=${ORACLE_HOME:Q} diff --git a/databases/py-datapkg/Makefile b/databases/py-datapkg/Makefile index 4047b0ab329..35ba97b143a 100644 --- a/databases/py-datapkg/Makefile +++ b/databases/py-datapkg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2019/09/02 13:19:47 adam Exp $ +# $NetBSD: Makefile,v 1.19 2019/11/02 15:38:09 rillig Exp $ DISTNAME= datapkg-0.9 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -13,7 +13,7 @@ LICENSE= mit DEPENDS+= ${PYPKGPREFIX}-ckanclient>=0.3:../../databases/py-ckanclient CONFLICTS= datapkg-[0-9]* -PYTHON_VERSIONS_ACCEPTED= 27 # py-ckanclient +PYTHON_VERSIONS_ACCEPTED= 27 # py-ckanclient .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/py-elixir/Makefile b/databases/py-elixir/Makefile index baf87241cd5..bcfe8e92f04 100644 --- a/databases/py-elixir/Makefile +++ b/databases/py-elixir/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2019/09/02 13:19:47 adam Exp $ +# $NetBSD: Makefile,v 1.17 2019/11/02 15:38:09 rillig Exp $ DISTNAME= Elixir-0.7.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -16,7 +16,7 @@ DEPENDS+= ${PYPKGPREFIX}-crypto-[0-9]*:../../security/py-crypto USE_LANGUAGES= # none -PYTHON_VERSIONS_ACCEPTED= 27 # py-sqlite2 +PYTHON_VERSIONS_ACCEPTED= 27 # py-sqlite2 .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/py-gdbm/Makefile b/databases/py-gdbm/Makefile index 8f646fcf548..7f8e6f6da75 100644 --- a/databases/py-gdbm/Makefile +++ b/databases/py-gdbm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2018/01/28 20:10:45 wiz Exp $ +# $NetBSD: Makefile,v 1.39 2019/11/02 15:38:09 rillig Exp $ PKGNAME= ${PYPKGPREFIX}-gdbm-${PY_DISTVERSION} PKGREVISION= 1 @@ -18,12 +18,12 @@ GDBM_MODNAME= gdbm .endif EXTRACT_ELEMENTS= ${PYSUBDIR}/Modules/${GDBM_MODNAME}module.c -PYDISTUTILSPKG= yes -PY_PATCHPLIST= yes +PYDISTUTILSPKG= yes +PY_PATCHPLIST= yes -PY_SETUP_SUBST+= GDBMPREFIX=${BUILDLINK_PREFIX.gdbm} -PY_SETUP_SUBST+= GDBM_MODNAME=${GDBM_MODNAME} -PLIST_SUBST+= GDBM_MODNAME=${GDBM_MODNAME} +PY_SETUP_SUBST+= GDBMPREFIX=${BUILDLINK_PREFIX.gdbm} +PY_SETUP_SUBST+= GDBM_MODNAME=${GDBM_MODNAME} +PLIST_SUBST+= GDBM_MODNAME=${GDBM_MODNAME} PYSETUPINSTALLARGS+= --install-lib ${PREFIX}/${PYLIB}/lib-dynload # ignore errors due to missing files (EXTRACT_ELEMENTS!) diff --git a/databases/py-metakit/Makefile b/databases/py-metakit/Makefile index 32dc8a29e47..18d51ea8e09 100644 --- a/databases/py-metakit/Makefile +++ b/databases/py-metakit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2019/09/02 13:19:46 adam Exp $ +# $NetBSD: Makefile,v 1.37 2019/11/02 15:38:09 rillig Exp $ DISTNAME= metakit-2.4.9.7 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -12,16 +12,16 @@ COMMENT= Embedded database library PATCHDIR= ${.CURDIR}/../metakit-lib/patches DISTINFO_FILE= ${.CURDIR}/../metakit-lib/distinfo -GNU_CONFIGURE= yes -CONFIGURE_DIRS= builds -CONFIGURE_SCRIPT= ../unix/configure -CONFIGURE_ARGS+= --with-python=${LOCALBASE}/${PYINC},${LOCALBASE}/${PYSITELIB} -USE_LANGUAGES= c c++03 -USE_LIBTOOL= yes -BUILD_TARGET= python -INSTALL_TARGET= install-python -MAKE_ENV+= PYINC=${LOCALBASE}/${PYINC} PYSITELIB=${LOCALBASE}/${PYSITELIB} -PY_PATCHPLIST= yes +GNU_CONFIGURE= yes +CONFIGURE_DIRS= builds +CONFIGURE_SCRIPT= ../unix/configure +CONFIGURE_ARGS+= --with-python=${LOCALBASE}/${PYINC},${LOCALBASE}/${PYSITELIB} +USE_LANGUAGES= c c++03 +USE_LIBTOOL= yes +BUILD_TARGET= python +INSTALL_TARGET= install-python +MAKE_ENV+= PYINC=${LOCALBASE}/${PYINC} PYSITELIB=${LOCALBASE}/${PYSITELIB} +PY_PATCHPLIST= yes PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 2.4.9.7 INSTALLATION_DIRS+= ${PYSITELIB} diff --git a/databases/py-sqlite/Makefile b/databases/py-sqlite/Makefile index a6d7848c35f..8dbbcb23aaf 100644 --- a/databases/py-sqlite/Makefile +++ b/databases/py-sqlite/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2019/09/02 13:19:48 adam Exp $ +# $NetBSD: Makefile,v 1.29 2019/11/02 15:38:09 rillig Exp $ DISTNAME= pysqlite-1.0.1 PKGNAME= ${PYPKGPREFIX}-sqlite-1.0.1 @@ -12,7 +12,7 @@ COMMENT= SQLite database adapter for Python WRKSRC= ${WRKDIR}/pysqlite -PYTHON_VERSIONS_ACCEPTED= 27 # py-mxDateTime +PYTHON_VERSIONS_ACCEPTED= 27 # py-mxDateTime .include "../../databases/sqlite/buildlink3.mk" .include "../../lang/python/distutils.mk" diff --git a/databases/py-sqlite3/Makefile b/databases/py-sqlite3/Makefile index 23ccdf5ee00..5b9e6e03436 100644 --- a/databases/py-sqlite3/Makefile +++ b/databases/py-sqlite3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2019/04/03 00:32:32 ryoon Exp $ +# $NetBSD: Makefile,v 1.35 2019/11/02 15:38:10 rillig Exp $ PKGNAME= ${PYPKGPREFIX}-sqlite3-${PY_DISTVERSION} PKGREVISION= 15 @@ -15,7 +15,7 @@ EXTRACT_ELEMENTS= ${PYSUBDIR}/Modules/_sqlite # part of python itself; using distutils.mk will install a useless egg PYDISTUTILSPKG= yes -PY_SETUP_SUBST+= SQLITE_PREFIX=${BUILDLINK_PREFIX.sqlite3} +PY_SETUP_SUBST+= SQLITE_PREFIX=${BUILDLINK_PREFIX.sqlite3} PYSETUPINSTALLARGS+= --install-lib ${PREFIX}/${PYLIB}/lib-dynload # ignore errors due to missing files (EXTRACT_ELEMENTS!) diff --git a/databases/py-table/Makefile b/databases/py-table/Makefile index 00f5f602c71..285a3d53468 100644 --- a/databases/py-table/Makefile +++ b/databases/py-table/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2019/09/02 13:19:46 adam Exp $ +# $NetBSD: Makefile,v 1.24 2019/11/02 15:38:10 rillig Exp $ DISTNAME= pytable-0.8.3a PKGNAME= ${PYPKGPREFIX}-table-0.8.3a @@ -13,7 +13,7 @@ COMMENT= Python RDBMS wrapper for various databases DEPENDS+= ${PYPKGPREFIX}-basicproperty-[0-9]*:../../lang/py-basicproperty # py-basicproperty isn't compatible to 3.x -PYTHON_VERSIONS_ACCEPTED= 27 +PYTHON_VERSIONS_ACCEPTED= 27 USE_LANGUAGES= # none diff --git a/databases/qdbm-plus/Makefile b/databases/qdbm-plus/Makefile index 2f395b3ad8c..f382df5a8a4 100644 --- a/databases/qdbm-plus/Makefile +++ b/databases/qdbm-plus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2019/07/11 09:25:25 nia Exp $ +# $NetBSD: Makefile,v 1.11 2019/11/02 15:38:10 rillig Exp $ # .include "../../databases/qdbm/Makefile.common" @@ -17,7 +17,7 @@ CONFIGURE_DIRS= ${MY_SUBDIR} GNU_CONFIGURE= yes USE_LANGUAGES= c c++ -TEST_TARGET= check +TEST_TARGET= check .include "../../databases/qdbm/buildlink3.mk" .if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} != "none" diff --git a/databases/qdbm/buildlink3.mk b/databases/qdbm/buildlink3.mk index 068853accdf..cfaa69dc273 100644 --- a/databases/qdbm/buildlink3.mk +++ b/databases/qdbm/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.12 2018/01/07 13:03:59 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2019/11/02 15:38:10 rillig Exp $ BUILDLINK_TREE+= qdbm @@ -12,9 +12,9 @@ BUILDLINK_PKGSRCDIR.qdbm?= ../../databases/qdbm .include "../../mk/pthread.buildlink3.mk" .if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} != "none" -CONFIGURE_ARGS+= --enable-pthread -BUILDLINK_CFLAGS.qdbm+= ${PTHREAD_CFLAGS} -BUILDLINK_LDFLAGS.qdbm+=${PTHREAD_LDFLAGS} +CONFIGURE_ARGS+= --enable-pthread +BUILDLINK_CFLAGS.qdbm+= ${PTHREAD_CFLAGS} +BUILDLINK_LDFLAGS.qdbm+= ${PTHREAD_LDFLAGS} .endif .include "../../archivers/bzip2/buildlink3.mk" diff --git a/databases/qore-freetds-module/Makefile b/databases/qore-freetds-module/Makefile index 4dd39da8c97..43ae4357d16 100644 --- a/databases/qore-freetds-module/Makefile +++ b/databases/qore-freetds-module/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2019/07/20 22:46:14 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2019/11/02 15:38:10 rillig Exp $ DISTNAME= qore-sybase-modules-1.0.4 PKGNAME= ${DISTNAME:S/sybase-modules/freetds-module/} @@ -20,8 +20,8 @@ USE_LANGUAGES= c c++11 USE_TOOLS+= pax PTHREAD_OPTS+= require -CONFIGURE_ARGS+=--with-sybase=no -CONFIGURE_ARGS+=--with-libsuffix="" +CONFIGURE_ARGS+= --with-sybase=no +CONFIGURE_ARGS+= --with-libsuffix="" INSTALLATION_DIRS+= share/doc/${PKGBASE} post-install: diff --git a/databases/qore-freetds-module/options.mk b/databases/qore-freetds-module/options.mk index e82daffc0d8..de0e859c3eb 100644 --- a/databases/qore-freetds-module/options.mk +++ b/databases/qore-freetds-module/options.mk @@ -1,11 +1,11 @@ -# $NetBSD: options.mk,v 1.1 2014/12/30 15:41:23 wiz Exp $ +# $NetBSD: options.mk,v 1.2 2019/11/02 15:38:10 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.qore 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/databases/qore-mysql-module/Makefile b/databases/qore-mysql-module/Makefile index f022efe585e..ab73267d8af 100644 --- a/databases/qore-mysql-module/Makefile +++ b/databases/qore-mysql-module/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2018/06/08 19:25:39 nros Exp $ +# $NetBSD: Makefile,v 1.8 2019/11/02 15:38:10 rillig Exp $ DISTNAME= qore-mysql-module-2.0.2.1 CATEGORIES= databases @@ -18,7 +18,7 @@ USE_LANGUAGES= c c++11 USE_TOOLS+= gmake pax PTHREAD_OPTS+= native -CONFIGURE_ARGS+=--with-libsuffix="" +CONFIGURE_ARGS+= --with-libsuffix="" #install docs INSTALLATION_DIRS+= share/doc/${PKGBASE} diff --git a/databases/qore-mysql-module/options.mk b/databases/qore-mysql-module/options.mk index d8c0818192b..a3ebe723289 100644 --- a/databases/qore-mysql-module/options.mk +++ b/databases/qore-mysql-module/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2014/12/30 15:42:24 wiz Exp $ +# $NetBSD: options.mk,v 1.2 2019/11/02 15:38:10 rillig Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.qore-mysql-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/databases/qore-openldap-module/Makefile b/databases/qore-openldap-module/Makefile index 197c7551bda..c0d7cab5e93 100644 --- a/databases/qore-openldap-module/Makefile +++ b/databases/qore-openldap-module/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.7 2018/06/08 20:49:41 nros Exp $ +# $NetBSD: Makefile,v 1.8 2019/11/02 15:38:10 rillig Exp $ DISTNAME= qore-openldap-module-1.1 PKGREVISION= 3 CATEGORIES= databases -MASTER_SITES= ${MASTER_SITE_GITHUB:=qorelanguage/} -EXTRACT_SUFX= .tar.bz2 +MASTER_SITES= ${MASTER_SITE_GITHUB:=qorelanguage/} +EXTRACT_SUFX= .tar.bz2 GITHUB_PROJECT= module-openldap 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="" #install docs INSTALLATION_DIRS+=share/doc/${PKGBASE} diff --git a/databases/qore-openldap-module/options.mk b/databases/qore-openldap-module/options.mk index 34aa2f1bac7..9287e657821 100644 --- a/databases/qore-openldap-module/options.mk +++ b/databases/qore-openldap-module/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2014/12/30 15:43:31 wiz Exp $ +# $NetBSD: options.mk,v 1.2 2019/11/02 15:38:10 rillig Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.qore-openldap-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/databases/qore-pgsql-module/Makefile b/databases/qore-pgsql-module/Makefile index 0deb2f4d2b0..25f4d984c87 100644 --- a/databases/qore-pgsql-module/Makefile +++ b/databases/qore-pgsql-module/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2018/06/08 19:04:49 nros Exp $ +# $NetBSD: Makefile,v 1.9 2019/11/02 15:38:10 rillig Exp $ DISTNAME= qore-pgsql-module-2.4.1 CATEGORIES= databases @@ -18,7 +18,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/databases/qore-pgsql-module/options.mk b/databases/qore-pgsql-module/options.mk index 153f52e33fd..a55b8537175 100644 --- a/databases/qore-pgsql-module/options.mk +++ b/databases/qore-pgsql-module/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2014/12/30 15:44:25 wiz Exp $ +# $NetBSD: options.mk,v 1.2 2019/11/02 15:38:10 rillig Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.qore-pgsql-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/databases/qore-sqlite3-module/Makefile b/databases/qore-sqlite3-module/Makefile index ca92d7e65e8..0a7c7b68d75 100644 --- a/databases/qore-sqlite3-module/Makefile +++ b/databases/qore-sqlite3-module/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.20 2019/04/03 00:32:32 ryoon Exp $ +# $NetBSD: Makefile,v 1.21 2019/11/02 15:38:10 rillig Exp $ DISTNAME= qore-sqlite3-module-1.0.1 PKGREVISION= 20 CATEGORIES= databases -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qore/} +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qore/} MAINTAINER= nros@NetBSD.org HOMEPAGE= http://www.qore.org/ @@ -15,7 +15,7 @@ USE_LIBTOOL= yes USE_LANGUAGES= c c++11 PTHREAD_OPTS+= native -CONFIGURE_ARGS+=--with-sqlite3=${BUILDLINK_PREFIX.sqlite3} +CONFIGURE_ARGS+= --with-sqlite3=${BUILDLINK_PREFIX.sqlite3} INSTALLATION_DIRS+= share/doc/${PKGBASE} post-install: diff --git a/databases/qore-sqlite3-module/options.mk b/databases/qore-sqlite3-module/options.mk index 24c2f88ad17..925a8366191 100644 --- a/databases/qore-sqlite3-module/options.mk +++ b/databases/qore-sqlite3-module/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2014/12/30 15:45:04 wiz Exp $ +# $NetBSD: options.mk,v 1.2 2019/11/02 15:38:10 rillig Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.qore-sqlite3-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/databases/redis/Makefile b/databases/redis/Makefile index 72a6507fe74..34ed63a88df 100644 --- a/databases/redis/Makefile +++ b/databases/redis/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2019/05/19 07:56:38 adam Exp $ +# $NetBSD: Makefile,v 1.45 2019/11/02 15:38:11 rillig Exp $ DISTNAME= redis-5.0.5 CATEGORIES= databases @@ -35,20 +35,20 @@ REDIS_PIDDIR?= ${VARBASE}/run OWN_DIRS_PERMS+= ${REDIS_DATADIR} ${REDIS_USER} ${REDIS_GROUP} 0770 OWN_DIRS_PERMS+= ${REDIS_LOGDIR} ${REDIS_USER} ${REDIS_GROUP} 0770 -PKG_GROUPS+= ${REDIS_GROUP} -PKG_USERS+= ${REDIS_USER}:${REDIS_GROUP} -PKG_GECOS.${REDIS_USER}=Redis daemon user -PKG_HOME.${REDIS_USER}= ${REDIS_DBDIR} +PKG_GROUPS+= ${REDIS_GROUP} +PKG_USERS+= ${REDIS_USER}:${REDIS_GROUP} +PKG_GECOS.${REDIS_USER}= Redis daemon user +PKG_HOME.${REDIS_USER}= ${REDIS_DBDIR} FILES_SUBST+= REDIS_USER=${REDIS_USER} FILES_SUBST+= REDIS_GROUP=${REDIS_GROUP} FILES_SUBST+= REDIS_DATADIR=${REDIS_DATADIR} -SUBST_CLASSES+= fix-paths -SUBST_STAGE.fix-paths= pre-configure -SUBST_MESSAGE.fix-paths=Fixing paths. -SUBST_FILES.fix-paths= redis.conf -SUBST_VARS.fix-paths= REDIS_DATADIR REDIS_LOGDIR REDIS_PIDDIR +SUBST_CLASSES+= fix-paths +SUBST_STAGE.fix-paths= pre-configure +SUBST_MESSAGE.fix-paths= Fixing paths. +SUBST_FILES.fix-paths= redis.conf +SUBST_VARS.fix-paths= REDIS_DATADIR REDIS_LOGDIR REDIS_PIDDIR CHECK_PORTABILITY_SKIP+= deps/jemalloc/configure diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile index ece3fdad841..312c0998e0d 100644 --- a/databases/rrdtool/Makefile +++ b/databases/rrdtool/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.135 2019/08/11 13:18:36 wiz Exp $ +# $NetBSD: Makefile,v 1.136 2019/11/02 15:38:11 rillig Exp $ PKGREVISION= 1 .include "Makefile.common" @@ -42,10 +42,10 @@ post-install: RRDCACHED_USER?= rrdcached RRDCACHED_GROUP?= ${RRDCACHED_USER} -PKG_USERS_VARS= RRDCACHED_USER -PKG_GROUPS_VARS= RRDCACHED_GROUP -PKG_GROUPS= ${RRDCACHED_GROUP} -PKG_USERS= ${RRDCACHED_USER}:${RRDCACHED_GROUP} +PKG_USERS_VARS= RRDCACHED_USER +PKG_GROUPS_VARS= RRDCACHED_GROUP +PKG_GROUPS= ${RRDCACHED_GROUP} +PKG_USERS= ${RRDCACHED_USER}:${RRDCACHED_GROUP} PKG_GECOS.${RRDCACHED_USER}= RRDCacheD daemon user OPSYSVARS+= SOEXT diff --git a/databases/ruby-awesome_nested_set/Makefile b/databases/ruby-awesome_nested_set/Makefile index 5eaa106be12..5c36118fc37 100644 --- a/databases/ruby-awesome_nested_set/Makefile +++ b/databases/ruby-awesome_nested_set/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2018/12/17 14:34:16 taca Exp $ +# $NetBSD: Makefile,v 1.12 2019/11/02 15:38:11 rillig Exp $ DISTNAME= awesome_nested_set-3.1.4 PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME} @@ -12,7 +12,7 @@ LICENSE= mit DEPENDS+= ${RUBY_ACTIVERECORD_DEPENDS} RUBY_RAILS_ACCEPTED= 42 51 -USE_LANGUAGES= # none +USE_LANGUAGES= # none .include "../../lang/ruby/gem.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/ruby-odbc/Makefile b/databases/ruby-odbc/Makefile index 7cea213ac13..ef1552f5827 100644 --- a/databases/ruby-odbc/Makefile +++ b/databases/ruby-odbc/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.17 2018/05/05 14:14:35 taca Exp $ +# $NetBSD: Makefile,v 1.18 2019/11/02 15:38:11 rillig Exp $ DISTNAME= ruby-odbc-0.99999 PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME:S/ruby-//} CATEGORIES= databases MASTER_SITES= http://www.ch-werner.de/rubyodbc/ # needs EXTRACT_SUFX since DISTFILE isn't Ruby's gem format. -EXTRACT_SUFX= .tar.gz +EXTRACT_SUFX= .tar.gz MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.ch-werner.de/rubyodbc/ diff --git a/databases/ruby-vapor/Makefile b/databases/ruby-vapor/Makefile index 096e78ba281..63c6ffbcb7f 100644 --- a/databases/ruby-vapor/Makefile +++ b/databases/ruby-vapor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2016/10/09 21:41:58 wiz Exp $ +# $NetBSD: Makefile,v 1.29 2019/11/02 15:38:11 rillig Exp $ DISTNAME= vapor-0.81 PKGREVISION= 10 @@ -15,7 +15,7 @@ CONFLICTS+= ruby[1-9][0-9]-vapor-* DEPENDS+= ${RUBY_PKGPREFIX}-dbd-pg>=0.0.20:../../databases/ruby-dbd-pg USE_TOOLS= pax -USE_RUBY_SETUP= yes +USE_RUBY_SETUP= yes RUBY_SETUP= install.rb REPLACE_RUBY= doc/examples/university/createperson \ doc/examples/university/createuni \ diff --git a/databases/sql-workbench/Makefile b/databases/sql-workbench/Makefile index ae585139966..5408fbca0ed 100644 --- a/databases/sql-workbench/Makefile +++ b/databases/sql-workbench/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2019/10/10 13:32:04 gdt Exp $ +# $NetBSD: Makefile,v 1.7 2019/11/02 15:38:11 rillig Exp $ DISTNAME= Workbench-Build124 PKGNAME= sql-workbench-124 @@ -11,8 +11,8 @@ HOMEPAGE= http://www.sql-workbench.net/ COMMENT= JDBC-based cross-platform SQL query tool # Apache, except not granted to certain entities -LICENSE= generic-nonlicense -RESTRICTED= Some entities are not permitted to use/download. +LICENSE= generic-nonlicense +RESTRICTED= Some entities are not permitted to use/download. NO_SRC_ON_FTP= ${RESTRICTED} NO_BIN_ON_FTP= ${RESTRICTED} NO_SRC_ON_CDROM= ${RESTRICTED} diff --git a/databases/sqlrelay-odbc/Makefile b/databases/sqlrelay-odbc/Makefile index 8417e79e5d7..7ac35347d2a 100644 --- a/databases/sqlrelay-odbc/Makefile +++ b/databases/sqlrelay-odbc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2019/08/22 12:22:59 ryoon Exp $ +# $NetBSD: Makefile,v 1.21 2019/11/02 15:38:11 rillig Exp $ PKGNAME= ${DISTNAME:S/sqlrelay/sqlrelay-odbc/} PKGREVISION= 9 @@ -9,14 +9,14 @@ COMMENT= ODBC support for SQL Relay LICENSE= gnu-lgpl-v2 CONFIGURE_ARGS+= --with-odbc-prefix=${BUILDLINK_PREFIX.unixodbc} -CONFIGURE_ARGS+= --disable-postgresql -CONFIGURE_ARGS+= --disable-sqlite -CONFIGURE_ARGS+= --disable-freetds -CONFIGURE_ARGS+= --disable-mysql +CONFIGURE_ARGS+= --disable-postgresql +CONFIGURE_ARGS+= --disable-sqlite +CONFIGURE_ARGS+= --disable-freetds +CONFIGURE_ARGS+= --disable-mysql -BUILD_DIRS= src/connections +BUILD_DIRS= src/connections -INSTALLATION_DIRS+= libexec/sqlrelay +INSTALLATION_DIRS+= libexec/sqlrelay do-install: ${LIBTOOL} --mode=install ${INSTALL_LIB} \ diff --git a/databases/tokyocabinet/Makefile b/databases/tokyocabinet/Makefile index 8d8ea57c401..35e96defb16 100644 --- a/databases/tokyocabinet/Makefile +++ b/databases/tokyocabinet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2019/07/11 09:25:26 nia Exp $ +# $NetBSD: Makefile,v 1.46 2019/11/02 15:38:11 rillig Exp $ # DISTNAME= tokyocabinet-1.4.48 @@ -10,10 +10,10 @@ HOMEPAGE= https://fallabs.com/tokyocabinet/ COMMENT= Modern implementation of DBM LICENSE= gnu-lgpl-v2.1 -GNU_CONFIGURE= yes -USE_GCC_RUNTIME=yes -USE_TOOLS+= gmake pkg-config -USE_LANGUAGES= c99 +GNU_CONFIGURE= yes +USE_GCC_RUNTIME= yes +USE_TOOLS+= gmake pkg-config +USE_LANGUAGES= c99 PKGCONFIG_OVERRIDE+= tokyocabinet.pc.in diff --git a/databases/tokyocabinet/options.mk b/databases/tokyocabinet/options.mk index 23621721ee1..0b6dfd59b07 100644 --- a/databases/tokyocabinet/options.mk +++ b/databases/tokyocabinet/options.mk @@ -1,11 +1,11 @@ -# $NetBSD: options.mk,v 1.1 2009/12/19 12:56:45 obache Exp $ +# $NetBSD: options.mk,v 1.2 2019/11/02 15:38:11 rillig Exp $ # -PKG_OPTIONS_VAR= PKG_OPTIONS.tokyocabinet -PKG_SUPPORTED_OPTIONS= zlib bzip2 +PKG_OPTIONS_VAR= PKG_OPTIONS.tokyocabinet +PKG_SUPPORTED_OPTIONS= zlib bzip2 PKG_OPTIONS_OPTIONAL_GROUPS= codec PKG_OPTIONS_GROUP.codec= lzma lzo -PKG_SUGGESTED_OPTIONS= zlib bzip2 +PKG_SUGGESTED_OPTIONS= zlib bzip2 .include "../../mk/bsd.options.mk" diff --git a/databases/tokyotyrant/Makefile b/databases/tokyotyrant/Makefile index ad25e4c9ab5..d652108dc8c 100644 --- a/databases/tokyotyrant/Makefile +++ b/databases/tokyotyrant/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2019/07/11 09:25:26 nia Exp $ +# $NetBSD: Makefile,v 1.38 2019/11/02 15:38:12 rillig Exp $ # DISTNAME= tokyotyrant-1.1.41 @@ -11,9 +11,9 @@ HOMEPAGE= https://fallabs.com/tokyotyrant/ COMMENT= Network interface of Tokyo Cabinet LICENSE= gnu-lgpl-v2.1 -GNU_CONFIGURE= yes -USE_GCC_RUNTIME=yes -USE_TOOLS+= gmake pkg-config +GNU_CONFIGURE= yes +USE_GCC_RUNTIME= yes +USE_TOOLS+= gmake pkg-config PKGCONFIG_OVERRIDE+= tokyotyrant.pc.in diff --git a/databases/virtuoso/Makefile b/databases/virtuoso/Makefile index 5062603d01d..5d7430bd21e 100644 --- a/databases/virtuoso/Makefile +++ b/databases/virtuoso/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2019/07/21 22:24:35 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2019/11/02 15:38:12 rillig Exp $ # DISTNAME= virtuoso-opensource-6.1.6 @@ -11,13 +11,13 @@ HOMEPAGE= https://virtuoso.openlinksw.com/ COMMENT= Universal SQL/Application server LICENSE= gnu-gpl-v2 # with exemptions -GNU_CONFIGURE= yes +GNU_CONFIGURE= yes CONFIGURE_ARGS+= --without-jdk2 --without-jdk3 --without-jdk4 \ --with-iodbc=${PREFIX} \ --with-layout=pkgsrc --localstatedir=${PREFIX} -USE_TOOLS+= pkg-config gmake -USE_LANGUAGES= c c++ -USE_LIBTOOL= yes +USE_TOOLS+= pkg-config gmake +USE_LANGUAGES= c c++ +USE_LIBTOOL= yes PKGCONFIG_OVERRIDE+= libsrc/zlib/zlib.pc.in diff --git a/databases/virtuoso/options.mk b/databases/virtuoso/options.mk index 98edbe1462e..67ea7ff50f6 100644 --- a/databases/virtuoso/options.mk +++ b/databases/virtuoso/options.mk @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.1 2013/04/13 13:16:02 jaapb Exp $ +# $NetBSD: options.mk,v 1.2 2019/11/02 15:38:12 rillig Exp $ -PKG_OPTIONS_VAR= PKG_OPTIONS.virtuoso -PKG_SUPPORTED_OPTIONS= imagemagick ldap +PKG_OPTIONS_VAR= PKG_OPTIONS.virtuoso +PKG_SUPPORTED_OPTIONS= imagemagick ldap .include "../../mk/bsd.prefs.mk" .include "../../mk/bsd.options.mk" diff --git a/databases/yasql/Makefile b/databases/yasql/Makefile index bca1cd121c5..a70b7ab40f3 100644 --- a/databases/yasql/Makefile +++ b/databases/yasql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2019/08/11 13:18:37 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2019/11/02 15:38:12 rillig Exp $ DISTNAME= yasql-1.81 PKGREVISION= 9 @@ -17,7 +17,7 @@ USE_TOOLS+= perl:run GNU_CONFIGURE= yes NO_BUILD= yes -CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFDIR:Q} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONF_FILES+= ${PREFIX}/share/examples/yasql/yasql.conf \ ${PKG_SYSCONFDIR}/yasql.conf |