kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Remove duplicates from MAKE_ENV after inclusion of CC and CXX in default MAKE_ENV

Browse source
This commit is contained in:
Pav Lucistnik 2008-07-25 09:08:42 +00:00
parent c667d592b2
commit 29e60de039
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=217468
35 changed files with 22 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
archivers/liblzxcomp/Makefile
View file

@ -14,8 +14,6 @@ DISTNAME= lzx_compress
MAINTAINER= skv@FreeBSD.org
COMMENT= LZX compression library
MAKE_ENV= PREFIX=${PREFIX}
USE_LDCONFIG= YES
SHLIB_MAJOR= 1
PLIST_SUB= SHLIB_MAJOR="${SHLIB_MAJOR}"

2
archivers/libunrar/Makefile
View file

@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/unrar
USE_GMAKE= yes
MAKEFILE= makefile.unix
MAKE_ENV+= CXX="${CXX}" LDFLAGS="${LDFLAGS}"
MAKE_ENV= LDFLAGS="${LDFLAGS}"
ALL_TARGET= lib
USE_LDCONFIG= yes

1
archivers/lzma/Makefile
View file

@ -24,7 +24,6 @@ BUILD_WRKSRC= ${WRKSRC}/CPP/7zip/Compress/LZMA_Alone
MAKEFILE= makefile.gcc
PLIST_FILES= bin/${PORTNAME}
CFLAGS+= -D_LZMA_SYSTEM_SIZE_T
MAKE_ENV+= CXX="${CXX}" CC="${CC}"
PORTDOCS= 7zC.txt 7zFormat.txt Methods.txt history.txt lzma.txt
post-patch:

3
archivers/tclmkziplib/Makefile
View file

