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 /math | |
| 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
Diffstat (limited to 'math')
| -rw-r--r-- | math/bamg/Makefile | 2 | ||||
| -rw-r--r-- | math/fxt/Makefile | 1 | ||||
| -rw-r--r-- | math/metis-edf/Makefile | 2 | ||||
| -rw-r--r-- | math/nsc2ke/Makefile | 1 | ||||
| -rw-r--r-- | math/octave-devel/Makefile | 8 | ||||
| -rw-r--r-- | math/octave/Makefile | 8 | ||||
| -rw-r--r-- | math/rascal/Makefile | 3 | ||||
| -rw-r--r-- | math/ump/Makefile | 2 |
8 files changed, 8 insertions, 19 deletions
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 |