20 files changed, 140 insertions, 80 deletions

diff --git a/lang/egcs/Makefile b/lang/egcs/Makefile
index 16480d6ef203..a5ef5b627d39 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.35 1998/10/01 21:40:03 obrien Exp $
+# $Id: Makefile,v 1.36 1998/11/13 07:32:21 obrien Exp $
 #
 
 DISTNAME=	egcs-19980914
@@ -16,14 +16,17 @@ MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-09-14/ \
 
 MAINTAINER=	obrien@FreeBSD.org
 
+.include <bsd.port.pre.mk>
+
 EGCS_REV=	egcs-2.92.07
 LIBSTDCPP_REV=	2.9.0
-ARE_WE_ELF!=	test -x /usr/bin/objformat && /usr/bin/objformat || echo aout
-.if ${ARE_WE_ELF} == "elf"
+
+.if ${PORTOBJFORMAT} == "elf"
 GNUHOST=	${ARCH}-unknown-freebsdelf
 .else
 GNUHOST=	${ARCH}-unknown-freebsd
 .endif
+
 PLIST_SUB=	EGCS_REV=${EGCS_REV} GNU_HOST=${GNUHOST}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
@@ -72,4 +75,4 @@ post-install:
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/lang/gcc-devel/Makefile b/lang/gcc-devel/Makefile
index 16480d6ef203..a5ef5b627d39 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.35 1998/10/01 21:40:03 obrien Exp $
+# $Id: Makefile,v 1.36 1998/11/13 07:32:21 obrien Exp $
 #
 
 DISTNAME=	egcs-19980914
@@ -16,14 +16,17 @@ MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-09-14/ \
 
 MAINTAINER=	obrien@FreeBSD.org
 
+.include <bsd.port.pre.mk>
+
 EGCS_REV=	egcs-2.92.07
 LIBSTDCPP_REV=	2.9.0
-ARE_WE_ELF!=	test -x /usr/bin/objformat && /usr/bin/objformat || echo aout
-.if ${ARE_WE_ELF} == "elf"
+
+.if ${PORTOBJFORMAT} == "elf"
 GNUHOST=	${ARCH}-unknown-freebsdelf
 .else
 GNUHOST=	${ARCH}-unknown-freebsd
 .endif
+
 PLIST_SUB=	EGCS_REV=${EGCS_REV} GNU_HOST=${GNUHOST}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
@@ -72,4 +75,4 @@ post-install:
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/lang/gcc-ooo/Makefile b/lang/gcc-ooo/Makefile
index 16480d6ef203..a5ef5b627d39 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.35 1998/10/01 21:40:03 obrien Exp $
+# $Id: Makefile,v 1.36 1998/11/13 07:32:21 obrien Exp $
 #
 
 DISTNAME=	egcs-19980914
@@ -16,14 +16,17 @@ MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-09-14/ \
 
 MAINTAINER=	obrien@FreeBSD.org
 
+.include <bsd.port.pre.mk>
+
 EGCS_REV=	egcs-2.92.07
 LIBSTDCPP_REV=	2.9.0
-ARE_WE_ELF!=	test -x /usr/bin/objformat && /usr/bin/objformat || echo aout
-.if ${ARE_WE_ELF} == "elf"
+
+.if ${PORTOBJFORMAT} == "elf"
 GNUHOST=	${ARCH}-unknown-freebsdelf
 .else
 GNUHOST=	${ARCH}-unknown-freebsd
 .endif
+
 PLIST_SUB=	EGCS_REV=${EGCS_REV} GNU_HOST=${GNUHOST}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
@@ -72,4 +75,4 @@ post-install:
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 16480d6ef203..a5ef5b627d39 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.35 1998/10/01 21:40:03 obrien Exp $
+# $Id: Makefile,v 1.36 1998/11/13 07:32:21 obrien Exp $
 #
 
 DISTNAME=	egcs-19980914
@@ -16,14 +16,17 @@ MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-09-14/ \
 
 MAINTAINER=	obrien@FreeBSD.org
 
+.include <bsd.port.pre.mk>
+
 EGCS_REV=	egcs-2.92.07
 LIBSTDCPP_REV=	2.9.0
-ARE_WE_ELF!=	test -x /usr/bin/objformat && /usr/bin/objformat || echo aout
-.if ${ARE_WE_ELF} == "elf"
+
+.if ${PORTOBJFORMAT} == "elf"
 GNUHOST=	${ARCH}-unknown-freebsdelf
 .else
 GNUHOST=	${ARCH}-unknown-freebsd
 .endif
+
 PLIST_SUB=	EGCS_REV=${EGCS_REV} GNU_HOST=${GNUHOST}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
@@ -72,4 +75,4 @@ post-install:
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/lang/gcc295/Makefile b/lang/gcc295/Makefile
index 16480d6ef203..a5ef5b627d39 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.35 1998/10/01 21:40:03 obrien Exp $
+# $Id: Makefile,v 1.36 1998/11/13 07:32:21 obrien Exp $
 #
 
 DISTNAME=	egcs-19980914
@@ -16,14 +16,17 @@ MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-09-14/ \
 
 MAINTAINER=	obrien@FreeBSD.org
 
+.include <bsd.port.pre.mk>
+
 EGCS_REV=	egcs-2.92.07
 LIBSTDCPP_REV=	2.9.0
-ARE_WE_ELF!=	test -x /usr/bin/objformat && /usr/bin/objformat || echo aout
-.if ${ARE_WE_ELF} == "elf"
+
+.if ${PORTOBJFORMAT} == "elf"
 GNUHOST=	${ARCH}-unknown-freebsdelf
 .else
 GNUHOST=	${ARCH}-unknown-freebsd
 .endif
+
 PLIST_SUB=	EGCS_REV=${EGCS_REV} GNU_HOST=${GNUHOST}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
@@ -72,4 +75,4 @@ post-install:
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/lang/gcc30/Makefile b/lang/gcc30/Makefile
index 16480d6ef203..a5ef5b627d39 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.35 1998/10/01 21:40:03 obrien Exp $
+# $Id: Makefile,v 1.36 1998/11/13 07:32:21 obrien Exp $
 #
 
 DISTNAME=	egcs-19980914
@@ -16,14 +16,17 @@ MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-09-14/ \
 
 MAINTAINER=	obrien@FreeBSD.org
 
+.include <bsd.port.pre.mk>
+
 EGCS_REV=	egcs-2.92.07
 LIBSTDCPP_REV=	2.9.0
-ARE_WE_ELF!=	test -x /usr/bin/objformat && /usr/bin/objformat || echo aout
-.if ${ARE_WE_ELF} == "elf"
+
+.if ${PORTOBJFORMAT} == "elf"
 GNUHOST=	${ARCH}-unknown-freebsdelf
 .else
 GNUHOST=	${ARCH}-unknown-freebsd
 .endif
+
 PLIST_SUB=	EGCS_REV=${EGCS_REV} GNU_HOST=${GNUHOST}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
@@ -72,4 +75,4 @@ post-install:
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/lang/gcc31/Makefile b/lang/gcc31/Makefile
index 16480d6ef203..a5ef5b627d39 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.35 1998/10/01 21:40:03 obrien Exp $
+# $Id: Makefile,v 1.36 1998/11/13 07:32:21 obrien Exp $
 #
 
 DISTNAME=	egcs-19980914
@@ -16,14 +16,17 @@ MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-09-14/ \
 
 MAINTAINER=	obrien@FreeBSD.org
 
+.include <bsd.port.pre.mk>
+
 EGCS_REV=	egcs-2.92.07
 LIBSTDCPP_REV=	2.9.0
-ARE_WE_ELF!=	test -x /usr/bin/objformat && /usr/bin/objformat || echo aout
-.if ${ARE_WE_ELF} == "elf"
+
+.if ${PORTOBJFORMAT} == "elf"
 GNUHOST=	${ARCH}-unknown-freebsdelf
 .else
 GNUHOST=	${ARCH}-unknown-freebsd
 .endif
+
 PLIST_SUB=	EGCS_REV=${EGCS_REV} GNU_HOST=${GNUHOST}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
@@ -72,4 +75,4 @@ post-install:
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/lang/gcc32/Makefile b/lang/gcc32/Makefile
index 16480d6ef203..a5ef5b627d39 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.35 1998/10/01 21:40:03 obrien Exp $
+# $Id: Makefile,v 1.36 1998/11/13 07:32:21 obrien Exp $
 #
 
 DISTNAME=	egcs-19980914
@@ -16,14 +16,17 @@ MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-09-14/ \
 
 MAINTAINER=	obrien@FreeBSD.org
 
+.include <bsd.port.pre.mk>
+
 EGCS_REV=	egcs-2.92.07
 LIBSTDCPP_REV=	2.9.0
-ARE_WE_ELF!=	test -x /usr/bin/objformat && /usr/bin/objformat || echo aout
-.if ${ARE_WE_ELF} == "elf"
+
+.if ${PORTOBJFORMAT} == "elf"
 GNUHOST=	${ARCH}-unknown-freebsdelf
 .else
 GNUHOST=	${ARCH}-unknown-freebsd
 .endif
