Use bsd.port.{pre,post}.mk. Either use them to avoid having to define

something already there (PORTOBJFORMAT, OSVERSION) or move stuff from after
.include <bsd.port.mk> to before.

(This is not by any means the complete list but just the ones I've noticed
recently.)

9 files changed, 45 insertions, 42 deletions

diff --git a/www/mozilla+ipv6/Makefile b/www/mozilla+ipv6/Makefile
index 5851f7c25344..bccaa7808569 100644
--- a/www/mozilla+ipv6/Makefile
+++ b/www/mozilla+ipv6/Makefile
@@ -3,7 +3,7 @@
 # Date created:		31 Mar 1998
 # Whom:			eivind/dima/jseger
 #
-# $Id: Makefile,v 1.26 1998/07/22 11:50:31 asami Exp $
+# $Id: Makefile,v 1.27 1998/10/15 01:16:23 jseger Exp $
 #
 
 DISTNAME=	unix-19980429
@@ -24,9 +24,9 @@ MAKE_ENV=	NO_SECURITY=1 MOZ_MEDIUM=1 MOZILLA_CLIENT=1 NO_MDUPDATE=1 \
 	BUILD_OPT=1 NO_NETSCAPE_STATIC=1 LD_LIBRARY_PATH=${LOCALBASE}/lib
 REQUIRES_MOTIF=	yes
 
-OSNAME=	`uname -s`
-OSVER=	`uname -r | ${SED} 's/-.*//'`
-OBJDIR=	${WRKSRC}/dist/${OSNAME}${OSVER}_OPT.OBJ
+.include <bsd.port.pre.mk>
+
+OBJDIR=	${WRKSRC}/dist/${OPSYS}${OSREL}_OPT.OBJ
 
 do-install:
 	@${MKDIR} ${PREFIX}/lib/mozilla/bin
@@ -40,4 +40,4 @@ do-install:
 	@strip ${PREFIX}/lib/mozilla/bin/moz-export
 	@chown -R bin.bin ${PREFIX}/lib/mozilla
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/mozilla-devel/Makefile b/www/mozilla-devel/Makefile
index 5851f7c25344..bccaa7808569 100644
--- a/www/mozilla-devel/Makefile
+++ b/www/mozilla-devel/Makefile
@@ -3,7 +3,7 @@
 # Date created:		31 Mar 1998
 # Whom:			eivind/dima/jseger
 #
-# $Id: Makefile,v 1.26 1998/07/22 11:50:31 asami Exp $
+# $Id: Makefile,v 1.27 1998/10/15 01:16:23 jseger Exp $
 #
 
 DISTNAME=	unix-19980429
@@ -24,9 +24,9 @@ MAKE_ENV=	NO_SECURITY=1 MOZ_MEDIUM=1 MOZILLA_CLIENT=1 NO_MDUPDATE=1 \
 	BUILD_OPT=1 NO_NETSCAPE_STATIC=1 LD_LIBRARY_PATH=${LOCALBASE}/lib
 REQUIRES_MOTIF=	yes
 
-OSNAME=	`uname -s`
-OSVER=	`uname -r | ${SED} 's/-.*//'`
-OBJDIR=	${WRKSRC}/dist/${OSNAME}${OSVER}_OPT.OBJ
+.include <bsd.port.pre.mk>
+
+OBJDIR=	${WRKSRC}/dist/${OPSYS}${OSREL}_OPT.OBJ
 
 do-install:
 	@${MKDIR} ${PREFIX}/lib/mozilla/bin
@@ -40,4 +40,4 @@ do-install:
 	@strip ${PREFIX}/lib/mozilla/bin/moz-export
 	@chown -R bin.bin ${PREFIX}/lib/mozilla
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/mozilla-vendor/Makefile b/www/mozilla-vendor/Makefile
index 5851f7c25344..bccaa7808569 100644
--- a/www/mozilla-vendor/Makefile
+++ b/www/mozilla-vendor/Makefile
@@ -3,7 +3,7 @@
 # Date created:		31 Mar 1998
 # Whom:			eivind/dima/jseger
 #
-# $Id: Makefile,v 1.26 1998/07/22 11:50:31 asami Exp $
+# $Id: Makefile,v 1.27 1998/10/15 01:16:23 jseger Exp $
 #
 
 DISTNAME=	unix-19980429
