tweak FAKE_FLAGS semantics to saner defaults.

2008-01-04 17:48:33 +00:00 · 2008-01-04 17:48:33 +00:00 · 17d70806a3
commit 17d70806a3
parent 0a55ef6456
189 changed files with 329 additions and 447 deletions
--- a/archivers/bzip2/Makefile
+++ b/archivers/bzip2/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.55 2007/09/15 10:14:32 espie Exp $
+# $OpenBSD: Makefile,v 1.56 2008/01/04 17:48:33 espie Exp $

 COMMENT=	block-sorting file compressor, unencumbered

@ -24,7 +24,6 @@ BZ2_CFLAGS+=	-fomit-frame-pointer -fno-strength-reduce

 MAKE_FLAGS=	CC="${CC}" CFLAGS="${CFLAGS} ${BZ2_CFLAGS}" \
 		LIBbz2_VERSION=${LIBbz2_VERSION} PREFIX=${TRUEPREFIX}
-FAKE_FLAGS=	${MAKE_FLAGS} DESTDIR=${WRKINST}
 REGRESS_FLAGS=	LD_LIBRARY_PATH="${WRKBUILD}" LIBbz2_VERSION=${LIBbz2_VERSION}

 REGRESS_TARGET=	test
--- a/archivers/zipios/Makefile
+++ b/archivers/zipios/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2007/09/15 10:14:34 espie Exp $
+# $OpenBSD: Makefile,v 1.8 2008/01/04 17:48:33 espie Exp $

 COMMENT=	java-like zip interface
 DISTNAME=	zipios++-0.1.5.9+cvs.2004.02.07
@ -26,7 +26,6 @@ post-extract:
 	done

 MAKE_FLAGS=SUBDIRS='zipios++ src'
-FAKE_FLAGS=${MAKE_FLAGS} DESTDIR=${WRKINST}

 post-install:
 	${INSTALL_DATA} ${WRKBUILD}/zipios++/zipios-config.h ${PREFIX}/include/zipios++/
--- a/astro/xephem/Makefile
+++ b/astro/xephem/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.31 2007/11/13 12:44:22 steven Exp $
+# $OpenBSD: Makefile,v 1.32 2008/01/04 17:48:33 espie Exp $

 COMMENT=	interactive astronomical ephemeris
 DISTNAME=	xephem-3.2.3
@ -36,7 +36,7 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/xephem/tools
 	@cd ${WRKSRC}/GUI/xephem && \
 	 ${SETENV} ${MAKE_ENV} \
-	 ${MAKE} ${FAKE_FLAGS} -f ${MAKE_FILE} ${INSTALL_TARGET}
+	 ${MAKE_PROGRAM} ${ALL_FAKE_FLAGS} -f ${MAKE_FILE} ${INSTALL_TARGET}
 	@cd ${WRKSRC}/GUI/xephem && \
 	 ${SETENV} ${MAKE_ENV} \
 	 ${MAKE} ${FAKE_FLAGS} -f ${MAKE_FILE} install.man
--- a/audio/cdparanoia/Makefile
+++ b/audio/cdparanoia/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2007/09/15 21:26:00 simon Exp $
+# $OpenBSD: Makefile,v 1.19 2008/01/04 17:48:33 espie Exp $

 COMMENT=	CDDA reading utility with extra data verification features

@ -25,7 +25,6 @@ AUTOCONF_VERSION=	2.52
 CONFIGURE_ENV=		GCC=${CC}
 MAKE_FLAGS=	LIBcdda_interface_VERSION=${LIBcdda_interface_VERSION} \
 		LIBcdda_paranoia_VERSION=${LIBcdda_paranoia_VERSION}
-FAKE_FLAGS=	${MAKE_FLAGS} DESTDIR=${WRKINST}

 NO_REGRESS=		Yes

--- a/audio/flite/Makefile
+++ b/audio/flite/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2007/09/15 21:26:01 simon Exp $
+# $OpenBSD: Makefile,v 1.10 2008/01/04 17:48:33 espie Exp $

 COMMENT=	text to speech utility

@ -22,7 +22,6 @@ MAKE_FLAGS=	LIBlibflite.so_VERSION=${LIBflite_VERSION} \
 	LIBlibflite_cmu_us_kal16.so_VERSION=${LIBflite_cmu_us_kal16_VERSION} \
 	LIBlibflite_cmulex.so_VERSION=${LIBflite_cmulex_VERSION} \
 	LIBlibflite_usenglish.so_VERSION=${LIBflite_usenglish_VERSION}
-FAKE_FLAGS=${MAKE_FLAGS} DESTDIR=${WRKINST}

 CATEGORIES=	audio

--- a/audio/gsm/Makefile
+++ b/audio/gsm/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.33 2007/09/15 21:26:01 simon Exp $
+# $OpenBSD: Makefile,v 1.34 2008/01/04 17:48:33 espie Exp $

 COMMENT=	u-law to gsm encoding audio converter and library

@ -19,7 +19,7 @@ WANTLIB=		c
 MAKE_FLAGS=	CC="${CC}" DEBUG="${CFLAGS}" LDINC='-L$$(LIB)' \
 		LIBgsm_VERSION=${LIBgsm_VERSION}

-FAKE_FLAGS=	${MAKE_FLAGS} INSTALL_ROOT="${WRKINST}${PREFIX}"
+FAKE_FLAGS=	INSTALL_ROOT="${WRKINST}${PREFIX}"

 WRKDIST=	${WRKDIR}/gsm-1.0-pl10
 NO_REGRESS=	Yes
--- a/audio/lame/Makefile
+++ b/audio/lame/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.33 2007/09/15 21:26:01 simon Exp $
+# $OpenBSD: Makefile,v 1.34 2008/01/04 17:48:33 espie Exp $

 COMMENT=	lame ain't an MP3 encoder

@ -29,7 +29,6 @@ FLAVOR?=

 CONFIGURE_ARGS+=	--enable-mp3rtp
 MAKE_FLAGS=	pkghtmldir=${TRUEPREFIX}/share/doc/lame
-FAKE_FLAGS=	${MAKE_FLAGS} DESTDIR=${WRKINST}
 USE_LIBTOOL=	Yes

 # XXX gcc3/nasm issue
--- a/audio/libogg/Makefile
+++ b/audio/libogg/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2007/12/27 16:29:54 espie Exp $
+# $OpenBSD: Makefile,v 1.23 2008/01/04 17:48:33 espie Exp $

 COMMENT=	Ogg bitstream library

@ -18,7 +18,6 @@ PERMIT_DISTFILES_FTP=	Yes
 MASTER_SITES=	http://downloads.xiph.org/releases/ogg/

 MAKE_FLAGS=mkdir_p="mkdir -p"
-FAKE_FLAGS=${MAKE_FLAGS} DESTDIR=${WRKINST}

 USE_LIBTOOL=	Yes
 CONFIGURE_STYLE=gnu
--- a/audio/libsndfile/Makefile
+++ b/audio/libsndfile/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2007/09/15 21:26:01 simon Exp $
+# $OpenBSD: Makefile,v 1.12 2008/01/04 17:48:33 espie Exp $

 COMMENT=	library to handle various audio file formats

@ -24,7 +24,6 @@ USE_LIBTOOL=	Yes
 CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS=	${CONFIGURE_SHARED}

-FAKE_FLAGS=	${DESTDIRNAME}=${WRKINST} \
-		htmldocdir=${PREFIX}/share/doc/libsndfile
+FAKE_FLAGS=	htmldocdir=${PREFIX}/share/doc/libsndfile

 .include <bsd.port.mk>
--- a/audio/libworkman/Makefile
+++ b/audio/libworkman/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2007/09/15 21:26:01 simon Exp $
+# $OpenBSD: Makefile,v 1.12 2008/01/04 17:48:33 espie Exp $

 COMMENT=		multi-platform CD-Player library

@ -19,7 +19,6 @@ USE_X11=		Yes
 NO_REGRESS=		Yes
 CONFIGURE_STYLE=	imake
 MAKE_FLAGS=		WM_LIBVER=${LIBworkman_VERSION}
-FAKE_FLAGS=		${MAKE_FLAGS} DESTDIR=${WRKINST}

 WRKDIST=		${WRKDIR}/libworkman

--- a/audio/morseplayer/Makefile
+++ b/audio/morseplayer/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2007/09/15 21:26:02 simon Exp $
+# $OpenBSD: Makefile,v 1.8 2008/01/04 17:48:33 espie Exp $

 COMMENT=		morse player

@ -16,8 +16,7 @@ WANTLIB=		c m

 MASTER_SITES=		http://www.thought.net/jason/radio/

-FAKE_FLAGS=		BINDIR="${PREFIX}/bin" MANDIR="${PREFIX}/man/cat" \
-			DESTDIR="${WRKINST}"
+FAKE_FLAGS=		BINDIR="${PREFIX}/bin" MANDIR="${PREFIX}/man/cat"

 NO_REGRESS=		Yes

--- a/audio/rplay/Makefile
+++ b/audio/rplay/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.29 2007/09/15 21:26:03 simon Exp $
+# $OpenBSD: Makefile,v 1.30 2008/01/04 17:48:33 espie Exp $

 COMMENT=	network audio player
 DISTNAME=	rplay-3.3.2
@ -27,7 +27,6 @@ CONFIGURE_ARGS+= --enable-static
 CONFIGURE_ENV=	CPPFLAGS="-I${DEPBASE}/include" \
 		LDFLAGS="-L${DEPBASE}/lib"
 MAKE_FLAGS=	LIBrplay_VERSION=${LIBrplay_VERSION}
-FAKE_FLAGS=	${MAKE_FLAGS}	DESTDIR=${WRKINST}

 post-extract:
 	@cd ${WRKSRC}/doc && mv rplay.texi rplayd.texi
--- a/audio/speex/Makefile
+++ b/audio/speex/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2007/09/15 21:26:03 simon Exp $
+# $OpenBSD: Makefile,v 1.17 2008/01/04 17:48:33 espie Exp $

 COMMENT=	patent-free speech codec

@ -28,7 +28,6 @@ CONFIGURE_ARGS=	${CONFIGURE_SHARED} \

 MAKE_FLAGS=	docdir=${TRUEPREFIX}/share/doc/speex \
 		mandir=${TRUEPREFIX}/man
-FAKE_FLAGS=	${MAKE_FLAGS} DESTDIR=${WRKINST}


 .include <bsd.port.mk>
--- a/audio/teknap/Makefile
+++ b/audio/teknap/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2007/09/15 21:26:03 simon Exp $
+# $OpenBSD: Makefile,v 1.15 2008/01/04 17:48:33 espie Exp $

 COMMENT=	console napster client

@ -24,7 +24,7 @@ NO_REGRESS=		Yes

 WRKDIST=	${WRKDIR}/TekNap

-FAKE_FLAGS=	INSTALL="${INSTALL_PROGRAM}" DESTDIR=${WRKINST}
+FAKE_FLAGS=	INSTALL="${INSTALL_PROGRAM}"
 post-install:
 	chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/TekNap/help

--- a/audio/tracker/Makefile
+++ b/audio/tracker/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2007/09/15 21:26:03 simon Exp $
+# $OpenBSD: Makefile,v 1.25 2008/01/04 17:48:33 espie Exp $

 COMMENT=	MOD player
 DISTNAME=	tracker-5.3
@ -25,7 +25,6 @@ MAKE_FLAGS=	MACHINE=openbsd CC=$(CC) INSTALL="$(INSTALL)" \
 		INST_MAN_OPT="-c -m 644 -o $(BINOWN) -g $(BINGRP)" \
 		COMPRESSION_FILE='$${DESTDIR}${SYSCONFDIR}/compression_methods' \
 		PREFIX='$${DESTDIR}/${TRUEPREFIX}'
-FAKE_FLAGS=	${MAKE_FLAGS} DESTDIR=${WRKINST}

 NO_REGRESS=	Yes

--- a/benchmarks/tcpblast/Makefile
+++ b/benchmarks/tcpblast/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2007/09/15 21:30:27 simon Exp $
+# $OpenBSD: Makefile,v 1.20 2008/01/04 17:48:33 espie Exp $

 COMMENT=	measure the throughput of a TCP connection

@ -13,7 +13,7 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 WANTLIB=		c

-FAKE_FLAGS=	BINDIR="${PREFIX}/bin" DESTDIR="${WRKINST}" 
+FAKE_FLAGS=	BINDIR="${PREFIX}/bin"

 NO_CHECKSUM=	Yes

--- a/cad/chipmunk/Makefile
+++ b/cad/chipmunk/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2007/09/15 21:36:57 simon Exp $
+# $OpenBSD: Makefile,v 1.9 2008/01/04 17:48:33 espie Exp $

 COMMENT=	electronic CAD system

@ -36,8 +36,6 @@ MAKE_FLAGS=	CHIPMUNKCC="${CC} ${CFLAGS}" XINCLUDEDIR="${X11BASE}/include" \
 		WOLLIBDIR="${LDIR}" \
 		UNTILPSMAP="${LDIR}/pensps.map"
 		
-FAKE_FLAGS=	${MAKE_FLAGS}
-
 USE_X11=	Yes
 NO_REGRESS=	Yes

--- a/comms/hylafax/Makefile
+++ b/comms/hylafax/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.51 2007/09/16 01:37:09 merdely Exp $
+# $OpenBSD: Makefile,v 1.52 2008/01/04 17:48:33 espie Exp $

 COMMENT=		send/receive faxes and share modems
 DISTNAME=		hylafax-4.1.5
@ -39,8 +39,7 @@ CONFIGURE_ENV+=		CCOMPILER="${CC}" CXXCOMPILER="${CXX}" \
 CONFIGURE_ARGS+=	--with-PAGESIZE=A4
 .endif

-FAKE_FLAGS=	ROOT=${WRKINST} ${DESTDIRNAME}=${WRKINST} \
-		SPOOL=${PREFIX}/libdata/hylafax
+FAKE_FLAGS=	ROOT=${WRKINST} SPOOL=${PREFIX}/libdata/hylafax

 SUID_EXES=	${PREFIX}/sbin/faxgetty ${PREFIX}/sbin/faxq \
 		${PREFIX}/bin/faxrm ${PREFIX}/bin/faxalter
--- a/comms/jpilot/Makefile
+++ b/comms/jpilot/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.46 2007/12/28 14:23:59 espie Exp $
+# $OpenBSD: Makefile,v 1.47 2008/01/04 17:48:33 espie Exp $

 COMMENT=	desktop organizer software for the palm pilot

@ -43,7 +43,6 @@ CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \
 MAN1=	jpilot-dump.1 jpilot-sync.1 jpilot.1

 MAKE_FLAGS = mkdir_p='mkdir -p'
-FAKE_FLAGS = ${MAKE_FLAGS} DESTDIR=${WRKINST}

 pre-build:
 .for i in ${MAN1}
--- a/comms/x3270/Makefile
+++ b/comms/x3270/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2007/11/28 21:18:08 naddy Exp $
+# $OpenBSD: Makefile,v 1.4 2008/01/04 17:48:34 espie Exp $

 COMMENT=	IBM 3270 terminal emulator for the X Window System

@ -32,6 +32,6 @@ CONFIGURE_ARGS=		--with-fontdir=${PREFIX}/lib/X11/fonts/x3270 \
 WRKDIST=		${WRKDIR}/x3270-3.3

 FAKE_FLAGS=		sysconfdir=${TRUEPREFIX}/share/examples \
-			PREFIX=${PREFIX} DESTDIR=${WRKINST}
+			PREFIX=${PREFIX}

 .include <bsd.port.mk>
--- a/databases/db/Makefile.inc
+++ b/databases/db/Makefile.inc
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.22 2007/09/16 03:05:29 merdely Exp $
+# $OpenBSD: Makefile.inc,v 1.23 2008/01/04 17:48:34 espie Exp $

 COMMENT-main=	Berkeley DB package, revision ${REVISION}
 COMMENT-tcl=	TCL bindings for Berkeley DB, revision ${REVISION}
@ -31,7 +31,6 @@ MODGNU_CONFIG_GUESS_DIRS=	${WRKSRC}/dist
 MAKE_FLAGS+=	DBVERSION=${LIBdb_VERSION} \
 		DBCXXVERSION=${LIBdb_cxx_VERSION} \
 		DBTCLVERSION=${LIBdb_tcl_VERSION}
-FAKE_FLAGS=	${MAKE_FLAGS} DESTDIR=${WRKINST}

 WRKBUILD=	${WRKDIST}/build_unix

--- a/databases/mysql/Makefile
+++ b/databases/mysql/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.136 2007/12/28 22:15:19 espie Exp $
+# $OpenBSD: Makefile,v 1.137 2008/01/04 17:48:34 espie Exp $

 .if ${MACHINE_ARCH} == "m88k"
 BROKEN=		gen_lex_hash hangs
@ -96,7 +96,6 @@ PKG_ARCH-tests=	*
 WANTLIB-tests=

 MAKE_FLAGS=	mkdir_p='mkdir -p --'
-FAKE_FLAGS=	${MAKE_FLAGS} DESTDIR=${WRKINST}

 post-install:
 	cd ${PREFIX}/lib && \
--- a/databases/pgtcl/Makefile
+++ b/databases/pgtcl/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2007/10/13 08:54:02 steven Exp $
+# $OpenBSD: Makefile,v 1.2 2008/01/04 17:48:34 espie Exp $

 SHARED_ONLY=	Yes
 
@ -35,7 +35,6 @@ CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
 		--with-postgres-lib=${LOCALBASE}/lib

 MAKE_FLAGS=	PKG_LIB_FILE=libpgtcl.so.${LIBpgtcl_VERSION}
-FAKE_FLAGS=	${MAKE_FLAGS} DESTDIR=${DESTDIR}

 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pgtcl/html
--- a/databases/qdbm/Makefile
+++ b/databases/qdbm/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2007/12/19 21:27:48 bernd Exp $
+# $OpenBSD: Makefile,v 1.16 2008/01/04 17:48:34 espie Exp $

 COMMENT=		high performance embedded database library

@ -27,6 +27,5 @@ CONFIGURE_ARGS=		${CONFIGURE_SHARED} \
 			--enable-iconv

 MAKE_FLAGS=	LIBVER=${LIBqdbm_VERSION:R} LIBREV=${LIBqdbm_VERSION:E}
-FAKE_FLAGS=	${MAKE_FLAGS} DESTDIR=${WRKINST}

 .include <bsd.port.mk>
--- a/devel/arm-elf/gcc/Makefile
+++ b/devel/arm-elf/gcc/Makefile
@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.3 2007/10/05 13:14:12 sturm Exp $
+# $OpenBSD: Makefile,v 1.4 2008/01/04 17:48:34 espie Exp $

 COMMENT=	gcc for arm-elf cross-development

 VERSION=	3.4.5
 FULL_VERSION=	3.4-20050913
 DISTNAME=	gcc-${FULL_VERSION}
-PKGNAME=	${CONFIG}-gcc-${VERSION}p0
+PKGNAME=	${CONFIG}-gcc-${VERSION}p1

 # GPL
 PERMIT_PACKAGE_FTP=	Yes
--- a/devel/arm-elf/gcc/pkg/PLIST
+++ b/devel/arm-elf/gcc/pkg/PLIST
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2007/04/02 15:35:01 sturm Exp $
+@comment $OpenBSD: PLIST,v 1.2 2008/01/04 17:48:34 espie Exp $
 arm-elf/
 arm-elf/lib/
 bin/arm-elf-c++
@ -7,7 +7,6 @@ bin/arm-elf-g++
 bin/arm-elf-gcc
 bin/arm-elf-gcc-3.4.5
 bin/arm-elf-gccbug
-bin/arm-elf-gcov
 lib/gcc/
 lib/gcc/arm-elf/
 lib/gcc/arm-elf/3.4.5/
--- a/devel/autoconf/2.13/Makefile
+++ b/devel/autoconf/2.13/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2007/09/16 02:52:57 merdely Exp $
+# $OpenBSD: Makefile,v 1.3 2008/01/04 17:48:34 espie Exp $

 COMMENT=	automatically configure source code on many Un*x platforms

