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-toolkits | |
| parent | 8c8dbd7325f0c5cd3837737357a4e2cdd953cee5 (diff) | |
| download | ports-2f35b73926abf3d3de21382a8a16414200fa2d5b.tar.gz ports-2f35b73926abf3d3de21382a8a16414200fa2d5b.zip | |
- 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-toolkits')
| -rw-r--r-- | x11-toolkits/gtk-sharp10/Makefile | 2 | ||||
| -rw-r--r-- | x11-toolkits/gtkada-gcc/Makefile | 5 | ||||
| -rw-r--r-- | x11-toolkits/irrlicht/Makefile | 1 | ||||
| -rw-r--r-- | x11-toolkits/scintilla/Makefile | 1 |
4 files changed, 3 insertions, 6 deletions
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 |