pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/pkgtools pkgtools/*: Realign variables in Makefiles
details: https://anonhg.NetBSD.org/pkgsrc/rev/99b4946e0f8c
branches: trunk
changeset: 374685:99b4946e0f8c
user: rillig <rillig%pkgsrc.org@localhost>
date: Sat Jan 27 19:07:46 2018 +0000
description:
pkgtools/*: Realign variables in Makefiles
Mainly done by pkglint, manually reviewed and improved in some few cases.
diffstat:
pkgtools/bootstrap-mk-files/Makefile | 4 ++--
pkgtools/gensolpkg/Makefile | 6 +++---
pkgtools/gnome-packagekit/Makefile | 18 +++++++++---------
pkgtools/libkver/Makefile | 22 +++++++++++-----------
pkgtools/mksandbox/Makefile | 10 +++++-----
pkgtools/nih/Makefile | 10 +++++-----
pkgtools/p5-pkgsrc-Dewey/Makefile | 4 ++--
pkgtools/packagekit/Makefile | 6 +++---
pkgtools/pkg/Makefile | 8 ++++----
pkgtools/pkg_filecheck/Makefile | 26 +++++++++++++-------------
pkgtools/pkg_install-info/hacks.mk | 4 ++--
pkgtools/pkg_install/Makefile | 8 ++++----
pkgtools/pkg_leaves/Makefile | 4 ++--
pkgtools/pkg_p5up2date/Makefile | 12 ++++++------
pkgtools/pkg_tarup/Makefile | 4 ++--
pkgtools/pkgse/Makefile | 4 ++--
pkgtools/x11-links/builtin.mk | 4 ++--
pkgtools/x11-links/version.mk | 4 ++--
pkgtools/x11-links/xfree.mk | 4 ++--
pkgtools/x11-links/xorg-version.mk | 4 ++--
pkgtools/x11-links/xorg.mk | 6 +++---
21 files changed, 86 insertions(+), 86 deletions(-)
diffs (truncated from 516 to 300 lines):
diff -r 686beb9a6082 -r 99b4946e0f8c pkgtools/bootstrap-mk-files/Makefile
--- a/pkgtools/bootstrap-mk-files/Makefile Sat Jan 27 18:51:17 2018 +0000
+++ b/pkgtools/bootstrap-mk-files/Makefile Sat Jan 27 19:07:46 2018 +0000
@@ -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 @@
LICENSE= original-bsd
NO_PKGTOOLS_REQD_CHECK= # defined
-BOOTSTRAP_PKG= yes
+BOOTSTRAP_PKG= yes
NO_BUILD= yes
diff -r 686beb9a6082 -r 99b4946e0f8c pkgtools/gensolpkg/Makefile
--- a/pkgtools/gensolpkg/Makefile Sat Jan 27 18:51:17 2018 +0000
+++ b/pkgtools/gensolpkg/Makefile Sat Jan 27 19:07:46 2018 +0000
@@ -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 @@
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"
diff -r 686beb9a6082 -r 99b4946e0f8c pkgtools/gnome-packagekit/Makefile
--- a/pkgtools/gnome-packagekit/Makefile Sat Jan 27 18:51:17 2018 +0000
+++ b/pkgtools/gnome-packagekit/Makefile Sat Jan 27 19:07:46 2018 +0000
@@ -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 @@
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 @@
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"
diff -r 686beb9a6082 -r 99b4946e0f8c pkgtools/libkver/Makefile
--- a/pkgtools/libkver/Makefile Sat Jan 27 18:51:17 2018 +0000
+++ b/pkgtools/libkver/Makefile Sat Jan 27 19:07:46 2018 +0000
@@ -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@localhost
+MAINTAINER= seb%NetBSD.org@localhost
#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 @@
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=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
diff -r 686beb9a6082 -r 99b4946e0f8c pkgtools/mksandbox/Makefile
--- a/pkgtools/mksandbox/Makefile Sat Jan 27 18:51:17 2018 +0000
+++ b/pkgtools/mksandbox/Makefile Sat Jan 27 19:07:46 2018 +0000
@@ -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 @@
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:
diff -r 686beb9a6082 -r 99b4946e0f8c pkgtools/nih/Makefile
--- a/pkgtools/nih/Makefile Sat Jan 27 18:51:17 2018 +0000
+++ b/pkgtools/nih/Makefile Sat Jan 27 19:07:46 2018 +0000
@@ -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.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 @@
.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
diff -r 686beb9a6082 -r 99b4946e0f8c pkgtools/p5-pkgsrc-Dewey/Makefile
--- a/pkgtools/p5-pkgsrc-Dewey/Makefile Sat Jan 27 18:51:17 2018 +0000
+++ b/pkgtools/p5-pkgsrc-Dewey/Makefile Sat Jan 27 19:07:46 2018 +0000
@@ -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 @@
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
diff -r 686beb9a6082 -r 99b4946e0f8c pkgtools/packagekit/Makefile
--- a/pkgtools/packagekit/Makefile Sat Jan 27 18:51:17 2018 +0000
+++ b/pkgtools/packagekit/Makefile Sat Jan 27 19:07:46 2018 +0000
@@ -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.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
diff -r 686beb9a6082 -r 99b4946e0f8c pkgtools/pkg/Makefile
--- a/pkgtools/pkg/Makefile Sat Jan 27 18:51:17 2018 +0000
+++ b/pkgtools/pkg/Makefile Sat Jan 27 19:07:46 2018 +0000
@@ -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 @@
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 @@
${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_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"
diff -r 686beb9a6082 -r 99b4946e0f8c pkgtools/pkg_filecheck/Makefile
--- a/pkgtools/pkg_filecheck/Makefile Sat Jan 27 18:51:17 2018 +0000
+++ b/pkgtools/pkg_filecheck/Makefile Sat Jan 27 19:07:46 2018 +0000
@@ -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
+PKGNAME= pkg_filecheck-0.4
+PKGREVISION= 6
+CATEGORIES= pkgtools devel
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-#HOMEPAGE= http://www.NetBSD.org/docs/pkgsrc/
-COMMENT= Check for files not owned by any package
-LICENSE= modified-bsd AND 2-clause-bsd
+MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+#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
Home |
Main Index |
Thread Index |
Old Index