No need to use += on first appearance of variables.

37 files changed, 96 insertions, 96 deletions

diff --git a/databases/postgresql-devel-server/Makefile b/databases/postgresql-devel-server/Makefile
index acbe10c0c3b1..d582b8312d6a 100644
--- a/databases/postgresql-devel-server/Makefile
+++ b/databases/postgresql-devel-server/Makefile
@@ -3,7 +3,7 @@
 # Date created:		April 2, 1997
 # Whom:			Marc G. Fournier <scrappy@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.20 1997/11/26 23:42:12 jseger Exp $
+# $Id: Makefile,v 1.21 1997/12/04 11:44:52 asami Exp $
 
 DISTNAME=	postgresql-6.2.1
 CATEGORIES=	databases
@@ -15,7 +15,7 @@ MAINTAINER=	andreas@FreeBSD.ORG
 # if you want to use the tcl/tk frontend pgaccess, then you need to build
 # postgresql with tcl support by typing: make USE_TCL=yes
 .if defined(USE_TCL)
-MAKE_ENV+=	USE_TCL=true TCL_INCDIR=${PREFIX}/include/tcl8.0
+MAKE_ENV=	USE_TCL=true TCL_INCDIR=${PREFIX}/include/tcl8.0
 LIB_DEPENDS=	tcl80\\.1\\.:${PORTSDIR}/lang/tcl80
 .endif
 
@@ -25,7 +25,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/src
 USE_GMAKE=	YES
 MAKEFILE=	GNUmakefile
 HAS_CONFIGURE=	YES
-CONFIGURE_ARGS+=--prefix=${PREFIX}/pgsql \
+CONFIGURE_ARGS= --prefix=${PREFIX}/pgsql \
 		--enable-locale \
 		--with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'`
 
diff --git a/databases/postgresql-devel/Makefile b/databases/postgresql-devel/Makefile
index acbe10c0c3b1..d582b8312d6a 100644
--- a/databases/postgresql-devel/Makefile
+++ b/databases/postgresql-devel/Makefile
@@ -3,7 +3,7 @@
 # Date created:		April 2, 1997
 # Whom:			Marc G. Fournier <scrappy@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.20 1997/11/26 23:42:12 jseger Exp $
+# $Id: Makefile,v 1.21 1997/12/04 11:44:52 asami Exp $
 
 DISTNAME=	postgresql-6.2.1
 CATEGORIES=	databases
@@ -15,7 +15,7 @@ MAINTAINER=	andreas@FreeBSD.ORG
 # if you want to use the tcl/tk frontend pgaccess, then you need to build
 # postgresql with tcl support by typing: make USE_TCL=yes
 .if defined(USE_TCL)
-MAKE_ENV+=	USE_TCL=true TCL_INCDIR=${PREFIX}/include/tcl8.0
+MAKE_ENV=	USE_TCL=true TCL_INCDIR=${PREFIX}/include/tcl8.0
 LIB_DEPENDS=	tcl80\\.1\\.:${PORTSDIR}/lang/tcl80
 .endif
 
@@ -25,7 +25,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/src
 USE_GMAKE=	YES
 MAKEFILE=	GNUmakefile
 HAS_CONFIGURE=	YES
-CONFIGURE_ARGS+=--prefix=${PREFIX}/pgsql \
+CONFIGURE_ARGS= --prefix=${PREFIX}/pgsql \
 		--enable-locale \
 		--with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'`
 
diff --git a/databases/postgresql7/Makefile b/databases/postgresql7/Makefile
index acbe10c0c3b1..d582b8312d6a 100644
--- a/databases/postgresql7/Makefile
+++ b/databases/postgresql7/Makefile
@@ -3,7 +3,7 @@
 # Date created:		April 2, 1997
 # Whom:			Marc G. Fournier <scrappy@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.20 1997/11/26 23:42:12 jseger Exp $
+# $Id: Makefile,v 1.21 1997/12/04 11:44:52 asami Exp $
 
 DISTNAME=	postgresql-6.2.1
 CATEGORIES=	databases
@@ -15,7 +15,7 @@ MAINTAINER=	andreas@FreeBSD.ORG
 # if you want to use the tcl/tk frontend pgaccess, then you need to build
 # postgresql with tcl support by typing: make USE_TCL=yes
 .if defined(USE_TCL)
-MAKE_ENV+=	USE_TCL=true TCL_INCDIR=${PREFIX}/include/tcl8.0
+MAKE_ENV=	USE_TCL=true TCL_INCDIR=${PREFIX}/include/tcl8.0
 LIB_DEPENDS=	tcl80\\.1\\.:${PORTSDIR}/lang/tcl80
 .endif
 
@@ -25,7 +25,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/src
 USE_GMAKE=	YES
 MAKEFILE=	GNUmakefile
 HAS_CONFIGURE=	YES
-CONFIGURE_ARGS+=--prefix=${PREFIX}/pgsql \
+CONFIGURE_ARGS= --prefix=${PREFIX}/pgsql \
 		--enable-locale \
 		--with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'`
 
diff --git a/databases/postgresql73-server/Makefile b/databases/postgresql73-server/Makefile
index acbe10c0c3b1..d582b8312d6a 100644
--- a/databases/postgresql73-server/Makefile
+++ b/databases/postgresql73-server/Makefile
@@ -3,7 +3,7 @@
 # Date created:		April 2, 1997
 # Whom:			Marc G. Fournier <scrappy@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.20 1997/11/26 23:42:12 jseger Exp $
+# $Id: Makefile,v 1.21 1997/12/04 11:44:52 asami Exp $
 
 DISTNAME=	postgresql-6.2.1
 CATEGORIES=	databases
@@ -15,7 +15,7 @@ MAINTAINER=	andreas@FreeBSD.ORG
 # if you want to use the tcl/tk frontend pgaccess, then you need to build
 # postgresql with tcl support by typing: make USE_TCL=yes
 .if defined(USE_TCL)