@@ -24,9 +24,9 @@ MAKE_ENV=	NO_SECURITY=1 MOZ_MEDIUM=1 MOZILLA_CLIENT=1 NO_MDUPDATE=1 \
 	BUILD_OPT=1 NO_NETSCAPE_STATIC=1 LD_LIBRARY_PATH=${LOCALBASE}/lib
 REQUIRES_MOTIF=	yes
 
-OSNAME=	`uname -s`
-OSVER=	`uname -r | ${SED} 's/-.*//'`
-OBJDIR=	${WRKSRC}/dist/${OSNAME}${OSVER}_OPT.OBJ
+.include <bsd.port.pre.mk>
+
+OBJDIR=	${WRKSRC}/dist/${OPSYS}${OSREL}_OPT.OBJ
 
 do-install:
 	@${MKDIR} ${PREFIX}/lib/mozilla/bin
@@ -40,4 +40,4 @@ do-install:
 	@strip ${PREFIX}/lib/mozilla/bin/moz-export
 	@chown -R bin.bin ${PREFIX}/lib/mozilla
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index 5851f7c25344..bccaa7808569 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -3,7 +3,7 @@
 # Date created:		31 Mar 1998
 # Whom:			eivind/dima/jseger
 #
-# $Id: Makefile,v 1.26 1998/07/22 11:50:31 asami Exp $
+# $Id: Makefile,v 1.27 1998/10/15 01:16:23 jseger Exp $
 #
 
 DISTNAME=	unix-19980429
@@ -24,9 +24,9 @@ MAKE_ENV=	NO_SECURITY=1 MOZ_MEDIUM=1 MOZILLA_CLIENT=1 NO_MDUPDATE=1 \
 	BUILD_OPT=1 NO_NETSCAPE_STATIC=1 LD_LIBRARY_PATH=${LOCALBASE}/lib
 REQUIRES_MOTIF=	yes
 
-OSNAME=	`uname -s`
-OSVER=	`uname -r | ${SED} 's/-.*//'`
-OBJDIR=	${WRKSRC}/dist/${OSNAME}${OSVER}_OPT.OBJ
+.include <bsd.port.pre.mk>
+
+OBJDIR=	${WRKSRC}/dist/${OPSYS}${OSREL}_OPT.OBJ
 
 do-install:
 	@${MKDIR} ${PREFIX}/lib/mozilla/bin
@@ -40,4 +40,4 @@ do-install:
 	@strip ${PREFIX}/lib/mozilla/bin/moz-export
 	@chown -R bin.bin ${PREFIX}/lib/mozilla
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/p5-WWW-Search/Makefile b/www/p5-WWW-Search/Makefile
index 69a48987e43f..6e487f18ff37 100644
--- a/www/p5-WWW-Search/Makefile
+++ b/www/p5-WWW-Search/Makefile
@@ -3,7 +3,7 @@
 # Date created:				June 26th 1997
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.8 1998/09/15 21:31:57 asami Exp $
+# $Id: Makefile,v 1.9 1998/10/15 01:28:34 jseger Exp $
 #
 
 DISTNAME=	WWW-Search-1.021
@@ -18,11 +18,6 @@ BUILD_DEPENDS=	${PREFIX}/lib/perl5/site_perl/${PERL_VER}/LWP.pm:${PORTSDIR}/www/
 
 USE_PERL5=	YES
 
-OSVERSION!=     sysctl -n kern.osreldate
-.if ${OSVERSION} >= 300000
-BROKEN=         perl
-.endif
-
 MAN1=		AutoSearch.1 \
 		WebSearch.1
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
@@ -51,7 +46,13 @@ MAN3=		WWW::Search.3 \
 		WWW::Search::Gopher.3 \
 		WWW::Search::Simple.3
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 300000
+BROKEN=         perl
+.endif
+
 do-configure:
 		@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${PERL5} Makefile.PL
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index 5851f7c25344..bccaa7808569 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -3,7 +3,7 @@
 # Date created:		31 Mar 1998
 # Whom:			eivind/dima/jseger
 #
-# $Id: Makefile,v 1.26 1998/07/22 11:50:31 asami Exp $
+# $Id: Makefile,v 1.27 1998/10/15 01:16:23 jseger Exp $
 #
 
 DISTNAME=	unix-19980429
@@ -24,9 +24,9 @@ MAKE_ENV=	NO_SECURITY=1 MOZ_MEDIUM=1 MOZILLA_CLIENT=1 NO_MDUPDATE=1 \
 	BUILD_OPT=1 NO_NETSCAPE_STATIC=1 LD_LIBRARY_PATH=${LOCALBASE}/lib
 REQUIRES_MOTIF=	yes
 
