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

9 files changed, 3 insertions, 10 deletions

diff --git a/textproc/Ebnf2ps/Makefile b/textproc/Ebnf2ps/Makefile
index acf58da82a4e..60c1c6faa4c1 100644
--- a/textproc/Ebnf2ps/Makefile
+++ b/textproc/Ebnf2ps/Makefile
@@ -26,7 +26,6 @@ USE_GMAKE=	yes
 USE_XORG=	x11
 USE_SUBMAKE=	yes
 
-MAKE_ENV+=	X11BASE=${X11BASE}
 .if defined(AFMPATH)
 MAKE_ENV+=	AFMPATH=${AFMPATH}
 .endif
diff --git a/textproc/antiword/Makefile b/textproc/antiword/Makefile
index be493ff1976d..48321d56920c 100644
--- a/textproc/antiword/Makefile
+++ b/textproc/antiword/Makefile
@@ -23,7 +23,6 @@ PORTDOCS=	COPYING ChangeLog Emacs Exmh FAQ History Mozilla Mutt Netscape \
 		QandA ReadMe antiword.1 antiword.man antiword.php testdoc.doc
 
 CFLAGS+=	-DNDEBUG
-MAKE_ENV+=	CC="${CC}"
 
 post-patch:
 	@${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} \
diff --git a/textproc/hevea/Makefile b/textproc/hevea/Makefile
index f1ddaa2ff8a3..5390959830fd 100644
--- a/textproc/hevea/Makefile
+++ b/textproc/hevea/Makefile
@@ -22,7 +22,6 @@ COMMENT=	Convert LaTeX to HTML
 BUILD_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml
 
 PLIST_SUB=	HEVEAVERSION=${PORTVERSION}
-MAKE_ENV=	PREFIX=${PREFIX}
 
 .include <bsd.port.pre.mk>
 
diff --git a/textproc/hhm/Makefile b/textproc/hhm/Makefile
index 666bcff38e92..fef7669888c3 100644
--- a/textproc/hhm/Makefile
+++ b/textproc/hhm/Makefile
@@ -17,7 +17,6 @@ COMMENT=	HTML Help Maker
 LIB_DEPENDS=	lzxcomp.1:${PORTSDIR}/archivers/liblzxcomp
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-MAKE_ENV=	PREFIX=${PREFIX}
 
 PLIST_FILES=	bin/hhm
 
diff --git a/textproc/l2a/Makefile b/textproc/l2a/Makefile
index 2b64f602d1ba..c84773707562 100644
--- a/textproc/l2a/Makefile
+++ b/textproc/l2a/Makefile
@@ -17,7 +17,7 @@ COMMENT=	L2a - LaTeX to ASCII converter
 USE_ZIP=	yes
 
 WRKSRC=		${WRKDIR}
-MAKE_ENV=	PREFIX="${PREFIX}" INSTALL_PROGRAM="${INSTALL_PROGRAM}" INSTALL_MAN="${INSTALL_MAN}"
+MAKE_ENV=	INSTALL_PROGRAM="${INSTALL_PROGRAM}" INSTALL_MAN="${INSTALL_MAN}"
 
 MAN1=		l2a.1
 PLIST_FILES=	bin/l2a
diff --git a/textproc/libcsv/Makefile b/textproc/libcsv/Makefile
index 1cc4866260ca..9aba85a42378 100644
--- a/textproc/libcsv/Makefile
+++ b/textproc/libcsv/Makefile
@@ -13,8 +13,6 @@ MASTER_SITES=	SF
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Small, simple and fast CSV library
 
-MAKE_ENV=	PREFIX=${PREFIX}
-
 USE_LDCONFIG=	YES
 SHLIB_MAJOR=	2
 PLIST_SUB=	SHLIB_MAJOR="${SHLIB_MAJOR}"
diff --git a/textproc/mguesser/Makefile b/textproc/mguesser/Makefile
index 4ea5789e77c2..3e7a97a4eed8 100644
--- a/textproc/mguesser/Makefile
+++ b/textproc/mguesser/Makefile
@@ -14,7 +14,6 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A tool for guessing a text's charset and language
 
 CFLAGS+=	-DUDM_GUESSER_STANDALONG -DLMDIR=\"${PREFIX}/share/mguesser\"
-MAKE_ENV+=	CFLAGS="${$CFLAGS}"
 
 post-patch:
 	${REINPLACE_CMD} -E \
diff --git a/textproc/tinyxml/Makefile b/textproc/tinyxml/Makefile
index a2b6c265e08a..ea8e33f8ad3c 100644
--- a/textproc/tinyxml/Makefile
+++ b/textproc/tinyxml/Makefile
@@ -17,7 +17,6 @@ MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Small C++ XML parser
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
-MAKE_ENV=	PREFIX=${PREFIX}
 
 USE_LDCONFIG=	YES
 SHLIB_MAJOR=	2
diff --git a/textproc/xmlada-gcc/Makefile b/textproc/xmlada-gcc/Makefile
index a769d448cf16..e193792793b0 100644
--- a/textproc/xmlada-gcc/Makefile
+++ b/textproc/xmlada-gcc/Makefile
@@ -31,8 +31,9 @@ WRKSRC=		${WRKDIR}/xmlada-gnat-5_04a
 
 CONFLICTS=	xmlada-[0-9]*
 
+CC=		${LOCALBASE}/bin/gcc41/gcc41
 CONFIGURE_ENV+=	PATH=${LOCALBASE}/bin/gcc41:${PATH} CC=${LOCALBASE}/bin/gcc41/gcc41
-MAKE_ENV+=	PATH=${LOCALBASE}/bin/gcc41:${PATH} CC=${LOCALBASE}/bin/gcc41/gcc41
+MAKE_ENV+=	PATH=${LOCALBASE}/bin/gcc41:${PATH}
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes