From 6e427b5c63f571cc7d3488032b70fa7cdfd7b6b1 Mon Sep 17 00:00:00 2001
From: agc <agc>
Date: Wed, 10 Jun 1998 08:02:08 +0000
Subject: Remove the trailing '-f' from MAKE_FLAGS in bsd.pkg.mk, and include
 it explicitly in the commands before ${MAKEFILE}; modify package Makefiles to
 conform to this rationalisation.  This was used inconsistently in many
 packages, some including it, some not.

---
 archivers/ha/Makefile       | 4 ++--
 archivers/unzip/Makefile    | 4 ++--
 archivers/zip/Makefile      | 4 ++--
 audio/tracker/Makefile      | 4 ++--
 databases/gdbm/Makefile     | 4 ++--
 graphics/gimp/Makefile      | 4 ++--
 mk/bsd.pkg.mk               | 8 ++++----
 print/ghostscript5/Makefile | 4 ++--
 print/psutils/Makefile      | 4 ++--
 security/ssh/Makefile       | 4 ++--
 sysutils/mkisofs/Makefile   | 4 ++--
 textproc/ispell/Makefile    | 4 ++--
 x11/tix/Makefile            | 4 ++--
 13 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/archivers/ha/Makefile b/archivers/ha/Makefile
index c8300ebb7c5..c3ebc07806b 100644
--- a/archivers/ha/Makefile
+++ b/archivers/ha/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1998/04/20 11:56:18 frueauf Exp $
+# $NetBSD: Makefile,v 1.6 1998/06/10 08:02:08 agc Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/08/10 22:31:19 fenner Exp 
 #
 
@@ -12,7 +12,7 @@ MAINTAINER=     packages@netbsd.org
 
 NO_WRKSUBDIR=   yes
 MAKEFILE=       makefile.nix
-MAKE_FLAGS=     CC=cc -f
+MAKE_FLAGS=     CC=cc
 ALL_TARGET=     ha
 USE_GMAKE=      yes
 
diff --git a/archivers/unzip/Makefile b/archivers/unzip/Makefile
index aa1e61a5115..14b71f19da0 100644
--- a/archivers/unzip/Makefile
+++ b/archivers/unzip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1998/04/20 11:56:18 frueauf Exp $
+# $NetBSD: Makefile,v 1.8 1998/06/10 08:02:08 agc Exp $
 # FreeBSD Id: Makefile,v 1.14 1997/06/19 05:30:04 ache Exp 
 #
 
@@ -11,7 +11,7 @@ MAINTAINER=     packages@netbsd.org
 
 MAKEFILE=       unix/Makefile
 ALL_TARGET=     bsd
-MAKE_FLAGS=     LOCAL_UNZIP="${CFLAGS} -DUSE_UNSHRINK" -f
+MAKE_FLAGS=     LOCAL_UNZIP="${CFLAGS} -DUSE_UNSHRINK"
 MAN1=           funzip.1 unzip.1 unzipsfx.1 zipgrep.1 zipinfo.1
 
 do-install:
diff --git a/archivers/zip/Makefile b/archivers/zip/Makefile
index 398c79d369d..7d2b8f84649 100644
--- a/archivers/zip/Makefile
+++ b/archivers/zip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1998/04/20 11:56:19 frueauf Exp $
+# $NetBSD: Makefile,v 1.9 1998/06/10 08:02:08 agc Exp $
 # FreeBSD Id: Makefile,v 1.10 1997/04/27 16:06:15 ache Exp 
 #
 
@@ -10,7 +10,7 @@ DISTFILES=	zip22.tar.gz
 MAINTAINER=	packages@netbsd.org
 
 MAKEFILE=	unix/Makefile
-MAKE_FLAGS=	LOCAL_ZIP="${CFLAGS}" -f
+MAKE_FLAGS=	LOCAL_ZIP="${CFLAGS}"
 ALL_TARGET=	generic
 MAN1=		zip.1 zipnote.1 zipcloak.1 zipsplit.1
 
diff --git a/audio/tracker/Makefile b/audio/tracker/Makefile
index 40612940d18..42b3e832847 100644
--- a/audio/tracker/Makefile
+++ b/audio/tracker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 1998/04/22 11:05:02 agc Exp $
+# $NetBSD: Makefile,v 1.11 1998/06/10 08:02:08 agc Exp $
 # FreeBSD Id: Makefile,v 1.29 1996/12/20 23:46:22 ache Exp 
 #
 
@@ -16,7 +16,7 @@ WRKSRC=			${WRKDIR}/tracker
 MAKE_FLAGS=		MACHINE=netbsd CC=${CC} INSTALL="${INSTALL}" \
 		INST_BIN_OPT="-c -s -m ${BINMODE} -o ${BINOWN} -g ${BINGRP}" \
 		INST_MAN_OPT="-c -m 644 -o ${BINOWN} -g ${BINGRP}" \