-OSNAME=	`uname -s`
-OSVER=	`uname -r | ${SED} 's/-.*//'`
-OBJDIR=	${WRKSRC}/dist/${OSNAME}${OSVER}_OPT.OBJ
+.include <bsd.port.pre.mk>
+
+OBJDIR=	${WRKSRC}/dist/${OPSYS}${OSREL}_OPT.OBJ
 
 do-install:
 	@${MKDIR} ${PREFIX}/lib/mozilla/bin
@@ -40,4 +40,4 @@ do-install:
 	@strip ${PREFIX}/lib/mozilla/bin/moz-export
 	@chown -R bin.bin ${PREFIX}/lib/mozilla
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/seamonkey2/Makefile b/www/seamonkey2/Makefile
index 5851f7c25344..bccaa7808569 100644
--- a/www/seamonkey2/Makefile
+++ b/www/seamonkey2/Makefile
@@ -3,7 +3,7 @@
 # Date created:		31 Mar 1998
 # Whom:			eivind/dima/jseger
 #
-# $Id: Makefile,v 1.26 1998/07/22 11:50:31 asami Exp $
+# $Id: Makefile,v 1.27 1998/10/15 01:16:23 jseger Exp $
 #
 
 DISTNAME=	unix-19980429
@@ -24,9 +24,9 @@ MAKE_ENV=	NO_SECURITY=1 MOZ_MEDIUM=1 MOZILLA_CLIENT=1 NO_MDUPDATE=1 \
 	BUILD_OPT=1 NO_NETSCAPE_STATIC=1 LD_LIBRARY_PATH=${LOCALBASE}/lib
 REQUIRES_MOTIF=	yes
 
-OSNAME=	`uname -s`
-OSVER=	`uname -r | ${SED} 's/-.*//'`
-OBJDIR=	${WRKSRC}/dist/${OSNAME}${OSVER}_OPT.OBJ
+.include <bsd.port.pre.mk>
+
+OBJDIR=	${WRKSRC}/dist/${OPSYS}${OSREL}_OPT.OBJ
 
 do-install:
 	@${MKDIR} ${PREFIX}/lib/mozilla/bin
@@ -40,4 +40,4 @@ do-install:
 	@strip ${PREFIX}/lib/mozilla/bin/moz-export
 	@chown -R bin.bin ${PREFIX}/lib/mozilla
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/transproxy/Makefile b/www/transproxy/Makefile
index 146859f4adbc..be1ad1953bed 100644
--- a/www/transproxy/Makefile
+++ b/www/transproxy/Makefile
@@ -15,10 +15,11 @@ MAINTAINER=	peter@FreeBSD.ORG
 
 ALL_TARGET=	tproxy
 
+.include <bsd.port.pre.mk>
+
 # This has only been tested with -current, although it might work if you
 # can get the ipfilter package to build on a 2.2.x system. YMMV.
 # ftp://cheops.anu.edu.au/pub/net/firewall/ip-filter/
-OSVERSION!=	sysctl -n kern.osreldate
 .if ${OSVERSION} < 300000
 BROKEN=		"transproxy requires ipfilter, available in 3.0 or later"
 .endif
@@ -26,4 +27,4 @@ BROKEN=		"transproxy requires ipfilter, available in 3.0 or later"
 do-install:
 	cd ${WRKSRC}; ${INSTALL_PROGRAM} ${WRKSRC}/tproxy ${PREFIX}/sbin
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/wml/Makefile b/www/wml/Makefile
index f96bc8737928..702703b2922f 100644
--- a/www/wml/Makefile
+++ b/www/wml/Makefile
@@ -3,7 +3,7 @@
 # Date created:		09-Sep-1997
 # Whom:			Ralf S. Engelschall <rse@engelschall.com>
 #
-# $Id: Makefile,v 1.25 1998/09/15 21:31:58 asami Exp $
+# $Id: Makefile,v 1.26 1998/10/15 10:43:21 jseger Exp $
 #
 
 DISTNAME=	wml-1.6.7
@@ -15,7 +15,8 @@ MASTER_SITES=	http://www.engelschall.com/sw/wml/distrib/ \
 
 MAINTAINER=	rse@engelschall.com
 
-OSVERSION!=     sysctl -n kern.osreldate
+.include <bsd.port.pre.mk>
+
 .if ${OSVERSION} >= 300000
 BROKEN=         perl
 .endif
@@ -66,4 +67,4 @@ post-install:
 .endfor
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>