From d02f2cd4efd98cd3d6e27f5a4d2f66e519943489 Mon Sep 17 00:00:00 2001 From: Jeremy Lea Date: Sat, 29 Jan 2000 22:46:04 +0000 Subject: [PATCH] Ports no longer need to pass CXXFLAGS to configure. bsd.port.mk does this for them. --- deskutils/offix-trash/Makefile | 1 - devel/tvision/Makefile | 1 - editors/yudit/Makefile | 2 +- japanese/lyx/Makefile | 2 +- print/lyx-devel/Makefile | 1 - print/lyx/Makefile | 1 - print/lyx14/Makefile | 1 - print/lyx15/Makefile | 1 - print/lyx16/Makefile | 1 - print/teTeX-base/Makefile | 3 +-- print/teTeX/Makefile | 3 +-- textproc/word2x/Makefile | 1 - x11/libdnd/Makefile | 1 - 13 files changed, 4 insertions(+), 15 deletions(-) diff --git a/deskutils/offix-trash/Makefile b/deskutils/offix-trash/Makefile index 0995cde3dcd7..96d54dec3f6a 100644 --- a/deskutils/offix-trash/Makefile +++ b/deskutils/offix-trash/Makefile @@ -17,7 +17,6 @@ MAINTAINER= ruslan@shevchenko.kiev.ua LIB_DEPENDS= Dnd++.1:${PORTSDIR}/x11/libdnd GNU_CONFIGURE= YES -CONFIGURE_ENV= CXXFLAGS="${CFLAGS}" USE_GMAKE= YES USE_X_PREFIX= YES diff --git a/devel/tvision/Makefile b/devel/tvision/Makefile index c1139c538fdd..d8d8f0143921 100644 --- a/devel/tvision/Makefile +++ b/devel/tvision/Makefile @@ -14,6 +14,5 @@ MASTER_SITE_SUBDIR= devel/lang/c++ MAINTAINER= ssigala@globalnet.it USE_LIBTOOL= yes -CONFIGURE_ENV= CXXFLAGS="$(CFLAGS)" .include diff --git a/editors/yudit/Makefile b/editors/yudit/Makefile index 0b9fc15ce1b5..d0fda7d8612d 100644 --- a/editors/yudit/Makefile +++ b/editors/yudit/Makefile @@ -16,7 +16,7 @@ MAINTAINER= rch@WriteMe.Com LIB_DEPENDS= ttf.4:${PORTSDIR}/print/freetype BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext -CONFIGURE_ENV= LC_ALL=C CXXFLAGS="${CFLAGS}" +CONFIGURE_ENV= LC_ALL=C GNU_CONFIGURE= YES MAKE_ENV= LC_ALL=C MAN1= yudit.1 makeumap.1 stripumap.1 uniconv.1 uniprint.1 diff --git a/japanese/lyx/Makefile b/japanese/lyx/Makefile index 34a1c00456e1..185442f5dfc2 100644 --- a/japanese/lyx/Makefile +++ b/japanese/lyx/Makefile @@ -27,7 +27,7 @@ LIB_DEPENDS= xforms.0:${PORTSDIR}/x11-toolkits/xforms \ USE_PERL5= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= LYX_LIBS="-lxpg4" CXXFLAGS="${CFLAGS}" +CONFIGURE_ENV= LYX_LIBS="-lxpg4" STRIP= CONFIGURE_ARGS= --with-extra-lib=${X11BASE}/lib --with-extra-inc="${X11BASE}/include ${X11BASE}/include/X11" MAN1= lyx.1 reLyX.1 diff --git a/print/lyx-devel/Makefile b/print/lyx-devel/Makefile index 04e24eb33056..7a5702f09b70 100644 --- a/print/lyx-devel/Makefile +++ b/print/lyx-devel/Makefile @@ -25,7 +25,6 @@ LIB_DEPENDS= xforms.0:${PORTSDIR}/x11-toolkits/xforms \ USE_PERL5= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CXXFLAGS="${CFLAGS}" STRIP= CONFIGURE_ARGS= --with-extra-lib=${X11BASE}/lib --with-extra-inc="${X11BASE}/include ${X11BASE}/include/X11 ${LOCALBASE}/include" MAN1= lyx.1 reLyX.1 diff --git a/print/lyx/Makefile b/print/lyx/Makefile index 04e24eb33056..7a5702f09b70 100644 --- a/print/lyx/Makefile +++ b/print/lyx/Makefile @@ -25,7 +25,6 @@ LIB_DEPENDS= xforms.0:${PORTSDIR}/x11-toolkits/xforms \ USE_PERL5= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CXXFLAGS="${CFLAGS}" STRIP= CONFIGURE_ARGS= --with-extra-lib=${X11BASE}/lib --with-extra-inc="${X11BASE}/include ${X11BASE}/include/X11 ${LOCALBASE}/include" MAN1= lyx.1 reLyX.1 diff --git a/print/lyx14/Makefile b/print/lyx14/Makefile index 04e24eb33056..7a5702f09b70 100644 --- a/print/lyx14/Makefile +++ b/print/lyx14/Makefile @@ -25,7 +25,6 @@ LIB_DEPENDS= xforms.0:${PORTSDIR}/x11-toolkits/xforms \ USE_PERL5= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CXXFLAGS="${CFLAGS}" STRIP= CONFIGURE_ARGS= --with-extra-lib=${X11BASE}/lib --with-extra-inc="${X11BASE}/include ${X11BASE}/include/X11 ${LOCALBASE}/include" MAN1= lyx.1 reLyX.1 diff --git a/print/lyx15/Makefile b/print/lyx15/Makefile index 04e24eb33056..7a5702f09b70 100644 --- a/print/lyx15/Makefile +++ b/print/lyx15/Makefile @@ -25,7 +25,6 @@ LIB_DEPENDS= xforms.0:${PORTSDIR}/x11-toolkits/xforms \ USE_PERL5= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CXXFLAGS="${CFLAGS}" STRIP= CONFIGURE_ARGS= --with-extra-lib=${X11BASE}/lib --with-extra-inc="${X11BASE}/include ${X11BASE}/include/X11 ${LOCALBASE}/include" MAN1= lyx.1 reLyX.1 diff --git a/print/lyx16/Makefile b/print/lyx16/Makefile index 04e24eb33056..7a5702f09b70 100644 --- a/print/lyx16/Makefile +++ b/print/lyx16/Makefile @@ -25,7 +25,6 @@ LIB_DEPENDS= xforms.0:${PORTSDIR}/x11-toolkits/xforms \ USE_PERL5= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CXXFLAGS="${CFLAGS}" STRIP= CONFIGURE_ARGS= --with-extra-lib=${X11BASE}/lib --with-extra-inc="${X11BASE}/include ${X11BASE}/include/X11 ${LOCALBASE}/include" MAN1= lyx.1 reLyX.1 diff --git a/print/teTeX-base/Makefile b/print/teTeX-base/Makefile index a05202d84704..ec6e1d4c76f9 100644 --- a/print/teTeX-base/Makefile +++ b/print/teTeX-base/Makefile @@ -32,8 +32,7 @@ CONFIGURE_ARGS= --disable-multiplatform \ --with-libwww-include=${LIBWWW_PREFIX}/include/w3c-libwww \ --with-system-pnglib --with-pnglib-libdir=${LIBPNG_PREFIX}/lib \ --with-pnglib-include=${LIBPNG_PREFIX}/include -CONFIGURE_ENV= CXXFLAGS="${CFLAGS}" \ - INSTALL_PROGRAM="${BSD_INSTALL_SCRIPT}" +CONFIGURE_ENV= INSTALL_PROGRAM="${BSD_INSTALL_SCRIPT}" INSTALL_TARGET= install strip NOMANCOMPRESS= yes NOMAN1= MakeTeXPK.1 access.1 afm2tfm.1 allcm.1 allec.1 allneeded.1 \ diff --git a/print/teTeX/Makefile b/print/teTeX/Makefile index a05202d84704..ec6e1d4c76f9 100644 --- a/print/teTeX/Makefile +++ b/print/teTeX/Makefile @@ -32,8 +32,7 @@ CONFIGURE_ARGS= --disable-multiplatform \ --with-libwww-include=${LIBWWW_PREFIX}/include/w3c-libwww \ --with-system-pnglib --with-pnglib-libdir=${LIBPNG_PREFIX}/lib \ --with-pnglib-include=${LIBPNG_PREFIX}/include -CONFIGURE_ENV= CXXFLAGS="${CFLAGS}" \ - INSTALL_PROGRAM="${BSD_INSTALL_SCRIPT}" +CONFIGURE_ENV= INSTALL_PROGRAM="${BSD_INSTALL_SCRIPT}" INSTALL_TARGET= install strip NOMANCOMPRESS= yes NOMAN1= MakeTeXPK.1 access.1 afm2tfm.1 allcm.1 allec.1 allneeded.1 \ diff --git a/textproc/word2x/Makefile b/textproc/word2x/Makefile index d8a5a2178819..4296faee0d3b 100644 --- a/textproc/word2x/Makefile +++ b/textproc/word2x/Makefile @@ -16,7 +16,6 @@ MAINTAINER= billf@FreeBSD.org USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CXXFLAGS="${CFLAGS}" MAN1= word2x.1 diff --git a/x11/libdnd/Makefile b/x11/libdnd/Makefile index ef02ef99fb27..2e0688062871 100644 --- a/x11/libdnd/Makefile +++ b/x11/libdnd/Makefile @@ -17,7 +17,6 @@ MAINTAINER= lukin@okbmei.msk.su USE_XLIB= yes WRKSRC= ${WRKDIR}/DND/DNDlib GNU_CONFIGURE= yes -CONFIGURE_ENV+= CXXFLAGS="${CFLAGS}" post-install: .if !defined(NOPORTDOCS)