@ -25,7 +25,7 @@ CONFIGURE_STYLE= gnu dest
 CONFIGURE_ENV=	M4=/usr/bin/m4

 MAKE_FLAGS=acdatadir=${PREFIX}/share/autoconf${SUFFIX}
-FAKE_FLAGS=DESTDIR=${WRKINST} acdatadir=${WRKINST}${PREFIX}/share/autoconf${SUFFIX}
+FAKE_FLAGS=acdatadir=${WRKINST}${PREFIX}/share/autoconf${SUFFIX}
 SUBST_VARS=SUFFIX

 post-install:
--- a/devel/autoconf/2.52/Makefile
+++ b/devel/autoconf/2.52/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2007/09/16 02:52:57 merdely Exp $
+# $OpenBSD: Makefile,v 1.5 2008/01/04 17:48:34 espie Exp $

 COMMENT=	automatically configure source code on many Un*x platforms

@ -25,7 +25,6 @@ CONFIGURE_STYLE= gnu
 CONFIGURE_ENV=	M4=/usr/bin/m4
 MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/config
 MAKE_FLAGS=pkgdatadir=${PREFIX}/share/autoconf${SUFFIX}
-FAKE_FLAGS=${MAKE_FLAGS} DESTDIR=${WRKINST}
 SUBST_VARS=SUFFIX

 post-install:
--- a/devel/autoconf/2.54/Makefile
+++ b/devel/autoconf/2.54/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2007/09/16 02:52:57 merdely Exp $
+# $OpenBSD: Makefile,v 1.6 2008/01/04 17:48:34 espie Exp $

 COMMENT=	automatically configure source code on many Un*x platforms

@ -26,7 +26,7 @@ CONFIGURE_ENV+=		M4="/usr/bin/m4"
 CONFIGURE_ENV+=		AWK="${AWK}"
 MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/config
 MAKE_FLAGS=		pkgdatadir=${PREFIX}/share/autoconf${SUFFIX}
-FAKE_FLAGS=		${MAKE_FLAGS} DESTDIR=${WRKINST} lispdir=
+FAKE_FLAGS=		lispdir=
 #USE_GMAKE=		Yes
 SUBST_VARS=		SUFFIX

--- a/devel/autoconf/2.56/Makefile
+++ b/devel/autoconf/2.56/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2007/09/16 02:52:57 merdely Exp $
+# $OpenBSD: Makefile,v 1.5 2008/01/04 17:48:34 espie Exp $

 COMMENT=	automatically configure source code on many Un*x platforms

@ -26,7 +26,7 @@ CONFIGURE_ENV+=		M4="/usr/bin/m4"
 CONFIGURE_ENV+=		AWK="${AWK}"
 MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/config
 MAKE_FLAGS=		pkgdatadir=${PREFIX}/share/autoconf${SUFFIX}
-FAKE_FLAGS=		${MAKE_FLAGS} DESTDIR=${WRKINST} lispdir=
+FAKE_FLAGS=		lispdir=
 #USE_GMAKE=		Yes
 SUBST_VARS=		SUFFIX

--- a/devel/autoconf/2.57/Makefile
+++ b/devel/autoconf/2.57/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2007/09/16 02:52:57 merdely Exp $
+# $OpenBSD: Makefile,v 1.5 2008/01/04 17:48:34 espie Exp $

 COMMENT=	automatically configure source code on many Un*x platforms

@ -26,7 +26,7 @@ CONFIGURE_ENV+=		M4="/usr/bin/m4"
 CONFIGURE_ENV+=		AWK="${AWK}"
 MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/config
 MAKE_FLAGS=		pkgdatadir=${PREFIX}/share/autoconf${SUFFIX}
-FAKE_FLAGS=		${MAKE_FLAGS} DESTDIR=${WRKINST} lispdir=
+FAKE_FLAGS=		lispdir=
 #USE_GMAKE=		Yes
 SUBST_VARS=		SUFFIX

--- a/devel/autoconf/2.58/Makefile
+++ b/devel/autoconf/2.58/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2007/09/16 02:52:57 merdely Exp $
+# $OpenBSD: Makefile,v 1.6 2008/01/04 17:48:34 espie Exp $

 COMMENT=	automatically configure source code on many Un*x platforms

@ -26,7 +26,7 @@ CONFIGURE_ENV+=		M4="/usr/bin/m4"
 CONFIGURE_ENV+=		AWK="${AWK}"
 MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/config
 MAKE_FLAGS=		pkgdatadir=${PREFIX}/share/autoconf${SUFFIX}
-FAKE_FLAGS=		${MAKE_FLAGS} DESTDIR=${WRKINST} lispdir=
+FAKE_FLAGS=		lispdir=
 #USE_GMAKE=		Yes
 SUBST_VARS=		SUFFIX

--- a/devel/autoconf/2.59/Makefile
+++ b/devel/autoconf/2.59/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2007/09/16 02:52:57 merdely Exp $
+# $OpenBSD: Makefile,v 1.7 2008/01/04 17:48:34 espie Exp $

 COMMENT=	automatically configure source code on many Un*x platforms

@ -26,7 +26,7 @@ CONFIGURE_ENV+=		M4="/usr/bin/m4"
 CONFIGURE_ENV+=		AWK="${AWK}"
 MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/config
 MAKE_FLAGS=		pkgdatadir=${PREFIX}/share/autoconf${SUFFIX}
-FAKE_FLAGS=		${MAKE_FLAGS} DESTDIR=${WRKINST} lispdir=
+FAKE_FLAGS=		lispdir=
 #USE_GMAKE=		Yes
 SUBST_VARS=		SUFFIX

--- a/devel/autoconf/2.60/Makefile
+++ b/devel/autoconf/2.60/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2007/09/16 02:52:57 merdely Exp $
+# $OpenBSD: Makefile,v 1.5 2008/01/04 17:48:34 espie Exp $

 COMMENT=	automatically configure source code on many Un*x platforms

@ -28,7 +28,7 @@ CONFIGURE_ENV+=		M4="/usr/bin/m4"
 CONFIGURE_ENV+=		AWK="${AWK}" ac_cv_sh_n_works=yes
 MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/config
 MAKE_FLAGS=		pkgdatadir=${PREFIX}/share/autoconf${SUFFIX} EMACS=no
-FAKE_FLAGS=		${MAKE_FLAGS} DESTDIR=${WRKINST} lispdir= EMACS=no
+FAKE_FLAGS=		lispdir= EMACS=no
 #USE_GMAKE=		Yes
 SUBST_VARS=		SUFFIX

--- a/devel/autoconf/2.61/Makefile
+++ b/devel/autoconf/2.61/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2007/09/16 02:52:57 merdely Exp $
+# $OpenBSD: Makefile,v 1.5 2008/01/04 17:48:34 espie Exp $

 COMMENT=	automatically configure source code on many Un*x platforms

@ -28,7 +28,7 @@ CONFIGURE_ENV+=		M4="/usr/bin/m4"
 CONFIGURE_ENV+=		AWK="${AWK}" ac_cv_sh_n_works=yes
 MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/config
 MAKE_FLAGS=		pkgdatadir=${PREFIX}/share/autoconf${SUFFIX} EMACS=no
-FAKE_FLAGS=		${MAKE_FLAGS} DESTDIR=${WRKINST} lispdir= EMACS=no
+FAKE_FLAGS=		lispdir= EMACS=no
 #USE_GMAKE=		Yes
 SUBST_VARS=		SUFFIX

--- a/devel/autogen/Makefile
+++ b/devel/autogen/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2007/09/16 02:52:57 merdely Exp $
+# $OpenBSD: Makefile,v 1.9 2008/01/04 17:48:34 espie Exp $

 COMMENT=automatic text creation from templates
 CATEGORIES=devel
@ -27,7 +27,5 @@ CONFIGURE_ARGS=	--without-libregex \
 		${ENABLE_SHARED}

 MAKE_FLAGS+=	INFO_DEPS=
-FAKE_FLAGS+=	INFO_DEPS= \
-		DESTDIR=${WRKINST}
 USE_LIBTOOL=	Yes
 .include <bsd.port.mk>
--- a/devel/automake/1.8/Makefile
+++ b/devel/automake/1.8/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2007/09/16 02:52:57 merdely Exp $
+# $OpenBSD: Makefile,v 1.5 2008/01/04 17:48:34 espie Exp $

 COMMENT=	GNU standards-compliant Makefile generator

@ -26,7 +26,6 @@ CONFIGURE_STYLE=	gnu
 MAKE_FLAGS+=		MAKEINFO="makeinfo --no-split" \
 			pkgvdatadir=${PREFIX}/share/automake${SUFFIX} \
 			APIVERSION=${VERSION}
-FAKE_FLAGS+=		${MAKE_FLAGS}
 SUBST_VARS=		SUFFIX

 REGRESS_DEPENDS=	${MODGNU_AUTOCONF_DEPENDS} \
--- a/devel/automake/1.9/Makefile
+++ b/devel/automake/1.9/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2007/10/01 11:42:30 steven Exp $
+# $OpenBSD: Makefile,v 1.7 2008/01/04 17:48:34 espie Exp $

 COMMENT=	GNU standards-compliant Makefile generator

@ -26,7 +26,6 @@ CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS=		--infodir=${PREFIX}/info
 MAKE_FLAGS+=		pkgvdatadir=${PREFIX}/share/automake${SUFFIX} \
 			APIVERSION=${VERSION}
-FAKE_FLAGS+=		${MAKE_FLAGS}
 SUBST_VARS=		SUFFIX

 REGRESS_DEPENDS=	${MODGNU_AUTOCONF_DEPENDS} \
--- a/devel/avr/gcc/Makefile
+++ b/devel/avr/gcc/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2007/09/16 02:52:57 merdely Exp $
+# $OpenBSD: Makefile,v 1.8 2008/01/04 17:48:34 espie Exp $

 COMMENT=	Atmel AVR 8-bit RISC microcontrollers' XGCC

@ -20,7 +20,7 @@ MAKE_ADA=No

 DISTNAME=	gcc-${FULL_VERSION}
 EXTRACT_SUFX=	.tar.bz2
-PKGNAME=	avr-gcc-${V}p2
+PKGNAME=	avr-gcc-${V}p3

 MASTER_SITE_GCC=	ftp://gcc.gnu.org/pub/gcc/ \
 			ftp://ftp.uvsq.fr/pub/gcc/ \