-MAKE_ENV+=	USE_TCL=true TCL_INCDIR=${PREFIX}/include/tcl8.0
+MAKE_ENV=	USE_TCL=true TCL_INCDIR=${PREFIX}/include/tcl8.0
 LIB_DEPENDS=	tcl80\\.1\\.:${PORTSDIR}/lang/tcl80
 .endif
 
@@ -25,7 +25,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/src
 USE_GMAKE=	YES
 MAKEFILE=	GNUmakefile
 HAS_CONFIGURE=	YES
-CONFIGURE_ARGS+=--prefix=${PREFIX}/pgsql \
+CONFIGURE_ARGS= --prefix=${PREFIX}/pgsql \
 		--enable-locale \
 		--with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'`
 
diff --git a/databases/postgresql73/Makefile b/databases/postgresql73/Makefile
index acbe10c0c3b1..d582b8312d6a 100644
--- a/databases/postgresql73/Makefile
+++ b/databases/postgresql73/Makefile
@@ -3,7 +3,7 @@
 # Date created:		April 2, 1997
 # Whom:			Marc G. Fournier <scrappy@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.20 1997/11/26 23:42:12 jseger Exp $
+# $Id: Makefile,v 1.21 1997/12/04 11:44:52 asami Exp $
 
 DISTNAME=	postgresql-6.2.1
 CATEGORIES=	databases
@@ -15,7 +15,7 @@ MAINTAINER=	andreas@FreeBSD.ORG
 # if you want to use the tcl/tk frontend pgaccess, then you need to build
 # postgresql with tcl support by typing: make USE_TCL=yes
 .if defined(USE_TCL)
-MAKE_ENV+=	USE_TCL=true TCL_INCDIR=${PREFIX}/include/tcl8.0
+MAKE_ENV=	USE_TCL=true TCL_INCDIR=${PREFIX}/include/tcl8.0
 LIB_DEPENDS=	tcl80\\.1\\.:${PORTSDIR}/lang/tcl80
 .endif
 
@@ -25,7 +25,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/src
 USE_GMAKE=	YES
 MAKEFILE=	GNUmakefile
 HAS_CONFIGURE=	YES
-CONFIGURE_ARGS+=--prefix=${PREFIX}/pgsql \
+CONFIGURE_ARGS= --prefix=${PREFIX}/pgsql \
 		--enable-locale \
 		--with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'`
 
diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile
index acbe10c0c3b1..d582b8312d6a 100644
--- a/databases/postgresql74-server/Makefile
+++ b/databases/postgresql74-server/Makefile
@@ -3,7 +3,7 @@
 # Date created:		April 2, 1997
 # Whom:			Marc G. Fournier <scrappy@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.20 1997/11/26 23:42:12 jseger Exp $
+# $Id: Makefile,v 1.21 1997/12/04 11:44:52 asami Exp $
 
 DISTNAME=	postgresql-6.2.1
 CATEGORIES=	databases
@@ -15,7 +15,7 @@ MAINTAINER=	andreas@FreeBSD.ORG
 # if you want to use the tcl/tk frontend pgaccess, then you need to build
 # postgresql with tcl support by typing: make USE_TCL=yes
 .if defined(USE_TCL)
-MAKE_ENV+=	USE_TCL=true TCL_INCDIR=${PREFIX}/include/tcl8.0
+MAKE_ENV=	USE_TCL=true TCL_INCDIR=${PREFIX}/include/tcl8.0
 LIB_DEPENDS=	tcl80\\.1\\.:${PORTSDIR}/lang/tcl80
 .endif
 
@@ -25,7 +25,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/src
 USE_GMAKE=	YES
 MAKEFILE=	GNUmakefile
 HAS_CONFIGURE=	YES
-CONFIGURE_ARGS+=--prefix=${PREFIX}/pgsql \
+CONFIGURE_ARGS= --prefix=${PREFIX}/pgsql \
 		--enable-locale \
 		--with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'`
 
diff --git a/databases/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile
index acbe10c0c3b1..d582b8312d6a 100644
--- a/databases/postgresql80-server/Makefile
+++ b/databases/postgresql80-server/Makefile
@@ -3,7 +3,7 @@
 # Date created:		April 2, 1997
 # Whom:			Marc G. Fournier <scrappy@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.20 1997/11/26 23:42:12 jseger Exp $
+# $Id: Makefile,v 1.21 1997/12/04 11:44:52 asami Exp $
 
 DISTNAME=	postgresql-6.2.1
 CATEGORIES=	databases
@@ -15,7 +15,7 @@ MAINTAINER=	andreas@FreeBSD.ORG
 # if you want to use the tcl/tk frontend pgaccess, then you need to build
 # postgresql with tcl support by typing: make USE_TCL=yes
 .if defined(USE_TCL)
-MAKE_ENV+=	USE_TCL=true TCL_INCDIR=${PREFIX}/include/tcl8.0
+MAKE_ENV=	USE_TCL=true TCL_INCDIR=${PREFIX}/include/tcl8.0
 LIB_DEPENDS=	tcl80\\.1\\.:${PORTSDIR}/lang/tcl80
 .endif
 
@@ -25,7 +25,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/src
 USE_GMAKE=	YES
 MAKEFILE=	GNUmakefile
 HAS_CONFIGURE=	YES
-CONFIGURE_ARGS+=--prefix=${PREFIX}/pgsql \
+CONFIGURE_ARGS= --prefix=${PREFIX}/pgsql \
 		--enable-locale \
 		--with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'`
 
diff --git a/databases/postgresql81-server/Makefile b/databases/postgresql81-server/Makefile
index acbe10c0c3b1..d582b8312d6a 100644
--- a/databases/postgresql81-server/Makefile
+++ b/databases/postgresql81-server/Makefile
@@ -3,7 +3,7 @@
 # Date created:		April 2, 1997
 # Whom:			Marc G. Fournier <scrappy@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.20 1997/11/26 23:42:12 jseger Exp $
+# $Id: Makefile,v 1.21 1997/12/04 11:44:52 asami Exp $
 
 DISTNAME=	postgresql-6.2.1
 CATEGORIES=	databases
@@ -15,7 +15,7 @@ MAINTAINER=	andreas@FreeBSD.ORG
 # if you want to use the tcl/tk frontend pgaccess, then you need to build
 # postgresql with tcl support by typing: make USE_TCL=yes
 .if defined(USE_TCL)
-MAKE_ENV+=	USE_TCL=true TCL_INCDIR=${PREFIX}/include/tcl8.0
+MAKE_ENV=	USE_TCL=true TCL_INCDIR=${PREFIX}/include/tcl8.0
 LIB_DEPENDS=	tcl80\\.1\\.:${PORTSDIR}/lang/tcl80
 .endif
 
@@ -25,7 +25,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/src
 USE_GMAKE=	YES
 MAKEFILE=	GNUmakefile
 HAS_CONFIGURE=	YES
-CONFIGURE_ARGS+=--prefix=${PREFIX}/pgsql \
+CONFIGURE_ARGS= --prefix=${PREFIX}/pgsql \
 		--enable-locale \
 		--with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'`
 
diff --git a/databases/postgresql82-server/Makefile b/databases/postgresql82-server/Makefile
index acbe10c0c3b1..d582b8312d6a 100644
--- a/databases/postgresql82-server/Makefile
+++ b/databases/postgresql82-server/Makefile
@@ -3,7 +3,7 @@
 # Date created:		April 2, 1997
 # Whom:			Marc G. Fournier <scrappy@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.20 1997/11/26 23:42:12 jseger Exp $
+# $Id: Makefile,v 1.21 1997/12/04 11:44:52 asami Exp $
 
 DISTNAME=	postgresql-6.2.1
 CATEGORIES=	databases
@@ -15,7 +15,7 @@ MAINTAINER=	andreas@FreeBSD.ORG
 # if you want to use the tcl/tk frontend pgaccess, then you need to build
 # postgresql with tcl support by typing: make USE_TCL=yes
 .if defined(USE_TCL)
-MAKE_ENV+=	USE_TCL=true TCL_INCDIR=${PREFIX}/include/tcl8.0
+MAKE_ENV=	USE_TCL=true TCL_INCDIR=${PREFIX}/include/tcl8.0
 LIB_DEPENDS=	tcl80\\.1\\.:${PORTSDIR}/lang/tcl80
 .endif
 
@@ -25,7 +25,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/src
 USE_GMAKE=	YES
 MAKEFILE=	GNUmakefile
 HAS_CONFIGURE=	YES
-CONFIGURE_ARGS+=--prefix=${PREFIX}/pgsql \
+CONFIGURE_ARGS= --prefix=${PREFIX}/pgsql \
 		--enable-locale \
 		--with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'`
 
diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile
index acbe10c0c3b1..d582b8312d6a 100644
--- a/databases/postgresql83-server/Makefile
+++ b/databases/postgresql83-server/Makefile
@@ -3,7 +3,7 @@
 # Date created:		April 2, 1997
 # Whom:			Marc G. Fournier <scrappy@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.20 1997/11/26 23:42:12 jseger Exp $
+# $Id: Makefile,v 1.21 1997/12/04 11:44:52 asami Exp $
 
 DISTNAME=	postgresql-6.2.1
 CATEGORIES=	databases
@@ -15,7 +15,7 @@ MAINTAINER=	andreas@FreeBSD.ORG
 # if you want to use the tcl/tk frontend pgaccess, then you need to build
 # postgresql with tcl support by typing: make USE_TCL=yes
 .if defined(USE_TCL)
-MAKE_ENV+=	USE_TCL=true TCL_INCDIR=${PREFIX}/include/tcl8.0
+MAKE_ENV=	USE_TCL=true TCL_INCDIR=${PREFIX}/include/tcl8.0
 LIB_DEPENDS=	tcl80\\.1\\.:${PORTSDIR}/lang/tcl80
 .endif
 
@@ -25,7 +25,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/src
 USE_GMAKE=	YES
 MAKEFILE=	GNUmakefile
 HAS_CONFIGURE=	YES
-CONFIGURE_ARGS+=--prefix=${PREFIX}/pgsql \
+CONFIGURE_ARGS= --prefix=${PREFIX}/pgsql \
 		--enable-locale \
 		--with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'`
 
diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile
index acbe10c0c3b1..d582b8312d6a 100644
--- a/databases/postgresql84-server/Makefile
+++ b/databases/postgresql84-server/Makefile
@@ -3,7 +3,7 @@
 # Date created:		April 2, 1997
 # Whom:			Marc G. Fournier <scrappy@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.20 1997/11/26 23:42:12 jseger Exp $
+# $Id: Makefile,v 1.21 1997/12/04 11:44:52 asami Exp $
 
 DISTNAME=	postgresql-6.2.1
 CATEGORIES=	databases
@@ -15,7 +15,7 @@ MAINTAINER=	andreas@FreeBSD.ORG
 # if you want to use the tcl/tk frontend pgaccess, then you need to build
 # postgresql with tcl support by typing: make USE_TCL=yes
 .if defined(USE_TCL)
-MAKE_ENV+=	USE_TCL=true TCL_INCDIR=${PREFIX}/include/tcl8.0
+MAKE_ENV=	USE_TCL=true TCL_INCDIR=${PREFIX}/include/tcl8.0
 LIB_DEPENDS=	tcl80\\.1\\.:${PORTSDIR}/lang/tcl80
 .endif
 
@@ -25,7 +25,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/src
 USE_GMAKE=	YES
 MAKEFILE=	GNUmakefile
 HAS_CONFIGURE=	YES
-CONFIGURE_ARGS+=--prefix=${PREFIX}/pgsql \
+CONFIGURE_ARGS= --prefix=${PREFIX}/pgsql \
 		--enable-locale \
 		--with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'`
 
diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile
index acbe10c0c3b1..d582b8312d6a 100644
--- a/databases/postgresql90-server/Makefile
+++ b/databases/postgresql90-server/Makefile
@@ -3,7 +3,7 @@
 # Date created:		April 2, 1997
 # Whom:			Marc G. Fournier <scrappy@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.20 1997/11/26 23:42:12 jseger Exp $
+# $Id: Makefile,v 1.21 1997/12/04 11:44:52 asami Exp $
 
 DISTNAME=	postgresql-6.2.1
 CATEGORIES=	databases
@@ -15,7 +15,7 @@ MAINTAINER=	andreas@FreeBSD.ORG
 # if you want to use the tcl/tk frontend pgaccess, then you need to build
 # postgresql with tcl support by typing: make USE_TCL=yes
 .if defined(USE_TCL)
-MAKE_ENV+=	USE_TCL=true TCL_INCDIR=${PREFIX}/include/tcl8.0
+MAKE_ENV=	USE_TCL=true TCL_INCDIR=${PREFIX}/include/tcl8.0
 LIB_DEPENDS=	tcl80\\.1\\.:${PORTSDIR}/lang/tcl80
 .endif
 
@@ -25,7 +25,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/src
 USE_GMAKE=	YES
 MAKEFILE=	GNUmakefile
 HAS_CONFIGURE=	YES
-CONFIGURE_ARGS+=--prefix=${PREFIX}/pgsql \
+CONFIGURE_ARGS= --prefix=${PREFIX}/pgsql \
 		--enable-locale \
 		--with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'`
 
diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile
index acbe10c0c3b1..d582b8312d6a 100644
--- a/databases/postgresql91-server/Makefile
+++ b/databases/postgresql91-server/Makefile
@@ -3,7 +3,7 @@
 # Date created:		April 2, 1997
 # Whom:			Marc G. Fournier <scrappy@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.20 1997/11/26 23:42:12 jseger Exp $
+# $Id: Makefile,v 1.21 1997/12/04 11:44:52 asami Exp $
 
 DISTNAME=	postgresql-6.2.1
 CATEGORIES=	databases
@@ -15,7 +15,7 @@ MAINTAINER=	andreas@FreeBSD.ORG
 # if you want to use the tcl/tk frontend pgaccess, then you need to build
 # postgresql with tcl support by typing: make USE_TCL=yes
 .if defined(USE_TCL)
-MAKE_ENV+=	USE_TCL=true TCL_INCDIR=${PREFIX}/include/tcl8.0
+MAKE_ENV=	USE_TCL=true TCL_INCDIR=${PREFIX}/include/tcl8.0
 LIB_DEPENDS=	tcl80\\.1\\.:${PORTSDIR}/lang/tcl80
 .endif
 
@@ -25,7 +25,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/src
 USE_GMAKE=	YES
 MAKEFILE=	GNUmakefile
 HAS_CONFIGURE=	YES
-CONFIGURE_ARGS+=--prefix=${PREFIX}/pgsql \
+CONFIGURE_ARGS= --prefix=${PREFIX}/pgsql \
 		--enable-locale \
 		--with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'`
 
diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index acbe10c0c3b1..d582b8312d6a 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -3,7 +3,7 @@
 # Date created:		April 2, 1997
 # Whom:			Marc G. Fournier <scrappy@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.20 1997/11/26 23:42:12 jseger Exp $
+# $Id: Makefile,v 1.21 1997/12/04 11:44:52 asami Exp $
 
 DISTNAME=	postgresql-6.2.1
 CATEGORIES=	databases
@@ -15,7 +15,7 @@ MAINTAINER=	andreas@FreeBSD.ORG
 # if you want to use the tcl/tk frontend pgaccess, then you need to build
 # postgresql with tcl support by typing: make USE_TCL=yes
 .if defined(USE_TCL)
-MAKE_ENV+=	USE_TCL=true TCL_INCDIR=${PREFIX}/include/tcl8.0
+MAKE_ENV=	USE_TCL=true TCL_INCDIR=${PREFIX}/include/tcl8.0
 LIB_DEPENDS=	tcl80\\.1\\.:${PORTSDIR}/lang/tcl80
 .endif
 
@@ -25,7 +25,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/src
 USE_GMAKE=	YES
 MAKEFILE=	GNUmakefile
 HAS_CONFIGURE=	YES
-CONFIGURE_ARGS+=--prefix=${PREFIX}/pgsql \
+CONFIGURE_ARGS= --prefix=${PREFIX}/pgsql \
 		--enable-locale \
 		--with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'`
 
diff --git a/emulators/mtools/Makefile b/emulators/mtools/Makefile
index 4676a4266e44..1c1ac7f13efe 100644
--- a/emulators/mtools/Makefile
+++ b/emulators/mtools/Makefile
@@ -3,7 +3,7 @@
 # Date created:         5 October 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.16 1997/08/13 15:28:12 jmz Exp $
+# $Id: Makefile,v 1.17 1997/10/08 21:12:22 jmz Exp $
 #
 
 DISTNAME=	mtools-3.8
@@ -14,7 +14,7 @@ MASTER_SITES=   ftp://linux.wauug.org/pub/knaff/mtools/ \
 MAINTAINER=	jmz@FreeBSD.org
 
 HAS_CONFIGURE=  yes
-CONFIGURE_ARGS+=--enable-xdf --prefix=${PREFIX}
+CONFIGURE_ARGS= --enable-xdf --prefix=${PREFIX}
 
 USE_GMAKE=	yes
 
diff --git a/games/tvp/Makefile b/games/tvp/Makefile
index 5dd4ea0d6492..3ed5ad5d1aa2 100644
--- a/games/tvp/Makefile
+++ b/games/tvp/Makefile
@@ -3,7 +3,7 @@
 # Date Created:		3 Jul 1996
 # Whom:			Tim Vanderhoek <ac199@hwcn.org>
 #
