Fix to make ports work with bsd.port.mk rev. 1.306.

${MACHINE_ARCH}--freebsd${OSREL} is now passed to CONFIGURE_ARGS if
GNU_CONFIGURE is defined.  Take the target out of CONFIGURE_ARGS of
some ports that added it explicitly; define it as
${MACHINE_ARCH}--freebsd if the port doesn't like the ${OSREL} part;
define it as something else (such as ${MACHINE_ARCH}--freebsdelf if
the port requires that; define it as an empty string if the port
doesn't like it at all.

The last might be a sign that a GNU_CONFIGURE port actually doesn't
use GNU's version of configure at all; but I don't have time to go
look at them all, we'll fix them as time goes on.

At least we've got much fewer "-unknown-"s in the tree as the result. :)

69 files changed, 199 insertions, 144 deletions

diff --git a/audio/splay/Makefile b/audio/splay/Makefile
index 8a1b96900582..1b14f03ac600 100644
--- a/audio/splay/Makefile
+++ b/audio/splay/Makefile
@@ -3,7 +3,7 @@
 # Date created:         1 Apr 1997
 # Whom:                 junker@jazz.snu.ac.kr
 #
-# $Id: Makefile,v 1.5 1998/01/08 18:52:01 fenner Exp $
+# $Id: Makefile,v 1.6 1998/04/19 15:40:42 steve Exp $
 #
 # pthread library can be used, but sound quality is buggy
 #
@@ -15,7 +15,7 @@ MASTER_SITES=		http://cain.kaist.ac.kr/~jwj95/
 MAINTAINER=		junker@jazz.snu.ac.kr
 
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS=		i386--freebsd --without-xsplay --without-pthread
+CONFIGURE_ARGS=		--without-xsplay --without-pthread
 MAN1=			splay.1
 
 .include <bsd.port.mk>
diff --git a/devel/gettext-devel/Makefile b/devel/gettext-devel/Makefile
index 83e8235c36bb..05c902bd6683 100644
--- a/devel/gettext-devel/Makefile
+++ b/devel/gettext-devel/Makefile
@@ -3,7 +3,7 @@
 # Date created:        16 March 1998
 # Whom:                Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.5 1998/12/01 22:38:45 billf Exp $
+# $Id: Makefile,v 1.6 1999/01/12 16:50:26 vanilla Exp $
 #
 
 DISTNAME=	gettext-0.10.35
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://alpha.gnu.ai.mit.edu/gnu/
 MAINTAINER=	nacai@iname.com
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	i386--freebsd --with-gnu-gettext
+CONFIGURE_ARGS=	--with-gnu-gettext
 
 pre-configure:
 	${RM} ${WRKSRC}/doc/gettext.info*
diff --git a/devel/gettext-old/Makefile b/devel/gettext-old/Makefile
index 83e8235c36bb..05c902bd6683 100644
--- a/devel/gettext-old/Makefile
+++ b/devel/gettext-old/Makefile
@@ -3,7 +3,7 @@
 # Date created:        16 March 1998
 # Whom:                Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.5 1998/12/01 22:38:45 billf Exp $
+# $Id: Makefile,v 1.6 1999/01/12 16:50:26 vanilla Exp $
 #
 
 DISTNAME=	gettext-0.10.35
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://alpha.gnu.ai.mit.edu/gnu/
 MAINTAINER=	nacai@iname.com
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	i386--freebsd --with-gnu-gettext
+CONFIGURE_ARGS=	--with-gnu-gettext
 
 pre-configure:
 	${RM} ${WRKSRC}/doc/gettext.info*
diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile
index 83e8235c36bb..05c902bd6683 100644
--- a/devel/gettext/Makefile
+++ b/devel/gettext/Makefile
@@ -3,7 +3,7 @@
 # Date created:        16 March 1998
 # Whom:                Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.5 1998/12/01 22:38:45 billf Exp $
+# $Id: Makefile,v 1.6 1999/01/12 16:50:26 vanilla Exp $
 #
 
 DISTNAME=	gettext-0.10.35
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://alpha.gnu.ai.mit.edu/gnu/
 MAINTAINER=	nacai@iname.com
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	i386--freebsd --with-gnu-gettext
+CONFIGURE_ARGS=	--with-gnu-gettext
 
 pre-configure:
 	${RM} ${WRKSRC}/doc/gettext.info*
diff --git a/devel/libffi-devel/Makefile b/devel/libffi-devel/Makefile
index b83994bb797b..3febfd34bded 100644
--- a/devel/libffi-devel/Makefile
+++ b/devel/libffi-devel/Makefile
@@ -3,7 +3,7 @@
 # Date created:			14, June, 1998
 # Whom:				Horance Chou <horance@freedom.ie.cycu.edu.tw>
 #
-# $Id: Makefile,v 1.6 1998/11/16 15:55:46 vanilla Exp $
+# $Id: Makefile,v 1.7 1999/02/02 13:54:00 vanilla Exp $
 #
 
 DISTNAME=       libffi-1.20
@@ -13,6 +13,7 @@ MASTER_SITES=   ftp://ftp.cygnus.com/pub/green/
 MAINTAINER=     horance@freedom.ie.cycu.edu.tw
 
 GNU_CONFIGURE=  yes
+CONFIGURE_TARGET=	# empty
 
 post-install:
 	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
diff --git a/devel/libffi/Makefile b/devel/libffi/Makefile
index b83994bb797b..3febfd34bded 100644
--- a/devel/libffi/Makefile
+++ b/devel/libffi/Makefile
@@ -3,7 +3,7 @@
 # Date created:			14, June, 1998
 # Whom:				Horance Chou <horance@freedom.ie.cycu.edu.tw>
 #
-# $Id: Makefile,v 1.6 1998/11/16 15:55:46 vanilla Exp $
+# $Id: Makefile,v 1.7 1999/02/02 13:54:00 vanilla Exp $
 #
 
 DISTNAME=       libffi-1.20
@@ -13,6 +13,7 @@ MASTER_SITES=   ftp://ftp.cygnus.com/pub/green/
 MAINTAINER=     horance@freedom.ie.cycu.edu.tw
 
 GNU_CONFIGURE=  yes
+CONFIGURE_TARGET=	# empty
 
 post-install:
 	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index 480951ed501f..f33d5dd72256 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -3,7 +3,7 @@
 # Date created:		29 October 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.35 1999/01/23 14:28:19 simokawa Exp $
+# $Id: Makefile,v 1.36 1999/01/27 07:41:10 fenner Exp $
 #
 
 DISTNAME=	emacs-19.34b
@@ -14,14 +14,14 @@ MASTER_SITE_SUBDIR=	emacs
 MAINTAINER=	ports@FreeBSD.ORG
 
 EMACS_VERSION=	19.34
-EMACS_ARCH=	${MACHINE_ARCH}--freebsd
-PLIST_SUB=	EMACS_VERSION=${EMACS_VERSION} EMACS_ARCH=${EMACS_ARCH}
+CONFIGURE_TARGET=	${MACHINE_ARCH}--freebsd
+PLIST_SUB=	EMACS_VERSION=${EMACS_VERSION} EMACS_ARCH=${CONFIGURE_TARGET}
 NO_LATEST_LINK=	yes
 WRKSRC=		${WRKDIR}/emacs-19.34
 GNU_CONFIGURE=	yes
 USE_XLIB=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	${EMACS_ARCH} --with-x-toolkit --sharedstatedir=/var/run
+CONFIGURE_ARGS=	--with-x-toolkit --sharedstatedir=/var/run
 
 STRIP=
 MAN1=		emacs.1 etags.1 ctags.1
diff --git a/editors/emacs19/Makefile b/editors/emacs19/Makefile
index 480951ed501f..f33d5dd72256 100644
--- a/editors/emacs19/Makefile
+++ b/editors/emacs19/Makefile
@@ -3,7 +3,7 @@
 # Date created:		29 October 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.35 1999/01/23 14:28:19 simokawa Exp $
+# $Id: Makefile,v 1.36 1999/01/27 07:41:10 fenner Exp $
 #
 
 DISTNAME=	emacs-19.34b
@@ -14,14 +14,14 @@ MASTER_SITE_SUBDIR=	emacs
 MAINTAINER=	ports@FreeBSD.ORG
 
 EMACS_VERSION=	19.34
-EMACS_ARCH=	${MACHINE_ARCH}--freebsd
-PLIST_SUB=	EMACS_VERSION=${EMACS_VERSION} EMACS_ARCH=${EMACS_ARCH}
+CONFIGURE_TARGET=	${MACHINE_ARCH}--freebsd
+PLIST_SUB=	EMACS_VERSION=${EMACS_VERSION} EMACS_ARCH=${CONFIGURE_TARGET}
 NO_LATEST_LINK=	yes
 WRKSRC=		${WRKDIR}/emacs-19.34
 GNU_CONFIGURE=	yes
 USE_XLIB=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	${EMACS_ARCH} --with-x-toolkit --sharedstatedir=/var/run
+CONFIGURE_ARGS=	--with-x-toolkit --sharedstatedir=/var/run
 
 STRIP=
 MAN1=		emacs.1 etags.1 ctags.1
diff --git a/editors/emacs20-dl/Makefile b/editors/emacs20-dl/Makefile
index dd7b8ff08148..af4fc05e2299 100644
--- a/editors/emacs20-dl/Makefile
+++ b/editors/emacs20-dl/Makefile
@@ -3,7 +3,7 @@
 # Date created:		10 October 1998
 # Whom:			shige
 #
-# $Id: Makefile,v 1.5 1999/01/27 07:41:11 fenner Exp $
+# $Id: Makefile,v 1.6 1999/03/01 09:17:43 shige Exp $
 #
 
 DISTNAME=	emacs-20.3
@@ -25,9 +25,9 @@ USE_XLIB=	yes
 USE_GMAKE=	yes
 MAKE_ENV=	INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 EMACS_VER=	20.3
-EMACS_ARCH=	${MACHINE_ARCH}--freebsd
+CONFIGURE_TARGET=	${MACHINE_ARCH}--freebsd
 CONFIGURE_ARGS=	${EMACS_ARCH} --with-x-toolkit --with-pop
-PLIST_SUB=	EMACS_VER=${EMACS_VER} EMACS_ARCH=${EMACS_ARCH}
+PLIST_SUB=	EMACS_VER=${EMACS_VER} EMACS_ARCH=${CONFIGURE_TARGET}
 
 .if defined(USE_XPGLIB)
 .if (${USE_XPGLIB} == "YES")
diff --git a/editors/emacs20/Makefile b/editors/emacs20/Makefile
index e5b75720ec8e..6680c65dc938 100644
--- a/editors/emacs20/Makefile
+++ b/editors/emacs20/Makefile
@@ -3,7 +3,7 @@
 # Date created:		29 October 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.37 1999/01/27 07:41:11 fenner Exp $
+# $Id: Makefile,v 1.38 1999/03/01 11:55:45 shige Exp $
 #
 
 DISTNAME=	emacs-20.3
@@ -16,12 +16,12 @@ MAINTAINER=	jseger@FreeBSD.org
 USE_AUTOCONF=	yes
 USE_XLIB=	yes
 USE_GMAKE=	yes
-EMACS_ARCH=	${MACHINE_ARCH}--freebsd
-CONFIGURE_ARGS=	${EMACS_ARCH} --with-x-toolkit --with-pop
+CONFIGURE_TARGET=	${MACHINE_ARCH}--freebsd
+CONFIGURE_ARGS=	--with-x-toolkit --with-pop
 
 MAKE_ENV=	INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 MAN1=		emacs.1 etags.1 ctags.1
-PLIST_SUB=	EMACS_VER=20.3 EMACS_ARCH=${EMACS_ARCH}
+PLIST_SUB=	EMACS_VER=20.3 EMACS_ARCH=${CONFIGURE_TARGET}
 
 .if defined(USE_XPGLIB)
 .if (${USE_XPGLIB} == "YES")
diff --git a/editors/emacs22/Makefile b/editors/emacs22/Makefile
index 480951ed501f..f33d5dd72256 100644
--- a/editors/emacs22/Makefile
+++ b/editors/emacs22/Makefile
@@ -3,7 +3,7 @@
 # Date created:		29 October 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.35 1999/01/23 14:28:19 simokawa Exp $
+# $Id: Makefile,v 1.36 1999/01/27 07:41:10 fenner Exp $
 #
 
 DISTNAME=	emacs-19.34b
@@ -14,14 +14,14 @@ MASTER_SITE_SUBDIR=	emacs
 MAINTAINER=	ports@FreeBSD.ORG
 
 EMACS_VERSION=	19.34
-EMACS_ARCH=	${MACHINE_ARCH}--freebsd
-PLIST_SUB=	EMACS_VERSION=${EMACS_VERSION} EMACS_ARCH=${EMACS_ARCH}
+CONFIGURE_TARGET=	${MACHINE_ARCH}--freebsd
+PLIST_SUB=	EMACS_VERSION=${EMACS_VERSION} EMACS_ARCH=${CONFIGURE_TARGET}
 NO_LATEST_LINK=	yes
 WRKSRC=		${WRKDIR}/emacs-19.34
 GNU_CONFIGURE=	yes
 USE_XLIB=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	${EMACS_ARCH} --with-x-toolkit --sharedstatedir=/var/run
+CONFIGURE_ARGS=	--with-x-toolkit --sharedstatedir=/var/run
 
 STRIP=
 MAN1=		emacs.1 etags.1 ctags.1
diff --git a/editors/emacs23/Makefile b/editors/emacs23/Makefile
index 480951ed501f..f33d5dd72256 100644
--- a/editors/emacs23/Makefile
+++ b/editors/emacs23/Makefile
@@ -3,7 +3,7 @@
 # Date created:		29 October 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.35 1999/01/23 14:28:19 simokawa Exp $
+# $Id: Makefile,v 1.36 1999/01/27 07:41:10 fenner Exp $
 #
 
 DISTNAME=	emacs-19.34b
@@ -14,14 +14,14 @@ MASTER_SITE_SUBDIR=	emacs
 MAINTAINER=	ports@FreeBSD.ORG
 
 EMACS_VERSION=	19.34
-EMACS_ARCH=	${MACHINE_ARCH}--freebsd
-PLIST_SUB=	EMACS_VERSION=${EMACS_VERSION} EMACS_ARCH=${EMACS_ARCH}
+CONFIGURE_TARGET=	${MACHINE_ARCH}--freebsd
+PLIST_SUB=	EMACS_VERSION=${EMACS_VERSION} EMACS_ARCH=${CONFIGURE_TARGET}
 NO_LATEST_LINK=	yes
 WRKSRC=		${WRKDIR}/emacs-19.34
 GNU_CONFIGURE=	yes
 USE_XLIB=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	${EMACS_ARCH} --with-x-toolkit --sharedstatedir=/var/run
+CONFIGURE_ARGS=	--with-x-toolkit --sharedstatedir=/var/run
 
 STRIP=
 MAN1=		emacs.1 etags.1 ctags.1
diff --git a/editors/mule-common/Makefile b/editors/mule-common/Makefile
index 160d605236b9..246c35f0011b 100644
--- a/editors/mule-common/Makefile
+++ b/editors/mule-common/Makefile
@@ -3,7 +3,7 @@
 # Date created:		7 July 1997
 # Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.36 1999/01/23 14:28:27 simokawa Exp $
+# $Id: Makefile,v 1.37 1999/02/03 11:11:42 asami Exp $
 #
 
 DISTNAME=	mule-2.3
@@ -58,15 +58,15 @@ BROKEN=		You should build install one of the other mule ports first
 INSTALL_COOKIE=	${WRKDIR}/.install_done-${PKGNAME}
 PACKAGE_COOKIE=	${WRKDIR}/.package_done-${PKGNAME}
 TMPPLIST=	${WRKDIR}/.PLIST.mktmp-${PKGNAME}
-EMACS_ARCH=	${MACHINE_ARCH}--freebsd
-PLIST_SUB=	EMACS_VERSION=19.34 EMACS_ARCH=${EMACS_ARCH}
+CONFIGURE_TARGET=	${MACHINE_ARCH}--freebsd
+PLIST_SUB=	EMACS_VERSION=19.34 EMACS_ARCH=${CONFIGURE_TARGET}
 
 USE_XLIB=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 EMACS_PREFIX=	mule
 EMACS_EXECUTABLE =	mule
-CONFIGURE_ARGS=	${EMACS_ARCH} --with-executable=${EMACS_EXECUTABLE} \
+CONFIGURE_ARGS=	--with-executable=${EMACS_EXECUTABLE} \
 		--with-emacs-prefix=${EMACS_PREFIX} \
 		--with-terminal-face \
 		--x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib
diff --git a/editors/mule/Makefile b/editors/mule/Makefile
index eaafb5ec72bd..953b3555941b 100644
--- a/editors/mule/Makefile
+++ b/editors/mule/Makefile
@@ -3,7 +3,7 @@
 # Date created:		6 July 1997
 # Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.35 1999/01/23 14:28:25 simokawa Exp $
+# $Id: Makefile,v 1.36 1999/02/03 11:11:41 asami Exp $
 #
 
 DISTNAME=	mule-2.3
@@ -41,8 +41,7 @@ MAKE_ENV=      LIBDIR="${LIBDIR}"
 CONFIGURE_ENV=	PATH=/usr/bin:$$PATH
 EMACS_PREFIX=	mule
 EMACS_EXECUTABLE =	mule
-EMACS_ARCH=	${MACHINE_ARCH}--freebsd
-CONFIGURE_ARGS=	${EMACS_ARCH} --with-executable=${EMACS_EXECUTABLE} \
+CONFIGURE_ARGS=	--with-executable=${EMACS_EXECUTABLE} \
 		--with-emacs-prefix=${EMACS_PREFIX} \
 		--with-terminal-face \
 		--x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib \
diff --git a/editors/xemacs21-mule-common/pkg-plist b/editors/xemacs21-mule-common/pkg-plist
index d7bdfc676e50..51d78d3b7ff7 100644
--- a/editors/xemacs21-mule-common/pkg-plist
+++ b/editors/xemacs21-mule-common/pkg-plist
@@ -3628,5 +3628,5 @@ lib/%%XEMACS_DIR%%/lisp/x11/x-win-xfree86.elc
 @dirrm lib/%%XEMACS_DIR%%/lisp/mule
 @dirrm lib/%%XEMACS_DIR%%/lisp/skk
 @dirrm lib/%%XEMACS_DIR%%/lisp
-@unexec mkdir -p %D/lib/%%XEMACS_DIR%%/i386-unknown-freebsd
-@dirrm lib/%%XEMACS_DIR%%/i386-unknown-freebsd
+@unexec mkdir -p %D/lib/%%XEMACS_DIR%%/i386--freebsd
+@dirrm lib/%%XEMACS_DIR%%/i386--freebsd
diff --git a/editors/xemacs21-mule/Makefile b/editors/xemacs21-mule/Makefile
index c3098f6f5067..647d5ef027a3 100644
--- a/editors/xemacs21-mule/Makefile
+++ b/editors/xemacs21-mule/Makefile
@@ -3,7 +3,7 @@
 # Date created:		5 Dec 1997
 # Whom:			Kazuyuki IENAGA <ienaga@jsys.co.jp>
 #
-# $Id: Makefile,v 1.13 1999/01/18 03:05:25 steve Exp $
+# $Id: Makefile,v 1.14 1999/01/23 07:05:33 vanilla Exp $
 #
 
 DISTNAME=	xemacs-20.4
@@ -38,7 +38,7 @@ INSTALL_COOKIE=	${WRKDIR}/.install_done-${PKGNAME}
 PACKAGE_COOKIE=	${WRKDIR}/.package_done-${PKGNAME}
 GNU_CONFIGURE=	yes
 USE_AUTOCONF=	yes
-CONFIGURE_ARGS=	i386-unknown-freebsd \
+CONFIGURE_ARGS=	\
 		--with-clash-detection \
 		--lockdir=/var/run/emacs/lock \
 		--with-x11 \
@@ -50,6 +50,7 @@ CONFIGURE_ARGS=	i386-unknown-freebsd \
 		--sitelispdir=${PREFIX}/lib/${XEMACS_DIR}/lisp:${PREFIX}/lib/${XEMACS_DIR}/site-lisp:${PREFIX}/lib/xemacs/site-lisp:${PREFIX}/share/emacs/site-lisp \
 		--infopath=${PREFIX}/lib/xemacs/info:${PREFIX}/info:${X11BASE}/info:/usr/info:${PREFIX}/lib/texmf/doc/info:/usr/lib/texmf/doc:/usr/share/info \
 		${MISC_OPTIONS} ${WITH_INPUT_METHOD} ${WITH_WIDGETS}
+CONFIGURE_TARGET=	${MACHINE_ARCH}--freebsd
 
 STRIP=
 
diff --git a/editors/xemacs21-mule/pkg-plist b/editors/xemacs21-mule/pkg-plist
index c50c3a16b872..d65f9461868d 100644
--- a/editors/xemacs21-mule/pkg-plist
+++ b/editors/xemacs21-mule/pkg-plist
@@ -11,34 +11,34 @@ bin/gnuattach
 bin/xemacs-20.4
 @exec ln -sf %D/%F %B/xemacs
 @unexec rm %B/xemacs
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/make-path
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/wakeup
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/profile
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/make-docfile
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/digest-doc
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/sorted-doc
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/movemail
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/cvtmail
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/fakemail
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/yow
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/hexl
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/gnuserv
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/mmencode
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/rcs2log
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/vcdiff
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/gzip-el.sh
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/install-sid
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/send-pr
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/tm-au
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/tm-file
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/tm-html
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/tm-image
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/tm-mpeg
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/tm-plain
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/tm-ps
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/tmdecode
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/add-little-package.sh
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/add-big-package.sh
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/DOC
-lib/%%XEMACS_DIR%%/i386-unknown-freebsd/config.values
-@dirrm lib/%%XEMACS_DIR%%/i386-unknown-freebsd
+lib/%%XEMACS_DIR%%/i386--freebsd/make-path
+lib/%%XEMACS_DIR%%/i386--freebsd/wakeup
+lib/%%XEMACS_DIR%%/i386--freebsd/profile
+lib/%%XEMACS_DIR%%/i386--freebsd/make-docfile
+lib/%%XEMACS_DIR%%/i386--freebsd/digest-doc
+lib/%%XEMACS_DIR%%/i386--freebsd/sorted-doc
+lib/%%XEMACS_DIR%%/i386--freebsd/movemail
+lib/%%XEMACS_DIR%%/i386--freebsd/cvtmail
+lib/%%XEMACS_DIR%%/i386--freebsd/fakemail
+lib/%%XEMACS_DIR%%/i386--freebsd/yow
+lib/%%XEMACS_DIR%%/i386--freebsd/hexl
+lib/%%XEMACS_DIR%%/i386--freebsd/gnuserv
+lib/%%XEMACS_DIR%%/i386--freebsd/mmencode
+lib/%%XEMACS_DIR%%/i386--freebsd/rcs2log
+lib/%%XEMACS_DIR%%/i386--freebsd/vcdiff
+lib/%%XEMACS_DIR%%/i386--freebsd/gzip-el.sh
+lib/%%XEMACS_DIR%%/i386--freebsd/install-sid
+lib/%%XEMACS_DIR%%/i386--freebsd/send-pr
+lib/%%XEMACS_DIR%%/i386--freebsd/tm-au
+lib/%%XEMACS_DIR%%/i386--freebsd/tm-file
+lib/%%XEMACS_DIR%%/i386--freebsd/tm-html
+lib/%%XEMACS_DIR%%/i386--freebsd/tm-image
+lib/%%XEMACS_DIR%%/i386--freebsd/tm-mpeg
+lib/%%XEMACS_DIR%%/i386--freebsd/tm-plain
+lib/%%XEMACS_DIR%%/i386--freebsd/tm-ps
+lib/%%XEMACS_DIR%%/i386--freebsd/tmdecode
+lib/%%XEMACS_DIR%%/i386--freebsd/add-little-package.sh
+lib/%%XEMACS_DIR%%/i386--freebsd/add-big-package.sh
+lib/%%XEMACS_DIR%%/i386--freebsd/DOC
+lib/%%XEMACS_DIR%%/i386--freebsd/config.values
+@dirrm lib/%%XEMACS_DIR%%/i386--freebsd
diff --git a/japanese/mtools/Makefile b/japanese/mtools/Makefile
index 54868cb06834..1e940fe3556a 100644
--- a/japanese/mtools/Makefile
+++ b/japanese/mtools/Makefile
@@ -3,7 +3,7 @@
 # Date created:		6 October 1997
 # Whom:			WATANABE junya <junya-w@remus.dti.ne.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/04/28 15:19:54 kuriyama Exp $
 #
 
 DISTNAME=	mtools-3.6
@@ -19,6 +19,7 @@ EXTRACT_ONLY=	mtools-3.6.tar.gz
 
 GNU_CONFIGURE=  yes
 CONFIGURE_ARGS=	--enable-xdf
+CONFIGURE_TARGET=	# empty
 
 USE_GMAKE=	yes
 
diff --git a/java/kaffe/Makefile b/java/kaffe/Makefile
index a22b62ad3197..c7b68cf6c952 100644
--- a/java/kaffe/Makefile
+++ b/java/kaffe/Makefile
@@ -3,7 +3,7 @@
 # Date created:         20 February 1995
 # Whom:                 Tim Wilkinson <tim@sarc.city.ac.uk>
 #
-# $Id: Makefile,v 1.38 1998/12/11 00:51:40 steve Exp $
+# $Id: Makefile,v 1.39 1999/01/23 07:05:27 vanilla Exp $
 #
 
 DISTNAME=	kaffe-1.0.b3
@@ -18,6 +18,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LDFLAGS="-L/usr/local/lib"
+CONFIGURE_TARGET=	# empty
 MAN1=		kaffe.1
 
 post-install:
diff --git a/korean/hanemacs/Makefile b/korean/hanemacs/Makefile
index 25a6d1edc591..9516c721a0d0 100644
--- a/korean/hanemacs/Makefile
+++ b/korean/hanemacs/Makefile
@@ -3,7 +3,7 @@
 # Date created:		12 Mar 1998
 # Whom:			CHOI Junho <junker@jazz.snu.ac.kr>
 #
-# $Id: Makefile,v 1.2 1998/10/16 01:12:22 jseger Exp $
+# $Id: Makefile,v 1.3 1999/01/18 03:21:43 steve Exp $
 #
 
 DISTNAME=	hanemacs-19.34b-1
@@ -17,8 +17,9 @@ MAINTAINER=	junker@jazz.snu.ac.kr
 WRKSRC=		${WRKDIR}/hanemacs-19.34
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	i386--freebsd --with-x-toolkit \
+CONFIGURE_ARGS=	--with-x-toolkit \
 		--sharedstatedir=/var/run
+CONFIGURE_TARGET=	${MACHINE_ARCH}--freebsd
 STRIP=
 MAN1=		emacs.1 etags.1 ctags.1
 
diff --git a/lang/egcs/Makefile b/lang/egcs/Makefile
index d0534238b138..3820cb6a100f 100644
--- a/lang/egcs/Makefile
+++ b/lang/egcs/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.46 1999/02/28 10:50:50 obrien Exp $
+# $Id: Makefile,v 1.47 1999/02/28 12:18:36 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.2-pre2
@@ -44,6 +44,7 @@ CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld ${GNUHOST} \
 .if defined(WANT_SHAREDLIBS)
 CONFIGURE_ARGS+= --enable-shared
 .endif
+CONFIGURE_TARGET=	# empty
 ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index 12d321053670..afa30cb2d675 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -3,7 +3,7 @@
 # Date created:		11 Dec 1998
 # Whom:			ruslan@shevchenko.kiev.ua
 #
-# $Id$
+# $Id: Makefile,v 1.4 1999/02/26 05:01:24 jkoshy Exp $
 #
 
 DISTNAME=	erlang_base-47.4.1.src
@@ -20,6 +20,7 @@ WRKSRC=		${WRKDIR}/erlang-47.4.1
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	# empty
 
 STRIP=
 
diff --git a/lang/erlang14/Makefile b/lang/erlang14/Makefile
index 12d321053670..afa30cb2d675 100644
--- a/lang/erlang14/Makefile
+++ b/lang/erlang14/Makefile
@@ -3,7 +3,7 @@
 # Date created:		11 Dec 1998
 # Whom:			ruslan@shevchenko.kiev.ua
 #
-# $Id$
+# $Id: Makefile,v 1.4 1999/02/26 05:01:24 jkoshy Exp $
 #
 
 DISTNAME=	erlang_base-47.4.1.src
@@ -20,6 +20,7 @@ WRKSRC=		${WRKDIR}/erlang-47.4.1
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	# empty
 
 STRIP=
 
diff --git a/lang/gcc-devel/Makefile b/lang/gcc-devel/Makefile
index d0534238b138..3820cb6a100f 100644
--- a/lang/gcc-devel/Makefile
+++ b/lang/gcc-devel/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.46 1999/02/28 10:50:50 obrien Exp $
+# $Id: Makefile,v 1.47 1999/02/28 12:18:36 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.2-pre2
@@ -44,6 +44,7 @@ CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld ${GNUHOST} \
 .if defined(WANT_SHAREDLIBS)
 CONFIGURE_ARGS+= --enable-shared
 .endif
+CONFIGURE_TARGET=	# empty
 ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
diff --git a/lang/gcc-ooo/Makefile b/lang/gcc-ooo/Makefile
index d0534238b138..3820cb6a100f 100644
--- a/lang/gcc-ooo/Makefile
+++ b/lang/gcc-ooo/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.46 1999/02/28 10:50:50 obrien Exp $
+# $Id: Makefile,v 1.47 1999/02/28 12:18:36 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.2-pre2
@@ -44,6 +44,7 @@ CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld ${GNUHOST} \
 .if defined(WANT_SHAREDLIBS)
 CONFIGURE_ARGS+= --enable-shared
 .endif
+CONFIGURE_TARGET=	# empty
 ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index d0534238b138..3820cb6a100f 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.46 1999/02/28 10:50:50 obrien Exp $
+# $Id: Makefile,v 1.47 1999/02/28 12:18:36 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.2-pre2
@@ -44,6 +44,7 @@ CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld ${GNUHOST} \
 .if defined(WANT_SHAREDLIBS)
 CONFIGURE_ARGS+= --enable-shared
 .endif
+CONFIGURE_TARGET=	# empty
 ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
diff --git a/lang/gcc28/Makefile b/lang/gcc28/Makefile
index daf7cd3a7020..a1e4362b189d 100644
--- a/lang/gcc28/Makefile
+++ b/lang/gcc28/Makefile
@@ -4,7 +4,7 @@
 # Date created:				17 Jan 1998
 # Whom:					David O'Brien <obrien@NUXI.com>
 #
-# $Id: Makefile,v 1.20 1999/01/27 07:41:20 fenner Exp $
+# $Id: Makefile,v 1.21 1999/02/09 18:25:42 obrien Exp $
 #
 
 DISTNAME=	gcc-2.8.1
@@ -28,6 +28,7 @@ CONFIGURE_ARGS=	--with-gxx-include-dir=${PREFIX}/lib/gcc-lib/${GNUHOST}/2.8.1/in
 CONFIGURE_ARGS+=	--host=${GNUHOST}
 .endif
 GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	# empty
 USE_GMAKE=	yes
 ALL_TARGET=	bootstrap
 MAN1=		cccp28.1 g++28.1 gcc28.1
diff --git a/lang/gcc295/Makefile b/lang/gcc295/Makefile
index d0534238b138..3820cb6a100f 100644
--- a/lang/gcc295/Makefile
+++ b/lang/gcc295/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.46 1999/02/28 10:50:50 obrien Exp $
+# $Id: Makefile,v 1.47 1999/02/28 12:18:36 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.2-pre2
@@ -44,6 +44,7 @@ CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld ${GNUHOST} \
 .if defined(WANT_SHAREDLIBS)
 CONFIGURE_ARGS+= --enable-shared
 .endif
+CONFIGURE_TARGET=	# empty
 ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
diff --git a/lang/gcc30/Makefile b/lang/gcc30/Makefile
index d0534238b138..3820cb6a100f 100644
--- a/lang/gcc30/Makefile
+++ b/lang/gcc30/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.46 1999/02/28 10:50:50 obrien Exp $
+# $Id: Makefile,v 1.47 1999/02/28 12:18:36 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.2-pre2
@@ -44,6 +44,7 @@ CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld ${GNUHOST} \
 .if defined(WANT_SHAREDLIBS)
 CONFIGURE_ARGS+= --enable-shared
 .endif
+CONFIGURE_TARGET=	# empty
 ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
diff --git a/lang/gcc31/Makefile b/lang/gcc31/Makefile
index d0534238b138..3820cb6a100f 100644
--- a/lang/gcc31/Makefile
+++ b/lang/gcc31/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.46 1999/02/28 10:50:50 obrien Exp $
+# $Id: Makefile,v 1.47 1999/02/28 12:18:36 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.2-pre2
@@ -44,6 +44,7 @@ CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld ${GNUHOST} \
 .if defined(WANT_SHAREDLIBS)
 CONFIGURE_ARGS+= --enable-shared
 .endif
+CONFIGURE_TARGET=	# empty
 ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
diff --git a/lang/gcc32/Makefile b/lang/gcc32/Makefile
index d0534238b138..3820cb6a100f 100644
--- a/lang/gcc32/Makefile
+++ b/lang/gcc32/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.46 1999/02/28 10:50:50 obrien Exp $
+# $Id: Makefile,v 1.47 1999/02/28 12:18:36 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.2-pre2
@@ -44,6 +44,7 @@ CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld ${GNUHOST} \
 .if defined(WANT_SHAREDLIBS)
 CONFIGURE_ARGS+= --enable-shared
 .endif
+CONFIGURE_TARGET=	# empty
 ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
diff --git a/lang/gcc33/Makefile b/lang/gcc33/Makefile
index d0534238b138..3820cb6a100f 100644
--- a/lang/gcc33/Makefile
+++ b/lang/gcc33/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.46 1999/02/28 10:50:50 obrien Exp $
+# $Id: Makefile,v 1.47 1999/02/28 12:18:36 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.2-pre2
@@ -44,6 +44,7 @@ CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld ${GNUHOST} \
 .if defined(WANT_SHAREDLIBS)
 CONFIGURE_ARGS+= --enable-shared
 .endif
+CONFIGURE_TARGET=	# empty
 ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile
index d0534238b138..3820cb6a100f 100644
--- a/lang/gcc34/Makefile
+++ b/lang/gcc34/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.46 1999/02/28 10:50:50 obrien Exp $
+# $Id: Makefile,v 1.47 1999/02/28 12:18:36 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.2-pre2
@@ -44,6 +44,7 @@ CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld ${GNUHOST} \
 .if defined(WANT_SHAREDLIBS)
 CONFIGURE_ARGS+= --enable-shared
 .endif
+CONFIGURE_TARGET=	# empty
 ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
diff --git a/lang/gcc35/Makefile b/lang/gcc35/Makefile
index d0534238b138..3820cb6a100f 100644
--- a/lang/gcc35/Makefile
+++ b/lang/gcc35/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.46 1999/02/28 10:50:50 obrien Exp $
+# $Id: Makefile,v 1.47 1999/02/28 12:18:36 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.2-pre2
@@ -44,6 +44,7 @@ CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld ${GNUHOST} \
 .if defined(WANT_SHAREDLIBS)
 CONFIGURE_ARGS+= --enable-shared
 .endif
+CONFIGURE_TARGET=	# empty
 ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
diff --git a/lang/gcc40/Makefile b/lang/gcc40/Makefile
index d0534238b138..3820cb6a100f 100644
--- a/lang/gcc40/Makefile
+++ b/lang/gcc40/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.46 1999/02/28 10:50:50 obrien Exp $
+# $Id: Makefile,v 1.47 1999/02/28 12:18:36 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.2-pre2
@@ -44,6 +44,7 @@ CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld ${GNUHOST} \
 .if defined(WANT_SHAREDLIBS)
 CONFIGURE_ARGS+= --enable-shared
 .endif
+CONFIGURE_TARGET=	# empty
 ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
diff --git a/lang/gcc41/Makefile b/lang/gcc41/Makefile
index d0534238b138..3820cb6a100f 100644
--- a/lang/gcc41/Makefile
+++ b/lang/gcc41/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.46 1999/02/28 10:50:50 obrien Exp $
+# $Id: Makefile,v 1.47 1999/02/28 12:18:36 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.2-pre2
@@ -44,6 +44,7 @@ CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld ${GNUHOST} \
 .if defined(WANT_SHAREDLIBS)
 CONFIGURE_ARGS+= --enable-shared
 .endif
+CONFIGURE_TARGET=	# empty
 ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile
index d0534238b138..3820cb6a100f 100644
--- a/lang/gcc42/Makefile
+++ b/lang/gcc42/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.46 1999/02/28 10:50:50 obrien Exp $
+# $Id: Makefile,v 1.47 1999/02/28 12:18:36 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.2-pre2
@@ -44,6 +44,7 @@ CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld ${GNUHOST} \
 .if defined(WANT_SHAREDLIBS)
 CONFIGURE_ARGS+= --enable-shared
 .endif
+CONFIGURE_TARGET=	# empty
 ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile
index d0534238b138..3820cb6a100f 100644
--- a/lang/gcc43/Makefile
+++ b/lang/gcc43/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.46 1999/02/28 10:50:50 obrien Exp $
+# $Id: Makefile,v 1.47 1999/02/28 12:18:36 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.2-pre2
@@ -44,6 +44,7 @@ CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld ${GNUHOST} \
 .if defined(WANT_SHAREDLIBS)
 CONFIGURE_ARGS+= --enable-shared
 .endif
+CONFIGURE_TARGET=	# empty
 ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile
index d0534238b138..3820cb6a100f 100644
--- a/lang/gcc44/Makefile
+++ b/lang/gcc44/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.46 1999/02/28 10:50:50 obrien Exp $
+# $Id: Makefile,v 1.47 1999/02/28 12:18:36 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.2-pre2
@@ -44,6 +44,7 @@ CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld ${GNUHOST} \
 .if defined(WANT_SHAREDLIBS)
 CONFIGURE_ARGS+= --enable-shared
 .endif
+CONFIGURE_TARGET=	# empty
 ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile
index d0534238b138..3820cb6a100f 100644
--- a/lang/gcc45/Makefile
+++ b/lang/gcc45/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.46 1999/02/28 10:50:50 obrien Exp $
+# $Id: Makefile,v 1.47 1999/02/28 12:18:36 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.2-pre2
@@ -44,6 +44,7 @@ CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld ${GNUHOST} \
 .if defined(WANT_SHAREDLIBS)
 CONFIGURE_ARGS+= --enable-shared
 .endif
+CONFIGURE_TARGET=	# empty
 ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index d0534238b138..3820cb6a100f 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.46 1999/02/28 10:50:50 obrien Exp $
+# $Id: Makefile,v 1.47 1999/02/28 12:18:36 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.2-pre2
@@ -44,6 +44,7 @@ CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld ${GNUHOST} \
 .if defined(WANT_SHAREDLIBS)
 CONFIGURE_ARGS+= --enable-shared
 .endif
+CONFIGURE_TARGET=	# empty
 ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index d0534238b138..3820cb6a100f 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.46 1999/02/28 10:50:50 obrien Exp $
+# $Id: Makefile,v 1.47 1999/02/28 12:18:36 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.2-pre2
@@ -44,6 +44,7 @@ CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld ${GNUHOST} \
 .if defined(WANT_SHAREDLIBS)
 CONFIGURE_ARGS+= --enable-shared
 .endif
+CONFIGURE_TARGET=	# empty
 ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index d0534238b138..3820cb6a100f 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.46 1999/02/28 10:50:50 obrien Exp $
+# $Id: Makefile,v 1.47 1999/02/28 12:18:36 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.2-pre2
@@ -44,6 +44,7 @@ CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld ${GNUHOST} \
 .if defined(WANT_SHAREDLIBS)
 CONFIGURE_ARGS+= --enable-shared
 .endif
+CONFIGURE_TARGET=	# empty
 ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
diff --git a/lang/glibstdc++28/Makefile b/lang/glibstdc++28/Makefile
index 533a31a60adf..215d5476aa02 100644
--- a/lang/glibstdc++28/Makefile
+++ b/lang/glibstdc++28/Makefile
@@ -4,7 +4,7 @@
 # Date created:				03 Mar 1998
 # Whom:					David O'Brien <obrien@NUXI.com>
 #
-# $Id: Makefile,v 1.14 1999/01/27 07:41:21 fenner Exp $
+# $Id: Makefile,v 1.15 1999/02/09 18:59:11 obrien Exp $
 #
 
 DISTNAME=	libstdc++-2.8.1.1
@@ -32,6 +32,7 @@ GNUHOST=        i386-unknown-freebsdaout${OSREL}
 GCC28DIR=	lib/gcc-lib/${GNUHOST}/2.8.1
 CONFIGURE_ARGS= --host=${GNUHOST}
 GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	# empty
 USE_GMAKE=	yes
 PLIST_SUB=	GCC28SUBDIR=${GCC28DIR} GNUHOST=${GNUHOST}
 
diff --git a/lang/pgcc/Makefile b/lang/pgcc/Makefile
index 811f850d85e6..7afcc459632b 100644
--- a/lang/pgcc/Makefile
+++ b/lang/pgcc/Makefile
@@ -4,7 +4,7 @@
 # Date created:				10 Dec 1998
 # Whom:					David O'Brien <obrien@NUXI.com>
 #
-# $Id: Makefile,v 1.13 1998/12/14 12:07:48 obrien Exp $
+# $Id: Makefile,v 1.14 1999/02/03 11:11:52 asami Exp $
 #
 
 DISTNAME=	egcs-1.1.1
@@ -46,8 +46,9 @@ PATCH_DIST_STRIP?=	-p1
 PLIST_SUB=	EGCS_REV=${EGCS_REV} GNU_HOST=${GNUHOST}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld ${GNUHOST} \
+CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld \
 		--with-gxx-include-dir=${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/include/g++
+CONFIGURE_TARGET=	${GNUHOST}
 ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
diff --git a/lang/swi-pl/Makefile b/lang/swi-pl/Makefile
index 65031688d686..e8f689cd65bc 100644
--- a/lang/swi-pl/Makefile
+++ b/lang/swi-pl/Makefile
@@ -3,7 +3,7 @@
 # Date created:			10 August 1996
 # Whom:				Michael Butschky <butsch@computi.erols.com>
 #
-# $Id: Makefile,v 1.11 1997/04/04 16:26:01 max Exp $              
+# $Id: Makefile,v 1.12 1997/05/17 12:24:33 max Exp $              
 #
 
 DISTNAME=	pl-2.8.6
@@ -15,7 +15,7 @@ MAINTAINER=	max@FreeBSD.ORG
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	i386-freebsd
+CONFIGURE_TARGET=	${MACHINE_ARCH}-freebsd
 STRIP=
 MAKE_FLAGS+=	CIFLAGS=-DRTLD_LAZY -f
 MAN1=		pl.1 chpl.1 plld.1
diff --git a/misc/dejagnu/Makefile b/misc/dejagnu/Makefile
index 3f9d1908fa3c..f199840bac7c 100644
--- a/misc/dejagnu/Makefile
+++ b/misc/dejagnu/Makefile
@@ -3,7 +3,7 @@
 # Date created:		12 October 1996
 # Whom:			markm
 #
-# $Id: Makefile,v 1.7 1997/11/22 19:49:58 jseger Exp $
+# $Id: Makefile,v 1.8 1999/01/27 07:41:22 fenner Exp $
 #
 
 DISTNAME=	dejagnu-1.3
@@ -17,7 +17,6 @@ RUN_DEPENDS=	expect:${PORTSDIR}/lang/expect
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/dejagnu
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	i386-freebsd
 STRIP=
 MAN1=		runtest.1
 
diff --git a/textproc/coco/Makefile b/textproc/coco/Makefile
index 160d605236b9..246c35f0011b 100644
--- a/textproc/coco/Makefile
+++ b/textproc/coco/Makefile
@@ -3,7 +3,7 @@
 # Date created:		7 July 1997
 # Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.36 1999/01/23 14:28:27 simokawa Exp $
+# $Id: Makefile,v 1.37 1999/02/03 11:11:42 asami Exp $
 #
 
 DISTNAME=	mule-2.3
@@ -58,15 +58,15 @@ BROKEN=		You should build install one of the other mule ports first
 INSTALL_COOKIE=	${WRKDIR}/.install_done-${PKGNAME}
 PACKAGE_COOKIE=	${WRKDIR}/.package_done-${PKGNAME}
 TMPPLIST=	${WRKDIR}/.PLIST.mktmp-${PKGNAME}
-EMACS_ARCH=	${MACHINE_ARCH}--freebsd
-PLIST_SUB=	EMACS_VERSION=19.34 EMACS_ARCH=${EMACS_ARCH}
+CONFIGURE_TARGET=	${MACHINE_ARCH}--freebsd
+PLIST_SUB=	EMACS_VERSION=19.34 EMACS_ARCH=${CONFIGURE_TARGET}
 
 USE_XLIB=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 EMACS_PREFIX=	mule
 EMACS_EXECUTABLE =	mule
-CONFIGURE_ARGS=	${EMACS_ARCH} --with-executable=${EMACS_EXECUTABLE} \
+CONFIGURE_ARGS=	--with-executable=${EMACS_EXECUTABLE} \
 		--with-emacs-prefix=${EMACS_PREFIX} \
 		--with-terminal-face \
 		--x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib
diff --git a/www/apache13/Makefile b/www/apache13/Makefile
index a56e33bf00a3..1c1eed113c9c 100644
--- a/www/apache13/Makefile
+++ b/www/apache13/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Fri Aug 25 16:42:36 CDT 1995
 # Whom:                 ache@nagual.pp.ru
 #
-# $Id: Makefile,v 1.65 1999/01/15 00:26:19 ache Exp $
+# $Id: Makefile,v 1.66 1999/03/07 18:34:56 ache Exp $
 #
 
 DISTNAME=       apache_1.3.4
@@ -19,8 +19,9 @@ Y2K=		http://www.apache.org/docs/misc/FAQ.html#year2000
 # Set APACHE_PERF_TUNING env. variable to YES to get maximum performance
 #
 
-GNU_CONFIGURE=  yes
+HAS_CONFIGURE=  yes
 CONFIGURE_ARGS= \
+		 --prefix=${PREFIX} \
 		 --with-layout=GNU \
 		 --sysconfdir=${PREFIX}/etc/apache \
 		 --includedir=${PREFIX}/include/apache \
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index a56e33bf00a3..1c1eed113c9c 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Fri Aug 25 16:42:36 CDT 1995
 # Whom:                 ache@nagual.pp.ru
 #
-# $Id: Makefile,v 1.65 1999/01/15 00:26:19 ache Exp $
+# $Id: Makefile,v 1.66 1999/03/07 18:34:56 ache Exp $
 #
 
 DISTNAME=       apache_1.3.4
@@ -19,8 +19,9 @@ Y2K=		http://www.apache.org/docs/misc/FAQ.html#year2000
 # Set APACHE_PERF_TUNING env. variable to YES to get maximum performance
 #
 
-GNU_CONFIGURE=  yes
+HAS_CONFIGURE=  yes
 CONFIGURE_ARGS= \
+		 --prefix=${PREFIX} \
 		 --with-layout=GNU \
 		 --sysconfdir=${PREFIX}/etc/apache \
 		 --includedir=${PREFIX}/include/apache \
diff --git a/www/apache20/Makefile b/www/apache20/Makefile
index a56e33bf00a3..1c1eed113c9c 100644
--- a/www/apache20/Makefile
+++ b/www/apache20/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Fri Aug 25 16:42:36 CDT 1995
 # Whom:                 ache@nagual.pp.ru
 #
-# $Id: Makefile,v 1.65 1999/01/15 00:26:19 ache Exp $
+# $Id: Makefile,v 1.66 1999/03/07 18:34:56 ache Exp $
 #
 
 DISTNAME=       apache_1.3.4
@@ -19,8 +19,9 @@ Y2K=		http://www.apache.org/docs/misc/FAQ.html#year2000
 # Set APACHE_PERF_TUNING env. variable to YES to get maximum performance
 #
 
-GNU_CONFIGURE=  yes
+HAS_CONFIGURE=  yes
 CONFIGURE_ARGS= \
+		 --prefix=${PREFIX} \
 		 --with-layout=GNU \
 		 --sysconfdir=${PREFIX}/etc/apache \
 		 --includedir=${PREFIX}/include/apache \
diff --git a/www/apache21/Makefile b/www/apache21/Makefile
index a56e33bf00a3..1c1eed113c9c 100644
--- a/www/apache21/Makefile
+++ b/www/apache21/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Fri Aug 25 16:42:36 CDT 1995
 # Whom:                 ache@nagual.pp.ru
 #
-# $Id: Makefile,v 1.65 1999/01/15 00:26:19 ache Exp $
+# $Id: Makefile,v 1.66 1999/03/07 18:34:56 ache Exp $
 #
 
 DISTNAME=       apache_1.3.4
@@ -19,8 +19,9 @@ Y2K=		http://www.apache.org/docs/misc/FAQ.html#year2000
 # Set APACHE_PERF_TUNING env. variable to YES to get maximum performance
 #
 
-GNU_CONFIGURE=  yes
+HAS_CONFIGURE=  yes
 CONFIGURE_ARGS= \
+		 --prefix=${PREFIX} \
 		 --with-layout=GNU \
 		 --sysconfdir=${PREFIX}/etc/apache \
 		 --includedir=${PREFIX}/include/apache \
diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index a56e33bf00a3..1c1eed113c9c 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Fri Aug 25 16:42:36 CDT 1995
 # Whom:                 ache@nagual.pp.ru
 #
-# $Id: Makefile,v 1.65 1999/01/15 00:26:19 ache Exp $
+# $Id: Makefile,v 1.66 1999/03/07 18:34:56 ache Exp $
 #
 
 DISTNAME=       apache_1.3.4
@@ -19,8 +19,9 @@ Y2K=		http://www.apache.org/docs/misc/FAQ.html#year2000
 # Set APACHE_PERF_TUNING env. variable to YES to get maximum performance
 #
 
-GNU_CONFIGURE=  yes
+HAS_CONFIGURE=  yes
 CONFIGURE_ARGS= \
+		 --prefix=${PREFIX} \
 		 --with-layout=GNU \
 		 --sysconfdir=${PREFIX}/etc/apache \
 		 --includedir=${PREFIX}/include/apache \
diff --git a/www/mod_php3/Makefile b/www/mod_php3/Makefile
index b26e89a9d681..6c07074549ed 100644
--- a/www/mod_php3/Makefile
+++ b/www/mod_php3/Makefile
@@ -3,7 +3,7 @@
 # Date created:		So  21 Jun 1998 16:09:39 CEST
 # Whom:			Stefan Herrmann <stefan@asterix.webaffairs.net>
 #
-# $Id: Makefile,v 1.64 1999/01/08 17:22:06 dirk Exp $
+# $Id: Makefile,v 1.66 1999/01/13 17:31:09 dirk Exp $
 #
 
 DISTNAME=	apache_${VERSION_APACHE}
@@ -29,8 +29,9 @@ VERSION_PHP3=	3.0.6
 # Set APACHE_PERF_TUNING env. variable to YES to get maximum performance
 #
 
-GNU_CONFIGURE=	yes
+HAS_CONFIGURE=	yes
 CONFIGURE_ARGS= \
+		 --prefix=${PREFIX} \
 		 --with-layout=GNU \
 		 --sysconfdir=${PREFIX}/etc/apache \
 		 --includedir=${PREFIX}/include/apache \
diff --git a/www/mod_php4/Makefile b/www/mod_php4/Makefile
index b26e89a9d681..6c07074549ed 100644
--- a/www/mod_php4/Makefile
+++ b/www/mod_php4/Makefile
@@ -3,7 +3,7 @@
 # Date created:		So  21 Jun 1998 16:09:39 CEST
 # Whom:			Stefan Herrmann <stefan@asterix.webaffairs.net>
 #
-# $Id: Makefile,v 1.64 1999/01/08 17:22:06 dirk Exp $
+# $Id: Makefile,v 1.66 1999/01/13 17:31:09 dirk Exp $
 #
 
 DISTNAME=	apache_${VERSION_APACHE}
@@ -29,8 +29,9 @@ VERSION_PHP3=	3.0.6
 # Set APACHE_PERF_TUNING env. variable to YES to get maximum performance
 #
 
-GNU_CONFIGURE=	yes
+HAS_CONFIGURE=	yes
 CONFIGURE_ARGS= \
+		 --prefix=${PREFIX} \
 		 --with-layout=GNU \
 		 --sysconfdir=${PREFIX}/etc/apache \
 		 --includedir=${PREFIX}/include/apache \
diff --git a/www/mod_php5/Makefile b/www/mod_php5/Makefile
index b26e89a9d681..6c07074549ed 100644
--- a/www/mod_php5/Makefile
+++ b/www/mod_php5/Makefile
@@ -3,7 +3,7 @@
 # Date created:		So  21 Jun 1998 16:09:39 CEST
 # Whom:			Stefan Herrmann <stefan@asterix.webaffairs.net>
 #
-# $Id: Makefile,v 1.64 1999/01/08 17:22:06 dirk Exp $
+# $Id: Makefile,v 1.66 1999/01/13 17:31:09 dirk Exp $
 #
 
 DISTNAME=	apache_${VERSION_APACHE}
@@ -29,8 +29,9 @@ VERSION_PHP3=	3.0.6
 # Set APACHE_PERF_TUNING env. variable to YES to get maximum performance
 #
 
-GNU_CONFIGURE=	yes
+HAS_CONFIGURE=	yes
 CONFIGURE_ARGS= \
+		 --prefix=${PREFIX} \
 		 --with-layout=GNU \
 		 --sysconfdir=${PREFIX}/etc/apache \
 		 --includedir=${PREFIX}/include/apache \
diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile
index 9352c6b6ddd5..ac891dadbfc6 100644
--- a/x11-servers/XFree86-4-Server-snap/Makefile
+++ b/x11-servers/XFree86-4-Server-snap/Makefile
@@ -3,7 +3,7 @@
 # Date created:         5 January 1995
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.51 1999/01/11 19:07:14 jmz Exp $
+# $Id: Makefile,v 1.52 1999/01/27 18:32:15 fenner Exp $
 #
 
 DISTNAME=	xc
@@ -31,6 +31,7 @@ ALL_TARGET=	World
 INSTALL_TARGET=	install install.man
 DIST_SUBDIR=	xc
 PATCH_DIST_ARGS=-p0 -E -d ${WRKDIR} --quiet
+SCRIPTS_ENV=	OSVERSION=${OSVERSION}
 # can't use USE_X_PREFIX here -- it will cause a circular dependency
 PREFIX=		${X11BASE}
 MTREE_FILE=	/etc/mtree/BSD.x11.dist
@@ -39,6 +40,8 @@ SCRIPTS_ENV+=	MACHINE=pc98
 PLIST=		${PKGDIR}/PLIST.pc98
 .endif
 
+PLIST=		${PKGDIR}/PLIST.stripped
+
 .if defined(XDM_DES) && (${USA_RESIDENT} != YES && ${USA_RESIDENT} != NO)
 pre-fetch:
 	@${ECHO}
diff --git a/x11-servers/XFree86-4-Server-snap/scripts/configure b/x11-servers/XFree86-4-Server-snap/scripts/configure
index 892ec160e629..47d2cfa64187 100644
--- a/x11-servers/XFree86-4-Server-snap/scripts/configure
+++ b/x11-servers/XFree86-4-Server-snap/scripts/configure
@@ -230,7 +230,7 @@ else
   ELF=no
 fi
 
-if [ ! `uname -r|grep ^2` ]; then
+if [ ${OSVERSION} -ge 300000 ]; then
 cat <<'END'
 
  FreeBSD-3.x has support for Secure RPC.
diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile
index 9352c6b6ddd5..ac891dadbfc6 100644
--- a/x11-servers/XFree86-4-Server/Makefile
+++ b/x11-servers/XFree86-4-Server/Makefile
@@ -3,7 +3,7 @@
 # Date created:         5 January 1995
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.51 1999/01/11 19:07:14 jmz Exp $
+# $Id: Makefile,v 1.52 1999/01/27 18:32:15 fenner Exp $
 #
 
 DISTNAME=	xc
@@ -31,6 +31,7 @@ ALL_TARGET=	World
 INSTALL_TARGET=	install install.man
 DIST_SUBDIR=	xc
 PATCH_DIST_ARGS=-p0 -E -d ${WRKDIR} --quiet
+SCRIPTS_ENV=	OSVERSION=${OSVERSION}
 # can't use USE_X_PREFIX here -- it will cause a circular dependency
 PREFIX=		${X11BASE}
 MTREE_FILE=	/etc/mtree/BSD.x11.dist
@@ -39,6 +40,8 @@ SCRIPTS_ENV+=	MACHINE=pc98
 PLIST=		${PKGDIR}/PLIST.pc98
 .endif
 
+PLIST=		${PKGDIR}/PLIST.stripped
+
 .if defined(XDM_DES) && (${USA_RESIDENT} != YES && ${USA_RESIDENT} != NO)
 pre-fetch:
 	@${ECHO}
diff --git a/x11-servers/XFree86-4-Server/scripts/configure b/x11-servers/XFree86-4-Server/scripts/configure
index 892ec160e629..47d2cfa64187 100644
--- a/x11-servers/XFree86-4-Server/scripts/configure
+++ b/x11-servers/XFree86-4-Server/scripts/configure
@@ -230,7 +230,7 @@ else
   ELF=no
 fi
 
-if [ ! `uname -r|grep ^2` ]; then
+if [ ${OSVERSION} -ge 300000 ]; then
 cat <<'END'
 
  FreeBSD-3.x has support for Secure RPC.
diff --git a/x11-servers/XttXF86srv-common/Makefile b/x11-servers/XttXF86srv-common/Makefile
index da535b7ee598..5d97eef71614 100644
--- a/x11-servers/XttXF86srv-common/Makefile
+++ b/x11-servers/XttXF86srv-common/Makefile
@@ -3,14 +3,14 @@
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
-# $Id: Makefile,v 1.14 1999/01/04 20:42:33 sada Exp $
+# $Id: Makefile,v 1.15 1999/01/15 09:49:34 asami Exp $
 #
 
 DISTNAME=	xc
 PKGNAME?=	xtt-common-1.1
 CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/3.3.3/source/ \
-		ftp://xfree86.cdrom.com/pub/XFree86/3.3.3/source/ \
+MASTER_SITES=	ftp://xfree86.cdrom.com/pub/XFree86/3.3.3/source/ \
+		ftp://ftp.xfree86.org/pub/XFree86/3.3.3/source/ \
 		http://hawk.ise.chuo-u.ac.jp/student/person/tshiozak/x-tt/dists/1.x/
 DISTFILES=	X333src-1.tgz X333src-2.tgz \
 		xtt-1.1.tar.gz xttdoc11-to-pl01.diff.gz
diff --git a/x11/XFree86-4-clients/Makefile b/x11/XFree86-4-clients/Makefile
index 9352c6b6ddd5..ac891dadbfc6 100644
--- a/x11/XFree86-4-clients/Makefile
+++ b/x11/XFree86-4-clients/Makefile
@@ -3,7 +3,7 @@
 # Date created:         5 January 1995
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.51 1999/01/11 19:07:14 jmz Exp $
+# $Id: Makefile,v 1.52 1999/01/27 18:32:15 fenner Exp $
 #
 
 DISTNAME=	xc
@@ -31,6 +31,7 @@ ALL_TARGET=	World
 INSTALL_TARGET=	install install.man
 DIST_SUBDIR=	xc
 PATCH_DIST_ARGS=-p0 -E -d ${WRKDIR} --quiet
+SCRIPTS_ENV=	OSVERSION=${OSVERSION}
 # can't use USE_X_PREFIX here -- it will cause a circular dependency
 PREFIX=		${X11BASE}
 MTREE_FILE=	/etc/mtree/BSD.x11.dist
@@ -39,6 +40,8 @@ SCRIPTS_ENV+=	MACHINE=pc98
 PLIST=		${PKGDIR}/PLIST.pc98
 .endif
 
+PLIST=		${PKGDIR}/PLIST.stripped
+
 .if defined(XDM_DES) && (${USA_RESIDENT} != YES && ${USA_RESIDENT} != NO)
 pre-fetch:
 	@${ECHO}
diff --git a/x11/XFree86-4-clients/scripts/configure b/x11/XFree86-4-clients/scripts/configure
index 892ec160e629..47d2cfa64187 100644
--- a/x11/XFree86-4-clients/scripts/configure
+++ b/x11/XFree86-4-clients/scripts/configure
@@ -230,7 +230,7 @@ else
   ELF=no
 fi
 
-if [ ! `uname -r|grep ^2` ]; then
+if [ ${OSVERSION} -ge 300000 ]; then
 cat <<'END'
 
  FreeBSD-3.x has support for Secure RPC.
diff --git a/x11/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile
index 9352c6b6ddd5..ac891dadbfc6 100644
--- a/x11/XFree86-4-libraries/Makefile
+++ b/x11/XFree86-4-libraries/Makefile
@@ -3,7 +3,7 @@
 # Date created:         5 January 1995
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.51 1999/01/11 19:07:14 jmz Exp $
+# $Id: Makefile,v 1.52 1999/01/27 18:32:15 fenner Exp $
 #
 
 DISTNAME=	xc
@@ -31,6 +31,7 @@ ALL_TARGET=	World
 INSTALL_TARGET=	install install.man
 DIST_SUBDIR=	xc
 PATCH_DIST_ARGS=-p0 -E -d ${WRKDIR} --quiet
+SCRIPTS_ENV=	OSVERSION=${OSVERSION}
 # can't use USE_X_PREFIX here -- it will cause a circular dependency
 PREFIX=		${X11BASE}
 MTREE_FILE=	/etc/mtree/BSD.x11.dist
@@ -39,6 +40,8 @@ SCRIPTS_ENV+=	MACHINE=pc98
 PLIST=		${PKGDIR}/PLIST.pc98
 .endif
 
+PLIST=		${PKGDIR}/PLIST.stripped
+
 .if defined(XDM_DES) && (${USA_RESIDENT} != YES && ${USA_RESIDENT} != NO)
 pre-fetch:
 	@${ECHO}
diff --git a/x11/XFree86-4-libraries/scripts/configure b/x11/XFree86-4-libraries/scripts/configure
index 892ec160e629..47d2cfa64187 100644
--- a/x11/XFree86-4-libraries/scripts/configure
+++ b/x11/XFree86-4-libraries/scripts/configure
@@ -230,7 +230,7 @@ else
   ELF=no
 fi
 
-if [ ! `uname -r|grep ^2` ]; then
+if [ ${OSVERSION} -ge 300000 ]; then
 cat <<'END'
 
  FreeBSD-3.x has support for Secure RPC.
diff --git a/x11/XFree86-4/Makefile b/x11/XFree86-4/Makefile
index 9352c6b6ddd5..ac891dadbfc6 100644
--- a/x11/XFree86-4/Makefile
+++ b/x11/XFree86-4/Makefile
@@ -3,7 +3,7 @@
 # Date created:         5 January 1995
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.51 1999/01/11 19:07:14 jmz Exp $
+# $Id: Makefile,v 1.52 1999/01/27 18:32:15 fenner Exp $
 #
 
 DISTNAME=	xc
@@ -31,6 +31,7 @@ ALL_TARGET=	World
 INSTALL_TARGET=	install install.man
 DIST_SUBDIR=	xc
 PATCH_DIST_ARGS=-p0 -E -d ${WRKDIR} --quiet
+SCRIPTS_ENV=	OSVERSION=${OSVERSION}
 # can't use USE_X_PREFIX here -- it will cause a circular dependency
 PREFIX=		${X11BASE}
 MTREE_FILE=	/etc/mtree/BSD.x11.dist
@@ -39,6 +40,8 @@ SCRIPTS_ENV+=	MACHINE=pc98
 PLIST=		${PKGDIR}/PLIST.pc98
 .endif
 
+PLIST=		${PKGDIR}/PLIST.stripped
+
 .if defined(XDM_DES) && (${USA_RESIDENT} != YES && ${USA_RESIDENT} != NO)
 pre-fetch:
 	@${ECHO}
diff --git a/x11/XFree86-4/scripts/configure b/x11/XFree86-4/scripts/configure
index 892ec160e629..47d2cfa64187 100644
--- a/x11/XFree86-4/scripts/configure
+++ b/x11/XFree86-4/scripts/configure
@@ -230,7 +230,7 @@ else
   ELF=no
 fi
 
-if [ ! `uname -r|grep ^2` ]; then
+if [ ${OSVERSION} -ge 300000 ]; then
 cat <<'END'
 
  FreeBSD-3.x has support for Secure RPC.
diff --git a/x11/XFree86/Makefile b/x11/XFree86/Makefile
index 9352c6b6ddd5..ac891dadbfc6 100644
--- a/x11/XFree86/Makefile
+++ b/x11/XFree86/Makefile
@@ -3,7 +3,7 @@
 # Date created:         5 January 1995
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.51 1999/01/11 19:07:14 jmz Exp $
+# $Id: Makefile,v 1.52 1999/01/27 18:32:15 fenner Exp $
 #
 
 DISTNAME=	xc
@@ -31,6 +31,7 @@ ALL_TARGET=	World
 INSTALL_TARGET=	install install.man
 DIST_SUBDIR=	xc
 PATCH_DIST_ARGS=-p0 -E -d ${WRKDIR} --quiet
+SCRIPTS_ENV=	OSVERSION=${OSVERSION}
 # can't use USE_X_PREFIX here -- it will cause a circular dependency
 PREFIX=		${X11BASE}
 MTREE_FILE=	/etc/mtree/BSD.x11.dist
@@ -39,6 +40,8 @@ SCRIPTS_ENV+=	MACHINE=pc98
 PLIST=		${PKGDIR}/PLIST.pc98
 .endif
 
+PLIST=		${PKGDIR}/PLIST.stripped
+
 .if defined(XDM_DES) && (${USA_RESIDENT} != YES && ${USA_RESIDENT} != NO)
 pre-fetch:
 	@${ECHO}
diff --git a/x11/XFree86/scripts/configure b/x11/XFree86/scripts/configure
index 892ec160e629..47d2cfa64187 100644
--- a/x11/XFree86/scripts/configure
+++ b/x11/XFree86/scripts/configure
@@ -230,7 +230,7 @@ else
   ELF=no
 fi
 
-if [ ! `uname -r|grep ^2` ]; then
+if [ ${OSVERSION} -ge 300000 ]; then
 cat <<'END'
 
  FreeBSD-3.x has support for Secure RPC.