--- a/devel/avr/gcc/pkg/PLIST
+++ b/devel/avr/gcc/pkg/PLIST
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.4 2006/11/16 22:25:58 steven Exp $
+@comment $OpenBSD: PLIST,v 1.5 2008/01/04 17:48:34 espie Exp $
 avr/
 avr/lib/
 bin/avr-c++
@ -7,7 +7,6 @@ bin/avr-g++
 bin/avr-gcc
 bin/avr-gcc-${V}
 bin/avr-gccbug
-bin/avr-gcov
 lib/gcc/
 lib/gcc/avr/
 lib/gcc/avr/${V}/
--- a/devel/cook/Makefile
+++ b/devel/cook/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2007/09/16 02:52:58 merdely Exp $
+# $OpenBSD: Makefile,v 1.16 2008/01/04 17:48:34 espie Exp $
 # $FreeBSD: Makefile,v 1.5 2000/05/30 23:19:09 jasone Exp $

 COMMENT=	like make(1), but more powerful and clean
@ -19,7 +19,7 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 WANTLIB=		c

-FAKE_FLAGS=	RPM_BUILD_ROOT="${WRKINST}"
+DESTDIRNAME=RPM_BUILD_ROOT

 CONFIGURE_STYLE= gnu
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
--- a/devel/ctm/Makefile
+++ b/devel/ctm/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2007/09/16 02:52:58 merdely Exp $
+# $OpenBSD: Makefile,v 1.11 2008/01/04 17:48:34 espie Exp $

 COMMENT=		directory synchronization over mail

@ -15,7 +15,7 @@ WANTLIB=		c

 MASTER_SITES=		http://www.nemeton.com.au/src/

-FAKE_FLAGS=		PREFIX=${PREFIX} DESTDIR=${WRKINST}
+FAKE_FLAGS=		PREFIX=${PREFIX}
 WRKBUILD=		${WRKSRC}/ctm

 .include <bsd.port.mk>
--- a/devel/dejagnu/Makefile
+++ b/devel/dejagnu/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2007/12/28 20:28:15 espie Exp $
+# $OpenBSD: Makefile,v 1.29 2008/01/04 17:48:34 espie Exp $

 COMMENT=	framework to test programs

@ -26,7 +26,6 @@ CONFIGURE_ENV=	ac_cv_path_tclsh=${LOCALBASE}/bin/tclsh8.4
 ALL_TARGET=	all
 INSTALL_TARGET=	install
 MAKE_FLAGS=mkinstalldirs='mkdir -p --'
-FAKE_FLAGS=${MAKE_FLAGS} DESTDIR=${WRKINST}

 post-build:
 	@cd ${WRKBUILD}/doc && makeinfo --no-split dejagnu.texi
--- a/devel/ffcall/Makefile
+++ b/devel/ffcall/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2007/09/16 02:52:58 merdely Exp $
+# $OpenBSD: Makefile,v 1.12 2008/01/04 17:48:34 espie Exp $
 # $FreeBSD: ports/devel/ffcall/Makefile,v 1.2 2001/08/31 14:20:18 sobomax Exp $
 # Original From:                jagapen@home.com

@ -28,8 +28,7 @@ CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS=	${CONFIGURE_SHARED}
 MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/autoconf

-FAKE_FLAGS=	${DESTDIRNAME}=${WRKINST} \
-		htmldir="\$$(datadir)/doc/ffcall/html"
+FAKE_FLAGS=	htmldir="\$$(datadir)/doc/ffcall/html"

 pre-install:
 	@${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ffcall/html
--- a/devel/iso-codes/Makefile
+++ b/devel/iso-codes/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2007/10/22 10:14:02 steven Exp $
+# $OpenBSD: Makefile,v 1.10 2008/01/04 17:48:34 espie Exp $

 COMMENT=	lists of the country, language and currency iso names

@ -23,7 +23,7 @@ MODPY_RUNDEP=	No

 BUILD_DEPENDS=	:python-expat-${MODPY_VERSION}*:lang/python/${MODPY_VERSION},-expat

-FAKE_FLAGS=	DESTDIR=${WRKINST}  pkgconfigdir=${PREFIX}/lib/pkgconfig
+FAKE_FLAGS=	pkgconfigdir=${PREFIX}/lib/pkgconfig

 post-extract:
 	@perl -pi -e 's,/usr/bin/env python,${MODPY_BIN},' \
--- a/devel/libJudy/Makefile
+++ b/devel/libJudy/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2007/09/16 02:53:00 merdely Exp $
+# $OpenBSD: Makefile,v 1.6 2008/01/04 17:48:34 espie Exp $

 COMMENT=		general purpose dynamic array

@ -23,8 +23,6 @@ CONFIGURE_STYLE=	GNU
 USE_GMAKE=		Yes
 USE_LIBTOOL=		Yes

-FAKE_FLAGS=		${MAKE_FLAGS} DESTDIR=${WRKINST}
-
 EXAMPLESDIR=		${PREFIX}/share/examples/libJudy

 post-install:
--- a/devel/libdsk/Makefile
+++ b/devel/libdsk/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2007/09/16 02:53:00 merdely Exp $
+# $OpenBSD: Makefile,v 1.13 2008/01/04 17:48:34 espie Exp $

 COMMENT=		library for accessing disks and disk image files

@ -27,7 +27,6 @@ CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS=		${CONFIGURE_SHARED}
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
-FAKE_FLAGS=		${MAKE_FLAGS} DESTDIR=${WRKINST}
 MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/config

 post-install:
--- a/devel/libelf/Makefile
+++ b/devel/libelf/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2007/09/16 02:53:00 merdely Exp $
+# $OpenBSD: Makefile,v 1.3 2008/01/04 17:48:34 espie Exp $

 COMMENT=	read, modify, create ELF files on any arch
 CATEGORIES=	devel
@ -14,7 +14,7 @@ CONFIGURE_STYLE=	autoconf
 AUTOCONF_VERSION=	2.13
 CONFIGURE_ARGS=		--disable-nls
 MAKE_FLAGS=		SHLIB_SFX=.so.$(LIBelf_VERSION)
-FAKE_FLAGS=		${MAKE_FLAGS} instroot=${DESTDIR}
+DESTDIRNAME=		instroot

 # LGPL
 PERMIT_DISTFILES_FTP=	Yes
--- a/devel/libtool/Makefile
+++ b/devel/libtool/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.67 2007/09/01 20:11:21 kili Exp $
+# $OpenBSD: Makefile,v 1.68 2008/01/04 17:48:34 espie Exp $
 # $FreeBSD: Makefile,v 1.2 1998/09/23 16:15:53 vanilla Exp $

 COMMENT-main=	generic shared library support script
@ -37,8 +37,6 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
 CONFIGURE_ENV=	GREP=/usr/bin/grep
 MAKE_ENV=	GREP=/usr/bin/grep

-FAKE_FLAGS=	 ${MAKE_FLAGS} DESTDIR=${WRKINST}
-
 MULTI_PACKAGES=	-main -ltdl

 RUN_DEPENDS-main=	::devel/libtool,-ltdl
--- a/devel/nasm/Makefile
+++ b/devel/nasm/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2007/09/16 02:53:02 merdely Exp $
+# $OpenBSD: Makefile,v 1.22 2008/01/04 17:48:34 espie Exp $

 COMMENT=	general-purpose multi-platform x86 assembler

@ -24,7 +24,7 @@ CONFIGURE_STYLE= gnu

 NO_REGRESS=	Yes

-FAKE_FLAGS=	INSTALLROOT="${WRKINST}"
+DESTDIRNAME=	INSTALLROOT

 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nasm
--- a/devel/opencm/Makefile
+++ b/devel/opencm/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.26 2007/09/16 02:53:02 merdely Exp $
+# $OpenBSD: Makefile,v 1.27 2008/01/04 17:48:34 espie Exp $

 COMMENT=		OpenCM change management system

@ -43,7 +43,6 @@ MAKE_FLAGS+= LIBZ=-lz USOURCE_SUBDIRS="libgdiff src"
 MAKE_FLAGS+= LIBGC=
 MAKE_FLAGS+=		infodir=${PREFIX}/info
 MAKE_FLAGS+=		mandir=${PREFIX}/man
-FAKE_FLAGS=		${MAKE_FLAGS}

 post-install:
 	gunzip ${PREFIX}/info/opencm.info.gz
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.41 2007/10/25 10:00:03 steven Exp $
+# $OpenBSD: Makefile,v 1.42 2008/01/04 17:48:34 espie Exp $

 COMMENT-main=	subversion revision control system
 COMMENT-perl=	perl interface to subversion
@ -157,11 +157,11 @@ do-regress:
 post-install:
 .if !${FLAVOR:L:Mno_bindings}
 	@cd ${WRKBUILD} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} \
-		${FAKE_FLAGS} install-swig-py
+		${ALL_FAKE_FLAGS} install-swig-py
 	@cd ${WRKBUILD} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} \
-		${FAKE_FLAGS} install-swig-pl
+		${ALL_FAKE_FLAGS} install-swig-pl
 	@cd ${WRKBUILD} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} \
-		${FAKE_FLAGS} install-swig-rb
+		${ALL_FAKE_FLAGS} install-swig-rb
 .endif
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/subversion
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/subversion/backup
--- a/editors/joe/Makefile
+++ b/editors/joe/Makefile
@ -1,5 +1,5 @@
 # $RuOBSD: Makefile,v 1.3 2002/04/10 05:14:52 form Exp $
-# $OpenBSD: Makefile,v 1.35 2007/09/16 00:44:00 merdely Exp $
+# $OpenBSD: Makefile,v 1.36 2008/01/04 17:48:34 espie Exp $

 COMMENT=		Joe's Own Editor

@ -18,8 +18,7 @@ WANTLIB=		c ncurses m util

 CONFIGURE_STYLE=	gnu

-FAKE_FLAGS=	DESTDIR=${WRKINST} \
-		sysconf_joedir=${PREFIX}/share/examples/joe \
+FAKE_FLAGS=	sysconf_joedir=${PREFIX}/share/examples/joe \
 		sysconf_docdir=${PREFIX}/share/doc/joe

 .include <bsd.port.mk>
