diff options
| author | hubertf <hubertf> | 2000-08-18 22:43:19 +0000 |
|---|---|---|
| committer | hubertf <hubertf> | 2000-08-18 22:43:19 +0000 |
| commit | 9cb66353bd73f4bd627c6b140122fe4652dce713 (patch) | |
| tree | 3e39eb4128a38cc578872b9bde91f8ab63e48735 /mk/bsd.pkg.mk | |
| parent | 58a3c6dfd03aa51169a3900ad1be984fac8a7854 (diff) | |
| download | pkgsrc-9cb66353bd73f4bd627c6b140122fe4652dce713.tar.gz | |
* Replace MIRROR_DISTFILES with NO_SRC_ON_FTP
* Replace NO_CDROM with NO_SRC_ON_CDROM and NO_BIN_ON_CDROM
* Add NO_{SRC,BIN}_ON_{FTP,CDROM} to BUILD_DEFS (in case someone
wants to re-distribute a binary pkg, so he has a chance to know
about resitrictions)
* Adjust 'mirror-distfiles' target for NO_SRC_ON_FTP
Diffstat (limited to 'mk/bsd.pkg.mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 1a5ee05b46e..b5660600fbe 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.545 2000/08/18 02:47:56 hubertf Exp $ +# $NetBSD: bsd.pkg.mk,v 1.546 2000/08/18 22:43:19 hubertf Exp $ # # This file is in the public domain. # @@ -270,9 +270,6 @@ FETCH_CMD?= ${LOCALBASE}/bsd/bin/ftp FETCH_CMD?= /usr/bin/ftp .endif -# By default, distfiles have no restrictions placed on them -MIRROR_DISTFILE?= yes - TOUCH_FLAGS?= -f PATCH_STRIP?= -p0 @@ -947,8 +944,10 @@ ACCEPTABLE_LICENSES= ${ACCEPTABLE_LICENCES} IGNORE= "is an interactive package" .elif (!defined(IS_INTERACTIVE) && defined(INTERACTIVE)) IGNORE= "is not an interactive package" -.elif (defined(NO_CDROM) && defined(FOR_CDROM)) -IGNORE= "may not be placed on a CDROM: ${NO_CDROM}" +.elif (defined(NO_BIN_ON_CDROM) && defined(FOR_CDROM)) +IGNORE= "may not be placed in binary form on a CDROM: ${NO_BIN_ON_CDROM}" +.elif (defined(NO_SRC_ON_CDROM) && defined(FOR_CDROM)) +IGNORE= "may not be placed in source form on a CDROM: ${NO_SRC_ON_CDROM}" .elif (defined(RESTRICTED) && defined(NO_RESTRICTED)) IGNORE= "is restricted: ${RESTRICTED}" .elif ((defined(USE_IMAKE) || defined(USE_MOTIF) || \ @@ -1017,6 +1016,8 @@ BUILD_DEFS+= OPSYS OS_VERSION MACHINE_ARCH MACHINE_GNU_ARCH BUILD_DEFS+= CPPFLAGS CFLAGS LDFLAGS BUILD_DEFS+= CONFIGURE_ENV CONFIGURE_ARGS BUILD_DEFS+= OBJECT_FMT LICENSE RESTRICTED +BUILD_DEFS+= NO_SRC_ON_FTP NO_SRC_ON_CDROM +BUILD_DEFS+= NO_BIN_ON_FTP NO_BIN_ON_CDROM .if !target(all) all: build @@ -2071,9 +2072,8 @@ mirror-distfiles: .if defined(NO_SRC_ON_FTP) @${ECHO_MSG} "${_PKGSRC_IN}> Warning: ${PKGNAME} distfile may not be made available through FTP:" @${ECHO_MSG} "${_PKGSRC_IN}> ${NO_SRC_ON_FTP}." -.endif -.if (${MIRROR_DISTFILE} == "yes") - ${_PKG_SILENT}${_PKG_DEBUG}${MAKE} ${MAKEFLAGS} fetch NO_IGNORE=yes NO_CHECK_DEPENDS=yes +.else + @${_PKG_SILENT}${_PKG_DEBUG}${MAKE} ${MAKEFLAGS} fetch NO_IGNORE=yes NO_CHECK_DEPENDS=yes .endif |