@ -25,8 +25,7 @@ USE_ZIP= yes
TCLCONFIG?= ${LOCALBASE}/lib/tcl${TCL_VER}/tclConfig.sh
MAKEFILE= ${FILESDIR}/Makefile.bsd
MAKE_ENV= LOCALBASE=${LOCALBASE} \
VERSION=${PORTVERSION:S/.//} \
MAKE_ENV= VERSION=${PORTVERSION:S/.//} \
TCLCONFIG=${TCLCONFIG}
PLIST_SUB+= VERSION=${PORTVERSION:S/.//}

2
archivers/unmass/Makefile
View file

@ -18,8 +18,6 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_DOS2UNIX= yes
MAKE_ENV+= CXX="${CXX}"
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/kdev
PLIST_FILES= bin/unmass

2
archivers/unzip/Makefile
View file

@ -31,7 +31,7 @@ EXTRACT_ONLY= ${PORTNAME}552.tar.gz
LOCAL_UNZIP+= -DUSE_SMITH_CODE
.endif
MAKE_ENV= CC="${CC}" LOCAL_UNZIP="${LOCAL_UNZIP}"
MAKE_ENV= LOCAL_UNZIP="${LOCAL_UNZIP}"
.ifdef USE_UNZIP
.error You have `USE_UNZIP' variable defined either in environment or in make(1) arguments. Please undefine and try again.

1
archivers/zip/Makefile
View file

@ -17,7 +17,6 @@ COMMENT= Create/update ZIP files compatible with pkzip
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
MAKEFILE= unix/Makefile
MAKE_ENV+= CC="${CC}"
ALL_TARGET= generic
MAN1= zip.1

2
audio/audacious-dumb/Makefile
View file

@ -22,6 +22,4 @@ BUILD_DEPENDS= audacious:${PORTSDIR}/multimedia/audacious \
USE_GMAKE= yes
USE_LDCONFIG= yes
MAKE_ENV+= CC="${CC}" LOCALBASE="${LOCALBASE}"
.include <bsd.port.mk>

2
audio/dumb/Makefile
View file

@ -31,8 +31,6 @@ MAKE_ARGS= _PORT_ALLEGRO_CFLAGS=
CFLAGS+= -fPIC
.endif
MAKE_ENV+= CC="${CC}"
pre-configure:
@${CP} ${FILESDIR}/config.txt ${WRKSRC}/make
@${REINPLACE_CMD} -e "s,@LOCALBASE@,${LOCALBASE}," ${WRKSRC}/make/config.txt

2
audio/espeak/Makefile
View file

@ -20,7 +20,7 @@ CONFLICTS= speak-1.[0-9]
MAKE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}" CPPFLAGS="${CPPFLAGS}" \
LDFLAGS="${LDFLAGS}" CXX="${CXX}"
LDFLAGS="${LDFLAGS}"
USE_GMAKE= yes
USE_LDCONFIG= yes

4
audio/festival+OGI/Makefile
View file

@ -41,9 +41,7 @@ MAKE_ENV+= PKG_EST_HOME=${SPEECHTOOLS} \
PKG_LOCALBASE=${LOCALBASE} \
PKG_PREFIX=${PREFIX} \
GCC27_CC="${CC}" \
GCC27_CXX="${CXX}" \
CC="${CC}" \
CXX="${CXX}"
GCC27_CXX="${CXX}"
MAN1= festival.1 festival_client.1
USE_GCC= 2.95
USE_GMAKE= yes

4
audio/festival/Makefile
View file

@ -32,9 +32,7 @@ MAKE_ENV+= GCC="${CC}" \
GXX="${CXX}" \
EST_HOME=${SPEECHTOOLS} \
EGCS_CC="${CC}" \
EGCS_CXX="${CXX}" \
CC="${CC}" \
CXX="${CXX}"
EGCS_CXX="${CXX}"
MAN1= festival.1 festival_client.1
WRKSRC= ${WRKDIR}

2
audio/gkrellmvolume2/Makefile
View file

@ -34,6 +34,6 @@ USE_GMAKE= yes
MAKE_ENV+= PLUGIN_DIR=${PREFIX}/libexec/gkrellm2/plugins \
LOCALEDIR=${PREFIX}/share/locale \
enable_nls=1 CC="${CC}"
enable_nls=1
.include <bsd.port.mk>

3
audio/hawkvoice/Makefile
View file

@ -22,8 +22,7 @@ USE_LDCONFIG= yes
LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
CPPFLAGS= -I${LOCALBASE}/include
MAKE_ENV= CC="${CC}" CFLAGS="${CFLAGS} ${OPTFLAGS}" \
LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" \
MAKE_ENV= LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" \
MAKE="${GMAKE}"
WRKSRC= ${WRKDIR}/HawkVoiceDI/src

1
audio/libmikmod/Makefile
View file

@ -24,7 +24,6 @@ USE_GNOME= gnometarget lthack
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= MAKEINFO="makeinfo --no-split"
MAKE_ENV= SHELL=/bin/sh
USE_LDCONFIG= yes
MAN1= libmikmod-config.1

2
audio/libmodplug/Makefile
View file

@ -19,8 +19,6 @@ USE_GMAKE= yes
USE_GNOME= pkgconfig
GNU_CONFIGURE= yes
MAKE_ENV+= CXX="${CXX}"
post-patch:
@${REINPLACE_CMD} -e '/^CXXFLAGS=/d' \
${WRKSRC}/configure

3
audio/pocketsphinx/Makefile
View file

@ -24,8 +24,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/sphinxbas
LDFLAGS="-L${LOCALBASE}/lib"
MAKE_ENV= MKDIR="${MKDIR}" \
OSVERSION=${OSVERSION} \
CXX="${CXX}"
OSVERSION=${OSVERSION}
post-patch:
@${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' ${WRKSRC}/Makefile.in

2
audio/py-xmms/Makefile
View file

@ -25,6 +25,6 @@ PYDISTUTILS_PKGNAME= pyxmms
USE_BZIP2= yes
USE_GNOME= glib12
XMMS_CONFIG?= ${LOCALBASE}/bin/xmms-config
MAKE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" XMMS_CONFIG="${XMMS_CONFIG}"
MAKE_ENV= XMMS_CONFIG="${XMMS_CONFIG}"
.include <bsd.port.mk>

2
audio/quelcom/Makefile
View file

@ -18,7 +18,7 @@ USE_GCC= 3.3
USE_GETTEXT= yes
USE_GMAKE= yes
MAKEFILE= makefile
MAKE_ENV= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
MAKE_ENV= LDFLAGS="${LDFLAGS}"
USE_LDCONFIG= yes
CXXFLAGS+= -I../lib -I${LOCALBASE}/include ${CPPFLAGS} \

3
audio/sphinx3/Makefile
View file

@ -24,8 +24,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/sphinxbas
LDFLAGS="-L${LOCALBASE}/lib"
MAKE_ENV= MKDIR="${MKDIR}" \
OSVERSION=${OSVERSION} \
CXX="${CXX}"
OSVERSION=${OSVERSION}
post-patch:
@${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' ${WRKSRC}/Makefile.in

3
audio/sphinxbase/Makefile
View file

@ -23,8 +23,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
MAKE_ENV= MKDIR="${MKDIR}" \
OSVERSION=${OSVERSION} \
CXX="${CXX}"
OSVERSION=${OSVERSION}
post-patch:
@${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' ${WRKSRC}/Makefile.am

2
audio/xmms-sndstretch/Makefile
View file

@ -22,7 +22,7 @@ WRKSRC= ${WRKDIR}/sndstretch_xmms
USE_GNOME= gtk12
USE_GMAKE= yes
MAKE_ENV+= GTK_CONFIG="${GTK_CONFIG}" PTHREAD_LIBS=${PTHREAD_LIBS}
MAKE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS}
post-extract:
(cd ${WRKSRC}; ${MAKE} clean)

2
audio/xmmsctrl/Makefile
View file

@ -21,7 +21,7 @@ BUILD_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
USE_GMAKE= yes
MAKE_ENV= CC="${CC}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
PORTDOCS= Changelog README

2
biology/genpak/Makefile
View file

@ -20,7 +20,7 @@ COMMENT= A set of small utilities to manipulate DNA sequences
LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd
USE_GMAKE= yes
MAKE_ENV= GMAKE="${GMAKE}" MANPREFIX="${MANPREFIX}"
MAKE_ENV= GMAKE="${GMAKE}"
MAN1= Genpak.1 gp_acc.1 gp_adjust.1 gp_cdndev.1 gp_cusage.1 gp_digest.1 \
gp_dimer.1 gp_findorf.1 gp_gc.1 gp_getseq.1 gp_matrix.1 gp_mkmtx.1 \

3
biology/lagan/Makefile
View file

@ -27,7 +27,8 @@ EXEUTILS= Glue bin2bl bin2mf cextract contigorder cstat dotplot fa2xfa \
SCRIPTUTILS= cmerge2.pl draft.pl mextract.pl mf2bin.pl mpretty.pl \
mproject.pl mrun.pl mrunfile.pl mrunpairs.pl mviz.pl
MAKE_ENV+= CC="${CC} ${CFLAGS}" CPP="${CXX} ${CXXFLAGS}"
CC:= ${CC} ${CFLAGS}
MAKE_ENV+= CPP="${CXX} ${CXXFLAGS}"
post-patch:
@${REINPLACE_CMD} -E 's,^(CC|CPP) =,\1 ?=,g' \

3
biology/mopac/Makefile
View file

@ -25,7 +25,8 @@ WRKSRC= ${WRKDIR}/mopac7-${MOPAC_SUBVERSION}
GNU_CONFIGURE= yes
USE_GMAKE= yes
CONFIGURE_ENV+= CFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
MAKE_ENV+= CFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
MAKE_ENV+= LDFLAGS="-L${LOCALBASE}/lib"
CFLAGS+= -I${LOCALBASE}/include
post-patch:
@${REINPLACE_CMD} -e \

2
cad/alliance/Makefile
View file

@ -38,7 +38,7 @@ SRCDIRLIST!= ${CAT} ${FILESDIR}/srcdirs.list
CFLAGS+= ${SRCDIRLIST:S,^,-I${WRKSRC}/,}
LDFLAGS+= ${SRCDIRLIST:S,^,-L${WRKSRC}/,}
CONFIGURE_ENV+= CFLAGS="${CFLAGS}" CPPFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
MAKE_ENV+= CFLAGS="${CFLAGS}" CPPFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
MAKE_ENV+= CPPFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
MAN1= MBK_CATAL_NAME.1 MBK_CATA_LIB.1 MBK_FILTER_SFX.1 MBK_IN_FILTER.1 \
MBK_IN_LO.1 MBK_IN_PH.1 MBK_OUT_FILTER.1 MBK_OUT_LO.1 MBK_OUT_PH.1 \

2
cad/cider/Makefile
View file

@ -24,8 +24,6 @@ MAN5= mfbcap.5
MLINKS= spice.1 spice3.1
USE_XORG= xt xaw xmu
MAKE_ENV+= CC="${CC}"
pre-patch:
@${CP} -f ${WRKSRC}/spice/common/lib/helpdir/spice.txt ${WRKSRC}/cider/common/lib/helpdir/spice.txt

2
cad/leocad/Makefile
View file

@ -26,8 +26,6 @@ USE_XORG= x11
USE_GMAKE= yes
USE_GNOME= gtk12
MAKE_ENV+= CXX=${CXX}
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 600000

1
comms/aldo/Makefile
View file

@ -23,7 +23,6 @@ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --includedir="${LOCALBASE}/include" \
--libdir="${LOCALBASE}/lib"
USE_GMAKE= yes
MAKE_ENV= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}"
PLIST_FILES= bin/aldo
MAN1= aldo.1

1
comms/fldigi/Makefile
View file

@ -25,7 +25,6 @@ LIB_DEPENDS= fltk:${PORTSDIR}/x11-toolkits/fltk-threads \
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
MAKE_ENV+= CXX="${CXX}"
.include <bsd.port.pre.mk>
.if ${ARCH} == "amd64" && ${OSVERSION} < 700000

1
comms/geoid/Makefile
View file

@ -24,7 +24,6 @@ LIB_DEPENDS= fltk:${PORTSDIR}/x11-toolkits/fltk-threads
USE_GMAKE= yes
MAKEFILE= makefile
MAKE_ENV+= CXX="${CXX}"
PLIST_FILES= bin/geoid ${DATADIR_REL}/country.pos share/pixmaps/geoid.png
PLIST_DIRS= ${DATADIR_REL}

1
comms/gkermit/Makefile
View file

@ -18,7 +18,6 @@ NO_WRKSUBDIR= yes
MAN1= gkermit.1
ALL_TARGET= posix
MAKE_ENV= CC="${CC}"
GKERMIT_DOCDIR= ${PREFIX}/share/doc/gkermit

2
comms/py-lirc/Makefile
View file

@ -22,7 +22,7 @@ LIB_DEPENDS= lirc_client.1:${PORTSDIR}/comms/lirc
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
MAKE_ENV= LDFLAGS="${LDFLAGS}" CFLAGS="${CFLAGS}"
MAKE_ENV= LDFLAGS="${LDFLAGS}"
PLIST_FILES= %%PYTHON_SITELIBDIR%%/pylircmodule.so
USE_PYTHON= yes

2
comms/uird/Makefile
View file

@ -18,8 +18,6 @@ COMMENT= The Universal IR Receiver Daemon
USE_GMAKE= yes
USE_PERL5= yes
MAKE_ENV+= CC="${CC}"
WRKSRC= ${WRKDIR}/${PORTNAME}
ALL_TARGET= ${PORTNAME}