--- a/editors/xwpe/Makefile
+++ b/editors/xwpe/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2007/09/16 00:44:00 merdely Exp $
+# $OpenBSD: Makefile,v 1.26 2008/01/04 17:48:34 espie Exp $

 COMMENT=	powerful programming editor

@ -19,8 +19,9 @@ WANTLIB=		ICE SM X11 c ncurses
 ALL_TARGET=	xwpe

 CONFIGURE_STYLE=gnu
+DESTDIRNAME=	none
 MAKE_FLAGS=	CFLAGS='${CFLAGS} -I${X11BASE}/include'
-FAKE_FLAGS=	${MAKE_FLAGS} prefix=${WRKINST}${PREFIX} MANDIR=${WRKINST}${PREFIX}/man
+FAKE_FLAGS=	prefix=${WRKINST}${PREFIX} MANDIR=${WRKINST}${PREFIX}/man

 USE_X11=	Yes
 NO_REGRESS=	Yes
--- a/emulators/xmame/Makefile
+++ b/emulators/xmame/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.30 2007/09/16 00:45:14 merdely Exp $
+# $OpenBSD: Makefile,v 1.31 2008/01/04 17:48:34 espie Exp $

 COMMENT-main=	emulates arcade machines and old home computers
 COMMENT-mame=	emulates a massive variety of arcade machines
@ -77,7 +77,6 @@ MAKE_FLAGS+=	MY_CPU=risc

 MAKE_ENV=	PREFIX="${PREFIX}"
 MAKE_FILE=	Makefile.OpenBSD
-FAKE_FLAGS=	${MAKE_FLAGS}
 MAKE_FLAGS+=	ARCH=openbsd \
 		CC="${CC}" CFLAGS="${CFLAGS}" \
 		DISPLAY_METHOD="${DISPLAY_METHOD}" \
--- a/games/falconseye/Makefile
+++ b/games/falconseye/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2007/09/15 18:01:01 simon Exp $
+# $OpenBSD: Makefile,v 1.16 2008/01/04 17:48:34 espie Exp $

 COMMENT=	NetHack derivative

@ -23,7 +23,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=falconseye/}
 LIB_DEPENDS=	SDL::devel/sdl
 RUN_DEPENDS=	:hackdata-*:games/hackdata

-FAKE_FLAGS=	PREFIX="${PREFIX}" DESTDIR="${WRKINST}"
+FAKE_FLAGS=	PREFIX="${PREFIX}"

 GAMEDIR=	lib/falconseyedir
 NHDIR=		${PREFIX}/${GAMEDIR}
--- a/games/lincity-ng/Makefile
+++ b/games/lincity-ng/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2007/12/29 20:51:10 simon Exp $
+# $OpenBSD: Makefile,v 1.3 2008/01/04 17:48:34 espie Exp $

 COMMENT=	city simulation game

@ -37,7 +37,7 @@ do-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} jam

 do-install:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${FAKE_FLAGS} jam \
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${ALL_FAKE_FLAGS} jam \
 		install install_man

 .include <bsd.port.mk>
--- a/games/moria/Makefile
+++ b/games/moria/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2007/09/15 18:01:02 simon Exp $
+# $OpenBSD: Makefile,v 1.12 2008/01/04 17:48:35 espie Exp $

 COMMENT=	The Dungeons of Moria

@ -34,6 +34,6 @@ do-build:

 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/moria
-	@cd ${WRKBUILD}; ${MAKE_PROGRAM} ${FAKE_FLAGS} install
+	@cd ${WRKBUILD}; ${MAKE_PROGRAM} ${ALL_FAKE_FLAGS} install

 .include <bsd.port.mk>
--- a/games/nethack/Makefile
+++ b/games/nethack/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.42 2007/09/15 18:01:02 simon Exp $
+# $OpenBSD: Makefile,v 1.43 2008/01/04 17:48:35 espie Exp $
 # $FreeBSD: Makefile,v 1.13 1997/12/25 22:29:17 asami Exp $

 COMMENT=	dungeon explorin', hackin', game.  Piece of cake
@ -23,7 +23,7 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 WANTLIB=		c termlib

-FAKE_FLAGS=PREFIX=${PREFIX} DESTDIR=${WRKINST}
+FAKE_FLAGS=PREFIX=${PREFIX}

 GAMEDIR=lib/nethackdir-$V
 NHDIR=	${TRUEPREFIX}/${GAMEDIR}
--- a/games/quake/Makefile
+++ b/games/quake/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2007/09/15 18:01:02 simon Exp $
+# $OpenBSD: Makefile,v 1.18 2008/01/04 17:48:35 espie Exp $

 COMMENT-main=		Quake/Quake-world client
 COMMENT-server=		Quake world server
@ -53,7 +53,6 @@ ERRORS="Need some non empty flavor"
 .endif

 WRKDIST=	${WRKDIR}/quakeforge
-FAKE_FLAGS=	${MAKE_FLAGS}	DESTDIR=${WRKINST}

 post-extract:
 	cd ${WRKDIST}; rm config.cache config.log
--- a/games/slash-em/Makefile
+++ b/games/slash-em/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2007/09/15 18:01:02 simon Exp $
+# $OpenBSD: Makefile,v 1.15 2008/01/04 17:48:35 espie Exp $

 COMMENT=	dungeon explorin', hackin', game.  Hard
 DISTNAME=	se007e7f1
@ -21,7 +21,7 @@ V=	3.4.3.7e7f1

 WRKDIST=${WRKDIR}/slashem-0.0.7E7F1

-FAKE_FLAGS=PREFIX=${PREFIX} DESTDIR=${WRKINST}
+FAKE_FLAGS=PREFIX=${PREFIX}

 GAMEDIR=lib/slashemdir-$V
 NHDIR=	${PREFIX}/${GAMEDIR}
--- a/games/slash/Makefile
+++ b/games/slash/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.31 2007/09/15 18:01:02 simon Exp $
+# $OpenBSD: Makefile,v 1.32 2008/01/04 17:48:35 espie Exp $

 COMMENT=	dungeon explorin', hackin' game, but harder than nethack

@ -26,7 +26,7 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 WANTLIB=		c termlib

-FAKE_FLAGS=PREFIX=${PREFIX} DESTDIR=${WRKINST}
+FAKE_FLAGS=PREFIX=${PREFIX}

 GAMEDIR=lib/slashdir
 NHDIR=	${PREFIX}/${GAMEDIR}
--- a/games/sudoku-solver/Makefile
+++ b/games/sudoku-solver/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2007/07/22 16:43:30 mbalmer Exp $
+# $OpenBSD: Makefile,v 1.3 2008/01/04 17:48:35 espie Exp $

 COMMENT=	sudoku puzzle solver with cli, gui, and web ui

@ -28,8 +28,6 @@ MODULES=	devel/gettext
 LIB_DEPENDS=	neo_cgi,neo_cs::www/clearsilver \
 		fcgi::www/fcgi

-FAKE_FLAGS=	${MAKE_FLAGS}
-
 NO_REGRESS=	Yes

 .include <bsd.port.mk>
--- a/games/xjewel/Makefile
+++ b/games/xjewel/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2007/11/13 14:54:31 steven Exp $
+# $OpenBSD: Makefile,v 1.23 2008/01/04 17:48:35 espie Exp $

 COMMENT=	dropping jewels game for X11

@ -23,8 +23,6 @@ MAKE_FLAGS=		HSCORE_FILE=/var/games/xjewel.scores \
 			MANSUFFIX=6 \
 			FFILE=pcf.gz

-FAKE_FLAGS=	${MAKE_FLAGS} DESTDIR=${WRKINST}
-
 CONFIGURE_STYLE=imake
 USE_X11=	Yes
 NO_REGRESS=	Yes
--- a/games/xmris/Makefile
+++ b/games/xmris/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2007/11/13 14:54:32 steven Exp $
+# $OpenBSD: Makefile,v 1.23 2008/01/04 17:48:35 espie Exp $

 COMMENT=	Mr Do video arcade game for X11

@ -30,6 +30,5 @@ ALL_TARGET=	xmris xmred xmris.0 xmred.0

 NO_REGRESS=	Yes
 USE_X11=	Yes
-FAKE_FLAGS=	${MAKE_FLAGS} DESTDIR=${WRKINST}

 .include <bsd.port.mk>
--- a/games/xneko/Makefile
+++ b/games/xneko/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2007/09/15 18:01:04 simon Exp $
+# $OpenBSD: Makefile,v 1.20 2008/01/04 17:48:35 espie Exp $

 COMMENT=	classic BSD4.4 cat-and-mouse

@ -16,7 +16,7 @@ PERMIT_DISTFILES_FTP=	Yes
 WANTLIB=		X11 c m

 FAKE_FLAGS=	MANDIR="${PREFIX}/man/cat" BINDIR="${PREFIX}/bin" \
-		DESTDIR="${WRKINST}" BINOWN=${BINOWN} BINMODE=${BINMODE}
+		BINOWN=${BINOWN} BINMODE=${BINMODE}

 USE_X11=	Yes

--- a/games/xroach/Makefile
+++ b/games/xroach/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2007/09/15 18:01:04 simon Exp $
+# $OpenBSD: Makefile,v 1.20 2008/01/04 17:48:35 espie Exp $

 COMMENT=	cockroaches hide under your windows

@ -20,7 +20,7 @@ PERMIT_DISTFILES_FTP=	Yes
 WANTLIB=		X11 c m

 FAKE_FLAGS=	MANDIR="${PREFIX}/man/cat" BINDIR="${PREFIX}/bin" \
-		DESTDIR="${WRKINST}" BINOWN="root" BINMODE="755"
+		BINOWN="root" BINMODE="755"

 USE_X11=	Yes

--- a/graphics/cqcam/Makefile
+++ b/graphics/cqcam/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2007/09/15 20:09:40 simon Exp $
+# $OpenBSD: Makefile,v 1.14 2008/01/04 17:48:35 espie Exp $

 DISTNAME=	cqcam-0.91
 PKGNAME=	${DISTNAME}p1
@ -30,8 +30,7 @@ FLAVOR?=
 .if ${FLAVOR:L:Mno_x11}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-MAKE_FLAGS=	${FAKE_FLAGS}
