aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPav Lucistnik <pav@FreeBSD.org>2008-07-25 12:48:47 +0000
committerPav Lucistnik <pav@FreeBSD.org>2008-07-25 12:48:47 +0000
commit2f35b73926abf3d3de21382a8a16414200fa2d5b (patch)
treeba424f33251d8f6c55d5b3a690abf181b6a819ee
parent8c8dbd7325f0c5cd3837737357a4e2cdd953cee5 (diff)
downloadports-2f35b73926abf3d3de21382a8a16414200fa2d5b.tar.gz
ports-2f35b73926abf3d3de21382a8a16414200fa2d5b.zip
Notes
-rw-r--r--security/bro/Makefile1
-rw-r--r--security/openssl/Makefile1
-rw-r--r--security/pft/Makefile1
-rw-r--r--security/pgp/Makefile2
-rw-r--r--security/poly1305aes/Makefile2
-rw-r--r--security/tlswrap/Makefile1
-rw-r--r--security/tthsum/Makefile2
-rw-r--r--security/vpnc/Makefile3
-rw-r--r--shells/ksh93/Makefile2
-rw-r--r--sysutils/anacron/Makefile1
-rw-r--r--sysutils/bacula-bat/Makefile2
-rw-r--r--sysutils/devcpu/Makefile5
-rw-r--r--sysutils/gkrellm/Makefile2
-rw-r--r--sysutils/gkrellm2/Makefile2
-rw-r--r--sysutils/isomaster/Makefile2
-rw-r--r--sysutils/nbosd/Makefile2
-rw-r--r--sysutils/pfstat/Makefile2
-rw-r--r--sysutils/pftop/Makefile2
-rw-r--r--sysutils/thefish/Makefile3
-rw-r--r--textproc/Ebnf2ps/Makefile1
-rw-r--r--textproc/antiword/Makefile1
-rw-r--r--textproc/hevea/Makefile1
-rw-r--r--textproc/hhm/Makefile1
-rw-r--r--textproc/l2a/Makefile2
-rw-r--r--textproc/libcsv/Makefile2
-rw-r--r--textproc/mguesser/Makefile1
-rw-r--r--textproc/tinyxml/Makefile1
-rw-r--r--textproc/xmlada-gcc/Makefile3
-rw-r--r--www/dfileserver/Makefile2
-rw-r--r--www/newsbeuter/Makefile1
-rw-r--r--www/polipo/Makefile1
-rw-r--r--www/srg/Makefile3
-rw-r--r--x11-fm/emelfm2/Makefile2
-rw-r--r--x11-fm/filerunner/Makefile1
-rw-r--r--x11-fonts/ttmkfdir/Makefile2
-rw-r--r--x11-toolkits/gtk-sharp10/Makefile2
-rw-r--r--x11-toolkits/gtkada-gcc/Makefile5
-rw-r--r--x11-toolkits/irrlicht/Makefile1
-rw-r--r--x11-toolkits/scintilla/Makefile1
-rw-r--r--x11-wm/wmanager/Makefile3
-rw-r--r--x11/libcapplet/Makefile2
-rw-r--r--x11/nvidia-settings/Makefile1
-rw-r--r--x11/nvidia-xconfig/Makefile3
-rw-r--r--x11/xbindkeys_config/Makefile2
44 files changed, 25 insertions, 58 deletions
diff --git a/security/bro/Makefile b/security/bro/Makefile
index 297edfc893cc..c8fb5dde9f20 100644
--- a/security/bro/Makefile
+++ b/security/bro/Makefile
@@ -25,7 +25,6 @@ WRKSRC= ${WRKDIR}/bro-${PORTVERSION}.1
USE_BISON= build
USE_LDCONFIG= ${PREFIX}/share
GNU_CONFIGURE= yes
-MAKE_ENV+= CC="${CC}"
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --libdir=${PREFIX}/share
USE_PERL5= yes
diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index acc7d8932207..cf639513bd21 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -48,7 +48,6 @@ EXTRACONFIGURE+= enable-camellia
.endif
MAKE_ARGS+= WHOLE_ARCHIVE_FLAG=--whole-archive
-MAKE_ENV+= MANPREFIX=${MANPREFIX}
NOPRECIOUSMAKEVARS= Too many _MLINKS for fetch
NOPRECIOUSSOFTMAKEVARS= Too many _MLINKS for fetch
USE_PERL5_BUILD= yes
diff --git a/security/pft/Makefile b/security/pft/Makefile
index 52a7cdffa4fa..2bf0a1a4f6b1 100644
--- a/security/pft/Makefile
+++ b/security/pft/Makefile
@@ -18,7 +18,6 @@ COMMENT= Printer Job Language library and tool
NO_WRKSUBDIR= yes
ALL_TARGET= libPJL.a
USE_GMAKE= yes
-MAKE_ENV= CXX="${CXX}"
PLIST_FILES= bin/pft lib/libPJL.a
diff --git a/security/pgp/Makefile b/security/pgp/Makefile
index 28afa6d34027..9075a5f3aa97 100644
--- a/security/pgp/Makefile
+++ b/security/pgp/Makefile
@@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/src
MAKEFILE= makefile
ALL_TARGET= freebsd-${MACHINE_ARCH}
-MAKE_ENV= PREFIX="${PREFIX}" OS_CFLAGS="${CFLAGS}"
+MAKE_ENV= OS_CFLAGS="${CFLAGS}"
PGPLIB= ${PREFIX}/share/pgp
MAN1= pgp.1 pgp2.1
ONLY_FOR_ARCHS= i386 alpha
diff --git a/security/poly1305aes/Makefile b/security/poly1305aes/Makefile
index 317c6e79fb20..17a378d5082f 100644
--- a/security/poly1305aes/Makefile
+++ b/security/poly1305aes/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://cr.yp.to/mac/
MAINTAINER= roam@FreeBSD.org
COMMENT= The poly1305 message authentication reference implementation using AES
-MAKE_ENV+= CC="${CC} ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} ${STRIP}"
+CC+= ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} ${STRIP}
ALL_TARGET= default
REPLACE_HDRS= aes.h cpucycles.h poly1305aes.h
diff --git a/security/tlswrap/Makefile b/security/tlswrap/Makefile
index 1abf475653d9..2673975f507d 100644
--- a/security/tlswrap/Makefile
+++ b/security/tlswrap/Makefile
@@ -15,7 +15,6 @@ DISTNAME= ${PORTNAME}-1.04
MAINTAINER= araujo@FreeBSD.org
COMMENT= An FTP proxy that wraps data and control with TLS/SSL
-MAKE_ENV+= CC="${CC}"
GNU_CONFIGURE= yes
USE_OPENSSL= yes
diff --git a/security/tthsum/Makefile b/security/tthsum/Makefile
index 57b5f08f4c8a..c80e70f5a13e 100644
--- a/security/tthsum/Makefile
+++ b/security/tthsum/Makefile
@@ -15,7 +15,7 @@ COMMENT= A command-line utility for generating and checking TTH message digests
USE_GMAKE= yes
-MAKE_ENV= CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+MAKE_ENV= LDFLAGS="${LDFLAGS}"
PORTDOCS= Changelog.txt
PLIST_FILES= bin/tthsum
diff --git a/security/vpnc/Makefile b/security/vpnc/Makefile
index 994d401c44ba..68f94fb21430 100644
--- a/security/vpnc/Makefile
+++ b/security/vpnc/Makefile
@@ -30,8 +30,7 @@ OPTIONS+= DECRYPT "cisco-decypt password decrypt utility" on
OPTIONS+= SSL "OpenSSL certificate support (hybrid only)" off
OPTIONS+= CISCOVERSION "Mask linux presentation string" off
-MAKE_ENV+= LDFLAGS="${LDFLAGS}" CFLAGS="${CFLAGS}" CC="${CC}" \
- BINS="${EXTRABUILDS}"
+MAKE_ENV+= LDFLAGS="${LDFLAGS}" BINS="${EXTRABUILDS}"
.include <bsd.port.pre.mk>
diff --git a/shells/ksh93/Makefile b/shells/ksh93/Makefile
index 2809d027ecc1..0243650576e1 100644
--- a/shells/ksh93/Makefile
+++ b/shells/ksh93/Makefile
@@ -34,7 +34,7 @@ RESTRICTED= Source recipient must acknowledge license
FETCH_ENV= HTTP_AUTH='basic:*:I accept www.opensource.org/licenses/cpl:.'
FETCH_CMD= /usr/bin/fetch -Rr # see bin/76134
NO_WRKSUBDIR= yes
-MAKE_ENV= CCFLAGS="${CFLAGS}" SHELL="${SH}"
+MAKE_ENV= CCFLAGS="${CFLAGS}"
.if defined(WANT_STATIC)
MAKE_ENV+= LDFLAGS=-static
.endif
diff --git a/sysutils/anacron/Makefile b/sysutils/anacron/Makefile
index 38daaa281788..6edb3417d8a9 100644
--- a/sysutils/anacron/Makefile
+++ b/sysutils/anacron/Makefile
@@ -20,7 +20,6 @@ MAN5= anacrontab.5
USE_GMAKE= yes
USE_RC_SUBR= anacron.sh
SUB_FILES= pkg-message
-MAKE_ENV= CC="${CC}"
post-patch:
.for f in Makefile anacron.8 anacrontab.5
diff --git a/sysutils/bacula-bat/Makefile b/sysutils/bacula-bat/Makefile
index f0ebff87db77..5277500c88a0 100644
--- a/sysutils/bacula-bat/Makefile
+++ b/sysutils/bacula-bat/Makefile
@@ -19,8 +19,6 @@ WITH_BAT= yes
MAN1= bat.1
MAKE_ARGS= -E MAN1
-MAKE_ENV= MAN1="${MAN1}"
-
MAKE_ENV+= MAKEOBJDIRPREFIX=/
MASTERDIR= ${.CURDIR}/../../sysutils/bacula-server
diff --git a/sysutils/devcpu/Makefile b/sysutils/devcpu/Makefile
index 942bf309afe5..e95cdfbccf9c 100644
--- a/sysutils/devcpu/Makefile
+++ b/sysutils/devcpu/Makefile
@@ -27,7 +27,7 @@ NO_PACKAGE= depends on kernel
PLIST_SUB= KMODDIR="${KMODDIR:C,^/,,}"
KMODDIR= /boot/modules
-MAKE_ENV+= KMODDIR="${KMODDIR}"
+MAKE_ENV+= KMODDIR="${KMODDIR}" BINDIR="${PREFIX}/bin"
STAMPFILE= ${LOCALBASE}/share/${PORTNAME}/.do_not_delete
@@ -50,9 +50,6 @@ PLIST_SUB+= EXTRACTOR=""
PLIST_SUB+= EXTRACTOR="@comment "
.endif
-MAKE_ENV+= KMODDIR="${KMODDIR}" \
- BINDIR="${PREFIX}/bin"
-
.if !exists(${SRC_BASE}/sys/Makefile)
IGNORE= requires kernel source to be installed
.endif
diff --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile
index f42efcb4a520..e2faba80ea57 100644
--- a/sysutils/gkrellm/Makefile
+++ b/sysutils/gkrellm/Makefile
@@ -51,7 +51,7 @@ BINMODE= 4511
BINMODE= 2511
.endif
-MAKE_ENV+= CC="${CC}" LOCALEDIR=${PREFIX}/share/locale
+MAKE_ENV+= LOCALEDIR=${PREFIX}/share/locale
CFLAGS+= -DSYSTEM_THEMES_DIR='\"${PREFIX}/share/gkrellm/themes\"' \
-DSYSTEM_PLUGINS_DIR='\"${PREFIX}/libexec/gkrellm/plugins\"'
diff --git a/sysutils/gkrellm2/Makefile b/sysutils/gkrellm2/Makefile
index 27e7621bab67..4f4ce7d4bd78 100644
--- a/sysutils/gkrellm2/Makefile
+++ b/sysutils/gkrellm2/Makefile
@@ -84,7 +84,7 @@ ALL_TARGET= freebsd
INSTALL_TARGET= install_freebsd
.endif
-MAKE_ENV+= CC="${CC}" INSTALLROOT=${LOCALBASE} INSTALLDIR=${LOCALBASE}/bin \
+MAKE_ENV+= INSTALLROOT=${LOCALBASE} INSTALLDIR=${LOCALBASE}/bin \
PKGCONFIGDIR=${LOCALBASE}/libdata/pkgconfig \
SINSTALLROOT=${PREFIX} SINSTALLDIR=${PREFIX}/sbin \
SPKGCONFIGDIR=${PREFIX}/libdata/pkgconfig \
diff --git a/sysutils/isomaster/Makefile b/sysutils/isomaster/Makefile
index 5ca912f7cebf..ad9ace8aa059 100644
--- a/sysutils/isomaster/Makefile
+++ b/sysutils/isomaster/Makefile
@@ -18,7 +18,7 @@ USE_GNOME= gtk20 pkgconfig intlhack gnomehier
USE_GMAKE= yes
USE_GETTEXT= yes
-MAKE_ENV= PREFIX=${PREFIX} DESKTOPPATH=${DESKTOPDIR}
+MAKE_ENV= DESKTOPPATH=${DESKTOPDIR}
MAKE_ARGS= CFLAGS="${CFLAGS}"
CFLAGS+= ${PTHREAD_CFLAGS} ${PTHREAD_LIBS:S/"//g} \
`pkg-config --cflags gtk+-2.0` \
diff --git a/sysutils/nbosd/Makefile b/sysutils/nbosd/Makefile
index 8a23b3eb6082..5105dbe0acb4 100644
--- a/sysutils/nbosd/Makefile
+++ b/sysutils/nbosd/Makefile
@@ -18,8 +18,6 @@ BUILD_DEPENDS= xosd-config:${PORTSDIR}/misc/xosd
PLIST_FILES= bin/nbosd
PORTDOCS= *
-MAKE_ENV+= PREFIX=${PREFIX}
-
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/nbosd ${PREFIX}/bin
diff --git a/sysutils/pfstat/Makefile b/sysutils/pfstat/Makefile
index 95d3aecb6529..102155ad67ff 100644
--- a/sysutils/pfstat/Makefile
+++ b/sysutils/pfstat/Makefile
@@ -18,7 +18,7 @@ COMMENT= Utility to render graphical statistics for pf
LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd
MAKE_ARGS= "LD_GD=gd"
-MAKE_ENV+= CFLAGS="${CFLAGS}" CC="${CC}" __MAKE_CONF=/dev/null
+MAKE_ENV+= __MAKE_CONF=/dev/null
USE_ICONV= yes
MAN8= pfstat.8 \
diff --git a/sysutils/pftop/Makefile b/sysutils/pftop/Makefile
index 90148d1aa017..dc367f6f423e 100644
--- a/sysutils/pftop/Makefile
+++ b/sysutils/pftop/Makefile
@@ -41,7 +41,7 @@ MAKE_ARGS= LOCALBASE="${PREFIX}" OSLEVEL=41
CFLAGS+= -DHAVE_ALTQ=1
.endif
-MAKE_ENV+= CC="${CC}" CFLAGS="${CFLAGS}" __MAKE_CONF=/dev/null
+MAKE_ENV+= __MAKE_CONF=/dev/null
PLIST_FILES= sbin/pftop
diff --git a/sysutils/thefish/Makefile b/sysutils/thefish/Makefile
index 30a9d0907d1e..d1b70420301c 100644
--- a/sysutils/thefish/Makefile
+++ b/sysutils/thefish/Makefile
@@ -15,8 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= mmendez@energyhq.be
COMMENT= Qt/Gtk+/ncurses rc.conf editor/management tool
-MAKE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" \
- LOCALBASE="${LOCALBASE}"
+MAKE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}"
WANT_GNOME= yes
diff --git a/textproc/Ebnf2ps/Makefile b/textproc/Ebnf2ps/Makefile
index acf58da82a4e..60c1c6faa4c1 100644
--- a/textproc/Ebnf2ps/Makefile
+++ b/textproc/Ebnf2ps/Makefile
@@ -26,7 +26,6 @@ USE_GMAKE= yes
USE_XORG= x11
USE_SUBMAKE= yes
-MAKE_ENV+= X11BASE=${X11BASE}
.if defined(AFMPATH)
MAKE_ENV+= AFMPATH=${AFMPATH}
.endif
diff --git a/textproc/antiword/Makefile b/textproc/antiword/Makefile
index be493ff1976d..48321d56920c 100644
--- a/textproc/antiword/Makefile
+++ b/textproc/antiword/Makefile
@@ -23,7 +23,6 @@ PORTDOCS= COPYING ChangeLog Emacs Exmh FAQ History Mozilla Mutt Netscape \
QandA ReadMe antiword.1 antiword.man antiword.php testdoc.doc
CFLAGS+= -DNDEBUG
-MAKE_ENV+= CC="${CC}"
post-patch:
@${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} \
diff --git a/textproc/hevea/Makefile b/textproc/hevea/Makefile
index f1ddaa2ff8a3..5390959830fd 100644
--- a/textproc/hevea/Makefile
+++ b/textproc/hevea/Makefile
@@ -22,7 +22,6 @@ COMMENT= Convert LaTeX to HTML
BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml
PLIST_SUB= HEVEAVERSION=${PORTVERSION}
-MAKE_ENV= PREFIX=${PREFIX}
.include <bsd.port.pre.mk>
diff --git a/textproc/hhm/Makefile b/textproc/hhm/Makefile
index 666bcff38e92..fef7669888c3 100644
--- a/textproc/hhm/Makefile
+++ b/textproc/hhm/Makefile
@@ -17,7 +17,6 @@ COMMENT= HTML Help Maker
LIB_DEPENDS= lzxcomp.1:${PORTSDIR}/archivers/liblzxcomp
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-MAKE_ENV= PREFIX=${PREFIX}
PLIST_FILES= bin/hhm
diff --git a/textproc/l2a/Makefile b/textproc/l2a/Makefile
index 2b64f602d1ba..c84773707562 100644
--- a/textproc/l2a/Makefile
+++ b/textproc/l2a/Makefile
@@ -17,7 +17,7 @@ COMMENT= L2a - LaTeX to ASCII converter
USE_ZIP= yes
WRKSRC= ${WRKDIR}
-MAKE_ENV= PREFIX="${PREFIX}" INSTALL_PROGRAM="${INSTALL_PROGRAM}" INSTALL_MAN="${INSTALL_MAN}"
+MAKE_ENV= INSTALL_PROGRAM="${INSTALL_PROGRAM}" INSTALL_MAN="${INSTALL_MAN}"
MAN1= l2a.1
PLIST_FILES= bin/l2a
diff --git a/textproc/libcsv/Makefile b/textproc/libcsv/Makefile
index 1cc4866260ca..9aba85a42378 100644
--- a/textproc/libcsv/Makefile
+++ b/textproc/libcsv/Makefile
@@ -13,8 +13,6 @@ MASTER_SITES= SF
MAINTAINER= skv@FreeBSD.org
COMMENT= Small, simple and fast CSV library
-MAKE_ENV= PREFIX=${PREFIX}
-
USE_LDCONFIG= YES
SHLIB_MAJOR= 2
PLIST_SUB= SHLIB_MAJOR="${SHLIB_MAJOR}"
diff --git a/textproc/mguesser/Makefile b/textproc/mguesser/Makefile
index 4ea5789e77c2..3e7a97a4eed8 100644
--- a/textproc/mguesser/Makefile
+++ b/textproc/mguesser/Makefile
@@ -14,7 +14,6 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A tool for guessing a text's charset and language
CFLAGS+= -DUDM_GUESSER_STANDALONG -DLMDIR=\"${PREFIX}/share/mguesser\"
-MAKE_ENV+= CFLAGS="${$CFLAGS}"
post-patch:
${REINPLACE_CMD} -E \
diff --git a/textproc/tinyxml/Makefile b/textproc/tinyxml/Makefile
index a2b6c265e08a..ea8e33f8ad3c 100644
--- a/textproc/tinyxml/Makefile
+++ b/textproc/tinyxml/Makefile
@@ -17,7 +17,6 @@ MAINTAINER= skv@FreeBSD.org
COMMENT= Small C++ XML parser
WRKSRC= ${WRKDIR}/${PORTNAME}
-MAKE_ENV= PREFIX=${PREFIX}
USE_LDCONFIG= YES
SHLIB_MAJOR= 2
diff --git a/textproc/xmlada-gcc/Makefile b/textproc/xmlada-gcc/Makefile
index a769d448cf16..e193792793b0 100644
--- a/textproc/xmlada-gcc/Makefile
+++ b/textproc/xmlada-gcc/Makefile
@@ -31,8 +31,9 @@ WRKSRC= ${WRKDIR}/xmlada-gnat-5_04a
CONFLICTS= xmlada-[0-9]*
+CC= ${LOCALBASE}/bin/gcc41/gcc41
CONFIGURE_ENV+= PATH=${LOCALBASE}/bin/gcc41:${PATH} CC=${LOCALBASE}/bin/gcc41/gcc41
-MAKE_ENV+= PATH=${LOCALBASE}/bin/gcc41:${PATH} CC=${LOCALBASE}/bin/gcc41/gcc41
+MAKE_ENV+= PATH=${LOCALBASE}/bin/gcc41:${PATH}
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/www/dfileserver/Makefile b/www/dfileserver/Makefile
index 581a4c114f30..314aa63ff01b 100644
--- a/www/dfileserver/Makefile
+++ b/www/dfileserver/Makefile
@@ -17,8 +17,6 @@ PLIST_FILES= bin/dfileserver
WRKSRC= ${WRKDIR}/${PORTNAME}
-MAKE_ENV= CXX=${CXX}
-
post-patch:
${REINPLACE_CMD} 's,g++,${CXX},;s,$$GCCFLAGS,${CXXFLAGS},; \
s,strip,${STRIP_CMD},' ${WRKSRC}/build.sh
diff --git a/www/newsbeuter/Makefile b/www/newsbeuter/Makefile
index f5d44737bb57..8beb3d5a0b77 100644
--- a/www/newsbeuter/Makefile
+++ b/www/newsbeuter/Makefile
@@ -22,7 +22,6 @@ USE_GETTEXT= yes
USE_PERL5_BUILD=yes
USE_SQLITE= yes
USE_RUBY= yes
-MAKE_ENV= CXX="${CXX}"
MAN1= newsbeuter.1 podbeuter.1
diff --git a/www/polipo/Makefile b/www/polipo/Makefile
index b518b454cee4..2879f84625d9 100644
--- a/www/polipo/Makefile
+++ b/www/polipo/Makefile
@@ -15,7 +15,6 @@ MAINTAINER= frank@pinky.sax.de
COMMENT= A small and fast caching web proxy
MAN1= polipo.1
-MAKE_ENV= CC="${CC}"
USE_RC_SUBR= polipo.sh
diff --git a/www/srg/Makefile b/www/srg/Makefile
index ee11d5201f75..eef379a1b2f4 100644
--- a/www/srg/Makefile
+++ b/www/srg/Makefile
@@ -20,8 +20,7 @@ USE_GMAKE= yes
USE_BISON= build
USE_BZIP2= yes
NO_INSTALL_MANPAGES= yes
-MAKE_ENV= CC="${CC}" CXX="${CXX}" \
- CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+MAKE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
post-patch:
${REINPLACE_CMD} -e 's|-g |${CFLAGS} ${CPPFLAGS} |' ${WRKSRC}/Makefile \
diff --git a/x11-fm/emelfm2/Makefile b/x11-fm/emelfm2/Makefile
index b478dcfd26a8..9c2866816a20 100644
--- a/x11-fm/emelfm2/Makefile
+++ b/x11-fm/emelfm2/Makefile
@@ -21,7 +21,7 @@ INSTALL_TARGET= install
CFLAGS+= ${PTHREAD_CFLAGS}
LDFLAGS+= ${PTHREAD_LIBS}
-MAKE_ENV= CC=${CC} LDFLAGS="${LDFLAGS}" DOC_DIR="${DOCSDIR}/"
+MAKE_ENV= LDFLAGS="${LDFLAGS}" DOC_DIR="${DOCSDIR}/"
MAN1= emelfm2.1
OPTIONS= DEBUG "Enable debugging messages" off \
diff --git a/x11-fm/filerunner/Makefile b/x11-fm/filerunner/Makefile
index 08bdfc5d2d15..bd93e9d3cdb1 100644
--- a/x11-fm/filerunner/Makefile
+++ b/x11-fm/filerunner/Makefile
@@ -19,7 +19,6 @@ COMMENT= Filemanager with FTP capabilities. Uses Tcl/Tk
LIB_DEPENDS= tk84.1:${PORTSDIR}/x11-toolkits/tk84
MAKEFILE= Makefile.freebsd_gcc
-MAKE_ENV+= LOCALBASE=${LOCALBASE}
pre-build:
# @ ${RM} ${WRKSRC}/ext.so
diff --git a/x11-fonts/ttmkfdir/Makefile b/x11-fonts/ttmkfdir/Makefile
index b906e64c6145..15bdfc5f5378 100644
--- a/x11-fonts/ttmkfdir/Makefile
+++ b/x11-fonts/ttmkfdir/Makefile
@@ -22,7 +22,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_XORG= x11
-MAKE_ENV= LDFLAGS="${LDFLAGS}" CXXFLAGS="${CFLAGS}" CXX="${CXX}"
+MAKE_ENV= LDFLAGS="${LDFLAGS}"
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/ttmkfdir ${PREFIX}/bin
diff --git a/x11-toolkits/gtk-sharp10/Makefile b/x11-toolkits/gtk-sharp10/Makefile
index f67625d8497e..e5123ee64431 100644
--- a/x11-toolkits/gtk-sharp10/Makefile
+++ b/x11-toolkits/gtk-sharp10/Makefile
@@ -28,8 +28,6 @@ USE_GNOME= gnomehack gtkhtml3 vte librsvg2 libgnomecanvas \
USE_AUTOTOOLS= libtool:15
-MAKE_ENV=MONO_SHARED_DIR=${WRKDIR}
-
post-patch:
@${FIND} ${WRKSRC} -name '*.pl' | ${XARGS} ${REINPLACE_CMD} -e \
's|^#!/usr/bin/perl|#!${PERL}|'
diff --git a/x11-toolkits/gtkada-gcc/Makefile b/x11-toolkits/gtkada-gcc/Makefile
index dbe50e74afc0..df80b35e270d 100644
--- a/x11-toolkits/gtkada-gcc/Makefile
+++ b/x11-toolkits/gtkada-gcc/Makefile
@@ -27,8 +27,9 @@ WRKSRC= ${WRKDIR}/GtkAda-2_8_1
CONFLICTS= gtkada-[0-9]* \
gtkada-devel-[0-9]*
-CONFIGURE_ENV+= PATH=${LOCALBASE}/bin/gcc41:${PATH} CC=${LOCALBASE}/bin/gcc41/gcc41
-MAKE_ENV+= PATH=${LOCALBASE}/bin/gcc41:${PATH} CC=${LOCALBASE}/bin/gcc41/gcc41
+CC= ${LOCALBASE}/bin/gcc41/gcc41
+CONFIGURE_ENV+= PATH=${LOCALBASE}/bin/gcc41:${PATH} CC=${CC}
+MAKE_ENV+= PATH=${LOCALBASE}/bin/gcc41:${PATH}
CONFIGURE_ARGS= --with-GL=GL
USE_GL= gl glu
diff --git a/x11-toolkits/irrlicht/Makefile b/x11-toolkits/irrlicht/Makefile
index 380c32f42028..52fa0dc7d85f 100644
--- a/x11-toolkits/irrlicht/Makefile
+++ b/x11-toolkits/irrlicht/Makefile
@@ -23,7 +23,6 @@ USE_DOS2UNIX= Makefile *.cpp *.h *.txt
USE_GMAKE= yes
USE_GL= yes
USE_LDCONFIG= yes
-MAKE_ENV+= CXX="${CXX}"
PLIST_SUB+= SHARED_LIB_VER=${SHARED_LIB_VER}
SUB_FILES= pkg-message
diff --git a/x11-toolkits/scintilla/Makefile b/x11-toolkits/scintilla/Makefile
index 2f2db594a84f..c72523673af4 100644
--- a/x11-toolkits/scintilla/Makefile
+++ b/x11-toolkits/scintilla/Makefile
@@ -24,7 +24,6 @@ USE_GMAKE= yes
USE_ICONV= yes
MAKEFILE= makefile
USE_LDCONFIG= yes
-MAKE_ENV= CC="${CC}" CXX="${CXX}"
.if defined(WITH_GTK2)
USE_GNOME= gtk20
diff --git a/x11-wm/wmanager/Makefile b/x11-wm/wmanager/Makefile
index 4ef0e18c1100..e217c3bd8ca4 100644
--- a/x11-wm/wmanager/Makefile
+++ b/x11-wm/wmanager/Makefile
@@ -24,8 +24,7 @@ PKGMESSAGE= ${WRKDIR}/pkg-message
USE_XORG= x11 xext
USE_GL= gl
USE_GMAKE= yes
-MAKE_ENV= CXX="${CXX}" \
- PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
OPTIONS= ADDONS "Install the helper scripts and manpages" on
diff --git a/x11/libcapplet/Makefile b/x11/libcapplet/Makefile
index 84f8d6a99c2d..b76f39b6936e 100644
--- a/x11/libcapplet/Makefile
+++ b/x11/libcapplet/Makefile
@@ -19,7 +19,7 @@ COMMENT= A library for writing custom applets for GNOME Control Center
USE_BZIP2= yes
USE_GNOME= gnomelibs
USE_LDCONFIG= yes
-MAKE_ENV= LOCALBASE="${LOCALBASE}" LDFLAGS="${LDFLAGS}"
+MAKE_ENV= LDFLAGS="${LDFLAGS}"
.include <bsd.port.pre.mk>
diff --git a/x11/nvidia-settings/Makefile b/x11/nvidia-settings/Makefile
index e5d9e1a3e2a5..41326c943319 100644
--- a/x11/nvidia-settings/Makefile
+++ b/x11/nvidia-settings/Makefile
@@ -23,7 +23,6 @@ PLIST_FILES= bin/nvidia-settings
MAN1= nvidia-settings.1
MAKE_ENV= ROOT=${PREFIX} \
- CC=${CC} \
X11R6_LIB_DIR=${LOCALBASE}/lib \
X11R6_INC_DIR=${LOCALBASE}/include \
LDFLAGS="${PTHREAD_LIBS}"
diff --git a/x11/nvidia-xconfig/Makefile b/x11/nvidia-xconfig/Makefile
index 934da5804931..027b3000b0d1 100644
--- a/x11/nvidia-xconfig/Makefile
+++ b/x11/nvidia-xconfig/Makefile
@@ -17,8 +17,7 @@ COMMENT= Tool to manipulate X configuration files for the NVidia driver
USE_GMAKE= yes
-MAKE_ENV= ROOT=${PREFIX} \
- CC=${CC}
+MAKE_ENV= ROOT=${PREFIX}
MAN1= nvidia-xconfig.1
PLIST_FILES= bin/nvidia-xconfig
diff --git a/x11/xbindkeys_config/Makefile b/x11/xbindkeys_config/Makefile
index bfde4eaa4640..e38f7548e157 100644
--- a/x11/xbindkeys_config/Makefile
+++ b/x11/xbindkeys_config/Makefile
@@ -19,7 +19,7 @@ COMMENT= An easy to use gtk program for configuring Xbindkeys
RUN_DEPENDS= ${LOCALBASE}/bin/xbindkeys:${PORTSDIR}/x11/xbindkeys
USE_GNOME= gtk20
-MAKE_ENV= CC="${CC} ${CFLAGS}"
+CC+= ${CFLAGS}
PLIST_FILES= bin/xbindkeys_config