+
 PLIST_SUB=	EGCS_REV=${EGCS_REV} GNU_HOST=${GNUHOST}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
@@ -72,4 +75,4 @@ post-install:
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/lang/gcc33/Makefile b/lang/gcc33/Makefile
index 16480d6ef203..a5ef5b627d39 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.35 1998/10/01 21:40:03 obrien Exp $
+# $Id: Makefile,v 1.36 1998/11/13 07:32:21 obrien Exp $
 #
 
 DISTNAME=	egcs-19980914
@@ -16,14 +16,17 @@ MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-09-14/ \
 
 MAINTAINER=	obrien@FreeBSD.org
 
+.include <bsd.port.pre.mk>
+
 EGCS_REV=	egcs-2.92.07
 LIBSTDCPP_REV=	2.9.0
-ARE_WE_ELF!=	test -x /usr/bin/objformat && /usr/bin/objformat || echo aout
-.if ${ARE_WE_ELF} == "elf"
+
+.if ${PORTOBJFORMAT} == "elf"
 GNUHOST=	${ARCH}-unknown-freebsdelf
 .else
 GNUHOST=	${ARCH}-unknown-freebsd
 .endif
+
 PLIST_SUB=	EGCS_REV=${EGCS_REV} GNU_HOST=${GNUHOST}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
@@ -72,4 +75,4 @@ post-install:
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile
index 16480d6ef203..a5ef5b627d39 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.35 1998/10/01 21:40:03 obrien Exp $
+# $Id: Makefile,v 1.36 1998/11/13 07:32:21 obrien Exp $
 #
 
 DISTNAME=	egcs-19980914
@@ -16,14 +16,17 @@ MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-09-14/ \
 
 MAINTAINER=	obrien@FreeBSD.org
 
+.include <bsd.port.pre.mk>
+
 EGCS_REV=	egcs-2.92.07
 LIBSTDCPP_REV=	2.9.0
-ARE_WE_ELF!=	test -x /usr/bin/objformat && /usr/bin/objformat || echo aout
-.if ${ARE_WE_ELF} == "elf"
+
+.if ${PORTOBJFORMAT} == "elf"
 GNUHOST=	${ARCH}-unknown-freebsdelf
 .else
 GNUHOST=	${ARCH}-unknown-freebsd
 .endif
+
 PLIST_SUB=	EGCS_REV=${EGCS_REV} GNU_HOST=${GNUHOST}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
@@ -72,4 +75,4 @@ post-install:
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/lang/gcc35/Makefile b/lang/gcc35/Makefile
index 16480d6ef203..a5ef5b627d39 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.35 1998/10/01 21:40:03 obrien Exp $
+# $Id: Makefile,v 1.36 1998/11/13 07:32:21 obrien Exp $
 #
 
 DISTNAME=	egcs-19980914
@@ -16,14 +16,17 @@ MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-09-14/ \
 
 MAINTAINER=	obrien@FreeBSD.org
 
+.include <bsd.port.pre.mk>
+
 EGCS_REV=	egcs-2.92.07
 LIBSTDCPP_REV=	2.9.0
-ARE_WE_ELF!=	test -x /usr/bin/objformat && /usr/bin/objformat || echo aout
-.if ${ARE_WE_ELF} == "elf"
+
+.if ${PORTOBJFORMAT} == "elf"
 GNUHOST=	${ARCH}-unknown-freebsdelf
 .else
 GNUHOST=	${ARCH}-unknown-freebsd
 .endif
+
 PLIST_SUB=	EGCS_REV=${EGCS_REV} GNU_HOST=${GNUHOST}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
@@ -72,4 +75,4 @@ post-install:
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/lang/gcc40/Makefile b/lang/gcc40/Makefile
index 16480d6ef203..a5ef5b627d39 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.35 1998/10/01 21:40:03 obrien Exp $
+# $Id: Makefile,v 1.36 1998/11/13 07:32:21 obrien Exp $
 #
 
 DISTNAME=	egcs-19980914
@@ -16,14 +16,17 @@ MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-09-14/ \
 
 MAINTAINER=	obrien@FreeBSD.org
 
+.include <bsd.port.pre.mk>
+
 EGCS_REV=	egcs-2.92.07
 LIBSTDCPP_REV=	2.9.0
-ARE_WE_ELF!=	test -x /usr/bin/objformat && /usr/bin/objformat || echo aout
-.if ${ARE_WE_ELF} == "elf"
+
+.if ${PORTOBJFORMAT} == "elf"
 GNUHOST=	${ARCH}-unknown-freebsdelf
 .else
 GNUHOST=	${ARCH}-unknown-freebsd
 .endif