-# $Id: Makefile,v 1.1.1.1 1997/10/23 14:42:22 hoek Exp $
+# $Id: Makefile,v 1.2 1997/11/08 13:26:08 hoek Exp $
 #
 
 DISTNAME=	tvp-0.9.7.1
@@ -18,7 +18,7 @@ MAINTAINER=	hoek@FreeBSD.ORG
 LIB_DEPENDS=	tk80\\.1\\.:${PORTSDIR}/x11/tk80
 
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--enable-tcl-dir=${PREFIX}/lib \
+CONFIGURE_ARGS=		--enable-tcl-dir=${PREFIX}/lib \
 			--enable-carddir=${PREFIX}/share/games/tvp
 
 MAN6=	tvp.6
diff --git a/lang/eperl/Makefile b/lang/eperl/Makefile
index dd357fe1fef6..44725045c7b0 100644
--- a/lang/eperl/Makefile
+++ b/lang/eperl/Makefile
@@ -3,7 +3,7 @@
 # Date created:		03-Sep-1997
 # Whom:			Ralf S. Engelschall <rse@engelschall.com>
 #
-# $Id: Makefile,v 1.19 1997/12/09 15:38:48 rse Exp $
+# $Id: Makefile,v 1.20 1997/12/23 09:59:20 rse Exp $
 #
 
 DISTNAME=	eperl-2.2.9
@@ -27,7 +27,7 @@ RUN_DEPENDS=	${PREFIX}/etc/apache/srm.conf:${PORTSDIR}/www/apache
 
 USE_PERL5=	yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-perl=${PREFIX}/bin/perl
+CONFIGURE_ARGS= --with-perl=${PREFIX}/bin/perl
 
 MAN1=	eperl.1
 
diff --git a/lang/tclX/Makefile b/lang/tclX/Makefile
index 548f66e29609..6da3107bf30e 100644
--- a/lang/tclX/Makefile
+++ b/lang/tclX/Makefile
@@ -3,7 +3,7 @@
 # Date created:		6 February 1996
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.18 1997/09/12 17:16:18 pst Exp $
+# $Id: Makefile,v 1.19 1997/10/09 08:19:14 tg Exp $
 #
 
 DISTNAME=	tclX7.5.2
@@ -17,8 +17,8 @@ MAINTAINER=	ports@FreeBSD.ORG
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+= --enable-shared --with-tk
-CONFIGURE_ENV+=	PREFIX=${PREFIX}
+CONFIGURE_ARGS= --enable-shared --with-tk
+CONFIGURE_ENV=	PREFIX=${PREFIX}
 MAN3=		CmdWrite.3 Handles.3 Keylist.3 TclCommandWriting.3 \
 		TclXInit.3 Tcl_HandleAlloc.3 Tcl_HandleFree.3 \
 		Tcl_HandleTblInit.3 Tcl_HandleTblRelease.3 \
diff --git a/lang/tclX80/Makefile b/lang/tclX80/Makefile
index 548f66e29609..6da3107bf30e 100644
--- a/lang/tclX80/Makefile
+++ b/lang/tclX80/Makefile
@@ -3,7 +3,7 @@
 # Date created:		6 February 1996
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.18 1997/09/12 17:16:18 pst Exp $
+# $Id: Makefile,v 1.19 1997/10/09 08:19:14 tg Exp $
 #
 
 DISTNAME=	tclX7.5.2
@@ -17,8 +17,8 @@ MAINTAINER=	ports@FreeBSD.ORG
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+= --enable-shared --with-tk
-CONFIGURE_ENV+=	PREFIX=${PREFIX}
+CONFIGURE_ARGS= --enable-shared --with-tk
+CONFIGURE_ENV=	PREFIX=${PREFIX}
 MAN3=		CmdWrite.3 Handles.3 Keylist.3 TclCommandWriting.3 \
 		TclXInit.3 Tcl_HandleAlloc.3 Tcl_HandleFree.3 \
 		Tcl_HandleTblInit.3 Tcl_HandleTblRelease.3 \
diff --git a/lang/tclX82/Makefile b/lang/tclX82/Makefile
index 548f66e29609..6da3107bf30e 100644
--- a/lang/tclX82/Makefile
+++ b/lang/tclX82/Makefile
@@ -3,7 +3,7 @@
 # Date created:		6 February 1996
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.18 1997/09/12 17:16:18 pst Exp $
+# $Id: Makefile,v 1.19 1997/10/09 08:19:14 tg Exp $
 #
 
 DISTNAME=	tclX7.5.2
@@ -17,8 +17,8 @@ MAINTAINER=	ports@FreeBSD.ORG
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+= --enable-shared --with-tk
-CONFIGURE_ENV+=	PREFIX=${PREFIX}
+CONFIGURE_ARGS= --enable-shared --with-tk
+CONFIGURE_ENV=	PREFIX=${PREFIX}
 MAN3=		CmdWrite.3 Handles.3 Keylist.3 TclCommandWriting.3 \
 		TclXInit.3 Tcl_HandleAlloc.3 Tcl_HandleFree.3 \
 		Tcl_HandleTblInit.3 Tcl_HandleTblRelease.3 \
diff --git a/mail/elm+ME/Makefile b/mail/elm+ME/Makefile
index 9fe8133ead48..ae7b36ae415f 100644
--- a/mail/elm+ME/Makefile
+++ b/mail/elm+ME/Makefile
@@ -4,7 +4,7 @@
 # Date created:         26 June 1995
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.40 1997/06/05 21:50:05 ache Exp $
+# $Id: Makefile,v 1.41 1997/06/22 07:28:49 ache Exp $
 #
 
 DISTNAME=       elm-2.4ME+32
@@ -21,8 +21,8 @@ MAN1=           answer.1 checkalias.1 elm.1 elmalias.1 fastmail.1 \
 
 HAS_CONFIGURE=  Yes
 CONFIGURE_SCRIPT= Configure
