aboutsummaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
authorpav <pav@FreeBSD.org>2008-07-25 20:48:47 +0800
committerpav <pav@FreeBSD.org>2008-07-25 20:48:47 +0800
commit3911417f7d6e276df2741fde745c6a0f1d9bdeef (patch)
tree88761bf508dd34db19dc9c2d5cb8ae46e6204c44 /x11
parenta6b4041b0c04993aaf832d1e24d6dbf041a4de76 (diff)
downloadfreebsd-ports-gnome-3911417f7d6e276df2741fde745c6a0f1d9bdeef.tar.gz
freebsd-ports-gnome-3911417f7d6e276df2741fde745c6a0f1d9bdeef.tar.zst
freebsd-ports-gnome-3911417f7d6e276df2741fde745c6a0f1d9bdeef.zip
- Remove duplicates from MAKE_ENV after inclusion of CC and CXX in default MAKE_ENV
Diffstat (limited to 'x11')
-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
4 files changed, 3 insertions, 5 deletions
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