diff --git a/archivers/bzip2/Makefile b/archivers/bzip2/Makefile index 719adff2d0a..fee05e63f69 100644 --- 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 diff --git a/archivers/zipios/Makefile b/archivers/zipios/Makefile index 4464e48e3e0..7bc3b577947 100644 --- 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++/ diff --git a/astro/xephem/Makefile b/astro/xephem/Makefile index a5446339755..63bdb463d58 100644 --- 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 diff --git a/audio/cdparanoia/Makefile b/audio/cdparanoia/Makefile index 919c6bdc143..0efad517f72 100644 --- 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 diff --git a/audio/flite/Makefile b/audio/flite/Makefile index 165f3694005..a8fd356ba1f 100644 --- 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 diff --git a/audio/gsm/Makefile b/audio/gsm/Makefile index 7088876a1f4..696cff1a4e6 100644 --- 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 diff --git a/audio/lame/Makefile b/audio/lame/Makefile index 418770e0c6c..7681716bcc0 100644 --- 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 diff --git a/audio/libogg/Makefile b/audio/libogg/Makefile index 50a77658211..420aeb9fe13 100644 --- 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 diff --git a/audio/libsndfile/Makefile b/audio/libsndfile/Makefile index 3a7d8676f6c..6920fea0908 100644 --- 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 diff --git a/audio/libworkman/Makefile b/audio/libworkman/Makefile index d58ab4e4112..bdf91122c6b 100644 --- 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 diff --git a/audio/morseplayer/Makefile b/audio/morseplayer/Makefile index 7fbc0c73941..dd2a23af630 100644 --- 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 diff --git a/audio/rplay/Makefile b/audio/rplay/Makefile index 1a0f80e68a3..1254c255587 100644 --- 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 diff --git a/audio/speex/Makefile b/audio/speex/Makefile index 62db26376fc..0f0483a8fe2 100644 --- 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 diff --git a/audio/teknap/Makefile b/audio/teknap/Makefile index 89ade49bfb7..81b2575fe8e 100644 --- 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 diff --git a/audio/tracker/Makefile b/audio/tracker/Makefile index 58d1f98d5f1..b4be3b92f5e 100644 --- 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 diff --git a/benchmarks/tcpblast/Makefile b/benchmarks/tcpblast/Makefile index 55eb92d6d43..4bd738a6ff0 100644 --- 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 diff --git a/cad/chipmunk/Makefile b/cad/chipmunk/Makefile index 5abf7414b11..30505d3dec1 100644 --- 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 diff --git a/comms/hylafax/Makefile b/comms/hylafax/Makefile index d0c0fbf44fb..13585db2e58 100644 --- 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 diff --git a/comms/jpilot/Makefile b/comms/jpilot/Makefile index afe85d2d9a8..0391b403138 100644 --- 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} diff --git a/comms/x3270/Makefile b/comms/x3270/Makefile index ff922476800..082126fb59d 100644 --- 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 diff --git a/databases/db/Makefile.inc b/databases/db/Makefile.inc index f2b2b7fb20f..40e3237547e 100644 --- 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 diff --git a/databases/mysql/Makefile b/databases/mysql/Makefile index 4eff6b7c2f6..a156f895537 100644 --- 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 && \ diff --git a/databases/pgtcl/Makefile b/databases/pgtcl/Makefile index fce8f1fa8cc..74717ee256a 100644 --- 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 diff --git a/databases/qdbm/Makefile b/databases/qdbm/Makefile index 70e53c89f13..0429f0b5f55 100644 --- 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 diff --git a/devel/arm-elf/gcc/Makefile b/devel/arm-elf/gcc/Makefile index dd2ffff29ff..be137642c61 100644 --- 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 diff --git a/devel/arm-elf/gcc/pkg/PLIST b/devel/arm-elf/gcc/pkg/PLIST index 02b2d588a31..eb757217f17 100644 --- 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/ diff --git a/devel/autoconf/2.13/Makefile b/devel/autoconf/2.13/Makefile index a1a4eafd5e5..f2d916114de 100644 --- 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: diff --git a/devel/autoconf/2.52/Makefile b/devel/autoconf/2.52/Makefile index 044abade5e8..08b7fdd4f03 100644 --- 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: diff --git a/devel/autoconf/2.54/Makefile b/devel/autoconf/2.54/Makefile index 3f9b443efa0..89bb3394e49 100644 --- 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 diff --git a/devel/autoconf/2.56/Makefile b/devel/autoconf/2.56/Makefile index 81f4a6dfaaa..1438d9a1eed 100644 --- 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 diff --git a/devel/autoconf/2.57/Makefile b/devel/autoconf/2.57/Makefile index fa30f7d9d09..7fbc91f6d78 100644 --- 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 diff --git a/devel/autoconf/2.58/Makefile b/devel/autoconf/2.58/Makefile index e433f92d73d..c3ba6f2fbbf 100644 --- 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 diff --git a/devel/autoconf/2.59/Makefile b/devel/autoconf/2.59/Makefile index 2378485087c..27d44601310 100644 --- 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 diff --git a/devel/autoconf/2.60/Makefile b/devel/autoconf/2.60/Makefile index 29485ac7a96..01722220fb4 100644 --- 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 diff --git a/devel/autoconf/2.61/Makefile b/devel/autoconf/2.61/Makefile index eb839cc7216..07320a5b634 100644 --- 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 diff --git a/devel/autogen/Makefile b/devel/autogen/Makefile index 4b0628d7475..1ca94cf3d4e 100644 --- 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 diff --git a/devel/automake/1.8/Makefile b/devel/automake/1.8/Makefile index 2305acfbc21..4ddd3a8456c 100644 --- 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} \ diff --git a/devel/automake/1.9/Makefile b/devel/automake/1.9/Makefile index ee14f8e96e7..02829efc740 100644 --- 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} \ diff --git a/devel/avr/gcc/Makefile b/devel/avr/gcc/Makefile index 51f5052c695..2692f83d7bd 100644 --- 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/ \ diff --git a/devel/avr/gcc/pkg/PLIST b/devel/avr/gcc/pkg/PLIST index c06b52d1f0a..52b2cc6f8c8 100644 --- 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}/ diff --git a/devel/cook/Makefile b/devel/cook/Makefile index c5b31e56f3d..aa42c4e03aa 100644 --- 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" \ diff --git a/devel/ctm/Makefile b/devel/ctm/Makefile index 53949df87da..bb76bafb372 100644 --- 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 diff --git a/devel/dejagnu/Makefile b/devel/dejagnu/Makefile index c09d9d93b94..60fbf03f1b7 100644 --- 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 diff --git a/devel/ffcall/Makefile b/devel/ffcall/Makefile index e9b793aac66..4d877b4b332 100644 --- 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 diff --git a/devel/iso-codes/Makefile b/devel/iso-codes/Makefile index 337a67d4cce..d31ba1aa6ca 100644 --- 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},' \ diff --git a/devel/libJudy/Makefile b/devel/libJudy/Makefile index a1f9a5e0b96..2d52d0c3e27 100644 --- 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: diff --git a/devel/libdsk/Makefile b/devel/libdsk/Makefile index 7c2a1f302ac..e4a6fbe3df6 100644 --- 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: diff --git a/devel/libelf/Makefile b/devel/libelf/Makefile index 4fb3078cab0..6aef7ec685f 100644 --- 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 diff --git a/devel/libtool/Makefile b/devel/libtool/Makefile index db622c30bfa..a80192bcc2c 100644 --- 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 diff --git a/devel/nasm/Makefile b/devel/nasm/Makefile index 6e80d651601..02e79378b19 100644 --- 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 diff --git a/devel/opencm/Makefile b/devel/opencm/Makefile index 9f5bff1c1fc..762dea134be 100644 --- 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 diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile index d902014da5e..ee4672e8087 100644 --- 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 diff --git a/editors/joe/Makefile b/editors/joe/Makefile index 5f287f6fbce..6a2eceaae28 100644 --- 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 diff --git a/editors/xwpe/Makefile b/editors/xwpe/Makefile index 7b67a9e9d27..1d7e8cc3e67 100644 --- 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 diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile index 017fe6e708c..56de3e40f81 100644 --- 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}" \ diff --git a/games/falconseye/Makefile b/games/falconseye/Makefile index 321e52e4c96..efdd1bf6777 100644 --- 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} diff --git a/games/lincity-ng/Makefile b/games/lincity-ng/Makefile index cb21ce5629d..0c809cb28d5 100644 --- 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 diff --git a/games/moria/Makefile b/games/moria/Makefile index dae0392af67..8f266ff83a4 100644 --- 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 diff --git a/games/nethack/Makefile b/games/nethack/Makefile index edc11631f59..f5a61cb2cf5 100644 --- 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} diff --git a/games/quake/Makefile b/games/quake/Makefile index ff46021ceb7..685d6fea8f7 100644 --- 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 diff --git a/games/slash-em/Makefile b/games/slash-em/Makefile index 413e9299cb6..2126e6c305c 100644 --- 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} diff --git a/games/slash/Makefile b/games/slash/Makefile index 6aee08e4088..80ae70c858b 100644 --- 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} diff --git a/games/sudoku-solver/Makefile b/games/sudoku-solver/Makefile index a3aafd32cb2..74af96e2ce4 100644 --- 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 diff --git a/games/xjewel/Makefile b/games/xjewel/Makefile index dfa5dd79868..217e76e7509 100644 --- 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 diff --git a/games/xmris/Makefile b/games/xmris/Makefile index 716e33e334b..8f4453757db 100644 --- 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 diff --git a/games/xneko/Makefile b/games/xneko/Makefile index a90d7078599..8a16371efdf 100644 --- 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 diff --git a/games/xroach/Makefile b/games/xroach/Makefile index 2dd2b7ffb9d..8231d0662ee 100644 --- 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 diff --git a/graphics/cqcam/Makefile b/graphics/cqcam/Makefile index 62f819089f1..ab072c0ffba 100644 --- 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: diff --git a/graphics/ffmpeg/Makefile b/graphics/ffmpeg/Makefile index 60be24111d9..3c31219c74c 100644 --- 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) \ diff --git a/graphics/glut/Makefile b/graphics/glut/Makefile index 538b371dfb7..09f992e19b7 100644 --- 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 diff --git a/graphics/gocr/Makefile b/graphics/gocr/Makefile index 550c718615b..40815c87807 100644 --- 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 diff --git a/graphics/libmng/Makefile b/graphics/libmng/Makefile index 259711a44e2..13dc791a2b4 100644 --- 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} \ diff --git a/graphics/molden/distinfo b/graphics/molden/distinfo index 38a28107070..fdceadcf240 100644 --- 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 diff --git a/graphics/mpeg-lib/Makefile b/graphics/mpeg-lib/Makefile index bdfa75a730e..abfe5065055 100644 --- 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 diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile index e01c900cf59..f31f89e391a 100644 --- 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;' \ diff --git a/graphics/png/Makefile b/graphics/png/Makefile index eee039ed04b..d9ebcfddb52 100644 --- 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 diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile index b5c2e82edb6..6d9d57891c4 100644 --- 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 diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile index 3a12697bc1c..1ed5d6a0c7d 100644 --- 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: diff --git a/infrastructure/mk/bsd.port.mk b/infrastructure/mk/bsd.port.mk index 32f2748f2e7..0733e87a618 100644 --- 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) diff --git a/inputmethods/anthy/Makefile b/inputmethods/anthy/Makefile index a3eadc764a0..8fc28d74f77 100644 --- 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 diff --git a/inputmethods/uim/Makefile b/inputmethods/uim/Makefile index 5a5cbef2dff..5a2aaf00b7a 100644 --- 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} diff --git a/japanese/Wnn/Makefile b/japanese/Wnn/Makefile index 0770fdc76f9..1511b58d59d 100644 --- a/japanese/Wnn/Makefile +++ b/japanese/Wnn/Makefile @@ -1,7 +1,7 @@ # From FreeBSD: Satoshi Taoka # # $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 diff --git a/japanese/canna/Makefile b/japanese/canna/Makefile index 6b4271ff44f..71f6617473a 100644 --- 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 diff --git a/japanese/groff/Makefile b/japanese/groff/Makefile index 852cae2e16a..1467dabe611 100644 --- 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 diff --git a/japanese/jvim/Makefile b/japanese/jvim/Makefile index 4d804c19ff5..cbd6d42da06 100644 --- 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 diff --git a/japanese/kanjipad/Makefile b/japanese/kanjipad/Makefile index 74425390388..694794ff7d9 100644 --- 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 diff --git a/lang/STk/Makefile b/lang/STk/Makefile index 3ab8f16e8f9..ab178a9eefe 100644 --- 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 diff --git a/lang/gcc/4.3/Makefile b/lang/gcc/4.3/Makefile index 5b621a3e00f..abb9a6a20aa 100644 --- 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 diff --git a/lang/ocamlduce/Makefile b/lang/ocamlduce/Makefile index 04cccfb2250..94db788a66c 100644 --- 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 diff --git a/lang/python/Makefile.inc b/lang/python/Makefile.inc index 3e886d382a2..902194caead 100644 --- 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 diff --git a/lang/scm/Makefile b/lang/scm/Makefile index b8d1c74adfb..87c731e260b 100644 --- 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 diff --git a/lang/squeak/vm/Makefile b/lang/squeak/vm/Makefile index 672931d3e67..4fb6bed40ec 100644 --- 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 diff --git a/lang/swi-prolog/Makefile b/lang/swi-prolog/Makefile index 240d24315f7..a02c0ae5d7e 100644 --- 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 \ diff --git a/lang/tcl/8.4/Makefile b/lang/tcl/8.4/Makefile index f2ac82a2796..7082f124105 100644 --- 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' \ diff --git a/mail/fdm/Makefile b/mail/fdm/Makefile index f24808f1e6a..9e8732e9a79 100644 --- 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 diff --git a/mail/razor-agents/Makefile b/mail/razor-agents/Makefile index d8c46c5436d..b81c611bcae 100644 --- 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 diff --git a/mail/smtp-vilter/Makefile b/mail/smtp-vilter/Makefile index 5128d09260c..40440411684 100644 --- 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 diff --git a/math/R/Makefile b/math/R/Makefile index 7bb13d00092..dd01d1177a8 100644 --- 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: diff --git a/math/amd/Makefile b/math/amd/Makefile index abebd3feda3..fc5da2f7de9 100644 --- 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 diff --git a/math/calc/Makefile b/math/calc/Makefile index 9c404226735..3122ff180e2 100644 --- 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 diff --git a/math/coq/Makefile b/math/coq/Makefile index 9aa8753249b..80b571eee30 100644 --- a/math/coq/Makefile +++ b/math/coq/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2007/09/15 18:44:36 steven Exp $ +# $OpenBSD: Makefile,v 1.13 2008/01/04 17:48:36 espie Exp $ BROKEN= requires update due to ocaml 3.08 @@ -35,7 +35,7 @@ EXTRACT_ONLY= ${DISTNAME}.tar.gz \ doc-html-20040711.tar.gz \ library.tar.gz \ -FAKE_FLAGS= COQINSTALLPREFIX=${WRKINST} +DESTDIRNAME= COQINSTALLPREFIX USE_GMAKE= Yes diff --git a/math/graphviz/Makefile b/math/graphviz/Makefile index 7f2d05fba33..b24484729c0 100644 --- a/math/graphviz/Makefile +++ b/math/graphviz/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.26 2007/11/14 19:27:35 merdely Exp $ +# $OpenBSD: Makefile,v 1.27 2008/01/04 17:48:36 espie Exp $ COMMENT-main= graph drawing software @@ -123,7 +123,6 @@ FAKE_FLAGS= htmldir="${DOCBASE}/html" \ leftydir="${EXBASE}/lefty" \ pathplanexampledir="${EXBASE}/demo/pathplan_data" \ undirecteddir="${EXBASE}/graphs/undirected" \ - ${MAKE_FLAGS} post-build: .for CMD in dotty lneato diff --git a/math/jacal/Makefile b/math/jacal/Makefile index 1baccf5c1aa..1243750b094 100644 --- a/math/jacal/Makefile +++ b/math/jacal/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2007/09/15 18:44:36 steven Exp $ +# $OpenBSD: Makefile,v 1.3 2008/01/04 17:48:36 espie Exp $ COMMENT= symbolics math system @@ -27,7 +27,7 @@ PKG_ARCH= * do-build: touch ${WRKDIST}/srcdir.mk -FAKE_FLAGS=prefix=${TRUEPREFIX}/ DESTDIR=${WRKINST} +FAKE_FLAGS=prefix=${TRUEPREFIX}/ post-install: ${INSTALL_DATA} ${WRKDIST}/jacal.info ${PREFIX}/info diff --git a/math/qtoctave/Makefile b/math/qtoctave/Makefile index 8148bdac544..f5c9f028ea3 100644 --- a/math/qtoctave/Makefile +++ b/math/qtoctave/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2007/11/12 14:07:11 steven Exp $ +# $OpenBSD: Makefile,v 1.3 2008/01/04 17:48:36 espie Exp $ COMMENT= graphical front-end for octave @@ -27,7 +27,7 @@ WRKDIST= ${WRKDIR}/project CONFIGURE_STYLE=simple CONFIGURE_ARGS= --qtdir=${MODQT4_QTDIR} -FAKE_FLAGS= INSTALL_ROOT=${WRKINST} +DESTDIRNAME= INSTALL_ROOT USE_X11= Yes diff --git a/math/umfpack/Makefile b/math/umfpack/Makefile index e3baf497dc0..f0f7e2fa90a 100644 --- a/math/umfpack/Makefile +++ b/math/umfpack/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2007/09/15 18:44:37 steven Exp $ +# $OpenBSD: Makefile,v 1.7 2008/01/04 17:48:36 espie Exp $ COMMENT= unsymmetric multifrontal sparse LU factorization package @@ -32,7 +32,7 @@ WRKSRC= ${WRKDIST}/Source MAKE_FILE= ${FILESDIR}/Makefile MAKE_ENV= SHLIB_MAJOR=${LIBumfpack_VERSION:R} \ SHLIB_MINOR=${LIBumfpack_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 \ -I${WRKDIR}/${AMD_DIR}/AMD/Include diff --git a/misc/calentool/Makefile b/misc/calentool/Makefile index d03c6fb76c2..dc422b5438a 100644 --- a/misc/calentool/Makefile +++ b/misc/calentool/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.20 2007/09/15 23:54:16 merdely Exp $ +# $OpenBSD: Makefile,v 1.21 2008/01/04 17:48:36 espie Exp $ COMMENT= nice X11-based calendar/scheduling tool (using XView) @@ -24,7 +24,6 @@ USE_X11= Yes MAKE_ENV= IMAKEINCLUDE=-I${LOCALBASE}/lib/X11/config MAKE_FLAGS=CCOPTIONS=-I${WRKSRC}/include -FAKE_FLAGS=${MAKE_FLAGS} pre-configure: @mkdir -p ${WRKSRC}/include/images diff --git a/misc/gone/Makefile b/misc/gone/Makefile index fa3d836f845..1ca9232de7e 100644 --- a/misc/gone/Makefile +++ b/misc/gone/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2007/09/15 23:54:16 merdely Exp $ +# $OpenBSD: Makefile,v 1.7 2008/01/04 17:48:36 espie Exp $ COMMENT= terminal locking utility @@ -20,8 +20,6 @@ MASTER_SITES= ${HOMEPAGE}/downloads/ CONFIGURE_STYLE= gnu CONFIGURE_ENV= with_setuid="no" -MAKE_FLAGS= prefix="${PREFIX}" - NO_REGRESS= Yes .include diff --git a/misc/most/Makefile b/misc/most/Makefile index c0acd4467be..455f93b20bc 100644 --- a/misc/most/Makefile +++ b/misc/most/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2007/09/15 23:54:17 merdely Exp $ +# $OpenBSD: Makefile,v 1.12 2008/01/04 17:48:36 espie Exp $ COMMENT= browse or page through a text file @@ -19,7 +19,7 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes WANTLIB= c m termcap -FAKE_FLAGS= DESTDIR="${WRKINST}" DOC_DIR='$$(prefix)/share/doc/most' +FAKE_FLAGS= DOC_DIR='$$(prefix)/share/doc/most' CONFIGURE_STYLE= gnu CONFIGURE_ENV+=DEPBASE=${DEPBASE} diff --git a/misc/pdmenu/Makefile b/misc/pdmenu/Makefile index ccf5f517504..ffec4b006f1 100644 --- a/misc/pdmenu/Makefile +++ b/misc/pdmenu/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.14 2007/09/15 23:54:17 merdely Exp $ +# $OpenBSD: Makefile,v 1.15 2008/01/04 17:48:36 espie Exp $ COMMENT= simple slang-based menu program @@ -19,7 +19,7 @@ MASTER_SITES= http://kitenet.net/programs/code/pdmenu/ LIB_DEPENDS= slang.>=14::devel/libslang -FAKE_FLAGS= INSTALL_PREFIX=${WRKINST} +DESTDIRNAME= INSTALL_PREFIX FAKE= lib CONFIGURE_STYLE= autoconf no-autoheader diff --git a/misc/tpwireless/Makefile b/misc/tpwireless/Makefile index ba02176bdad..faa8db93452 100644 --- a/misc/tpwireless/Makefile +++ b/misc/tpwireless/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2007/09/15 23:54:17 merdely Exp $ +# $OpenBSD: Makefile,v 1.4 2008/01/04 17:48:36 espie Exp $ COMMENT= Set IBM Thinkpad BIOS bit to disable Wireless NIC ID check @@ -18,7 +18,7 @@ ONLY_FOR_ARCHS= i386 NO_CHECKSUM= Yes WRKDIST= ${WRKDIR} -FAKE_FLAGS= BINDIR="${PREFIX}/bin" DESTDIR="${WRKINST}" +FAKE_FLAGS= BINDIR="${PREFIX}/bin" MAKE_ENV= CC="${CC}" # Just link the contained source files into the build environment diff --git a/misc/xnc/Makefile b/misc/xnc/Makefile index 97cad24e0d6..a6029f5ac05 100644 --- a/misc/xnc/Makefile +++ b/misc/xnc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.18 2007/09/15 23:54:18 merdely Exp $ +# $OpenBSD: Makefile,v 1.19 2008/01/04 17:48:36 espie Exp $ COMMENT= filemanager for X Window @@ -37,8 +37,7 @@ CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/include/l CONFIGURE_ARGS= --with-x FAKE_FLAGS= LIBxncaqua_VERSION=${LIBxncaqua_VERSION} \ - LIBxncfive_VERSION=${LIBxncfive_VERSION} \ - DESTDIR=${WRKINST} + LIBxncfive_VERSION=${LIBxncfive_VERSION} XNLAUNCHFILES= .launch.menu .xnlaunch.ini graphs.gif ives.gif kill.gif \ map.gif netscape.gif term.gif tnet.gif diff --git a/multimedia/subrip/Makefile b/multimedia/subrip/Makefile index 3154cb340bd..70ba417be67 100644 --- a/multimedia/subrip/Makefile +++ b/multimedia/subrip/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2007/09/16 03:24:28 merdely Exp $ +# $OpenBSD: Makefile,v 1.5 2008/01/04 17:48:36 espie Exp $ COMMENT= extract subtitles from dvds DISTNAME= ogmrip-0.10.0 @@ -28,8 +28,7 @@ WANTLIB= c m NO_REGRESS= Yes FAKE_FLAGS= BINDIR=${TRUEPREFIX}/bin \ - INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ - DESTDIR=${WRKINST} + INSTALL_PROGRAM="${INSTALL_PROGRAM}" post-install: ${INSTALL_PROGRAM} ${FILESDIR}/subrip ${PREFIX}/bin diff --git a/net/GeoIP/Makefile b/net/GeoIP/Makefile index 3ef4ada63d6..6246e4ec034 100644 --- a/net/GeoIP/Makefile +++ b/net/GeoIP/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 2007/09/15 22:36:51 merdely Exp $ +# $OpenBSD: Makefile,v 1.17 2008/01/04 17:48:36 espie Exp $ COMMENT= find the country where IP address/hostname originates from @@ -24,8 +24,7 @@ USE_LIBTOOL= Yes EXAMPLESDIR= ${PREFIX}/share/examples/GeoIP -FAKE_FLAGS= ${DESTDIRNAME}=${WRKINST} \ - DEFAULT_CONFIG_FILE=${EXAMPLESDIR}/GeoIP.conf \ +FAKE_FLAGS= DEFAULT_CONFIG_FILE=${EXAMPLESDIR}/GeoIP.conf \ DEFAULT_DB_FILE=${EXAMPLESDIR}/GeoIP.dat pre-install: diff --git a/net/adns/Makefile b/net/adns/Makefile index 87591a55d7a..cfd30cee9b5 100644 --- a/net/adns/Makefile +++ b/net/adns/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2007/09/15 22:36:51 merdely Exp $ +# $OpenBSD: Makefile,v 1.9 2008/01/04 17:48:36 espie Exp $ COMMENT= asynchronous dns resolver client library and utilities DISTNAME= adns-1.4 @@ -21,7 +21,6 @@ MASTER_SITES= ${HOMEPAGE}/ftp/ CONFIGURE_STYLE= gnu dest USE_GMAKE= Yes MAKE_FLAGS= MAJOR=${LIBadns_MAJOR} MINOR=${LIBadns_VERSION:E} -FAKE_FLAGS= MAJOR=${LIBadns_MAJOR} MINOR=${LIBadns_VERSION:E} LIBadns_MAJOR=${LIBadns_VERSION:R} SUBST_VARS+= LIBadns_MAJOR diff --git a/net/bitlbee/Makefile b/net/bitlbee/Makefile index a5cec13a148..78fd4609b1a 100644 --- a/net/bitlbee/Makefile +++ b/net/bitlbee/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.24 2007/11/19 11:44:32 martynas Exp $ +# $OpenBSD: Makefile,v 1.25 2008/01/04 17:48:36 espie Exp $ COMMENT= IRC proxy to connect to AIM, ICQ, Jabber, MSN and Yahoo @@ -35,7 +35,7 @@ CONFIGURE_ARGS+= --bindir=${PREFIX}/libexec \ USE_GMAKE= Yes MAKE_ENV= "CC=${CC}" "CFLAGS=${CFLAGS}" -FAKE_FLAGS= ${DESTDIRNAME}=${WRKINST} ETCDIR=${EXAMPLEDIR} +FAKE_FLAGS= ETCDIR=${EXAMPLEDIR} FAKE_TARGET= install install-etc SUBST_VARS= DB_DIR diff --git a/net/dlint/Makefile b/net/dlint/Makefile index 7d37fcbf877..9844d5defa9 100644 --- a/net/dlint/Makefile +++ b/net/dlint/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2007/09/15 22:36:53 merdely Exp $ +# $OpenBSD: Makefile,v 1.7 2008/01/04 17:48:36 espie Exp $ COMMENT= DNS zone verification tool @@ -21,6 +21,6 @@ MASTER_SITES= http://www.domtools.com/pub/ NO_BUILD= Yes NO_REGRESS= Yes -FAKE_FLAGS= DESTROOT=${WRKINST} +DESTDIRNAME= DESTROOT .include diff --git a/net/dsocks/Makefile b/net/dsocks/Makefile index 3f54d253f69..415847b4985 100644 --- a/net/dsocks/Makefile +++ b/net/dsocks/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2007/09/15 22:36:53 merdely Exp $ +# $OpenBSD: Makefile,v 1.7 2008/01/04 17:48:36 espie Exp $ COMMENT= SOCKS client wrapper for *BSD DISTNAME= dsocks-1.6 @@ -20,9 +20,7 @@ MASTER_SITES= ${HOMEPAGE} MAKE_FLAGS= SHLIB_MAJOR=${LIBdsocks_VERSION:R} \ SHLIB_MINOR=${LIBdsocks_VERSION:E} -FAKE_FLAGS= SHLIB_MAJOR=${LIBdsocks_VERSION:R} \ - SHLIB_MINOR=${LIBdsocks_VERSION:E} \ - DEBUGLIBS=No +FAKE_FLAGS= DEBUGLIBS=No post-install: ${INSTALL_PROGRAM} ${WRKSRC}/dsocks.sh ${WRKSRC}/dsocks-torify.sh \ diff --git a/net/epic4/Makefile b/net/epic4/Makefile index 5f19ff27da2..978a0e76d99 100644 --- a/net/epic4/Makefile +++ b/net/epic4/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.61 2007/09/15 22:36:53 merdely Exp $ +# $OpenBSD: Makefile,v 1.62 2008/01/04 17:48:36 espie Exp $ COMMENT= (E)nhanced (P)rogrammable (I)RC-II (C)lient @@ -19,8 +19,8 @@ PERMIT_DISTFILES_FTP= Yes WANTLIB= c crypto m ncurses ssl -FAKE_FLAGS= IP="${WRKINST}" \ - INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ +DESTDIRNAME= IP +FAKE_FLAGS= INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ INSTALL_DATA="${INSTALL_DATA}" SEPARATE_BUILD= simple diff --git a/net/gtk-gnutella/Makefile b/net/gtk-gnutella/Makefile index e880f960797..2d202a1d2ee 100644 --- a/net/gtk-gnutella/Makefile +++ b/net/gtk-gnutella/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.38 2007/11/17 20:39:02 steven Exp $ +# $OpenBSD: Makefile,v 1.39 2008/01/04 17:48:36 espie Exp $ COMMENT= Gtk-based GUI client for the Gnutella Network @@ -49,7 +49,7 @@ CONFIGURE_ARGS= -d -e \ -U optimize MAKE_FLAGS= GNUTLS_LDFLAGS= GNUTLS_CFLAGS= -FAKE_FLAGS= ${MAKE_FLAGS} INSTALL_PREFIX=${DESTDIR} +DESTDIRNAME= INSTALL_PREFIX INSTALL_TARGET= install install.man USE_X11= Yes diff --git a/net/ircII/Makefile b/net/ircII/Makefile index 25ee3e1a29b..0d35ba4c097 100644 --- a/net/ircII/Makefile +++ b/net/ircII/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.30 2007/10/05 19:54:55 kili Exp $ +# $OpenBSD: Makefile,v 1.31 2008/01/04 17:48:36 espie Exp $ COMMENT= Internet Relay Chat client @@ -24,7 +24,7 @@ MASTER_SITES= ftp://ircii.warped.com/pub/ircII/ \ SUBST_VARS= VERSION -FAKE_FLAGS= DESTDIR="${WRKINST}" INSTALL_IRC_NAME="ircII" \ +FAKE_FLAGS= INSTALL_IRC_NAME="ircII" \ INSTALL="${INSTALL_PROGRAM}" INSTALL_DATA="${INSTALL_DATA}" SEPARATE_BUILD= simple diff --git a/net/irssi/Makefile b/net/irssi/Makefile index ced1fbe215c..7e6a76106ba 100644 --- a/net/irssi/Makefile +++ b/net/irssi/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.34 2007/11/17 20:39:02 steven Exp $ +# $OpenBSD: Makefile,v 1.35 2008/01/04 17:48:37 espie Exp $ SHARED_ONLY= Yes @@ -48,8 +48,7 @@ BUILD_DEPENDS+= ::security/dante MAKE_FLAGS= scriptdir="${SYSCONFDIR}/irssi/scripts" \ themedir="${SYSCONFDIR}/irssi/themes" -FAKE_FLAGS= DESTDIR=${WRKINST} \ - confdir="${PREFIX}/share/examples/irssi" \ +FAKE_FLAGS= confdir="${PREFIX}/share/examples/irssi" \ scriptdir="${PREFIX}/share/examples/irssi/scripts" \ themedir="${PREFIX}/share/examples/irssi/themes" diff --git a/net/libdnet/Makefile b/net/libdnet/Makefile index f5faa0614a1..94425614bf0 100644 --- a/net/libdnet/Makefile +++ b/net/libdnet/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.20 2007/11/05 23:27:22 espie Exp $ +# $OpenBSD: Makefile,v 1.21 2008/01/04 17:48:37 espie Exp $ COMMENT-main= portable low-level networking library COMMENT-python= python interface to libdnet @@ -38,7 +38,6 @@ MODULES+= lang/python MULTI_PACKAGES+= -python CONFIGURE_ARGS+= --with-python MAKE_FLAGS= PYTHON=${MODPY_BIN} -FAKE_FLAGS= ${MAKE_FLAGS} DESTDIR=${WRKINST} REGRESS_DEPENDS= ::net/libdnet,-python REGRESS_FLAGS= TESTS_ENVIRONMENT=${MODPY_BIN} WANTLIB-python= diff --git a/net/libgadu/Makefile b/net/libgadu/Makefile index e4b2c16fee0..959281097cd 100644 --- a/net/libgadu/Makefile +++ b/net/libgadu/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2007/09/15 22:36:55 merdely Exp $ +# $OpenBSD: Makefile,v 1.3 2008/01/04 17:48:37 espie Exp $ COMMENT= implementation of Gadu-Gadu IM protocol @@ -23,7 +23,6 @@ CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ --without-pthread \ --disable-libgadu-openssl MAKE_FLAGS= LIBgadu_VERSION=${LIBgadu_VERSION} -FAKE_FLAGS= LIBgadu_VERSION=${LIBgadu_VERSION} USE_GMAKE= Yes NO_REGRESS= Yes diff --git a/net/libnet/1.0/Makefile b/net/libnet/1.0/Makefile index ca7e451e89a..ff133b2b6d1 100644 --- a/net/libnet/1.0/Makefile +++ b/net/libnet/1.0/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2005/12/31 14:03:28 steven Exp $ +# $OpenBSD: Makefile,v 1.6 2008/01/04 17:48:37 espie Exp $ REVISION= 1.0 VERSION= ${REVISION}.2a @@ -10,7 +10,6 @@ MASTER_SITES= http://www.packetfactory.net/libnet/dist/deprecated/ WRKDIST= ${WRKDIR}/Libnet-1.0.2a AUTOCONF_VERSION=2.13 MAKE_FLAGS= LIBnet_VERSION=${LIBnet_VERSION} -FAKE_FLAGS= ${MAKE_FLAGS} DESTDIR=${WRKINST} post-install: @ln -sf libnet-1.0/libnet.so.${LIBnet_VERSION} \ diff --git a/net/libnet/1.1/Makefile b/net/libnet/1.1/Makefile index 249d602442c..fa2387f536e 100644 --- a/net/libnet/1.1/Makefile +++ b/net/libnet/1.1/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2005/12/31 14:03:28 steven Exp $ +# $OpenBSD: Makefile,v 1.4 2008/01/04 17:48:37 espie Exp $ REVISION= 1.1 VERSION= ${REVISION}.2.1 @@ -9,7 +9,6 @@ MASTER_SITES= http://www.packetfactory.net/libnet/dist/ AUTOCONF_VERSION= 2.59 MAKE_FLAGS= LIBnet_VERSION=${LIBnet_VERSION} -FAKE_FLAGS= ${MAKE_FLAGS} DESTDIR=${WRKINST} CONFIGURE_ENV= LIBNET_CONFIG_LIBS="-L${LOCALBASE}/lib/libnet-1.1" \ LIBNET_CONFIG_CFLAGS="-I${LOCALBASE}/include/libnet-1.1" diff --git a/net/libnids/Makefile b/net/libnids/Makefile index 60de5ad2565..2cb8a5da2cf 100644 --- a/net/libnids/Makefile +++ b/net/libnids/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.27 2007/09/15 22:36:55 merdely Exp $ +# $OpenBSD: Makefile,v 1.28 2008/01/04 17:48:37 espie Exp $ COMMENT= network monitoring library with TCP/IP reassembly @@ -16,7 +16,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -FAKE_FLAGS= install_prefix="${WRKINST}" +DESTDIRNAME= install_prefix CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --with-libnet="${LOCALBASE}" diff --git a/net/p5-Net-FTPServer/Makefile b/net/p5-Net-FTPServer/Makefile index c403c4c2776..e5e542c2f15 100644 --- a/net/p5-Net-FTPServer/Makefile +++ b/net/p5-Net-FTPServer/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2007/09/15 22:36:57 merdely Exp $ +# $OpenBSD: Makefile,v 1.5 2008/01/04 17:48:37 espie Exp $ COMMENT= secure, extensible and configurable Perl FTPd @@ -21,7 +21,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -FAKE_FLAGS= NOCONF=1 ${DESTDIRNAME}=${WRKINST} +FAKE_FLAGS= NOCONF=1 CONFIG_DIR= ${PREFIX}/share/examples/p5-Net-FTPServer post-install: diff --git a/net/samba/Makefile b/net/samba/Makefile index ad882df9f5c..f553394f8f1 100644 --- a/net/samba/Makefile +++ b/net/samba/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.88 2007/12/14 08:53:27 mbalmer Exp $ +# $OpenBSD: Makefile,v 1.89 2008/01/04 17:48:37 espie Exp $ COMMENT-main= SMB and CIFS client and server for UNIX COMMENT-docs= documentation and examples for samba @@ -34,9 +34,6 @@ LIB_DEPENDS= popt::devel/popt MAKE_FLAGS= PASSWD_PROGRAM="/usr/bin/passwd" \ LIBsmbclient_VERSION=${LIBsmbclient_VERSION} \ LIBmsrpc_VERSION=${LIBmsrpc_VERSION} -FAKE_FLAGS= DESTDIR="${DESTDIR}" \ - LIBsmbclient_VERSION=${LIBsmbclient_VERSION} \ - LIBmsrpc_VERSION=${LIBmsrpc_VERSION} CONFDIR= ${SYSCONFDIR}/samba SAMBA_LOGDIR= /var/log diff --git a/net/tor/Makefile b/net/tor/Makefile index a9641ee78e3..8d8c807930a 100644 --- a/net/tor/Makefile +++ b/net/tor/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.32 2007/11/04 08:39:20 rui Exp $ +# $OpenBSD: Makefile,v 1.33 2008/01/04 17:48:37 espie Exp $ COMMENT= anonymity service using onion routing @@ -25,6 +25,6 @@ CONFIGURE_ARGS= --with-ssl-dir=/usr DB_DIR= /var/tor SUBST_VARS= DB_DIR -FAKE_FLAGS= DESTDIR=${WRKINST} sysconfdir=${PREFIX}/share/examples +FAKE_FLAGS= sysconfdir=${PREFIX}/share/examples .include diff --git a/net/wide-dhcp/Makefile b/net/wide-dhcp/Makefile index 48d47fc0a61..65a93e8725c 100644 --- a/net/wide-dhcp/Makefile +++ b/net/wide-dhcp/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.17 2007/09/15 22:37:00 merdely Exp $ +# $OpenBSD: Makefile,v 1.18 2008/01/04 17:48:37 espie Exp $ COMMENT= client and servers for the WIDE DHCP protocol @@ -16,7 +16,7 @@ PERMIT_DISTFILES_FTP= Yes WANTLIB= c kvm MAKE_FLAGS= OSTYPE=OpenBSD CC=${CC} CFLAGS="${CFLAGS} -g -Wall -I. -I${WRKBUILD}/server" -FAKE_FLAGS= ${MAKE_FLAGS} SBIN=${WRKINST}${PREFIX}/sbin MAN=${WRKINST}${PREFIX}/man LIBEXEC=${WRKINST}${PREFIX}/libexec +FAKE_FLAGS= SBIN=${WRKINST}${PREFIX}/sbin MAN=${WRKINST}${PREFIX}/man LIBEXEC=${WRKINST}${PREFIX}/libexec NO_REGRESS= Yes diff --git a/palm/coldsync/Makefile b/palm/coldsync/Makefile index 5560dd5b4c1..19ec6029073 100644 --- a/palm/coldsync/Makefile +++ b/palm/coldsync/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2007/09/15 19:00:54 steven Exp $ +# $OpenBSD: Makefile,v 1.8 2008/01/04 17:48:37 espie Exp $ COMMENT= tool for synchronizing PalmOS devices @@ -20,8 +20,9 @@ MODULES= devel/gettext CONFIGURE_STYLE= gnu CONFIGURE_ARGS= --without-usb --without-libusb -FAKE_FLAGS= ${MAKE_FLAGS} \ - INFODIR=${WRKINST}${PREFIX}/info \ +# DESTDIR bugs the fake process, so make sure it does not get set +DESTDIRNAME= none +FAKE_FLAGS= INFODIR=${WRKINST}${PREFIX}/info \ MANDIR=${WRKINST}${PREFIX}/man .include diff --git a/print/foomatic-filters/Makefile b/print/foomatic-filters/Makefile index 9bb1a4e8abe..5f4f2d0f44e 100644 --- a/print/foomatic-filters/Makefile +++ b/print/foomatic-filters/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2007/10/19 09:12:03 jakemsr Exp $ +# $OpenBSD: Makefile,v 1.4 2008/01/04 17:48:37 espie Exp $ COMMENT= Foomatic PPD print filters @@ -32,9 +32,7 @@ CONFIGURE_ENV= CUPS="${LOCALBASE}/libexec/cups" \ ENSCRIPT="${LOCALBASE}/bin/enscript" \ MPAGE="${LOCALBASE}/bin/mpage" -FAKE_FLAGS= ${MAKE_FLAGS} \ - DESTDIR="${WRKINST}" \ - ETCDIR="${PREFIX}/share/examples/foomatic" +FAKE_FLAGS= ETCDIR="${PREFIX}/share/examples/foomatic" SUBST_VARS+= SYSCONFDIR diff --git a/print/ghostscript/gnu/Makefile b/print/ghostscript/gnu/Makefile index 7f5654037ab..190bce1199a 100644 --- a/print/ghostscript/gnu/Makefile +++ b/print/ghostscript/gnu/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.52 2007/11/19 20:06:56 kili Exp $ +# $OpenBSD: Makefile,v 1.53 2008/01/04 17:48:37 espie Exp $ COMMENT= GNU PostScript interpreter @@ -120,8 +120,6 @@ WANTLIB+= crypto pthread ssl tiff NO_REGRESS= Yes -FAKE_FLAGS+= ${MAKE_FLAGS} DESTDIR=${WRKINST} - # Avoid surprises in update-patches. # Use the old-style (non-autoconf) build. post-extract: diff --git a/print/mftrace/Makefile b/print/mftrace/Makefile index 2117c7a7c64..e955634f79a 100644 --- a/print/mftrace/Makefile +++ b/print/mftrace/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2007/11/04 23:24:43 steven Exp $ +# $OpenBSD: Makefile,v 1.6 2008/01/04 17:48:37 espie Exp $ COMMENT= Scalable PostScript fonts for MetaFont @@ -32,7 +32,7 @@ USE_GMAKE= Yes CONFIGURE_STYLE=gnu CONFIGURE_ARGS= PYTHON=${MODPY_BIN} MAKE_FILE= GNUmakefile -FAKE_FLAGS= MODPY_SITEPKG=${MODPY_SITEPKG} ${DESTDIRNAME}=${WRKINST} +FAKE_FLAGS= MODPY_SITEPKG=${MODPY_SITEPKG} NO_REGRESS= Yes diff --git a/print/poppler/Makefile b/print/poppler/Makefile index 29fa17cb4c0..ed1bae23554 100644 --- a/print/poppler/Makefile +++ b/print/poppler/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2007/12/07 19:55:58 kili Exp $ +# $OpenBSD: Makefile,v 1.14 2008/01/04 17:48:37 espie Exp $ COMMENT-main= PDF rendering library COMMENT-qt= qt interface to PDF rendering library @@ -86,8 +86,6 @@ CONFIGURE_ENV+= CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \ CFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -FAKE_FLAGS= ${MAKE_FLAGS} DESTDIR=${WRKINST} - USE_LIBTOOL= Yes USE_X11= Yes USE_GMAKE= Yes diff --git a/security/dsniff/Makefile b/security/dsniff/Makefile index 8cb9b39384f..0c17b1ed48a 100644 --- a/security/dsniff/Makefile +++ b/security/dsniff/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.39 2007/09/15 23:29:58 merdely Exp $ +# $OpenBSD: Makefile,v 1.40 2008/01/04 17:48:37 espie Exp $ COMMENT= sniffing tools for penetration testing @@ -38,6 +38,6 @@ WANTLIB+= ICE SM X11 Xmu NO_REGRESS= Yes -FAKE_FLAGS= install_prefix="${WRKINST}" +DESTDIRNAME= install_prefix .include diff --git a/security/fwbuilder/Makefile b/security/fwbuilder/Makefile index 2f8856d0c2b..e8e328179c2 100644 --- a/security/fwbuilder/Makefile +++ b/security/fwbuilder/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2007/09/15 23:29:58 merdely Exp $ +# $OpenBSD: Makefile,v 1.9 2008/01/04 17:48:37 espie Exp $ COMMENT=firewall gui CATEGORIES=net security @@ -20,7 +20,7 @@ CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --with-docdir=${TRUEPREFIX}/share/doc/fwbuilder MODULES= x11/qt3 -FAKE_FLAGS= INSTALL_ROOT=${WRKINST} ${MAKE_FLAGS} +DESTDIRNAME= INSTALL_ROOT LIB_DEPENDS= fwcompiler.>=9,fwbuilder.>=9::security/libfwbuilder NO_REGRESS= Yes USE_X11= Yes diff --git a/security/libfwbuilder/Makefile b/security/libfwbuilder/Makefile index 0266fce8ac1..cd3bc84a118 100644 --- a/security/libfwbuilder/Makefile +++ b/security/libfwbuilder/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2007/09/15 23:29:58 merdely Exp $ +# $OpenBSD: Makefile,v 1.8 2008/01/04 17:48:37 espie Exp $ COMMENT= libraries for fwbuilder DISTNAME= libfwbuilder-2.1.8 @@ -34,6 +34,6 @@ NO_REGRESS= Yes MAKE_FLAGS= LIBfwbuilder_VERSION=${LIBfwbuilder_VERSION} \ LIBfwcompiler_VERSION=${LIBfwcompiler_VERSION} -FAKE_FLAGS= ${MAKE_FLAGS} INSTALL_ROOT=${WRKINST} +DESTDIRNAME= INSTALL_ROOT .include diff --git a/sysutils/LPRng/Makefile b/sysutils/LPRng/Makefile index 87dfacd4d49..57c2a616f5c 100644 --- a/sysutils/LPRng/Makefile +++ b/sysutils/LPRng/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.35 2007/09/15 21:14:00 merdely Exp $ +# $OpenBSD: Makefile,v 1.36 2008/01/04 17:48:37 espie Exp $ COMMENT= enhanced printer spooler @@ -31,7 +31,7 @@ CONFIGURE_ARGS= --with-sbindir=${PREFIX}/sbin \ --disable-nls CFLAGS+= -Dlog=mylog -FAKE_FLAGS= DESTDIR=${WRKINST} POSTINSTALL=NO prefix=${TRUEPREFIX} \ +FAKE_FLAGS= POSTINSTALL=NO prefix=${TRUEPREFIX} \ MAN=${TRUEPREFIX}/man \ FILTER_DIR=${TRUEPREFIX}/libexec/filters \ LPD_PERMS_PATH=${TRUEPREFIX}${CONFDIR}/lpd.perms \ diff --git a/sysutils/clusterit/Makefile b/sysutils/clusterit/Makefile index 1df319450c2..b4af9a38a91 100644 --- a/sysutils/clusterit/Makefile +++ b/sysutils/clusterit/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2007/09/15 22:16:55 merdely Exp $ +# $OpenBSD: Makefile,v 1.4 2008/01/04 17:48:37 espie Exp $ COMMENT= suite of clustering tools based on IBM's PSSP @@ -32,7 +32,6 @@ CONFIGURE_ARGS= --without-x11 USE_X11= Yes WANTLIB+= util X11 MAKE_FLAGS= EXTRA_SUBDIRS="${X11_SUBDIRS}" -FAKE_FLAGS= EXTRA_SUBDIRS="${X11_SUBDIRS}" ${DESTDIRNAME}=${WRKINST} .endif # The port's existing regress structure seems broken; upstream contacted diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile index 787a54e1763..8a31b606b0d 100644 --- a/sysutils/e2fsprogs/Makefile +++ b/sysutils/e2fsprogs/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2007/09/15 21:14:01 merdely Exp $ +# $OpenBSD: Makefile,v 1.10 2008/01/04 17:48:37 espie Exp $ # $FreeBSD: ports/sysutils/e2fsprogs/Makefile,v 1.8 2003/02/20 19:00:47 knu Exp $ COMMENT-main= utilities to manipulate ext2 filesystems @@ -41,7 +41,6 @@ MAKE_FLAGS= LIBe2p_VERSION=${LIBe2p_VERSION} \ LIBext2fs_com_err_VERSION=${LIBext2fs_com_err_VERSION} \ LIBss_VERSION=${LIBss_VERSION} \ LIBuuid_VERSION=${LIBuuid_VERSION} -FAKE_FLAGS= ${MAKE_FLAGS} LIB_DEPENDS-main= lib/uuid/uuid::${BUILD_PKGPATH},-uuid post-install: diff --git a/sysutils/idled/Makefile b/sysutils/idled/Makefile index 7c444ebd141..df9159d03e7 100644 --- a/sysutils/idled/Makefile +++ b/sysutils/idled/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.17 2007/09/15 21:14:01 merdely Exp $ +# $OpenBSD: Makefile,v 1.18 2008/01/04 17:48:37 espie Exp $ COMMENT= log out idle users and those hogging resources @@ -8,7 +8,7 @@ CATEGORIES= sysutils MASTER_SITES= http://www.netsw.org/system/tools/process/ HOMEPAGE= http://www.darkwing.com/idled/ -FAKE_FLAGS= PREFIX=${PREFIX} DESTDIR=${WRKINST} +FAKE_FLAGS= PREFIX=${PREFIX} PERMIT_PACKAGE_CDROM= no fee PERMIT_PACKAGE_FTP= Yes diff --git a/sysutils/iogen/Makefile b/sysutils/iogen/Makefile index 94f2146da5c..c60ab005e1e 100644 --- a/sysutils/iogen/Makefile +++ b/sysutils/iogen/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.18 2007/09/15 21:14:01 merdely Exp $ +# $OpenBSD: Makefile,v 1.19 2008/01/04 17:48:37 espie Exp $ COMMENT= i/o generator PKGNAME= iogen-3.1 @@ -17,7 +17,7 @@ NO_CHECKSUM= Yes NO_REGRESS= Yes CFLAGS+= -DVERSION=\"${PKGNAME:S/iogen-//}\" -FAKE_FLAGS+= BINDIR="${PREFIX}/bin" DESTDIR="${WRKINST}" MANDIR="${PREFIX}/man/cat" +FAKE_FLAGS+= BINDIR="${PREFIX}/bin" MANDIR="${PREFIX}/man/cat" MAKE_ENV= CC="${CC}" WRKDIST= ${WRKDIR} diff --git a/sysutils/pciutils/Makefile b/sysutils/pciutils/Makefile index 9c6d27193e7..5b5d204272d 100644 --- a/sysutils/pciutils/Makefile +++ b/sysutils/pciutils/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2007/09/15 21:14:02 merdely Exp $ +# $OpenBSD: Makefile,v 1.7 2008/01/04 17:48:37 espie Exp $ NOT_FOR_ARCHS= sparc m68k m88k vax @@ -24,8 +24,7 @@ MASTER_SITES= ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/ USE_GMAKE= Yes MAKE_ENV= CC="${CC}" -FAKE_FLAGS= PREFIX=${TRUEPREFIX} DESTDIR=${WRKINST} \ - MANDIR=${TRUEPREFIX}/man +FAKE_FLAGS= PREFIX=${TRUEPREFIX} MANDIR=${TRUEPREFIX}/man NO_REGRESS= Yes diff --git a/sysutils/rtty/Makefile b/sysutils/rtty/Makefile index 6b86b1ada35..74a961067f8 100644 --- a/sysutils/rtty/Makefile +++ b/sysutils/rtty/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.18 2007/06/09 16:17:35 naddy Exp $ +# $OpenBSD: Makefile,v 1.19 2008/01/04 17:48:37 espie Exp $ COMMENT= multiuser tip/cu replacement with logging @@ -20,7 +20,7 @@ WRKDIST= ${WRKDIR} NO_REGRESS= Yes -FAKE_FLAGS= DESTROOT=${WRKINST} +DESTDIRNAME= DESTROOT post-install: @${INSTALL_DATA} ${WRKDIR}/README ${PREFIX}/rtty diff --git a/sysutils/ruby-facter/Makefile b/sysutils/ruby-facter/Makefile index a6cd7feba6c..df1410edcac 100644 --- a/sysutils/ruby-facter/Makefile +++ b/sysutils/ruby-facter/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2007/09/15 21:14:02 merdely Exp $ +# $OpenBSD: Makefile,v 1.4 2008/01/04 17:48:37 espie Exp $ SHARED_ONLY= Yes @@ -28,7 +28,7 @@ NO_BUILD= Yes do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ruby-facter - @cd ${WRKSRC} && ${FAKE_FLAGS} ${RUBY} install.rb + @cd ${WRKSRC} && ${ALL_FAKE_FLAGS} ${RUBY} install.rb ${INSTALL_DATA} ${WRKSRC}/etc/facter.conf \ ${PREFIX}/share/examples/ruby-facter diff --git a/sysutils/ruby-puppet/Makefile b/sysutils/ruby-puppet/Makefile index f644f508377..a880818c856 100644 --- a/sysutils/ruby-puppet/Makefile +++ b/sysutils/ruby-puppet/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2007/09/15 21:14:02 merdely Exp $ +# $OpenBSD: Makefile,v 1.5 2008/01/04 17:48:37 espie Exp $ COMMENT= centralised configuration management for networks @@ -27,7 +27,7 @@ NO_BUILD= Yes do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ruby-puppet - @cd ${WRKSRC} && ${FAKE_FLAGS} ${RUBY} install.rb + @cd ${WRKSRC} && ${ALL_FAKE_FLAGS} ${RUBY} install.rb for f in `ls -1 ${WRKSRC}/examples/root/etc/puppet/*.conf`; do \ ${INSTALL_DATA} $$f ${PREFIX}/share/examples/ruby-puppet; \ done diff --git a/sysutils/tabled/Makefile b/sysutils/tabled/Makefile index 5f5df15fbf9..37554955e77 100644 --- a/sysutils/tabled/Makefile +++ b/sysutils/tabled/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2007/09/15 21:14:03 merdely Exp $ +# $OpenBSD: Makefile,v 1.10 2008/01/04 17:48:37 espie Exp $ COMMENT= daemon to modify pf tables from userland @@ -20,8 +20,6 @@ WANTLIB= c MASTER_SITES= ftp://ftp.etc.msys.ch/pub/sources/tabled/ EXTRACT_SUFX= .tgz -FAKE_FLAGS= ${MAKE_FLAGS} - NO_REGRESS= Yes post-install: diff --git a/textproc/aspell/core/Makefile b/textproc/aspell/core/Makefile index 6be32b3431b..b9338f73f89 100644 --- a/textproc/aspell/core/Makefile +++ b/textproc/aspell/core/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.15 2007/09/15 20:59:37 merdely Exp $ +# $OpenBSD: Makefile,v 1.16 2008/01/04 17:48:37 espie Exp $ COMMENT= spell checker designed to eventually replace Ispell DISTNAME= aspell-0.50.5 @@ -46,7 +46,7 @@ post-install: cd ${WRKDIR}/aspell-$i; \ ASPELL=${WRKSRC}/prog/aspell \ WORD_LIST_COMPRESS=${WRKSRC}/prog/word-list-compress \ - ${MAKE} ${FAKE_FLAGS} install + ${MAKE} ${ALL_FAKE_FLAGS} install .endfor .include diff --git a/textproc/icu4c/Makefile b/textproc/icu4c/Makefile index cc4764c0949..27a51fbd529 100644 --- a/textproc/icu4c/Makefile +++ b/textproc/icu4c/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2007/10/02 20:53:29 jasper Exp $ +# $OpenBSD: Makefile,v 1.4 2008/01/04 17:48:37 espie Exp $ SHARED_ONLY= Yes @@ -39,7 +39,5 @@ WRKDIST= ${WRKDIR}/icu WRKSRC= ${WRKDIST}/source MAKE_FLAGS= SO_TARGET_VERSION=${SO_VERSION} -FAKE_FLAGS= SO_TARGET_VERSION=${SO_VERSION} \ - ${DESTDIRNAME}=${WRKINST} .include diff --git a/textproc/libebml/Makefile b/textproc/libebml/Makefile index dd341c616fd..c205f4cb76b 100644 --- a/textproc/libebml/Makefile +++ b/textproc/libebml/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2007/09/15 20:59:38 merdely Exp $ +# $OpenBSD: Makefile,v 1.5 2008/01/04 17:48:37 espie Exp $ COMMENT= Extensible Binary Meta Language library DISTNAME= libebml-0.7.7 @@ -20,7 +20,6 @@ USE_GMAKE= Yes WRKSRC= ${WRKDIST}/make/linux -FAKE_FLAGS+= LIBebml_VERSION=${LIBebml_VERSION} MAKE_FLAGS+= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \ LIBebml_VERSION=${LIBebml_VERSION} diff --git a/textproc/libxml++/Makefile b/textproc/libxml++/Makefile index 3ea85e74bbe..c538ddf3930 100644 --- a/textproc/libxml++/Makefile +++ b/textproc/libxml++/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2007/09/15 20:59:38 merdely Exp $ +# $OpenBSD: Makefile,v 1.3 2008/01/04 17:48:37 espie Exp $ COMMENT= C++ wrapper for the libxml XML parser library @@ -31,7 +31,6 @@ USE_LIBTOOL= Yes CONFIGURE_STYLE=gnu CONFIGURE_ARGS= ${CONFIGURE_SHARED} -FAKE_FLAGS= ${DESTDIRNAME}=${WRKINST} \ - docdir="${PREFIX}/share/doc/libxml++-2.6" +FAKE_FLAGS= docdir="${PREFIX}/share/doc/libxml++-2.6" .include diff --git a/textproc/wdiff/Makefile b/textproc/wdiff/Makefile index bf2e526099b..70b15713ee4 100644 --- a/textproc/wdiff/Makefile +++ b/textproc/wdiff/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.19 2007/11/24 14:46:29 simon Exp $ +# $OpenBSD: Makefile,v 1.20 2008/01/04 17:48:37 espie Exp $ COMMENT= word differences between text files @@ -19,7 +19,6 @@ CONFIGURE_ENV= CFLAGS=-I${LOCALBASE}/include \ LDFLAGS=-L${LOCALBASE}/lib CONFIGURE_ARGS= --without-included-gettext USE_GMAKE= Yes -FAKE_FLAGS= DESTDIR=${WRKINST} \ - PREFIX=${PREFIX} +FAKE_FLAGS= PREFIX=${PREFIX} .include diff --git a/www/cgicc/Makefile b/www/cgicc/Makefile index cfb8abd3349..2d500eaa183 100644 --- a/www/cgicc/Makefile +++ b/www/cgicc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2007/09/15 20:38:21 merdely Exp $ +# $OpenBSD: Makefile,v 1.14 2008/01/04 17:48:37 espie Exp $ COMMENT= c++ compliant CGI applications libraries @@ -23,7 +23,6 @@ CONFIGURE_STYLE= gnu CONFIGURE_ARGS= ${CONFIGURE_SHARED} --enable-static MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/example ${WRKSRC}/support -FAKE_FLAGS= ${DESTDIRNAME}=${WRKINST} \ - docdir=${DESTDIR}${PREFIX}/share/doc/cgicc +FAKE_FLAGS= docdir=${DESTDIR}${PREFIX}/share/doc/cgicc .include diff --git a/www/cgiparse/Makefile b/www/cgiparse/Makefile index 90a2a59054f..65310853d12 100644 --- a/www/cgiparse/Makefile +++ b/www/cgiparse/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.27 2007/09/16 02:59:32 merdely Exp $ +# $OpenBSD: Makefile,v 1.28 2008/01/04 17:48:37 espie Exp $ COMMENT= C library to parse CGI Forms @@ -26,7 +26,7 @@ BROKEN= Alpha architecture not yet supported NO_REGRESS= Yes MAKE_ENV= LIBcgiparse_VERSION=${LIBcgiparse_VERSION} -FAKE_FLAGS= DESTDIR=${WRKINST} MANDIR=${WRKINST}${PREFIX}/man +FAKE_FLAGS= MANDIR=${WRKINST}${PREFIX}/man .include diff --git a/www/liferea/Makefile b/www/liferea/Makefile index f973fabe99a..bf745367241 100644 --- a/www/liferea/Makefile +++ b/www/liferea/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2008/01/02 12:15:25 jasper Exp $ +# $OpenBSD: Makefile,v 1.13 2008/01/04 17:48:37 espie Exp $ SHARED_ONLY= Yes @@ -45,8 +45,7 @@ RUN_DEPENDS= ::devel/desktop-file-utils \ ::x11/hicolor-icon-theme MAKE_FLAGS= liblinotiflibnotify_la_LDFLAGS="-module -avoid-version" -FAKE_FLAGS= htmldocdir="${PREFIX}/share/doc/liferea/html" \ - DESTDIR=${WRKINST} +FAKE_FLAGS= htmldocdir="${PREFIX}/share/doc/liferea/html" CFLAGS+= -I${LOCALBASE}/xulrunner/include/webbrwsr/ \ -I${LOCALBASE}/xulrunner/include/dom/ \ -I${LOCALBASE}/xulrunner/include/pref/ \ diff --git a/www/man2web/Makefile b/www/man2web/Makefile index 66e9e734572..1efb232a308 100644 --- a/www/man2web/Makefile +++ b/www/man2web/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2007/09/15 20:38:22 merdely Exp $ +# $OpenBSD: Makefile,v 1.7 2008/01/04 17:48:37 espie Exp $ COMMENT= convert man pages to HTML @@ -22,7 +22,6 @@ CONFIGURE_ARGS= --with-distro=openbsd-3 CONFIGURE_ARGS+= --disable-lynx # requires lynxcgi support MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/helpers -FAKE_FLAGS= ${DESTDIRNAME}=${WRKINST} \ - sysconfdir=${PREFIX}/share/examples/man2web +FAKE_FLAGS= sysconfdir=${PREFIX}/share/examples/man2web .include diff --git a/www/mplayerplug-in/Makefile b/www/mplayerplug-in/Makefile index f1cf890b18d..66637ae8e0e 100644 --- a/www/mplayerplug-in/Makefile +++ b/www/mplayerplug-in/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2007/12/17 19:25:59 jasper Exp $ +# $OpenBSD: Makefile,v 1.4 2008/01/04 17:48:37 espie Exp $ SHARED_ONLY= Yes @@ -72,6 +72,6 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/mplayerplug-in.{conf,types} \ ${PREFIX}/share/examples/mplayerplug-in @cd ${WRKSRC}/po && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} \ - ${FAKE_FLAGS} ${FAKE_TARGET} + ${ALL_FAKE_FLAGS} ${FAKE_TARGET} .include diff --git a/www/pecl-APC/Makefile b/www/pecl-APC/Makefile index e17b56b49d0..3634870d281 100644 --- a/www/pecl-APC/Makefile +++ b/www/pecl-APC/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2007/12/06 11:21:09 sthen Exp $ +# $OpenBSD: Makefile,v 1.10 2008/01/04 17:48:37 espie Exp $ SHARED_ONLY= Yes @@ -39,7 +39,7 @@ CONFIGURE_ENV= AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \ AUTOCONF_VERSION=${AUTOCONF_VERSION} PREFIX= /var/www -FAKE_FLAGS= INSTALL_ROOT=${WRKINST} +DESTDIRNAME= INSTALL_ROOT SUBST_VARS= LOCALBASE NO_REGRESS= Yes diff --git a/www/pecl-memcache/Makefile b/www/pecl-memcache/Makefile index 678ca852fe7..512425aecfe 100644 --- a/www/pecl-memcache/Makefile +++ b/www/pecl-memcache/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2007/09/15 20:38:25 merdely Exp $ +# $OpenBSD: Makefile,v 1.7 2008/01/04 17:48:38 espie Exp $ SHARED_ONLY= Yes @@ -35,7 +35,7 @@ CONFIGURE_ENV= AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \ AUTOCONF_VERSION=${AUTOCONF_VERSION} PREFIX= /var/www -FAKE_FLAGS= INSTALL_ROOT=${WRKINST} +DESTDIRNAME= INSTALL_ROOT SUBST_VARS= LOCALBASE NO_REGRESS= Yes diff --git a/www/php4/core/Makefile b/www/php4/core/Makefile index ce7f7d5a34a..727bb1cb9e2 100644 --- a/www/php4/core/Makefile +++ b/www/php4/core/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.37 2007/09/15 20:38:25 merdely Exp $ +# $OpenBSD: Makefile,v 1.38 2008/01/04 17:48:38 espie Exp $ MULTI_PACKAGES= -main -pear @@ -54,7 +54,7 @@ pre-fake: ${INSTALL_DATA_DIR} ${PREFIX}/${APACHE_MODULE_SUBDIR} INSTALL_TARGET= install-pear install-headers install-build install-programs -FAKE_FLAGS= INSTALL_ROOT=${DESTDIR} +DESTDIRNAME= INSTALL_ROOT pre-configure: @perl -p -i.orig -e "s,OPENBSD_PEAR_ROOT,'${CHROOT_DIR}/pear',g" \ diff --git a/www/php5/core/Makefile b/www/php5/core/Makefile index f06afba2d27..50a8f895a9d 100644 --- a/www/php5/core/Makefile +++ b/www/php5/core/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.33 2007/12/11 12:45:08 robert Exp $ +# $OpenBSD: Makefile,v 1.34 2008/01/04 17:48:38 espie Exp $ COMMENT-main= server-side HTML-embedded scripting language COMMENT-fastcgi=stand-alone FastCGI version of PHP @@ -51,7 +51,7 @@ LIB_DEPENDS= xml2.>=8::textproc/libxml pre-fake: ${INSTALL_DATA_DIR} ${PREFIX}/${APACHE_MODULE_SUBDIR} INSTALL_TARGET= install-headers install-build install-programs -FAKE_FLAGS= INSTALL_ROOT=${DESTDIR} +DESTDIRNAME= INSTALL_ROOT post-patch: mv ${WRKDIR}/suhosin-${SUHOSIN_V} ${WRKSRC}/ext/suhosin diff --git a/www/tidy/Makefile b/www/tidy/Makefile index d6e8f014e94..a693f5232cc 100644 --- a/www/tidy/Makefile +++ b/www/tidy/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.21 2007/09/15 20:38:26 merdely Exp $ +# $OpenBSD: Makefile,v 1.22 2008/01/04 17:48:38 espie Exp $ COMMENT= validate, correct, and pretty-print HTML files @@ -37,7 +37,6 @@ WRKBUILD= ${WRKDIST}/build/gmake DOCDIR= ${PREFIX}/share/doc/tidy MAKE_FLAGS= TIDY_MAJOR=${LIBtidy_VERSION:R} TIDY_MINOR=${LIBtidy_VERSION:E} -FAKE_FLAGS= TIDY_MAJOR=${LIBtidy_VERSION:R} TIDY_MINOR=${LIBtidy_VERSION:E} post-install: ${INSTALL_DATA_DIR} ${DOCDIR} diff --git a/www/xcache/Makefile b/www/xcache/Makefile index 04d1764cf75..3a3e976bd64 100644 --- a/www/xcache/Makefile +++ b/www/xcache/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2007/09/15 20:38:26 merdely Exp $ +# $OpenBSD: Makefile,v 1.3 2008/01/04 17:48:38 espie Exp $ SHARED_ONLY= Yes @@ -30,7 +30,7 @@ CONFIGURE_ARGS+= --enable-xcache CONFIGURE_ENV= AUTOCONF_VERSION=${AUTOCONF_VERSION} PREFIX= /var/www -FAKE_FLAGS= INSTALL_ROOT=${WRKINST} +DESTDIRNAME= INSTALL_ROOT NO_REGRESS= Yes diff --git a/x11/Xaw3d/Makefile b/x11/Xaw3d/Makefile index c98bc05a6fd..9713038baa0 100644 --- a/x11/Xaw3d/Makefile +++ b/x11/Xaw3d/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.24 2007/09/15 20:04:18 merdely Exp $ +# $OpenBSD: Makefile,v 1.25 2008/01/04 17:48:38 espie Exp $ COMMENT= 3D Athena Widget set that looks like Motif @@ -20,7 +20,6 @@ USE_X11= Yes CONFIGURE_STYLE=imake MAKE_FLAGS= SOXAWREV=${LIBXaw3d_VERSION} -FAKE_FLAGS= ${DESTDIRNAME}=${WRKINST} ${MAKE_FLAGS} WRKDIST= ${WRKDIR}/xc/lib/Xaw3d diff --git a/x11/chbg/Makefile b/x11/chbg/Makefile index 45ab0b58c19..f7ab586caf7 100644 --- a/x11/chbg/Makefile +++ b/x11/chbg/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2007/09/15 20:04:19 merdely Exp $ +# $OpenBSD: Makefile,v 1.11 2008/01/04 17:48:38 espie Exp $ COMMENT= Desktop wallpaper manager and X11 screensaver @@ -27,8 +27,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/libpng" # Will install some stub files for gnome. Needed if Gnome not installed # when packaging. -FAKE_FLAGS= ${DESTDIRNAME}=${WRKINST} \ - GNOME_PREFIX=${PREFIX} +FAKE_FLAGS= GNOME_PREFIX=${PREFIX} USE_X11= Yes CONFIGURE_STYLE= gnu diff --git a/x11/dbus/Makefile b/x11/dbus/Makefile index e2e1114995d..f329cf9ab6e 100644 --- a/x11/dbus/Makefile +++ b/x11/dbus/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2007/11/01 11:04:28 espie Exp $ +# $OpenBSD: Makefile,v 1.11 2008/01/04 17:48:38 espie Exp $ COMMENT= message system @@ -37,7 +37,6 @@ CONFIGURE_ARGS= --localstatedir=/var \ USE_X11= Yes USE_LIBTOOL= Yes -FAKE_FLAGS= sysconfdir=${TRUEPREFIX}/share/examples/dbus \ - DESTDIR=${WRKINST} +FAKE_FLAGS= sysconfdir=${TRUEPREFIX}/share/examples/dbus .include diff --git a/x11/enlightenment/Makefile b/x11/enlightenment/Makefile index 91481fe76c1..84085daae72 100644 --- a/x11/enlightenment/Makefile +++ b/x11/enlightenment/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.45 2007/11/30 18:39:53 fgsch Exp $ +# $OpenBSD: Makefile,v 1.46 2008/01/04 17:48:38 espie Exp $ COMMENT= themed window manager @@ -48,11 +48,11 @@ post-configure: ${SH} ./configure ${CONFIGURE_ARGS} post-install: - @cd ${WRKDIR}/${DOCS} && ${SUDO} ${SETENV} ${MAKE_ENV} \ - ${_FAKE_SETUP} ${MAKE_PROGRAM} ${FAKE_FLAGS} \ + @cd ${WRKDIR}/${DOCS} && ${SETENV} ${MAKE_ENV} \ + ${_FAKE_SETUP} ${MAKE_PROGRAM} ${ALL_FAKE_FLAGS} \ -f ${MAKE_FILE} ${FAKE_TARGET} - cd ${WRKDIR}/${THEMES} && ${SUDO} ${SETENV} ${MAKE_ENV} \ - ${_FAKE_SETUP} ${MAKE_PROGRAM} ${FAKE_FLAGS} \ + cd ${WRKDIR}/${THEMES} && ${SETENV} ${MAKE_ENV} \ + ${_FAKE_SETUP} ${MAKE_PROGRAM} ${ALL_FAKE_FLAGS} \ -f ${MAKE_FILE} ${FAKE_TARGET} .include diff --git a/x11/kde/Makefile.inc b/x11/kde/Makefile.inc index f099cc9f856..0eac01dd461 100644 --- a/x11/kde/Makefile.inc +++ b/x11/kde/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.38 2007/10/24 21:52:16 espie Exp $ +# $OpenBSD: Makefile.inc,v 1.39 2008/01/04 17:48:38 espie Exp $ DIST_SUBDIR?= kde HOMEPAGE?= http://www.kde.org .if defined(VERSION) && ${VERSION} == "3.1.95" @@ -48,7 +48,7 @@ CONFIGURE_ENV+= ${MODKDE_CONFIGURE_ENV} MAKE_ENV= ${CONFIGURE_ENV} MAKE_FLAGS+= ${MODKDE_MAKE_FLAGS} -FAKE_FLAGS?= TAR=tar DESTDIR=${WRKINST} +FAKE_FLAGS?= TAR=tar # GPL PERMIT_DISTFILES_CDROM?= Yes PERMIT_DISTFILES_FTP?= Yes diff --git a/x11/kde/base3/Makefile b/x11/kde/base3/Makefile index 0a52e9431a2..787ca7c7e2a 100644 --- a/x11/kde/base3/Makefile +++ b/x11/kde/base3/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.82 2007/12/18 16:00:12 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.83 2008/01/04 17:48:38 espie Exp $ COMMENT-main= K Desktop Environment, basic applications COMMENT-plugins= Konqueror nsplugins, essentially native JDK @@ -70,6 +70,6 @@ post-install: ${INSTALL_PROGRAM} ${WRKBUILD}/kdm/kfrontend/genkdmconf ${PREFIX}/libexec ${INSTALL_DATA} ${FILESDIR}/kdesurc ${PREFIX}/share/config -FAKE_FLAGS=${MAKE_FLAGS} DESTDIR=${WRKINST} sysconfdir=${SAMPLECONFDIR} +FAKE_FLAGS= sysconfdir=${SAMPLECONFDIR} .include diff --git a/x11/kde/i18n3/Makefile b/x11/kde/i18n3/Makefile index 8467fb2fc2b..eb395622fdd 100644 --- a/x11/kde/i18n3/Makefile +++ b/x11/kde/i18n3/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.47 2007/10/31 20:20:41 naddy Exp $ +# $OpenBSD: Makefile,v 1.48 2008/01/04 17:48:38 espie Exp $ LANGS= af ar az bg bn br bs ca cs csb cy da de el en_GB eo es et eu fa \ fi fr fy ga gl he hi hr hu is it ja kk km ko lt lv mk mn ms nb nds \ @@ -50,7 +50,6 @@ MODKDE_VERSION= CONFIGURE_STYLE=gnu MAKE_FLAGS+=MEINPROC= -FAKE_FLAGS=DESTDIR=${WRKINST} MEINPROC= CONFIGURE_ARGS+=-C DESCR=${PKGDIR}/DESCR diff --git a/x11/kde/libs3/Makefile b/x11/kde/libs3/Makefile index ccac51d3441..42c977ea02d 100644 --- a/x11/kde/libs3/Makefile +++ b/x11/kde/libs3/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.87 2007/12/18 16:00:12 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.88 2008/01/04 17:48:38 espie Exp $ COMMENT-main= K Desktop Environment, libraries COMMENT-cups= K Desktop Environment, cups support @@ -97,7 +97,7 @@ SEPARATE_BUILD= flavored SAMPLECONFDIR=${TRUEPREFIX}/share/apps/kde-conf-sample EXTRA_CONFIG=xdg/menus/applications.menu -FAKE_FLAGS=DESTDIR=${WRKINST} sysconfdir=${SAMPLECONFDIR} +FAKE_FLAGS= sysconfdir=${SAMPLECONFDIR} post-extract: cp ${FILESDIR}/krb5-config ${WRKDIR}/bin diff --git a/x11/kde/multimedia3/Makefile b/x11/kde/multimedia3/Makefile index 4e687138140..c0dc50f94cb 100644 --- a/x11/kde/multimedia3/Makefile +++ b/x11/kde/multimedia3/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.55 2007/12/15 23:47:41 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.56 2008/01/04 17:48:38 espie Exp $ COMMENT= K Desktop Environment, multimedia applications CATEGORIES= x11 x11/kde @@ -51,7 +51,7 @@ LIB_DEPENDS= DCOP,kdecore.>=6,kdefakes,kdefx,kdesu,kdeui,kio,khtml,kmid,kparts,k EXTRA_CONFIG= xdg/menus/applications-merged/kde-multimedia-music.menu SAMPLECONFDIR=${PREFIX}/share/apps/kde-conf-sample -FAKE_FLAGS=$(MAKE_FLAGS) DESTDIR=${WRKINST} sysconfdir=${SAMPLECONFDIR} +FAKE_FLAGS= sysconfdir=${SAMPLECONFDIR} RUN_DEPENDS=:xanim-*:graphics/xanim \ :desktop-file-utils-*:devel/desktop-file-utils SEPARATE_BUILD=flavored diff --git a/x11/kde/office-i18n3/Makefile b/x11/kde/office-i18n3/Makefile index 9eb795cd1fa..fe99f0d89a6 100644 --- a/x11/kde/office-i18n3/Makefile +++ b/x11/kde/office-i18n3/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.22 2007/09/15 20:04:21 merdely Exp $ +# $OpenBSD: Makefile,v 1.23 2008/01/04 17:48:38 espie Exp $ LANGS= ca cs cy da de el en_GB es et eu fi fr \ hu it ja lv ms nb nl pl pt pt_BR ru sk sl sr sr@Latn \ @@ -39,7 +39,6 @@ MODKDE_VERSION= CONFIGURE_STYLE=gnu MAKE_FLAGS+=MEINPROC= -FAKE_FLAGS=DESTDIR=${WRKINST} MEINPROC= CONFIGURE_ARGS+=-C DESCR=${PKGDIR}/DESCR diff --git a/x11/kde/office3/Makefile b/x11/kde/office3/Makefile index 2b3dfae566c..dd43879dac4 100644 --- a/x11/kde/office3/Makefile +++ b/x11/kde/office3/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.51 2007/12/15 23:47:41 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.52 2008/01/04 17:48:38 espie Exp $ COMMENT= office suite for KDE @@ -69,7 +69,7 @@ SHARED_LIBS += kchartimageexport 4.0 # .4.0 SHARED_LIBS += kwordexportfilters 2.0 # .1.1 SHARED_LIBS += kpresenterimageexport 4.0 # .4.0 -FAKE_FLAGS= ${MAKE_FLAGS} TAR=tar DESTDIR=${WRKINST} +FAKE_FLAGS= TAR=tar SEPARATE_BUILD= flavored diff --git a/x11/libdnd/Makefile b/x11/libdnd/Makefile index 18c2438f330..ae68e4f6dc7 100644 --- a/x11/libdnd/Makefile +++ b/x11/libdnd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2007/09/15 20:04:22 merdely Exp $ +# $OpenBSD: Makefile,v 1.14 2008/01/04 17:48:38 espie Exp $ COMMENT= drag and drop library @@ -22,7 +22,6 @@ USE_X11= Yes CONFIGURE_STYLE= gnu MAKE_FLAGS= LIBDnd_VERSION=${LIBDnd_VERSION} \ LIBDnd++_VERSION=${LIBDnd++_VERSION} -FAKE_FLAGS= ${DESTDIRNAME}=${WRKINST} ${MAKE_FLAGS} WRKDIST= ${WRKDIR}/DND WRKSRC= ${WRKDIST}/DNDlib diff --git a/x11/openmotif/Makefile b/x11/openmotif/Makefile index ef981606b11..b136a2e5888 100644 --- a/x11/openmotif/Makefile +++ b/x11/openmotif/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.33 2007/10/17 07:57:03 mbalmer Exp $ +# $OpenBSD: Makefile,v 1.34 2008/01/04 17:48:38 espie Exp $ COMMENT-main= Motif toolkit COMMENT-demos= Motif toolkit demos @@ -38,7 +38,6 @@ USE_LIBTOOL= Yes MAKE_FLAGS= SOMRMREV=${LIBMrm_VERSION} \ SOUILREV=${LIBUil_VERSION} \ SOXMREV=${LIBXm_VERSION} -FAKE_FLAGS= ${MAKE_FLAGS} ${DESTDIRNAME}=${WRKINST} pre-configure: # fix sections diff --git a/x11/p5-Gtk/Makefile b/x11/p5-Gtk/Makefile index 725760e536b..b4eea58b2d5 100644 --- a/x11/p5-Gtk/Makefile +++ b/x11/p5-Gtk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.24 2007/09/15 20:04:23 merdely Exp $ +# $OpenBSD: Makefile,v 1.25 2008/01/04 17:48:38 espie Exp $ SHARED_ONLY= Yes @@ -40,8 +40,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ MAKE_FLAGS= INST_MAN3DIR="../blib/man3p" PERLDIR= "${DESTDIR}/${PREFIX}/libdata/perl5/site_perl" -FAKE_FLAGS= ${MAKE_FLAGS} \ - INSTALLPRIVLIB="${PERLDIR}" \ +DESTDIRNAME= none +FAKE_FLAGS= INSTALLPRIVLIB="${PERLDIR}" \ INSTALLARCHLIB="${PERLDIR}/${MACHINE_ARCH}-openbsd" \ INSTALLSITELIB="${PERLDIR}" \ INSTALLSITEARCH="${PERLDIR}/${MACHINE_ARCH}-openbsd" \ diff --git a/x11/qt2/Makefile b/x11/qt2/Makefile index e0120a0b448..075cc75b5dc 100644 --- a/x11/qt2/Makefile +++ b/x11/qt2/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.60 2007/09/15 20:04:23 merdely Exp $ +# $OpenBSD: Makefile,v 1.61 2008/01/04 17:48:38 espie Exp $ # $FreeBSD: Makefile,v 1.33 1999/02/27 03:09:57 andreas Exp $ COMMENT-main= C++ X11 GUI toolkit @@ -37,7 +37,6 @@ MAKE_ENV= QTDIR="${WRKDIST}" EXTRA_SAMPLES="${EXTRA_SAMPLES}" \ SYS_CXX="${CXX}" SYS_CXXFLAGS="${CXXFLAGS} -I${X11BASE}/include/freetype2" \ LD_LIBRARY_PATH="${WRKDIST}/lib" MAKE_FLAGS= DESIGNER_SUBDIR=dummy LIBqt_VERSION=$(LIBqt_VERSION) -FAKE_FLAGS= $(MAKE_FLAGS) DESTDIR=$(WRKINST) CONFIGURE_STYLE= simple CONFIGURE_ARGS= -gif -system-libmng -system-libpng -system-jpeg \ diff --git a/x11/qt3/Makefile b/x11/qt3/Makefile index 8c7777ef8fc..6a10c1f2a91 100644 --- a/x11/qt3/Makefile +++ b/x11/qt3/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.83 2007/12/28 18:53:20 espie Exp $ +# $OpenBSD: Makefile,v 1.84 2008/01/04 17:48:38 espie Exp $ # $FreeBSD: Makefile,v 1.33 1999/02/27 03:09:57 andreas Exp $ COMMENT-main= C++ X11 GUI toolkit @@ -67,7 +67,6 @@ PORTHOME= ${WRKDIST} MAKE_FLAGS= DESIGNER_SUBDIR=dummy \ LIBqt-mt_VERSION=$(LIBqt-mt_VERSION) \ LIBqui_VERSION=$(LIBqui_VERSION) -FAKE_FLAGS= $(MAKE_FLAGS) DESTDIR=${WRKINST} CONFIGURE_STYLE= simple CONFIGURE_ARGS= -qt-gif -system-libmng -system-libpng -system-libjpeg -system-zlib \ diff --git a/x11/qt4/Makefile b/x11/qt4/Makefile index 70c989d22f7..075ace8505a 100644 --- a/x11/qt4/Makefile +++ b/x11/qt4/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.45 2007/12/11 08:00:06 jakemsr Exp $ +# $OpenBSD: Makefile,v 1.46 2008/01/04 17:48:38 espie Exp $ COMMENT-main= C++ X11 GUI toolkit COMMENT-examples= examples for qt4 @@ -201,7 +201,7 @@ MAKE_FLAGS+= INSTALL_PROGRAM='${INSTALL_PROGRAM}' \ MAKE_FLAGS+=LIB$l_VERSION=$v .endfor -FAKE_FLAGS=$(MAKE_FLAGS) INSTALL_ROOT=${WRKINST} +DESTDIRNAME= INSTALL_ROOT post-patch: perl -pi -e "s#!!CUPS_LIBS!!#`cups-config --libs`#" \ diff --git a/x11/qwt/Makefile b/x11/qwt/Makefile index c735ab4f5fd..8c806b99d6a 100644 --- a/x11/qwt/Makefile +++ b/x11/qwt/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2007/09/14 01:19:24 merdely Exp $ +# $OpenBSD: Makefile,v 1.2 2008/01/04 17:48:38 espie Exp $ SHARED_ONLY= Yes @@ -25,8 +25,6 @@ NO_REGRESS= Yes USE_GMAKE= Yes MAKE_FLAGS= LIBqwt_VERSION=${LIBqwt_VERSION} -FAKE_FLAGS= LIBqwt_VERSION=${LIBqwt_VERSION} \ - ${DESTDIRNAME}=${WRKINST} WANTLIB+= ICE SM X11 Xcursor Xext Xfixes Xi Xinerama Xrandr WANTLIB+= Xrender fontconfig freetype glib-2.0 gthread-2.0 iconv diff --git a/x11/slim/Makefile b/x11/slim/Makefile index d938cd1e13f..b305b7af3d6 100644 --- a/x11/slim/Makefile +++ b/x11/slim/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2007/12/30 10:46:49 landry Exp $ +# $OpenBSD: Makefile,v 1.4 2008/01/04 17:48:38 espie Exp $ COMMENT= simple login manager @@ -27,8 +27,7 @@ WANTLIB= X11 Xft Xmu Xrender fontconfig c m stdc++ z freetype MAKE_FILE= Makefile.openbsd MAKE_FLAGS+= CFGDIR=${SYSCONFDIR} FAKE_FLAGS+= PREFIX=${PREFIX} \ - CFGDIR=${PREFIX}/share/examples/slim \ - DESTDIR=${WRKINST} + CFGDIR=${PREFIX}/share/examples/slim pre-configure: perl -pi -e 's!/usr/!${PREFIX}/!' ${WRKSRC}/slim.1 diff --git a/x11/treewm/Makefile b/x11/treewm/Makefile index 5c365b034b3..3118f7015b5 100644 --- a/x11/treewm/Makefile +++ b/x11/treewm/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2007/09/15 20:04:25 merdely Exp $ +# $OpenBSD: Makefile,v 1.9 2008/01/04 17:48:38 espie Exp $ COMMENT= tree window manager DISTNAME= treewm-0.4.5 @@ -26,8 +26,8 @@ MAKE_FLAGS= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \ LIBS="-L${X11BASE}/lib -lXxf86vm -lXpm -lXext -lX11" \ INCLUDES="-I${X11BASE}/include" -FAKE_FLAGS= ROOT="${DESTDIR}" \ - DOCFILES="ChangeLog PROBLEMS README README.tiling" +DESTDIRNAME= ROOT +FAKE_FLAGS= DOCFILES="ChangeLog PROBLEMS README README.tiling" NO_REGRESS= Yes diff --git a/x11/wm2/Makefile b/x11/wm2/Makefile index 53787694f09..7f0a4693213 100644 --- a/x11/wm2/Makefile +++ b/x11/wm2/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2007/09/15 20:04:25 merdely Exp $ +# $OpenBSD: Makefile,v 1.8 2008/01/04 17:48:38 espie Exp $ COMMENT= stylish window manager @@ -17,7 +17,7 @@ WANTLIB= X11 Xext Xau Xdmcp c m stdc++ MASTER_SITES= http://www.all-day-breakfast.com/wm2/ -FAKE_FLAGS= PREFIX="${PREFIX}" DESTDIRNAME=${WRKINST} +FAKE_FLAGS= PREFIX="${PREFIX}" USE_X11= Yes diff --git a/x11/wmtheme/Makefile b/x11/wmtheme/Makefile index 66d3531fc8e..3e2b6f2ad93 100644 --- a/x11/wmtheme/Makefile +++ b/x11/wmtheme/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.17 2007/09/15 20:04:25 merdely Exp $ +# $OpenBSD: Makefile,v 1.18 2008/01/04 17:48:38 espie Exp $ COMMENT= window manager theme utility @@ -23,7 +23,7 @@ USE_GMAKE= Yes USE_X11= Yes EXTRA_THEMES= gotheme ortheme -FAKE_FLAGS+= prefix=${PREFIX} DESTDIR=${WRKINST} +FAKE_FLAGS+= prefix=${PREFIX} post-install: .for i in ${EXTRA_THEMES} diff --git a/x11/wxWidgets/Makefile b/x11/wxWidgets/Makefile index 192434e4193..55e978efe69 100644 --- a/x11/wxWidgets/Makefile +++ b/x11/wxWidgets/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2007/11/24 08:05:56 winiger Exp $ +# $OpenBSD: Makefile,v 1.10 2008/01/04 17:48:38 espie Exp $ SHARED_ONLY= Yes @@ -78,7 +78,5 @@ MAKE_ENV+= LIB${_l}_VERSION=${_v} .endfor MAKE_FLAGS= WXUNICODEFLAG="" -FAKE_FLAGS= ${DESTDIRNAME}=${WRKINST} -FAKE_FLAGS+= WXUNICODEFLAG="" .include diff --git a/x11/xforms/Makefile b/x11/xforms/Makefile index 20873836f02..5a3290015a5 100644 --- a/x11/xforms/Makefile +++ b/x11/xforms/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.32 2007/09/15 20:04:27 merdely Exp $ +# $OpenBSD: Makefile,v 1.33 2008/01/04 17:48:38 espie Exp $ COMMENT= GUI toolkit for X11 @@ -24,7 +24,6 @@ CONFIGURE_STYLE= imake MAKE_FLAGS= LIBflimage_VERSION=${LIBflimage_VERSION} \ LIBforms_VERSION=${LIBforms_VERSION} \ LIBformsGL_VERSION=${LIBformsGL_VERSION} -FAKE_FLAGS= ${DESTNAMEDIR}=${WRKINST} ${MAKE_FLAGS} BUILD_DEPENDS= ::graphics/jpeg diff --git a/x11/xview/lib/Makefile b/x11/xview/lib/Makefile index f8c22387f59..64fe7f00031 100644 --- a/x11/xview/lib/Makefile +++ b/x11/xview/lib/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.18 2007/09/15 20:04:29 merdely Exp $ +# $OpenBSD: Makefile,v 1.19 2008/01/04 17:48:38 espie Exp $ COMMENT= OpenLook Toolkit libs, includes, and man pages @@ -17,7 +17,6 @@ CONFIGURE_STYLE=imake MAKE_ENV= IMAKEINCLUDE=-I${LOCALBASE}/lib/X11/config MAKE_FLAGS= SOOLGXREV=${LIBolgx_VERSION} \ SOXVIEWREV=${LIBxview_VERSION} -FAKE_FLAGS= ${DESTDIRNAME}=${WRKINST} ${MAKE_FLAGS} NO_REGRESS= Yes