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.)

7 files changed, 28 insertions, 21 deletions

diff --git a/net/mpich/Makefile b/net/mpich/Makefile
index 25f3b1d599c..3e6496d3596 100644
--- a/net/mpich/Makefile
+++ b/net/mpich/Makefile
@@ -3,7 +3,7 @@
 # Date created:		2 May 1998
 # Whom:                 dbader@eece.unm.edu
 #
-# $Id: Makefile,v 1.4 1998/10/13 23:15:30 jseger Exp $
+# $Id: Makefile,v 1.5 1998/10/13 23:18:37 jseger Exp $
 #
 
 DISTNAME=	mpich-1.1.1
@@ -12,7 +12,8 @@ MASTER_SITES=	ftp://ftp.mcs.anl.gov/pub/mpi/
 
 MAINTAINER=	dbader@eece.unm.edu
 
-OSVERSION!=     sysctl -n kern.osreldate
+.include <bsd.port.pre.mk>
+
 .if ${OSVERSION} >= 300000
 BROKEN=         MOUNT_NFS undeclared
 .endif
@@ -166,4 +167,4 @@ MAN4=		CLOG_Finalize.4 CLOG_Init.4 CLOG_Output.4 \
 		MPE_Stop_log.4 MPE_TagsEnd.4 MPE_Update.4 MPE_Wtime.4
 INSTALL_TARGET=	install PREFIX=$(PREFIX)/mpich
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net/mpich2/Makefile b/net/mpich2/Makefile
index 25f3b1d599c..3e6496d3596 100644
--- a/net/mpich2/Makefile
+++ b/net/mpich2/Makefile
@@ -3,7 +3,7 @@
 # Date created:		2 May 1998
 # Whom:                 dbader@eece.unm.edu
 #
-# $Id: Makefile,v 1.4 1998/10/13 23:15:30 jseger Exp $
+# $Id: Makefile,v 1.5 1998/10/13 23:18:37 jseger Exp $
 #
 
 DISTNAME=	mpich-1.1.1
@@ -12,7 +12,8 @@ MASTER_SITES=	ftp://ftp.mcs.anl.gov/pub/mpi/
 
 MAINTAINER=	dbader@eece.unm.edu
 
-OSVERSION!=     sysctl -n kern.osreldate
+.include <bsd.port.pre.mk>
+
 .if ${OSVERSION} >= 300000
 BROKEN=         MOUNT_NFS undeclared
 .endif
@@ -166,4 +167,4 @@ MAN4=		CLOG_Finalize.4 CLOG_Init.4 CLOG_Output.4 \
 		MPE_Stop_log.4 MPE_TagsEnd.4 MPE_Update.4 MPE_Wtime.4
 INSTALL_TARGET=	install PREFIX=$(PREFIX)/mpich
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net/p5-pRPC/Makefile b/net/p5-pRPC/Makefile
index acefb7519df..5e2d5bb83ad 100644
--- a/net/p5-pRPC/Makefile
+++ b/net/p5-pRPC/Makefile
@@ -3,7 +3,7 @@
 # Date Created:				Aug 18 1998
 # Whom:					Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.2 1998/09/15 21:31:50 asami Exp $
+# $Id: Makefile,v 1.3 1998/10/12 03:17:55 jseger Exp $
 #
 
 DISTNAME=	pRPC-modules-0.1005
@@ -18,7 +18,8 @@ BUILD_DEPENDS=	${PREFIX}/lib/perl5/site_perl/${PERL_VER}/i386-freebsd/Storable.p
 
 USE_PERL5=	yes
 
-OSVERSION!=     sysctl -n kern.osreldate
+.include <bsd.port.pre.mk>
+
 .if ${OSVERSION} >= 300000
 BROKEN=         perl
 .endif
@@ -31,4 +32,4 @@ MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 do-configure:
 		@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${PERL5} Makefile.PL
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net/queso/Makefile b/net/queso/Makefile
index 93fce753d6a..bd5d5947bd7 100644
--- a/net/queso/Makefile
+++ b/net/queso/Makefile
@@ -5,7 +5,7 @@
 # Whom:				  Wu Ching-hong <woju@freebsd.ee.ntu.edu.tw>
 # 				  and David O'Brien (obrien@NUXI.com)
 #
