Sat Jan 27 19:07:48 2018 UTC ()
pkgtools/*: Realign variables in Makefiles

Mainly done by pkglint, manually reviewed and improved in some few cases.


(rillig)
diff -r1.53 -r1.54 pkgsrc/pkgtools/bootstrap-mk-files/Makefile
diff -r1.22 -r1.23 pkgsrc/pkgtools/gensolpkg/Makefile
diff -r1.63 -r1.64 pkgsrc/pkgtools/gnome-packagekit/Makefile
diff -r1.37 -r1.38 pkgsrc/pkgtools/libkver/Makefile
diff -r1.12 -r1.13 pkgsrc/pkgtools/mksandbox/Makefile
diff -r1.24 -r1.25 pkgsrc/pkgtools/nih/Makefile
diff -r1.30 -r1.31 pkgsrc/pkgtools/p5-pkgsrc-Dewey/Makefile
diff -r1.61 -r1.62 pkgsrc/pkgtools/packagekit/Makefile
diff -r1.21 -r1.22 pkgsrc/pkgtools/pkg/Makefile
diff -r1.42 -r1.43 pkgsrc/pkgtools/pkg_filecheck/Makefile
diff -r1.222 -r1.223 pkgsrc/pkgtools/pkg_install/Makefile
diff -r1.1 -r1.2 pkgsrc/pkgtools/pkg_install-info/hacks.mk
diff -r1.7 -r1.8 pkgsrc/pkgtools/pkg_leaves/Makefile
diff -r1.15 -r1.16 pkgsrc/pkgtools/pkg_p5up2date/Makefile
diff -r1.41 -r1.42 pkgsrc/pkgtools/pkg_tarup/Makefile
diff -r1.15 -r1.16 pkgsrc/pkgtools/pkgse/Makefile
diff -r1.7 -r1.8 pkgsrc/pkgtools/x11-links/builtin.mk
diff -r1.5 -r1.6 pkgsrc/pkgtools/x11-links/version.mk
diff -r1.17 -r1.18 pkgsrc/pkgtools/x11-links/xfree.mk
diff -r1.3 -r1.4 pkgsrc/pkgtools/x11-links/xorg-version.mk
diff -r1.28 -r1.29 pkgsrc/pkgtools/x11-links/xorg.mk
cvs diff -r1.53 -r1.54 pkgsrc/pkgtools/bootstrap-mk-files/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/bootstrap-mk-files/Makefile 2017/08/02 09:38:06 1.53
+++ pkgsrc/pkgtools/bootstrap-mk-files/Makefile 2018/01/27 19:07:46 1.54
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1# $NetBSD: Makefile,v 1.53 2017/08/02 09:38:06 maya Exp $ 1# $NetBSD: Makefile,v 1.54 2018/01/27 19:07:46 rillig Exp $
2 2
3PKGNAME= bootstrap-mk-files-20170802 3PKGNAME= bootstrap-mk-files-20170802
4CATEGORIES= pkgtools 4CATEGORIES= pkgtools
5 5
6CONFLICTS+= mk-files-[0-9]* 6CONFLICTS+= mk-files-[0-9]*
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.pkgsrc.org/ 9HOMEPAGE= http://www.pkgsrc.org/
10COMMENT= *.mk files for the bootstrap bmake utility 10COMMENT= *.mk files for the bootstrap bmake utility
11LICENSE= original-bsd 11LICENSE= original-bsd
12 12
13NO_PKGTOOLS_REQD_CHECK= # defined 13NO_PKGTOOLS_REQD_CHECK= # defined
14BOOTSTRAP_PKG= yes 14BOOTSTRAP_PKG= yes
15 15
16NO_BUILD= yes 16NO_BUILD= yes
17 17
18USE_TOOLS+= sed 18USE_TOOLS+= sed
19 19
20INSTALLATION_DIRS= share/mk 20INSTALLATION_DIRS= share/mk
21 21
22do-extract: 22do-extract:
23 @${CP} -R ${FILESDIR} ${WRKSRC} 23 @${CP} -R ${FILESDIR} ${WRKSRC}
24 24
25do-configure: 25do-configure:
26 cd ${WRKSRC}; for file in bsd.* sys.mk; do \ 26 cd ${WRKSRC}; for file in bsd.* sys.mk; do \
27 ${TEST} ! -f mods/${OPSYS}.$$file || \ 27 ${TEST} ! -f mods/${OPSYS}.$$file || \
cvs diff -r1.22 -r1.23 pkgsrc/pkgtools/gensolpkg/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/gensolpkg/Makefile 2012/09/11 23:19:35 1.22
+++ pkgsrc/pkgtools/gensolpkg/Makefile 2018/01/27 19:07:46 1.23
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1# $NetBSD: Makefile,v 1.22 2012/09/11 23:19:35 asau Exp $ 1# $NetBSD: Makefile,v 1.23 2018/01/27 19:07:46 rillig Exp $
2# 2#
3 3
4DISTNAME= gensolpkg-1.10 4DISTNAME= gensolpkg-1.10
5PKGREVISION= 2 5PKGREVISION= 2
6CATEGORIES= pkgtools 6CATEGORIES= pkgtools
7MASTER_SITES= ${MASTER_SITE_LOCAL} 7MASTER_SITES= ${MASTER_SITE_LOCAL}
8 8
9MAINTAINER= agc@NetBSD.org 9MAINTAINER= agc@NetBSD.org
10COMMENT= Utility to generate a Solaris package 10COMMENT= Utility to generate a Solaris package
11LICENSE= original-bsd 11LICENSE= original-bsd
12 12
13USE_BSD_MAKEFILE= yes 13USE_BSD_MAKEFILE= yes
14 14
15ONLY_FOR_PLATFORM= SunOS-*-* # uses Solaris pkgmk(1) 15ONLY_FOR_PLATFORM= SunOS-*-* # uses Solaris pkgmk(1)
16 16
17INSTALLATION_DIRS= sbin ${PKGMANDIR}/man1 17INSTALLATION_DIRS= sbin ${PKGMANDIR}/man1
18 18
19MAKE_ENV+= CPPFLAGS="" CC=${CC:Q} 19MAKE_ENV+= CPPFLAGS="" CC=${CC:Q}
20MAKEFLAGS+= PREFIX=${PREFIX} 20MAKEFLAGS+= PREFIX=${PREFIX}
21INSTALL_MAKE_FLAGS+= PREFIX=${DESTDIR}${PREFIX} 21INSTALL_MAKE_FLAGS+= PREFIX=${DESTDIR}${PREFIX}
22 22
23.include "../../mk/bsd.pkg.mk" 23.include "../../mk/bsd.pkg.mk"
cvs diff -r1.63 -r1.64 pkgsrc/pkgtools/gnome-packagekit/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/gnome-packagekit/Makefile 2017/11/30 16:45:36 1.63
+++ pkgsrc/pkgtools/gnome-packagekit/Makefile 2018/01/27 19:07:46 1.64
@@ -1,40 +1,40 @@ @@ -1,40 +1,40 @@
1# $NetBSD: Makefile,v 1.63 2017/11/30 16:45:36 adam Exp $ 1# $NetBSD: Makefile,v 1.64 2018/01/27 19:07:46 rillig Exp $
2 2
3DISTNAME= gnome-packagekit-0.4.0 3DISTNAME= gnome-packagekit-0.4.0
4PKGREVISION= 49 4PKGREVISION= 49
5CATEGORIES= pkgtools gnome 5CATEGORIES= pkgtools gnome
6MASTER_SITES= http://www.packagekit.org/releases/ 6MASTER_SITES= http://www.packagekit.org/releases/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.packagekit.org/ 9HOMEPAGE= http://www.packagekit.org/
10COMMENT= GNOME frontend for PackageKit 10COMMENT= GNOME frontend for PackageKit
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13GNU_CONFIGURE= yes 13GNU_CONFIGURE= yes
14USE_LIBTOOL= yes 14USE_LIBTOOL= yes
15USE_TOOLS+= pkg-config gmake intltool perl msgfmt 15USE_TOOLS+= pkg-config gmake intltool perl msgfmt
16USE_PKGLOCALEDIR= yes 16USE_PKGLOCALEDIR= yes
17 17
18GCONF_SCHEMAS+= gnome-packagekit.schemas 18GCONF_SCHEMAS+= gnome-packagekit.schemas
19 19
20PY_PATCHPLIST= yes 20PY_PATCHPLIST= yes
21PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # not yet ported as of 0.4.0 21PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # not yet ported as of 0.4.0
22 22
23# needed for gnome-packagekit-0.4 and gtk2-2.20 -- remove on next update 23# needed for gnome-packagekit-0.4 and gtk2-2.20 -- remove on next update
24BUILDLINK_TRANSFORM+= rm:-DG_DISABLE_DEPRECATED 24BUILDLINK_TRANSFORM+= rm:-DG_DISABLE_DEPRECATED
25BUILDLINK_TRANSFORM+= rm:-DGDK_DISABLE_DEPRECATED 25BUILDLINK_TRANSFORM+= rm:-DGDK_DISABLE_DEPRECATED
26BUILDLINK_TRANSFORM+= rm:-DGDK_PIXBUF_DISABLE_DEPRECATED 26BUILDLINK_TRANSFORM+= rm:-DGDK_PIXBUF_DISABLE_DEPRECATED
27BUILDLINK_TRANSFORM+= rm:-DGTK_DISABLE_DEPRECATED 27BUILDLINK_TRANSFORM+= rm:-DGTK_DISABLE_DEPRECATED
28BUILDLINK_API_DEPENDS.glib2+= glib2>=2.30.0 28BUILDLINK_API_DEPENDS.glib2+= glib2>=2.30.0
29 29
30.include "../../devel/GConf/schemas.mk" 30.include "../../devel/GConf/schemas.mk"
31.include "../../devel/libglade/buildlink3.mk" 31.include "../../devel/libglade/buildlink3.mk"
32.include "../../devel/libsexy/buildlink3.mk" 32.include "../../devel/libsexy/buildlink3.mk"
33.include "../../lang/python/application.mk" 33.include "../../lang/python/application.mk"
34.include "../../lang/python/extension.mk" 34.include "../../lang/python/extension.mk"
35.include "../../pkgtools/packagekit/buildlink3.mk" 35.include "../../pkgtools/packagekit/buildlink3.mk"
36.include "../../graphics/gnome-icon-theme/buildlink3.mk" 36.include "../../graphics/gnome-icon-theme/buildlink3.mk"
37.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 37.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
38.include "../../security/policykit-gnome/buildlink3.mk" 38.include "../../security/policykit-gnome/buildlink3.mk"
39.include "../../sysutils/desktop-file-utils/desktopdb.mk" 39.include "../../sysutils/desktop-file-utils/desktopdb.mk"
40.include "../../sysutils/gnome-menus/buildlink3.mk" 40.include "../../sysutils/gnome-menus/buildlink3.mk"
cvs diff -r1.37 -r1.38 pkgsrc/pkgtools/libkver/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/libkver/Makefile 2017/08/19 00:22:00 1.37
+++ pkgsrc/pkgtools/libkver/Makefile 2018/01/27 19:07:46 1.38
@@ -1,50 +1,50 @@ @@ -1,50 +1,50 @@
1# $NetBSD: Makefile,v 1.37 2017/08/19 00:22:00 jlam Exp $ 1# $NetBSD: Makefile,v 1.38 2018/01/27 19:07:46 rillig Exp $
2 2
3PKGNAME= libkver-${VERSION} 3PKGNAME= libkver-${VERSION}
4CATEGORIES= pkgtools 4CATEGORIES= pkgtools
5 5
6MAINTAINER= seb@NetBSD.org 6MAINTAINER= seb@NetBSD.org
7#HOMEPAGE= 7#HOMEPAGE=
8COMMENT= Shared library and sysctl(1) replacement to override system version 8COMMENT= Shared library and sysctl(1) replacement to override system version
9 9
10.include "../../mk/bsd.prefs.mk" 10.include "../../mk/bsd.prefs.mk"
11 11
12CHECK_PERMS= no 12CHECK_PERMS= no
13 13
14NO_PKGTOOLS_REQD_CHECK= yes 14NO_PKGTOOLS_REQD_CHECK= yes
15USE_BSD_MAKEFILE= yes 15USE_BSD_MAKEFILE= yes
16 16
17VERSION= 0.7.2 17VERSION= 0.7.2
18 18
19ONLY_FOR_PLATFORM= NetBSD-*-* 19ONLY_FOR_PLATFORM= NetBSD-*-*
20 20
21BUILDLINK_PASSTHRU_DIRS= ${BSDSRCDIR}/sys 21BUILDLINK_PASSTHRU_DIRS= ${BSDSRCDIR}/sys
22 22
23PLIST_VARS= sysctl 23PLIST_VARS= sysctl
24LDD_SYSCTL!= ldd /sbin/sysctl 2>&1 || ${TRUE} 24LDD_SYSCTL!= ldd /sbin/sysctl 2>&1 || ${TRUE}
25MAKE_ENV+= LDD_SYSCTL=${LDD_SYSCTL:Q} # save another ldd run 25MAKE_ENV+= LDD_SYSCTL=${LDD_SYSCTL:Q} # save another ldd run
26.if empty(LDD_SYSCTL:M*libc*) 26.if empty(LDD_SYSCTL:M*libc*)
27PLIST.sysctl= yes 27PLIST.sysctl= yes
28FILES_SUBST+= HAS_SYSCTL=true 28FILES_SUBST+= HAS_SYSCTL=true
29.else 29.else
30FILES_SUBST+= HAS_SYSCTL=false 30FILES_SUBST+= HAS_SYSCTL=false
31.endif 31.endif
32 32
33SUBST_CLASSES+= paths 33SUBST_CLASSES+= paths
34SUBST_FILES.paths= kver/kver.sh kver/kver.8 lib/kver.3 34SUBST_FILES.paths= kver/kver.sh kver/kver.8 lib/kver.3
35SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g' 35SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g'
36SUBST_SED.paths+= -e 's,@SH@,${SH},g' 36SUBST_SED.paths+= -e 's,@SH@,${SH},g'
37SUBST_STAGE.paths= post-patch 37SUBST_STAGE.paths= post-patch
38 38
39INSTALLATION_DIRS+= sbin ${PKGMANDIR}/man8 ${PKGMANDIR}/cat8 39INSTALLATION_DIRS+= sbin ${PKGMANDIR}/man8 ${PKGMANDIR}/cat8
40INSTALLATION_DIRS+= lib ${PKGMANDIR}/man3 ${PKGMANDIR}/cat3 40INSTALLATION_DIRS+= lib ${PKGMANDIR}/man3 ${PKGMANDIR}/cat3
41.if empty(LDD_SYSCTL:M*libc*) 41.if empty(LDD_SYSCTL:M*libc*)
42INSTALLATION_DIRS+= sbin 42INSTALLATION_DIRS+= sbin
43.endif 43.endif
44 44
45INSTALL_MAKE_FLAGS+= MANDIR=${PREFIX:Q}/${PKGMANDIR:Q} 45INSTALL_MAKE_FLAGS+= MANDIR=${PREFIX:Q}/${PKGMANDIR:Q}
46 46
47do-extract: 47do-extract:
48 ${CP} -R ${FILESDIR} ${WRKSRC} 48 ${CP} -R ${FILESDIR} ${WRKSRC}
49 49
50LIBKVER_STANDALONE_PREFIX?= /libkver 50LIBKVER_STANDALONE_PREFIX?= /libkver
cvs diff -r1.12 -r1.13 pkgsrc/pkgtools/mksandbox/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/mksandbox/Makefile 2016/10/14 12:50:07 1.12
+++ pkgsrc/pkgtools/mksandbox/Makefile 2018/01/27 19:07:46 1.13
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1# $NetBSD: Makefile,v 1.12 2016/10/14 12:50:07 jperkin Exp $ 1# $NetBSD: Makefile,v 1.13 2018/01/27 19:07:46 rillig Exp $
2 2
3PKGNAME= mksandbox-1.7 3PKGNAME= mksandbox-1.7
4CATEGORIES= pkgtools 4CATEGORIES= pkgtools
5 5
6MAINTAINER= agc@NetBSD.org 6MAINTAINER= agc@NetBSD.org
7HOMEPAGE= http://www.NetBSD.org/docs/pkgsrc/bulk.html#setting-up-a-sandbox 7HOMEPAGE= http://www.NetBSD.org/docs/pkgsrc/bulk.html#setting-up-a-sandbox
8COMMENT= Tool for creating sandboxes 8COMMENT= Tool for creating sandboxes
9LICENSE= 2-clause-bsd 9LICENSE= 2-clause-bsd
10 10
11WRKSRC= ${WRKDIR} 11WRKSRC= ${WRKDIR}
12NO_BUILD= yes 12NO_BUILD= yes
13NO_CHECKSUM= yes 13NO_CHECKSUM= yes
14USE_LANGUAGES= # none 14USE_LANGUAGES= # none
15INSTALLATION_DIRS= sbin ${PKGMANDIR}/man8 15INSTALLATION_DIRS= sbin ${PKGMANDIR}/man8
16 16
17do-extract: 17do-extract:
18 cd ${FILESDIR} && cp mksandbox mksandbox.8 ${WRKSRC}/ 18 cd ${FILESDIR} && cp mksandbox mksandbox.8 ${WRKSRC}/
19 19
20.include "../../mk/bsd.prefs.mk" 20.include "../../mk/bsd.prefs.mk"
21 21
22SUBST_CLASSES+= up 22SUBST_CLASSES+= up
23SUBST_STAGE.up= do-configure 23SUBST_STAGE.up= do-configure
24SUBST_FILES.up= mksandbox mksandbox.8 24SUBST_FILES.up= mksandbox mksandbox.8
25SUBST_SED.up+= -e 's,/usr/pkgsrc,${PKGSRCDIR},g' 25SUBST_SED.up+= -e 's,/usr/pkgsrc,${PKGSRCDIR},g'
26 26
27do-install: 27do-install:
cvs diff -r1.24 -r1.25 pkgsrc/pkgtools/nih/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/nih/Makefile 2017/01/19 18:52:21 1.24
+++ pkgsrc/pkgtools/nih/Makefile 2018/01/27 19:07:47 1.25
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.24 2017/01/19 18:52:21 agc Exp $ 1# $NetBSD: Makefile,v 1.25 2018/01/27 19:07:47 rillig Exp $
2 2
3DISTNAME= pkgnih-0.14.1 3DISTNAME= pkgnih-0.14.1
4PKGNAME= ${DISTNAME:S/pkgnih/nih/} 4PKGNAME= ${DISTNAME:S/pkgnih/nih/}
5CATEGORIES= pkgtools 5CATEGORIES= pkgtools
6MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/cheusov/nih/ 6MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/cheusov/nih/
7MASTER_SITES+= http://mova.org/~cheusov/pub/pkgnih/ 7MASTER_SITES+= http://mova.org/~cheusov/pub/pkgnih/
8 8
9MAINTAINER= cheusov@NetBSD.org 9MAINTAINER= cheusov@NetBSD.org
10HOMEPAGE= https://github.com/cheusov/pkgnih 10HOMEPAGE= https://github.com/cheusov/pkgnih
11COMMENT= Package manager for pkgsrc 11COMMENT= Package manager for pkgsrc
12LICENSE= 2-clause-bsd 12LICENSE= 2-clause-bsd
13 13
14DEPENDS+= pkg_summary-utils>=0.66.0:../../pkgtools/pkg_summary-utils 14DEPENDS+= pkg_summary-utils>=0.66.0:../../pkgtools/pkg_summary-utils
@@ -24,37 +24,37 @@ BUILD_TARGET= all all-doc @@ -24,37 +24,37 @@ BUILD_TARGET= all all-doc
24INSTALL_TARGET= install install-doc 24INSTALL_TARGET= install install-doc
25 25
26EGDIR= ${PREFIX}/share/examples/nih 26EGDIR= ${PREFIX}/share/examples/nih
27 27
28CONF_FILES= ${EGDIR}/nih.conf \ 28CONF_FILES= ${EGDIR}/nih.conf \
29 ${PKG_SYSCONFDIR}/nih/config 29 ${PKG_SYSCONFDIR}/nih/config
30 30
31MAKE_DIRS+= ${PKG_SYSCONFDIR}/nih 31MAKE_DIRS+= ${PKG_SYSCONFDIR}/nih
32 32
33REPLACE_INTERPRETER+= runawk 33REPLACE_INTERPRETER+= runawk
34REPLACE.runawk.old= .*runawk 34REPLACE.runawk.old= .*runawk
35REPLACE.runawk.new= ${PREFIX}/bin/runawk 35REPLACE.runawk.new= ${PREFIX}/bin/runawk
36REPLACE_FILES.runawk= nih/pkg_update_plan.in nih/cmp2hr.in \ 36REPLACE_FILES.runawk= nih/pkg_update_plan.in nih/cmp2hr.in \
37 nih/pkg_create_fake.in nih/analyse_conflicts.in 37 nih/pkg_create_fake.in nih/analyse_conflicts.in
38 38
39MAKE_ENV+= PKG_DBDIR=${PKG_DBDIR} 39MAKE_ENV+= PKG_DBDIR=${PKG_DBDIR}
40MAKE_ENV+= REAL_ROOT_USER=${REAL_ROOT_USER} 40MAKE_ENV+= REAL_ROOT_USER=${REAL_ROOT_USER}
41MAKE_ENV+= REAL_ROOT_GROUP=${REAL_ROOT_GROUP} 41MAKE_ENV+= REAL_ROOT_GROUP=${REAL_ROOT_GROUP}
42 42
43.include "../../mk/bsd.prefs.mk" 43.include "../../mk/bsd.prefs.mk"
44 44
45.if ${OPSYS} == NetBSD || ${OPSYS} == FreeBSD || ${OPSYS} == OpenBSD || \ 45.if ${OPSYS} == NetBSD || ${OPSYS} == FreeBSD || ${OPSYS} == OpenBSD || \
46 ${OPSYS} == DragonFly || ${OPSYS} == MirBSD 46 ${OPSYS} == DragonFly || ${OPSYS} == MirBSD
47FTP_CMD=/usr/bin/ftp 47FTP_CMD= /usr/bin/ftp
48.else 48.else
49FTP_CMD=${PREFIX}/bin/ftp 49FTP_CMD= ${PREFIX}/bin/ftp
50DEPENDS+= tnftp-[0-9]*:../../net/tnftp 50DEPENDS+= tnftp-[0-9]*:../../net/tnftp
51.endif 51.endif
52 52
53MAKE_ENV+= FTP=${FTP_CMD:Q} PKG_TOOLS_BIN=${PKG_TOOLS_BIN} 53MAKE_ENV+= FTP=${FTP_CMD:Q} PKG_TOOLS_BIN=${PKG_TOOLS_BIN}
54 54
55.if ${OPSYS} =="SunOS" #&& empty(OS_VERSION:M5.11*) 55.if ${OPSYS} =="SunOS" #&& empty(OS_VERSION:M5.11*)
56REPLACE_SH+= nih/nih.in nih/pkg_status.in 56REPLACE_SH+= nih/nih.in nih/pkg_status.in
57.endif 57.endif
58 58
59.include "../../devel/mk-configure/mk-c.mk" 59.include "../../devel/mk-configure/mk-c.mk"
60.include "../../mk/bsd.pkg.mk" 60.include "../../mk/bsd.pkg.mk"
cvs diff -r1.30 -r1.31 pkgsrc/pkgtools/p5-pkgsrc-Dewey/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/p5-pkgsrc-Dewey/Makefile 2017/06/05 14:24:26 1.30
+++ pkgsrc/pkgtools/p5-pkgsrc-Dewey/Makefile 2018/01/27 19:07:47 1.31
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1# $NetBSD: Makefile,v 1.30 2017/06/05 14:24:26 ryoon Exp $ 1# $NetBSD: Makefile,v 1.31 2018/01/27 19:07:47 rillig Exp $
2 2
3PKGNAME= p5-pkgsrc-Dewey-1.1 3PKGNAME= p5-pkgsrc-Dewey-1.1
4PKGREVISION= 8 4PKGREVISION= 8
5CATEGORIES= pkgtools perl5 5CATEGORIES= pkgtools perl5
6 6
7MAINTAINER= wiz@NetBSD.org 7MAINTAINER= wiz@NetBSD.org
8HOMEPAGE= http://www.NetBSD.org/docs/pkgsrc/ 8HOMEPAGE= http://www.NetBSD.org/docs/pkgsrc/
9COMMENT= Perl module to compare pkgsrc Dewey numbers 9COMMENT= Perl module to compare pkgsrc Dewey numbers
10LICENSE= ${PERL5_LICENSE} OR 2-clause-bsd 10LICENSE= ${PERL5_LICENSE} OR 2-clause-bsd
11 11
12CPPFLAGS+= -DHAVE_CTYPE_H -DHAVE_STDLIB_H -DHAVE_STRING_H 12CPPFLAGS+= -DHAVE_CTYPE_H -DHAVE_STDLIB_H -DHAVE_STRING_H
13CPPFLAGS.NetBSD+= -DHAVE_ERR_H 13CPPFLAGS.NetBSD+= -DHAVE_ERR_H
14CPPFLAGS.Linux+= -fPIC 14CPPFLAGS.Linux+= -fPIC
15 15
16USE_LANGUAGES= c 16USE_LANGUAGES= c
17USE_FEATURES+= err 17USE_FEATURES+= err
18MAKE_ENV+= LIBS=${LIBS:Q} 18MAKE_ENV+= LIBS=${LIBS:Q}
19 19
20PERL5_PACKLIST= auto/pkgsrc/Dewey/.packlist 20PERL5_PACKLIST= auto/pkgsrc/Dewey/.packlist
21 21
22PKG_INSTALL_FILESDIR= ${PKGSRCDIR}/pkgtools/pkg_install/files 22PKG_INSTALL_FILESDIR= ${PKGSRCDIR}/pkgtools/pkg_install/files
23PKG_INSTALL_FILES= lib/dewey.c lib/dewey.h lib/defs.h 23PKG_INSTALL_FILES= lib/dewey.c lib/dewey.h lib/defs.h
24 24
25do-extract: 25do-extract:
cvs diff -r1.61 -r1.62 pkgsrc/pkgtools/packagekit/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/packagekit/Makefile 2017/11/30 16:45:07 1.61
+++ pkgsrc/pkgtools/packagekit/Makefile 2018/01/27 19:07:47 1.62
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.61 2017/11/30 16:45:07 adam Exp $ 1# $NetBSD: Makefile,v 1.62 2018/01/27 19:07:47 rillig Exp $
2 2
3DISTNAME= PackageKit-0.4.0 3DISTNAME= PackageKit-0.4.0
4PKGREVISION= 44 4PKGREVISION= 44
5PKGNAME= ${DISTNAME:S/PackageKit/packagekit/} 5PKGNAME= ${DISTNAME:S/PackageKit/packagekit/}
6CATEGORIES= pkgtools 6CATEGORIES= pkgtools
7MASTER_SITES= http://www.freedesktop.org/software/PackageKit/releases/ 7MASTER_SITES= http://www.freedesktop.org/software/PackageKit/releases/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.freedesktop.org/software/PackageKit/ 10HOMEPAGE= http://www.freedesktop.org/software/PackageKit/
11COMMENT= System activated daemon for managing software updates 11COMMENT= System activated daemon for managing software updates
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
@@ -25,28 +25,28 @@ PKETCDIR= ${LOCALBASE}/etc/PackageKit @@ -25,28 +25,28 @@ PKETCDIR= ${LOCALBASE}/etc/PackageKit
25 25
26EGDIR= ${PREFIX}/share/examples/packagekit 26EGDIR= ${PREFIX}/share/examples/packagekit
27CONF_FILES= ${EGDIR}/CommandNotFound.conf \ 27CONF_FILES= ${EGDIR}/CommandNotFound.conf \
28 ${PKG_SYSCONFDIR}/PackageKit/CommandNotFound.conf 28 ${PKG_SYSCONFDIR}/PackageKit/CommandNotFound.conf
29CONF_FILES+= ${EGDIR}/PackageKit.conf \ 29CONF_FILES+= ${EGDIR}/PackageKit.conf \
30 ${PKG_SYSCONFDIR}/PackageKit/PackageKit.conf 30 ${PKG_SYSCONFDIR}/PackageKit/PackageKit.conf
31CONF_FILES+= ${EGDIR}/Vendor.conf \ 31CONF_FILES+= ${EGDIR}/Vendor.conf \
32 ${PKG_SYSCONFDIR}/PackageKit/Vendor.conf 32 ${PKG_SYSCONFDIR}/PackageKit/Vendor.conf
33CONF_FILES+= ${EGDIR}/org.freedesktop.PackageKit.conf \ 33CONF_FILES+= ${EGDIR}/org.freedesktop.PackageKit.conf \
34 ${PKG_SYSCONFDIR}/dbus-1/system.d/org.freedesktop.PackageKit.conf 34 ${PKG_SYSCONFDIR}/dbus-1/system.d/org.freedesktop.PackageKit.conf
35CONF_FILES+= ${EGDIR}/org.freedesktop.PackageKitTestBackend.conf \ 35CONF_FILES+= ${EGDIR}/org.freedesktop.PackageKitTestBackend.conf \
36 ${PKG_SYSCONFDIR}/dbus-1/system.d/org.freedesktop.PackageKitTestBackend.conf 36 ${PKG_SYSCONFDIR}/dbus-1/system.d/org.freedesktop.PackageKitTestBackend.conf
37 37
38CHECK_INTERPRETER_SKIP+= lib/pm-utils/sleep.d/95packagekit \ 38CHECK_INTERPRETER_SKIP+= lib/pm-utils/sleep.d/95packagekit \
39 share/PackageKit/helpers/test_spawn/search-name.sh 39 share/PackageKit/helpers/test_spawn/search-name.sh
40 40
41CONFIGURE_ARGS+= --disable-qt 41CONFIGURE_ARGS+= --disable-qt
42CONFIGURE_ARGS+= --with-security-framework=polkit 42CONFIGURE_ARGS+= --with-security-framework=polkit
43CONFIGURE_ARGS+= --enable-pkgsrc 43CONFIGURE_ARGS+= --enable-pkgsrc
44CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} 44CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q}
45CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE:Q} 45CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE:Q}
46 46
47PKGCONFIG_OVERRIDE+= data/packagekit-qt.pc.in 47PKGCONFIG_OVERRIDE+= data/packagekit-qt.pc.in
48PKGCONFIG_OVERRIDE+= data/packagekit-glib.pc.in 48PKGCONFIG_OVERRIDE+= data/packagekit-glib.pc.in
49 49
50PY_PATCHPLIST= yes 50PY_PATCHPLIST= yes
51PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # not yet ported as of 0.4.0 51PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # not yet ported as of 0.4.0
52 52
cvs diff -r1.21 -r1.22 pkgsrc/pkgtools/pkg/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkg/Makefile 2017/08/19 00:24:13 1.21
+++ pkgsrc/pkgtools/pkg/Makefile 2018/01/27 19:07:47 1.22
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: Makefile,v 1.21 2017/08/19 00:24:13 jlam Exp $ 1# $NetBSD: Makefile,v 1.22 2018/01/27 19:07:47 rillig Exp $
2 2
3DISTNAME= pkg-1.9.99.4 3DISTNAME= pkg-1.9.99.4
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= pkgtools 5CATEGORIES= pkgtools
6MASTER_SITES= http://files.etoilebsd.net/pkg/ 6MASTER_SITES= http://files.etoilebsd.net/pkg/
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= khorben@defora.org 9MAINTAINER= khorben@defora.org
10HOMEPAGE= https://wiki.freebsd.org/pkgng 10HOMEPAGE= https://wiki.freebsd.org/pkgng
11COMMENT= Package management tool for FreeBSD 11COMMENT= Package management tool for FreeBSD
12LICENSE= 2-clause-bsd 12LICENSE= 2-clause-bsd
13 13
14BOOTSTRAP_PKG= yes 14BOOTSTRAP_PKG= yes
15GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
16USE_CWRAPPERS= no 16USE_CWRAPPERS= no
17USE_LANGUAGES= c 17USE_LANGUAGES= c
18 18
19CPPFLAGS+= -D_LOCALBASE="\"${PREFIX}\"" 19CPPFLAGS+= -D_LOCALBASE="\"${PREFIX}\""
20CPPFLAGS+= -DPORTSDIR="\"${PKG.portsdir}\"" 20CPPFLAGS+= -DPORTSDIR="\"${PKG.portsdir}\""
21CPPFLAGS+= -DDEFAULT_VULNXML_URL="\"http://muscles.dragonflybsd.org/pkgsrc-vuxml/vuln.xml.bz2\"" 21CPPFLAGS+= -DDEFAULT_VULNXML_URL="\"http://muscles.dragonflybsd.org/pkgsrc-vuxml/vuln.xml.bz2\""
22CFLAGS+= -DSYSCONFDIR=\"${PKG_SYSCONFDIR}\" 22CFLAGS+= -DSYSCONFDIR=\"${PKG_SYSCONFDIR}\"
23 23
24.if defined(DEBUG_PKGNG) 24.if defined(DEBUG_PKGNG)
25CFLAGS:= ${CFLAGS:N-O2} -ggdb -O0 25CFLAGS:= ${CFLAGS:N-O2} -ggdb -O0
26_STRIPFLAG_INSTALL= # don't strip 26_STRIPFLAG_INSTALL= # don't strip
27.endif 27.endif
28 28
29AUTO_MKDIRS= yes 29AUTO_MKDIRS= yes
30 30
31EGDIR= ${PREFIX}/share/examples/pkg 31EGDIR= ${PREFIX}/share/examples/pkg
32 32
33CONF_FILES+= ${EGDIR}/bash_completion.d/_pkg.bash \ 33CONF_FILES+= ${EGDIR}/bash_completion.d/_pkg.bash \
34 ${PKG_SYSCONFDIR}/bash_completion.d/_pkg.bash 34 ${PKG_SYSCONFDIR}/bash_completion.d/_pkg.bash
35CONF_FILES+= ${EGDIR}/periodic/daily/411.pkg-backup \ 35CONF_FILES+= ${EGDIR}/periodic/daily/411.pkg-backup \
36 ${PKG_SYSCONFDIR}/periodic/daily/411.pkg-backup 36 ${PKG_SYSCONFDIR}/periodic/daily/411.pkg-backup
37CONF_FILES+= ${EGDIR}/periodic/daily/490.status-pkg-changes \ 37CONF_FILES+= ${EGDIR}/periodic/daily/490.status-pkg-changes \
38 ${PKG_SYSCONFDIR}/periodic/daily/490.status-pkg-changes 38 ${PKG_SYSCONFDIR}/periodic/daily/490.status-pkg-changes
@@ -40,36 +40,36 @@ CONF_FILES+= ${EGDIR}/periodic/security/ @@ -40,36 +40,36 @@ CONF_FILES+= ${EGDIR}/periodic/security/
40 ${PKG_SYSCONFDIR}/periodic/security/410.pkg-audit 40 ${PKG_SYSCONFDIR}/periodic/security/410.pkg-audit
41CONF_FILES+= ${EGDIR}/periodic/security/460.pkg-checksum \ 41CONF_FILES+= ${EGDIR}/periodic/security/460.pkg-checksum \
42 ${PKG_SYSCONFDIR}/periodic/security/460.pkg-checksum 42 ${PKG_SYSCONFDIR}/periodic/security/460.pkg-checksum
43CONF_FILES+= ${EGDIR}/periodic/weekly/400.status-pkg \ 43CONF_FILES+= ${EGDIR}/periodic/weekly/400.status-pkg \
44 ${PKG_SYSCONFDIR}/periodic/weekly/400.status-pkg 44 ${PKG_SYSCONFDIR}/periodic/weekly/400.status-pkg
45CONF_FILES+= ${EGDIR}/pkg.conf.sample \ 45CONF_FILES+= ${EGDIR}/pkg.conf.sample \
46 ${PKG_SYSCONFDIR}/pkg.conf 46 ${PKG_SYSCONFDIR}/pkg.conf
47 47
48OWN_DIRS= ${PKG_SYSCONFDIR}/bash_completion.d \ 48OWN_DIRS= ${PKG_SYSCONFDIR}/bash_completion.d \
49 ${PKG_SYSCONFDIR}/periodic/daily \ 49 ${PKG_SYSCONFDIR}/periodic/daily \
50 ${PKG_SYSCONFDIR}/periodic/security \ 50 ${PKG_SYSCONFDIR}/periodic/security \
51 ${PKG_SYSCONFDIR}/periodic/weekly 51 ${PKG_SYSCONFDIR}/periodic/weekly
52 52
53SUBST_CLASSES+= manpages-prefix 53SUBST_CLASSES+= manpages-prefix
54SUBST_STAGE.manpages-prefix= pre-install 54SUBST_STAGE.manpages-prefix= pre-install
55SUBST_FILES.manpages-prefix= docs/pkg-install.8 docs/pkg-repo.8 55SUBST_FILES.manpages-prefix= docs/pkg-install.8 docs/pkg-repo.8
56SUBST_FILES.manpages-prefix+= docs/pkg-search.8 docs/pkg-update.8 56SUBST_FILES.manpages-prefix+= docs/pkg-search.8 docs/pkg-update.8
57SUBST_FILES.manpages-prefix+= docs/pkg-upgrade.8 docs/pkg.8 57SUBST_FILES.manpages-prefix+= docs/pkg-upgrade.8 docs/pkg.8
58SUBST_FILES.manpages-prefix+= docs/pkg.conf.5 58SUBST_FILES.manpages-prefix+= docs/pkg.conf.5
59SUBST_SED.manpages-prefix+= -e "s|/usr/local|${PREFIX}|g" 59SUBST_SED.manpages-prefix+= -e "s|/usr/local|${PREFIX}|g"
60SUBST_MESSAGE.manpages-prefix= Correct the installation prefix in manual pages. 60SUBST_MESSAGE.manpages-prefix= Correct the installation prefix in manual pages.
61 61
62SUBST_CLASSES+= pkgconf-prefix 62SUBST_CLASSES+= pkgconf-prefix
63SUBST_STAGE.pkgconf-prefix= pre-install 63SUBST_STAGE.pkgconf-prefix= pre-install
64SUBST_FILES.pkgconf-prefix= src/pkg.conf.sample 64SUBST_FILES.pkgconf-prefix= src/pkg.conf.sample
65SUBST_SED.pkgconf-prefix+= -e "s|/usr/local|${PREFIX}|g" 65SUBST_SED.pkgconf-prefix+= -e "s|/usr/local|${PREFIX}|g"
66SUBST_MESSAGE.pkgconf-prefix= Correct the installation prefix in pkg.conf(5). 66SUBST_MESSAGE.pkgconf-prefix= Correct the installation prefix in pkg.conf(5).
67 67
68SUBST_CLASSES+= portsdir 68SUBST_CLASSES+= portsdir
69SUBST_STAGE.portsdir= pre-install 69SUBST_STAGE.portsdir= pre-install
70SUBST_FILES.portsdir= src/pkg.conf.sample \ 70SUBST_FILES.portsdir= src/pkg.conf.sample \
71 docs/pkg-create.8 \ 71 docs/pkg-create.8 \
72 docs/pkg-set.8 \ 72 docs/pkg-set.8 \
73 docs/pkg-repo.8 \ 73 docs/pkg-repo.8 \
74 docs/pkg.conf.5 \ 74 docs/pkg.conf.5 \
75 docs/pkg-version.8 \ 75 docs/pkg-version.8 \
cvs diff -r1.42 -r1.43 pkgsrc/pkgtools/pkg_filecheck/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkg_filecheck/Makefile 2016/07/09 06:38:48 1.42
+++ pkgsrc/pkgtools/pkg_filecheck/Makefile 2018/01/27 19:07:47 1.43
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: Makefile,v 1.42 2016/07/09 06:38:48 wiz Exp $ 1# $NetBSD: Makefile,v 1.43 2018/01/27 19:07:47 rillig Exp $
2# 2#
3 3
4PKGNAME= pkg_filecheck-0.4 4PKGNAME= pkg_filecheck-0.4
5PKGREVISION= 6 5PKGREVISION= 6
6CATEGORIES= pkgtools devel 6CATEGORIES= pkgtools devel
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9#HOMEPAGE= http://www.NetBSD.org/docs/pkgsrc/ 9#HOMEPAGE= http://www.NetBSD.org/docs/pkgsrc/
10COMMENT= Check for files not owned by any package 10COMMENT= Check for files not owned by any package
11LICENSE= modified-bsd AND 2-clause-bsd 11LICENSE= modified-bsd AND 2-clause-bsd
12 12
13WRKSRC= ${WRKDIR} 13WRKSRC= ${WRKDIR}
14USE_TOOLS+= perl:run 14USE_TOOLS+= perl:run
15USE_FEATURES= fts_open 15USE_FEATURES= fts_open
16 16
17USE_FEATURES+= nbcompat  17USE_FEATURES+= nbcompat
18NBCOMPAT_CONFIGURE_ARGS+= --enable-db  18NBCOMPAT_CONFIGURE_ARGS+= --enable-db
19  19
20FILES_SUBST+= PKG_DBDIR=${PKG_DBDIR:Q} 20FILES_SUBST+= PKG_DBDIR=${PKG_DBDIR:Q}
21CONF_FILES= ${PREFIX}/share/examples/pkg_filecheck/pkg_filecheck.conf \ 21CONF_FILES= ${PREFIX}/share/examples/pkg_filecheck/pkg_filecheck.conf \
22 ${PKG_SYSCONFDIR}/pkg_filecheck.conf 22 ${PKG_SYSCONFDIR}/pkg_filecheck.conf
23 23
24INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 \ 24INSTALLATION_DIRS= \
25 share/examples/pkg_filecheck 25 bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 share/examples/pkg_filecheck
26 26
27SUBST_CLASSES+= paths 27SUBST_CLASSES+= paths
28SUBST_FILES.paths= builddb.pl builddb.1 pkg_filecheck.conf 28SUBST_FILES.paths= builddb.pl builddb.1 pkg_filecheck.conf
29SUBST_FILES.paths+= pkg_filecheck.conf.5 pkg_filecheck.c pkg_filecheck.1 29SUBST_FILES.paths+= pkg_filecheck.conf.5 pkg_filecheck.c pkg_filecheck.1
30SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g' 30SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g'
31SUBST_SED.paths+= -e 's,@PERL5@,${PERL5},g' 31SUBST_SED.paths+= -e 's,@PERL5@,${PERL5},g'
32SUBST_SED.paths+= -e 's,@PKG_DBDIR@,${PKG_DBDIR},g' 32SUBST_SED.paths+= -e 's,@PKG_DBDIR@,${PKG_DBDIR},g'
33SUBST_SED.paths+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g' 33SUBST_SED.paths+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
34SUBST_STAGE.paths= post-patch 34SUBST_STAGE.paths= post-patch
35 35
36post-extract: 36post-extract:
37.for f in builddb.pl builddb.1 pkg_filecheck.conf pkg_filecheck.conf.5 \ 37.for f in builddb.pl builddb.1 pkg_filecheck.conf pkg_filecheck.conf.5 \
38 pkg_filecheck.c pkg_filecheck.1 38 pkg_filecheck.c pkg_filecheck.1
cvs diff -r1.222 -r1.223 pkgsrc/pkgtools/pkg_install/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkg_install/Makefile 2017/07/27 18:54:44 1.222
+++ pkgsrc/pkgtools/pkg_install/Makefile 2018/01/27 19:07:47 1.223
@@ -1,30 +1,30 @@ @@ -1,30 +1,30 @@
1# $NetBSD: Makefile,v 1.222 2017/07/27 18:54:44 tnn Exp $ 1# $NetBSD: Makefile,v 1.223 2018/01/27 19:07:47 rillig Exp $
2 2
3# Notes to package maintainers: 3# Notes to package maintainers:
4# 4#
5# Updating this package does not automatically necessitate bumping 5# Updating this package does not automatically necessitate bumping
6# PKGTOOLS_REQD in bsd.pkg.mk. Do so if and only if there is a critical 6# PKGTOOLS_REQD in bsd.pkg.mk. Do so if and only if there is a critical
7# change in the pkg_* tools that pkgsrc relies on for proper operation. 7# change in the pkg_* tools that pkgsrc relies on for proper operation.
8 8
9PKGNAME= pkg_install-${VERSION} 9PKGNAME= pkg_install-${VERSION}
10CATEGORIES= pkgtools 10CATEGORIES= pkgtools
11 11
12MAINTAINER= agc@NetBSD.org 12MAINTAINER= agc@NetBSD.org
13HOMEPAGE= http://www.pkgsrc.org/ 13HOMEPAGE= http://www.pkgsrc.org/
14COMMENT= Package management and administration tools for pkgsrc 14COMMENT= Package management and administration tools for pkgsrc
15LICENSE= modified-bsd 15LICENSE= modified-bsd
16 16
17BOOTSTRAP_PKG= yes 17BOOTSTRAP_PKG= yes
18SKIP_LICENSE_CHECK= yes 18SKIP_LICENSE_CHECK= yes
19 19
20CONFLICTS+= audit-packages-[0-9]* 20CONFLICTS+= audit-packages-[0-9]*
21 21
22GNU_CONFIGURE= yes 22GNU_CONFIGURE= yes
23CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 23CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
24CONFIGURE_ARGS+= --with-pkgdbdir=${PKG_DBDIR} 24CONFIGURE_ARGS+= --with-pkgdbdir=${PKG_DBDIR}
25 25
26USE_FEATURES= nbcompat 26USE_FEATURES= nbcompat
27 27
28NBCOMPAT_CONFIGURE_ARGS+= --enable-bsd-getopt --enable-db 28NBCOMPAT_CONFIGURE_ARGS+= --enable-bsd-getopt --enable-db
29 29
30SKIP_AUDIT_PACKAGES= yes 30SKIP_AUDIT_PACKAGES= yes
@@ -135,28 +135,28 @@ LDFLAGS+= -L${WRKDIR}/zlib @@ -135,28 +135,28 @@ LDFLAGS+= -L${WRKDIR}/zlib
135.endif 135.endif
136.if empty(USE_BUILTIN.libarchive:M[yY][eE][sS]) 136.if empty(USE_BUILTIN.libarchive:M[yY][eE][sS])
137CPPFLAGS+= -I${WRKDIR}/libarchive/libarchive 137CPPFLAGS+= -I${WRKDIR}/libarchive/libarchive
138LDFLAGS+= -L${WRKDIR}/libarchive/.libs 138LDFLAGS+= -L${WRKDIR}/libarchive/.libs
139 139
140# Only use XZ if we actually have builtin support for it. Some systems 140# Only use XZ if we actually have builtin support for it. Some systems
141# install the header, but without usable library or prefer to not use 141# install the header, but without usable library or prefer to not use
142# the system version, so give them some control. 142# the system version, so give them some control.
143. if empty(USE_BUILTIN.xz:M[Yy][Ee][Ss]) 143. if empty(USE_BUILTIN.xz:M[Yy][Ee][Ss])
144LIBARCHIVE_CONFIGURE_ARGS+= --without-lzma 144LIBARCHIVE_CONFIGURE_ARGS+= --without-lzma
145. endif 145. endif
146 146
147LIBARCHIVE_LIBS= ${SED} -n -e 's/^Libs.private://p' \ 147LIBARCHIVE_LIBS= ${SED} -n -e 's/^Libs.private://p' \
148 ${WRKDIR}/libarchive/build/pkgconfig/libarchive.pc 2>/dev/null || echo 148 ${WRKDIR}/libarchive/build/pkgconfig/libarchive.pc 2>/dev/null || echo
149LIBS+= ${LIBARCHIVE_LIBS:sh} 149LIBS+= ${LIBARCHIVE_LIBS:sh}
150 150
151CONFIG_GUESS_OVERRIDE+= ${WRKDIR}/libarchive/build/autoconf/config.guess \ 151CONFIG_GUESS_OVERRIDE+= ${WRKDIR}/libarchive/build/autoconf/config.guess \
152 ${WRKSRC}/config.guess 152 ${WRKSRC}/config.guess
153CONFIG_SUB_OVERRIDE+= ${WRKDIR}/libarchive/build/autoconf/config.sub \ 153CONFIG_SUB_OVERRIDE+= ${WRKDIR}/libarchive/build/autoconf/config.sub \
154 ${WRKSRC}/config.sub 154 ${WRKSRC}/config.sub
155 155
156CPPFLAGS.Cygwin+= -DLIBARCHIVE_STATIC 156CPPFLAGS.Cygwin+= -DLIBARCHIVE_STATIC
157 157
158# Make sure that the linker used our static library instead of the 158# Make sure that the linker used our static library instead of the
159# (outdated) dynamic library "/usr/lib/libarchive.dylib". 159# (outdated) dynamic library "/usr/lib/libarchive.dylib".
160LDFLAGS.Darwin+= -Wl,-search_paths_first 160LDFLAGS.Darwin+= -Wl,-search_paths_first
161 161
162# workaround for pkg/45491 162# workaround for pkg/45491
cvs diff -r1.1 -r1.2 pkgsrc/pkgtools/pkg_install-info/hacks.mk (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkg_install-info/hacks.mk 2006/12/24 14:07:55 1.1
+++ pkgsrc/pkgtools/pkg_install-info/hacks.mk 2018/01/27 19:07:47 1.2
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1# $NetBSD: hacks.mk,v 1.1 2006/12/24 14:07:55 schwarz Exp $ 1# $NetBSD: hacks.mk,v 1.2 2018/01/27 19:07:47 rillig Exp $
2 2
3.if !defined(PKG_INSTALL-INFO_HACKS_MK) 3.if !defined(PKG_INSTALL-INFO_HACKS_MK)
4PKG_INSTALL-INFO_HACKS_MK= #defined 4PKG_INSTALL-INFO_HACKS_MK= #defined
5 5
6### [Sat Dec 23 16:09:15 CET 2006: schwarz] 6### [Sat Dec 23 16:09:15 CET 2006: schwarz]
7### work around gcc optimization issue (gcc bug report c/14675) 7### work around gcc optimization issue (gcc bug report c/14675)
8### see http://gcc.gnu.org/ml/gcc-bugs/2004-03/msg02604.html 8### see http://gcc.gnu.org/ml/gcc-bugs/2004-03/msg02604.html
9### 9###
10. if !empty(PKGSRC_COMPILER:Mgcc*) && !empty(CFLAGS:M-O3) 10. if !empty(PKGSRC_COMPILER:Mgcc*) && !empty(CFLAGS:M-O3)
11PKG_HACKS+= suppress-Werror 11PKG_HACKS+= suppress-Werror
12BUILDLINK_TRANSFORM+= rm:-Werror 12BUILDLINK_TRANSFORM+= rm:-Werror
13. endif 13. endif
14 14
15.endif 15.endif
cvs diff -r1.7 -r1.8 pkgsrc/pkgtools/pkg_leaves/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkg_leaves/Makefile 2014/03/03 04:47:04 1.7
+++ pkgsrc/pkgtools/pkg_leaves/Makefile 2018/01/27 19:07:47 1.8
@@ -1,28 +1,28 @@ @@ -1,28 +1,28 @@
1# $NetBSD: Makefile,v 1.7 2014/03/03 04:47:04 obache Exp $ 1# $NetBSD: Makefile,v 1.8 2018/01/27 19:07:47 rillig Exp $
2 2
3PKGNAME= pkg_leaves-1.2 3PKGNAME= pkg_leaves-1.2
4CATEGORIES= pkgtools 4CATEGORIES= pkgtools
5 5
6MAINTAINER= joerg@NetBSD.org 6MAINTAINER= joerg@NetBSD.org
7COMMENT= Print leaf packages 7COMMENT= Print leaf packages
8LICENSE= 2-clause-bsd 8LICENSE= 2-clause-bsd
9 9
10WRKSRC= ${WRKDIR} 10WRKSRC= ${WRKDIR}
11NO_BUILD= yes 11NO_BUILD= yes
12USE_LANGUAGES= # none 12USE_LANGUAGES= # none
13 13
14# Set SCRIPT_SUBST to substitute "@VARIABLE@" with "value" 14# Set SCRIPT_SUBST to substitute "@VARIABLE@" with "value"
15SUBST_CLASSES+= vars 15SUBST_CLASSES+= vars
16SUBST_STAGE.vars= do-configure 16SUBST_STAGE.vars= do-configure
17SUBST_FILES.vars= pkg_leaves 17SUBST_FILES.vars= pkg_leaves
18SUBST_VARS.vars= PKG_INFO_CMD PKG_DBDIR SH 18SUBST_VARS.vars= PKG_INFO_CMD PKG_DBDIR SH
19 19
20INSTALLATION_DIRS= bin 20INSTALLATION_DIRS= bin
21 21
22do-extract: 22do-extract:
23 cd ${FILESDIR} && cp pkg_leaves ${WRKSRC}/ 23 cd ${FILESDIR} && cp pkg_leaves ${WRKSRC}/
24 24
25do-install: 25do-install:
26 ${INSTALL_SCRIPT} ${WRKSRC}/pkg_leaves ${DESTDIR}${PREFIX}/bin 26 ${INSTALL_SCRIPT} ${WRKSRC}/pkg_leaves ${DESTDIR}${PREFIX}/bin
27 27
28.include "../../mk/bsd.pkg.mk" 28.include "../../mk/bsd.pkg.mk"
cvs diff -r1.15 -r1.16 pkgsrc/pkgtools/pkg_p5up2date/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkg_p5up2date/Makefile 2016/07/09 06:38:48 1.15
+++ pkgsrc/pkgtools/pkg_p5up2date/Makefile 2018/01/27 19:07:47 1.16
@@ -1,44 +1,44 @@ @@ -1,44 +1,44 @@
1# $NetBSD: Makefile,v 1.15 2016/07/09 06:38:48 wiz Exp $ 1# $NetBSD: Makefile,v 1.16 2018/01/27 19:07:47 rillig Exp $
2 2
3PKGNAME= pkg_p5up2date-0.06 3PKGNAME= pkg_p5up2date-0.06
4PKGREVISION= 3 4PKGREVISION= 3
5CATEGORIES= pkgtools 5CATEGORIES= pkgtools
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8COMMENT= Check p5-* pkgsrc packages requiring updates 8COMMENT= Check p5-* pkgsrc packages requiring updates
9 9
10USE_TOOLS+= perl:run 10USE_TOOLS+= perl:run
11 11
12WRKSRC= ${WRKDIR} 12WRKSRC= ${WRKDIR}
13NO_BUILD= yes 13NO_BUILD= yes
14USE_LANGUAGES= # none 14USE_LANGUAGES= # none
15 15
16DEPENDS+= p5-File-Find-Rule>=0.30:../../devel/p5-File-Find-Rule 16DEPENDS+= p5-File-Find-Rule>=0.30:../../devel/p5-File-Find-Rule
17DEPENDS+= p5-CPAN-DistnameInfo>=0.02:../../devel/p5-CPAN-DistnameInfo 17DEPENDS+= p5-CPAN-DistnameInfo>=0.02:../../devel/p5-CPAN-DistnameInfo
18 18
19INSTALLATION_DIRS= bin ${PKGMANDIR}/man8 19INSTALLATION_DIRS= bin ${PKGMANDIR}/man8
20 20
21SUBST_CLASSES+= tools 21SUBST_CLASSES+= tools
22SUBST_STAGE.tools= pre-configure 22SUBST_STAGE.tools= pre-configure
23SUBST_MESSAGE.tools= Substituting tool locations. 23SUBST_MESSAGE.tools= Substituting tool locations.
24SUBST_FILES.tools= pkg_p5up2date.pl 24SUBST_FILES.tools= pkg_p5up2date.pl
25SUBST_VARS.tools= PKG_INFO_CMD MAKE PERL5 25SUBST_VARS.tools= PKG_INFO_CMD MAKE PERL5
26 26
27SUBST_CLASSES+= pkgsrcdir 27SUBST_CLASSES+= pkgsrcdir
28SUBST_STAGE.pkgsrcdir= pre-configure 28SUBST_STAGE.pkgsrcdir= pre-configure
29SUBST_MESSAGE.pkgsrcdir=Recording default path of pkgsrc base directory. 29SUBST_MESSAGE.pkgsrcdir= Recording default path of pkgsrc base directory.
30SUBST_FILES.pkgsrcdir= pkg_p5up2date.pl 30SUBST_FILES.pkgsrcdir= pkg_p5up2date.pl
31SUBST_SED.pkgsrcdir= -e 's,@PKGSRCDIR@,${PKGSRCDIR},g' 31SUBST_SED.pkgsrcdir= -e 's,@PKGSRCDIR@,${PKGSRCDIR},g'
32 32
33# REPLACE_PERL+= pkg_p5up2date.pl 33# REPLACE_PERL+= pkg_p5up2date.pl
34 34
35.include "../../mk/bsd.prefs.mk" 35.include "../../mk/bsd.prefs.mk"
36 36
37do-extract: 37do-extract:
38 cp ${FILESDIR}/pkg_p5up2date.pl ${WRKSRC} 38 cp ${FILESDIR}/pkg_p5up2date.pl ${WRKSRC}
39 39
40do-install: 40do-install:
41 ${INSTALL_SCRIPT} ${WRKSRC}/pkg_p5up2date.pl \ 41 ${INSTALL_SCRIPT} ${WRKSRC}/pkg_p5up2date.pl \
42 ${DESTDIR}${PREFIX}/bin/pkg_p5up2date 42 ${DESTDIR}${PREFIX}/bin/pkg_p5up2date
43 pod2man ${DESTDIR}${PREFIX}/bin/pkg_p5up2date \ 43 pod2man ${DESTDIR}${PREFIX}/bin/pkg_p5up2date \
44 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/pkg_p5up2date.8 44 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/pkg_p5up2date.8
cvs diff -r1.41 -r1.42 pkgsrc/pkgtools/pkg_tarup/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkg_tarup/Makefile 2014/03/03 03:30:54 1.41
+++ pkgsrc/pkgtools/pkg_tarup/Makefile 2018/01/27 19:07:47 1.42
@@ -1,28 +1,28 @@ @@ -1,28 +1,28 @@
1# $NetBSD: Makefile,v 1.41 2014/03/03 03:30:54 obache Exp $ 1# $NetBSD: Makefile,v 1.42 2018/01/27 19:07:47 rillig Exp $
2 2
3PKGNAME= pkg_tarup-1.9.1 3PKGNAME= pkg_tarup-1.9.1
4CATEGORIES= pkgtools 4CATEGORIES= pkgtools
5 5
6MAINTAINER= hubertf@NetBSD.org 6MAINTAINER= hubertf@NetBSD.org
7COMMENT= Generates binary package(s) from installed pkg(s) 7COMMENT= Generates binary package(s) from installed pkg(s)
8 8
9WRKSRC= ${WRKDIR} 9WRKSRC= ${WRKDIR}
10NO_BUILD= yes 10NO_BUILD= yes
11USE_LANGUAGES= # none 11USE_LANGUAGES= # none
12AUTO_MKDIRS= yes 12AUTO_MKDIRS= yes
13 13
14# Set SCRIPT_SUBST to substitute "@VARIABLE@" with "value" 14# Set SCRIPT_SUBST to substitute "@VARIABLE@" with "value"
15SUBST_CLASSES+= tarup 15SUBST_CLASSES+= tarup
16SUBST_STAGE.tarup= do-configure 16SUBST_STAGE.tarup= do-configure
17SUBST_FILES.tarup= pkg_tarup pkg_tarup_all pkg_tarup.1 17SUBST_FILES.tarup= pkg_tarup pkg_tarup_all pkg_tarup.1
18SUBST_VARS.tarup= ECHO ECHO_N GREP HEAD ID PKG_DBDIR PKG_SUFX PKG_TOOLS_BIN PREFIX SED SH SU_CMD XARGS 18SUBST_VARS.tarup= ECHO ECHO_N GREP HEAD ID PKG_DBDIR PKG_SUFX PKG_TOOLS_BIN PREFIX SED SH SU_CMD XARGS
19SUBST_SED.tarup= -e 's,@ROOT_USER@,${REAL_ROOT_USER},g' 19SUBST_SED.tarup= -e 's,@ROOT_USER@,${REAL_ROOT_USER},g'
20 20
21do-extract: 21do-extract:
22 cd ${FILESDIR} && cp pkg_tarup pkg_tarup.1 pkg_tarup_all ${WRKSRC}/ 22 cd ${FILESDIR} && cp pkg_tarup pkg_tarup.1 pkg_tarup_all ${WRKSRC}/
23 23
24do-install: 24do-install:
25 ${INSTALL_SCRIPT} ${WRKSRC}/pkg_tarup ${DESTDIR}${PREFIX}/bin 25 ${INSTALL_SCRIPT} ${WRKSRC}/pkg_tarup ${DESTDIR}${PREFIX}/bin
26 ${INSTALL_SCRIPT} ${WRKSRC}/pkg_tarup_all ${DESTDIR}${PREFIX}/bin 26 ${INSTALL_SCRIPT} ${WRKSRC}/pkg_tarup_all ${DESTDIR}${PREFIX}/bin
27 ${INSTALL_MAN} ${WRKSRC}/pkg_tarup.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 27 ${INSTALL_MAN} ${WRKSRC}/pkg_tarup.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
28 28
cvs diff -r1.15 -r1.16 pkgsrc/pkgtools/pkgse/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkgse/Makefile 2016/07/09 06:38:49 1.15
+++ pkgsrc/pkgtools/pkgse/Makefile 2018/01/27 19:07:47 1.16
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1# $NetBSD: Makefile,v 1.15 2016/07/09 06:38:49 wiz Exp $ 1# $NetBSD: Makefile,v 1.16 2018/01/27 19:07:47 rillig Exp $
2# 2#
3 3
4DISTNAME= pkgse-0.3 4DISTNAME= pkgse-0.3
5PKGREVISION= 6 5PKGREVISION= 6
6CATEGORIES= pkgtools 6CATEGORIES= pkgtools
7MASTER_SITES= http://imil.net/NetBSD/ 7MASTER_SITES= http://imil.net/NetBSD/
8EXTRACT_SUFX= .tgz 8EXTRACT_SUFX= .tgz
9 9
10MAINTAINER= imil@gcu.info 10MAINTAINER= imil@gcu.info
11HOMEPAGE= http://imil.net/wp/ 11HOMEPAGE= http://imil.net/wp/
12COMMENT= Fetch informations about a NetBSD package from pkgsrc.netbsd.se 12COMMENT= Fetch informations about a NetBSD package from pkgsrc.netbsd.se
13 13
14DEPENDS+= p5-libwww>=5.76:../../www/p5-libwww 14DEPENDS+= p5-libwww>=5.76:../../www/p5-libwww
15 15
16NO_BUILD= yes 16NO_BUILD= yes
17USE_TOOLS+= perl:run 17USE_TOOLS+= perl:run
18 18
19INSTALLATION_DIRS= bin 19INSTALLATION_DIRS= bin
20REPLACE_PERL= pkgse 20REPLACE_PERL= pkgse
21 21
22do-install: 22do-install:
23 ${INSTALL_SCRIPT} ${WRKSRC}/pkgse ${DESTDIR}${PREFIX}/bin 23 ${INSTALL_SCRIPT} ${WRKSRC}/pkgse ${DESTDIR}${PREFIX}/bin
24 24
25.include "../../mk/bsd.pkg.mk" 25.include "../../mk/bsd.pkg.mk"
cvs diff -r1.7 -r1.8 pkgsrc/pkgtools/x11-links/builtin.mk (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/builtin.mk 2005/06/01 18:03:08 1.7
+++ pkgsrc/pkgtools/x11-links/builtin.mk 2018/01/27 19:07:48 1.8
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1# $NetBSD: builtin.mk,v 1.7 2005/06/01 18:03:08 jlam Exp $ 1# $NetBSD: builtin.mk,v 1.8 2018/01/27 19:07:48 rillig Exp $
2 2
3BUILTIN_PKG:= x11-links 3BUILTIN_PKG:= x11-links
4.include "../../mk/buildlink3/bsd.builtin.mk" 4.include "../../mk/buildlink3/bsd.builtin.mk"
5 5
6.if !defined(USE_BUILTIN.x11-links) 6.if !defined(USE_BUILTIN.x11-links)
7USE_BUILTIN.x11-links= no 7USE_BUILTIN.x11-links= no
8.endif 8.endif
9MAKEVARS+= USE_BUILTIN.x11-links 9MAKEVARS+= USE_BUILTIN.x11-links
cvs diff -r1.5 -r1.6 pkgsrc/pkgtools/x11-links/version.mk (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/version.mk 2011/01/30 17:26:32 1.5
+++ pkgsrc/pkgtools/x11-links/version.mk 2018/01/27 19:07:48 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: version.mk,v 1.5 2011/01/30 17:26:32 wiz Exp $ 1# $NetBSD: version.mk,v 1.6 2018/01/27 19:07:48 rillig Exp $
2# 2#
3# This Makefile fragment is included by Makefiles that need to access 3# This Makefile fragment is included by Makefiles that need to access
4# the X11_TYPE and version number of a native X11 distribution. 4# the X11_TYPE and version number of a native X11 distribution.
5# 5#
6# The following variables are provided by this file: 6# The following variables are provided by this file:
7# 7#
8# BUILTIN_X11_TYPE.native is the X11_TYPE of the native X11 8# BUILTIN_X11_TYPE.native is the X11_TYPE of the native X11
9# distribution detected on the system. 9# distribution detected on the system.
10# 10#
11# BUILTIN_X11_VERSION.native is the version number, where applicable, 11# BUILTIN_X11_VERSION.native is the version number, where applicable,
12# of the native X11 distribution detected on the system. 12# of the native X11 distribution detected on the system.
13# 13#
14 14
@@ -22,14 +22,14 @@ BUILTIN_X11_VERSION.native= ${BUILTIN_X1 @@ -22,14 +22,14 @@ BUILTIN_X11_VERSION.native= ${BUILTIN_X1
22. elif defined(BUILTIN_X11_VERSION.XFree86) 22. elif defined(BUILTIN_X11_VERSION.XFree86)
23BUILTIN_X11_TYPE.native= ${BUILTIN_X11_TYPE.XFree86} 23BUILTIN_X11_TYPE.native= ${BUILTIN_X11_TYPE.XFree86}
24BUILTIN_X11_VERSION.native= ${BUILTIN_X11_VERSION.XFree86} 24BUILTIN_X11_VERSION.native= ${BUILTIN_X11_VERSION.XFree86}
25. elif !empty(X11BASE:M*openwin) 25. elif !empty(X11BASE:M*openwin)
26BUILTIN_X11_TYPE.native= openwin 26BUILTIN_X11_TYPE.native= openwin
27. elif ${OPSYS} == "IRIX" 27. elif ${OPSYS} == "IRIX"
28BUILTIN_X11_TYPE.native= xsgi 28BUILTIN_X11_TYPE.native= xsgi
29. elif ${OPSYS} == "OSF1" 29. elif ${OPSYS} == "OSF1"
30BUILTIN_X11_TYPE.native= xdec 30BUILTIN_X11_TYPE.native= xdec
31. else 31. else
32BUILTIN_X11_TYPE.native= unknown 32BUILTIN_X11_TYPE.native= unknown
33. endif 33. endif
34.endif 34.endif
35MAKEVARS+= BUILTIN_X11_VERSION.native BUILTIN_X11_TYPE.native 35MAKEVARS+= BUILTIN_X11_VERSION.native BUILTIN_X11_TYPE.native
cvs diff -r1.17 -r1.18 pkgsrc/pkgtools/x11-links/xfree.mk (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/xfree.mk 2016/07/10 13:28:41 1.17
+++ pkgsrc/pkgtools/x11-links/xfree.mk 2018/01/27 19:07:48 1.18
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: xfree.mk,v 1.17 2016/07/10 13:28:41 rillig Exp $ 1# $NetBSD: xfree.mk,v 1.18 2018/01/27 19:07:48 rillig Exp $
2 2
3FILES_LIST= ${FILESDIR}/xfree 3FILES_LIST= ${FILESDIR}/xfree
4 4
5.include "../../fonts/fontconfig/buildlink3.mk" 5.include "../../fonts/fontconfig/buildlink3.mk"
6.include "../../graphics/MesaLib/buildlink3.mk" 6.include "../../graphics/MesaLib/buildlink3.mk"
7.include "../../graphics/freetype2/buildlink3.mk" 7.include "../../graphics/freetype2/buildlink3.mk"
8.include "../../graphics/glu/buildlink3.mk" 8.include "../../graphics/glu/buildlink3.mk"
9.include "../../x11/libXft/buildlink3.mk" 9.include "../../x11/libXft/buildlink3.mk"
10.include "../../x11/libXpm/buildlink3.mk" 10.include "../../x11/libXpm/buildlink3.mk"
11.include "../../textproc/expat/buildlink3.mk" 11.include "../../textproc/expat/buildlink3.mk"
12.include "../../x11/libXcursor/buildlink3.mk" 12.include "../../x11/libXcursor/buildlink3.mk"
13.include "../../x11/libXrandr/buildlink3.mk" 13.include "../../x11/libXrandr/buildlink3.mk"
14.include "../../x11/libXrender/buildlink3.mk" 14.include "../../x11/libXrender/buildlink3.mk"
@@ -19,16 +19,16 @@ FILES_LIST= ${FILESDIR}/xfree @@ -19,16 +19,16 @@ FILES_LIST= ${FILESDIR}/xfree
19# ${X11BASE} actually belong to the base XFree86 or not. 19# ${X11BASE} actually belong to the base XFree86 or not.
20# 20#
21.for pkg in ${BUILDLINK_TREE:N-*:Nx11-links:O:u} 21.for pkg in ${BUILDLINK_TREE:N-*:Nx11-links:O:u}
22CHECK_BUILTIN.${pkg}:= yes 22CHECK_BUILTIN.${pkg}:= yes
23USE_BUILTIN.${pkg}= yes 23USE_BUILTIN.${pkg}= yes
24. sinclude "${BUILDLINK_PKGSRCDIR.${pkg}}/builtin.mk" 24. sinclude "${BUILDLINK_PKGSRCDIR.${pkg}}/builtin.mk"
25CHECK_BUILTIN.${pkg}:= no 25CHECK_BUILTIN.${pkg}:= no
26.endfor 26.endfor
27 27
28.for pkg in ${BUILDLINK_TREE:N-*:Nx11-links:O:u} 28.for pkg in ${BUILDLINK_TREE:N-*:Nx11-links:O:u}
29IGNORE_PKG.${pkg}= yes 29IGNORE_PKG.${pkg}= yes
30. if (defined(IS_BUILTIN.${pkg}) && !empty(IS_BUILTIN.${pkg}:M[yY][eE][sS]) ) && \ 30. if (defined(IS_BUILTIN.${pkg}) && !empty(IS_BUILTIN.${pkg}:M[yY][eE][sS]) ) && \
31 exists(${FILESDIR}/xfree.${pkg}) 31 exists(${FILESDIR}/xfree.${pkg})
32FILES_LIST+= ${FILESDIR}/xfree.${pkg} 32FILES_LIST+= ${FILESDIR}/xfree.${pkg}
33. endif 33. endif
34.endfor 34.endfor
cvs diff -r1.3 -r1.4 pkgsrc/pkgtools/x11-links/xorg-version.mk (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/xorg-version.mk 2013/01/23 15:25:04 1.3
+++ pkgsrc/pkgtools/x11-links/xorg-version.mk 2018/01/27 19:07:48 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: xorg-version.mk,v 1.3 2013/01/23 15:25:04 tron Exp $ 1# $NetBSD: xorg-version.mk,v 1.4 2018/01/27 19:07:48 rillig Exp $
2# 2#
3# This Makefile fragment is included by Makefiles that need to access 3# This Makefile fragment is included by Makefiles that need to access
4# the X11_TYPE and version number of an X.org distribution. 4# the X11_TYPE and version number of an X.org distribution.
5# 5#
6# The following variables are provided by this file: 6# The following variables are provided by this file:
7# 7#
8# BUILTIN_X11_TYPE.xorg is the X11_TYPE of the X.org distribution 8# BUILTIN_X11_TYPE.xorg is the X11_TYPE of the X.org distribution
9# and is simply "xorg". 9# and is simply "xorg".
10# 10#
11# BUILTIN_X11_VERSION.xorg is the version number of the X.org 11# BUILTIN_X11_VERSION.xorg is the version number of the X.org
12# distribution detected on the system. 12# distribution detected on the system.
13# 13#
14 14
@@ -18,27 +18,27 @@ BUILTIN_FIND_FILES_VAR:= CF_XORG CF_XOR @@ -18,27 +18,27 @@ BUILTIN_FIND_FILES_VAR:= CF_XORG CF_XOR
18BUILTIN_FIND_FILES.CF_XORG= ${X11BASE}/lib/X11/config/xorg.cf 18BUILTIN_FIND_FILES.CF_XORG= ${X11BASE}/lib/X11/config/xorg.cf
19BUILTIN_FIND_FILES.CF_XORG_VERSION= ${X11BASE}/lib/X11/config/xorgversion.def 19BUILTIN_FIND_FILES.CF_XORG_VERSION= ${X11BASE}/lib/X11/config/xorgversion.def
20BUILTIN_FIND_FILES.CF_VERSION_OLD= ${X11BASE}/lib/X11/config/version.def 20BUILTIN_FIND_FILES.CF_VERSION_OLD= ${X11BASE}/lib/X11/config/version.def
21.include "../../mk/buildlink3/find-files.mk" 21.include "../../mk/buildlink3/find-files.mk"
22 22
23.if !defined(BUILTIN_XORG_VERSION_FILE) 23.if !defined(BUILTIN_XORG_VERSION_FILE)
24BUILTIN_XORG_VERSION_FILE= __nonexistent__ 24BUILTIN_XORG_VERSION_FILE= __nonexistent__
25. if exists(${CF_XORG_VERSION}) 25. if exists(${CF_XORG_VERSION})
26BUILTIN_XORG_VERSION_FILE= ${CF_XORG_VERSION} 26BUILTIN_XORG_VERSION_FILE= ${CF_XORG_VERSION}
27. elif exists(${CF_VERSION_OLD}) 27. elif exists(${CF_VERSION_OLD})
28BUILTIN_XORG_VERSION_FILE= ${CF_VERSION_OLD} 28BUILTIN_XORG_VERSION_FILE= ${CF_VERSION_OLD}
29. endif 29. endif
30.endif 30.endif
31MAKEVARS+= BUILTIN_XORG_VERSION_FILE 31MAKEVARS+= BUILTIN_XORG_VERSION_FILE
32 32
33.if !defined(BUILTIN_X11_VERSION.xorg) 33.if !defined(BUILTIN_X11_VERSION.xorg)
34. if exists(${BUILTIN_XORG_VERSION_FILE}) 34. if exists(${BUILTIN_XORG_VERSION_FILE})
35BUILTIN_X11_VERSION.xorg!= \ 35BUILTIN_X11_VERSION.xorg!= \
36 ${AWK} '/\#define[ ]*XORG_VERSION_MAJOR/ { M = $$3 } \ 36 ${AWK} '/\#define[ ]*XORG_VERSION_MAJOR/ { M = $$3 } \
37 /\#define[ ]*XORG_VERSION_MINOR/ { m = "."$$3 } \ 37 /\#define[ ]*XORG_VERSION_MINOR/ { m = "."$$3 } \
38 /\#define[ ]*XORG_VERSION_PATCH/ { p = "."$$3 } \ 38 /\#define[ ]*XORG_VERSION_PATCH/ { p = "."$$3 } \
39 /\#define[ ]*XORG_VERSION_SNAP/ { s = "."$$3 } \ 39 /\#define[ ]*XORG_VERSION_SNAP/ { s = "."$$3 } \
40 END { if (s == ".0") s = ""; \ 40 END { if (s == ".0") s = ""; \
41 if (p == ".0" && s == "") p = ""; \ 41 if (p == ".0" && s == "") p = ""; \
42 printf "%s%s%s%s\n", M, m, p, s }' \ 42 printf "%s%s%s%s\n", M, m, p, s }' \
43 ${BUILTIN_XORG_VERSION_FILE} 43 ${BUILTIN_XORG_VERSION_FILE}
44. endif 44. endif
cvs diff -r1.28 -r1.29 pkgsrc/pkgtools/x11-links/xorg.mk (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/xorg.mk 2017/01/24 14:25:00 1.28
+++ pkgsrc/pkgtools/x11-links/xorg.mk 2018/01/27 19:07:48 1.29
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: xorg.mk,v 1.28 2017/01/24 14:25:00 mrg Exp $ 1# $NetBSD: xorg.mk,v 1.29 2018/01/27 19:07:48 rillig Exp $
2# 2#
3# This is for X.org, but use "xfree" files also. 3# This is for X.org, but use "xfree" files also.
4 4
5FILES_LIST= ${FILESDIR}/xorg 5FILES_LIST= ${FILESDIR}/xorg
6 6
7# XXX: what about xaw? 7# XXX: what about xaw?
8 8
9.include "../../fonts/fontconfig/buildlink3.mk" 9.include "../../fonts/fontconfig/buildlink3.mk"
10.include "../../fonts/libfontenc/buildlink3.mk" 10.include "../../fonts/libfontenc/buildlink3.mk"
11.include "../../graphics/MesaLib/buildlink3.mk" 11.include "../../graphics/MesaLib/buildlink3.mk"
12.include "../../graphics/freetype2/buildlink3.mk" 12.include "../../graphics/freetype2/buildlink3.mk"
13.include "../../graphics/glu/buildlink3.mk" 13.include "../../graphics/glu/buildlink3.mk"
14.include "../../graphics/glut/buildlink3.mk" 14.include "../../graphics/glut/buildlink3.mk"
@@ -84,19 +84,19 @@ FILES_LIST= ${FILESDIR}/xorg @@ -84,19 +84,19 @@ FILES_LIST= ${FILESDIR}/xorg
84# 84#
85# XXX: maybe skip iconv and zlib too? 85# XXX: maybe skip iconv and zlib too?
86.for pkg in ${BUILDLINK_TREE:N-*:Nx11-links:O:u} 86.for pkg in ${BUILDLINK_TREE:N-*:Nx11-links:O:u}
87CHECK_BUILTIN.${pkg}:= yes 87CHECK_BUILTIN.${pkg}:= yes
88. sinclude "${BUILDLINK_PKGSRCDIR.${pkg}}/builtin.mk" 88. sinclude "${BUILDLINK_PKGSRCDIR.${pkg}}/builtin.mk"
89CHECK_BUILTIN.${pkg}:= no 89CHECK_BUILTIN.${pkg}:= no
90.endfor 90.endfor
91 91
92.for pkg in ${BUILDLINK_TREE:N-*:Nx11-links:O:u} 92.for pkg in ${BUILDLINK_TREE:N-*:Nx11-links:O:u}
93IGNORE_PKG.${pkg}= yes 93IGNORE_PKG.${pkg}= yes
94. if defined(USE_BUILTIN.${pkg}) && \ 94. if defined(USE_BUILTIN.${pkg}) && \
95 !empty(USE_BUILTIN.${pkg}:M[yY][eE][sS]) 95 !empty(USE_BUILTIN.${pkg}:M[yY][eE][sS])
96. if exists(${FILESDIR}/xorg.${pkg}) 96. if exists(${FILESDIR}/xorg.${pkg})
97FILES_LIST+= ${FILESDIR}/xorg.${pkg} 97FILES_LIST+= ${FILESDIR}/xorg.${pkg}
98. elif exists(${FILESDIR}/xfree.${pkg}) 98. elif exists(${FILESDIR}/xfree.${pkg})
99FILES_LIST+= ${FILESDIR}/xfree.${pkg} 99FILES_LIST+= ${FILESDIR}/xfree.${pkg}
100. endif 100. endif
101. endif 101. endif
102.endfor 102.endfor