-		COMPRESSION_FILE=${PREFIX}/etc/compression_methods -f
+		COMPRESSION_FILE=${PREFIX}/etc/compression_methods
 
 INFO_FILES=		tracker.info
 
diff --git a/databases/gdbm/Makefile b/databases/gdbm/Makefile
index b45cb4c4b16..2beb0df679a 100644
--- a/databases/gdbm/Makefile
+++ b/databases/gdbm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1998/05/08 12:30:19 frueauf Exp $
+# $NetBSD: Makefile,v 1.8 1998/06/10 08:02:08 agc Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/01/28 08:11:23 asami Exp 
 #
 
@@ -9,7 +9,7 @@ MASTER_SITES=      ${MASTER_SITE_GNU}
 MAINTAINER=        packages@netbsd.org
 
 GNU_CONFIGURE=     yes
-MAKE_FLAGS=        CFLAGS="${CFLAGS}" LDFLAGS=-s -f
+MAKE_FLAGS=        CFLAGS="${CFLAGS}" LDFLAGS=-s
 MAN3=		   gdbm.3
 INFO_FILES=	   gdbm.info
 
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 598de47ae33..83d86007225 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 1998/05/09 15:24:42 frueauf Exp $
+# $NetBSD: Makefile,v 1.17 1998/06/10 08:02:08 agc Exp $
 
 DISTNAME=	gimp-0.99.28
 CATEGORIES=	graphics
@@ -55,6 +55,6 @@ pre-install:
 post-install:
 	@${ECHO_MSG} "--> now installing in ${GIMP_DATA}"
 	@(cd ${WRKDIR}/${GIMP_DATA} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} \
-		${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})
+		${MAKE_FLAGS} -f ${MAKEFILE} ${INSTALL_TARGET})
 
 .include <../../mk/bsd.pkg.mk>
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 8db1c8848dc..e9572d6e3db 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.98 1998/06/09 13:36:48 agc Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.99 1998/06/10 08:02:10 agc Exp $
 #
 # This file is in the public domain.
 #
@@ -166,7 +166,7 @@ MD5?=			md5
 .endif
 MD5_FILE?=		${FILESDIR}/md5
 
-MAKE_FLAGS?=	-f
+MAKE_FLAGS?=
 MAKEFILE?=		Makefile
 MAKE_ENV+=		PATH=${PATH}:${LOCALBASE}/bin:${X11BASE}/bin PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} MOTIFLIB="${MOTIFLIB}" CFLAGS="${CFLAGS}"
 
@@ -907,14 +907,14 @@ do-configure:
 
 .if !target(do-build)
 do-build:
-	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET})
+	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} ${ALL_TARGET})
 .endif
 
 # Install
 
 .if !target(do-install)
 do-install:
-	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})
+	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} ${INSTALL_TARGET})
 	@for f in ${INFO_FILES}; do		\
 		${ECHO} "${LOCALBASE}/bin/install-info --info-dir=${PREFIX}/info ${PREFIX}/info/$$f";	\
 		${LOCALBASE}/bin/install-info --info-dir=${PREFIX}/info ${PREFIX}/info/$$f;		\
diff --git a/print/ghostscript5/Makefile b/print/ghostscript5/Makefile
index f98c53fd098..95884038052 100644
--- a/print/ghostscript5/Makefile
+++ b/print/ghostscript5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 1998/06/03 14:08:50 agc Exp $
+# $NetBSD: Makefile,v 1.15 1998/06/10 08:02:09 agc Exp $
 # FreeBSD Id: Makefile,v 1.14 1997/10/13 11:22:43 asami Exp
 #
 
@@ -20,7 +20,7 @@ MAKE_ENV=	PORTSDIR=${.CURDIR}/../..
 EXTRACT_ONLY=	${GS_SOURCES}
 WRKSRC=		${WRKDIR}/gs5.10
 MAKEFILE=	unix-gcc.mak
-MAKE_FLAGS=	prefix=${PREFIX} zlibc_=-lz CFLAGS="${CFLAGS}" -f
+MAKE_FLAGS=	prefix=${PREFIX} zlibc_=-lz CFLAGS="${CFLAGS}"
 MAN1=		gs.1 pdf2dsc.1 pdf2ps.1 ps2ascii.1 ps2epsi.1 ps2pdf.1
 
 GS_SOURCES=	ghostscript-5.10.tar.gz
diff --git a/print/psutils/Makefile b/print/psutils/Makefile
index f5e28dfd3b0..3dc482bf068 100644
--- a/print/psutils/Makefile
+++ b/print/psutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1998/04/20 11:56:32 frueauf Exp $
+# $NetBSD: Makefile,v 1.7 1998/06/10 08:02:09 agc Exp $
 # FreeBSD Id: Makefile,v 1.15 1998/01/08 18:52:13 fenner Exp
 #
 
@@ -11,7 +11,7 @@ MAINTAINER=	packages@netbsd.org
 
 MANUAL_PACKAGE_BUILD=	PAPERSIZE has to be set to letter or A4
 WRKSRC=		${WRKDIR}/psutils