+
 PLIST_SUB=	EGCS_REV=${EGCS_REV} GNU_HOST=${GNUHOST}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
@@ -72,4 +75,4 @@ post-install:
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/lang/gcc41/Makefile b/lang/gcc41/Makefile
index 16480d6ef203..a5ef5b627d39 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.35 1998/10/01 21:40:03 obrien Exp $
+# $Id: Makefile,v 1.36 1998/11/13 07:32:21 obrien Exp $
 #
 
 DISTNAME=	egcs-19980914
@@ -16,14 +16,17 @@ MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-09-14/ \
 
 MAINTAINER=	obrien@FreeBSD.org
 
+.include <bsd.port.pre.mk>
+
 EGCS_REV=	egcs-2.92.07
 LIBSTDCPP_REV=	2.9.0
-ARE_WE_ELF!=	test -x /usr/bin/objformat && /usr/bin/objformat || echo aout
-.if ${ARE_WE_ELF} == "elf"
+
+.if ${PORTOBJFORMAT} == "elf"
 GNUHOST=	${ARCH}-unknown-freebsdelf
 .else
 GNUHOST=	${ARCH}-unknown-freebsd
 .endif
+
 PLIST_SUB=	EGCS_REV=${EGCS_REV} GNU_HOST=${GNUHOST}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
@@ -72,4 +75,4 @@ post-install:
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile
index 16480d6ef203..a5ef5b627d39 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.35 1998/10/01 21:40:03 obrien Exp $
+# $Id: Makefile,v 1.36 1998/11/13 07:32:21 obrien Exp $
 #
 
 DISTNAME=	egcs-19980914
@@ -16,14 +16,17 @@ MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-09-14/ \
 
 MAINTAINER=	obrien@FreeBSD.org
 
+.include <bsd.port.pre.mk>
+
 EGCS_REV=	egcs-2.92.07
 LIBSTDCPP_REV=	2.9.0
-ARE_WE_ELF!=	test -x /usr/bin/objformat && /usr/bin/objformat || echo aout
-.if ${ARE_WE_ELF} == "elf"
+
+.if ${PORTOBJFORMAT} == "elf"
 GNUHOST=	${ARCH}-unknown-freebsdelf
 .else
 GNUHOST=	${ARCH}-unknown-freebsd
 .endif
+
 PLIST_SUB=	EGCS_REV=${EGCS_REV} GNU_HOST=${GNUHOST}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
@@ -72,4 +75,4 @@ post-install:
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile
index 16480d6ef203..a5ef5b627d39 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.35 1998/10/01 21:40:03 obrien Exp $
+# $Id: Makefile,v 1.36 1998/11/13 07:32:21 obrien Exp $
 #
 
 DISTNAME=	egcs-19980914
@@ -16,14 +16,17 @@ MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-09-14/ \
 
 MAINTAINER=	obrien@FreeBSD.org
 
+.include <bsd.port.pre.mk>
+
 EGCS_REV=	egcs-2.92.07
 LIBSTDCPP_REV=	2.9.0
-ARE_WE_ELF!=	test -x /usr/bin/objformat && /usr/bin/objformat || echo aout
-.if ${ARE_WE_ELF} == "elf"
+
+.if ${PORTOBJFORMAT} == "elf"
 GNUHOST=	${ARCH}-unknown-freebsdelf
 .else
 GNUHOST=	${ARCH}-unknown-freebsd
 .endif
+
 PLIST_SUB=	EGCS_REV=${EGCS_REV} GNU_HOST=${GNUHOST}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
@@ -72,4 +75,4 @@ post-install:
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile
index 16480d6ef203..a5ef5b627d39 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.35 1998/10/01 21:40:03 obrien Exp $
+# $Id: Makefile,v 1.36 1998/11/13 07:32:21 obrien Exp $
 #
 
 DISTNAME=	egcs-19980914
@@ -16,14 +16,17 @@ MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-09-14/ \
 
 MAINTAINER=	obrien@FreeBSD.org
 
+.include <bsd.port.pre.mk>
+
 EGCS_REV=	egcs-2.92.07
 LIBSTDCPP_REV=	2.9.0
-ARE_WE_ELF!=	test -x /usr/bin/objformat && /usr/bin/objformat || echo aout
-.if ${ARE_WE_ELF} == "elf"
+
+.if ${PORTOBJFORMAT} == "elf"
 GNUHOST=	${ARCH}-unknown-freebsdelf
 .else
 GNUHOST=	${ARCH}-unknown-freebsd
 .endif
