diff options
| author | Pav Lucistnik <pav@FreeBSD.org> | 2008-07-25 12:24:09 +0000 |
|---|---|---|
| committer | Pav Lucistnik <pav@FreeBSD.org> | 2008-07-25 12:24:09 +0000 |
| commit | fa38ed02cc7ff1a59528f13db1b7dedc130b2def (patch) | |
| tree | 94158659da258abce4ed96928351a7282233e421 | |
| parent | - Enhance next/prev commands. Next on last track jumps to first track. Prev (diff) | |
- Remove duplicates from MAKE_ENV after inclusion of CC and CXX in default MAKE_ENV
Notes
Notes:
svn path=/head/; revision=217477
135 files changed, 95 insertions, 201 deletions
diff --git a/games/blobandconquer/Makefile b/games/blobandconquer/Makefile index 01b5cc145f85..d0a86e5d1d43 100644 --- a/games/blobandconquer/Makefile +++ b/games/blobandconquer/Makefile @@ -30,7 +30,7 @@ WRKSRC= ${WRKDIR}/blobAndConquer-${DISTVERSION:C/^([0-9]\.[0-9][0-9]).*/\1/} PORTDOCS= * MAKEFILE= makefile -MAKE_ENV= CXX="${CXX}" DATADIR="${DATADIR}" DOCSDIR="${DOCSDIR}" +MAKE_ENV= DATADIR="${DATADIR}" DOCSDIR="${DOCSDIR}" post-build: @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} buildpak) diff --git a/games/bloboats/Makefile b/games/bloboats/Makefile index f2034da00ffb..d513a2dc96b7 100644 --- a/games/bloboats/Makefile +++ b/games/bloboats/Makefile @@ -21,7 +21,7 @@ USE_GMAKE= yes USE_SDL= mixer image net sdl USE_GL= yes -MAKE_ENV+= CXX="${CXX}" DATADIR="${DATADIR}" +MAKE_ENV+= DATADIR="${DATADIR}" post-patch: @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/Makefile diff --git a/games/blobwars/Makefile b/games/blobwars/Makefile index 6b5ec066adc6..aa0aea8de887 100644 --- a/games/blobwars/Makefile +++ b/games/blobwars/Makefile @@ -16,7 +16,6 @@ MAINTAINER= lorenl@north-winds.org COMMENT= You are the fearless Blob agent, Bob MAKEFILE= makefile -MAKE_ENV= CXX="${CXX}" USE_SDL= sdl image mixer ttf USE_GMAKE= yes diff --git a/games/bloodfrontier/Makefile b/games/bloodfrontier/Makefile index 5416931229d8..d671f6a49d8d 100644 --- a/games/bloodfrontier/Makefile +++ b/games/bloodfrontier/Makefile @@ -20,7 +20,6 @@ USE_BZIP2= yes CONFIGURE_ENV= ACLOCAL=true AUTOCONF=true AUTOMAKE=true CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_WRKSRC= ${WRKSRC}/src/enet -MAKE_ENV+= CXX="${CXX}" BUILD_WRKSRC= ${WRKSRC}/src WRKSRC= ${WRKDIR}/${PORTNAME} ALL_TARGET= libenet diff --git a/games/bugsquish/Makefile b/games/bugsquish/Makefile index bae3a6eb4a4e..bd0a71bc51b7 100644 --- a/games/bugsquish/Makefile +++ b/games/bugsquish/Makefile @@ -16,7 +16,6 @@ COMMENT= Bug-squishing, fly-swatting action USE_SDL= mixer image USE_GMAKE= yes -MAKE_ENV= SDL_CONFIG="${SDL_CONFIG}" do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin diff --git a/games/connectfive/Makefile b/games/connectfive/Makefile index a5a82b0cf463..7869f625347e 100644 --- a/games/connectfive/Makefile +++ b/games/connectfive/Makefile @@ -16,9 +16,8 @@ MAINTAINER= amdmi3@FreeBSD.org COMMENT= Place five pieces in a row on a 3d board MAKEFILE= Makefile.linux -MAKE_ENV= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \ - CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +MAKE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" ALL_TARGET= default USE_SDL= sdl diff --git a/games/cube/Makefile b/games/cube/Makefile index 359ab1b9cc6e..70e892265269 100644 --- a/games/cube/Makefile +++ b/games/cube/Makefile @@ -23,7 +23,6 @@ USE_ZIP= yes USE_DOS2UNIX= yes USE_GMAKE= yes WRKSRC= ${WRKDIR}/${PORTNAME}_source/src -MAKE_ENV+= CXX="${CXX}" CFLAGS+= -fsigned-char ALL_TARGET= #empty diff --git a/games/dangerdeep/Makefile b/games/dangerdeep/Makefile index 38a6ba8fa736..88bee8337ccc 100644 --- a/games/dangerdeep/Makefile +++ b/games/dangerdeep/Makefile @@ -24,7 +24,6 @@ RUN_DEPENDS= ${LOCALBASE}/share/${PORTNAME}/maps/default.xml:${PORTSDIR}/games/d USE_GL= yes USE_SDL= sdl mixer image net -MAKE_ENV= CC="${CC}" CXX="${CXX}" SCONS_ARGS= installbindir=${PREFIX}/bin installdatadir=${DATADIR} PLIST_FILES= bin/dangerdeep bin/crosssection bin/damagemodel \ diff --git a/games/djgame2/Makefile b/games/djgame2/Makefile index 4c3aef9bdbd8..611d28db55b8 100644 --- a/games/djgame2/Makefile +++ b/games/djgame2/Makefile @@ -23,7 +23,6 @@ QT_COMPONENTS= gui qt3support qmake_build uic_build rcc_build moc_build svg QMAKE?= qmake-qt4 QMAKESPEC?= ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ -MAKE_ENV= QMAKESPEC="{QMAKESPEC}" WRKSRC= ${WRKDIR}/${DISTNAME} DATADIR= ${PREFIX}/share/djgame2 diff --git a/games/f1spirit-remake/Makefile b/games/f1spirit-remake/Makefile index a858a6bb0d96..4ec9ffcf1795 100644 --- a/games/f1spirit-remake/Makefile +++ b/games/f1spirit-remake/Makefile @@ -22,7 +22,6 @@ USE_ZIP= yes USE_GMAKE= yes USE_SDL= sdl net image mixer sound USE_GL= gl glu -MAKE_ENV= CXX="${CXX}" WRKSRC= "${WRKDIR}/F-1 Spirit" BUILD_WRKSRC= ${WRKSRC}/sources diff --git a/games/falconseye/Makefile b/games/falconseye/Makefile index a02d4c0be277..a898c8589060 100644 --- a/games/falconseye/Makefile +++ b/games/falconseye/Makefile @@ -24,7 +24,7 @@ USE_SDL= sdl USE_PERL5_BUILD=yes USE_ZIP= yes USE_XORG= x11 xpm xaw -MAKE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib -I${LOCALBASE}/include/SDL11" PREFIX="${PREFIX}" +CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib -I${LOCALBASE}/include/SDL11 WRKSRC= ${WRKDIR} post-patch: diff --git a/games/filters/Makefile b/games/filters/Makefile index 431dc1c9dc87..d3ce7a090252 100644 --- a/games/filters/Makefile +++ b/games/filters/Makefile @@ -22,8 +22,6 @@ USE_GMAKE= yes WRKSRC= ${WRKDIR}/${PORTNAME} -MAKE_ENV+= CC="${CC}" - PERLFILTERS= b1ff censor chef eleet fudd jibberish kenny pirate rasterman \ spammer studly uniencode upside-down CFILTERS= jethro kraut cockney jive nyc ken ky00te newspeak nethackify diff --git a/games/gemdropx/Makefile b/games/gemdropx/Makefile index 5b0761e62b0e..ea6f5df78695 100644 --- a/games/gemdropx/Makefile +++ b/games/gemdropx/Makefile @@ -16,8 +16,7 @@ COMMENT= An interesting one-player puzzle game for X USE_SDL= mixer USE_GMAKE= yes -MAKE_ENV= JOY=NO \ - SDL_CONFIG="${SDL_CONFIG}" +MAKE_ENV= JOY=NO do-install: ${INSTALL_PROGRAM} ${WRKSRC}/gemdropx ${PREFIX}/bin diff --git a/games/gnudoku/Makefile b/games/gnudoku/Makefile index 0a920f70b443..f6a2c0193fa9 100644 --- a/games/gnudoku/Makefile +++ b/games/gnudoku/Makefile @@ -18,8 +18,7 @@ COMMENT= A free program for creating and solving Su Doku puzzles LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 USE_GMAKE= yes -MAKE_ENV= CXX="${CXX}" CXXLAGS="${CXXFLAGS}" -USE_GCC= 3.4+ +MAKE_ENV= CXXLAGS="${CXXFLAGS}" post-patch: @${REINPLACE_CMD} -e 's|PREFIX=|PREFIX?=|' ${WRKSRC}/Makefile diff --git a/games/icebreaker/Makefile b/games/icebreaker/Makefile index 33448dc031f5..e64a6d8f70fb 100644 --- a/games/icebreaker/Makefile +++ b/games/icebreaker/Makefile @@ -22,8 +22,7 @@ MAKE_ENV+= prefix="${PREFIX}" \ mandir="${MANPREFIX}/man" \ CHMOD="${CHMOD}" \ CHOWN="${CHOWN}" \ - MKDIR="${MKDIR}" \ - CC="${CC}" + MKDIR="${MKDIR}" MAN6= ${PORTNAME}.6 diff --git a/games/jigzo/Makefile b/games/jigzo/Makefile index e2c22f9ba788..a341305070d0 100644 --- a/games/jigzo/Makefile +++ b/games/jigzo/Makefile @@ -22,7 +22,6 @@ USE_SDL= sdl mixer USE_GL= gl USE_GMAKE= yes -MAKE_ENV= CXX="${CXX}" PORTDOCS= * post-patch: diff --git a/games/kiki/Makefile b/games/kiki/Makefile index 9e8d276f742f..fe35b86d2bfa 100644 --- a/games/kiki/Makefile +++ b/games/kiki/Makefile @@ -24,8 +24,6 @@ USE_GL= gl USE_SDL= sdl mixer image USE_DOS2UNIX= kodilib/linux/Makefile src/main/KikiController.cpp linux/Makefile kodilib/src/types/KVector.h src/main/KikiPythonWidget.h -MAKE_ENV= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" - WRKSRC= ${WRKDIR}/kiki post-patch: diff --git a/games/marsnomercy/Makefile b/games/marsnomercy/Makefile index d2161b90cf59..586be49a9e76 100644 --- a/games/marsnomercy/Makefile +++ b/games/marsnomercy/Makefile @@ -20,7 +20,6 @@ BUILD_DEPENDS= scons:${PORTSDIR}/devel/scons USE_GL= gl USE_SDL= sdl image ttf -MAKE_ENV= CC="${CC}" CXX="${CXX}" SCONS_ARGS= prefix=${PREFIX} PLIST= ${WRKDIR}/pkg-plist diff --git a/games/nethack33/Makefile b/games/nethack33/Makefile index 7000f5f8dce1..f1065a5b9152 100644 --- a/games/nethack33/Makefile +++ b/games/nethack33/Makefile @@ -21,7 +21,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} LATEST_LINK= nethack33${PKGNAMESUFFIX} USE_GMAKE= yes -MAKE_ENV= CXX="${CXX}" GRAPHICS="${GRAPHICS}" LDFLAGS="${LDFLAGS}" +MAKE_ENV= GRAPHICS="${GRAPHICS}" LDFLAGS="${LDFLAGS}" PLIST_SUB= HACKNAME="${HACKNAME}" \ HACKEXT="${HACKEXT}" diff --git a/games/nethack34/Makefile b/games/nethack34/Makefile index a59ff8278531..323a24985a6b 100644 --- a/games/nethack34/Makefile +++ b/games/nethack34/Makefile @@ -20,7 +20,7 @@ COMMENT= A dungeon explorin', slashin', hackin' game WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_GMAKE= yes -MAKE_ENV= CXX="${CXX}" GRAPHICS="${GRAPHICS}" +MAKE_ENV= GRAPHICS="${GRAPHICS}" PLIST_SUB= HACKNAME="${HACKNAME}" \ HACKDIR="${HACKDIR}" \ HACKDOCSDIR="${HACKDOCSDIR}" diff --git a/games/palomino/Makefile b/games/palomino/Makefile index f30fa2fc0c74..487ffb7a3362 100644 --- a/games/palomino/Makefile +++ b/games/palomino/Makefile @@ -23,7 +23,6 @@ USE_GMAKE= yes WRKSRC= ${WRKDIR}/${PORTNAME} INSTALL_WRKSRC= ${WRKSRC}/${PORTNAME}/modules/pony MAKEFILE= GNUmakefile -MAKE_ENV= CC="${CC}" CXX="${CXX}" post-patch: @${REINPLACE_CMD} -e '/APPLE_CC/s|$$| \&\& !defined(__FreeBSD__)|'\ diff --git a/games/pouetchess/Makefile b/games/pouetchess/Makefile index 23dee426f3b7..06d3bfac8f5e 100644 --- a/games/pouetchess/Makefile +++ b/games/pouetchess/Makefile @@ -21,8 +21,6 @@ USE_GMAKE= yes WRKSRC= ${WRKDIR}/pouetChess_0.11 -MAKE_ENV= CXX="${CXX}" - DESKTOP_ENTRIES="pouetChess" \ "Play chess" \ "${DATADIR}/textures/1.png" \ diff --git a/games/race/Makefile b/games/race/Makefile index 045019b5dfd9..21c2f6095c34 100644 --- a/games/race/Makefile +++ b/games/race/Makefile @@ -19,7 +19,8 @@ USE_SDL= mixer image sdl USE_BZIP2= yes USE_GL= glut CFLAGS+= "-I${LOCALBASE}/include" -MAKE_ENV= CC="${CC} ${CFLAGS}" LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CC+= ${CFLAGS} +MAKE_ENV= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" post-patch: @${REINPLACE_CMD} -e "s|^CC|#CC|g" \ diff --git a/games/randomshooter/Makefile b/games/randomshooter/Makefile index 4d455f31ef90..8de7883b38ab 100644 --- a/games/randomshooter/Makefile +++ b/games/randomshooter/Makefile @@ -22,7 +22,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME:S/-1$$//} PORTDOCS= * MAKEFILE= makefile -MAKE_ENV= CXX="${CXX}" DATADIR=${DATADIR}/ +MAKE_ENV= DATADIR=${DATADIR}/ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin diff --git a/games/redeclipse/Makefile b/games/redeclipse/Makefile index 5416931229d8..d671f6a49d8d 100644 --- a/games/redeclipse/Makefile +++ b/games/redeclipse/Makefile @@ -20,7 +20,6 @@ USE_BZIP2= yes CONFIGURE_ENV= ACLOCAL=true AUTOCONF=true AUTOMAKE=true CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_WRKSRC= ${WRKSRC}/src/enet -MAKE_ENV+= CXX="${CXX}" BUILD_WRKSRC= ${WRKSRC}/src WRKSRC= ${WRKDIR}/${PORTNAME} ALL_TARGET= libenet diff --git a/games/reminiscence/Makefile b/games/reminiscence/Makefile index e40a20cea3c7..e6245c7f3119 100644 --- a/games/reminiscence/Makefile +++ b/games/reminiscence/Makefile @@ -20,9 +20,7 @@ USE_GMAKE= yes USE_SDL= sdl ALL_TARGET= rs -MAKE_ENV= CXX="${CXX}" -PKGMESSAGE= ${WRKDIR}/pkg-message SUB_FILES= pkg-message PORTDOCS= README diff --git a/games/sauerbraten/Makefile b/games/sauerbraten/Makefile index 5416931229d8..d671f6a49d8d 100644 --- a/games/sauerbraten/Makefile +++ b/games/sauerbraten/Makefile @@ -20,7 +20,6 @@ USE_BZIP2= yes CONFIGURE_ENV= ACLOCAL=true AUTOCONF=true AUTOMAKE=true CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_WRKSRC= ${WRKSRC}/src/enet -MAKE_ENV+= CXX="${CXX}" BUILD_WRKSRC= ${WRKSRC}/src WRKSRC= ${WRKDIR}/${PORTNAME} ALL_TARGET= libenet diff --git a/games/solarconquest/Makefile b/games/solarconquest/Makefile index ab9e896e1ea3..3f3b1b992472 100644 --- a/games/solarconquest/Makefile +++ b/games/solarconquest/Makefile @@ -23,7 +23,6 @@ USE_GL= yes USE_DOS2UNIX= makefile source/MenuScreen.h source/main.cpp MAKEFILE= makefile -MAKE_ENV= CXX="${CXX}" post-patch: @${REINPLACE_CMD} -e 's|images/|${DATADIR}/images/|' \ diff --git a/games/starfighter/Makefile b/games/starfighter/Makefile index 1213ed79522d..b7485bea381f 100644 --- a/games/starfighter/Makefile +++ b/games/starfighter/Makefile @@ -23,7 +23,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-1.1 OPTIONS= OPTIMIZED_CFLAGS "Enable compilation optimizations" on MAKEFILE= makefile -MAKE_ENV= CXX="${CXX}" .if !defined(NOPORTDOCS) post-install: diff --git a/games/stonesoup/Makefile b/games/stonesoup/Makefile index d31dae57e37a..e51d12e8a580 100644 --- a/games/stonesoup/Makefile +++ b/games/stonesoup/Makefile @@ -18,7 +18,6 @@ COMMENT= Dungeon Crawl Stone Soup - a fun, free rogue-like game USE_BISON= build USE_GMAKE= yes -MAKE_ENV= CC=${CC} CXX=${CXX} SAVEDIR?= /var/games/${PORTNAME} WRKSRC= ${WRKDIR}/${DISTNAME}/source/ diff --git a/games/stransball2/Makefile b/games/stransball2/Makefile index a96af408b834..a541b07584cb 100644 --- a/games/stransball2/Makefile +++ b/games/stransball2/Makefile @@ -20,7 +20,6 @@ LIB_DEPENDS= SGE.0:${PORTSDIR}/devel/sdl_sge USE_ZIP= yes USE_GMAKE= yes USE_SDL= sdl image mixer sound -MAKE_ENV= CXX="${CXX}" BUILD_WRKSRC= ${WRKSRC}/sources diff --git a/games/vdrift/Makefile b/games/vdrift/Makefile index 43a804cb4bad..0aecfe06fc66 100644 --- a/games/vdrift/Makefile +++ b/games/vdrift/Makefile @@ -26,7 +26,6 @@ USE_BZIP2= yes USE_GL= yes USE_SDL= sdl image net gfx -MAKE_ENV= CC="${CC}" CXX="${CXX}" SCONS_ARGS= prefix=${PREFIX} \ datadir=share/${PORTNAME} \ bindir=bin \ diff --git a/games/viruskiller/Makefile b/games/viruskiller/Makefile index dd140ae4481f..0c205b242906 100644 --- a/games/viruskiller/Makefile +++ b/games/viruskiller/Makefile @@ -24,7 +24,6 @@ USE_SDL= image mixer sdl ttf WRKSRC= ${WRKDIR}/${PORTNAME}-1.0 MAKEFILE= makefile -MAKE_ENV= CXX="${CXX}" post-patch: # Fix Makefile diff --git a/games/vultures-eye/Makefile b/games/vultures-eye/Makefile index 2b2a2024f12b..0e6b832ecce0 100644 --- a/games/vultures-eye/Makefile +++ b/games/vultures-eye/Makefile @@ -28,7 +28,7 @@ HAS_CONFIGURE= yes CONFIGURE_WRKSRC= ${WRKSRC}/sys/unix CONFIGURE_SCRIPT= setup.sh DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX} -MAKE_ENV+= SDL_CONFIG="${SDL_CONFIG}" DATADIR="${DATADIR}" MAKE="${GMAKE}" +MAKE_ENV+= DATADIR="${DATADIR}" MAKE="${GMAKE}" pre-configure: @${CHMOD} 755 ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} diff --git a/games/wmminichess/Makefile b/games/wmminichess/Makefile index 8379208a296e..e7f3c585c8be 100644 --- a/games/wmminichess/Makefile +++ b/games/wmminichess/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= ${LOCALBASE}/bin/gnuchess:${PORTSDIR}/games/gnuchess USE_GMAKE= YES USE_XORG= xpm -MAKE_ENV= PREFIX="${PREFIX}" INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ +MAKE_ENV= INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ LOCAL="${LOCALBASE}" MKDIR="${MKDIR}" \ INSTALL_DATA="${INSTALL_DATA}" diff --git a/games/xevil/Makefile b/games/xevil/Makefile index ba410fb42ef5..379c8a3cfae6 100644 --- a/games/xevil/Makefile +++ b/games/xevil/Makefile @@ -17,7 +17,6 @@ COMMENT= A fast-action, networked, anti-social, kill-everything game USE_ZIP= yes USE_XORG= xpm -MAKE_ENV= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" MAKEFILE= makefile ALL_TARGET= freebsd diff --git a/games/xrally/Makefile b/games/xrally/Makefile index a134a18353b6..4546d320a729 100644 --- a/games/xrally/Makefile +++ b/games/xrally/Makefile @@ -23,10 +23,10 @@ HAS_CONFIGURE= yes USE_XORG= x11 xi xpm USE_BZIP2= yes USE_GMAKE= yes +CFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ - CFLAGS="${PTHREAD_CFLAGS}" + CFLAGS="${CFLAGS}" MAKE_ENV= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ - CFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ INCLUDES="-I${LOCALBASE}/include" .include <bsd.port.pre.mk> diff --git a/games/xtux/Makefile b/games/xtux/Makefile index 6585c84a57bd..a5eede81fc6e 100644 --- a/games/xtux/Makefile +++ b/games/xtux/Makefile @@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME} USE_XORG= xpm USE_GMAKE= yes -MAKE_ENV= CPP="${CC} -E" CC="${CC}" +MAKE_ENV= CPP="${CC} -E" CFLAGS+= -DDATADIR=\\\"${DATADIR}\\\" diff --git a/graphics/agg/Makefile b/graphics/agg/Makefile index 9c892be1b5d1..2d7ce1ddf519 100644 --- a/graphics/agg/Makefile +++ b/graphics/agg/Makefile @@ -25,7 +25,7 @@ USE_GMAKE= yes USE_LDCONFIG= yes ACLOCAL_ARGS+= -I ${LOCALBASE}/share/aclocal USE_AUTOTOOLS= autoconf:261:env automake:15:env libtool:15:env -MAKE_ENV= C="${CC}" CXX="${CXX}" AGGCXXFLAGS="${CXXFLAGS}" +MAKE_ENV= C="${CC}" AGGCXXFLAGS="${CXXFLAGS}" CXXFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib -I../include -L./ post-patch: diff --git a/graphics/crystalentitylayer-devel/Makefile b/graphics/crystalentitylayer-devel/Makefile index 8f77df5b8e9c..d5f295cb6878 100644 --- a/graphics/crystalentitylayer-devel/Makefile +++ b/graphics/crystalentitylayer-devel/Makefile @@ -28,7 +28,7 @@ LDFLAGS= -L${LOCALBASE}/lib CPPFLAGS= -I${LOCALBASE}/include CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS+= --with-cs-prefix=${LOCALBASE} -MAKE_ENV= CC="${CC}" CFLAGS="${CFLAGS} ${CXX}" LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" +MAKE_ENV= LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" DOCSDIR= share/doc/cel-0.99 DATADIR= share/cel PLIST_SUB+= DOCSDIR=${DOCSDIR} \ diff --git a/graphics/crystalentitylayer/Makefile b/graphics/crystalentitylayer/Makefile index b0050c4a25bc..fff72934249b 100644 --- a/graphics/crystalentitylayer/Makefile +++ b/graphics/crystalentitylayer/Makefile @@ -28,7 +28,7 @@ LDFLAGS= -L${LOCALBASE}/lib CPPFLAGS= -I${LOCALBASE}/include CONFIGURE_ARGS+= --with-cs-prefix=${LOCALBASE} CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -MAKE_ENV= CC="${CC}" CFLAGS="${CFLAGS} ${CXX}" LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" +MAKE_ENV= LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" DOCSDIR= share/doc/cel-${PORTVERSION} DATADIR= share/cel PLIST_SUB+= DOCSDIR=${DOCSDIR} \ diff --git a/graphics/crystalspace-devel/Makefile b/graphics/crystalspace-devel/Makefile index dadaaa41eec2..928c84770696 100644 --- a/graphics/crystalspace-devel/Makefile +++ b/graphics/crystalspace-devel/Makefile @@ -38,8 +38,7 @@ WANT_PERL= yes LDFLAGS= -L${LOCALBASE}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS} CPPFLAGS= -I${LOCALBASE}/include -I${LOCALBASE}/include CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -MAKE_ENV= CC="${CC}" CFLAGS="${CFLAGS} ${CXX}" \ - CPPFLAGS="${CPPFLAGS} "LDFLAGS="${LDFLAGS}" +MAKE_ENV= CPPFLAGS="${CPPFLAGS} "LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS+= --disable-cpu-specific-optimizations \ --disable-make-emulation \ --prefix=${PREFIX} \ diff --git a/graphics/dataplot/Makefile b/graphics/dataplot/Makefile index 34b6c55426ac..849a660f2f78 100644 --- a/graphics/dataplot/Makefile +++ b/graphics/dataplot/Makefile @@ -26,7 +26,6 @@ LIB_DEPENDS= gd:${PORTSDIR}/graphics/gd \ USE_FORTRAN= yes FFLAGS+= -fno-range-check -MAKE_ENV+= FFLAGS="${FFLAGS}" USE_XORG= x11 xi NO_WRKSUBDIR= yes MAXOBV?= 100000 # Change if you need more observations/variable diff --git a/graphics/dynamechs/Makefile b/graphics/dynamechs/Makefile index b62bc3f883fc..b4b0e4148769 100644 --- a/graphics/dynamechs/Makefile +++ b/graphics/dynamechs/Makefile @@ -21,9 +21,9 @@ USE_BZIP2= yes USE_GL= glut USE_GMAKE= yes USE_PERL5_BUILD=yes +CXXFLAGS+= ${PTHREAD_CFLAGS} MAKE_ENV= OPENGLINCDIR="${LOCALBASE}/include" \ OPENGLLIBDIR="${LOCALBASE}/lib" \ - CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS}" \ LDFLAGS="${PTHREAD_LIBS}" ALL_TARGET= freebsd USE_LDCONFIG= yes diff --git a/graphics/fractorama/Makefile b/graphics/fractorama/Makefile index 495f0a19c4ab..45b0991f9471 100644 --- a/graphics/fractorama/Makefile +++ b/graphics/fractorama/Makefile @@ -22,8 +22,7 @@ LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff USE_QT_VER= 3 USE_BISON= build USE_GMAKE= yes -MAKE_ENV= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \ - QTCPPFLAGS="${QTCPPFLAGS} ${PTHREAD_CFLAGS}" \ +MAKE_ENV= QTCPPFLAGS="${QTCPPFLAGS} ${PTHREAD_CFLAGS}" \ QTCFGLIBS="${QTCFGLIBS} ${PTHREAD_LIBS}" WRKSRC= ${WRKDIR}/${DISTNAME}/src diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile index faaafd6a967e..da2e71bf4aad 100644 --- a/graphics/gd/Makefile +++ b/graphics/gd/Makefile @@ -23,7 +23,7 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ USE_BZIP2= yes SCRIPTDIR= ${FILESDIR} -MAKE_ENV= WRKSRC="${WRKSRC}" CC="${CC}" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" +MAKE_ENV= WRKSRC="${WRKSRC}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" MAKEFILE= ${FILESDIR}/Makefile.bsd CPPFLAGS+= -DHAVE_ERRNO_H -DHAVE_FT2BUILD_H -DHAVE_LIBFREETYPE -DHAVE_LIBJPEG -DHAVE_LIBPNG \ -DHAVE_LIBZ -DHAVE_STDDEF_H -DHAVE_STDINT_H -DHAVE_STDLIB_H diff --git a/graphics/glean/Makefile b/graphics/glean/Makefile index 9a6ac7e94e04..41f4fd4b8cf2 100644 --- a/graphics/glean/Makefile +++ b/graphics/glean/Makefile @@ -24,8 +24,7 @@ WRKSRC= ${WRKDIR}/glean/src USE_BZIP2= yes USE_GL= yes USE_GMAKE= yes -MAKE_ENV+= GLEAN_ROOT="${WRKDIR}/glean" \ - CXX="${CXX}" +MAKE_ENV+= GLEAN_ROOT="${WRKDIR}/glean" ALL_TARGET= install do-install: diff --git a/graphics/jbigkit/Makefile b/graphics/jbigkit/Makefile index af7f0de6ac99..0c8e2b2744f8 100644 --- a/graphics/jbigkit/Makefile +++ b/graphics/jbigkit/Makefile @@ -14,7 +14,6 @@ MAINTAINER= mi@aldan.algebra.com COMMENT= Lossless compression for bi-level images such as scanned pages, faxes WRKSRC= ${WRKDIR}/${PORTNAME} -MAKE_ENV+= CC="${CC}" USE_LDCONFIG= yes MAN1= jbgtopbm.1 pbmtojbg.1 diff --git a/graphics/libraw/Makefile b/graphics/libraw/Makefile index bacf4ae50a96..2d010c1d0820 100644 --- a/graphics/libraw/Makefile +++ b/graphics/libraw/Makefile @@ -18,8 +18,7 @@ COMMENT= Library for manipulating raw images LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ lcms.1:${PORTSDIR}/graphics/lcms -MAKE_ENV+= CXX="${CXX}" CC="${CC}" CFLAGS="${CFLAGS}" \ - PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS} +MAKE_ENV+= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS} USE_LDCONFIG= yes diff --git a/graphics/multivideo/Makefile b/graphics/multivideo/Makefile index 528762ff6308..09801060034a 100644 --- a/graphics/multivideo/Makefile +++ b/graphics/multivideo/Makefile @@ -21,7 +21,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME} USE_BZIP2= yes USE_GMAKE= yes USE_WX= 2.4 -MAKE_ENV= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" ALL_TARGET= default PLIST_FILES= bin/multivideo diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile index 859dc6024268..97c135eaaeab 100644 --- a/graphics/netpbm/Makefile +++ b/graphics/netpbm/Makefile @@ -37,7 +37,7 @@ LIB_DEPENDS+= xml2.5:${PORTSDIR}/textproc/libxml2 USE_PERL5= yes USE_GMAKE= yes -MAKE_ENV= CC="${CC}" LN="${LN}" RANLIB="${RANLIB}" +MAKE_ENV= LN="${LN}" RANLIB="${RANLIB}" MAKEFILE= GNUmakefile INSTALL_TARGET= install.bin install.lib install.data install-dev USE_LDCONFIG= yes diff --git a/graphics/pecomato/Makefile b/graphics/pecomato/Makefile index c2498466cfda..177dd323d2d4 100644 --- a/graphics/pecomato/Makefile +++ b/graphics/pecomato/Makefile @@ -18,7 +18,6 @@ USE_GMAKE= yes USE_PYTHON_BUILD= yes MAKEFILE= Makefile.unix -MAKE_ENV= CC="${CC}" MAN1= pecomato.1 PLIST_FILES= bin/pecomato diff --git a/graphics/popplerkit/Makefile b/graphics/popplerkit/Makefile index b0f71308e721..c1390c530168 100644 --- a/graphics/popplerkit/Makefile +++ b/graphics/popplerkit/Makefile @@ -26,7 +26,6 @@ USE_GNOME= gnomeprefix gnomehack gtk20 SNAPSHOT= 20050720 WRKSRC= ${WRKDIR}/PopplerKit -MAKE_ENV+= CXX=${CXX} ADDITIONAL_CPPFLAGS+= -DPOPPLER_0_5 post-patch: diff --git a/graphics/py-visual/Makefile b/graphics/py-visual/Makefile index 7347d7a50b2b..0ccc7cfa08e9 100644 --- a/graphics/py-visual/Makefile +++ b/graphics/py-visual/Makefile @@ -39,7 +39,8 @@ CONFIGURE_ARGS= --with-html-dir=${DOCSDIR} --disable-dependency-tracking CONFIGURE_ARGS+= --disable-docs .endif CONFIGURE_ENV= PYTHONPATH=${PYTHON_LIBDIR} -MAKE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" LDFLAGS="${LDFLAGS} ${PTREAD_LIBS}" +CFLAGS+= ${PTHREAD_CFLAGS} +MAKE_ENV= LDFLAGS="${LDFLAGS} ${PTREAD_LIBS}" VPYTHON_SCRIPT= bin/vpython.in diff --git a/graphics/robot/Makefile b/graphics/robot/Makefile index 5715e483519f..a18e76c9bcd0 100644 --- a/graphics/robot/Makefile +++ b/graphics/robot/Makefile @@ -24,7 +24,6 @@ MAKE_ENV+= OPENWINHOME=${LOCALBASE} WEB_BROWSER?= firefox USE_FORTRAN= yes FFLAGS+= -ffixed-line-length-80 -MAKE_ENV+= FFLAGS="${FFLAGS}" MANL= robot.l diff --git a/graphics/telak/Makefile b/graphics/telak/Makefile index 60cf60b4d6a1..39b2d54ab0ae 100644 --- a/graphics/telak/Makefile +++ b/graphics/telak/Makefile @@ -22,7 +22,7 @@ USE_GMAKE= yes USE_EFL= imlib2 ALL_TARGET= ${PORTNAME} -MAKE_ENV= CC="${CC}" LDFLAGS="${LDFLAGS}" +MAKE_ENV= LDFLAGS="${LDFLAGS}" PLIST_FILES= bin/telak MAN1= telak.1 diff --git a/graphics/wildmagic/Makefile b/graphics/wildmagic/Makefile index 1e778bf48675..158069355ffa 100644 --- a/graphics/wildmagic/Makefile +++ b/graphics/wildmagic/Makefile @@ -25,7 +25,7 @@ DOS2UNIX_REGEX= .*\.(wm${MV}|h|inl|cpp) MAKEFILE= makefile.wm${MV} ALL_TARGET= build MAKE_ARGS= CFG=${CONFIG} SYS=${OPSYS:L} GRF=${GRF} -MAKE_ENV= CC=${CXX} GCC=${CXX} AR=${AR} EGL=${EGL} EGL0=glx EGL1=Glx \ +MAKE_ENV= GCC=${CXX} AR=${AR} EGL=${EGL} EGL0=glx EGL1=Glx \ INCPATH="-I${LOCALBASE}/include" \ LIBPATH="-L${LOCALBASE}/lib" \ XLIBS="-lX11 -lXext" GLIBS="-lGL -lGLU" diff --git a/japanese/Canna/Makefile b/japanese/Canna/Makefile index 9f6cdb720d6c..3c354031de5b 100644 --- a/japanese/Canna/Makefile +++ b/japanese/Canna/Makefile @@ -22,7 +22,6 @@ USE_BZIP2= yes USE_IMAKE= yes ALL_TARGET= canna USE_LDCONFIG= yes -MAKE_ENV+= CC=$(CC) MANLANG="" ja MAN1= addwords.1 cannacheck.1 cannakill.1 cannaserver.1 cannastat.1 \ diff --git a/japanese/canna-lib/Makefile b/japanese/canna-lib/Makefile index 9f6cdb720d6c..3c354031de5b 100644 --- a/japanese/canna-lib/Makefile +++ b/japanese/canna-lib/Makefile @@ -22,7 +22,6 @@ USE_BZIP2= yes USE_IMAKE= yes ALL_TARGET= canna USE_LDCONFIG= yes -MAKE_ENV+= CC=$(CC) MANLANG="" ja MAN1= addwords.1 cannacheck.1 cannakill.1 cannaserver.1 cannastat.1 \ diff --git a/japanese/canna-server/Makefile b/japanese/canna-server/Makefile index 9f6cdb720d6c..3c354031de5b 100644 --- a/japanese/canna-server/Makefile +++ b/japanese/canna-server/Makefile @@ -22,7 +22,6 @@ USE_BZIP2= yes USE_IMAKE= yes ALL_TARGET= canna USE_LDCONFIG= yes -MAKE_ENV+= CC=$(CC) MANLANG="" ja MAN1= addwords.1 cannacheck.1 cannakill.1 cannaserver.1 cannastat.1 \ diff --git a/japanese/kdrill/Makefile b/japanese/kdrill/Makefile index 9d9c15f77734..83bbd88d6bec 100644 --- a/japanese/kdrill/Makefile +++ b/japanese/kdrill/Makefile @@ -22,7 +22,6 @@ MAN1= kdrill.1 makedic.1 makeedict.1 MANCOMPRESSED= yes USE_IMAKE= yes -MAKE_ENV+= LOCALBASE=${LOCALBASE} RUN_DEPENDS+= xjdic:${PORTSDIR}/japanese/edict diff --git a/japanese/nethack34/Makefile b/japanese/nethack34/Makefile index b1e0fce3d359..34c89e8ca017 100644 --- a/japanese/nethack34/Makefile +++ b/japanese/nethack34/Makefile @@ -26,7 +26,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_BISON= build USE_GMAKE= yes -MAKE_ENV= CXX="${CXX}" GRAPHICS="${GRAPHICS}" +MAKE_ENV= GRAPHICS="${GRAPHICS}" PLIST_SUB= HACKNAME="${HACKNAME}" \ HACKDIR="${HACKDIR}" \ HACKDOCSDIR="${HACKDOCSDIR}" diff --git a/japanese/p5-Mail-SpamAssassin/Makefile b/japanese/p5-Mail-SpamAssassin/Makefile index af914d42168d..feb8d69e74a1 100644 --- a/japanese/p5-Mail-SpamAssassin/Makefile +++ b/japanese/p5-Mail-SpamAssassin/Makefile @@ -42,7 +42,6 @@ CONFLICTS= p5-Mail-SpamAssassin-[0-9]* PERL_CONFIGURE= yes USE_LDCONFIG= yes -MAKE_ENV+= CC="${CC}" CONFIGURE_ARGS= SYSCONFDIR="${PREFIX}/etc" \ CONTACT_ADDRESS="${CONTACT_ADDRESS}" \ LOCALSTATEDIR="/var/db/spamassassin" diff --git a/java/jdk16/Makefile b/java/jdk16/Makefile index aaecfc458029..d5e558ef89e1 100644 --- a/java/jdk16/Makefile +++ b/java/jdk16/Makefile @@ -134,7 +134,6 @@ MAKE_ENV+= ALT_BOOTDIR="${BOOTSTRAPJDKDIR}" \ MAKEFLAGS="" \ SKIP_COMPARE_IMAGES="true" \ SKIP_FASTDEBUG_BUILD="true" \ - LOCALBASE="${LOCALBASE}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" .if defined(WITH_DEBUG) diff --git a/lang/afnix/Makefile b/lang/afnix/Makefile index b7831fe797e5..03cfad69da7b 100644 --- a/lang/afnix/Makefile +++ b/lang/afnix/Makefile @@ -24,7 +24,7 @@ USE_LDCONFIG= yes HAS_CONFIGURE= yes CONFIGURE_SCRIPT= cnf/bin/afnix-setup CONFIGURE_ARGS= -o --prefix "${PREFIX}" --compiler freebsd -MAKE_ENV= CXX="${CXX}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ +MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" PORTDOCS= * diff --git a/lang/alisp/Makefile b/lang/alisp/Makefile index 9804ae92474b..790ed664a58f 100644 --- a/lang/alisp/Makefile +++ b/lang/alisp/Makefile @@ -18,8 +18,7 @@ MANCOMPRESSED= no USE_LDCONFIG= yes MAKE_ENV+= BINOWN=${BINOWN} \ - BINGRP=${BINGRP} \ - PREFIX=${PREFIX} + BINGRP=${BINGRP} # Please, please keep this! USE_REINPLACE= yes diff --git a/lang/gnat-gcc41/Makefile b/lang/gnat-gcc41/Makefile index 0c4626f69751..7dc58f0ca9c9 100644 --- a/lang/gnat-gcc41/Makefile +++ b/lang/gnat-gcc41/Makefile @@ -82,11 +82,11 @@ PLIST_SUB= GCC_VER=${PORTVERSION} \ USE_LDCONFIG= ${targlib} # Prepare environment for the bootstrap compiler. -build_env= CC=${WRKDIR}/boot/bin/gcc \ - PTHREAD_LIBS=${PTHREAD_LIBS} \ +CC= ${WRKDIR}/boot/bin/gcc +build_env= PTHREAD_LIBS=${PTHREAD_LIBS} \ PATH=${WRKDIR}/boot/bin:${WRKDIR}/boot/libexec:${PATH} -CONFIGURE_ENV+= ${build_env} +CONFIGURE_ENV+= ${build_env} CC="${CC}" MAKE_ENV+= ${build_env} pre-everything:: diff --git a/lang/gnat-gcc42/Makefile b/lang/gnat-gcc42/Makefile index 7dc48aa2ae9f..20c71dcb37e0 100644 --- a/lang/gnat-gcc42/Makefile +++ b/lang/gnat-gcc42/Makefile @@ -83,11 +83,11 @@ PLIST_SUB= GCC_VER=${PORTVERSION} \ USE_LDCONFIG= ${targlib} # Prepare environment for the bootstrap compiler. -build_env= CC=${WRKDIR}/boot/bin/gcc \ - PTHREAD_LIBS=${PTHREAD_LIBS} \ +CC= ${WRKDIR}/boot/bin/gcc +build_env= PTHREAD_LIBS=${PTHREAD_LIBS} \ PATH=${WRKDIR}/boot/bin:${WRKDIR}/boot/libexec:${PATH} -CONFIGURE_ENV+= ${build_env} +CONFIGURE_ENV+= ${build_env} CC="${CC}" MAKE_ENV+= ${build_env} pre-everything:: diff --git a/lang/gnat-gcc43/Makefile b/lang/gnat-gcc43/Makefile index 8ed631bceaa6..11fc7f677931 100644 --- a/lang/gnat-gcc43/Makefile +++ b/lang/gnat-gcc43/Makefile @@ -88,11 +88,11 @@ PLIST_SUB= GCC_VER=${PORTVERSION} \ USE_LDCONFIG= ${targlib} # Prepare environment for the bootstrap compiler. -build_env= CC=${WRKDIR}/boot/bin/gcc \ - PTHREAD_LIBS=${PTHREAD_LIBS} \ +CC= ${WRKDIR}/boot/bin/gcc +build_env= PTHREAD_LIBS=${PTHREAD_LIBS} \ PATH=${WRKDIR}/boot/bin:${WRKDIR}/boot/libexec:${PATH} -CONFIGURE_ENV+= ${build_env} +CONFIGURE_ENV+= ${build_env} CC="${CC}" MAKE_ENV+= ${build_env} pre-everything:: diff --git a/lang/mono/Makefile b/lang/mono/Makefile index 9857ce012446..0268850bfaa3 100644 --- a/lang/mono/Makefile +++ b/lang/mono/Makefile @@ -39,8 +39,7 @@ MONO_SHARED_DIR=${WRKDIR} # LC_ALL is set in order to work around issues people are having when using # other languages. This has shown itself in build fails and possibly other # strange crashes. -MAKE_ENV= MONO_SHARED_DIR="${MONO_SHARED_DIR}" \ - LC_ALL=C +MAKE_ENV= LC_ALL=C # Removed amd64 arch because builds are exhibiting semaphore problems on # pointyhat runs causing failure to build. diff --git a/lang/spidermonkey/Makefile b/lang/spidermonkey/Makefile index 7badb0878f3b..af963aefcd3b 100644 --- a/lang/spidermonkey/Makefile +++ b/lang/spidermonkey/Makefile @@ -29,7 +29,7 @@ CFLAGS+= -I${LOCALBASE}/include/nspr USE_GMAKE= YES MAKEFILE= Makefile.ref ALL_TARGET= ${OPSYS}`${UNAME} -r`_DBG.OBJ/js -MAKE_ENV+= CC="${CC}" CCC="${CXX}" +MAKE_ENV+= CCC="${CXX}" USE_LDCONFIG= yes SRC_DIR= js/src JSH= jsapi.h jsautocfg.h jsconfig.h jscompat.h jslong.h jsosdep.h \ diff --git a/mail/gkrellmmailwatch2/Makefile b/mail/gkrellmmailwatch2/Makefile index 47d6aad91e3e..7b7073ff9fde 100644 --- a/mail/gkrellmmailwatch2/Makefile +++ b/mail/gkrellmmailwatch2/Makefile @@ -26,6 +26,6 @@ WRKSRC= ${WRKDIR}/gkrellm-mailwatch USE_GMAKE= yes USE_LDCONFIG= yes -MAKE_ENV+= PLUGIN_DIR=${PREFIX}/libexec/gkrellm2/plugins CC="${CC}" +MAKE_ENV+= PLUGIN_DIR=${PREFIX}/libexec/gkrellm2/plugins .include <bsd.port.mk> diff --git a/mail/libdomainkeys/Makefile b/mail/libdomainkeys/Makefile index 95db2a33f3ca..c2a108c23cd1 100644 --- a/mail/libdomainkeys/Makefile +++ b/mail/libdomainkeys/Makefile @@ -14,7 +14,6 @@ MASTER_SITE_SUBDIR= domainkeys MAINTAINER= skv@FreeBSD.org COMMENT= DomainKeys library -MAKE_ENV= PREFIX=${PREFIX} OPENSSLBASE="${OPENSSLBASE}" USE_LDCONFIG= YES SHLIB_MAJOR= 3 PLIST_SUB= SHLIB_MAJOR="${SHLIB_MAJOR}" diff --git a/mail/missey/Makefile b/mail/missey/Makefile index 8ec3a4158f5c..3cfddf3a91d0 100644 --- a/mail/missey/Makefile +++ b/mail/missey/Makefile @@ -21,7 +21,7 @@ USE_BZIP2= yes WRKSRC= ${WRKDIR}/mps/src MAKE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}" \ - PREFIX="${PREFIX}" INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ + INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ INSTALL_DATA="${INSTALL_DATA}" MKDIR="${MKDIR}" WRKSRC="${WRKSRC}" PLIST_FILES= sbin/bent sbin/mps etc/mps/pop3d.conf-dist diff --git a/mail/p5-Mail-SpamAssassin/Makefile b/mail/p5-Mail-SpamAssassin/Makefile index cd73be0ce989..bbce8a33af8c 100644 --- a/mail/p5-Mail-SpamAssassin/Makefile +++ b/mail/p5-Mail-SpamAssassin/Makefile @@ -33,7 +33,6 @@ CONFLICTS= ja-p5-Mail-SpamAssassin-[0-9]* PERL_CONFIGURE= yes USE_LDCONFIG= yes -MAKE_ENV+= CC="${CC}" CONFIGURE_ARGS= SYSCONFDIR="${PREFIX}/etc" \ CONTACT_ADDRESS="${CONTACT_ADDRESS}" \ LOCALSTATEDIR="/var/db/spamassassin" diff --git a/mail/spamilter/Makefile b/mail/spamilter/Makefile index 015cb01e5ae9..9f935120bd81 100644 --- a/mail/spamilter/Makefile +++ b/mail/spamilter/Makefile @@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME} HAS_CONFIGURE= yes CFLAGS+= ${PTHREAD_CFLAGS:S=""==} LDFLAGS+= ${PTHREAD_LIBS} -MAKE_ENV+= LDFLAGS="${LDFLAGS}" __MAKE_CONF=/dev/null +MAKE_ENV+= __MAKE_CONF=/dev/null BINFILES= spamilter-system-report spamilter-user-report DOCSFILES= Changelog INSTALL LICENSE docs/docs.html docs/docs.txt \ diff --git a/math/bamg/Makefile b/math/bamg/Makefile index 350c29c3e68a..d045d6839bd3 100644 --- a/math/bamg/Makefile +++ b/math/bamg/Makefile @@ -38,7 +38,7 @@ EXDIRS= NACA012 quadloop square test .pre-configure: HOSTTYPE= ${UNAME} -s -MAKE_ENV= CXX=${CXX} HOSTTYPE=${${HOSTTYPE}} +MAKE_ENV= HOSTTYPE=${${HOSTTYPE}} post-patch: @${MV} ${WRKSRC}/FLAG.linux ${WRKSRC}/FLAG.${${HOSTTYPE}} diff --git a/math/fxt/Makefile b/math/fxt/Makefile index 476983ce3278..9e1fe92d1bf1 100644 --- a/math/fxt/Makefile +++ b/math/fxt/Makefile @@ -20,7 +20,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME} USE_GMAKE= yes MAKEFILE= makefile -MAKE_ENV= CXX="${CXX}" .include <bsd.port.pre.mk> diff --git a/math/metis-edf/Makefile b/math/metis-edf/Makefile index 2969cd196fa7..6f6ab93c451c 100644 --- a/math/metis-edf/Makefile +++ b/math/metis-edf/Makefile @@ -18,7 +18,7 @@ COMMENT= Meshes partionning tool used by Code_Aster CONFLICTS= metis-[0-9]* ALL_TARGET= default -MAKE_ENV+= CC="${CC}" AR="${AR}" F77="${F77}" FFLAGS="${FFLAGS}" +MAKE_ENV+= AR="${AR}" REINPLACE_ARGS= -i "" USE_FORTRAN= yes diff --git a/math/nsc2ke/Makefile b/math/nsc2ke/Makefile index 0bfbf60e1298..e2aa9347be59 100644 --- a/math/nsc2ke/Makefile +++ b/math/nsc2ke/Makefile @@ -26,7 +26,6 @@ FFLAGS+= -O2 NO_WRKSUBDIR= yes MAKEFILE= makefile ALL_TARGET= NSC2KE -MAKE_ENV= F77="${F77}" FFLAGS="${FFLAGS}" EXEMPLES= DATA MESH gnu.data TESTDIR?= /tmp/testnsc2ke diff --git a/math/octave-devel/Makefile b/math/octave-devel/Makefile index 58e895672db7..0c5a888ad569 100644 --- a/math/octave-devel/Makefile +++ b/math/octave-devel/Makefile @@ -67,12 +67,8 @@ OCTAVE_VERSION= ${PORTVERSION} GNU_HOST= ${ARCH}-portbld-freebsd${OSREL} PLIST_SUB= OCTAVE_VERSION=${OCTAVE_VERSION} GNU_HOST=${GNU_HOST} INCLUDES= -I${LOCALBASE}/include -I${LOCALBASE}/include/metis -MAKE_ENV+= CFLAGS="${CFLAGS} ${INCLUDES}" \ - CXXFLAGS="${CXXFLAGS} ${INCLUDES}" \ - CPPFLAGS="${CPPFLAGS} ${INCLUDES}" \ - LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ - CC="${CC}" \ - CXX="${CXX}" +MAKE_ENV+= CPPFLAGS="${CPPFLAGS} ${INCLUDES}" \ + LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" CONFIGURE_ENV+= GPERF="${LOCALBASE}/bin/gperf" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ CFLAGS="${CFLAGS} ${INCLUDES}" \ diff --git a/math/octave/Makefile b/math/octave/Makefile index 6a71b2beb77c..4e529edd36ed 100644 --- a/math/octave/Makefile +++ b/math/octave/Makefile @@ -74,12 +74,8 @@ OCTAVE_VERSION= ${PORTVERSION} GNU_HOST= ${ARCH}-portbld-freebsd${OSREL} PLIST_SUB= OCTAVE_VERSION=${OCTAVE_VERSION} GNU_HOST=${GNU_HOST} INCLUDES= -I${LOCALBASE}/include -I${LOCALBASE}/include/metis -MAKE_ENV+= CFLAGS="${CFLAGS} ${INCLUDES}" \ - CXXFLAGS="${CXXFLAGS} ${INCLUDES}" \ - CPPFLAGS="${CPPFLAGS} ${INCLUDES}" \ - LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ - CC="${CC}" \ - CXX="${CXX}" +MAKE_ENV+= CPPFLAGS="${CPPFLAGS} ${INCLUDES}" \ + LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" CONFIGURE_ENV+= GPERF="${LOCALBASE}/bin/gperf" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ CFLAGS="${CFLAGS} ${INCLUDES}" \ diff --git a/math/rascal/Makefile b/math/rascal/Makefile index 39f7519d2b32..00c31345bb84 100644 --- a/math/rascal/Makefile +++ b/math/rascal/Makefile @@ -21,8 +21,7 @@ WRKSRC= ${WRKDIR}/Rascal-${PORTVERSION} USE_BISON= build WANT_GNOME= yes USE_GMAKE= yes -MAKE_ENV= CC="${CXX}" CFLAGS="${CXXFLAGS}" \ - CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" +MAKE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" ALL_TARGET= ${PROGRAMS} MAN1= rascal.1 diff --git a/math/ump/Makefile b/math/ump/Makefile index b72e529f35eb..b15457a2a586 100644 --- a/math/ump/Makefile +++ b/math/ump/Makefile @@ -25,7 +25,7 @@ USE_GL= glu ALL_TARGET= ${PORTNAME} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -MAKE_ENV+= CXX="${CXX}" CC="${CC}" DATADIR="${DATADIR}" +MAKE_ENV+= DATADIR="${DATADIR}" FIND_DIRS= -type d FIND_DATA= -type f diff --git a/mbone/nte/Makefile b/mbone/nte/Makefile index bb81ced53e80..e889ca6acdef 100644 --- a/mbone/nte/Makefile +++ b/mbone/nte/Makefile @@ -21,6 +21,4 @@ WRKSRC= ${WRKDIR}/nte PLIST_FILES= bin/nte USE_GMAKE= yes -MAKE_ENV= LOCALBASE="${LOCALBASE}" - .include <bsd.port.mk> diff --git a/misc/getopt/Makefile b/misc/getopt/Makefile index 172827365243..701f0d463acc 100644 --- a/misc/getopt/Makefile +++ b/misc/getopt/Makefile @@ -19,7 +19,7 @@ USE_GMAKE= yes CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -lintl -MAKE_ENV= LIBCGETOPT=0 CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" +MAKE_ENV= LIBCGETOPT=0 LDFLAGS="${LDFLAGS}" MAN1= getopt.1 DOCS= Changelog README diff --git a/misc/gkrellweather2/Makefile b/misc/gkrellweather2/Makefile index 52a093b11265..362234b66253 100644 --- a/misc/gkrellweather2/Makefile +++ b/misc/gkrellweather2/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2 USE_GMAKE= yes ALL_TARGET= gkrellweather.so -MAKE_ENV= enable_nls=1 PTHREAD_LIBS=${PTHREAD_LIBS} CC=${CC} +MAKE_ENV= enable_nls=1 PTHREAD_LIBS=${PTHREAD_LIBS} .include <bsd.port.pre.mk> diff --git a/multimedia/kissdx/Makefile b/multimedia/kissdx/Makefile index 00bb7d02bdba..5aac54dc7cf9 100644 --- a/multimedia/kissdx/Makefile +++ b/multimedia/kissdx/Makefile @@ -27,7 +27,7 @@ MAN1= kissdx.1 USE_RC_SUBR= kissdx # set enviroment variables for port makefile -MAKE_ENV= FreeBSD=defined CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" LOCALBASE=${LOCALBASE} +MAKE_ENV= FreeBSD=defined LDFLAGS="${LDFLAGS}" # Convert CR/LF to LF in source files USE_DOS2UNIX= yes diff --git a/multimedia/motion/Makefile b/multimedia/motion/Makefile index 93520cc1da10..092d50c07424 100644 --- a/multimedia/motion/Makefile +++ b/multimedia/motion/Makefile @@ -42,8 +42,6 @@ OPTIONS= PWCBSD "PWCBSD based Webcams (disables BKTR)" off \ BKTR "Support for TV Capture cards" on \ LINUXTHREADS "Use LinuxThreads" off -MAKE_ENV+= CC="${CC}" - .include <bsd.port.pre.mk> .if !defined(WITH_BKTR) && !defined(WITH_PWCBSD) diff --git a/multimedia/nmm/Makefile b/multimedia/nmm/Makefile index 8e31c911e7f6..e55c2004a78a 100644 --- a/multimedia/nmm/Makefile +++ b/multimedia/nmm/Makefile @@ -68,8 +68,9 @@ CONFIGURE_ARGS= --program-prefix=nmm- \ --with-vorbis=${LOCALBASE} \ --with-a52dec=${LOCALBASE} \ --with-mpeg2dec=${LOCALBASE} -CONFIGURE_ENV+= LIBS="${PTHREAD_LIBS}" CFLAGS="${PTHREAD_CFLAGS}" -MAKE_ENV+= LIBS="${PTHREAD_LIBS}" CFLAGS="${PTHREAD_CFLAGS}" +CFLAGS+= ${PTHREAD_CFLAGS} +CONFIGURE_ENV+= LIBS="${PTHREAD_LIBS}" CFLAGS="${CFLAGS}" +MAKE_ENV+= LIBS="${PTHREAD_LIBS}" post-patch: @${REINPLACE_CMD} -i "" -e 's:Magick++ Magick:Magick++ MagickCore:g' \ diff --git a/multimedia/tosvcd/Makefile b/multimedia/tosvcd/Makefile index 9a47f6ee5707..3769972c1890 100644 --- a/multimedia/tosvcd/Makefile +++ b/multimedia/tosvcd/Makefile @@ -24,8 +24,7 @@ PLIST_FILES= bin/tosvcd USE_BZIP2= yes USE_GMAKE= yes MAKEFILE= makefile -MAKE_ENV= CC="${CXX}" CFLAGS="${CXXFLAGS}" \ - PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ +MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" .include <bsd.port.mk> diff --git a/multimedia/vamps/Makefile b/multimedia/vamps/Makefile index 37ddd87e9050..a0f4c1ad3fa1 100644 --- a/multimedia/vamps/Makefile +++ b/multimedia/vamps/Makefile @@ -18,9 +18,7 @@ COMMENT= High performance tool to transcode DVD videos to a smaller size LIB_DEPENDS= dvdread.5:${PORTSDIR}/multimedia/libdvdread USE_GMAKE= yes -MAKE_ENV= \ - CC="${CC}" \ - LDFLAGS="${LDFLAGS}" +MAKE_ENV= LDFLAGS="${LDFLAGS}" CFLAGS+= -DHAVE_BUILTIN_EXPECT \ -I${LOCALBASE}/include \ diff --git a/multimedia/y4mscaler/Makefile b/multimedia/y4mscaler/Makefile index c02aed0f5d4c..de0aa25cc2ac 100644 --- a/multimedia/y4mscaler/Makefile +++ b/multimedia/y4mscaler/Makefile @@ -25,7 +25,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} PORTDOCS= COPYING ChangeLog INSTALL README TODO MAN1= y4mscaler.1 PLIST_FILES= bin/y4mscaler -MAKE_ENV= CXX="${CXX}" .include <bsd.port.pre.mk> diff --git a/net-im/jggtrans/Makefile b/net-im/jggtrans/Makefile index 4bbc135310da..7d28e32ffbcd 100644 --- a/net-im/jggtrans/Makefile +++ b/net-im/jggtrans/Makefile @@ -22,8 +22,8 @@ GNU_CONFIGURE= yes USE_GETTEXT= yes USE_GNOME= glib20 pkgconfig CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" +CFLAGS+= -I${LOCALBASE}/include MAKE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ - CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" USE_RC_SUBR= jggtrans.sh diff --git a/net-im/licq/Makefile.inc b/net-im/licq/Makefile.inc index 26b3ad54ad42..49e7be6162a2 100644 --- a/net-im/licq/Makefile.inc +++ b/net-im/licq/Makefile.inc @@ -22,4 +22,3 @@ WRKSRC?= ${WRKDIR}/${DISTNAME}/plugins/${PORTNAME} PLIST_SUB+= LICQ_DEVEL="@comment " CXXFLAGS+= -Wno-deprecated CONFIGURE_ENV+= CXXFLAGS="${CXXFLAGS}" -MAKE_ENV+= CXXFLAGS="${CXXFLAGS}" diff --git a/net-p2p/btpeer/Makefile b/net-p2p/btpeer/Makefile index 0f56634fba67..407750cc6d74 100644 --- a/net-p2p/btpeer/Makefile +++ b/net-p2p/btpeer/Makefile @@ -18,7 +18,6 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libSockets-devel.a:${PORTSDIR}/net/Sockets-devel USE_GMAKE= yes USE_OPENSSL= yes WITH_OPENSSL_BASE= yes -MAKE_ENV= CXX="${CXX}" # ssl support CFLAGS+= ${PTHREAD_CFLAGS} -DHAVE_OPENSSL diff --git a/net-p2p/deluge/Makefile b/net-p2p/deluge/Makefile index b0c3fffd37cb..225bd34d090d 100644 --- a/net-p2p/deluge/Makefile +++ b/net-p2p/deluge/Makefile @@ -29,8 +29,6 @@ USE_PYTHON= yes USE_PYDISTUTILS=yes INSTALLS_ICONS= yes -MAKE_ENV= CC="${CC}" CXX="${CXX}" - DOCS= LICENSE README .include <bsd.port.pre.mk> diff --git a/net-p2p/deluge05/Makefile b/net-p2p/deluge05/Makefile index b0c3fffd37cb..225bd34d090d 100644 --- a/net-p2p/deluge05/Makefile +++ b/net-p2p/deluge05/Makefile @@ -29,8 +29,6 @@ USE_PYTHON= yes USE_PYDISTUTILS=yes INSTALLS_ICONS= yes -MAKE_ENV= CC="${CC}" CXX="${CXX}" - DOCS= LICENSE README .include <bsd.port.pre.mk> diff --git a/net-p2p/minder/Makefile b/net-p2p/minder/Makefile index 0f886c32ea71..3cbd1e8f9efb 100644 --- a/net-p2p/minder/Makefile +++ b/net-p2p/minder/Makefile @@ -19,7 +19,6 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libSockets.a:${PORTSDIR}/net/Sockets USE_GMAKE= yes USE_OPENSSL= yes WITH_OPENSSL_BASE= yes -MAKE_ENV= CXX="${CXX}" # ssl support CFLAGS+= ${PTHREAD_CFLAGS} -DHAVE_OPENSSL diff --git a/net-p2p/trackerbt/Makefile b/net-p2p/trackerbt/Makefile index 8de9df90baa2..bbac04c0e2d1 100644 --- a/net-p2p/trackerbt/Makefile +++ b/net-p2p/trackerbt/Makefile @@ -20,7 +20,6 @@ USE_GNOME= libxml2 USE_ICONV= yes USE_OPENSSL= yes WITH_OPENSSL_BASE= yes -MAKE_ENV= CXX="${CXX}" # ssl support CFLAGS+= ${PTHREAD_CFLAGS} -DHAVE_OPENSSL diff --git a/net/3proxy/Makefile b/net/3proxy/Makefile index 4fe5d940ba11..aef3e4f5a779 100644 --- a/net/3proxy/Makefile +++ b/net/3proxy/Makefile @@ -18,8 +18,7 @@ COMMENT= Proxy servers set (support HTTP(S), FTP, SOCKS, POP3, TCP & UDP) NO_WRKSUBDIR= yes USE_RC_SUBR= 3proxy.sh MAKEFILE= Makefile.unix -MAKE_ENV= CC="${CC}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" \ +MAKE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" MAN3= 3proxy.conf.3 diff --git a/net/DarwinStreamingServer/Makefile b/net/DarwinStreamingServer/Makefile index 90b970aa3ecb..7bdc0a76dda0 100644 --- a/net/DarwinStreamingServer/Makefile +++ b/net/DarwinStreamingServer/Makefile @@ -35,9 +35,7 @@ SUB_LIST+= PERL=${PERL} PKGMESSAGE= ${WRKDIR}/pkg-message -MAKE_ENV+= CC="${CC}" \ - CXX="${CXX}" \ - MAKE="${MAKE}" \ +MAKE_ENV+= MAKE="${MAKE}" \ DATADIR="${DATADIR}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ diff --git a/net/Sockets-devel/Makefile b/net/Sockets-devel/Makefile index 78f5f59a2bcc..b18af4f5ec70 100644 --- a/net/Sockets-devel/Makefile +++ b/net/Sockets-devel/Makefile @@ -17,7 +17,6 @@ COMMENT= A C++ wrapper for BSD-style sockets USE_GMAKE= yes USE_OPENSSL= yes WITH_OPENSSL_BASE= yes -MAKE_ENV= CXX="${CXX}" post-patch: # PREFIX safeness diff --git a/net/Sockets/Makefile b/net/Sockets/Makefile index ea0c3b7cf330..42a5169521a1 100644 --- a/net/Sockets/Makefile +++ b/net/Sockets/Makefile @@ -16,7 +16,6 @@ COMMENT= A C++ wrapper for BSD-style sockets USE_GMAKE= yes USE_OPENSSL= yes WITH_OPENSSL_BASE= yes -MAKE_ENV= CXX="${CXX}" post-patch: # PREFIX safeness diff --git a/net/asterisk-bristuff/Makefile b/net/asterisk-bristuff/Makefile index b4eef0d36f93..2af86ae95d39 100644 --- a/net/asterisk-bristuff/Makefile +++ b/net/asterisk-bristuff/Makefile @@ -41,8 +41,7 @@ MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ MKDIR="${MKDIR}" \ PWLIBDIR=${LOCALBASE}/share/pwlib \ OPENH323DIR=${LOCALBASE}/share/openh323 \ - OSVERSION=${OSVERSION} \ - CXX="${CXX}" + OSVERSION=${OSVERSION} MAN8= asterisk.8 astgenkey.8 autosupport.8 safe_asterisk.8 .include <bsd.port.pre.mk> diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile index 82e3cac1e173..86938e6d0a46 100644 --- a/net/asterisk/Makefile +++ b/net/asterisk/Makefile @@ -38,8 +38,7 @@ MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PWLIBDIR=${LOCALBASE}/share/pwlib \ OPENH323DIR=${LOCALBASE}/share/openh323 \ OSVERSION=${OSVERSION} \ - NOISY_BUILD=YES \ - CXX="${CXX}" + NOISY_BUILD=YES MAN8= asterisk.8 astgenkey.8 autosupport.8 safe_asterisk.8 OPTIONS= OGGVORBIS "Enable Ogg Vorbis support" on \ diff --git a/net/asterisk10/Makefile b/net/asterisk10/Makefile index 82e3cac1e173..86938e6d0a46 100644 --- a/net/asterisk10/Makefile +++ b/net/asterisk10/Makefile @@ -38,8 +38,7 @@ MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PWLIBDIR=${LOCALBASE}/share/pwlib \ OPENH323DIR=${LOCALBASE}/share/openh323 \ OSVERSION=${OSVERSION} \ - NOISY_BUILD=YES \ - CXX="${CXX}" + NOISY_BUILD=YES MAN8= asterisk.8 astgenkey.8 autosupport.8 safe_asterisk.8 OPTIONS= OGGVORBIS "Enable Ogg Vorbis support" on \ diff --git a/net/asterisk12/Makefile b/net/asterisk12/Makefile index 12ad38f4ee95..0e0d9b24b74d 100644 --- a/net/asterisk12/Makefile +++ b/net/asterisk12/Makefile @@ -42,8 +42,7 @@ MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ MKDIR="${MKDIR}" \ PWLIBDIR=${LOCALBASE}/share/pwlib \ OPENH323DIR=${LOCALBASE}/share/openh323 \ - OSVERSION=${OSVERSION} \ - CXX="${CXX}" + OSVERSION=${OSVERSION} PLIST_SUB= BRISTUFF="@comment " MAN8= asterisk.8 astgenkey.8 autosupport.8 safe_asterisk.8 WITHOUT_FAX= yes # Doesn't build with spandsp-0.0.3. diff --git a/net/asterisk14/Makefile b/net/asterisk14/Makefile index 82e3cac1e173..86938e6d0a46 100644 --- a/net/asterisk14/Makefile +++ b/net/asterisk14/Makefile @@ -38,8 +38,7 @@ MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PWLIBDIR=${LOCALBASE}/share/pwlib \ OPENH323DIR=${LOCALBASE}/share/openh323 \ OSVERSION=${OSVERSION} \ - NOISY_BUILD=YES \ - CXX="${CXX}" + NOISY_BUILD=YES MAN8= asterisk.8 astgenkey.8 autosupport.8 safe_asterisk.8 OPTIONS= OGGVORBIS "Enable Ogg Vorbis support" on \ diff --git a/net/asterisk16/Makefile b/net/asterisk16/Makefile index 82e3cac1e173..86938e6d0a46 100644 --- a/net/asterisk16/Makefile +++ b/net/asterisk16/Makefile @@ -38,8 +38,7 @@ MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PWLIBDIR=${LOCALBASE}/share/pwlib \ OPENH323DIR=${LOCALBASE}/share/openh323 \ OSVERSION=${OSVERSION} \ - NOISY_BUILD=YES \ - CXX="${CXX}" + NOISY_BUILD=YES MAN8= asterisk.8 astgenkey.8 autosupport.8 safe_asterisk.8 OPTIONS= OGGVORBIS "Enable Ogg Vorbis support" on \ diff --git a/net/ccxstream/Makefile b/net/ccxstream/Makefile index 18352063085c..46d4526db8d3 100644 --- a/net/ccxstream/Makefile +++ b/net/ccxstream/Makefile @@ -19,7 +19,6 @@ OPTIONS= SO_KEEPALIVE "Build with SO_KEEPALIVE" ON \ TCP_NODELAY "Build with TCP_NODELAY" OFF USE_GMAKE= yes -MAKE_ENV= CC="${CC}" USE_RC_SUBR= ccxstream PLIST_FILES= \ diff --git a/net/hawknl-devel/Makefile b/net/hawknl-devel/Makefile index beb26187bb3e..7423c5610a40 100644 --- a/net/hawknl-devel/Makefile +++ b/net/hawknl-devel/Makefile @@ -26,8 +26,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}" WRKSRC= ${WRKDIR}/HawkNL1.70 diff --git a/net/hawknl/Makefile b/net/hawknl/Makefile index c61376e3cfbe..39716c46198f 100644 --- a/net/hawknl/Makefile +++ b/net/hawknl/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}" WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION} diff --git a/net/ipfw-graph/Makefile b/net/ipfw-graph/Makefile index 7f24a14e413c..6e95a17f828a 100644 --- a/net/ipfw-graph/Makefile +++ b/net/ipfw-graph/Makefile @@ -15,7 +15,6 @@ MAINTAINER= edwin@mavetju.org COMMENT= Graphical overview of traffic going through your IPFW rules USE_GNOME= gtk12 -MAKE_ENV+= MANPREFIX="${MANPREFIX}" MAN8= ipfw-al.8 ipfw-graph.8 diff --git a/net/ldap2dns/Makefile b/net/ldap2dns/Makefile index ef788a11e188..02ff86246f19 100644 --- a/net/ldap2dns/Makefile +++ b/net/ldap2dns/Makefile @@ -20,7 +20,7 @@ USE_GMAKE= yes USE_OPENLDAP= yes USE_PERL5= yes -MAKE_ENV= PREFIX=${PREFIX} INC=-I${PREFIX}/include LIB=-L${PREFIX}/lib +MAKE_ENV= INC=-I${PREFIX}/include LIB=-L${PREFIX}/lib post-patch: @${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX}," ${WRKSRC}/ldap2dns.c diff --git a/net/mars_nwe/Makefile b/net/mars_nwe/Makefile index bc34460da40a..a6fd2b3cfb9c 100644 --- a/net/mars_nwe/Makefile +++ b/net/mars_nwe/Makefile @@ -19,7 +19,6 @@ MAINTAINER= araujo@FreeBSD.org COMMENT= Netware server emulator for Un*x systems WRKSRC= ${WRKDIR}/mars_nwe -MAKE_ENV= CC="${CC}" PLIST= ${WRKDIR}/PLIST.DYN diff --git a/net/openser/Makefile b/net/openser/Makefile index f84144aca9aa..abf1463d89c5 100644 --- a/net/openser/Makefile +++ b/net/openser/Makefile @@ -20,8 +20,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-tls USE_GMAKE= yes USE_GNOME= libxml2 -MAKE_ENV= CC="${CC}" \ - CC_EXTRA_OPTS="${CFLAGS}" \ +MAKE_ENV= CC_EXTRA_OPTS="${CFLAGS}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" diff --git a/net/tapidbus/Makefile b/net/tapidbus/Makefile index eb92e2ebef15..d391cb04a5fc 100644 --- a/net/tapidbus/Makefile +++ b/net/tapidbus/Makefile @@ -26,7 +26,7 @@ USE_LDCONFIG= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} WRKSRC= ${WRKDIR}/${PORTNAME} -MAKE_ENV+= CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" +MAKE_ENV+= LDFLAGS="${LDFLAGS}" post-patch: @${REINPLACE_CMD} -e 's|\-O2||' ${WRKSRC}/configure diff --git a/net/wistumbler2/Makefile b/net/wistumbler2/Makefile index c2477852c8be..e5424bf69773 100644 --- a/net/wistumbler2/Makefile +++ b/net/wistumbler2/Makefile @@ -15,7 +15,6 @@ DISTNAME= wistumbler${PORTVERSION}-pre7 MAINTAINER= ports@FreeBSD.org COMMENT= Network Stumbler for WaveLAN/IEEE Wireless -MAKE_ENV= PREFIX=${LOCALBASE} USE_GTK=1 WRKSRC= ${WRKDIR}/${DISTNAME} USE_GNOME= gtk20 @@ -25,17 +24,13 @@ MAN1= wistumbler2.1 PLIST_FILES= bin/wistumbler2 .if defined(NO_X) -MAKE_ENV= PREFIX=${LOCALBASE} USE_GTK=0 +MAKE_ENV= USE_GTK=0 +.else +MAKE_ENV= USE_GTK=1 .endif .include <bsd.port.pre.mk> -# this port needs the file /sys/dev/owi/if_ieee80211.h, but there -# was not a FreeBSD version bump specifically for that. Use the -# nearest one. -.if ${OSVERSION} < 501107 -IGNORE= requires newer kernel sources -.endif .if ${OSVERSION} > 700045 IGNORE= is not supported on FreeBSD 7.X and later .endif diff --git a/net/yate-devel/Makefile b/net/yate-devel/Makefile index 3436ae099687..8e46f3ed12d2 100644 --- a/net/yate-devel/Makefile +++ b/net/yate-devel/Makefile @@ -31,8 +31,7 @@ CONFIGURE_ARGS= --without-fdsize \ --mandir=${LOCALBASE}/man CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -MAKE_ENV= CXX="${CXX}" \ - PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ +MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" \ PWLIBDIR=${LOCALBASE}/share/pwlib \ OPENH323DIR=${LOCALBASE}/share/openh323 diff --git a/news/fidogate/Makefile b/news/fidogate/Makefile index b7f4352ca0a9..1eff3c2d142d 100644 --- a/news/fidogate/Makefile +++ b/news/fidogate/Makefile @@ -30,8 +30,6 @@ DOCLIST= fidogate.texi fidogate.txt gatebau94.txt kludge-rfc.doc \ template.html fido howto misc rfc gatebau/msgid.sgml \ gatebau/msgid.tex gatebau/msgid.txt -MAKE_ENV+= CC=${CC} - .include <bsd.port.pre.mk> pre-configure: diff --git a/polish/ekg2/Makefile b/polish/ekg2/Makefile index 326df18bc83e..93dd8c560599 100644 --- a/polish/ekg2/Makefile +++ b/polish/ekg2/Makefile @@ -40,11 +40,11 @@ CONFIGURE_ARGS+= --enable-shared \ --with-libgadu CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ - CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ + CFLAGS="${CFLAGS}" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -lintl" MAKE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ - CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" +CFLAGS+= -I${LOCALBASE}/include USE_LDCONFIG= yes diff --git a/ports-mgmt/qtpkg/Makefile b/ports-mgmt/qtpkg/Makefile index fac1a30cf1b8..72656b177d5a 100644 --- a/ports-mgmt/qtpkg/Makefile +++ b/ports-mgmt/qtpkg/Makefile @@ -15,7 +15,8 @@ DISTNAME= qtpkg MAINTAINER= ports@FreeBSD.org COMMENT= A Qt based package removal tool -MAKE_ENV= LIBS="-lqt-mt ${PTHREAD_LIBS}" CFLAGS="${PTHREAD_CFLAGS}" +CFLAGS+= ${PTHREAD_CFLAGS} +MAKE_ENV= LIBS="-lqt-mt ${PTHREAD_LIBS}" PLIST_FILES= sbin/qtpkg USE_QT_VER= 3 diff --git a/print/ghostscript-gnu/Makefile b/print/ghostscript-gnu/Makefile index 48235a4ef06e..5c7f2134ab6c 100644 --- a/print/ghostscript-gnu/Makefile +++ b/print/ghostscript-gnu/Makefile @@ -66,7 +66,7 @@ CONFLICTS= gambc-* ghostscript-gpl-* USE_BZIP2= yes USE_GMAKE= yes -MAKE_ENV= CC="${CC}" CXX="${CXX}" CFLAGS_STANDARD="${CFLAGS}" \ +MAKE_ENV= CFLAGS_STANDARD="${CFLAGS}" \ XCFLAGS="${XCFLAGS}" PLIST_SUB= GS_VERSION="${GS_VERSION}" diff --git a/print/ghostscript-gpl/Makefile b/print/ghostscript-gpl/Makefile index c66912479d93..7876fffdec5d 100644 --- a/print/ghostscript-gpl/Makefile +++ b/print/ghostscript-gpl/Makefile @@ -33,7 +33,7 @@ WANT_GNOME= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes -MAKE_ENV= CC="${CC}" CXX="${CXX}" CFLAGS_STANDARD="${CFLAGS}" \ +MAKE_ENV= CFLAGS_STANDARD="${CFLAGS}" \ XCFLAGS="${XCFLAGS}" XLDFLAGS="${XLDFLAGS}" \ EXTRALIBS="${EXTRALIBS}" \ SOC_LOADER="dxmainc.c" diff --git a/print/ghostscript7/Makefile b/print/ghostscript7/Makefile index 2823d3cbb9fb..ce4aa9992a74 100644 --- a/print/ghostscript7/Makefile +++ b/print/ghostscript7/Makefile @@ -35,7 +35,7 @@ CONFLICTS= gambc-* ghostscript8-* USE_BZIP2= yes USE_GMAKE= yes GNU_CONFIGURE= yes -MAKE_ENV= CC="${CC}" CXX="${CXX}" CFLAGS_STANDARD="${CFLAGS}" \ +MAKE_ENV= CFLAGS_STANDARD="${CFLAGS}" \ XCFLAGS="${XCFLAGS}" XLDFLAGS="${XLDFLAGS}" \ EXTRALIBS="${EXTRALIBS}" CONFIGURE_ENV= ${MAKE_ENV} \ diff --git a/print/ghostscript8/Makefile b/print/ghostscript8/Makefile index 4109f818c342..fc26939253bd 100644 --- a/print/ghostscript8/Makefile +++ b/print/ghostscript8/Makefile @@ -33,7 +33,7 @@ WANT_GNOME= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes -MAKE_ENV= CC="${CC}" CXX="${CXX}" CFLAGS_STANDARD="${CFLAGS}" \ +MAKE_ENV= CFLAGS_STANDARD="${CFLAGS}" \ XCFLAGS="${XCFLAGS}" XLDFLAGS="${XLDFLAGS}" \ EXTRALIBS="${EXTRALIBS}" \ SOC_LOADER="dxmainc.c" diff --git a/print/pcal/Makefile b/print/pcal/Makefile index 8e74e00951e0..6499f9707090 100644 --- a/print/pcal/Makefile +++ b/print/pcal/Makefile @@ -15,7 +15,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= laszlof@FreeBSD.org COMMENT= PostScript calendar program -MAKE_ENV= CC="${CC}" HOST_CC="${CC}" +MAKE_ENV= HOST_CC="${CC}" ALL_TARGET= USE_GMAKE= yes diff --git a/print/py-cups/Makefile b/print/py-cups/Makefile index 74d191550311..6a8c2afdadd0 100644 --- a/print/py-cups/Makefile +++ b/print/py-cups/Makefile @@ -23,7 +23,7 @@ USE_BZIP2= yes USE_PYDISTUTILS= yes CFLAGS+= -I${LOCALBASE}/include -DVERSION=\\\"${PORTVERSION}\\\" LDFLAGS+= -L${LOCALBASE}/lib -liconv -MAKE_ENV= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" +MAKE_ENV= LDFLAGS="${LDFLAGS}" PYDISTUTILS_EGGINFO=${PORTNAME}-1.0-py2.5.egg-info PLIST_FILES= %%PYTHON_SITELIBDIR%%/cups.so diff --git a/print/tex-omegaware-old/Makefile b/print/tex-omegaware-old/Makefile index 00bdea394b63..56a192230292 100644 --- a/print/tex-omegaware-old/Makefile +++ b/print/tex-omegaware-old/Makefile @@ -28,8 +28,7 @@ TETEX_SRC= tetex-src-${PORTVERSION}.tar.gz TETEX_TEXMF= tetex-texmf-${PORTVERSION}.tar.gz TEXMF_TREE= ${PREFIX}/share/texmf -MAKE_ENV= PREFIX="${PREFIX}" \ - LN="${LN}" \ +MAKE_ENV= LN="${LN}" \ INSTALL_PROGRAM="${INSTALL_PROGRAM}" GNU_CONFIGURE= YES CONFIGURE_ARGS= --disable-multiplatform \ diff --git a/russian/libcyrillic/Makefile b/russian/libcyrillic/Makefile index ffcffec0acc9..5db6a6c08c55 100644 --- a/russian/libcyrillic/Makefile +++ b/russian/libcyrillic/Makefile @@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME:S/^lib//}-${PORTVERSION} MAINTAINER= pavel@ext.by COMMENT= Text manipulation and autodetection for 6 major cyrillic charsets -MAKE_ENV= WRKSRC="${WRKSRC}" CFLAGS="${CFLAGS}" +MAKE_ENV= WRKSRC="${WRKSRC}" MAKEFILE= ${FILESDIR}/Makefile.bsd USE_LDCONFIG= yes diff --git a/science/afni/Makefile b/science/afni/Makefile index 960603e19b63..aacc35688742 100644 --- a/science/afni/Makefile +++ b/science/afni/Makefile @@ -45,7 +45,6 @@ USE_GETTEXT= yes USE_GMAKE= yes USE_ICONV= yes USE_MOTIF= yes -MAKE_ENV= CC="${CC}" WRKSRC= ${WRKDIR}/afni_src MAKEFILE= Makefile.FreeBSD_PORT diff --git a/science/g3data/Makefile b/science/g3data/Makefile index f7d6b85f6b93..e17b837f79a4 100644 --- a/science/g3data/Makefile +++ b/science/g3data/Makefile @@ -20,7 +20,6 @@ BUILD_DEPENDS= nsgmls:${PORTSDIR}/textproc/jade \ USE_GNOME= gtk20 ALL_TARGET= -MAKE_ENV= PREFIX=${PREFIX} MAN1= g3data.1 MANCOMPRESSED= yes PLIST_FILES= bin/g3data %%EXAMPLESDIR%%/test1.png %%EXAMPLESDIR%%/test1.values \ diff --git a/science/liblinear/Makefile b/science/liblinear/Makefile index f2b6e546085c..d34f03ef7517 100644 --- a/science/liblinear/Makefile +++ b/science/liblinear/Makefile @@ -19,8 +19,6 @@ OPTIONS= OCFLAGS "Use optimized CFLAGS" On USE_ZIP= yes -MAKE_ENV= CC="${CC}" CXX="${CXX}" - TXT_DOCS= COPYRIGHT README .if !defined(NOPORTDOCS) diff --git a/science/paraview/Makefile b/science/paraview/Makefile index 7ea45ef9043d..1f1ad40fc4ce 100644 --- a/science/paraview/Makefile +++ b/science/paraview/Makefile @@ -43,8 +43,6 @@ CMAKE_SOURCE_PATH= .. PLIST_SUB+= VERMAJORMINOR=2.4 CMAKE2INST= Utilities/ParaViewConfig.cmake ParaViewConfig.cmake \ ParaViewLibraryDepends.cmake cmake_install.cmake -MAKE_ENV= CC="${CC}" \ - CXX="${CXX}" LIB_INSTDIR= ${PREFIX}/lib/${PORTNAME}-${PORTVERSION:R} post-extract: |