diff options
| author | wiz <wiz@pkgsrc.org> | 2014-12-30 15:13:19 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2014-12-30 15:13:19 +0000 |
| commit | c847f599fae4c8f3ee0a5d8469a7564bab932fc0 (patch) | |
| tree | 72a940b4201682de30eda8c9b0e307555f4681b7 /mk/bsd.pkg.mk | |
| parent | 48b9f0ffaecb6a61d5a3d0b56da4a0e13bf291c3 (diff) | |
| download | pkgsrc-c847f599fae4c8f3ee0a5d8469a7564bab932fc0.tar.gz | |
Remove pkg_views support, second part: infrastructure.
Diffstat (limited to 'mk/bsd.pkg.mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 33 |
1 files changed, 1 insertions, 32 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index a16022cad7f..af767bb06eb 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.2006 2014/11/25 18:27:17 joerg Exp $ +# $NetBSD: bsd.pkg.mk,v 1.2007 2014/12/30 15:13:19 wiz Exp $ # # This file is in the public domain. # @@ -121,17 +121,6 @@ _INSTALL_UNSTRIPPED= # set (flag used by platform/*.mk) PKG_FAIL_REASON+= "Out-dated buildlink3.mk detected, please update" .endif -# PKG_INSTALLATION_TYPE can only be one of two values: "pkgviews" or -# "overwrite". -.if (${PKG_INSTALLATION_TYPE} != "pkgviews") && \ - (${PKG_INSTALLATION_TYPE} != "overwrite") -PKG_FAIL_REASON+= "PKG_INSTALLATION_TYPE must be \`\`pkgviews'' or \`\`overwrite''." -.endif - -.if empty(PKG_INSTALLATION_TYPES:M${PKG_INSTALLATION_TYPE}) -PKG_FAIL_REASON+= "This package doesn't support PKG_INSTALLATION_TYPE=${PKG_INSTALLATION_TYPE}." -.endif - .if !defined(CATEGORIES) PKG_FAIL_REASON+='CATEGORIES are mandatory.' .endif @@ -216,10 +205,6 @@ _BUILD_DEFS+= _USE_DESTDIR _BUILD_DEFS+= PKG_OPTIONS .endif -.if empty(DEPOT_SUBDIR) -PKG_FAIL_REASON+= "DEPOT_SUBDIR may not be empty." -.endif - # Store the build options for multi-packages, i.e. packages that can # be built with multiple versions of Apache, Python, Ruby, PHP etc. # @@ -349,19 +334,7 @@ FAIL?= ${SH} ${PKGSRCDIR}/mk/scripts/fail # PKG_SYSCONFVAR?= ${PKGBASE} PKG_SYSCONFSUBDIR?= # empty -.if ${PKG_INSTALLATION_TYPE} == "overwrite" -PKG_SYSCONFDEPOTBASE= # empty PKG_SYSCONFBASEDIR= ${PKG_SYSCONFBASE} -.else -. if !empty(PKG_SYSCONFBASE:M${PREFIX}) || \ - !empty(PKG_SYSCONFBASE:M${PREFIX}/*) -PKG_SYSCONFDEPOTBASE= # empty -PKG_SYSCONFBASEDIR= ${PKG_SYSCONFBASE} -. else -PKG_SYSCONFDEPOTBASE= ${PKG_SYSCONFBASE}/${DEPOT_SUBDIR} -PKG_SYSCONFBASEDIR= ${PKG_SYSCONFDEPOTBASE}/${PKGNAME} -. endif -.endif .if empty(PKG_SYSCONFSUBDIR) DFLT_PKG_SYSCONFDIR:= ${PKG_SYSCONFBASEDIR} .else @@ -371,7 +344,6 @@ PKG_SYSCONFDIR= ${DFLT_PKG_SYSCONFDIR} .if defined(PKG_SYSCONFDIR.${PKG_SYSCONFVAR}) PKG_SYSCONFDIR= ${PKG_SYSCONFDIR.${PKG_SYSCONFVAR}} PKG_SYSCONFBASEDIR= ${PKG_SYSCONFDIR.${PKG_SYSCONFVAR}} -PKG_SYSCONFDEPOTBASE= # empty .endif PKG_SYSCONFDIR_PERMS?= ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755 @@ -662,9 +634,6 @@ lint: # List of flags to pass to pkg_add(1) for bin-install: BIN_INSTALL_FLAGS?= # -v -.if ${PKG_INSTALLATION_TYPE} == "pkgviews" -PKG_ARGS_ADD= -W ${LOCALBASE} -w ${DEFAULT_VIEW} -.endif _BIN_INSTALL_FLAGS= ${BIN_INSTALL_FLAGS} .if defined(_AUTOMATIC) && !empty(_AUTOMATIC:M[Yy][Ee][Ss]) _BIN_INSTALL_FLAGS+= -A |