-CONFIGURE_ENV+= PREFIX="${PREFIX}"
-CONFIGURE_ARGS+= -S
+CONFIGURE_ENV=  PREFIX="${PREFIX}"
+CONFIGURE_ARGS= -S
 
 post-install:
 	cd ${WRKSRC}/nls; ${MAKE} install
diff --git a/mail/elm/Makefile b/mail/elm/Makefile
index 9fe8133ead48..ae7b36ae415f 100644
--- a/mail/elm/Makefile
+++ b/mail/elm/Makefile
@@ -4,7 +4,7 @@
 # Date created:         26 June 1995
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.40 1997/06/05 21:50:05 ache Exp $
+# $Id: Makefile,v 1.41 1997/06/22 07:28:49 ache Exp $
 #
 
 DISTNAME=       elm-2.4ME+32
@@ -21,8 +21,8 @@ MAN1=           answer.1 checkalias.1 elm.1 elmalias.1 fastmail.1 \
 
 HAS_CONFIGURE=  Yes
 CONFIGURE_SCRIPT= Configure
-CONFIGURE_ENV+= PREFIX="${PREFIX}"
-CONFIGURE_ARGS+= -S
+CONFIGURE_ENV=  PREFIX="${PREFIX}"
+CONFIGURE_ARGS= -S
 
 post-install:
 	cd ${WRKSRC}/nls; ${MAKE} install
diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index 2da8d2a20fd2..5ce5da822726 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -3,7 +3,7 @@
 # Date created:		26 Oct 1996
 # Whom:			Ville Eerola <ve@sci.fi>
 #
-# $Id: Makefile,v 1.52 1997/11/29 14:22:27 max Exp $
+# $Id: Makefile,v 1.53 1997/12/15 20:55:27 max Exp $
 #
 
 DISTNAME=       fetchmail-4.3.5
@@ -13,8 +13,8 @@ MASTER_SITES=	ftp://ftp.ccil.org/pub/esr/fetchmail/
 MAINTAINER=	ve@sci.fi
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+= --enable-opie
-CONFIGURE_ENV+= LDFLAGS="${CFLAGS}"
+CONFIGURE_ARGS= --enable-opie
+CONFIGURE_ENV=  LDFLAGS="${CFLAGS}"
 MAN1=		fetchmail.1
 
 .if exists(/usr/lib/libkrb.a) && (defined(MAKE_EBONES) || defined(MAKE_KERBEROS4))
diff --git a/mail/popper/Makefile b/mail/popper/Makefile
index 7b9fcc4135d2..af3ec6292ed7 100644
--- a/mail/popper/Makefile
+++ b/mail/popper/Makefile
@@ -3,7 +3,7 @@
 # Date created:		1 April 1995
 # Whom:			pst
 #
-# $Id: Makefile,v 1.19 1997/10/09 02:39:58 pst Exp $
+# $Id: Makefile,v 1.20 1997/11/20 14:38:36 ache Exp $
 #
 
 DISTNAME=       qpopper2.41beta1
@@ -34,9 +34,9 @@ O_DEFS+=        -DAPOP_ONLY
 P_LIBS+=        -lmd -lutil
 
 GNU_CONFIGURE=          yes
-CONFIGURE_ARGS+=        --with-apop=${PREFIX}/etc/popper/pop.auth \
+CONFIGURE_ARGS=         --with-apop=${PREFIX}/etc/popper/pop.auth \
 			--with-apopuid=pop
-CONFIGURE_ENV+=         LIBS="${P_LIBS}" O_DEFS="${O_DEFS}"
+CONFIGURE_ENV=          LIBS="${P_LIBS}" O_DEFS="${O_DEFS}"
 
 MAN8=   popauth.8 popper.8
 
diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile
index 7b9fcc4135d2..af3ec6292ed7 100644
--- a/mail/qpopper/Makefile
+++ b/mail/qpopper/Makefile
@@ -3,7 +3,7 @@
 # Date created:		1 April 1995
 # Whom:			pst
 #
-# $Id: Makefile,v 1.19 1997/10/09 02:39:58 pst Exp $
+# $Id: Makefile,v 1.20 1997/11/20 14:38:36 ache Exp $
 #
 
 DISTNAME=       qpopper2.41beta1
@@ -34,9 +34,9 @@ O_DEFS+=        -DAPOP_ONLY
 P_LIBS+=        -lmd -lutil
 
 GNU_CONFIGURE=          yes
-CONFIGURE_ARGS+=        --with-apop=${PREFIX}/etc/popper/pop.auth \
+CONFIGURE_ARGS=         --with-apop=${PREFIX}/etc/popper/pop.auth \
 			--with-apopuid=pop
-CONFIGURE_ENV+=         LIBS="${P_LIBS}" O_DEFS="${O_DEFS}"
+CONFIGURE_ENV=          LIBS="${P_LIBS}" O_DEFS="${O_DEFS}"
 
 MAN8=   popauth.8 popper.8
 
diff --git a/math/plplot/Makefile b/math/plplot/Makefile
index e2abbe821713..f19e0049f1d8 100644
--- a/math/plplot/Makefile
+++ b/math/plplot/Makefile
@@ -3,7 +3,7 @@
 # Date created:         03 Oct 1997
 # Whom:                 Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.2 1997/11/29 23:20:20 jseger Exp $
+# $Id: Makefile,v 1.3 1997/11/30 21:12:15 jseger Exp $
 #
 
 DISTNAME=       plplot4p99j
@@ -14,7 +14,7 @@ MASTER_SITES=	ftp://dino.ph.utexas.edu/plplot/distrib/alpha/
 MAINTAINER=	tg@FreeBSD.ORG
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+= --with-gcc=yes --with-double=yes
+CONFIGURE_ARGS= --with-gcc=yes --with-double=yes
 
 post-patch:
 	@perl -pi.bak -e "s|/usr/local/plplot/lib|${PREFIX}/lib/plplot|g;" \
