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

5 files changed, 20 insertions, 15 deletions

diff --git a/devel/cccc/Makefile b/devel/cccc/Makefile
index cefcff4..2a9b6b2 100644
--- a/devel/cccc/Makefile
+++ b/devel/cccc/Makefile
@@ -3,7 +3,7 @@
 # Date created:				12 September 1997
 # Whom:					Andrey Zakhvatov
 #
-# $Id: Makefile,v 1.3 1998/08/13 03:32:52 asami Exp $
+# $Id: Makefile,v 1.4 1998/10/12 15:54:23 jseger Exp $
 #
 
 DISTNAME=		cccc-2.1.1.src
@@ -17,7 +17,8 @@ MAINTAINER=		andy@icc.surw.chel.su
 BUILD_DEPENDS=		antlr:${PORTSDIR}/devel/pccts \
 			dlg:${PORTSDIR}/devel/pccts
 
-OSVERSION!=     sysctl -n kern.osreldate
+.include <bsd.port.pre.mk>
+
 .if ${OSVERSION} >= 300000
 BROKEN=		signal.h:163: syntax error
 .endif
@@ -36,4 +37,4 @@ do-install:
 	@ ${MKDIR} ${PREFIX}/share/doc/cccc
 	@ ${INSTALL_DATA} ${WRKSRC}/readme.txt ${PREFIX}/share/doc/cccc
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/linux_kdump/Makefile b/devel/linux_kdump/Makefile
index aeb2272..daa97e2 100644
--- a/devel/linux_kdump/Makefile
+++ b/devel/linux_kdump/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Nov 26 1997
 # Whom:                 msmith@FreeBSD.org
 #
-# $Id: Makefile,v 1.1.1.1 1997/11/26 07:49:35 msmith Exp $
+# $Id: Makefile,v 1.2 1998/08/16 13:13:02 jseger Exp $
 #
 
 DISTNAME=	linux_kdump-1.0
@@ -14,7 +14,8 @@ MAINTAINER=	msmith@FreeBSD.org
 
 BUILD_DEPENDS=	/compat/linux/usr/bin/cpp:${PORTSDIR}/devel/linux_devel
 
-OSVERSION!=	sysctl -n kern.osreldate
+.include <bsd.port.pre.mk>
+
 .if ${OSVERSION} >= 300000
 BROKEN=	"During build fails makesyscalls"
 .endif
@@ -26,4 +27,4 @@ BROKEN=		"requires kernel source present in /sys"
 BROKEN=		"requires ktrace source present in /usr/src/usr.bin/ktrace"
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/p5-Data-ShowTable/Makefile b/devel/p5-Data-ShowTable/Makefile
index b9050604..defdc20 100644
--- a/devel/p5-Data-ShowTable/Makefile
+++ b/devel/p5-Data-ShowTable/Makefile
@@ -3,7 +3,7 @@
 # Date created:				September 10th 1997
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-# $Id: Makefile,v 1.5 1998/09/15 21:31:33 asami Exp $
+# $Id: Makefile,v 1.6 1998/10/12 04:19:27 jseger Exp $
 #
 
 DISTNAME=	Data-ShowTable-3.3
@@ -16,7 +16,8 @@ MAINTAINER=	jfitz@FreeBSD.ORG
 
 USE_PERL5=	YES
 
-OSVERSION!=     sysctl -n kern.osreldate
+.include <bsd.port.pre.mk>
+
 .if ${OSVERSION} >= 300000
 BROKEN=         perl
 .endif
@@ -28,4 +29,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/devel/p5-Devel-DProf/Makefile b/devel/p5-Devel-DProf/Makefile
index eb2ff18..f825f9a 100644
--- a/devel/p5-Devel-DProf/Makefile
+++ b/devel/p5-Devel-DProf/Makefile
@@ -3,7 +3,7 @@
 # Date created:				June 15th 1997
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.5 1998/09/15 21:31:35 asami Exp $
+#   $Id: Makefile,v 1.6 1998/10/12 19:32:28 jseger Exp $
 #
 
 DISTNAME=	DProf-19970614
@@ -16,7 +16,8 @@ MAINTAINER=	jfitz@FreeBSD.ORG
 
 USE_PERL5=	YES
 
-OSVERSION!=     sysctl -n kern.osreldate
+.include <bsd.port.pre.mk>
+
 .if ${OSVERSION} >= 300000
 BROKEN=         perl
 .endif
@@ -29,4 +30,4 @@ MAN3=		Devel::DProf.3
 do-configure:
 		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/ups-debug/Makefile b/devel/ups-debug/Makefile
index d2ffaaf..81d1f99 100644
--- a/devel/ups-debug/Makefile
+++ b/devel/ups-debug/Makefile
@@ -4,7 +4,7 @@
 # Date created:			  Mon Feb 03, 1997
 # Whom:				  David O'Brien (obrien@FreeBSD.org)
 #
-# $Id: Makefile,v 1.3 1998/08/17 11:22:36 jseger Exp $
+# $Id: Makefile,v 1.5 1998/09/16 20:48:34 obrien Exp $
 #
 
 DISTNAME=	ups-3.32
@@ -19,7 +19,8 @@ PATCH_SITES=	http://www.concerto.demon.co.uk/UPS/
 
 MAINTAINER=     obrien@FreeBSD.org
 
-OSVERSION!=	sysctl -n kern.osreldate
+.include <bsd.port.pre.mk>
+
 .if ${OSVERSION} >= 300000
 BROKEN=	"During build: Libvar_addrs[0] is not constant"
 .endif
@@ -28,4 +29,4 @@ USE_GMAKE=	yes
 ALL_TARGET=	ups
 MAN1=		ups.1
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>