summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorobache <obache@pkgsrc.org>2014-03-03 03:30:52 +0000
committerobache <obache@pkgsrc.org>2014-03-03 03:30:52 +0000
commit7f2a37cb1a08dc9b8e6f934a578612a8cd05ed91 (patch)
tree968fbf2f44edcbf2a187c50ffa7c8ac49b781666
parent92b8ca727c1d095ba1045f23f5edb21265dc7d0b (diff)
downloadpkgsrc-7f2a37cb1a08dc9b8e6f934a578612a8cd05ed91.tar.gz
Just define PKGNAME and use it.
-rw-r--r--pkgtools/autoswc/Makefile6
-rw-r--r--pkgtools/binpatch/Makefile6
-rw-r--r--pkgtools/bootstrap-extras/Makefile6
-rw-r--r--pkgtools/bootstrap-mk-files/Makefile6
-rw-r--r--pkgtools/cdpack/Makefile6
-rw-r--r--pkgtools/compat_headers/Makefile6
-rw-r--r--pkgtools/createbuildlink/Makefile8
-rw-r--r--pkgtools/dfdisk/Makefile6
-rw-r--r--pkgtools/digest/Makefile6
-rw-r--r--pkgtools/genrpm/Makefile6
-rw-r--r--pkgtools/libkver/Makefile6
-rw-r--r--pkgtools/libnbcompat/Makefile6
-rw-r--r--pkgtools/lintpkgsrc/Makefile6
-rw-r--r--pkgtools/mksandbox/Makefile6
-rw-r--r--pkgtools/mtree/Makefile6
-rw-r--r--pkgtools/osabi/Makefile6
-rw-r--r--pkgtools/p5-pkgsrc-Dewey/Makefile6
-rw-r--r--pkgtools/pbulk/Makefile4
-rw-r--r--pkgtools/pkg_alternatives/Makefile6
-rw-r--r--pkgtools/pkg_chk/Makefile6
-rw-r--r--pkgtools/pkg_comp/Makefile6
-rw-r--r--pkgtools/pkg_distinst/Makefile6
-rw-r--r--pkgtools/pkg_filecheck/Makefile6
-rw-r--r--pkgtools/pkg_install-info/Makefile6
-rw-r--r--pkgtools/pkg_install/Makefile6
-rw-r--r--pkgtools/pkg_leaves/Makefile6
-rw-r--r--pkgtools/pkg_notify/Makefile6
-rw-r--r--pkgtools/pkg_p5up2date/Makefile6
-rw-r--r--pkgtools/pkg_regress/Makefile6
-rw-r--r--pkgtools/pkg_rolling-replace/Makefile6
-rw-r--r--pkgtools/pkg_tarup/Makefile6
-rw-r--r--pkgtools/pkgclean/Makefile6
-rw-r--r--pkgtools/pkgdep/Makefile6
-rw-r--r--pkgtools/pkgdepgraph/Makefile8
-rw-r--r--pkgtools/pkgdiff/Makefile6
-rw-r--r--pkgtools/pkgfind/Makefile6
-rw-r--r--pkgtools/pkgsrc-todo/Makefile6
-rw-r--r--pkgtools/pkgsurvey/Makefile6
-rw-r--r--pkgtools/port2pkg/Makefile6
-rw-r--r--pkgtools/prereq-readme/Makefile6
-rw-r--r--pkgtools/rc.subr/Makefile6
-rw-r--r--pkgtools/rcorder/Makefile6
-rw-r--r--pkgtools/rdigest/Makefile5
43 files changed, 88 insertions, 171 deletions
diff --git a/pkgtools/autoswc/Makefile b/pkgtools/autoswc/Makefile
index ab12f5b94f7..03dd83d0291 100644
--- a/pkgtools/autoswc/Makefile
+++ b/pkgtools/autoswc/Makefile
@@ -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
diff --git a/pkgtools/binpatch/Makefile b/pkgtools/binpatch/Makefile
index 458236743f0..73438d24f37 100644
--- a/pkgtools/binpatch/Makefile
+++ b/pkgtools/binpatch/Makefile
@@ -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
diff --git a/pkgtools/bootstrap-extras/Makefile b/pkgtools/bootstrap-extras/Makefile
index 01a72f7b713..ce8fc325673 100644
--- a/pkgtools/bootstrap-extras/Makefile
+++ b/pkgtools/bootstrap-extras/Makefile
@@ -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}
diff --git a/pkgtools/bootstrap-mk-files/Makefile b/pkgtools/bootstrap-mk-files/Makefile
index 47903fb6311..8d3bdeac1b1 100644
--- a/pkgtools/bootstrap-mk-files/Makefile
+++ b/pkgtools/bootstrap-mk-files/Makefile
@@ -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]*
diff --git a/pkgtools/cdpack/Makefile b/pkgtools/cdpack/Makefile
index 7764b3a0e4b..a60ae6a4bb2 100644
--- a/pkgtools/cdpack/Makefile
+++ b/pkgtools/cdpack/Makefile
@@ -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/
diff --git a/pkgtools/compat_headers/Makefile b/pkgtools/compat_headers/Makefile
index b05858b22f7..ff5c7544489 100644
--- a/pkgtools/compat_headers/Makefile
+++ b/pkgtools/compat_headers/Makefile
@@ -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/
diff --git a/pkgtools/createbuildlink/Makefile b/pkgtools/createbuildlink/Makefile
index c65f5d90637..51cbd699562 100644
--- a/pkgtools/createbuildlink/Makefile
+++ b/pkgtools/createbuildlink/Makefile
@@ -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 @@ WRKSRC= ${WRKDIR}
USE_LANGUAGES= # empty
NO_BUILD= yes
-SCRIPT= ${DISTNAME:C/-.*$//}
+SCRIPT= ${PKGNAME:C/-.*$//}
SCRIPTS= ${SCRIPT} substplistbasedirs
REPLACE_SH+= ${SCRIPTS}
diff --git a/pkgtools/dfdisk/Makefile b/pkgtools/dfdisk/Makefile
index 3cb7f6ae06d..e48acd2d240 100644
--- a/pkgtools/dfdisk/Makefile
+++ b/pkgtools/dfdisk/Makefile
@@ -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
diff --git a/pkgtools/digest/Makefile b/pkgtools/digest/Makefile
index 8689af59a95..400ab0d6f4d 100644
--- a/pkgtools/digest/Makefile
+++ b/pkgtools/digest/Makefile
@@ -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
diff --git a/pkgtools/genrpm/Makefile b/pkgtools/genrpm/Makefile
index 0e7b07cefff..e8ebc62f804 100644
--- a/pkgtools/genrpm/Makefile
+++ b/pkgtools/genrpm/Makefile
@@ -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/
diff --git a/pkgtools/libkver/Makefile b/pkgtools/libkver/Makefile
index 2338f7cafcc..28787655b5b 100644
--- a/pkgtools/libkver/Makefile
+++ b/pkgtools/libkver/Makefile
@@ -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=
diff --git a/pkgtools/libnbcompat/Makefile b/pkgtools/libnbcompat/Makefile
index 5c192af2c31..cf3f558fa22 100644
--- a/pkgtools/libnbcompat/Makefile
+++ b/pkgtools/libnbcompat/Makefile
@@ -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/
diff --git a/pkgtools/lintpkgsrc/Makefile b/pkgtools/lintpkgsrc/Makefile
index af6521eea4c..7a58c3a9613 100644
--- a/pkgtools/lintpkgsrc/Makefile
+++ b/pkgtools/lintpkgsrc/Makefile
@@ -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/
diff --git a/pkgtools/mksandbox/Makefile b/pkgtools/mksandbox/Makefile
index 4d55b8a43cf..16828841ce9 100644
--- a/pkgtools/mksandbox/Makefile
+++ b/pkgtools/mksandbox/Makefile
@@ -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
diff --git a/pkgtools/mtree/Makefile b/pkgtools/mtree/Makefile
index fdf72e9d427..d870621dad7 100644
--- a/pkgtools/mtree/Makefile
+++ b/pkgtools/mtree/Makefile
@@ -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/
diff --git a/pkgtools/osabi/Makefile b/pkgtools/osabi/Makefile
index f8268fdee69..e4d76cab920 100644
--- a/pkgtools/osabi/Makefile
+++ b/pkgtools/osabi/Makefile
@@ -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/
diff --git a/pkgtools/p5-pkgsrc-Dewey/Makefile b/pkgtools/p5-pkgsrc-Dewey/Makefile
index 8a1e41d8a90..90e5c853a07 100644
--- a/pkgtools/p5-pkgsrc-Dewey/Makefile
+++ b/pkgtools/p5-pkgsrc-Dewey/Makefile
@@ -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/
diff --git a/pkgtools/pbulk/Makefile b/pkgtools/pbulk/Makefile
index b4383e8a19a..5017aeae22b 100644
--- a/pkgtools/pbulk/Makefile
+++ b/pkgtools/pbulk/Makefile
@@ -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"
diff --git a/pkgtools/pkg_alternatives/Makefile b/pkgtools/pkg_alternatives/Makefile
index 3d1412b30cd..b6882a316ea 100644
--- a/pkgtools/pkg_alternatives/Makefile
+++ b/pkgtools/pkg_alternatives/Makefile
@@ -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
diff --git a/pkgtools/pkg_chk/Makefile b/pkgtools/pkg_chk/Makefile
index 16a6d3ffde1..bc2e09e0160 100644
--- a/pkgtools/pkg_chk/Makefile
+++ b/pkgtools/pkg_chk/Makefile
@@ -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
diff --git a/pkgtools/pkg_comp/Makefile b/pkgtools/pkg_comp/Makefile
index 8c677cc9e3b..5e2dde42743 100644
--- a/pkgtools/pkg_comp/Makefile
+++ b/pkgtools/pkg_comp/Makefile
@@ -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
diff --git a/pkgtools/pkg_distinst/Makefile b/pkgtools/pkg_distinst/Makefile
index fa2bf7716d9..3fefb97e35d 100644
--- a/pkgtools/pkg_distinst/Makefile
+++ b/pkgtools/pkg_distinst/Makefile
@@ -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
diff --git a/pkgtools/pkg_filecheck/Makefile b/pkgtools/pkg_filecheck/Makefile
index 5e496a7d0fe..dd446dfe6f5 100644
--- a/pkgtools/pkg_filecheck/Makefile
+++ b/pkgtools/pkg_filecheck/Makefile
@@ -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/
diff --git a/pkgtools/pkg_install-info/Makefile b/pkgtools/pkg_install-info/Makefile
index 531c40495b9..a730d5aee8e 100644
--- a/pkgtools/pkg_install-info/Makefile
+++ b/pkgtools/pkg_install-info/Makefile
@@ -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
diff --git a/pkgtools/pkg_install/Makefile b/pkgtools/pkg_install/Makefile
index 963ac3b7fab..766dc11fec6 100644
--- a/pkgtools/pkg_install/Makefile
+++ b/pkgtools/pkg_install/Makefile
@@ -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/
diff --git a/pkgtools/pkg_leaves/Makefile b/pkgtools/pkg_leaves/Makefile
index 56956a46e4d..8ed4fc09d41 100644
--- a/pkgtools/pkg_leaves/Makefile
+++ b/pkgtools/pkg_leaves/Makefile
@@ -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
diff --git a/pkgtools/pkg_notify/Makefile b/pkgtools/pkg_notify/Makefile
index 98e9264f204..d16b7dcc8ad 100644
--- a/pkgtools/pkg_notify/Makefile
+++ b/pkgtools/pkg_notify/Makefile
@@ -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
diff --git a/pkgtools/pkg_p5up2date/Makefile b/pkgtools/pkg_p5up2date/Makefile
index b0d05f348e9..234572bbd14 100644
--- a/pkgtools/pkg_p5up2date/Makefile
+++ b/pkgtools/pkg_p5up2date/Makefile
@@ -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
diff --git a/pkgtools/pkg_regress/Makefile b/pkgtools/pkg_regress/Makefile
index 4a55cfe394e..8cc3247783a 100644
--- a/pkgtools/pkg_regress/Makefile
+++ b/pkgtools/pkg_regress/Makefile
@@ -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
diff --git a/pkgtools/pkg_rolling-replace/Makefile b/pkgtools/pkg_rolling-replace/Makefile
index d7fbe0d0ca3..b6dbad62a6c 100644
--- a/pkgtools/pkg_rolling-replace/Makefile
+++ b/pkgtools/pkg_rolling-replace/Makefile
@@ -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
diff --git a/pkgtools/pkg_tarup/Makefile b/pkgtools/pkg_tarup/Makefile
index 663ae20ac95..af7ecb759cb 100644
--- a/pkgtools/pkg_tarup/Makefile
+++ b/pkgtools/pkg_tarup/Makefile
@@ -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)
diff --git a/pkgtools/pkgclean/Makefile b/pkgtools/pkgclean/Makefile
index 374ec9a02d9..0475785fe7d 100644
--- a/pkgtools/pkgclean/Makefile
+++ b/pkgtools/pkgclean/Makefile
@@ -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
diff --git a/pkgtools/pkgdep/Makefile b/pkgtools/pkgdep/Makefile
index ac0662a7b91..40cdfae1d9b 100644
--- a/pkgtools/pkgdep/Makefile
+++ b/pkgtools/pkgdep/Makefile
@@ -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
diff --git a/pkgtools/pkgdepgraph/Makefile b/pkgtools/pkgdepgraph/Makefile
index be6496b8858..695d5ad9737 100644
--- a/pkgtools/pkgdepgraph/Makefile
+++ b/pkgtools/pkgdepgraph/Makefile
@@ -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 @@ USE_TOOLS+= perl:run
NO_CONFIGURE= yes
-DISTVER= ${DISTNAME:S/pkgdepgraph-//}
+DISTVER= ${PKGVERSION_NOREV}
.include "../../mk/bsd.prefs.mk"
diff --git a/pkgtools/pkgdiff/Makefile b/pkgtools/pkgdiff/Makefile
index ae3d57773e8..2c050f6980e 100644
--- a/pkgtools/pkgdiff/Makefile
+++ b/pkgtools/pkgdiff/Makefile
@@ -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
diff --git a/pkgtools/pkgfind/Makefile b/pkgtools/pkgfind/Makefile
index c33fdbf5b13..163b56edaca 100644
--- a/pkgtools/pkgfind/Makefile
+++ b/pkgtools/pkgfind/Makefile
@@ -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
diff --git a/pkgtools/pkgsrc-todo/Makefile b/pkgtools/pkgsrc-todo/Makefile
index 231c5625f03..a1e5876bcce 100644
--- a/pkgtools/pkgsrc-todo/Makefile
+++ b/pkgtools/pkgsrc-todo/Makefile
@@ -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/
diff --git a/pkgtools/pkgsurvey/Makefile b/pkgtools/pkgsurvey/Makefile
index 600a88a77a3..a19007cb7f5 100644
--- a/pkgtools/pkgsurvey/Makefile
+++ b/pkgtools/pkgsurvey/Makefile
@@ -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
diff --git a/pkgtools/port2pkg/Makefile b/pkgtools/port2pkg/Makefile
index 993f9a51958..8ac49a32570 100644
--- a/pkgtools/port2pkg/Makefile
+++ b/pkgtools/port2pkg/Makefile
@@ -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
diff --git a/pkgtools/prereq-readme/Makefile b/pkgtools/prereq-readme/Makefile
index 38d9dd052db..db06c0092c1 100644
--- a/pkgtools/prereq-readme/Makefile
+++ b/pkgtools/prereq-readme/Makefile
@@ -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/
diff --git a/pkgtools/rc.subr/Makefile b/pkgtools/rc.subr/Makefile
index ce7a8ca714a..a577d34f9a2 100644
--- a/pkgtools/rc.subr/Makefile
+++ b/pkgtools/rc.subr/Makefile
@@ -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/
diff --git a/pkgtools/rcorder/Makefile b/pkgtools/rcorder/Makefile
index 4fc5ea6f375..9698b58ca68 100644
--- a/pkgtools/rcorder/Makefile
+++ b/pkgtools/rcorder/Makefile
@@ -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/
diff --git a/pkgtools/rdigest/Makefile b/pkgtools/rdigest/Makefile
index cce9bed5b6b..fa73a5d3489 100644
--- a/pkgtools/rdigest/Makefile
+++ b/pkgtools/rdigest/Makefile
@@ -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