-FAKE_FLAGS=	CLIENTS="cli webcam"
+MAKE_FLAGS=	CLIENTS="cli webcam"
 .else
 WANTLIB+=	X11 Xext Xi glib gmodule iconv intl
 USE_X11=	Yes
@ -41,10 +40,7 @@ LIB_DEPENDS+=	xview,olgx::x11/xview/lib
 CONFIGURE_ARGS+= --with-gtk-prefix=${LOCALBASE} 
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" # -L${LOCALBASE}/lib/tcl8.3"
-#MAKE_FLAGS=	CPPFLAGS="-I${LOCALBASE}/include/tcl8.3 \
-#		-I${LOCALBASE}/include/tk8.3" \
-MAKE_FLAGS=	${FAKE_FLAGS}
-FAKE_FLAGS=	CLIENTS="cli gtkfe webcam xfe"
+MAKE_FLAGS=	CLIENTS="cli gtkfe webcam xfe"
 .endif

 post-install:
--- a/graphics/ffmpeg/Makefile
+++ b/graphics/ffmpeg/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.32 2007/10/19 14:32:57 jakemsr Exp $
+# $OpenBSD: Makefile,v 1.33 2008/01/04 17:48:35 espie Exp $

 COMMENT=	audio/video converter and streamer with bktr(4) support

@ -91,8 +91,7 @@ MAKE_FLAGS=		LIBavutil_VERSION=$(LIBavutil_VERSION) \
 			LIBavformat_EXTRALIBS="-L${WRKBUILD}/libavutil -L${WRKBUILD}/libavcodec ${LIBavformat_EXTRALIBS}" \
 			LIBpostproc_EXTRALIBS="-L${WRKBUILD}/libavutil ${LIBpostproc_EXTRALIBS}"

-FAKE_FLAGS=		DESTDIR=${WRKINST} \
-			LDCONFIG=true \
+FAKE_FLAGS=		LDCONFIG=true \
 			LIBavutil_VERSION=$(LIBavutil_VERSION) \
 			LIBavcodec_VERSION=$(LIBavcodec_VERSION) \
 			LIBavformat_VERSION=$(LIBavformat_VERSION) \
--- a/graphics/glut/Makefile
+++ b/graphics/glut/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2007/09/15 20:09:41 simon Exp $
+# $OpenBSD: Makefile,v 1.15 2008/01/04 17:48:35 espie Exp $

 COMMENT=	OpenGL Utility Toolkit

@ -24,7 +24,6 @@ NO_REGRESS=		Yes
 MAKE_FLAGS=	SOGLSMAPREV=${LIBglsmap_VERSION}	\
 		SOGLUTREV=${LIBglut_VERSION}		\
 		SOMUIREV=${LIBmui_VERSION}