-MAKE_FLAGS?=	PAPER=${PAPERSIZE} -f
+MAKE_FLAGS?=	PAPER=${PAPERSIZE}
 MAN1=		psbook.1 psselect.1 pstops.1 epsffit.1 psnup.1 psresize.1 \
 		getafm.1 fixdlsrps.1 fixfmps.1 fixmacps.1 fixpsditps.1 \
 		fixpspps.1 fixtpps.1 fixwfwps.1 fixwpps.1 fixwwps.1 \
diff --git a/security/ssh/Makefile b/security/ssh/Makefile
index 8d8feb72387..8ec19184b31 100644
--- a/security/ssh/Makefile
+++ b/security/ssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 1998/06/03 13:49:07 agc Exp $
+# $NetBSD: Makefile,v 1.22 1998/06/10 08:02:09 agc Exp $
 # FreeBSD Id: Makefile,v 1.47 1997/11/10 22:04:42 dima Exp
 #
 
@@ -111,7 +111,7 @@ post-install:
 	@${MKDIR} ${PREFIX}/share/examples/ssh
 	@${MKDIR} ${WRKDIR}${SSH_CONF_DIR}
 	(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} \
-		${MAKEFILE} install_prefix=${WRKDIR} install-configs)
+		-f ${MAKEFILE} install_prefix=${WRKDIR} install-configs)
 	${INSTALL_DATA} ${WRKDIR}${SSH_CONF_DIR}/ssh_config \
 		${WRKDIR}${SSH_CONF_DIR}/sshd_config ${PREFIX}/share/examples/ssh
 	@${RM} -rf ${WRKDIR}${SSH_CONF_DIR}
diff --git a/sysutils/mkisofs/Makefile b/sysutils/mkisofs/Makefile
index 8d7df131256..60237ba075e 100644
--- a/sysutils/mkisofs/Makefile
+++ b/sysutils/mkisofs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:49 agc Exp $
+# $NetBSD: Makefile,v 1.5 1998/06/10 08:02:09 agc Exp $
 # FreeBSD Id: Makefile,v 1.5 1997/04/28 11:30:44 joerg Exp
 #
 
@@ -9,7 +9,7 @@ MASTER_SITES=   ftp://ftp.cdrom.com/pub/linux/tsx-11/packages/mkisofs/
 MAINTAINER=	packages@netbsd.org
 
 GNU_CONFIGURE=	yes
-MAKE_FLAGS=	XCFLAGS='-c -I. ${CFLAGS} -DSYSTEM_ID_DEFAULT=\"'`uname -s | ${TR} [a-z] [A-Z]`'\"' -f
+MAKE_FLAGS=	XCFLAGS='-c -I. ${CFLAGS} -DSYSTEM_ID_DEFAULT=\"'`uname -s | ${TR} [a-z] [A-Z]`'\"'
 MAN8=		mkisofs.8
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/ispell/Makefile b/textproc/ispell/Makefile
index 8ad6342fbe1..3a37080cd29 100644
--- a/textproc/ispell/Makefile
+++ b/textproc/ispell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1998/06/03 13:57:28 agc Exp $
+# $NetBSD: Makefile,v 1.9 1998/06/10 08:02:09 agc Exp $
 # FreeBSD Id: Makefile,v 1.21 1997/08/13 23:29:52 jmz Exp
 #
 
@@ -9,7 +9,7 @@ MASTER_SITES=	ftp://ftp.cs.ucla.edu/pub/ispell-3.1/
 
 MAINTAINER=	packages@netbsd.org
 
-MAKE_FLAGS=	TMPDIR=${.CURDIR} -f
+MAKE_FLAGS=	TMPDIR=${.CURDIR}
 SCRIPTS_ENV=	"LANG=${LANG}"
 
 MAN1=		buildhash.1 findaffix.1 ispell.1 munchlist.1 \
diff --git a/x11/tix/Makefile b/x11/tix/Makefile
index 1bec2444d43..19211875f00 100644
--- a/x11/tix/Makefile
+++ b/x11/tix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1998/05/04 22:55:29 tron Exp $
+# $NetBSD: Makefile,v 1.3 1998/06/10 08:02:09 agc Exp $
 # $FreeBSD Id: Makefile,v 1.15 1998/03/17 07:55:17 tg Exp
 
 DISTNAME=	Tix4.1.0.006
@@ -35,7 +35,7 @@ pre-configure:
 
 post-install:
 	@(cd ${WRKSRC}/.. && \
-	    ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})
+	    ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} -f ${MAKEFILE} ${INSTALL_TARGET})
 	@${MKDIR} ${PREFIX}/man/man1
 	@${MV} ${PREFIX}/man/mann/tixwish.1 ${PREFIX}/man/man1
 	@${LN} -sf ${PREFIX}/bin/tixwish4.1.8.0 ${PREFIX}/bin/tixwish
-- 
cgit v1.2.3