Mon Mar 3 03:30:55 2014 UTC ()
Just define PKGNAME and use it.


(obache)
diff -r1.19 -r1.20 pkgsrc/pkgtools/autoswc/Makefile
diff -r1.12 -r1.13 pkgsrc/pkgtools/binpatch/Makefile
diff -r1.11 -r1.12 pkgsrc/pkgtools/bootstrap-extras/Makefile
diff -r1.39 -r1.40 pkgsrc/pkgtools/bootstrap-mk-files/Makefile
diff -r1.31 -r1.32 pkgsrc/pkgtools/cdpack/Makefile
diff -r1.8 -r1.9 pkgsrc/pkgtools/compat_headers/Makefile
diff -r1.50 -r1.51 pkgsrc/pkgtools/createbuildlink/Makefile
diff -r1.14 -r1.15 pkgsrc/pkgtools/dfdisk/Makefile
diff -r1.59 -r1.60 pkgsrc/pkgtools/digest/Makefile
diff -r1.9 -r1.10 pkgsrc/pkgtools/genrpm/Makefile
diff -r1.34 -r1.35 pkgsrc/pkgtools/libkver/Makefile
diff -r1.79 -r1.80 pkgsrc/pkgtools/libnbcompat/Makefile
diff -r1.14 -r1.15 pkgsrc/pkgtools/lintpkgsrc/Makefile
diff -r1.7 -r1.8 pkgsrc/pkgtools/mksandbox/Makefile
diff -r1.27 -r1.28 pkgsrc/pkgtools/mtree/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/pkgtools/osabi/Makefile
diff -r1.22 -r1.23 pkgsrc/pkgtools/p5-pkgsrc-Dewey/Makefile
diff -r1.67 -r1.68 pkgsrc/pkgtools/pbulk/Makefile
diff -r1.19 -r1.20 pkgsrc/pkgtools/pkg_alternatives/Makefile
diff -r1.82 -r1.83 pkgsrc/pkgtools/pkg_chk/Makefile
diff -r1.50 -r1.51 pkgsrc/pkgtools/pkg_comp/Makefile
diff -r1.7 -r1.8 pkgsrc/pkgtools/pkg_distinst/Makefile
diff -r1.35 -r1.36 pkgsrc/pkgtools/pkg_filecheck/Makefile
diff -r1.201 -r1.202 pkgsrc/pkgtools/pkg_install/Makefile
diff -r1.20 -r1.21 pkgsrc/pkgtools/pkg_install-info/Makefile
diff -r1.5 -r1.6 pkgsrc/pkgtools/pkg_leaves/Makefile
diff -r1.17 -r1.18 pkgsrc/pkgtools/pkg_notify/Makefile
diff -r1.7 -r1.8 pkgsrc/pkgtools/pkg_p5up2date/Makefile
diff -r1.11 -r1.12 pkgsrc/pkgtools/pkg_regress/Makefile
diff -r1.34 -r1.35 pkgsrc/pkgtools/pkg_rolling-replace/Makefile
diff -r1.40 -r1.41 pkgsrc/pkgtools/pkg_tarup/Makefile
diff -r1.16 -r1.17 pkgsrc/pkgtools/pkgclean/Makefile
diff -r1.18 -r1.19 pkgsrc/pkgtools/pkgdep/Makefile
diff -r1.32 -r1.33 pkgsrc/pkgtools/pkgdepgraph/Makefile
diff -r1.81 -r1.82 pkgsrc/pkgtools/pkgdiff/Makefile
diff -r1.24 -r1.25 pkgsrc/pkgtools/pkgfind/Makefile
diff -r1.7 -r1.8 pkgsrc/pkgtools/pkgsrc-todo/Makefile
diff -r1.12 -r1.13 pkgsrc/pkgtools/pkgsurvey/Makefile
diff -r1.42 -r1.43 pkgsrc/pkgtools/port2pkg/Makefile
diff -r1.8 -r1.9 pkgsrc/pkgtools/prereq-readme/Makefile
diff -r1.25 -r1.26 pkgsrc/pkgtools/rc.subr/Makefile
diff -r1.15 -r1.16 pkgsrc/pkgtools/rcorder/Makefile
diff -r1.4 -r1.5 pkgsrc/pkgtools/rdigest/Makefile

cvs diff -r1.19 -r1.20 pkgsrc/pkgtools/autoswc/Makefile (expand / switch to context diff)
--- pkgsrc/pkgtools/autoswc/Makefile 2012/09/11 23:19:33 1.19
+++ pkgsrc/pkgtools/autoswc/Makefile 2014/03/03 03:30:52 1.20
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2012/09/11 23:19:33 asau Exp $
+# $NetBSD: Makefile,v 1.20 2014/03/03 03:30:52 obache Exp $
 
-DISTNAME=		autoswc-1.6
+PKGNAME=		autoswc-1.6
 CATEGORIES=		pkgtools sysutils
-MASTER_SITES=		# empty
-DISTFILES=		# empty
 
 MAINTAINER=		jmmv@NetBSD.org
 COMMENT=		Generates system wide cache files for GNU autoconf