-# $Id: Makefile,v 1.2 1997/01/25 18:08:40 obrien Exp $
+# $Id: Makefile,v 1.1.1.1 1998/10/24 23:31:27 obrien Exp $
 #
 
 DISTNAME=	queso-980922
@@ -17,9 +17,10 @@ DISTFILES=	queso-980922.tar.gz
 
 MAINTAINER=	woju@freebsd.ee.ntu.edu.tw
 
-OSVERSION!=	sysctl -n kern.osreldate
 GNU_CONFIGURE=  yes
 
+.include <bsd.port.pre.mk>
+
 .if ${OSVERSION} < 300004
 DISTFILES+=	libpcap-0.4.tar.Z
 post-patch:
@@ -34,4 +35,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/Documentation.txt ${PREFIX}/share/doc/queso
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net/rdist6/Makefile b/net/rdist6/Makefile
index 4ed2f27206e..33ed73ecd96 100644
--- a/net/rdist6/Makefile
+++ b/net/rdist6/Makefile
@@ -3,7 +3,7 @@
 # Date created:		19 August 1995
 # Whom:			peter
 #
-# $Id: Makefile,v 1.14 1998/08/22 17:27:00 hoek Exp $
+# $Id: Makefile,v 1.15 1998/10/14 00:10:17 jseger Exp $
 #
 
 DISTNAME=	rdist-6.1.4
@@ -14,7 +14,8 @@ MASTER_SITES=	http://www.magnicomp.com/download/rdist/ \
 
 MAINTAINER=	peter@FreeBSD.org
 
-OSVERSION!=     sysctl -n kern.osreldate
+.include <bsd.port.pre.mk>
+
 .if ${OSVERSION} >= 300000
 BROKEN=         MOUNT_NFS undeclared
 .endif
@@ -32,4 +33,4 @@ post-install:
 	@strip ${PREFIX}/bin/${RDIST_NAME}
 	@strip ${PREFIX}/bin/rdistd
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net/slirp/Makefile b/net/slirp/Makefile
index 423aa760a27..3f0d6d2010f 100644
--- a/net/slirp/Makefile
+++ b/net/slirp/Makefile
@@ -3,7 +3,7 @@
 # Date created:		25 Aug 1995
 # Whom:			Alain Kalker <A.C.P.M.Kalker@student.utwente.nl>
 #
-# $Id: Makefile,v 1.8 1998/02/10 17:23:47 fenner Exp $
+# $Id: Makefile,v 1.9 1998/10/14 01:18:49 jseger Exp $
 #
 
 DISTNAME=	slirp-1.0c
@@ -12,7 +12,8 @@ MASTER_SITES=	ftp://blitzen.canberra.edu.au/pub/slirp/
 
 MAINTAINER=	A.C.P.M.Kalker@student.utwente.nl
 
-OSVERSION!=     sysctl -n kern.osreldate
+.include <bsd.port.pre.mk>
+
 .if ${OSVERSION} >= 300000
 BROKEN=         tcp_subr.c
 .endif
@@ -21,4 +22,4 @@ WRKSRC=		${WRKDIR}/slirp-1.0c/src
 HAS_CONFIGURE=	yes
 MAN1=		slirp.1
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net/smbtcpdump/Makefile b/net/smbtcpdump/Makefile
index dcab385fa17..6998a0df66b 100644
--- a/net/smbtcpdump/Makefile
+++ b/net/smbtcpdump/Makefile
@@ -4,7 +4,7 @@
 # Date created:				11th Feb 1995
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.1.1.1 1998/06/02 18:30:18 obrien Exp $
+# $Id: Makefile,v 1.2 1998/10/14 01:22:00 jseger Exp $
 #
 
 DISTNAME=	tcpdump-3.2.1
@@ -18,7 +18,8 @@ PATCHFILES=	tcpdump-3.2.1-smb-diffs.gz
 
 MAINTAINER=	obrien@FreeBSD.org
 
-OSVERSION!=     sysctl -n kern.osreldate
+.include <bsd.port.pre.mk>
+
 .if ${OSVERSION} >= 300000
 BROKEN=         T_GID undeclared
 .endif
@@ -31,4 +32,4 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tcpdump ${PREFIX}/sbin/smbtcpdump
 	${INSTALL_MAN} ${WRKSRC}/tcpdump.1 ${PREFIX}/man/man1/smbtcpdump.1
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>