diff options
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 3 | ||||
| -rw-r--r-- | mk/bsd.pkg.readme.mk | 4 | ||||
| -rw-r--r-- | mk/plist/plist.mk | 3 |
3 files changed, 3 insertions, 7 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 4fddf7f1142..93bdeb80ddc 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.2002 2014/08/28 22:29:37 riz Exp $ +# $NetBSD: bsd.pkg.mk,v 1.2003 2014/10/09 13:44:51 wiz Exp $ # # This file is in the public domain. # @@ -95,7 +95,6 @@ MAINTAINER=${OWNER} MAINTAINER?= pkgsrc-users@NetBSD.org .endif PKGWILDCARD?= ${PKGBASE}-[0-9]* -SVR4_PKGNAME?= ${PKGNAME} TOOL_DEPENDS?= # empty WRKSRC?= ${WRKDIR}/${DISTNAME:U${PKGNAME_NOREV}} diff --git a/mk/bsd.pkg.readme.mk b/mk/bsd.pkg.readme.mk index 0d0eb4e4387..fe9f4e6fcf4 100644 --- a/mk/bsd.pkg.readme.mk +++ b/mk/bsd.pkg.readme.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.readme.mk,v 1.26 2013/05/09 23:37:25 riastradh Exp $ +# $NetBSD: bsd.pkg.readme.mk,v 1.27 2014/10/09 13:44:51 wiz Exp $ # # This Makefile fragment is included by bsd.pkg.mk and encapsulates the # code to produce README.html files in each package directory. @@ -33,7 +33,6 @@ # Set to "html" by the README.html target to generate HTML code, # or to "svr4" to print SVR4 (Solaris, ...) short package names, from -# SVR4_PKGNAME variable. # This variable is passed down via build-depends-list and run-depends-list PACKAGE_NAME_TYPE?= name @@ -45,7 +44,6 @@ package-name: . if (${PACKAGE_NAME_TYPE} == "html") @${ECHO} ${_HTML_PKGLINK:Q} . elif (${PACKAGE_NAME_TYPE} == "svr4") - @${ECHO} ${SVR4_PKGNAME} . else @${ECHO} ${PKGNAME} . endif # PACKAGE_NAME_TYPE diff --git a/mk/plist/plist.mk b/mk/plist/plist.mk index f8a7a5f383c..8310fc31a36 100644 --- a/mk/plist/plist.mk +++ b/mk/plist/plist.mk @@ -1,4 +1,4 @@ -# $NetBSD: plist.mk,v 1.46 2013/09/12 11:01:47 jperkin Exp $ +# $NetBSD: plist.mk,v 1.47 2014/10/09 13:44:51 wiz Exp $ # # This Makefile fragment handles the creation of PLISTs for use by # pkg_create(8). @@ -166,7 +166,6 @@ PLIST_SUBST+= OPSYS=${OPSYS:Q} \ VIEWBASE=${VIEWBASE:Q} \ X11BASE=${X11BASE:Q} \ X11PREFIX=${X11PREFIX:Q} \ - SVR4_PKGNAME=${SVR4_PKGNAME:Q} \ CHGRP=${CHGRP:Q} \ CHMOD=${CHMOD:Q} \ CHOWN=${CHOWN:Q} \ |