diff options
35 files changed, 22 insertions, 52 deletions
diff --git a/archivers/liblzxcomp/Makefile b/archivers/liblzxcomp/Makefile index 3669cf5b7097..b1e809f57ab6 100644 --- a/archivers/liblzxcomp/Makefile +++ b/archivers/liblzxcomp/Makefile @@ -14,8 +14,6 @@ DISTNAME= lzx_compress MAINTAINER= skv@FreeBSD.org COMMENT= LZX compression library -MAKE_ENV= PREFIX=${PREFIX} - USE_LDCONFIG= YES SHLIB_MAJOR= 1 PLIST_SUB= SHLIB_MAJOR="${SHLIB_MAJOR}" diff --git a/archivers/libunrar/Makefile b/archivers/libunrar/Makefile index 1178ddc760e6..197e4ba396f6 100644 --- a/archivers/libunrar/Makefile +++ b/archivers/libunrar/Makefile @@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/unrar USE_GMAKE= yes MAKEFILE= makefile.unix -MAKE_ENV+= CXX="${CXX}" LDFLAGS="${LDFLAGS}" +MAKE_ENV= LDFLAGS="${LDFLAGS}" ALL_TARGET= lib USE_LDCONFIG= yes diff --git a/archivers/lzma/Makefile b/archivers/lzma/Makefile index 91baa82b8c61..fc12f445c750 100644 --- a/archivers/lzma/Makefile +++ b/archivers/lzma/Makefile @@ -24,7 +24,6 @@ BUILD_WRKSRC= ${WRKSRC}/CPP/7zip/Compress/LZMA_Alone MAKEFILE= makefile.gcc PLIST_FILES= bin/${PORTNAME} CFLAGS+= -D_LZMA_SYSTEM_SIZE_T -MAKE_ENV+= CXX="${CXX}" CC="${CC}" PORTDOCS= 7zC.txt 7zFormat.txt Methods.txt history.txt lzma.txt post-patch: diff --git a/archivers/tclmkziplib/Makefile b/archivers/tclmkziplib/Makefile index d69af3c04916..1a2f0049640f 100644 --- a/archivers/tclmkziplib/Makefile +++ b/archivers/tclmkziplib/Makefile @@ -25,8 +25,7 @@ USE_ZIP= yes TCLCONFIG?= ${LOCALBASE}/lib/tcl${TCL_VER}/tclConfig.sh MAKEFILE= ${FILESDIR}/Makefile.bsd -MAKE_ENV= LOCALBASE=${LOCALBASE} \ - VERSION=${PORTVERSION:S/.//} \ +MAKE_ENV= VERSION=${PORTVERSION:S/.//} \ TCLCONFIG=${TCLCONFIG} PLIST_SUB+= VERSION=${PORTVERSION:S/.//} diff --git a/archivers/unmass/Makefile b/archivers/unmass/Makefile index c585b4fef017..ea11e4b83e07 100644 --- a/archivers/unmass/Makefile +++ b/archivers/unmass/Makefile @@ -18,8 +18,6 @@ GNU_CONFIGURE= yes USE_GMAKE= yes USE_DOS2UNIX= yes -MAKE_ENV+= CXX="${CXX}" - WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/kdev PLIST_FILES= bin/unmass diff --git a/archivers/unzip/Makefile b/archivers/unzip/Makefile index 536a58c1b563..005c268abc23 100644 --- a/archivers/unzip/Makefile +++ b/archivers/unzip/Makefile @@ -31,7 +31,7 @@ EXTRACT_ONLY= ${PORTNAME}552.tar.gz LOCAL_UNZIP+= -DUSE_SMITH_CODE .endif -MAKE_ENV= CC="${CC}" LOCAL_UNZIP="${LOCAL_UNZIP}" +MAKE_ENV= LOCAL_UNZIP="${LOCAL_UNZIP}" .ifdef USE_UNZIP .error You have `USE_UNZIP' variable defined either in environment or in make(1) arguments. Please undefine and try again. diff --git a/archivers/zip/Makefile b/archivers/zip/Makefile index 9ebdc93230fe..8716674ab43f 100644 --- a/archivers/zip/Makefile +++ b/archivers/zip/Makefile @@ -17,7 +17,6 @@ COMMENT= Create/update ZIP files compatible with pkzip WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} MAKEFILE= unix/Makefile -MAKE_ENV+= CC="${CC}" ALL_TARGET= generic MAN1= zip.1 diff --git a/audio/audacious-dumb/Makefile b/audio/audacious-dumb/Makefile index ac6420cbb40d..c77cd43103ad 100644 --- a/audio/audacious-dumb/Makefile +++ b/audio/audacious-dumb/Makefile @@ -22,6 +22,4 @@ BUILD_DEPENDS= audacious:${PORTSDIR}/multimedia/audacious \ USE_GMAKE= yes USE_LDCONFIG= yes -MAKE_ENV+= CC="${CC}" LOCALBASE="${LOCALBASE}" - .include <bsd.port.mk> diff --git a/audio/dumb/Makefile b/audio/dumb/Makefile index dfab9fe86a51..6ad8459ef2b4 100644 --- a/audio/dumb/Makefile +++ b/audio/dumb/Makefile @@ -31,8 +31,6 @@ MAKE_ARGS= _PORT_ALLEGRO_CFLAGS= CFLAGS+= -fPIC .endif -MAKE_ENV+= CC="${CC}" - pre-configure: @${CP} ${FILESDIR}/config.txt ${WRKSRC}/make @${REINPLACE_CMD} -e "s,@LOCALBASE@,${LOCALBASE}," ${WRKSRC}/make/config.txt diff --git a/audio/espeak/Makefile b/audio/espeak/Makefile index 4efa48785a8b..22bc40b0e90a 100644 --- a/audio/espeak/Makefile +++ b/audio/espeak/Makefile @@ -20,7 +20,7 @@ CONFLICTS= speak-1.[0-9] MAKE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" CPPFLAGS="${CPPFLAGS}" \ - LDFLAGS="${LDFLAGS}" CXX="${CXX}" + LDFLAGS="${LDFLAGS}" USE_GMAKE= yes USE_LDCONFIG= yes diff --git a/audio/festival+OGI/Makefile b/audio/festival+OGI/Makefile index a626e07cff56..d24c8fa50c8c 100644 --- a/audio/festival+OGI/Makefile +++ b/audio/festival+OGI/Makefile @@ -41,9 +41,7 @@ MAKE_ENV+= PKG_EST_HOME=${SPEECHTOOLS} \ PKG_LOCALBASE=${LOCALBASE} \ PKG_PREFIX=${PREFIX} \ GCC27_CC="${CC}" \ - GCC27_CXX="${CXX}" \ - CC="${CC}" \ - CXX="${CXX}" + GCC27_CXX="${CXX}" MAN1= festival.1 festival_client.1 USE_GCC= 2.95 USE_GMAKE= yes diff --git a/audio/festival/Makefile b/audio/festival/Makefile index 00d0fe76b575..eda28733fd08 100644 --- a/audio/festival/Makefile +++ b/audio/festival/Makefile @@ -32,9 +32,7 @@ MAKE_ENV+= GCC="${CC}" \ GXX="${CXX}" \ EST_HOME=${SPEECHTOOLS} \ EGCS_CC="${CC}" \ - EGCS_CXX="${CXX}" \ - CC="${CC}" \ - CXX="${CXX}" + EGCS_CXX="${CXX}" MAN1= festival.1 festival_client.1 WRKSRC= ${WRKDIR} diff --git a/audio/gkrellmvolume2/Makefile b/audio/gkrellmvolume2/Makefile index 0c69a97c18af..100df1033b0f 100644 --- a/audio/gkrellmvolume2/Makefile +++ b/audio/gkrellmvolume2/Makefile @@ -34,6 +34,6 @@ USE_GMAKE= yes MAKE_ENV+= PLUGIN_DIR=${PREFIX}/libexec/gkrellm2/plugins \ LOCALEDIR=${PREFIX}/share/locale \ - enable_nls=1 CC="${CC}" + enable_nls=1 .include <bsd.port.mk> diff --git a/audio/hawkvoice/Makefile b/audio/hawkvoice/Makefile index 6963e30f8ff1..dab21d034813 100644 --- a/audio/hawkvoice/Makefile +++ b/audio/hawkvoice/Makefile @@ -22,8 +22,7 @@ USE_LDCONFIG= yes LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} CPPFLAGS= -I${LOCALBASE}/include -MAKE_ENV= CC="${CC}" CFLAGS="${CFLAGS} ${OPTFLAGS}" \ - LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" \ +MAKE_ENV= LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" \ MAKE="${GMAKE}" WRKSRC= ${WRKDIR}/HawkVoiceDI/src diff --git a/audio/libmikmod/Makefile b/audio/libmikmod/Makefile index 63c3953e0630..f1f55bbdcf50 100644 --- a/audio/libmikmod/Makefile +++ b/audio/libmikmod/Makefile @@ -24,7 +24,6 @@ USE_GNOME= gnometarget lthack USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= MAKEINFO="makeinfo --no-split" -MAKE_ENV= SHELL=/bin/sh USE_LDCONFIG= yes MAN1= libmikmod-config.1 diff --git a/audio/libmodplug/Makefile b/audio/libmodplug/Makefile index d0fc0dd4a972..92c582f807b4 100644 --- a/audio/libmodplug/Makefile +++ b/audio/libmodplug/Makefile @@ -19,8 +19,6 @@ USE_GMAKE= yes USE_GNOME= pkgconfig GNU_CONFIGURE= yes -MAKE_ENV+= CXX="${CXX}" - post-patch: @${REINPLACE_CMD} -e '/^CXXFLAGS=/d' \ ${WRKSRC}/configure diff --git a/audio/pocketsphinx/Makefile b/audio/pocketsphinx/Makefile index 635dd8446632..a73994f9619a 100644 --- a/audio/pocketsphinx/Makefile +++ b/audio/pocketsphinx/Makefile @@ -24,8 +24,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/sphinxbas LDFLAGS="-L${LOCALBASE}/lib" MAKE_ENV= MKDIR="${MKDIR}" \ - OSVERSION=${OSVERSION} \ - CXX="${CXX}" + OSVERSION=${OSVERSION} post-patch: @${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' ${WRKSRC}/Makefile.in diff --git a/audio/py-xmms/Makefile b/audio/py-xmms/Makefile index 71e00f93fe30..3529bcc6d04f 100644 --- a/audio/py-xmms/Makefile +++ b/audio/py-xmms/Makefile @@ -25,6 +25,6 @@ PYDISTUTILS_PKGNAME= pyxmms USE_BZIP2= yes USE_GNOME= glib12 XMMS_CONFIG?= ${LOCALBASE}/bin/xmms-config -MAKE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" XMMS_CONFIG="${XMMS_CONFIG}" +MAKE_ENV= XMMS_CONFIG="${XMMS_CONFIG}" .include <bsd.port.mk> diff --git a/audio/quelcom/Makefile b/audio/quelcom/Makefile index 806d8de32ce5..b3ac58cb7af0 100644 --- a/audio/quelcom/Makefile +++ b/audio/quelcom/Makefile @@ -18,7 +18,7 @@ USE_GCC= 3.3 USE_GETTEXT= yes USE_GMAKE= yes MAKEFILE= makefile -MAKE_ENV= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" +MAKE_ENV= LDFLAGS="${LDFLAGS}" USE_LDCONFIG= yes CXXFLAGS+= -I../lib -I${LOCALBASE}/include ${CPPFLAGS} \ diff --git a/audio/sphinx3/Makefile b/audio/sphinx3/Makefile index ff42b39f30ce..0071c4f3f370 100644 --- a/audio/sphinx3/Makefile +++ b/audio/sphinx3/Makefile @@ -24,8 +24,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/sphinxbas LDFLAGS="-L${LOCALBASE}/lib" MAKE_ENV= MKDIR="${MKDIR}" \ - OSVERSION=${OSVERSION} \ - CXX="${CXX}" + OSVERSION=${OSVERSION} post-patch: @${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' ${WRKSRC}/Makefile.in diff --git a/audio/sphinxbase/Makefile b/audio/sphinxbase/Makefile index 52e571c02346..0cb09061b8ef 100644 --- a/audio/sphinxbase/Makefile +++ b/audio/sphinxbase/Makefile @@ -23,8 +23,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" MAKE_ENV= MKDIR="${MKDIR}" \ - OSVERSION=${OSVERSION} \ - CXX="${CXX}" + OSVERSION=${OSVERSION} post-patch: @${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' ${WRKSRC}/Makefile.am diff --git a/audio/xmms-sndstretch/Makefile b/audio/xmms-sndstretch/Makefile index f218c49a91aa..f9bf409df805 100644 --- a/audio/xmms-sndstretch/Makefile +++ b/audio/xmms-sndstretch/Makefile @@ -22,7 +22,7 @@ WRKSRC= ${WRKDIR}/sndstretch_xmms USE_GNOME= gtk12 USE_GMAKE= yes -MAKE_ENV+= GTK_CONFIG="${GTK_CONFIG}" PTHREAD_LIBS=${PTHREAD_LIBS} +MAKE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS} post-extract: (cd ${WRKSRC}; ${MAKE} clean) diff --git a/audio/xmmsctrl/Makefile b/audio/xmmsctrl/Makefile index 56ff3c9649bf..643b0211462c 100644 --- a/audio/xmmsctrl/Makefile +++ b/audio/xmmsctrl/Makefile @@ -21,7 +21,7 @@ BUILD_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms USE_GMAKE= yes -MAKE_ENV= CC="${CC}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ +MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" PORTDOCS= Changelog README diff --git a/biology/genpak/Makefile b/biology/genpak/Makefile index 3ac7d7c088f2..980d303ab270 100644 --- a/biology/genpak/Makefile +++ b/biology/genpak/Makefile @@ -20,7 +20,7 @@ COMMENT= A set of small utilities to manipulate DNA sequences LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd USE_GMAKE= yes -MAKE_ENV= GMAKE="${GMAKE}" MANPREFIX="${MANPREFIX}" +MAKE_ENV= GMAKE="${GMAKE}" MAN1= Genpak.1 gp_acc.1 gp_adjust.1 gp_cdndev.1 gp_cusage.1 gp_digest.1 \ gp_dimer.1 gp_findorf.1 gp_gc.1 gp_getseq.1 gp_matrix.1 gp_mkmtx.1 \ diff --git a/biology/lagan/Makefile b/biology/lagan/Makefile index fdec41b76a0d..ec064efb99b2 100644 --- a/biology/lagan/Makefile +++ b/biology/lagan/Makefile @@ -27,7 +27,8 @@ EXEUTILS= Glue bin2bl bin2mf cextract contigorder cstat dotplot fa2xfa \ SCRIPTUTILS= cmerge2.pl draft.pl mextract.pl mf2bin.pl mpretty.pl \ mproject.pl mrun.pl mrunfile.pl mrunpairs.pl mviz.pl -MAKE_ENV+= CC="${CC} ${CFLAGS}" CPP="${CXX} ${CXXFLAGS}" +CC:= ${CC} ${CFLAGS} +MAKE_ENV+= CPP="${CXX} ${CXXFLAGS}" post-patch: @${REINPLACE_CMD} -E 's,^(CC|CPP) =,\1 ?=,g' \ diff --git a/biology/mopac/Makefile b/biology/mopac/Makefile index 6a48c12db050..c265948bce5f 100644 --- a/biology/mopac/Makefile +++ b/biology/mopac/Makefile @@ -25,7 +25,8 @@ WRKSRC= ${WRKDIR}/mopac7-${MOPAC_SUBVERSION} GNU_CONFIGURE= yes USE_GMAKE= yes CONFIGURE_ENV+= CFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" -MAKE_ENV+= CFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" +MAKE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" +CFLAGS+= -I${LOCALBASE}/include post-patch: @${REINPLACE_CMD} -e \ diff --git a/cad/alliance/Makefile b/cad/alliance/Makefile index 7395740d520c..0ddb53227d06 100644 --- a/cad/alliance/Makefile +++ b/cad/alliance/Makefile @@ -38,7 +38,7 @@ SRCDIRLIST!= ${CAT} ${FILESDIR}/srcdirs.list CFLAGS+= ${SRCDIRLIST:S,^,-I${WRKSRC}/,} LDFLAGS+= ${SRCDIRLIST:S,^,-L${WRKSRC}/,} CONFIGURE_ENV+= CFLAGS="${CFLAGS}" CPPFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" -MAKE_ENV+= CFLAGS="${CFLAGS}" CPPFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" +MAKE_ENV+= CPPFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" MAN1= MBK_CATAL_NAME.1 MBK_CATA_LIB.1 MBK_FILTER_SFX.1 MBK_IN_FILTER.1 \ MBK_IN_LO.1 MBK_IN_PH.1 MBK_OUT_FILTER.1 MBK_OUT_LO.1 MBK_OUT_PH.1 \ diff --git a/cad/cider/Makefile b/cad/cider/Makefile index 726fddabbd76..3367cc2400ca 100644 --- a/cad/cider/Makefile +++ b/cad/cider/Makefile @@ -24,8 +24,6 @@ MAN5= mfbcap.5 MLINKS= spice.1 spice3.1 USE_XORG= xt xaw xmu -MAKE_ENV+= CC="${CC}" - pre-patch: @${CP} -f ${WRKSRC}/spice/common/lib/helpdir/spice.txt ${WRKSRC}/cider/common/lib/helpdir/spice.txt diff --git a/cad/leocad/Makefile b/cad/leocad/Makefile index a22dedecca91..696d14a51198 100644 --- a/cad/leocad/Makefile +++ b/cad/leocad/Makefile @@ -26,8 +26,6 @@ USE_XORG= x11 USE_GMAKE= yes USE_GNOME= gtk12 -MAKE_ENV+= CXX=${CXX} - .include <bsd.port.pre.mk> .if ${OSVERSION} < 600000 diff --git a/comms/aldo/Makefile b/comms/aldo/Makefile index 221e2c39a859..8193e55e6f5d 100644 --- a/comms/aldo/Makefile +++ b/comms/aldo/Makefile @@ -23,7 +23,6 @@ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --includedir="${LOCALBASE}/include" \ --libdir="${LOCALBASE}/lib" USE_GMAKE= yes -MAKE_ENV= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" PLIST_FILES= bin/aldo MAN1= aldo.1 diff --git a/comms/fldigi/Makefile b/comms/fldigi/Makefile index e711b4e846e2..3312d5c9d9ae 100644 --- a/comms/fldigi/Makefile +++ b/comms/fldigi/Makefile @@ -25,7 +25,6 @@ LIB_DEPENDS= fltk:${PORTSDIR}/x11-toolkits/fltk-threads \ USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -MAKE_ENV+= CXX="${CXX}" .include <bsd.port.pre.mk> .if ${ARCH} == "amd64" && ${OSVERSION} < 700000 diff --git a/comms/geoid/Makefile b/comms/geoid/Makefile index d28f72f894d9..15285943b417 100644 --- a/comms/geoid/Makefile +++ b/comms/geoid/Makefile @@ -24,7 +24,6 @@ LIB_DEPENDS= fltk:${PORTSDIR}/x11-toolkits/fltk-threads USE_GMAKE= yes MAKEFILE= makefile -MAKE_ENV+= CXX="${CXX}" PLIST_FILES= bin/geoid ${DATADIR_REL}/country.pos share/pixmaps/geoid.png PLIST_DIRS= ${DATADIR_REL} diff --git a/comms/gkermit/Makefile b/comms/gkermit/Makefile index ba51cec62a28..e7fb0863adba 100644 --- a/comms/gkermit/Makefile +++ b/comms/gkermit/Makefile @@ -18,7 +18,6 @@ NO_WRKSUBDIR= yes MAN1= gkermit.1 ALL_TARGET= posix -MAKE_ENV= CC="${CC}" GKERMIT_DOCDIR= ${PREFIX}/share/doc/gkermit diff --git a/comms/py-lirc/Makefile b/comms/py-lirc/Makefile index c150164fe7c5..57d2169d1034 100644 --- a/comms/py-lirc/Makefile +++ b/comms/py-lirc/Makefile @@ -22,7 +22,7 @@ LIB_DEPENDS= lirc_client.1:${PORTSDIR}/comms/lirc CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -MAKE_ENV= LDFLAGS="${LDFLAGS}" CFLAGS="${CFLAGS}" +MAKE_ENV= LDFLAGS="${LDFLAGS}" PLIST_FILES= %%PYTHON_SITELIBDIR%%/pylircmodule.so USE_PYTHON= yes diff --git a/comms/uird/Makefile b/comms/uird/Makefile index b1fe35fafa14..aa38dd8023e4 100644 --- a/comms/uird/Makefile +++ b/comms/uird/Makefile @@ -18,8 +18,6 @@ COMMENT= The Universal IR Receiver Daemon USE_GMAKE= yes USE_PERL5= yes -MAKE_ENV+= CC="${CC}" - WRKSRC= ${WRKDIR}/${PORTNAME} ALL_TARGET= ${PORTNAME} |