diff options
| author | joerg <joerg> | 2009-04-09 00:51:23 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2009-04-09 00:51:23 +0000 |
| commit | ac9056f4d5a5c3cf4698b45ed22d97487548e8b5 (patch) | |
| tree | 5f1fe80c13cb5595c1f93abf56531ed987a7af86 /mk | |
| parent | d1027a4004f5c7c3099fca5ac8fd2468db8d9b7c (diff) | |
| download | pkgsrc-ac9056f4d5a5c3cf4698b45ed22d97487548e8b5.tar.gz | |
Remove support for NO_PACKAGE.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 8 | ||||
| -rw-r--r-- | mk/package/bsd.package.mk | 20 |
2 files changed, 3 insertions, 25 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 4cb300a8b21..0524f8f60c6 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -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 @@ _PKGSRC_BUILD_TARGETS= build # 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 --git a/mk/package/bsd.package.mk b/mk/package/bsd.package.mk index 686e5fd8ec1..eabd61bf16a 100644 --- a/mk/package/bsd.package.mk +++ b/mk/package/bsd.package.mk @@ -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 @@ _COOKIE.package= ${WRKDIR}/.package_done ### 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) |