+
 PLIST_SUB=	EGCS_REV=${EGCS_REV} GNU_HOST=${GNUHOST}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
@@ -72,4 +75,4 @@ post-install:
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile
index 16480d6ef203..a5ef5b627d39 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.35 1998/10/01 21:40:03 obrien Exp $
+# $Id: Makefile,v 1.36 1998/11/13 07:32:21 obrien Exp $
 #
 
 DISTNAME=	egcs-19980914
@@ -16,14 +16,17 @@ MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-09-14/ \
 
 MAINTAINER=	obrien@FreeBSD.org
 
+.include <bsd.port.pre.mk>
+
 EGCS_REV=	egcs-2.92.07
 LIBSTDCPP_REV=	2.9.0
-ARE_WE_ELF!=	test -x /usr/bin/objformat && /usr/bin/objformat || echo aout
-.if ${ARE_WE_ELF} == "elf"
+
+.if ${PORTOBJFORMAT} == "elf"
 GNUHOST=	${ARCH}-unknown-freebsdelf
 .else
 GNUHOST=	${ARCH}-unknown-freebsd
 .endif
+
 PLIST_SUB=	EGCS_REV=${EGCS_REV} GNU_HOST=${GNUHOST}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
@@ -72,4 +75,4 @@ post-install:
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index 16480d6ef203..a5ef5b627d39 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.35 1998/10/01 21:40:03 obrien Exp $
+# $Id: Makefile,v 1.36 1998/11/13 07:32:21 obrien Exp $
 #
 
 DISTNAME=	egcs-19980914
@@ -16,14 +16,17 @@ MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-09-14/ \
 
 MAINTAINER=	obrien@FreeBSD.org
 
+.include <bsd.port.pre.mk>
+
 EGCS_REV=	egcs-2.92.07
 LIBSTDCPP_REV=	2.9.0
-ARE_WE_ELF!=	test -x /usr/bin/objformat && /usr/bin/objformat || echo aout
-.if ${ARE_WE_ELF} == "elf"
+
+.if ${PORTOBJFORMAT} == "elf"
 GNUHOST=	${ARCH}-unknown-freebsdelf
 .else
 GNUHOST=	${ARCH}-unknown-freebsd
 .endif
+
 PLIST_SUB=	EGCS_REV=${EGCS_REV} GNU_HOST=${GNUHOST}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
@@ -72,4 +75,4 @@ post-install:
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index 16480d6ef203..a5ef5b627d39 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.35 1998/10/01 21:40:03 obrien Exp $
+# $Id: Makefile,v 1.36 1998/11/13 07:32:21 obrien Exp $
 #
 
 DISTNAME=	egcs-19980914
@@ -16,14 +16,17 @@ MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-09-14/ \
 
 MAINTAINER=	obrien@FreeBSD.org
 
+.include <bsd.port.pre.mk>
+
 EGCS_REV=	egcs-2.92.07
 LIBSTDCPP_REV=	2.9.0
-ARE_WE_ELF!=	test -x /usr/bin/objformat && /usr/bin/objformat || echo aout
-.if ${ARE_WE_ELF} == "elf"
+
+.if ${PORTOBJFORMAT} == "elf"
 GNUHOST=	${ARCH}-unknown-freebsdelf
 .else
 GNUHOST=	${ARCH}-unknown-freebsd
 .endif
+
 PLIST_SUB=	EGCS_REV=${EGCS_REV} GNU_HOST=${GNUHOST}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
@@ -72,4 +75,4 @@ post-install:
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index 16480d6ef203..a5ef5b627d39 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.35 1998/10/01 21:40:03 obrien Exp $
+# $Id: Makefile,v 1.36 1998/11/13 07:32:21 obrien Exp $
 #
 
 DISTNAME=	egcs-19980914
@@ -16,14 +16,17 @@ MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-09-14/ \
 
 MAINTAINER=	obrien@FreeBSD.org
 
+.include <bsd.port.pre.mk>
+
 EGCS_REV=	egcs-2.92.07
 LIBSTDCPP_REV=	2.9.0
-ARE_WE_ELF!=	test -x /usr/bin/objformat && /usr/bin/objformat || echo aout
-.if ${ARE_WE_ELF} == "elf"
+
+.if ${PORTOBJFORMAT} == "elf"
 GNUHOST=	${ARCH}-unknown-freebsdelf
 .else
 GNUHOST=	${ARCH}-unknown-freebsd
 .endif
+
 PLIST_SUB=	EGCS_REV=${EGCS_REV} GNU_HOST=${GNUHOST}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
@@ -72,4 +75,4 @@ post-install:
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>