diff --git a/net/freewais-sf/Makefile b/net/freewais-sf/Makefile
index c6cc4c763049..d10a5b1b7599 100644
--- a/net/freewais-sf/Makefile
+++ b/net/freewais-sf/Makefile
@@ -3,7 +3,7 @@
 # Date created:		19 November 1996
 # Whom:			Pedro Giffuni <pgiffuni@fps.biblos.unal.edu.co>
 #
-# $Id: Makefile,v 1.2 1997/02/18 10:08:02 obrien Exp $
+# $Id: Makefile,v 1.3 1997/02/19 05:49:17 asami Exp $
 #
 
 DISTNAME=	freeWAIS-sf-2.1.2
@@ -14,7 +14,7 @@ MASTER_SITES=   ftp://ftp.wsct.wsc.com/pub/freeWAIS-sf/freeWAIS-sf-2.1/
 MAINTAINER=	pgiffuni@fps.biblos.unal.edu.co
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+= < ${FILESDIR}/configure.ans
+CONFIGURE_ARGS= < ${FILESDIR}/configure.ans
 MAN1=	catalog.1 dictionary.1 inverted_file.1 makedb.1 mkfmt.1 waisindex.1 \
 	waisq.1 waissearch.1 xwais.1 xwaisq.1
 MAN3=	ftw.3 scandir.3
diff --git a/news/nntpcache/Makefile b/news/nntpcache/Makefile
index 400affbd133b..bb9969fadd8a 100644
--- a/news/nntpcache/Makefile
+++ b/news/nntpcache/Makefile
@@ -3,7 +3,7 @@
 # Date created:		6 January 1997
 # Whom:			proff@suburbia.net
 #
-# $Id: Makefile,v 1.5 1997/04/09 07:16:39 asami Exp $
+# $Id: Makefile,v 1.6 1997/07/31 06:36:03 asami Exp $
 #
 
 DISTNAME=	nntpcache-1.0.7.1
@@ -16,7 +16,7 @@ MASTER_SITES=	ftp://nntpcache.org/pub/nntpcache/ \
 MAINTAINER=	nntpcache@nntpcache.org
 
 GNU_CONFIGURE=	TRUE
-CONFIGURE_ARGS+=	--localstatedir=/var/spool
+CONFIGURE_ARGS=	--localstatedir=/var/spool
 MAN8=		nntpcache.8
 
 post-configure:
diff --git a/print/lyx-devel/Makefile b/print/lyx-devel/Makefile
index c1dd6247f5cf..c4255be27c2e 100644
--- a/print/lyx-devel/Makefile
+++ b/print/lyx-devel/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Sa  12 Okt 1996 19:20:51 MET DST
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.11 1997/10/24 15:18:16 obrien Exp $
+# $Id: Makefile,v 1.12 1997/10/29 18:26:01 obrien Exp $
 #
 
 DISTNAME=	lyx-0.11.45
@@ -20,7 +20,7 @@ LIB_DEPENDS=	xforms\\.0\\.:${PORTSDIR}/x11/xforms \
 
 GNU_CONFIGURE=	yes
 STRIP=
-CONFIGURE_ARGS+=--with-extra-lib=${X11BASE}/lib --with-extra-inc="${X11BASE}/include ${X11BASE}/include/X11"
+CONFIGURE_ARGS= --with-extra-lib=${X11BASE}/lib --with-extra-inc="${X11BASE}/include ${X11BASE}/include/X11"
 MAN1=		lyx.1
 
 post-install:
diff --git a/print/lyx/Makefile b/print/lyx/Makefile
index c1dd6247f5cf..c4255be27c2e 100644
--- a/print/lyx/Makefile
+++ b/print/lyx/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Sa  12 Okt 1996 19:20:51 MET DST
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.11 1997/10/24 15:18:16 obrien Exp $
+# $Id: Makefile,v 1.12 1997/10/29 18:26:01 obrien Exp $
 #
 
 DISTNAME=	lyx-0.11.45
@@ -20,7 +20,7 @@ LIB_DEPENDS=	xforms\\.0\\.:${PORTSDIR}/x11/xforms \
 
 GNU_CONFIGURE=	yes
 STRIP=
-CONFIGURE_ARGS+=--with-extra-lib=${X11BASE}/lib --with-extra-inc="${X11BASE}/include ${X11BASE}/include/X11"
+CONFIGURE_ARGS= --with-extra-lib=${X11BASE}/lib --with-extra-inc="${X11BASE}/include ${X11BASE}/include/X11"
 MAN1=		lyx.1
 
 post-install:
diff --git a/print/lyx14/Makefile b/print/lyx14/Makefile
index c1dd6247f5cf..c4255be27c2e 100644
--- a/print/lyx14/Makefile
+++ b/print/lyx14/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Sa  12 Okt 1996 19:20:51 MET DST
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.11 1997/10/24 15:18:16 obrien Exp $
+# $Id: Makefile,v 1.12 1997/10/29 18:26:01 obrien Exp $
 #
 
 DISTNAME=	lyx-0.11.45
@@ -20,7 +20,7 @@ LIB_DEPENDS=	xforms\\.0\\.:${PORTSDIR}/x11/xforms \
 
 GNU_CONFIGURE=	yes
 STRIP=
-CONFIGURE_ARGS+=--with-extra-lib=${X11BASE}/lib --with-extra-inc="${X11BASE}/include ${X11BASE}/include/X11"
+CONFIGURE_ARGS= --with-extra-lib=${X11BASE}/lib --with-extra-inc="${X11BASE}/include ${X11BASE}/include/X11"
 MAN1=		lyx.1
 
 post-install:
diff --git a/print/lyx15/Makefile b/print/lyx15/Makefile
index c1dd6247f5cf..c4255be27c2e 100644
--- a/print/lyx15/Makefile
+++ b/print/lyx15/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Sa  12 Okt 1996 19:20:51 MET DST
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.11 1997/10/24 15:18:16 obrien Exp $
+# $Id: Makefile,v 1.12 1997/10/29 18:26:01 obrien Exp $
 #
 
 DISTNAME=	lyx-0.11.45