cvs diff -r1.12 -r1.13 pkgsrc/pkgtools/binpatch/Makefile (expand / switch to context diff)
--- pkgsrc/pkgtools/binpatch/Makefile 2012/09/11 23:19:33 1.12
+++ pkgsrc/pkgtools/binpatch/Makefile 2014/03/03 03:30:52 1.13
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2012/09/11 23:19:33 asau Exp $
+# $NetBSD: Makefile,v 1.13 2014/03/03 03:30:52 obache Exp $
 #
 
-DISTNAME=	binpatch-1.0
+PKGNAME=	binpatch-1.0
 CATEGORIES=	pkgtools
-MASTER_SITES=	# empty
-DISTFILES=	# empty
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/doc/pkgsrc.html

cvs diff -r1.11 -r1.12 pkgsrc/pkgtools/bootstrap-extras/Makefile (expand / switch to context diff)
--- pkgsrc/pkgtools/bootstrap-extras/Makefile 2012/09/11 23:19:34 1.11
+++ pkgsrc/pkgtools/bootstrap-extras/Makefile 2014/03/03 03:30:52 1.12
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2012/09/11 23:19:34 asau Exp $
+# $NetBSD: Makefile,v 1.12 2014/03/03 03:30:52 obache Exp $
 
-DISTNAME=	bootstrap-extra-files-20070702
+PKGNAME=	bootstrap-extra-files-20070702
 CATEGORIES=	pkgtools
-MASTER_SITES=	# empty
-DISTFILES=	# empty
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Extra bootstrap files and scripts for ${OPSYS}

cvs diff -r1.39 -r1.40 pkgsrc/pkgtools/bootstrap-mk-files/Makefile (expand / switch to context diff)
--- pkgsrc/pkgtools/bootstrap-mk-files/Makefile 2013/12/31 19:10:20 1.39
+++ pkgsrc/pkgtools/bootstrap-mk-files/Makefile 2014/03/03 03:30:53 1.40
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2013/12/31 19:10:20 dholland Exp $
+# $NetBSD: Makefile,v 1.40 2014/03/03 03:30:53 obache Exp $
 
-DISTNAME=	bootstrap-mk-files-20131207
+PKGNAME=	bootstrap-mk-files-20131207
 CATEGORIES=	pkgtools
-MASTER_SITES=	# empty
-DISTFILES=	# empty
 
 CONFLICTS+=	mk-files-[0-9]*
 

cvs diff -r1.31 -r1.32 pkgsrc/pkgtools/cdpack/Makefile (expand / switch to context diff)
--- pkgsrc/pkgtools/cdpack/Makefile 2012/09/11 23:19:34 1.31
+++ pkgsrc/pkgtools/cdpack/Makefile 2014/03/03 03:30:53 1.32
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2012/09/11 23:19:34 asau Exp $
+# $NetBSD: Makefile,v 1.32 2014/03/03 03:30:53 obache Exp $
 #
 
-DISTNAME=	cdpack-1.9
+PKGNAME=	cdpack-1.9
 CATEGORIES=	pkgtools
-MASTER_SITES=	# empty
-DISTFILES=	# empty
 
 MAINTAINER=	dmcmahill@NetBSD.org
 HOMEPAGE=	http://www.NetBSD.org/

cvs diff -r1.8 -r1.9 pkgsrc/pkgtools/compat_headers/Makefile (expand / switch to context diff)
--- pkgsrc/pkgtools/compat_headers/Makefile 2013/04/06 03:45:21 1.8
+++ pkgsrc/pkgtools/compat_headers/Makefile 2014/03/03 03:30:53 1.9
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2013/04/06 03:45:21 rodent Exp $
+# $NetBSD: Makefile,v 1.9 2014/03/03 03:30:53 obache Exp $
 
-DISTNAME=		compat_headers-0.2
+PKGNAME=		compat_headers-0.2
 CATEGORIES=		pkgtools
-MASTER_SITES=		# empty
-DISTFILES=		# empty
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.pkgsrc.org/

cvs diff -r1.50 -r1.51 pkgsrc/pkgtools/createbuildlink/Makefile (expand / switch to context diff)
--- pkgsrc/pkgtools/createbuildlink/Makefile 2013/12/23 11:57:05 1.50
+++ pkgsrc/pkgtools/createbuildlink/Makefile 2014/03/03 03:30:53 1.51
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.50 2013/12/23 11:57:05 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2014/03/03 03:30:53 obache Exp $
 
-DISTNAME=	createbuildlink-3.16
+PKGNAME=	createbuildlink-3.16
 CATEGORIES=	pkgtools sysutils
-MASTER_SITES=	# Nothing
-DISTFILES=	# Nothing
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Shell script to help creating buildlink3.mk files
@@ -14,7 +12,7 @@
 USE_LANGUAGES=	# empty
 NO_BUILD=	yes
 
