From fa38ed02cc7ff1a59528f13db1b7dedc130b2def Mon Sep 17 00:00:00 2001 From: Pav Lucistnik Date: Fri, 25 Jul 2008 12:24:09 +0000 Subject: - Remove duplicates from MAKE_ENV after inclusion of CC and CXX in default MAKE_ENV --- print/ghostscript-gnu/Makefile | 2 +- print/ghostscript-gpl/Makefile | 2 +- print/ghostscript7/Makefile | 2 +- print/ghostscript8/Makefile | 2 +- print/pcal/Makefile | 2 +- print/py-cups/Makefile | 2 +- print/tex-omegaware-old/Makefile | 3 +-- 7 files changed, 7 insertions(+), 8 deletions(-) (limited to 'print') diff --git a/print/ghostscript-gnu/Makefile b/print/ghostscript-gnu/Makefile index 48235a4ef06e..5c7f2134ab6c 100644 --- a/print/ghostscript-gnu/Makefile +++ b/print/ghostscript-gnu/Makefile @@ -66,7 +66,7 @@ CONFLICTS= gambc-* ghostscript-gpl-* USE_BZIP2= yes USE_GMAKE= yes -MAKE_ENV= CC="${CC}" CXX="${CXX}" CFLAGS_STANDARD="${CFLAGS}" \ +MAKE_ENV= CFLAGS_STANDARD="${CFLAGS}" \ XCFLAGS="${XCFLAGS}" PLIST_SUB= GS_VERSION="${GS_VERSION}" diff --git a/print/ghostscript-gpl/Makefile b/print/ghostscript-gpl/Makefile index c66912479d93..7876fffdec5d 100644 --- a/print/ghostscript-gpl/Makefile +++ b/print/ghostscript-gpl/Makefile @@ -33,7 +33,7 @@ WANT_GNOME= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes -MAKE_ENV= CC="${CC}" CXX="${CXX}" CFLAGS_STANDARD="${CFLAGS}" \ +MAKE_ENV= CFLAGS_STANDARD="${CFLAGS}" \ XCFLAGS="${XCFLAGS}" XLDFLAGS="${XLDFLAGS}" \ EXTRALIBS="${EXTRALIBS}" \ SOC_LOADER="dxmainc.c" diff --git a/print/ghostscript7/Makefile b/print/ghostscript7/Makefile index 2823d3cbb9fb..ce4aa9992a74 100644 --- a/print/ghostscript7/Makefile +++ b/print/ghostscript7/Makefile @@ -35,7 +35,7 @@ CONFLICTS= gambc-* ghostscript8-* USE_BZIP2= yes USE_GMAKE= yes GNU_CONFIGURE= yes -MAKE_ENV= CC="${CC}" CXX="${CXX}" CFLAGS_STANDARD="${CFLAGS}" \ +MAKE_ENV= CFLAGS_STANDARD="${CFLAGS}" \ XCFLAGS="${XCFLAGS}" XLDFLAGS="${XLDFLAGS}" \ EXTRALIBS="${EXTRALIBS}" CONFIGURE_ENV= ${MAKE_ENV} \ diff --git a/print/ghostscript8/Makefile b/print/ghostscript8/Makefile index 4109f818c342..fc26939253bd 100644 --- a/print/ghostscript8/Makefile +++ b/print/ghostscript8/Makefile @@ -33,7 +33,7 @@ WANT_GNOME= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes -MAKE_ENV= CC="${CC}" CXX="${CXX}" CFLAGS_STANDARD="${CFLAGS}" \ +MAKE_ENV= CFLAGS_STANDARD="${CFLAGS}" \ XCFLAGS="${XCFLAGS}" XLDFLAGS="${XLDFLAGS}" \ EXTRALIBS="${EXTRALIBS}" \ SOC_LOADER="dxmainc.c" diff --git a/print/pcal/Makefile b/print/pcal/Makefile index 8e74e00951e0..6499f9707090 100644 --- a/print/pcal/Makefile +++ b/print/pcal/Makefile @@ -15,7 +15,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= laszlof@FreeBSD.org COMMENT= PostScript calendar program -MAKE_ENV= CC="${CC}" HOST_CC="${CC}" +MAKE_ENV= HOST_CC="${CC}" ALL_TARGET= USE_GMAKE= yes diff --git a/print/py-cups/Makefile b/print/py-cups/Makefile index 74d191550311..6a8c2afdadd0 100644 --- a/print/py-cups/Makefile +++ b/print/py-cups/Makefile @@ -23,7 +23,7 @@ USE_BZIP2= yes USE_PYDISTUTILS= yes CFLAGS+= -I${LOCALBASE}/include -DVERSION=\\\"${PORTVERSION}\\\" LDFLAGS+= -L${LOCALBASE}/lib -liconv -MAKE_ENV= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" +MAKE_ENV= LDFLAGS="${LDFLAGS}" PYDISTUTILS_EGGINFO=${PORTNAME}-1.0-py2.5.egg-info PLIST_FILES= %%PYTHON_SITELIBDIR%%/cups.so diff --git a/print/tex-omegaware-old/Makefile b/print/tex-omegaware-old/Makefile index 00bdea394b63..56a192230292 100644 --- a/print/tex-omegaware-old/Makefile +++ b/print/tex-omegaware-old/Makefile @@ -28,8 +28,7 @@ TETEX_SRC= tetex-src-${PORTVERSION}.tar.gz TETEX_TEXMF= tetex-texmf-${PORTVERSION}.tar.gz TEXMF_TREE= ${PREFIX}/share/texmf -MAKE_ENV= PREFIX="${PREFIX}" \ - LN="${LN}" \ +MAKE_ENV= LN="${LN}" \ INSTALL_PROGRAM="${INSTALL_PROGRAM}" GNU_CONFIGURE= YES CONFIGURE_ARGS= --disable-multiplatform \ -- cgit v1.2.3