diff options
| author | Pav Lucistnik <pav@FreeBSD.org> | 2008-07-25 12:48:47 +0000 |
|---|---|---|
| committer | Pav Lucistnik <pav@FreeBSD.org> | 2008-07-25 12:48:47 +0000 |
| commit | 2f35b73926abf3d3de21382a8a16414200fa2d5b (patch) | |
| tree | ba424f33251d8f6c55d5b3a690abf181b6a819ee /x11 | |
| parent | Upgrade to 20080707. (diff) | |
- Remove duplicates from MAKE_ENV after inclusion of CC and CXX in default MAKE_ENV
Notes
Notes:
svn path=/head/; revision=217479
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/libcapplet/Makefile | 2 | ||||
| -rw-r--r-- | x11/nvidia-settings/Makefile | 1 | ||||
| -rw-r--r-- | x11/nvidia-xconfig/Makefile | 3 | ||||
| -rw-r--r-- | x11/xbindkeys_config/Makefile | 2 |
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 |