-SCRIPT=		${DISTNAME:C/-.*$//}
+SCRIPT=		${PKGNAME:C/-.*$//}
 SCRIPTS=	${SCRIPT} substplistbasedirs
 REPLACE_SH+=	${SCRIPTS}
 

cvs diff -r1.14 -r1.15 pkgsrc/pkgtools/dfdisk/Makefile (expand / switch to context diff)
--- pkgsrc/pkgtools/dfdisk/Makefile 2012/09/11 23:19:34 1.14
+++ pkgsrc/pkgtools/dfdisk/Makefile 2014/03/03 03:30:53 1.15
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2012/09/11 23:19:34 asau Exp $
+# $NetBSD: Makefile,v 1.15 2014/03/03 03:30:53 obache Exp $
 #
 
-DISTNAME=	dfdisk-1.0
+PKGNAME=	dfdisk-1.0
 CATEGORIES=	pkgtools
-MASTER_SITES=	# empty
-DISTFILES=	# empty
 
 MAINTAINER=	jmmv@NetBSD.org
 COMMENT=	Fetch distfiles from multiple locations

cvs diff -r1.59 -r1.60 pkgsrc/pkgtools/digest/Makefile (expand / switch to context diff)
--- pkgsrc/pkgtools/digest/Makefile 2012/09/11 23:19:34 1.59
+++ pkgsrc/pkgtools/digest/Makefile 2014/03/03 03:30:53 1.60
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.59 2012/09/11 23:19:34 asau Exp $
+# $NetBSD: Makefile,v 1.60 2014/03/03 03:30:53 obache Exp $
 #
 # When adding new digest algorithms, please use rmd160 as the template,
 # and bump the VERSION definition.
 
-DISTNAME?=	digest-${VERSION}
+PKGNAME?=	digest-${VERSION}
 CATEGORIES=	pkgtools
-MASTER_SITES=	# empty
-DISTFILES=	# empty
 
 MAINTAINER?=	agc@NetBSD.org
 HOMEPAGE?=	http://www.NetBSD.org/docs/software/packages.html

cvs diff -r1.9 -r1.10 pkgsrc/pkgtools/genrpm/Makefile (expand / switch to context diff)
--- pkgsrc/pkgtools/genrpm/Makefile 2012/09/11 23:19:34 1.9
+++ pkgsrc/pkgtools/genrpm/Makefile 2014/03/03 03:30:53 1.10
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2012/09/11 23:19:34 asau Exp $
+# $NetBSD: Makefile,v 1.10 2014/03/03 03:30:53 obache Exp $
 
-DISTNAME=	genrpm-1.2
+PKGNAME=	genrpm-1.2
 CATEGORIES=	pkgtools
-MASTER_SITES=	# empty
-DISTFILES=	# empty
 
 MAINTAINER=	agc@NetBSD.org
 HOMEPAGE=	http://www.pkgsrc.org/

cvs diff -r1.34 -r1.35 pkgsrc/pkgtools/libkver/Makefile (expand / switch to context diff)
--- pkgsrc/pkgtools/libkver/Makefile 2013/08/23 08:59:51 1.34
+++ pkgsrc/pkgtools/libkver/Makefile 2014/03/03 03:30:53 1.35
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2013/08/23 08:59:51 apb Exp $
+# $NetBSD: Makefile,v 1.35 2014/03/03 03:30:53 obache Exp $
 
-DISTNAME=		libkver-${VERSION}
+PKGNAME=		libkver-${VERSION}
 CATEGORIES=		pkgtools
-MASTER_SITES=		# empty
-DISTFILES=		# empty
 
 MAINTAINER=	seb@NetBSD.org
 #HOMEPAGE=

cvs diff -r1.79 -r1.80 pkgsrc/pkgtools/libnbcompat/Makefile (expand / switch to context diff)
--- pkgsrc/pkgtools/libnbcompat/Makefile 2013/09/08 16:24:43 1.79
+++ pkgsrc/pkgtools/libnbcompat/Makefile 2014/03/03 03:30:53 1.80
@@ -1,14 +1,12 @@
-# $NetBSD: Makefile,v 1.79 2013/09/08 16:24:43 ryoon Exp $
+# $NetBSD: Makefile,v 1.80 2014/03/03 03:30:53 obache Exp $
 #
 # NOTE: If you update this package, it is *mandatory* that you update
 # 	pkgsrc/pkgtools/libnbcompat/files/README to reflect the actual
 #	list of tested and supported platforms.
 #
 
-DISTNAME=		libnbcompat-20130908
+PKGNAME=		libnbcompat-20130908
 CATEGORIES=		pkgtools devel
-MASTER_SITES=		# empty
-DISTFILES=		# empty
 
 MAINTAINER=		joerg@NetBSD.org
 HOMEPAGE=		http://www.NetBSD.org/

cvs diff -r1.14 -r1.15 pkgsrc/pkgtools/lintpkgsrc/Makefile (expand / switch to context diff)
--- pkgsrc/pkgtools/lintpkgsrc/Makefile 2013/09/12 11:18:40 1.14
+++ pkgsrc/pkgtools/lintpkgsrc/Makefile 2014/03/03 03:30:53 1.15
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2013/09/12 11:18:40 jperkin Exp $
+# $NetBSD: Makefile,v 1.15 2014/03/03 03:30:53 obache Exp $
 
-DISTNAME=	lintpkgsrc-4.86
+PKGNAME=	lintpkgsrc-4.86
 PKGREVISION=	1
 CATEGORIES=	pkgtools
-MASTER_SITES=	# none
-DISTFILES=	# none
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.NetBSD.org/Documentation/pkgsrc/

cvs diff -r1.7 -r1.8 pkgsrc/pkgtools/mksandbox/Makefile (expand / switch to context diff)
--- pkgsrc/pkgtools/mksandbox/Makefile 2013/07/24 22:16:26 1.7
+++ pkgsrc/pkgtools/mksandbox/Makefile 2014/03/03 03:30:53 1.8
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2013/07/24 22:16:26 jperkin Exp $
+# $NetBSD: Makefile,v 1.8 2014/03/03 03:30:53 obache Exp $
 
-DISTNAME=	mksandbox-1.3
+PKGNAME=	mksandbox-1.3
 CATEGORIES=	pkgtools
-MASTER_SITES=	# none
-DISTFILES=	# none
 
 MAINTAINER=	agc@NetBSD.org
 HOMEPAGE=	http://www.NetBSD.org/docs/pkgsrc/bulk.html#setting-up-a-sandbox

cvs diff -r1.27 -r1.28 pkgsrc/pkgtools/mtree/Makefile (expand / switch to context diff)
--- pkgsrc/pkgtools/mtree/Makefile 2013/09/08 16:20:10 1.27
+++ pkgsrc/pkgtools/mtree/Makefile 2014/03/03 03:30:53 1.28
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2013/09/08 16:20:10 ryoon Exp $
+# $NetBSD: Makefile,v 1.28 2014/03/03 03:30:53 obache Exp $
 #
 
-DISTNAME=		mtree-20130908
+PKGNAME=		mtree-20130908
 CATEGORIES=		pkgtools sysutils
-MASTER_SITES=		# empty
-DISTFILES=		# empty
 
 MAINTAINER=		sbd@NetBSD.org
 HOMEPAGE=		http://www.NetBSD.org/

cvs diff -r1.1.1.1 -r1.2 pkgsrc/pkgtools/osabi/Makefile (expand / switch to context diff)
--- pkgsrc/pkgtools/osabi/Makefile 2010/04/30 03:18:26 1.1.1.1
+++ pkgsrc/pkgtools/osabi/Makefile 2014/03/03 03:30:53 1.2
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/04/30 03:18:26 sbd Exp $
+# $NetBSD: Makefile,v 1.2 2014/03/03 03:30:53 obache Exp $
 #
 
-DISTNAME=	osabi-${OPSYS}-${OS_VERSION}
+PKGNAME=	osabi-${OPSYS}-${OS_VERSION}
 CATEGORIES=	pkgtools
-MASTER_SITES=	# empty
-DISTFILES=	# empty
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.pkgsrc.org/

cvs diff -r1.22 -r1.23 pkgsrc/pkgtools/p5-pkgsrc-Dewey/Makefile (expand / switch to context diff)
--- pkgsrc/pkgtools/p5-pkgsrc-Dewey/Makefile 2013/05/31 12:41:46 1.22
+++ pkgsrc/pkgtools/p5-pkgsrc-Dewey/Makefile 2014/03/03 03:30:53 1.23
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2013/05/31 12:41:46 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2014/03/03 03:30:53 obache Exp $
 
-DISTNAME=	p5-pkgsrc-Dewey-1.1
+PKGNAME=	p5-pkgsrc-Dewey-1.1
 PKGREVISION=	4
 CATEGORIES=	pkgtools perl5
-MASTER_SITES=	# empty
-DISTFILES=	# empty
 
 MAINTAINER=	wiz@NetBSD.org
 HOMEPAGE=	http://www.NetBSD.org/docs/pkgsrc/

cvs diff -r1.67 -r1.68 pkgsrc/pkgtools/pbulk/Makefile (expand / switch to context diff)
--- pkgsrc/pkgtools/pbulk/Makefile 2014/02/22 00:35:41 1.67
+++ pkgsrc/pkgtools/pbulk/Makefile 2014/03/03 03:30:53 1.68
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.67 2014/02/22 00:35:41 jperkin Exp $
+# $NetBSD: Makefile,v 1.68 2014/03/03 03:30:53 obache Exp $
 
-DISTNAME=	pbulk-0.52
+PKGNAME=	pbulk-0.52
 COMMENT=	Modular bulk build framework
 
 .include "../../pkgtools/pbulk/Makefile.common"

cvs diff -r1.19 -r1.20 pkgsrc/pkgtools/pkg_alternatives/Makefile (expand / switch to context diff)
--- pkgsrc/pkgtools/pkg_alternatives/Makefile 2012/09/11 23:19:36 1.19
+++ pkgsrc/pkgtools/pkg_alternatives/Makefile 2014/03/03 03:30:53 1.20
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2012/09/11 23:19:36 asau Exp $
+# $NetBSD: Makefile,v 1.20 2014/03/03 03:30:53 obache Exp $
 #
 
-DISTNAME=	pkg_alternatives-1.6
+PKGNAME=	pkg_alternatives-1.6
 CATEGORIES=	pkgtools
-MASTER_SITES=	# empty
-DISTFILES=	# empty
 
 MAINTAINER=	jmmv@NetBSD.org
 COMMENT=	Generic wrappers for programs with similar interfaces

cvs diff -r1.82 -r1.83 pkgsrc/pkgtools/pkg_chk/Makefile (expand / switch to context diff)
--- pkgsrc/pkgtools/pkg_chk/Makefile 2012/09/11 23:19:36 1.82
+++ pkgsrc/pkgtools/pkg_chk/Makefile 2014/03/03 03:30:54 1.83
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.82 2012/09/11 23:19:36 asau Exp $
+# $NetBSD: Makefile,v 1.83 2014/03/03 03:30:54 obache Exp $
 
-DISTNAME=	pkg_chk-2.0.6
+PKGNAME=	pkg_chk-2.0.6
 CATEGORIES=	pkgtools
-MASTER_SITES=	# empty
-DISTFILES=	# empty
 
 OWNER=		abs@NetBSD.org
 HOMEPAGE=	ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/doc/pkgsrc.html

cvs diff -r1.50 -r1.51 pkgsrc/pkgtools/pkg_comp/Makefile (expand / switch to context diff)
--- pkgsrc/pkgtools/pkg_comp/Makefile 2012/09/11 23:19:36 1.50
+++ pkgsrc/pkgtools/pkg_comp/Makefile 2014/03/03 03:30:54 1.51
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.50 2012/09/11 23:19:36 asau Exp $
+# $NetBSD: Makefile,v 1.51 2014/03/03 03:30:54 obache Exp $
 
-DISTNAME=	pkg_comp-1.37
+PKGNAME=	pkg_comp-1.37
 CATEGORIES=	pkgtools
-MASTER_SITES=	# empty
-DISTFILES=	# empty
 
 MAINTAINER=	jmmv@NetBSD.org
 COMMENT=	Build packages inside a chroot jail

cvs diff -r1.7 -r1.8 pkgsrc/pkgtools/pkg_distinst/Makefile (expand / switch to context diff)
--- pkgsrc/pkgtools/pkg_distinst/Makefile 2013/05/31 12:41:46 1.7
+++ pkgsrc/pkgtools/pkg_distinst/Makefile 2014/03/03 03:30:54 1.8
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2013/05/31 12:41:46 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2014/03/03 03:30:54 obache Exp $
 
-DISTNAME=	pkg_distinst-0.02
+PKGNAME=	pkg_distinst-0.02
 PKGREVISION=	2
 CATEGORIES=	pkgtools
-MASTER_SITES=	# empty
-DISTFILES=	# empty
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Remove any distfiles not belonging to an installed package

cvs diff -r1.35 -r1.36 pkgsrc/pkgtools/pkg_filecheck/Makefile (expand / switch to context diff)
--- pkgsrc/pkgtools/pkg_filecheck/Makefile 2013/05/31 12:41:46 1.35
+++ pkgsrc/pkgtools/pkg_filecheck/Makefile 2014/03/03 03:30:54 1.36
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.35 2013/05/31 12:41:46 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2014/03/03 03:30:54 obache Exp $
 #
 
-DISTNAME=		pkg_filecheck-0.4
+PKGNAME=		pkg_filecheck-0.4
 PKGREVISION=		2
 CATEGORIES=		pkgtools devel
-MASTER_SITES=		# empty
-DISTFILES=		# empty
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 #HOMEPAGE=		http://www.NetBSD.org/docs/pkgsrc/

cvs diff -r1.201 -r1.202 pkgsrc/pkgtools/pkg_install/Makefile (expand / switch to context diff)
--- pkgsrc/pkgtools/pkg_install/Makefile 2014/02/21 18:18:49 1.201
+++ pkgsrc/pkgtools/pkg_install/Makefile 2014/03/03 03:30:54 1.202
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.201 2014/02/21 18:18:49 richard Exp $
+# $NetBSD: Makefile,v 1.202 2014/03/03 03:30:54 obache Exp $
 
 # Notes to package maintainers:
 #
@@ -6,11 +6,9 @@
 # PKGTOOLS_REQD in bsd.pkg.mk. Do so if and only if there is a critical
 # change in the pkg_* tools that pkgsrc relies on for proper operation.
 
-DISTNAME=		pkg_install-${VERSION}
+PKGNAME=		pkg_install-${VERSION}
 PKGREVISION=		1
 CATEGORIES=		pkgtools
-MASTER_SITES=		# empty
-DISTFILES=		# empty
 
 MAINTAINER=		agc@NetBSD.org
 HOMEPAGE=		http://www.pkgsrc.org/

cvs diff -r1.20 -r1.21 pkgsrc/pkgtools/pkg_install-info/Makefile (expand / switch to context diff)
--- pkgsrc/pkgtools/pkg_install-info/Makefile 2012/09/11 23:19:37 1.20
+++ pkgsrc/pkgtools/pkg_install-info/Makefile 2014/03/03 03:30:54 1.21
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2012/09/11 23:19:37 asau Exp $
+# $NetBSD: Makefile,v 1.21 2014/03/03 03:30:54 obache Exp $
 #
 
-DISTNAME=		pkg_install-info-${VERSION}
+PKGNAME=		pkg_install-info-${VERSION}
 PKGREVISION=		3
 CATEGORIES=		pkgtools
-MASTER_SITES=		# empty
-DISTFILES=		# empty
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.gnu.org/software/texinfo/texinfo.html

cvs diff -r1.5 -r1.6 pkgsrc/pkgtools/pkg_leaves/Makefile (expand / switch to context diff)
--- pkgsrc/pkgtools/pkg_leaves/Makefile 2012/09/11 23:19:37 1.5
+++ pkgsrc/pkgtools/pkg_leaves/Makefile 2014/03/03 03:30:54 1.6
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2012/09/11 23:19:37 asau Exp $
+# $NetBSD: Makefile,v 1.6 2014/03/03 03:30:54 obache Exp $
 
-DISTNAME=	pkg_leaves-1.2
+PKGNAME=	pkg_leaves-1.2
 CATEGORIES=	pkgtools
-MASTER_SITES=	# empty
-DISTFILES=	# empty
 
 MAINTAINER=	joerg@NetBSD.org
 COMMENT=	Print leaf packages

cvs diff -r1.17 -r1.18 pkgsrc/pkgtools/pkg_notify/Makefile (expand / switch to context diff)
--- pkgsrc/pkgtools/pkg_notify/Makefile 2014/02/02 10:19:41 1.17
+++ pkgsrc/pkgtools/pkg_notify/Makefile 2014/03/03 03:30:54 1.18
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2014/02/02 10:19:41 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2014/03/03 03:30:54 obache Exp $
 
-DISTNAME=	pkg_notify-0.4.4
+PKGNAME=	pkg_notify-0.4.4
 CATEGORIES=	pkgtools
-MASTER_SITES=	# none
-DISTFILES=	# none
 
 MAINTAINER=	imil@gcu.info
 HOMEPAGE=	# none

cvs diff -r1.7 -r1.8 pkgsrc/pkgtools/pkg_p5up2date/Makefile (expand / switch to context diff)
--- pkgsrc/pkgtools/pkg_p5up2date/Makefile 2014/02/13 17:35:44 1.7
+++ pkgsrc/pkgtools/pkg_p5up2date/Makefile 2014/03/03 03:30:54 1.8
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2014/02/13 17:35:44 abs Exp $
+# $NetBSD: Makefile,v 1.8 2014/03/03 03:30:54 obache Exp $
 
-DISTNAME=	pkg_p5up2date-0.04
+PKGNAME=	pkg_p5up2date-0.04
 PKGREVISION=	3
 CATEGORIES=	pkgtools
-MASTER_SITES=	# empty
-DISTFILES=	# empty
 
 MAINTAINER=	pkgsrc-p5-people@NetBSD.org
 COMMENT=	Check p5-* pkgsrc packages requiring updates

cvs diff -r1.11 -r1.12 pkgsrc/pkgtools/pkg_regress/Makefile (expand / switch to context diff)
--- pkgsrc/pkgtools/pkg_regress/Makefile 2012/09/11 23:19:37 1.11
+++ pkgsrc/pkgtools/pkg_regress/Makefile 2014/03/03 03:30:54 1.12
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2012/09/11 23:19:37 asau Exp $
+# $NetBSD: Makefile,v 1.12 2014/03/03 03:30:54 obache Exp $
 
-DISTNAME=	pkg_regress-0.2
+PKGNAME=	pkg_regress-0.2
 CATEGORIES=	pkgtools
-MASTER_SITES=	# empty
-DISTFILES=	# empty
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Run pkgsrc infrastructure regression test suite

cvs diff -r1.34 -r1.35 pkgsrc/pkgtools/pkg_rolling-replace/Makefile (expand / switch to context diff)
--- pkgsrc/pkgtools/pkg_rolling-replace/Makefile 2012/09/11 23:19:37 1.34
+++ pkgsrc/pkgtools/pkg_rolling-replace/Makefile 2014/03/03 03:30:54 1.35
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2012/09/11 23:19:37 asau Exp $
+# $NetBSD: Makefile,v 1.35 2014/03/03 03:30:54 obache Exp $
 
-DISTNAME=	pkg_rolling-replace-0.24.1
+PKGNAME=	pkg_rolling-replace-0.24.1
 CATEGORIES=	pkgtools
-MASTER_SITES=	# empty
-DISTFILES=	# empty
 
 MAINTAINER=	ngoffee@bbn.com
 COMMENT=	Replace/upgrade packages in-place

cvs diff -r1.40 -r1.41 pkgsrc/pkgtools/pkg_tarup/Makefile (expand / switch to context diff)
--- pkgsrc/pkgtools/pkg_tarup/Makefile 2013/01/08 11:02:19 1.40
+++ pkgsrc/pkgtools/pkg_tarup/Makefile 2014/03/03 03:30:54 1.41
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2013/01/08 11:02:19 jperkin Exp $
+# $NetBSD: Makefile,v 1.41 2014/03/03 03:30:54 obache Exp $
 
-DISTNAME=	pkg_tarup-1.9.1
+PKGNAME=	pkg_tarup-1.9.1
 CATEGORIES=	pkgtools
-MASTER_SITES=	# empty
-DISTFILES=	# empty
 
 MAINTAINER=	hubertf@NetBSD.org
 COMMENT=	Generates binary package(s) from installed pkg(s)

cvs diff -r1.16 -r1.17 pkgsrc/pkgtools/pkgclean/Makefile (expand / switch to context diff)
--- pkgsrc/pkgtools/pkgclean/Makefile 2012/09/11 23:19:38 1.16
+++ pkgsrc/pkgtools/pkgclean/Makefile 2014/03/03 03:30:54 1.17
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2012/09/11 23:19:38 asau Exp $
+# $NetBSD: Makefile,v 1.17 2014/03/03 03:30:54 obache Exp $
 
-DISTNAME=	pkgclean-20051116
+PKGNAME=	pkgclean-20051116
 CATEGORIES=	pkgtools
-MASTER_SITES=	# empty
-DISTFILES=	# empty
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Quickly clean up all work directories in pkgsrc

cvs diff -r1.18 -r1.19 pkgsrc/pkgtools/pkgdep/Makefile (expand / switch to context diff)
--- pkgsrc/pkgtools/pkgdep/Makefile 2013/05/31 12:41:46 1.18
+++ pkgsrc/pkgtools/pkgdep/Makefile 2014/03/03 03:30:54 1.19
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2013/05/31 12:41:46 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2014/03/03 03:30:54 obache Exp $
 #
 
-DISTNAME=	pkgdep-1.0
+PKGNAME=	pkgdep-1.0
 PKGREVISION=	2
 CATEGORIES=	pkgtools
-MASTER_SITES=	# empty
-DISTFILES=	# empty
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Script for displaying dependence information on software packages

cvs diff -r1.32 -r1.33 pkgsrc/pkgtools/pkgdepgraph/Makefile (expand / switch to context diff)
--- pkgsrc/pkgtools/pkgdepgraph/Makefile 2013/09/12 11:18:40 1.32
+++ pkgsrc/pkgtools/pkgdepgraph/Makefile 2014/03/03 03:30:54 1.33
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.32 2013/09/12 11:18:40 jperkin Exp $
+# $NetBSD: Makefile,v 1.33 2014/03/03 03:30:54 obache Exp $
 #
 
-DISTNAME=	pkgdepgraph-2.8
+PKGNAME=	pkgdepgraph-2.8
 PKGREVISION=	2
 CATEGORIES=	pkgtools devel
-MASTER_SITES=	# empty
-DISTFILES=	# empty
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/doc/pkgsrc.html
@@ -19,7 +17,7 @@
 
 NO_CONFIGURE=	yes
 
-DISTVER=	${DISTNAME:S/pkgdepgraph-//}
+DISTVER=	${PKGVERSION_NOREV}
 
 .include "../../mk/bsd.prefs.mk"
 

cvs diff -r1.81 -r1.82 pkgsrc/pkgtools/pkgdiff/Makefile (expand / switch to context diff)
--- pkgsrc/pkgtools/pkgdiff/Makefile 2013/09/12 11:18:40 1.81
+++ pkgsrc/pkgtools/pkgdiff/Makefile 2014/03/03 03:30:54 1.82
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.81 2013/09/12 11:18:40 jperkin Exp $
+# $NetBSD: Makefile,v 1.82 2014/03/03 03:30:54 obache Exp $
 #
 
-DISTNAME=	pkgdiff-1.4
+PKGNAME=	pkgdiff-1.4
 PKGREVISION=	2
 CATEGORIES=	pkgtools devel
-MASTER_SITES=	# empty
-DISTFILES=	# empty
 
 MAINTAINER=	wiz@NetBSD.org
 HOMEPAGE=	ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/doc/pkgsrc.html

cvs diff -r1.24 -r1.25 pkgsrc/pkgtools/pkgfind/Makefile (expand / switch to context diff)
--- pkgsrc/pkgtools/pkgfind/Makefile 2012/09/11 23:19:38 1.24
+++ pkgsrc/pkgtools/pkgfind/Makefile 2014/03/03 03:30:54 1.25
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2012/09/11 23:19:38 asau Exp $
+# $NetBSD: Makefile,v 1.25 2014/03/03 03:30:54 obache Exp $
 
-DISTNAME=	pkgfind-20111022
+PKGNAME=	pkgfind-20111022
 CATEGORIES=	pkgtools
-MASTER_SITES=	# empty
-DISTFILES=	# empty
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Find packages by package name in pkgsrc

cvs diff -r1.7 -r1.8 pkgsrc/pkgtools/pkgsrc-todo/Makefile (expand / switch to context diff)
--- pkgsrc/pkgtools/pkgsrc-todo/Makefile 2013/10/06 16:52:29 1.7
+++ pkgsrc/pkgtools/pkgsrc-todo/Makefile 2014/03/03 03:30:55 1.8
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2013/10/06 16:52:29 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2014/03/03 03:30:55 obache Exp $
 
-DISTNAME=	pkgsrc-todo-1.2
+PKGNAME=	pkgsrc-todo-1.2
 PKGREVISION=	1
 CATEGORIES=	pkgtools
-MASTER_SITES=	# none
-DISTFILES=	# none
 
 MAINTAINER=	wiz@NetBSD.org
 HOMEPAGE=	http://www.NetBSD.org/docs/pkgsrc/

cvs diff -r1.12 -r1.13 pkgsrc/pkgtools/pkgsurvey/Makefile (expand / switch to context diff)
--- pkgsrc/pkgtools/pkgsurvey/Makefile 2012/09/11 23:19:39 1.12
+++ pkgsrc/pkgtools/pkgsurvey/Makefile 2014/03/03 03:30:55 1.13
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2012/09/11 23:19:39 asau Exp $
+# $NetBSD: Makefile,v 1.13 2014/03/03 03:30:55 obache Exp $
 #
 
-DISTNAME=	pkgsurvey-0.0
+PKGNAME=	pkgsurvey-0.0
 CATEGORIES=	pkgtools
-MASTER_SITES=	# empty
-DISTFILES=	# empty
 
 MAINTAINER=	agc@pkgsrc.org
 COMMENT=	Utility to collate pkg information, and mail to central census site

cvs diff -r1.42 -r1.43 pkgsrc/pkgtools/port2pkg/Makefile (expand / switch to context diff)
--- pkgsrc/pkgtools/port2pkg/Makefile 2014/02/17 10:32:02 1.42
+++ pkgsrc/pkgtools/port2pkg/Makefile 2014/03/03 03:30:55 1.43
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.42 2014/02/17 10:32:02 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2014/03/03 03:30:55 obache Exp $
 
-DISTNAME=	port2pkg-1.15
+PKGNAME=	port2pkg-1.15
 CATEGORIES=	pkgtools
-MASTER_SITES=	# empty
-DISTFILES=	# empty
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Convert from a FreeBSD port to a NetBSD package

cvs diff -r1.8 -r1.9 pkgsrc/pkgtools/prereq-readme/Makefile (expand / switch to context diff)
--- pkgsrc/pkgtools/prereq-readme/Makefile 2008/06/15 09:56:37 1.8
+++ pkgsrc/pkgtools/prereq-readme/Makefile 2014/03/03 03:30:55 1.9
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2008/06/15 09:56:37 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2014/03/03 03:30:55 obache Exp $
 #
 
-DISTNAME=	prereq-readme-20050521
+PKGNAME=	prereq-readme-20050521
 CATEGORIES=	pkgtools
-MASTER_SITES=	# empty
-DISTFILES=	# empty
 
 MAINTAINER=	dmcmahill@NetBSD.org
 HOMEPAGE=	http://www.NetBSD.org/

cvs diff -r1.25 -r1.26 pkgsrc/pkgtools/rc.subr/Makefile (expand / switch to context diff)
--- pkgsrc/pkgtools/rc.subr/Makefile 2012/09/11 23:19:39 1.25
+++ pkgsrc/pkgtools/rc.subr/Makefile 2014/03/03 03:30:55 1.26
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2012/09/11 23:19:39 asau Exp $
+# $NetBSD: Makefile,v 1.26 2014/03/03 03:30:55 obache Exp $
 #
 
-DISTNAME=		rc.subr-20090118
+PKGNAME=		rc.subr-20090118
 CATEGORIES=		pkgtools
-MASTER_SITES=		# empty
-DISTFILES=		# empty
 
 MAINTAINER=		sbd@NetBSD.org
 HOMEPAGE=		http://www.NetBSD.org/

cvs diff -r1.15 -r1.16 pkgsrc/pkgtools/rcorder/Makefile (expand / switch to context diff)
--- pkgsrc/pkgtools/rcorder/Makefile 2012/09/11 23:19:39 1.15
+++ pkgsrc/pkgtools/rcorder/Makefile 2014/03/03 03:30:55 1.16
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2012/09/11 23:19:39 asau Exp $
+# $NetBSD: Makefile,v 1.16 2014/03/03 03:30:55 obache Exp $
 #
 
-DISTNAME=		rcorder-20120310
+PKGNAME=		rcorder-20120310
 CATEGORIES=		pkgtools sysutils
-MASTER_SITES=		# empty
-DISTFILES=		# empty
 
 MAINTAINER=		schmonz@NetBSD.org
 HOMEPAGE=		http://www.NetBSD.org/

cvs diff -r1.4 -r1.5 pkgsrc/pkgtools/rdigest/Makefile (expand / switch to context diff)
--- pkgsrc/pkgtools/rdigest/Makefile 2010/03/21 16:29:42 1.4
+++ pkgsrc/pkgtools/rdigest/Makefile 2014/03/03 03:30:55 1.5
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2010/03/21 16:29:42 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2014/03/03 03:30:55 obache Exp $
 
-DISTNAME=	rdigest-${VERSION}
+PKGNAME=	rdigest-${VERSION}
 CATEGORIES=	# be quiet pkglint
-MASTER_SITES=	# be quiet pkglint
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Recursive message digest wrapper utility