@@ -20,7 +20,7 @@ LIB_DEPENDS=	xforms\\.0\\.:${PORTSDIR}/x11/xforms \
 
 GNU_CONFIGURE=	yes
 STRIP=
-CONFIGURE_ARGS+=--with-extra-lib=${X11BASE}/lib --with-extra-inc="${X11BASE}/include ${X11BASE}/include/X11"
+CONFIGURE_ARGS= --with-extra-lib=${X11BASE}/lib --with-extra-inc="${X11BASE}/include ${X11BASE}/include/X11"
 MAN1=		lyx.1
 
 post-install:
diff --git a/print/lyx16/Makefile b/print/lyx16/Makefile
index c1dd6247f5cf..c4255be27c2e 100644
--- a/print/lyx16/Makefile
+++ b/print/lyx16/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Sa  12 Okt 1996 19:20:51 MET DST
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.11 1997/10/24 15:18:16 obrien Exp $
+# $Id: Makefile,v 1.12 1997/10/29 18:26:01 obrien Exp $
 #
 
 DISTNAME=	lyx-0.11.45
@@ -20,7 +20,7 @@ LIB_DEPENDS=	xforms\\.0\\.:${PORTSDIR}/x11/xforms \
 
 GNU_CONFIGURE=	yes
 STRIP=
-CONFIGURE_ARGS+=--with-extra-lib=${X11BASE}/lib --with-extra-inc="${X11BASE}/include ${X11BASE}/include/X11"
+CONFIGURE_ARGS= --with-extra-lib=${X11BASE}/lib --with-extra-inc="${X11BASE}/include ${X11BASE}/include/X11"
 MAN1=		lyx.1
 
 post-install:
diff --git a/x11-toolkits/tkstep80/Makefile b/x11-toolkits/tkstep80/Makefile
index 9d7d6747859d..b1413ea6bf42 100644
--- a/x11-toolkits/tkstep80/Makefile
+++ b/x11-toolkits/tkstep80/Makefile
@@ -3,7 +3,7 @@
 # Date created:		06 November 1997
 # Whom:			Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.4 1997/12/01 12:41:44 tg Exp $
+# $Id: Makefile,v 1.5 1997/12/05 13:45:35 tg Exp $
 #
 
 DISTNAME=	tk8.0p2
@@ -26,7 +26,7 @@ FETCH_BEFORE_ARGS=	-b
 PATCH_DIST_ARGS=	-p1 -d ${WRKDIR}/tk8.0 -E --quiet
 WRKSRC=		${WRKDIR}/tk8.0/unix
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+= --enable-shared --enable-xpm --enable-step --enable-dnd \
+CONFIGURE_ARGS= --enable-shared --enable-xpm --enable-step --enable-dnd \
 		 --enable-tiff --with-optimize="${CFLAGS} -I${PREFIX}/include -I${PREFIX}/include/tiff34"
 CONFIGURE_ENV=  PORTSDIR=${PORTSDIR}
 
diff --git a/x11-wm/fvwm95-i18n/Makefile b/x11-wm/fvwm95-i18n/Makefile
index c83950cdbaea..b1546562fd5d 100644
--- a/x11-wm/fvwm95-i18n/Makefile
+++ b/x11-wm/fvwm95-i18n/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Sa   1 Feb 1997 14:46:05 MET
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.15 1997/12/04 02:21:59 vanilla Exp $
+# $Id: Makefile,v 1.16 1997/12/04 22:47:32 vanilla Exp $
 #
 
 DISTNAME=	fvwm95-2.0.43a-Autoconf
@@ -20,7 +20,7 @@ RUN_DEPENDS=	${X11BASE}/icons/chuck.xpm:${PORTSDIR}/x11/fbsd-icons
 
 USE_X11=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--includedir=${LOCALBASE}/include \
+CONFIGURE_ARGS= --includedir=${LOCALBASE}/include \
 		--libdir=${LOCALBASE}/lib
 
 MAN1=		fvwm95.1
diff --git a/x11-wm/fvwm95/Makefile b/x11-wm/fvwm95/Makefile
index c83950cdbaea..b1546562fd5d 100644
--- a/x11-wm/fvwm95/Makefile
+++ b/x11-wm/fvwm95/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Sa   1 Feb 1997 14:46:05 MET
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.15 1997/12/04 02:21:59 vanilla Exp $
+# $Id: Makefile,v 1.16 1997/12/04 22:47:32 vanilla Exp $
 #
 
 DISTNAME=	fvwm95-2.0.43a-Autoconf
@@ -20,7 +20,7 @@ RUN_DEPENDS=	${X11BASE}/icons/chuck.xpm:${PORTSDIR}/x11/fbsd-icons
 
 USE_X11=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--includedir=${LOCALBASE}/include \
+CONFIGURE_ARGS= --includedir=${LOCALBASE}/include \
 		--libdir=${LOCALBASE}/lib
 
 MAN1=		fvwm95.1
diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile
index 13acfb5c31f4..c8161054d5ea 100644
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -3,7 +3,7 @@
 # Date created:		9 November 1994
 # Whom:			smace
 #
-# $Id: Makefile,v 1.23 1997/10/10 09:24:38 tg Exp $
+# $Id: Makefile,v 1.24 1997/11/24 08:06:02 tg Exp $
 #
 
 DISTNAME=       xlockmore-4.06.1
@@ -16,7 +16,7 @@ MAINTAINER=	tg@FreeBSD.ORG
 LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+= --without-gl --without-motif --without-sx --without-mesagl \
+CONFIGURE_ARGS= --without-gl --without-motif --without-sx --without-mesagl \
 		--without-editres --without-dtsaver --without-rplay \
 		--without-nas --enable-mouse-motion
 USE_X11=	yes