diff options
| -rw-r--r-- | mk/bsd.pkg.mk | 13 | ||||
| -rw-r--r-- | mk/bsd.pkg.subdir.mk | 8 |
2 files changed, 10 insertions, 11 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 882072f7efe..c0f51edda26 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1747 2005/11/09 18:42:32 tv Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1748 2005/11/14 04:41:17 rillig Exp $ # # This file is in the public domain. # @@ -284,7 +284,7 @@ ${_var_}+= ${${_var_}.*} .endfor CPPFLAGS+= ${CPP_PRECOMP_FLAGS} - + ALL_ENV+= CC=${CC:Q} ALL_ENV+= CFLAGS=${CFLAGS:M*:Q} ALL_ENV+= CPPFLAGS=${CPPFLAGS:M*:Q} @@ -677,8 +677,7 @@ _MASTER_SITE_OVERRIDE:= ${MASTER_SITE_OVERRIDE} .endif # DIST_SUBDIR # Where to put distfiles that don't have any other master site -MASTER_SITE_LOCAL?= \ - ${MASTER_SITE_BACKUP:=LOCAL_PORTS/} \ +MASTER_SITE_LOCAL?= ${MASTER_SITE_BACKUP:=LOCAL_PORTS/} ALLFILES?= ${DISTFILES} ${PATCHFILES} CKSUMFILES?= ${ALLFILES} @@ -830,7 +829,7 @@ USE_TOOLS+= shlock sleep .endif # If MANZ is defined, then we want the final man pages to be compressed. -# If MANZ is not defined, then we want the final man pages to be +# If MANZ is not defined, then we want the final man pages to be # uncompressed. # # We need to figure out if during installation, we need either gunzip or @@ -838,7 +837,7 @@ USE_TOOLS+= shlock sleep # sets MANCOMPRESSED to "yes" or "no", then it's an indication to the # install code that the package itself installed the man pages either # compressed or uncompressed. If a package sets MANCOMPRESSED_IF_MANZ, -# then the package uses BSD-style makefiles, so we need to determine if +# then the package uses BSD-style makefiles, so we need to determine if # the BSD-style makefile causes the man pages to be compressed or not. # .if !defined(_MANCOMPRESSED) @@ -4725,7 +4724,7 @@ ${DESCR}: ${DESCR_SRC} @\ ${ECHO} >>${DESCR} ; \ ${ECHO} "Homepage:" >>${DESCR} ; \ - ${ECHO} '${HOMEPAGE}' >>${DESCR} + ${ECHO} '${HOMEPAGE}' >>${DESCR} .endif .include "../../mk/subst.mk" diff --git a/mk/bsd.pkg.subdir.mk b/mk/bsd.pkg.subdir.mk index 9af6f3f43ab..3fe6931c214 100644 --- a/mk/bsd.pkg.subdir.mk +++ b/mk/bsd.pkg.subdir.mk @@ -1,9 +1,9 @@ -# $NetBSD: bsd.pkg.subdir.mk,v 1.59 2005/11/09 18:48:33 erh Exp $ -# Derived from: FreeBSD Id: bsd.port.subdir.mk,v 1.19 1997/03/09 23:10:56 wosch Exp +# $NetBSD: bsd.pkg.subdir.mk,v 1.60 2005/11/14 04:44:25 rillig Exp $ +# Derived from: FreeBSD Id: bsd.port.subdir.mk,v 1.19 1997/03/09 23:10:56 wosch Exp # from: @(#)bsd.subdir.mk 5.9 (Berkeley) 2/1/91 # # The include file <bsd.pkg.subdir.mk> contains the default targets -# for building ports subdirectories. +# for building ports subdirectories. # # # +++ variables +++ @@ -21,7 +21,7 @@ # Creating README.html for package. # # afterinstall, all, beforeinstall, build, checksum, clean, -# configure, deinstall, depend, describe, extract, fetch, fetch-list, +# configure, deinstall, depend, describe, extract, fetch, fetch-list, # install, package, readmes, realinstall, reinstall, tags, # mirror-distfiles, bulk-install, bulk-package, ${PKG_MISC_TARGETS} # |