pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk Remove support for NO_PACKAGE.
details: https://anonhg.NetBSD.org/pkgsrc/rev/f244932edbd4
branches: trunk
changeset: 557036:f244932edbd4
user: joerg <joerg%pkgsrc.org@localhost>
date: Thu Apr 09 00:51:23 2009 +0000
description:
Remove support for NO_PACKAGE.
diffstat:
mk/bsd.pkg.mk | 8 +-------
mk/package/bsd.package.mk | 20 ++------------------
2 files changed, 3 insertions(+), 25 deletions(-)
diffs (56 lines):
diff -r c609dbe16ed0 -r f244932edbd4 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk Thu Apr 09 00:48:06 2009 +0000
+++ b/mk/bsd.pkg.mk Thu Apr 09 00:51:23 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1955 2009/04/08 14:47:26 wiz Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1956 2009/04/09 00:51:23 joerg Exp $
#
# This file is in the public domain.
#
@@ -320,12 +320,6 @@
#
OVERRIDE_DIRDEPTH?= 2
-# The user can override the NO_PACKAGE by specifying this from
-# the make command line
-.if defined(FORCE_PACKAGE)
-. undef NO_PACKAGE
-.endif
-
# Handle alternatives
#
.include "alternatives.mk"
diff -r c609dbe16ed0 -r f244932edbd4 mk/package/bsd.package.mk
--- a/mk/package/bsd.package.mk Thu Apr 09 00:48:06 2009 +0000
+++ b/mk/package/bsd.package.mk Thu Apr 09 00:51:23 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.package.mk,v 1.11 2009/03/17 22:13:36 rillig Exp $
+# $NetBSD: bsd.package.mk,v 1.12 2009/04/09 00:51:23 joerg Exp $
#
# This Makefile fragment is included by bsd.pkg.mk and provides all
# variables and targets related to binary packages.
@@ -15,23 +15,7 @@
### package is a public target to generate a binary package.
###
.PHONY: package
-.if !defined(NO_PACKAGE)
-. include "package.mk"
-.elif !target(package)
-. if exists(${_COOKIE.package})
-package:
- @${DO_NADA}
-. elif defined(_PKGSRC_BARRIER)
-package: install
-. if defined(SKIP_SILENT)
- @${DO_NADA}
-. else
- @${PHASE_MSG} "${PKGNAME} may not be packaged: "${NO_PACKAGE:Q}"."
-. endif
-. else
-package: barrier
-. endif
-.endif
+.include "package.mk"
######################################################################
### repackage (PUBLIC)
Home |
Main Index |
Thread Index |
Old Index