diff options
Diffstat (limited to 'lang')
46 files changed, 69 insertions, 100 deletions
diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile index a4f7dbaa813d..d68db524dea8 100644 --- a/lang/clisp/Makefile +++ b/lang/clisp/Makefile @@ -29,14 +29,13 @@ HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix="${PREFIX}" --mandir="${MANPREFIX}/man" \ --elispdir="${DATADIR}/emacs" --vimdir="${DATADIR}/vim" \ --docdir="${DOCSDIR}" -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_TARGET= ${ARCH:S/amd64/x86_64/}-portbld-freebsd${OSREL} # Complaints if the environment changes between build stages. MAKE_ENV= ${CONFIGURE_ENV} BUILD_WRKSRC= ${WRKSRC}/src INSTALL_WRKSRC= ${BUILD_WRKSRC} -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib MAKE_JOBS_UNSAFE=yes OPTIONS= BDB "Build Berkeley Database module" Off \ diff --git a/lang/ecl/Makefile b/lang/ecl/Makefile index 7373e51f19b3..6269b08232f7 100644 --- a/lang/ecl/Makefile +++ b/lang/ecl/Makefile @@ -20,9 +20,8 @@ USE_GMAKE= yes USE_PERL5_BUILD=yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-system-gmp --enable-boehm=system -CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +LDFLAGS+= -L${LOCALBASE}/lib USE_LDCONFIG= yes OPTIONS= ASDF "Enable ASDF building facility" on \ diff --git a/lang/elk/Makefile b/lang/elk/Makefile index 0d04da660fb6..6463dd59692d 100644 --- a/lang/elk/Makefile +++ b/lang/elk/Makefile @@ -20,14 +20,13 @@ LIB_DEPENDS= gdbm.4:${PORTSDIR}/databases/gdbm \ USE_BZIP2= yes USE_MOTIF= yes USE_AUTOTOOLS= libtool -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" USE_LDCONFIG= yes MAKE_JOBS_UNSAFE= yes MAN1= elk.1 -CPPFLAGS= -I${LOCALBASE}/include/libelf -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include/libelf -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.pre.mk> diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile index d5abaafbdec7..9598d8ff8b1e 100644 --- a/lang/erlang/Makefile +++ b/lang/erlang/Makefile @@ -113,7 +113,6 @@ CONFIGURE_ARGS+=--enable-threads --enable-dynamic-ssl-lib --enable-sctp CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" PLIST_SUB+= ERTS_VSN=${ERTS_VSN} TOOLS_VSN=${TOOLS_VSN} .if ${ARCH} == i386 diff --git a/lang/erlang14/Makefile b/lang/erlang14/Makefile index d5abaafbdec7..9598d8ff8b1e 100644 --- a/lang/erlang14/Makefile +++ b/lang/erlang14/Makefile @@ -113,7 +113,6 @@ CONFIGURE_ARGS+=--enable-threads --enable-dynamic-ssl-lib --enable-sctp CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" PLIST_SUB+= ERTS_VSN=${ERTS_VSN} TOOLS_VSN=${TOOLS_VSN} .if ${ARCH} == i386 diff --git a/lang/ferite/Makefile b/lang/ferite/Makefile index 1e5fd7d705ac..70d055dd3eb1 100644 --- a/lang/ferite/Makefile +++ b/lang/ferite/Makefile @@ -20,8 +20,8 @@ LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre \ USE_AUTOTOOLS= libtool USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ - LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} USE_LDCONFIG= yes PLIST_SUB= MACHINE_ARCH=${MACHINE_ARCH} diff --git a/lang/gambas2-base/Makefile b/lang/gambas2-base/Makefile index 38242265d262..be861da261f7 100644 --- a/lang/gambas2-base/Makefile +++ b/lang/gambas2-base/Makefile @@ -25,7 +25,6 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_LIBS} LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --disable-debug \ --disable-optimization \ --disable-preloading \ diff --git a/lang/gcl/Makefile b/lang/gcl/Makefile index 295d22348778..472b11224193 100644 --- a/lang/gcl/Makefile +++ b/lang/gcl/Makefile @@ -35,7 +35,8 @@ CONFIGURE_ARGS=--prefix=${PREFIX} \ --disable-statsysbfd \ --disable-locbfd \ --enable-custreloc -CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" C_INCLUDE_PATH=${PREFIX}/include LIBRARY_PATH=${PREFIX}/lib +CONFIGURE_ENV= C_INCLUDE_PATH=${PREFIX}/include LIBRARY_PATH=${PREFIX}/lib +CFLAGS+= -I${LOCALBASE}/include MAKEFILE= makefile INFO= gcl-si gcl-tk diff --git a/lang/gforth/Makefile b/lang/gforth/Makefile index 9017ca3b7f7c..aaa829cf7f5a 100644 --- a/lang/gforth/Makefile +++ b/lang/gforth/Makefile @@ -16,9 +16,9 @@ MAINTAINER= stas@FreeBSD.org COMMENT= Fast and portable Forth system GNU_CONFIGURE= yes -CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ - CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib +CFLAGS+= -I${LOCALBASE}/include USE_GMAKE= yes ALL_TARGET= all info USE_EMACS= yes diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile index 0176dda2b9ab..11069d7900b2 100644 --- a/lang/ghc/Makefile +++ b/lang/ghc/Makefile @@ -114,7 +114,7 @@ CONFIGURE_ARGS+= --with-ghc=${BOOT_GHC} --with-gcc=${CC} \ --with-iconv-libraries=${LOCALBASE}/lib # libgmp: -CONFIGURE_ENV+= LDFLAGS=-L${LOCALBASE}/lib +LDFLAGS+= -L${LOCALBASE}/lib CFLAGS+= -I${LOCALBASE}/include # override TMPDIR because /tmp often doesn't have enough space diff --git a/lang/gjs/Makefile b/lang/gjs/Makefile index d5b5db3e53a9..89915677b090 100644 --- a/lang/gjs/Makefile +++ b/lang/gjs/Makefile @@ -26,8 +26,8 @@ USE_PYTHON= build USE_AUTOTOOLS= libtool USE_GNOME= gnomeprefix gnomehack intlhack glib20 ltverhack USE_LDCONFIG= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.pre.mk> diff --git a/lang/intercal/Makefile b/lang/intercal/Makefile index 0ad85d971c04..3f4ccd3ed4a4 100644 --- a/lang/intercal/Makefile +++ b/lang/intercal/Makefile @@ -16,7 +16,7 @@ COMMENT= The C-INTERCAL compiler, ick, and supporting libraries GNU_CONFIGURE= yes USE_GMAKE= yes -CONFIGURE_ENV= CFLAGS="${CFLAGS} -D_POSIX_SOURCE" +CFLAGS+= -D_POSIX_SOURCE post-patch: # diff --git a/lang/klogoturtle/Makefile b/lang/klogoturtle/Makefile index 97b71ed34db1..4b42b93c6124 100644 --- a/lang/klogoturtle/Makefile +++ b/lang/klogoturtle/Makefile @@ -15,7 +15,7 @@ COMMENT= LOGO Interpreter for the KDE Desktop USE_KDELIBS_VER=3 USE_AUTOTOOLS= libtool -CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS}" +LDFLAGS+= ${PTHREAD_LIBS} post-patch: @${REINPLACE_CMD} -e 's/-O2//g; s/-lpthread/${PTHREAD_LIBS}/g' \ diff --git a/lang/libhx/Makefile b/lang/libhx/Makefile index 520a4ded07b1..819548b75a4b 100644 --- a/lang/libhx/Makefile +++ b/lang/libhx/Makefile @@ -13,8 +13,8 @@ MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME}/${PORTVERSION} MAINTAINER= sylvio@FreeBSD.org COMMENT= Library C with some additional C++ bindings available -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib USE_XZ= yes USE_LDCONFIG= yes diff --git a/lang/librep/Makefile b/lang/librep/Makefile index ef0b9c5114ab..0cd9dcd8c82b 100644 --- a/lang/librep/Makefile +++ b/lang/librep/Makefile @@ -26,7 +26,6 @@ USE_GNOME= gnomehack USE_GETTEXT= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool -CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --with-aclocaldir=${PREFIX}/share/aclocal \ --with-stack-direction=-1 USE_LDCONFIG= yes @@ -35,8 +34,8 @@ MANCOMPRESSED= yes MAN1= rep.1 rep-remote.1 rep-xgettext.1 repdoc.1 INFO= librep -CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} .include <bsd.port.pre.mk> diff --git a/lang/lush/Makefile b/lang/lush/Makefile index f5ca70f4a298..3b2732e8aae4 100644 --- a/lang/lush/Makefile +++ b/lang/lush/Makefile @@ -21,8 +21,8 @@ GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/lush -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ - LIBS="${LIBS} ${PTHREAD_LIBS} -lintl -L${LOCALBASE}/lib" +CONFIGURE_ENV= LIBS="${LIBS} ${PTHREAD_LIBS} -lintl -L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include CONFIGURE_ARGS= --without-bfd diff --git a/lang/maude/Makefile b/lang/maude/Makefile index a93d3d39d1ca..0ee312a97c34 100644 --- a/lang/maude/Makefile +++ b/lang/maude/Makefile @@ -21,7 +21,8 @@ LIB_DEPENDS= bdd:${PORTSDIR}/science/buddy \ USE_BISON= build GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --datadir=${DATADIR} post-patch: diff --git a/lang/mdk/Makefile b/lang/mdk/Makefile index 011bee4c4179..ff6ba2c3e92f 100644 --- a/lang/mdk/Makefile +++ b/lang/mdk/Makefile @@ -22,7 +22,8 @@ LIB_DEPENDS= guile.21:${PORTSDIR}/lang/guile \ USE_GNOME= libglade2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-nls -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib INFO= mdk diff --git a/lang/moscow_ml/Makefile b/lang/moscow_ml/Makefile index 62981718716e..a135e860d671 100644 --- a/lang/moscow_ml/Makefile +++ b/lang/moscow_ml/Makefile @@ -25,8 +25,9 @@ ALL_TARGET= world MOSMLHOME=${MOSMLHOME} INSTALL_TARGET= install MOSMLHOME=${MOSMLHOME} WRKSRC= ${WRKDIR}/mosml/src USE_PERL5= yes -MAKE_ENV+= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" DOCSDIR="${DOCSDIR}" \ +MAKE_ENV+= DOCSDIR="${DOCSDIR}" \ LD_RUN_PATH="${PREFIX}/lib/mosml" +LDFLAGS+= -L${LOCALBASE}/lib PKGMESSAGE= ${WRKDIR}/pkgmessage diff --git a/lang/nickle/Makefile b/lang/nickle/Makefile index 860347682d20..a1555ac1c725 100644 --- a/lang/nickle/Makefile +++ b/lang/nickle/Makefile @@ -18,7 +18,7 @@ GNU_CONFIGURE= yes # Nickle now has bindings which are likely to pull in libraries that need # libpthread. Link to it now, since it wouldn't work at runtime. -CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS}" +LDFLAGS+= ${PTHREAD_LIBS} MAN1= nickle.1 diff --git a/lang/ofc/Makefile b/lang/ofc/Makefile index 288587d97831..557481368414 100644 --- a/lang/ofc/Makefile +++ b/lang/ofc/Makefile @@ -24,8 +24,8 @@ USE_AUTOTOOLS= libtool USE_GNOME= gnomehack GNU_CONFIGURE= yes USE_LDCONFIG= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ - LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} OPTIONS= GDBM "Add gdbm support" off \ GMP "Add gmp support" off diff --git a/lang/oo2c/Makefile b/lang/oo2c/Makefile index 980380724bce..614b53e6622f 100644 --- a/lang/oo2c/Makefile +++ b/lang/oo2c/Makefile @@ -22,8 +22,8 @@ USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes USE_GMAKE= yes USE_LDCONFIG= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DGC_PTR='void*'" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include -DGC_PTR='void*' +LDFLAGS+= -L${LOCALBASE}/lib MAN1= oo2c.1 oob.1 ooef.1 oowhereis.1 diff --git a/lang/open-cobol-devel/Makefile b/lang/open-cobol-devel/Makefile index 14441dcc9bb8..50d734fbd8aa 100644 --- a/lang/open-cobol-devel/Makefile +++ b/lang/open-cobol-devel/Makefile @@ -21,13 +21,12 @@ LATEST_LINK= open-cobol-devel USE_BDB= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" USE_LDCONFIG= yes INFO= open-cobol -CPPFLAGS= -I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .if defined(WITHOUT_NLS) CONFIGURE_ARGS+= --disable-nls diff --git a/lang/open-cobol/Makefile b/lang/open-cobol/Makefile index daca1342cbd3..a06bf6b026a1 100644 --- a/lang/open-cobol/Makefile +++ b/lang/open-cobol/Makefile @@ -22,13 +22,12 @@ CONFLICTS= open-cobol-1.[1]* USE_BDB= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" USE_LDCONFIG= yes INFO= open-cobol -CPPFLAGS= -I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .if defined(WITHOUT_NLS) CONFIGURE_ARGS+= --disable-nls diff --git a/lang/php52/Makefile b/lang/php52/Makefile index 802329417ed0..e2144b724e30 100644 --- a/lang/php52/Makefile +++ b/lang/php52/Makefile @@ -170,10 +170,8 @@ CONFIGURE_ENV+= ac_cv_pthreads_lib="" \ pthreads_working="yes" \ lt_cv_path_SED="sed" -MAKE_ENV+= LDFLAGS="${LDFLAGS}" - .if defined(WITH_LINKTHR) -CONFIGURE_ENV+= LIBS="${LIBS} ${PTHREAD_LIBS}" +CONFIGURE_ENV+= LIBS="${LIBS} ${PTHREAD_LIBS}" .endif .if defined(WITH_DEBUG) diff --git a/lang/pike76/Makefile b/lang/pike76/Makefile index e8f527905880..6eb92db7cd60 100644 --- a/lang/pike76/Makefile +++ b/lang/pike76/Makefile @@ -49,7 +49,6 @@ MAN1= pike.1 WANT_MESA= yes CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -CONFIGURE_ENV= CPPFLAGS=${CPPFLAGS} CONFIGURE_ARGS+= --without-debug \ --with-thread-library=${PTHREAD_LIBS} \ --with-double-precision \ diff --git a/lang/python24/Makefile b/lang/python24/Makefile index a9754b9a700b..3d2dfb45427d 100644 --- a/lang/python24/Makefile +++ b/lang/python24/Makefile @@ -69,12 +69,9 @@ CFLAGS+= -DTHREAD_STACK_SIZE=0x20000 .else CFLAGS+= -DTHREAD_STACK_SIZE=0x100000 .endif # defined(WITHOUT_HUGE_STACK_SIZE) -CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}" +LDFLAGS+= ${PTHREAD_LIBS} .else CONFIGURE_ARGS+= --without-threads -.if defined(LDFLAGS) -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" -.endif # defined(LDFLAGS) .endif # !defined(WITHOUT_THREADS) .if !defined(WITHOUT_UCS4) && !defined(WITH_UCS2) diff --git a/lang/python25/Makefile b/lang/python25/Makefile index e67b7e3df38d..7fd4f7ee198c 100644 --- a/lang/python25/Makefile +++ b/lang/python25/Makefile @@ -73,12 +73,9 @@ CFLAGS+= -DTHREAD_STACK_SIZE=0x20000 .else CFLAGS+= -DTHREAD_STACK_SIZE=0x100000 .endif # defined(WITHOUT_HUGE_STACK_SIZE) -CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}" +LDFLAGS+= ${PTHREAD_LIBS} .else CONFIGURE_ARGS+= --without-threads -.if defined(LDFLAGS) -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" -.endif # defined(LDFLAGS) .endif # !defined(WITHOUT_THREADS) .if !defined(WITHOUT_UCS4) && !defined(WITH_UCS2) diff --git a/lang/python26/Makefile b/lang/python26/Makefile index 8f742fcc5e9b..dfc413af7b28 100644 --- a/lang/python26/Makefile +++ b/lang/python26/Makefile @@ -89,12 +89,12 @@ EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-configure-pth LIB_DEPENDS+= pth:${PORTSDIR}/devel/pth _PTH_CPPFLAGS= "-I${LOCALBASE}/include/pth" _PTH_LDFLAGS= "-L${LOCALBASE}/lib/pth" -CONFIGURE_ENV+= CPPFLAGS="${_PTH_CPPFLAGS} ${CPPFLAGS}" -CONFIGURE_ENV+= LDFLAGS="${_PTH_LDFLAGS} ${LDFLAGS}" +CPPFLAGS+= ${_PTH_CPPFLAGS} +LDFLAGS+= ${_PTH_LDFLAGS} .else # !defined(WITH_PTH) CONFIGURE_ARGS+= --with-threads CFLAGS+= ${PTHREAD_CFLAGS} -CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}" +LDFLAGS+= ${PTHREAD_LIBS} .endif # defined(WITH_PTH) .if defined(WITHOUT_HUGE_STACK_SIZE) CFLAGS+= -DTHREAD_STACK_SIZE=0x20000 @@ -104,9 +104,6 @@ CFLAGS+= -DTHREAD_STACK_SIZE=0x100000 .else # defined(WITHOUT_THREADS) PLIST_SUB+= THREADS="@comment " CONFIGURE_ARGS+= --without-threads -.if defined(LDFLAGS) -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" -.endif # defined(LDFLAGS) .endif # !defined(WITHOUT_THREADS) .if !defined(WITHOUT_UCS4) && !defined(WITH_UCS2) diff --git a/lang/python27/Makefile b/lang/python27/Makefile index 9e95b226855d..b4a9a139cdea 100644 --- a/lang/python27/Makefile +++ b/lang/python27/Makefile @@ -91,12 +91,12 @@ EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-configure-pth LIB_DEPENDS+= pth:${PORTSDIR}/devel/pth _PTH_CPPFLAGS= "-I${LOCALBASE}/include/pth" _PTH_LDFLAGS= "-L${LOCALBASE}/lib/pth" -CONFIGURE_ENV+= CPPFLAGS="${_PTH_CPPFLAGS} ${CPPFLAGS}" -CONFIGURE_ENV+= LDFLAGS="${_PTH_LDFLAGS} ${LDFLAGS}" +CPPFLAGS:= ${_PTH_CPPFLAGS} ${CPPFLAGS} +LDFLAGS+= ${_PTH_LDFLAGS} .else # !defined(WITH_PTH) CONFIGURE_ARGS+= --with-threads CFLAGS+= ${PTHREAD_CFLAGS} -CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}" +LDFLAGS+= ${PTHREAD_LIBS} .endif # defined(WITH_PTH) .if defined(WITHOUT_HUGE_STACK_SIZE) CFLAGS+= -DTHREAD_STACK_SIZE=0x20000 @@ -106,9 +106,6 @@ CFLAGS+= -DTHREAD_STACK_SIZE=0x100000 .else # defined(WITHOUT_THREADS) PLIST_SUB+= THREADS="@comment " CONFIGURE_ARGS+= --without-threads -.if defined(LDFLAGS) -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" -.endif # defined(LDFLAGS) .endif # !defined(WITHOUT_THREADS) .if !defined(WITHOUT_UCS4) && !defined(WITH_UCS2) @@ -130,7 +127,7 @@ PLIST_SUB+= 32BIT_ONLY="@comment " PLIST_SUB+= 32BIT_ONLY="" .endif .if ${ARCH} == powerpc64 -MAKE_ENV+= UNAME_m="powerpc64" +MAKE_ENV+= UNAME_m="powerpc64" .endif .if ${ARCH} == sparc64 CFLAGS+= -DPYTHON_DEFAULT_RECURSION_LIMIT=900 diff --git a/lang/python31/Makefile b/lang/python31/Makefile index 9389dfa372fb..54279db975e5 100644 --- a/lang/python31/Makefile +++ b/lang/python31/Makefile @@ -75,13 +75,10 @@ CFLAGS+= -DTHREAD_STACK_SIZE=0x20000 .else CFLAGS+= -DTHREAD_STACK_SIZE=0x100000 .endif # defined(WITHOUT_HUGE_STACK_SIZE) -CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}" +LDFLAGS+= ${PTHREAD_LIBS} .else # defined(WITHOUT_THREADS) PLIST_SUB+= THREADS="@comment " CONFIGURE_ARGS+= --without-threads -.if defined(LDFLAGS) -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" -.endif # defined(LDFLAGS) .endif # !defined(WITHOUT_THREADS) .if !defined(WITHOUT_UCS4) && !defined(WITH_UCS2) diff --git a/lang/python32/Makefile b/lang/python32/Makefile index 5fc533074b86..85939aaf5095 100644 --- a/lang/python32/Makefile +++ b/lang/python32/Makefile @@ -76,13 +76,10 @@ CFLAGS+= -DTHREAD_STACK_SIZE=0x20000 .else CFLAGS+= -DTHREAD_STACK_SIZE=0x100000 .endif # defined(WITHOUT_HUGE_STACK_SIZE) -CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}" +LDFLAGS+= ${PTHREAD_LIBS} .else # defined(WITHOUT_THREADS) PLIST_SUB+= THREADS="@comment " CONFIGURE_ARGS+= --without-threads -.if defined(LDFLAGS) -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" -.endif # defined(LDFLAGS) .endif # !defined(WITHOUT_THREADS) .if !defined(WITHOUT_UCS4) && !defined(WITH_UCS2) diff --git a/lang/racket-textual/Makefile b/lang/racket-textual/Makefile index d7dfb22e27e1..2444c54fc2c5 100644 --- a/lang/racket-textual/Makefile +++ b/lang/racket-textual/Makefile @@ -48,8 +48,6 @@ BUILD_DEPENDS+= ${LOCALBASE}/bin/cjpeg:${PORTSDIR}/graphics/jpeg \ ${LOCALBASE}/libdata/pkgconfig/pango.pc:${PORTSDIR}/x11-toolkits/pango .endif -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" - # Force the "configure" script to look in $LOCALBASE for -lpng and -ljpeg LDFLAGS+= -L${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include diff --git a/lang/racket/Makefile b/lang/racket/Makefile index d7dfb22e27e1..2444c54fc2c5 100644 --- a/lang/racket/Makefile +++ b/lang/racket/Makefile @@ -48,8 +48,6 @@ BUILD_DEPENDS+= ${LOCALBASE}/bin/cjpeg:${PORTSDIR}/graphics/jpeg \ ${LOCALBASE}/libdata/pkgconfig/pango.pc:${PORTSDIR}/x11-toolkits/pango .endif -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" - # Force the "configure" script to look in $LOCALBASE for -lpng and -ljpeg LDFLAGS+= -L${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include diff --git a/lang/rexx-imc/Makefile b/lang/rexx-imc/Makefile index 007fc67734ae..f332578f85c3 100644 --- a/lang/rexx-imc/Makefile +++ b/lang/rexx-imc/Makefile @@ -19,8 +19,7 @@ CONFLICTS= rexx-regina-* oorexx-[0-9]* HAS_CONFIGURE= yes CONFIGURE_SCRIPT= Make -CONFIGURE_ENV= CFLAGS="${CFLAGS}" \ - PREFIX="${PREFIX}" +CONFIGURE_ENV= PREFIX="${PREFIX}" CONFIGURE_ARGS= o all # configures and builds in one step diff --git a/lang/runawk/Makefile b/lang/runawk/Makefile index b556d680f5f5..7acce93bd462 100644 --- a/lang/runawk/Makefile +++ b/lang/runawk/Makefile @@ -15,8 +15,9 @@ COMMENT= Wrapper for AWK interpreter that implements a modules system BUILD_DEPENDS= mk-configure>=0.21.0:${PORTSDIR}/devel/mk-configure -MAKE_ENV+= LDFLAGS="-L${LOCALBASE}/lib -Wl,-rpath -Wl,${LOCALBASE}/lib" \ - CPPFLAGS="-I${LOCALBASE}/include" SUBPRJ_DFLT="${SUBPRJ_DFLT}" +MAKE_ENV+= SUBPRJ_DFLT="${SUBPRJ_DFLT}" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -Wl,-rpath -Wl,${LOCALBASE}/lib MAN1= ${PORTNAME}.1 alt_getopt.1 diff --git a/lang/scsh/Makefile b/lang/scsh/Makefile index 9d894f2f550f..832a6f72ac94 100644 --- a/lang/scsh/Makefile +++ b/lang/scsh/Makefile @@ -16,7 +16,7 @@ COMMENT= A Unix shell embedded into Scheme, with access to all Posix calls CONFLICTS= scheme48-[0-9]* -CONFIGURE_ENV+= LDFLAGS="-Wl,-E" +LDFLAGS+= -Wl,-E .include <bsd.port.pre.mk> diff --git a/lang/sdcc-devel/Makefile b/lang/sdcc-devel/Makefile index d8b5ed469bc7..0a753bed3e94 100644 --- a/lang/sdcc-devel/Makefile +++ b/lang/sdcc-devel/Makefile @@ -36,7 +36,6 @@ OPTIONS= MCS51 "Intel 8051 port" on \ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --docdir=${DOCSDIR} .include <bsd.port.pre.mk> diff --git a/lang/sdcc/Makefile b/lang/sdcc/Makefile index 744202ebb118..0eda26a727e0 100644 --- a/lang/sdcc/Makefile +++ b/lang/sdcc/Makefile @@ -34,7 +34,6 @@ OPTIONS= MCS51 "Intel 8051 port" on \ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --docdir=${DOCSDIR} .include <bsd.port.pre.mk> diff --git a/lang/see-devel/Makefile b/lang/see-devel/Makefile index 0645153052c8..8b970f63b9ad 100644 --- a/lang/see-devel/Makefile +++ b/lang/see-devel/Makefile @@ -28,8 +28,8 @@ USE_LDCONFIG= yes USE_PERL5_BUILD=yes GNU_CONFIGURE= yes -CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ - CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} .include <bsd.port.pre.mk> diff --git a/lang/see/Makefile b/lang/see/Makefile index 369941d7f1ba..bf0a50f424d8 100644 --- a/lang/see/Makefile +++ b/lang/see/Makefile @@ -29,8 +29,8 @@ USE_LDCONFIG= yes USE_PERL5_BUILD=yes GNU_CONFIGURE= yes -CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ - CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} .include <bsd.port.pre.mk> diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile index d047dbeb6af4..90bd2ffcdb6e 100644 --- a/lang/smalltalk/Makefile +++ b/lang/smalltalk/Makefile @@ -32,8 +32,7 @@ USE_SQLITE= yes USE_GMAKE= yes USE_GL= gl glut GNU_CONFIGURE= yes -CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" \ - ac_cv_prog_EMACS=no +CONFIGURE_ENV= ac_cv_prog_EMACS=no CONFIGURE_ARGS= --enable-generational-gc=no \ --enable-gtk=no \ --with-emacs=no \ @@ -51,8 +50,8 @@ MAN1= gst.1 gst-load.1 gst-package.1 gst-sunit.1 gst-config.1 \ MLINKS= gst-load.1 gst-reload.1 INFO= gst gst-base gst-libs -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.pre.mk> diff --git a/lang/stklos/Makefile b/lang/stklos/Makefile index 09de334083c9..07011c909f31 100644 --- a/lang/stklos/Makefile +++ b/lang/stklos/Makefile @@ -22,7 +22,8 @@ LIB_DEPENDS= gmp.10:${PORTSDIR}/math/gmp \ ONLY_FOR_ARCHS= i386 amd64 USE_GMAKE= yes -CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib PLIST_SUB= VERSION="${PORTVERSION}" GNU_CONFIGURE= yes diff --git a/lang/swi-pl/Makefile b/lang/swi-pl/Makefile index 4a56ccf61ba2..f712d9cbbf24 100644 --- a/lang/swi-pl/Makefile +++ b/lang/swi-pl/Makefile @@ -38,7 +38,7 @@ NOPRECIOUSMAKEVARS= yes USE_GMAKE= yes MAKE_JOBS_UNSAFE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" ARCH=${ARCH}-${OPSYS:L} +CONFIGURE_ENV= ARCH=${ARCH}-${OPSYS:L} CONFIGURE_TARGET= ${ARCH}-${OPSYS:L} CONFIGURE_ARGS= --with-world --without-jpl diff --git a/lang/tclX/Makefile b/lang/tclX/Makefile index 7eff9c563439..ba018119d637 100644 --- a/lang/tclX/Makefile +++ b/lang/tclX/Makefile @@ -20,8 +20,8 @@ USE_TCL= 83+ USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ENV+= CPPFLAGS="-I${TCL_INCLUDEDIR}/unix\ - -I${TCL_INCLUDEDIR}/generic" +CPPFLAGS+= -I${TCL_INCLUDEDIR}/unix\ + -I${TCL_INCLUDEDIR}/generic CONFIGURE_ARGS= --enable-shared \ --with-help=Help \ --with-tcl="${TCL_LIBDIR}" diff --git a/lang/vala/Makefile b/lang/vala/Makefile index 6c7785484f29..f899439a5fbb 100644 --- a/lang/vala/Makefile +++ b/lang/vala/Makefile @@ -20,7 +20,8 @@ USE_XZ= yes USE_GNOME= gnomehack glib20 gnomeprefix libxslt GNU_CONFIGURE= yes USE_GETTEXT= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}" LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE} +LDFLAGS+= -L${LOCALBASE}/lib USE_BISON= build USE_LDCONFIG= yes |