Received: by mail.netbsd.org (Postfix, from userid 605) id 5D5C584E07; Sat, 27 Jan 2018 19:07:50 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id DD23C84E05 for ; Sat, 27 Jan 2018 19:07:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 1Z-yHHwjpzUI for ; Sat, 27 Jan 2018 19:07:48 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 6599B84C2E for ; Sat, 27 Jan 2018 19:07:48 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 60885FBDE; Sat, 27 Jan 2018 19:07:48 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_151708006859930" MIME-Version: 1.0 Date: Sat, 27 Jan 2018 19:07:48 +0000 From: "Roland Illig" Subject: CVS commit: pkgsrc/pkgtools To: pkgsrc-changes@NetBSD.org Reply-To: rillig@netbsd.org X-Mailer: log_accum Message-Id: <20180127190748.60885FBDE@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_151708006859930 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: rillig Date: Sat Jan 27 19:07:48 UTC 2018 Modified Files: pkgsrc/pkgtools/bootstrap-mk-files: Makefile pkgsrc/pkgtools/gensolpkg: Makefile pkgsrc/pkgtools/gnome-packagekit: Makefile pkgsrc/pkgtools/libkver: Makefile pkgsrc/pkgtools/mksandbox: Makefile pkgsrc/pkgtools/nih: Makefile pkgsrc/pkgtools/p5-pkgsrc-Dewey: Makefile pkgsrc/pkgtools/packagekit: Makefile pkgsrc/pkgtools/pkg: Makefile pkgsrc/pkgtools/pkg_filecheck: Makefile pkgsrc/pkgtools/pkg_install: Makefile pkgsrc/pkgtools/pkg_install-info: hacks.mk pkgsrc/pkgtools/pkg_leaves: Makefile pkgsrc/pkgtools/pkg_p5up2date: Makefile pkgsrc/pkgtools/pkg_tarup: Makefile pkgsrc/pkgtools/pkgse: Makefile pkgsrc/pkgtools/x11-links: builtin.mk version.mk xfree.mk xorg-version.mk xorg.mk Log Message: pkgtools/*: Realign variables in Makefiles Mainly done by pkglint, manually reviewed and improved in some few cases. To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 pkgsrc/pkgtools/bootstrap-mk-files/Makefile cvs rdiff -u -r1.22 -r1.23 pkgsrc/pkgtools/gensolpkg/Makefile cvs rdiff -u -r1.63 -r1.64 pkgsrc/pkgtools/gnome-packagekit/Makefile cvs rdiff -u -r1.37 -r1.38 pkgsrc/pkgtools/libkver/Makefile cvs rdiff -u -r1.12 -r1.13 pkgsrc/pkgtools/mksandbox/Makefile cvs rdiff -u -r1.24 -r1.25 pkgsrc/pkgtools/nih/Makefile cvs rdiff -u -r1.30 -r1.31 pkgsrc/pkgtools/p5-pkgsrc-Dewey/Makefile cvs rdiff -u -r1.61 -r1.62 pkgsrc/pkgtools/packagekit/Makefile cvs rdiff -u -r1.21 -r1.22 pkgsrc/pkgtools/pkg/Makefile cvs rdiff -u -r1.42 -r1.43 pkgsrc/pkgtools/pkg_filecheck/Makefile cvs rdiff -u -r1.222 -r1.223 pkgsrc/pkgtools/pkg_install/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/pkgtools/pkg_install-info/hacks.mk cvs rdiff -u -r1.7 -r1.8 pkgsrc/pkgtools/pkg_leaves/Makefile cvs rdiff -u -r1.15 -r1.16 pkgsrc/pkgtools/pkg_p5up2date/Makefile cvs rdiff -u -r1.41 -r1.42 pkgsrc/pkgtools/pkg_tarup/Makefile cvs rdiff -u -r1.15 -r1.16 pkgsrc/pkgtools/pkgse/Makefile cvs rdiff -u -r1.7 -r1.8 pkgsrc/pkgtools/x11-links/builtin.mk cvs rdiff -u -r1.5 -r1.6 pkgsrc/pkgtools/x11-links/version.mk cvs rdiff -u -r1.17 -r1.18 pkgsrc/pkgtools/x11-links/xfree.mk cvs rdiff -u -r1.3 -r1.4 pkgsrc/pkgtools/x11-links/xorg-version.mk cvs rdiff -u -r1.28 -r1.29 pkgsrc/pkgtools/x11-links/xorg.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_151708006859930 Content-Disposition: inline Content-Length: 20938 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/pkgtools/bootstrap-mk-files/Makefile diff -u pkgsrc/pkgtools/bootstrap-mk-files/Makefile:1.53 pkgsrc/pkgtools/bootstrap-mk-files/Makefile:1.54 --- pkgsrc/pkgtools/bootstrap-mk-files/Makefile:1.53 Wed Aug 2 09:38:06 2017 +++ pkgsrc/pkgtools/bootstrap-mk-files/Makefile Sat Jan 27 19:07:46 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.53 2017/08/02 09:38:06 maya Exp $ +# $NetBSD: Makefile,v 1.54 2018/01/27 19:07:46 rillig Exp $ PKGNAME= bootstrap-mk-files-20170802 CATEGORIES= pkgtools @@ -11,7 +11,7 @@ COMMENT= *.mk files for the bootstrap bm LICENSE= original-bsd NO_PKGTOOLS_REQD_CHECK= # defined -BOOTSTRAP_PKG= yes +BOOTSTRAP_PKG= yes NO_BUILD= yes Index: pkgsrc/pkgtools/gensolpkg/Makefile diff -u pkgsrc/pkgtools/gensolpkg/Makefile:1.22 pkgsrc/pkgtools/gensolpkg/Makefile:1.23 --- pkgsrc/pkgtools/gensolpkg/Makefile:1.22 Tue Sep 11 23:19:35 2012 +++ pkgsrc/pkgtools/gensolpkg/Makefile Sat Jan 27 19:07:46 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2012/09/11 23:19:35 asau Exp $ +# $NetBSD: Makefile,v 1.23 2018/01/27 19:07:46 rillig Exp $ # DISTNAME= gensolpkg-1.10 @@ -16,8 +16,8 @@ ONLY_FOR_PLATFORM= SunOS-*-* # uses Sola INSTALLATION_DIRS= sbin ${PKGMANDIR}/man1 -MAKE_ENV+= CPPFLAGS="" CC=${CC:Q} -MAKEFLAGS+= PREFIX=${PREFIX} +MAKE_ENV+= CPPFLAGS="" CC=${CC:Q} +MAKEFLAGS+= PREFIX=${PREFIX} INSTALL_MAKE_FLAGS+= PREFIX=${DESTDIR}${PREFIX} .include "../../mk/bsd.pkg.mk" Index: pkgsrc/pkgtools/gnome-packagekit/Makefile diff -u pkgsrc/pkgtools/gnome-packagekit/Makefile:1.63 pkgsrc/pkgtools/gnome-packagekit/Makefile:1.64 --- pkgsrc/pkgtools/gnome-packagekit/Makefile:1.63 Thu Nov 30 16:45:36 2017 +++ pkgsrc/pkgtools/gnome-packagekit/Makefile Sat Jan 27 19:07:46 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.63 2017/11/30 16:45:36 adam Exp $ +# $NetBSD: Makefile,v 1.64 2018/01/27 19:07:46 rillig Exp $ DISTNAME= gnome-packagekit-0.4.0 PKGREVISION= 49 @@ -10,10 +10,10 @@ HOMEPAGE= http://www.packagekit.org/ COMMENT= GNOME frontend for PackageKit LICENSE= gnu-gpl-v2 -GNU_CONFIGURE= yes -USE_LIBTOOL= yes -USE_TOOLS+= pkg-config gmake intltool perl msgfmt -USE_PKGLOCALEDIR= yes +GNU_CONFIGURE= yes +USE_LIBTOOL= yes +USE_TOOLS+= pkg-config gmake intltool perl msgfmt +USE_PKGLOCALEDIR= yes GCONF_SCHEMAS+= gnome-packagekit.schemas @@ -21,10 +21,10 @@ PY_PATCHPLIST= yes PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # not yet ported as of 0.4.0 # needed for gnome-packagekit-0.4 and gtk2-2.20 -- remove on next update -BUILDLINK_TRANSFORM+= rm:-DG_DISABLE_DEPRECATED -BUILDLINK_TRANSFORM+= rm:-DGDK_DISABLE_DEPRECATED -BUILDLINK_TRANSFORM+= rm:-DGDK_PIXBUF_DISABLE_DEPRECATED -BUILDLINK_TRANSFORM+= rm:-DGTK_DISABLE_DEPRECATED +BUILDLINK_TRANSFORM+= rm:-DG_DISABLE_DEPRECATED +BUILDLINK_TRANSFORM+= rm:-DGDK_DISABLE_DEPRECATED +BUILDLINK_TRANSFORM+= rm:-DGDK_PIXBUF_DISABLE_DEPRECATED +BUILDLINK_TRANSFORM+= rm:-DGTK_DISABLE_DEPRECATED BUILDLINK_API_DEPENDS.glib2+= glib2>=2.30.0 .include "../../devel/GConf/schemas.mk" Index: pkgsrc/pkgtools/libkver/Makefile diff -u pkgsrc/pkgtools/libkver/Makefile:1.37 pkgsrc/pkgtools/libkver/Makefile:1.38 --- pkgsrc/pkgtools/libkver/Makefile:1.37 Sat Aug 19 00:22:00 2017 +++ pkgsrc/pkgtools/libkver/Makefile Sat Jan 27 19:07:46 2018 @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.37 2017/08/19 00:22:00 jlam Exp $ +# $NetBSD: Makefile,v 1.38 2018/01/27 19:07:46 rillig Exp $ PKGNAME= libkver-${VERSION} CATEGORIES= pkgtools -MAINTAINER= seb@NetBSD.org +MAINTAINER= seb@NetBSD.org #HOMEPAGE= -COMMENT= Shared library and sysctl(1) replacement to override system version +COMMENT= Shared library and sysctl(1) replacement to override system version .include "../../mk/bsd.prefs.mk" @@ -20,9 +20,9 @@ ONLY_FOR_PLATFORM= NetBSD-*-* BUILDLINK_PASSTHRU_DIRS= ${BSDSRCDIR}/sys -PLIST_VARS= sysctl -LDD_SYSCTL!= ldd /sbin/sysctl 2>&1 || ${TRUE} -MAKE_ENV+= LDD_SYSCTL=${LDD_SYSCTL:Q} # save another ldd run +PLIST_VARS= sysctl +LDD_SYSCTL!= ldd /sbin/sysctl 2>&1 || ${TRUE} +MAKE_ENV+= LDD_SYSCTL=${LDD_SYSCTL:Q} # save another ldd run .if empty(LDD_SYSCTL:M*libc*) PLIST.sysctl= yes FILES_SUBST+= HAS_SYSCTL=true @@ -30,11 +30,11 @@ FILES_SUBST+= HAS_SYSCTL=true FILES_SUBST+= HAS_SYSCTL=false .endif -SUBST_CLASSES+= paths -SUBST_FILES.paths= kver/kver.sh kver/kver.8 lib/kver.3 -SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g' -SUBST_SED.paths+= -e 's,@SH@,${SH},g' -SUBST_STAGE.paths= post-patch +SUBST_CLASSES+= paths +SUBST_FILES.paths= kver/kver.sh kver/kver.8 lib/kver.3 +SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g' +SUBST_SED.paths+= -e 's,@SH@,${SH},g' +SUBST_STAGE.paths= post-patch INSTALLATION_DIRS+= sbin ${PKGMANDIR}/man8 ${PKGMANDIR}/cat8 INSTALLATION_DIRS+= lib ${PKGMANDIR}/man3 ${PKGMANDIR}/cat3 Index: pkgsrc/pkgtools/mksandbox/Makefile diff -u pkgsrc/pkgtools/mksandbox/Makefile:1.12 pkgsrc/pkgtools/mksandbox/Makefile:1.13 --- pkgsrc/pkgtools/mksandbox/Makefile:1.12 Fri Oct 14 12:50:07 2016 +++ pkgsrc/pkgtools/mksandbox/Makefile Sat Jan 27 19:07:46 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2016/10/14 12:50:07 jperkin Exp $ +# $NetBSD: Makefile,v 1.13 2018/01/27 19:07:46 rillig Exp $ PKGNAME= mksandbox-1.7 CATEGORIES= pkgtools @@ -8,10 +8,10 @@ HOMEPAGE= http://www.NetBSD.org/docs/pkg COMMENT= Tool for creating sandboxes LICENSE= 2-clause-bsd -WRKSRC= ${WRKDIR} -NO_BUILD= yes -NO_CHECKSUM= yes -USE_LANGUAGES= # none +WRKSRC= ${WRKDIR} +NO_BUILD= yes +NO_CHECKSUM= yes +USE_LANGUAGES= # none INSTALLATION_DIRS= sbin ${PKGMANDIR}/man8 do-extract: Index: pkgsrc/pkgtools/nih/Makefile diff -u pkgsrc/pkgtools/nih/Makefile:1.24 pkgsrc/pkgtools/nih/Makefile:1.25 --- pkgsrc/pkgtools/nih/Makefile:1.24 Thu Jan 19 18:52:21 2017 +++ pkgsrc/pkgtools/nih/Makefile Sat Jan 27 19:07:47 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2017/01/19 18:52:21 agc Exp $ +# $NetBSD: Makefile,v 1.25 2018/01/27 19:07:47 rillig Exp $ DISTNAME= pkgnih-0.14.1 PKGNAME= ${DISTNAME:S/pkgnih/nih/} @@ -34,7 +34,7 @@ REPLACE_INTERPRETER+= runawk REPLACE.runawk.old= .*runawk REPLACE.runawk.new= ${PREFIX}/bin/runawk REPLACE_FILES.runawk= nih/pkg_update_plan.in nih/cmp2hr.in \ - nih/pkg_create_fake.in nih/analyse_conflicts.in + nih/pkg_create_fake.in nih/analyse_conflicts.in MAKE_ENV+= PKG_DBDIR=${PKG_DBDIR} MAKE_ENV+= REAL_ROOT_USER=${REAL_ROOT_USER} @@ -44,13 +44,13 @@ MAKE_ENV+= REAL_ROOT_GROUP=${REAL_ROOT_ .if ${OPSYS} == NetBSD || ${OPSYS} == FreeBSD || ${OPSYS} == OpenBSD || \ ${OPSYS} == DragonFly || ${OPSYS} == MirBSD -FTP_CMD=/usr/bin/ftp +FTP_CMD= /usr/bin/ftp .else -FTP_CMD=${PREFIX}/bin/ftp +FTP_CMD= ${PREFIX}/bin/ftp DEPENDS+= tnftp-[0-9]*:../../net/tnftp .endif -MAKE_ENV+= FTP=${FTP_CMD:Q} PKG_TOOLS_BIN=${PKG_TOOLS_BIN} +MAKE_ENV+= FTP=${FTP_CMD:Q} PKG_TOOLS_BIN=${PKG_TOOLS_BIN} .if ${OPSYS} =="SunOS" #&& empty(OS_VERSION:M5.11*) REPLACE_SH+= nih/nih.in nih/pkg_status.in Index: pkgsrc/pkgtools/p5-pkgsrc-Dewey/Makefile diff -u pkgsrc/pkgtools/p5-pkgsrc-Dewey/Makefile:1.30 pkgsrc/pkgtools/p5-pkgsrc-Dewey/Makefile:1.31 --- pkgsrc/pkgtools/p5-pkgsrc-Dewey/Makefile:1.30 Mon Jun 5 14:24:26 2017 +++ pkgsrc/pkgtools/p5-pkgsrc-Dewey/Makefile Sat Jan 27 19:07:47 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2017/06/05 14:24:26 ryoon Exp $ +# $NetBSD: Makefile,v 1.31 2018/01/27 19:07:47 rillig Exp $ PKGNAME= p5-pkgsrc-Dewey-1.1 PKGREVISION= 8 @@ -9,7 +9,7 @@ HOMEPAGE= http://www.NetBSD.org/docs/pkg COMMENT= Perl module to compare pkgsrc Dewey numbers LICENSE= ${PERL5_LICENSE} OR 2-clause-bsd -CPPFLAGS+= -DHAVE_CTYPE_H -DHAVE_STDLIB_H -DHAVE_STRING_H +CPPFLAGS+= -DHAVE_CTYPE_H -DHAVE_STDLIB_H -DHAVE_STRING_H CPPFLAGS.NetBSD+= -DHAVE_ERR_H CPPFLAGS.Linux+= -fPIC Index: pkgsrc/pkgtools/packagekit/Makefile diff -u pkgsrc/pkgtools/packagekit/Makefile:1.61 pkgsrc/pkgtools/packagekit/Makefile:1.62 --- pkgsrc/pkgtools/packagekit/Makefile:1.61 Thu Nov 30 16:45:07 2017 +++ pkgsrc/pkgtools/packagekit/Makefile Sat Jan 27 19:07:47 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.61 2017/11/30 16:45:07 adam Exp $ +# $NetBSD: Makefile,v 1.62 2018/01/27 19:07:47 rillig Exp $ DISTNAME= PackageKit-0.4.0 PKGREVISION= 44 @@ -35,8 +35,8 @@ CONF_FILES+= ${EGDIR}/org.freedesktop.Pa CONF_FILES+= ${EGDIR}/org.freedesktop.PackageKitTestBackend.conf \ ${PKG_SYSCONFDIR}/dbus-1/system.d/org.freedesktop.PackageKitTestBackend.conf -CHECK_INTERPRETER_SKIP+= lib/pm-utils/sleep.d/95packagekit \ - share/PackageKit/helpers/test_spawn/search-name.sh +CHECK_INTERPRETER_SKIP+= lib/pm-utils/sleep.d/95packagekit \ + share/PackageKit/helpers/test_spawn/search-name.sh CONFIGURE_ARGS+= --disable-qt CONFIGURE_ARGS+= --with-security-framework=polkit Index: pkgsrc/pkgtools/pkg/Makefile diff -u pkgsrc/pkgtools/pkg/Makefile:1.21 pkgsrc/pkgtools/pkg/Makefile:1.22 --- pkgsrc/pkgtools/pkg/Makefile:1.21 Sat Aug 19 00:24:13 2017 +++ pkgsrc/pkgtools/pkg/Makefile Sat Jan 27 19:07:47 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2017/08/19 00:24:13 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2018/01/27 19:07:47 rillig Exp $ DISTNAME= pkg-1.9.99.4 PKGREVISION= 1 @@ -22,7 +22,7 @@ CPPFLAGS+= -DDEFAULT_VULNXML_URL="\"http CFLAGS+= -DSYSCONFDIR=\"${PKG_SYSCONFDIR}\" .if defined(DEBUG_PKGNG) -CFLAGS:= ${CFLAGS:N-O2} -ggdb -O0 +CFLAGS:= ${CFLAGS:N-O2} -ggdb -O0 _STRIPFLAG_INSTALL= # don't strip .endif @@ -50,7 +50,7 @@ OWN_DIRS= ${PKG_SYSCONFDIR}/bash_complet ${PKG_SYSCONFDIR}/periodic/security \ ${PKG_SYSCONFDIR}/periodic/weekly -SUBST_CLASSES+= manpages-prefix +SUBST_CLASSES+= manpages-prefix SUBST_STAGE.manpages-prefix= pre-install SUBST_FILES.manpages-prefix= docs/pkg-install.8 docs/pkg-repo.8 SUBST_FILES.manpages-prefix+= docs/pkg-search.8 docs/pkg-update.8 @@ -59,7 +59,7 @@ SUBST_FILES.manpages-prefix+= docs/pkg.c SUBST_SED.manpages-prefix+= -e "s|/usr/local|${PREFIX}|g" SUBST_MESSAGE.manpages-prefix= Correct the installation prefix in manual pages. -SUBST_CLASSES+= pkgconf-prefix +SUBST_CLASSES+= pkgconf-prefix SUBST_STAGE.pkgconf-prefix= pre-install SUBST_FILES.pkgconf-prefix= src/pkg.conf.sample SUBST_SED.pkgconf-prefix+= -e "s|/usr/local|${PREFIX}|g" Index: pkgsrc/pkgtools/pkg_filecheck/Makefile diff -u pkgsrc/pkgtools/pkg_filecheck/Makefile:1.42 pkgsrc/pkgtools/pkg_filecheck/Makefile:1.43 --- pkgsrc/pkgtools/pkg_filecheck/Makefile:1.42 Sat Jul 9 06:38:48 2016 +++ pkgsrc/pkgtools/pkg_filecheck/Makefile Sat Jan 27 19:07:47 2018 @@ -1,28 +1,28 @@ -# $NetBSD: Makefile,v 1.42 2016/07/09 06:38:48 wiz Exp $ +# $NetBSD: Makefile,v 1.43 2018/01/27 19:07:47 rillig Exp $ # -PKGNAME= pkg_filecheck-0.4 -PKGREVISION= 6 -CATEGORIES= pkgtools devel - -MAINTAINER= pkgsrc-users@NetBSD.org -#HOMEPAGE= http://www.NetBSD.org/docs/pkgsrc/ -COMMENT= Check for files not owned by any package -LICENSE= modified-bsd AND 2-clause-bsd +PKGNAME= pkg_filecheck-0.4 +PKGREVISION= 6 +CATEGORIES= pkgtools devel + +MAINTAINER= pkgsrc-users@NetBSD.org +#HOMEPAGE= http://www.NetBSD.org/docs/pkgsrc/ +COMMENT= Check for files not owned by any package +LICENSE= modified-bsd AND 2-clause-bsd WRKSRC= ${WRKDIR} USE_TOOLS+= perl:run USE_FEATURES= fts_open -USE_FEATURES+= nbcompat -NBCOMPAT_CONFIGURE_ARGS+= --enable-db - +USE_FEATURES+= nbcompat +NBCOMPAT_CONFIGURE_ARGS+= --enable-db + FILES_SUBST+= PKG_DBDIR=${PKG_DBDIR:Q} CONF_FILES= ${PREFIX}/share/examples/pkg_filecheck/pkg_filecheck.conf \ ${PKG_SYSCONFDIR}/pkg_filecheck.conf -INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 \ - share/examples/pkg_filecheck +INSTALLATION_DIRS= \ + bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 share/examples/pkg_filecheck SUBST_CLASSES+= paths SUBST_FILES.paths= builddb.pl builddb.1 pkg_filecheck.conf Index: pkgsrc/pkgtools/pkg_install/Makefile diff -u pkgsrc/pkgtools/pkg_install/Makefile:1.222 pkgsrc/pkgtools/pkg_install/Makefile:1.223 --- pkgsrc/pkgtools/pkg_install/Makefile:1.222 Thu Jul 27 18:54:44 2017 +++ pkgsrc/pkgtools/pkg_install/Makefile Sat Jan 27 19:07:47 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.222 2017/07/27 18:54:44 tnn Exp $ +# $NetBSD: Makefile,v 1.223 2018/01/27 19:07:47 rillig Exp $ # Notes to package maintainers: # @@ -14,7 +14,7 @@ HOMEPAGE= http://www.pkgsrc.org/ COMMENT= Package management and administration tools for pkgsrc LICENSE= modified-bsd -BOOTSTRAP_PKG= yes +BOOTSTRAP_PKG= yes SKIP_LICENSE_CHECK= yes CONFLICTS+= audit-packages-[0-9]* @@ -145,8 +145,8 @@ LIBARCHIVE_CONFIGURE_ARGS+= --without-lz . endif LIBARCHIVE_LIBS= ${SED} -n -e 's/^Libs.private://p' \ - ${WRKDIR}/libarchive/build/pkgconfig/libarchive.pc 2>/dev/null || echo -LIBS+= ${LIBARCHIVE_LIBS:sh} + ${WRKDIR}/libarchive/build/pkgconfig/libarchive.pc 2>/dev/null || echo +LIBS+= ${LIBARCHIVE_LIBS:sh} CONFIG_GUESS_OVERRIDE+= ${WRKDIR}/libarchive/build/autoconf/config.guess \ ${WRKSRC}/config.guess Index: pkgsrc/pkgtools/pkg_install-info/hacks.mk diff -u pkgsrc/pkgtools/pkg_install-info/hacks.mk:1.1 pkgsrc/pkgtools/pkg_install-info/hacks.mk:1.2 --- pkgsrc/pkgtools/pkg_install-info/hacks.mk:1.1 Sun Dec 24 14:07:55 2006 +++ pkgsrc/pkgtools/pkg_install-info/hacks.mk Sat Jan 27 19:07:47 2018 @@ -1,4 +1,4 @@ -# $NetBSD: hacks.mk,v 1.1 2006/12/24 14:07:55 schwarz Exp $ +# $NetBSD: hacks.mk,v 1.2 2018/01/27 19:07:47 rillig Exp $ .if !defined(PKG_INSTALL-INFO_HACKS_MK) PKG_INSTALL-INFO_HACKS_MK= #defined @@ -8,7 +8,7 @@ PKG_INSTALL-INFO_HACKS_MK= #defined ### see http://gcc.gnu.org/ml/gcc-bugs/2004-03/msg02604.html ### . if !empty(PKGSRC_COMPILER:Mgcc*) && !empty(CFLAGS:M-O3) -PKG_HACKS+= suppress-Werror +PKG_HACKS+= suppress-Werror BUILDLINK_TRANSFORM+= rm:-Werror . endif Index: pkgsrc/pkgtools/pkg_leaves/Makefile diff -u pkgsrc/pkgtools/pkg_leaves/Makefile:1.7 pkgsrc/pkgtools/pkg_leaves/Makefile:1.8 --- pkgsrc/pkgtools/pkg_leaves/Makefile:1.7 Mon Mar 3 04:47:04 2014 +++ pkgsrc/pkgtools/pkg_leaves/Makefile Sat Jan 27 19:07:47 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2014/03/03 04:47:04 obache Exp $ +# $NetBSD: Makefile,v 1.8 2018/01/27 19:07:47 rillig Exp $ PKGNAME= pkg_leaves-1.2 CATEGORIES= pkgtools @@ -12,7 +12,7 @@ NO_BUILD= yes USE_LANGUAGES= # none # Set SCRIPT_SUBST to substitute "@VARIABLE@" with "value" -SUBST_CLASSES+= vars +SUBST_CLASSES+= vars SUBST_STAGE.vars= do-configure SUBST_FILES.vars= pkg_leaves SUBST_VARS.vars= PKG_INFO_CMD PKG_DBDIR SH Index: pkgsrc/pkgtools/pkg_p5up2date/Makefile diff -u pkgsrc/pkgtools/pkg_p5up2date/Makefile:1.15 pkgsrc/pkgtools/pkg_p5up2date/Makefile:1.16 --- pkgsrc/pkgtools/pkg_p5up2date/Makefile:1.15 Sat Jul 9 06:38:48 2016 +++ pkgsrc/pkgtools/pkg_p5up2date/Makefile Sat Jan 27 19:07:47 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2016/07/09 06:38:48 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2018/01/27 19:07:47 rillig Exp $ PKGNAME= pkg_p5up2date-0.06 PKGREVISION= 3 @@ -24,11 +24,11 @@ SUBST_MESSAGE.tools= Substituting tool l SUBST_FILES.tools= pkg_p5up2date.pl SUBST_VARS.tools= PKG_INFO_CMD MAKE PERL5 -SUBST_CLASSES+= pkgsrcdir -SUBST_STAGE.pkgsrcdir= pre-configure -SUBST_MESSAGE.pkgsrcdir=Recording default path of pkgsrc base directory. -SUBST_FILES.pkgsrcdir= pkg_p5up2date.pl -SUBST_SED.pkgsrcdir= -e 's,@PKGSRCDIR@,${PKGSRCDIR},g' +SUBST_CLASSES+= pkgsrcdir +SUBST_STAGE.pkgsrcdir= pre-configure +SUBST_MESSAGE.pkgsrcdir= Recording default path of pkgsrc base directory. +SUBST_FILES.pkgsrcdir= pkg_p5up2date.pl +SUBST_SED.pkgsrcdir= -e 's,@PKGSRCDIR@,${PKGSRCDIR},g' # REPLACE_PERL+= pkg_p5up2date.pl Index: pkgsrc/pkgtools/pkg_tarup/Makefile diff -u pkgsrc/pkgtools/pkg_tarup/Makefile:1.41 pkgsrc/pkgtools/pkg_tarup/Makefile:1.42 --- pkgsrc/pkgtools/pkg_tarup/Makefile:1.41 Mon Mar 3 03:30:54 2014 +++ pkgsrc/pkgtools/pkg_tarup/Makefile Sat Jan 27 19:07:47 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2014/03/03 03:30:54 obache Exp $ +# $NetBSD: Makefile,v 1.42 2018/01/27 19:07:47 rillig Exp $ PKGNAME= pkg_tarup-1.9.1 CATEGORIES= pkgtools @@ -12,7 +12,7 @@ USE_LANGUAGES= # none AUTO_MKDIRS= yes # Set SCRIPT_SUBST to substitute "@VARIABLE@" with "value" -SUBST_CLASSES+= tarup +SUBST_CLASSES+= tarup SUBST_STAGE.tarup= do-configure SUBST_FILES.tarup= pkg_tarup pkg_tarup_all pkg_tarup.1 SUBST_VARS.tarup= ECHO ECHO_N GREP HEAD ID PKG_DBDIR PKG_SUFX PKG_TOOLS_BIN PREFIX SED SH SU_CMD XARGS Index: pkgsrc/pkgtools/pkgse/Makefile diff -u pkgsrc/pkgtools/pkgse/Makefile:1.15 pkgsrc/pkgtools/pkgse/Makefile:1.16 --- pkgsrc/pkgtools/pkgse/Makefile:1.15 Sat Jul 9 06:38:49 2016 +++ pkgsrc/pkgtools/pkgse/Makefile Sat Jan 27 19:07:47 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2016/07/09 06:38:49 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2018/01/27 19:07:47 rillig Exp $ # DISTNAME= pkgse-0.3 @@ -17,7 +17,7 @@ NO_BUILD= yes USE_TOOLS+= perl:run INSTALLATION_DIRS= bin -REPLACE_PERL= pkgse +REPLACE_PERL= pkgse do-install: ${INSTALL_SCRIPT} ${WRKSRC}/pkgse ${DESTDIR}${PREFIX}/bin Index: pkgsrc/pkgtools/x11-links/builtin.mk diff -u pkgsrc/pkgtools/x11-links/builtin.mk:1.7 pkgsrc/pkgtools/x11-links/builtin.mk:1.8 --- pkgsrc/pkgtools/x11-links/builtin.mk:1.7 Wed Jun 1 18:03:08 2005 +++ pkgsrc/pkgtools/x11-links/builtin.mk Sat Jan 27 19:07:48 2018 @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.7 2005/06/01 18:03:08 jlam Exp $ +# $NetBSD: builtin.mk,v 1.8 2018/01/27 19:07:48 rillig Exp $ BUILTIN_PKG:= x11-links .include "../../mk/buildlink3/bsd.builtin.mk" @@ -6,4 +6,4 @@ BUILTIN_PKG:= x11-links .if !defined(USE_BUILTIN.x11-links) USE_BUILTIN.x11-links= no .endif -MAKEVARS+= USE_BUILTIN.x11-links +MAKEVARS+= USE_BUILTIN.x11-links Index: pkgsrc/pkgtools/x11-links/version.mk diff -u pkgsrc/pkgtools/x11-links/version.mk:1.5 pkgsrc/pkgtools/x11-links/version.mk:1.6 --- pkgsrc/pkgtools/x11-links/version.mk:1.5 Sun Jan 30 17:26:32 2011 +++ pkgsrc/pkgtools/x11-links/version.mk Sat Jan 27 19:07:48 2018 @@ -1,4 +1,4 @@ -# $NetBSD: version.mk,v 1.5 2011/01/30 17:26:32 wiz Exp $ +# $NetBSD: version.mk,v 1.6 2018/01/27 19:07:48 rillig Exp $ # # This Makefile fragment is included by Makefiles that need to access # the X11_TYPE and version number of a native X11 distribution. @@ -32,4 +32,4 @@ BUILTIN_X11_TYPE.native= xdec BUILTIN_X11_TYPE.native= unknown . endif .endif -MAKEVARS+= BUILTIN_X11_VERSION.native BUILTIN_X11_TYPE.native +MAKEVARS+= BUILTIN_X11_VERSION.native BUILTIN_X11_TYPE.native Index: pkgsrc/pkgtools/x11-links/xfree.mk diff -u pkgsrc/pkgtools/x11-links/xfree.mk:1.17 pkgsrc/pkgtools/x11-links/xfree.mk:1.18 --- pkgsrc/pkgtools/x11-links/xfree.mk:1.17 Sun Jul 10 13:28:41 2016 +++ pkgsrc/pkgtools/x11-links/xfree.mk Sat Jan 27 19:07:48 2018 @@ -1,4 +1,4 @@ -# $NetBSD: xfree.mk,v 1.17 2016/07/10 13:28:41 rillig Exp $ +# $NetBSD: xfree.mk,v 1.18 2018/01/27 19:07:48 rillig Exp $ FILES_LIST= ${FILESDIR}/xfree @@ -29,6 +29,6 @@ CHECK_BUILTIN.${pkg}:= no IGNORE_PKG.${pkg}= yes . if (defined(IS_BUILTIN.${pkg}) && !empty(IS_BUILTIN.${pkg}:M[yY][eE][sS]) ) && \ exists(${FILESDIR}/xfree.${pkg}) -FILES_LIST+= ${FILESDIR}/xfree.${pkg} +FILES_LIST+= ${FILESDIR}/xfree.${pkg} . endif .endfor Index: pkgsrc/pkgtools/x11-links/xorg-version.mk diff -u pkgsrc/pkgtools/x11-links/xorg-version.mk:1.3 pkgsrc/pkgtools/x11-links/xorg-version.mk:1.4 --- pkgsrc/pkgtools/x11-links/xorg-version.mk:1.3 Wed Jan 23 15:25:04 2013 +++ pkgsrc/pkgtools/x11-links/xorg-version.mk Sat Jan 27 19:07:48 2018 @@ -1,4 +1,4 @@ -# $NetBSD: xorg-version.mk,v 1.3 2013/01/23 15:25:04 tron Exp $ +# $NetBSD: xorg-version.mk,v 1.4 2018/01/27 19:07:48 rillig Exp $ # # This Makefile fragment is included by Makefiles that need to access # the X11_TYPE and version number of an X.org distribution. @@ -28,7 +28,7 @@ BUILTIN_XORG_VERSION_FILE= ${CF_XORG_VER BUILTIN_XORG_VERSION_FILE= ${CF_VERSION_OLD} . endif .endif -MAKEVARS+= BUILTIN_XORG_VERSION_FILE +MAKEVARS+= BUILTIN_XORG_VERSION_FILE .if !defined(BUILTIN_X11_VERSION.xorg) . if exists(${BUILTIN_XORG_VERSION_FILE}) Index: pkgsrc/pkgtools/x11-links/xorg.mk diff -u pkgsrc/pkgtools/x11-links/xorg.mk:1.28 pkgsrc/pkgtools/x11-links/xorg.mk:1.29 --- pkgsrc/pkgtools/x11-links/xorg.mk:1.28 Tue Jan 24 14:25:00 2017 +++ pkgsrc/pkgtools/x11-links/xorg.mk Sat Jan 27 19:07:48 2018 @@ -1,4 +1,4 @@ -# $NetBSD: xorg.mk,v 1.28 2017/01/24 14:25:00 mrg Exp $ +# $NetBSD: xorg.mk,v 1.29 2018/01/27 19:07:48 rillig Exp $ # # This is for X.org, but use "xfree" files also. @@ -94,9 +94,9 @@ IGNORE_PKG.${pkg}= yes . if defined(USE_BUILTIN.${pkg}) && \ !empty(USE_BUILTIN.${pkg}:M[yY][eE][sS]) . if exists(${FILESDIR}/xorg.${pkg}) -FILES_LIST+= ${FILESDIR}/xorg.${pkg} +FILES_LIST+= ${FILESDIR}/xorg.${pkg} . elif exists(${FILESDIR}/xfree.${pkg}) -FILES_LIST+= ${FILESDIR}/xfree.${pkg} +FILES_LIST+= ${FILESDIR}/xfree.${pkg} . endif . endif .endfor --_----------=_151708006859930--