-FAKE_FLAGS=	${MAKE_FLAGS} ${DESTDIRNAME}=${WRKINST}

 post-extract:
 	@perl -i -p -e 's/3GLUT/3/;' ${WRKSRC}/man/glut/*.man
--- a/graphics/gocr/Makefile
+++ b/graphics/gocr/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2007/09/15 20:09:41 simon Exp $
+# $OpenBSD: Makefile,v 1.5 2008/01/04 17:48:35 espie Exp $

 COMMENT-main=	OCR software
 COMMENT-gui=	gocr tcl/tk frontend
@ -27,8 +27,7 @@ NO_REGRESS=	Yes
 CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS=	--with-netpbm=${PREFIX}
 USE_GMAKE=	Yes
-FAKE_FLAGS+=	DESTDIR=${DESTDIR} \
-			prefix=${PREFIX} exec_prefix=${PREFIX}
+FAKE_FLAGS+=	prefix=${PREFIX} exec_prefix=${PREFIX}

 MULTI_PACKAGES=	-main -gui

--- a/graphics/libmng/Makefile
+++ b/graphics/libmng/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2007/09/15 20:09:41 simon Exp $
+# $OpenBSD: Makefile,v 1.18 2008/01/04 17:48:35 espie Exp $

 COMMENT=	Multiple-image Network Graphics (MNG) reference library

@ -21,7 +21,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-FAKE_FLAGS=	DESTDIR="${WRKINST}" PREFIX="${PREFIX}"
+FAKE_FLAGS=	PREFIX="${PREFIX}"

 MAKE_ENV=	CC="${CC}" \
 		SHLIB_MAJOR=${LIBmng_VERSION:R} \
--- a/graphics/molden/distinfo
+++ b/graphics/molden/distinfo
@ -1,5 +1,5 @@
-MD5 (molden4.6.tar.gz) = 4QStALxep0aBGHTn7hD2vg==
-RMD160 (molden4.6.tar.gz) = 8q8E8ltgrz6VCuW4nOsnyL9dHM4=
-SHA1 (molden4.6.tar.gz) = wmlyqG8T0wrNqSH3SyWgQ52VqeI=
-SHA256 (molden4.6.tar.gz) = C9ZnmUrEltk9w+6864egG+ULiqiPOIx4ldi+yoUmGnc=
-SIZE (molden4.6.tar.gz) = 2691311
+MD5 (molden4.6.tar.gz) = 8tkp/parhaP5lFVxQPXcvg==
+RMD160 (molden4.6.tar.gz) = 8Rc15havt+bee9lLyHggaKn7R78=
+SHA1 (molden4.6.tar.gz) = BMxuMsHIp55UwCz6zc3e5KZNCNw=
+SHA256 (molden4.6.tar.gz) = hrf0H+wQx1qQ+pTWg6A5UmTgiLR2KAqGH2VX7w43QKU=
+SIZE (molden4.6.tar.gz) = 2694231
--- a/graphics/mpeg-lib/Makefile
+++ b/graphics/mpeg-lib/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.29 2007/09/15 20:09:42 simon Exp $
+# $OpenBSD: Makefile,v 1.30 2008/01/04 17:48:35 espie Exp $

 COMMENT=	collection of C routines to decode MPEG movies

@ -20,8 +20,6 @@ CONFIGURE_STYLE= gnu
 CONFIGURE_ENV=	OPTIMIZE="${CFLAGS}"

 MAKE_FLAGS=	SHLIB=libmpeg.so.${LIBmpeg_VERSION}
-FAKE_FLAGS=	SHLIB=libmpeg.so.${LIBmpeg_VERSION} \
-		${DESTDIRNAME}=${WRKINST}

 do-regress:
 	@cd ${WRKSRC} && env LD_LIBRARY_PATH=${WRKSRC} ./mpegtest -checksum test.mpg
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.46 2007/10/15 19:29:52 naddy Exp $
+# $OpenBSD: Makefile,v 1.47 2008/01/04 17:48:35 espie Exp $

 COMMENT=	toolkit for converting images between different formats

@ -30,7 +30,7 @@ INSTALL_TARGET=	install.bin install.lib install.data \

 MAKE_FLAGS=	CC="${CC}" \
 		LIBnetpbm_VERSION=${LIBnetpbm_VERSION}
-FAKE_FLAGS=	${MAKE_FLAGS} PKGDIR="${WRKINST}${TRUEPREFIX}"
+FAKE_FLAGS=	PKGDIR="${WRKINST}${TRUEPREFIX}"

 pre-build:
 	@perl -i -pe 's#%%X11BASE%%#${X11BASE}#g;' \
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.66 2007/10/16 20:32:18 naddy Exp $
+# $OpenBSD: Makefile,v 1.67 2008/01/04 17:48:35 espie Exp $

 COMMENT=	library for manipulating PNG images

@ -19,7 +19,7 @@ PERMIT_DISTFILES_FTP=	Yes

 SUBST_VARS=	VERSION

-FAKE_FLAGS=	${MAKE_FLAGS} DESTDIR="${WRKINST}" PREFIX="${PREFIX}"
+FAKE_FLAGS=	PREFIX="${PREFIX}"

 MAKE_ENV=	CC="${CC}"
 MAKE_FILE=	scripts/makefile.openbsd
--- a/graphics/xfig/Makefile
+++ b/graphics/xfig/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.34 2007/11/13 17:10:26 steven Exp $
+# $OpenBSD: Makefile,v 1.35 2008/01/04 17:48:35 espie Exp $

 COMMENT=	CAD drawing program for X11

@ -30,7 +30,6 @@ RUN_DEPENDS=	::print/transfig \
 MAKE_FLAGS=	XAPPLOADDIR="${PREFIX}/lib/X11/app-defaults" \
 		XFIGDOCDIR="${PREFIX}/share/doc/xfig" \
 		XFIGLIBDIR="${PREFIX}/lib/X11/xfig"
-FAKE_FLAGS=	DESTDIR="${WRKINST}" ${MAKE_FLAGS}

 CONFIGURE_STYLE= imake

--- a/graphics/xv/Makefile
+++ b/graphics/xv/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.35 2007/09/15 20:09:43 simon Exp $
+# $OpenBSD: Makefile,v 1.36 2008/01/04 17:48:35 espie Exp $

 COMMENT=	X11 image display and modification tool

@ -30,8 +30,8 @@ WANTLIB=	X11 Xau Xdmcp c m z

 USE_X11=	Yes
 MAKE_ENV=	SYSCONFDIR="$(SYSCONFDIR)"
-FAKE_FLAGS=

+DESTDIRNAME=	none
 NO_REGRESS=	Yes

 pre-patch:
--- a/infrastructure/mk/bsd.port.mk
+++ b/infrastructure/mk/bsd.port.mk
@ -1,6 +1,6 @@
 #-*- mode: Makefile; tab-width: 4; -*-
 # ex:ts=4 sw=4 filetype=make:
-#	$OpenBSD: bsd.port.mk,v 1.920 2007/12/28 12:49:12 espie Exp $
+#	$OpenBSD: bsd.port.mk,v 1.921 2008/01/04 17:48:35 espie Exp $
 #	$FreeBSD: bsd.port.mk,v 1.264 1996/12/25 02:27:44 imp Exp $
 #	$NetBSD: bsd.port.mk,v 1.62 1998/04/09 12:47:02 hubertf Exp $
 #
@ -301,9 +301,6 @@ DESTDIR ?= ${WRKINST}

 MAKE_FLAGS ?=
 LIBTOOL_FLAGS ?=
-.if !defined(FAKE_FLAGS)
-FAKE_FLAGS = ${DESTDIRNAME}=${WRKINST}
-.endif

 # where configuration files should go
 SYSCONFDIR ?= /etc
@ -323,10 +320,12 @@ BUILD_DEPENDS += ::devel/libtool
 CONFIGURE_ENV += LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}" ${_lt_libs}
 MAKE_ENV += LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}" ${_lt_libs}
 MAKE_FLAGS += LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}" ${_lt_libs}
-FAKE_FLAGS += LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}" ${_lt_libs}
 .endif
 MAKE_FLAGS += SHARED_LIBS_LOG=${WRKBUILD}/shared_libs.log

+ALL_FAKE_FLAGS=	${MAKE_FLAGS} ${DESTDIRNAME}=${WRKINST} ${FAKE_FLAGS}
+
+
 PARALLEL_BUILD ?= Yes
 PARALLEL_INSTALL ?= ${PARALLEL_BUILD}
 MAKE_JOBS ?= 1
@ -336,7 +335,7 @@ MAKE_JOBS ?= 1
 MAKE_FLAGS += -j${MAKE_JOBS}
 .  endif
 .  if ${PARALLEL_INSTALL:L} == "yes"
-FAKE_FLAGS += -j${MAKE_JOBS}
+ALL_FAKE_FLAGS += -j${MAKE_JOBS}
 .  endif
 .endif

@ -2166,7 +2165,7 @@ ${_FAKE_COOKIE}: ${_BUILD_COOKIE}
 # What FAKE normally does:
 	@cd ${WRKBUILD} && exec ${SUDO} ${_SYSTRACE_CMD} \
 		${SETENV} ${MAKE_ENV} ${_FAKE_SETUP} \
-		${MAKE_PROGRAM} ${FAKE_FLAGS} -f ${MAKE_FILE} ${FAKE_TARGET}
+		${MAKE_PROGRAM} ${ALL_FAKE_FLAGS} -f ${MAKE_FILE} ${FAKE_TARGET}
 # End of FAKE.
 .endif
 .if target(post-install)
--- a/inputmethods/anthy/Makefile
+++ b/inputmethods/anthy/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2007/09/16 11:14:46 simon Exp $
+# $OpenBSD: Makefile,v 1.7 2008/01/04 17:48:35 espie Exp $
 COMMENT-main=	japanese input method
 COMMENT-emacs=	emacs files for anthy

@ -33,7 +33,7 @@ CONFIGURE_ENV=	CPPFLAGS='-I${LOCALBASE}/include'
 CONFIGURE_ENV+=	LDFLAGS='-L${LOCALBASE}/lib'
 CONFIGURE_ENV+=	SWIG=no

-FAKE_FLAGS=	DESTDIR=${WRKINST} sysconfdir=$(PREFIX)/share/examples/anthy
+FAKE_FLAGS=	sysconfdir=$(PREFIX)/share/examples/anthy

 WANTLIB-main=	c m

--- a/inputmethods/uim/Makefile
+++ b/inputmethods/uim/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2007/12/18 15:56:16 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.9 2008/01/04 17:48:35 espie Exp $
 COMMENT-main=	multilingual input method library
 COMMENT-gtk=	uim for gtk
 COMMENT-qt=	uim for qt
@ -85,7 +85,6 @@ MAKE_FLAGS=	moduledir='${LOCALBASE}/lib/gtk-2.0/2.10.0/immodules' \
 		itlocaledir=${TRUEPREFIX}/share/locale

 		
-FAKE_FLAGS=	${MAKE_FLAGS} DESTDIR=${WRKINST}
 CONFIGURE_ENV=	CPPFLAGS='-I${LOCALBASE}/include -I${X11BASE}/include'
 CONFIGURE_ENV+=	LDFLAGS='-L${MODQT_LIBDIR} -L${LOCALBASE}/lib -L${X11BASE}/lib'
 CONFIGURE_ENV+=	QTDIR=${MODQT_QTDIR}
--- a/japanese/Wnn/Makefile
+++ b/japanese/Wnn/Makefile
@ -1,7 +1,7 @@
 # From FreeBSD:		Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
 # $FreeBSD: Makefile,v 1.19 1997/09/23 02:17:58 max Exp $
-# $OpenBSD: Makefile,v 1.52 2007/09/16 00:33:56 merdely Exp $
+# $OpenBSD: Makefile,v 1.53 2008/01/04 17:48:35 espie Exp $

 COMMENT-main= 	Japanese input method
 COMMENT-dict=	dictionaries for Japanese Wnn
@ -117,7 +117,7 @@ do-configure:
 # Xfree4 believes it can build html documentation, fat chance...
 #MAKE_FLAGS=IMAKE='imake -DBuildHtmlManPages=0 -DPorts' WNNOWNER_INDIRECT=_wnn
 MAKE_FLAGS=IMAKE='imake -DPorts' WNNOWNER_INDIRECT=_wnn
-FAKE_FLAGS=DESTDIR=${WRKINST} WNNOWNER_INDIRECT=bin
+FAKE_FLAGS=WNNOWNER_INDIRECT=bin

 MAKE_ENV=IMAKEINCLUDE=-I${WRKSRC}/config
 # These are necessary because this package uses a different Makefile for
--- a/japanese/canna/Makefile
+++ b/japanese/canna/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.26 2007/09/16 00:33:57 merdely Exp $
+# $OpenBSD: Makefile,v 1.27 2008/01/04 17:48:35 espie Exp $

 COMMENT-main= 	canna (kana-kanji converter) libraries
 COMMENT-dict=	canna (kana-kanji converter) dictionaries
@ -55,7 +55,6 @@ MAKE_FLAGS=	LIBRKC_VERSION=$(LIBRKC_VERSION) \
 		LIBcanna_VERSION=$(LIBcanna_VERSION) \
 		LIBcanna16_VERSION=$(LIBcanna16_VERSION)

-FAKE_FLAGS=	$(MAKE_FLAGS) DESTDIR=${WRKINST}
 NO_REGRESS=	Yes

 .include <bsd.port.mk>
--- a/japanese/groff/Makefile
+++ b/japanese/groff/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2007/09/16 00:33:57 merdely Exp $
+# $OpenBSD: Makefile,v 1.10 2008/01/04 17:48:35 espie Exp $

 COMMENT=	japanese groff

@ -34,7 +34,7 @@ CONFIGURE_STYLE=	gnu old dest
 #
 #post-install:
 #	@cd ${WRKBUILD}/xditview && ${SETENV} ${MAKE_ENV} \
-#	    make ${FAKE_FLAGS} -f ${MAKE_FILE} install install.man
+#	    make ${ALL_FAKE_FLAGS} -f ${MAKE_FILE} install install.man

 MAINTAINER=	Marc Espie <espie@openbsd.org>

--- a/japanese/jvim/Makefile
+++ b/japanese/jvim/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2007/09/16 00:33:57 merdely Exp $
+# $OpenBSD: Makefile,v 1.25 2008/01/04 17:48:35 espie Exp $
 # $FreeBSD: Makefile,v 1.1.1.1 1998/07/10 14:05:19 kuriyama Exp $

 COMMENT=	Japanized Vim
@ -68,7 +68,7 @@ MAKE_FILE=	makefile.junx
 ALL_TARGET=jvim jcat jfold jgrep

 MAKE_FLAGS=${BFLAGS} PREFIX='${PREFIX}'
-FAKE_FLAGS=${BFLAGS} PREFIX='${WRKINST}${PREFIX}'
+FAKE_FLAGS=PREFIX='${WRKINST}${PREFIX}'

 NO_REGRESS=	Yes

--- a/japanese/kanjipad/Makefile
+++ b/japanese/kanjipad/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2007/09/16 00:33:57 merdely Exp $
+# $OpenBSD: Makefile,v 1.6 2008/01/04 17:48:36 espie Exp $

 COMMENT=japanese handwriting recognition
 CATEGORIES=japanese
@ -23,7 +23,7 @@ WANTLIB=	c Xext Xi X11 m
 USE_X11=	Yes

 MAKE_FLAGS=OPTIMIZE='${CFLAGS}' PREFIX=${PREFIX}
-FAKE_FLAGS=PREFIX=${WRKINST}${TRUEPREFIX} OPTIMIZE='${CFLAGS}'
+FAKE_FLAGS=PREFIX=${WRKINST}${TRUEPREFIX}

 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/kanjipad
--- a/lang/STk/Makefile
+++ b/lang/STk/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2007/09/16 00:27:05 merdely Exp $
+# $OpenBSD: Makefile,v 1.23 2008/01/04 17:48:36 espie Exp $

 COMMENT=	Scheme interpreter with Tk interface

@ -20,7 +20,7 @@ USE_X11=	Yes

 CONFIGURE_STYLE=gnu

-FAKE_FLAGS=	root=${DESTDIR}
+DESTDIRNAME=	root

 NO_REGRESS=	Yes
 SUBST_VARS=	STK_VERSION STK_ARCH
--- a/lang/gcc/4.3/Makefile
+++ b/lang/gcc/4.3/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2007/12/20 16:11:35 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.6 2008/01/04 17:48:36 espie Exp $

 ONLY_FOR_ARCHS=	alpha i386 m68k sparc sparc64 powerpc vax amd64
 #BROKEN=adjust for types changes
@ -166,9 +166,6 @@ MAKE_FLAGS=${BASIC_MAKE_FLAGS} \
 	INSTALL_PROGRAM='/usr/bin/install -c -m 555' \
 	INSTALL_DATA='/usr/bin/install -c -m 444' \

-FAKE_FLAGS=DESTDIR=${WRKINST} ${BASIC_MAKE_FLAGS}
-
-
 .if ${MACHINE_ARCH} == "m68k" || ${MACHINE_ARCH} == "sparc"  || ${MACHINE_ARCH} == "amd64"
 PKG_ARGS+=-DPIC=1
 .else
--- a/lang/ocamlduce/Makefile
+++ b/lang/ocamlduce/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2007/09/16 00:27:06 merdely Exp $
+# $OpenBSD: Makefile,v 1.6 2008/01/04 17:48:36 espie Exp $

 COMMENT=	XML extension types for Objective Caml
 CATEGORIES=	lang textproc
@ -22,7 +22,6 @@ WANTLIB=	curses m c pthread
 NO_REGRESS= 	Yes
 USE_GMAKE=	Yes
 MAKE_FLAGS=	CAMLC=ocamlc${MODOCAML_NATIVE:S,Yes,.opt,:S,No,,}
-FAKE_FLAGS=	CAMLC=ocamlc${MODOCAML_NATIVE:S,Yes,.opt,:S,No,,}
 ALL_TARGET=	all ${MODOCAML_NATIVE:S,Yes,opt,:S,No,,}

 BUILD_DEPENDS=	::sysutils/findlib
--- a/lang/python/Makefile.inc
+++ b/lang/python/Makefile.inc
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.52 2007/10/30 13:35:18 steven Exp $
+# $OpenBSD: Makefile.inc,v 1.53 2008/01/04 17:48:36 espie Exp $

 # IMPORTANT!  If you make any changes to the Python ports, be sure
 # to also update files/CHANGES.OpenBSD for your change.  This is a
@ -167,8 +167,7 @@ CONFIGURE_ENV+= OPT='${CFLAGS} -DTHREAD_STACK_SIZE=${THREAD_STACK_SIZE} -fPIC' \
 		SVNVERSION=no
 MAKE_FLAGS+=	LDLIBRARY=libpython${VERSION}.so.${LIBpython${VERSION}_VERSION} \
 		LD_LIBRARY_PATH=${WRKSRC} PATH="${WRKDIST}:${PORTPATH}"
-FAKE_FLAGS+=	LDLIBRARY=libpython${VERSION}.so.${LIBpython${VERSION}_VERSION} \
-		LD_LIBRARY_PATH=${WRKSRC} RANLIB=:
+FAKE_FLAGS+=	RANLIB=:

 ALL_TARGET=	all ${WRKSRC}/Lib/plat-openbsd4

--- a/lang/scm/Makefile
+++ b/lang/scm/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2007/09/16 00:27:06 merdely Exp $
+# $OpenBSD: Makefile,v 1.23 2008/01/04 17:48:36 espie Exp $
 # losely based on the FreeBSD port

 .if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "vax" || \
@ -110,7 +110,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/info
 .endfor

-FAKE_FLAGS=${MAKE_FLAGS} exec_prefix=${WRKINST}${TRUEPREFIX}/
+FAKE_FLAGS=exec_prefix=${WRKINST}${TRUEPREFIX}/
 REGRESS_TARGET=	check

 .include <bsd.port.mk>
--- a/lang/squeak/vm/Makefile
+++ b/lang/squeak/vm/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2007/09/16 00:27:06 merdely Exp $
+# $OpenBSD: Makefile,v 1.7 2008/01/04 17:48:36 espie Exp $


 COMMENT=	smalltalk system, vm
@ -27,7 +27,7 @@ MAKE_FLAGS+=INTERP=gnu-interp
 .endif

 MAKE_FLAGS+=docdir=${PREFIX}/share/doc/squeak
-FAKE_FLAGS=${MAKE_FLAGS} ROOT=${WRKINST}
+DESTDIRNAME=	ROOT

 post-extract:
 	mkdir ${WRKDIST}/platforms/unix/vm-sound-OpenBSD
--- a/lang/swi-prolog/Makefile
+++ b/lang/swi-prolog/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2007/11/14 09:43:39 steven Exp $
+# $OpenBSD: Makefile,v 1.10 2008/01/04 17:48:36 espie Exp $

 CATEGORIES=		lang
 V=			5.6.27
@ -38,8 +38,6 @@ USE_GMAKE=		Yes

 MAKE_FLAGS=		SONAMEOPT= \
 			SHAREDV=libpl.so.${LIBpl_VERSION}
-FAKE_FLAGS=		${MAKE_FLAGS} \
-			DESTDIR=${WRKINST}

 WANTLIB=		ICE Xrender readline SM freetype Xt pthread \
 			c Xinerama Xft Xpm m fontconfig X11 ncurses z \
--- a/lang/tcl/8.4/Makefile
+++ b/lang/tcl/8.4/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2007/12/11 11:18:05 sthen Exp $
+# $OpenBSD: Makefile,v 1.21 2008/01/04 17:48:36 espie Exp $
 # Uses pthreads (can but does not at the moment)

 COMMENT=	Tool Command Language
@ -21,7 +21,7 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

 MAKE_FLAGS=	CFLAGS="${CFLAGS}"
-FAKE_FLAGS=	INSTALL="install -c" INSTALL_ROOT="${WRKINST}" \
+FAKE_FLAGS=	INSTALL="install -c" INSTALL_ROOT=${WRKINST} \
 		BASE_INCLUDE_DIR='$$(prefix)/include/tcl$$(VERSION)' \
 		INCLUDE_INSTALL_DIR='$$(INSTALL_ROOT)$$(BASE_INCLUDE_DIR)' \
 		GENERIC_INCLUDE_INSTALL_DIR='$$(BASE_INCLUDE_DIR)/generic' \
--- a/mail/fdm/Makefile
+++ b/mail/fdm/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2007/10/15 19:25:34 merdely Exp $
+# $OpenBSD: Makefile,v 1.6 2008/01/04 17:48:36 espie Exp $

 COMMENT=	fetch, filter and deliver mail

@ -21,7 +21,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fdm/}

 LIB_DEPENDS+=	tdb::databases/tdb

-FAKE_FLAGS=	DESTDIR=${WRKINST} PREFIX=${PREFIX}
+FAKE_FLAGS=	PREFIX=${PREFIX}

 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/fdm
--- a/mail/razor-agents/Makefile
+++ b/mail/razor-agents/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2007/09/16 00:17:06 merdely Exp $
+# $OpenBSD: Makefile,v 1.19 2008/01/04 17:48:36 espie Exp $

 SHARED_ONLY=		Yes

@ -22,7 +22,7 @@ RUN_DEPENDS=		:p5-Digest-SHA1->=1.0:security/p5-Digest-SHA1 \
 			:p5-URI->=1.19:www/p5-URI
 BUILD_DEPENDS=		${RUN_DEPENDS}

-FAKE_FLAGS=		${DESTDIRNAME}=${WRKINST} PERL5LIB=${WRKINST}/${PREFIX}/${P5ARCH}
+FAKE_FLAGS=		PERL5LIB=${WRKINST}/${PREFIX}/${P5ARCH}

 CONFIGURE_STYLE= 	perl

--- a/mail/smtp-vilter/Makefile
+++ b/mail/smtp-vilter/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.30 2007/09/16 00:17:06 merdely Exp $
+# $OpenBSD: Makefile,v 1.31 2008/01/04 17:48:36 espie Exp $

 COMMENT=	sendmail milter to scan messages for viruses and spam

@ -23,8 +23,6 @@ WANTLIB=		c m pthread milter
 MASTER_SITES=  	ftp://ftp.etc.msys.ch/pub/sources/smtp-vilter/
 EXTRACT_SUFX=	.tgz

-FAKE_FLAGS=	${MAKE_FLAGS}
-
 NO_REGRESS=	Yes

 FLAVORS=	ldap
--- a/math/R/Makefile
+++ b/math/R/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2007/12/14 15:08:18 mbalmer Exp $
+# $OpenBSD: Makefile,v 1.24 2008/01/04 17:48:36 espie Exp $

 SHARED_ONLY=	Yes

@ -44,7 +44,8 @@ MAKE_FLAGS=	INSTALL='install -c' \
 		INSTALL_SCRIPT='install -c -m 555' \
 		LIBRlapack_VERSION=${LIBRlapack_VERSION}

-FAKE_FLAGS=	PREFIX=${PREFIX} DESTDIR=${WRKINST} \
+DESTDIRNAME=	DESTDIR
+FAKE_FLAGS=	PREFIX=${PREFIX} \
 		LIBRlapack_VERSION=${LIBRlapack_VERSION}

 post-install:
--- a/math/amd/Makefile
+++ b/math/amd/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2007/09/15 18:44:36 steven Exp $
+# $OpenBSD: Makefile,v 1.7 2008/01/04 17:48:36 espie Exp $

 COMMENT=	order a sparse matrix prior to Cholesky factorization

@ -32,7 +32,7 @@ MAKE_ENV=	SHLIB_MAJOR=${LIBamd_VERSION:R} \
 MAKE_FLAGS=	CSRC="${CSRC}"
 MAKE_ENV_F77=	SHLIB_MAJOR=${LIBamdf77_VERSION:R} \
 		SHLIB_MINOR=${LIBamdf77_VERSION:E}
-FAKE_FLAGS=	${DESTDIRNAME}=${WRKINST} LIBDIR=${LOCALBASE}/lib DEBUGLIBS=no
+FAKE_FLAGS=	LIBDIR=${LOCALBASE}/lib DEBUGLIBS=no
 CFLAGS+=	-I${WRKDIST}/Include -I${WRKDIR}/UFconfig

 CSRC=	aat 1 2 dump postorder post_tree defaults order control info \
@ -52,7 +52,7 @@ post-build:

 post-install:
 	cd ${WRKBUILD} && ${SETENV} ${MAKE_ENV_F77} ${MAKE_PROGRAM} \
-		${FAKE_FLAGS} -f ${FILESDIR}/Makefile.f77 ${INSTALL_TARGET}
+		${ALL_FAKE_FLAGS} -f ${FILESDIR}/Makefile.f77 ${INSTALL_TARGET}
 	${INSTALL_DATA_DIR} ${PREFIX}/include/amd
 	${INSTALL_DATA} ${WRKDIST}/Include/amd.h ${PREFIX}/include/amd

--- a/math/calc/Makefile
+++ b/math/calc/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2007/09/15 18:44:36 steven Exp $
+# $OpenBSD: Makefile,v 1.17 2008/01/04 17:48:36 espie Exp $

 COMMENT=	C-style arbitrary precision calculator

@ -29,8 +29,6 @@ MAKE_FLAGS=\
 	LCC=${CC} \
 	CFLAGS='${CFLAGS} -DCALC_SRC $${CCWARN}'

-FAKE_FLAGS=${MAKE_FLAGS}
-
 REGRESS_TARGET=	check

 .include <bsd.port.mk>
--- a/Show More
+++ b/Show More