90 files changed, 536 insertions, 473 deletions

diff --git a/converters/p5-Convert-UU/Makefile b/converters/p5-Convert-UU/Makefile
index f48a8a6d0e0e..0e4a768e503b 100644
--- a/converters/p5-Convert-UU/Makefile
+++ b/converters/p5-Convert-UU/Makefile
@@ -3,7 +3,7 @@
 # Date created:				October 20th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-# $Id: Makefile,v 1.15 1998/09/15 21:31:30 asami Exp $
+# $Id: Makefile,v 1.16 1998/10/12 02:59:12 jseger Exp $
 #
 
 DISTNAME=	Convert-UU-0.20
@@ -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 paths
 .endif
@@ -28,4 +29,4 @@ MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 do-configure:
 		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/databases/mysql322-client/Makefile b/databases/mysql322-client/Makefile
index 5ed51094cf47..58d40fc5d51e 100644
--- a/databases/mysql322-client/Makefile
+++ b/databases/mysql322-client/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.29 1998/10/08 01:20:26 asami Exp $
+# $Id: Makefile,v 1.30 1998/10/22 07:47:24 thepish Exp $
 #
 
 DISTNAME=	mysql-3.22.9-beta
@@ -30,7 +30,8 @@ CONFIGURE_ENV+=	PERL=${PERL5} \
 		PERL5=${PERL5} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
-OSVERSION!=	sysctl -n kern.osreldate
+.include <bsd.port.pre.mk>
+
 .if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
 CONFIGURE_ARGS+=	--with-named-thread-libs=-lc_r
 .else
@@ -58,7 +59,7 @@ pre-fetch:
 	@${ECHO} "Using mit-pthreads."
 	@${ECHO}
 .endif
-	
+
 pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
@@ -95,4 +96,4 @@ post-install:
 
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/mysql
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/databases/mysql322-server/Makefile b/databases/mysql322-server/Makefile
index 5ed51094cf47..58d40fc5d51e 100644
--- a/databases/mysql322-server/Makefile
+++ b/databases/mysql322-server/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.29 1998/10/08 01:20:26 asami Exp $
+# $Id: Makefile,v 1.30 1998/10/22 07:47:24 thepish Exp $
 #
 
 DISTNAME=	mysql-3.22.9-beta
@@ -30,7 +30,8 @@ CONFIGURE_ENV+=	PERL=${PERL5} \
 		PERL5=${PERL5} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
-OSVERSION!=	sysctl -n kern.osreldate
+.include <bsd.port.pre.mk>
+
 .if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
 CONFIGURE_ARGS+=	--with-named-thread-libs=-lc_r
 .else
@@ -58,7 +59,7 @@ pre-fetch:
 	@${ECHO} "Using mit-pthreads."
 	@${ECHO}
 .endif
-	
+
 pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
@@ -95,4 +96,4 @@ post-install:
 
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/mysql
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/databases/mysql323-client/Makefile b/databases/mysql323-client/Makefile
index 5ed51094cf47..58d40fc5d51e 100644
--- a/databases/mysql323-client/Makefile
+++ b/databases/mysql323-client/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.29 1998/10/08 01:20:26 asami Exp $
+# $Id: Makefile,v 1.30 1998/10/22 07:47:24 thepish Exp $
 #
 
 DISTNAME=	mysql-3.22.9-beta
@@ -30,7 +30,8 @@ CONFIGURE_ENV+=	PERL=${PERL5} \
 		PERL5=${PERL5} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
-OSVERSION!=	sysctl -n kern.osreldate
+.include <bsd.port.pre.mk>
+
 .if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
 CONFIGURE_ARGS+=	--with-named-thread-libs=-lc_r
 .else
@@ -58,7 +59,7 @@ pre-fetch:
 	@${ECHO} "Using mit-pthreads."
 	@${ECHO}
 .endif
-	
+
 pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
@@ -95,4 +96,4 @@ post-install:
 
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/mysql
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/databases/mysql323-server/Makefile b/databases/mysql323-server/Makefile
index 5ed51094cf47..58d40fc5d51e 100644
--- a/databases/mysql323-server/Makefile
+++ b/databases/mysql323-server/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.29 1998/10/08 01:20:26 asami Exp $
+# $Id: Makefile,v 1.30 1998/10/22 07:47:24 thepish Exp $
 #
 
 DISTNAME=	mysql-3.22.9-beta
@@ -30,7 +30,8 @@ CONFIGURE_ENV+=	PERL=${PERL5} \
 		PERL5=${PERL5} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
-OSVERSION!=	sysctl -n kern.osreldate
+.include <bsd.port.pre.mk>
+
 .if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
 CONFIGURE_ARGS+=	--with-named-thread-libs=-lc_r
 .else
@@ -58,7 +59,7 @@ pre-fetch:
 	@${ECHO} "Using mit-pthreads."
 	@${ECHO}
 .endif
-	
+
 pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
@@ -95,4 +96,4 @@ post-install:
 
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/mysql
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/databases/mysql40-client/Makefile b/databases/mysql40-client/Makefile
index 5ed51094cf47..58d40fc5d51e 100644
--- a/databases/mysql40-client/Makefile
+++ b/databases/mysql40-client/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.29 1998/10/08 01:20:26 asami Exp $
+# $Id: Makefile,v 1.30 1998/10/22 07:47:24 thepish Exp $
 #
 
 DISTNAME=	mysql-3.22.9-beta
@@ -30,7 +30,8 @@ CONFIGURE_ENV+=	PERL=${PERL5} \
 		PERL5=${PERL5} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
-OSVERSION!=	sysctl -n kern.osreldate
+.include <bsd.port.pre.mk>
+
 .if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
 CONFIGURE_ARGS+=	--with-named-thread-libs=-lc_r
 .else
@@ -58,7 +59,7 @@ pre-fetch:
 	@${ECHO} "Using mit-pthreads."
 	@${ECHO}
 .endif
-	
+
 pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
@@ -95,4 +96,4 @@ post-install:
 
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/mysql
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile
index 5ed51094cf47..58d40fc5d51e 100644
--- a/databases/mysql40-server/Makefile
+++ b/databases/mysql40-server/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.29 1998/10/08 01:20:26 asami Exp $
+# $Id: Makefile,v 1.30 1998/10/22 07:47:24 thepish Exp $
 #
 
 DISTNAME=	mysql-3.22.9-beta
@@ -30,7 +30,8 @@ CONFIGURE_ENV+=	PERL=${PERL5} \
 		PERL5=${PERL5} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
-OSVERSION!=	sysctl -n kern.osreldate
+.include <bsd.port.pre.mk>
+
 .if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
 CONFIGURE_ARGS+=	--with-named-thread-libs=-lc_r
 .else
@@ -58,7 +59,7 @@ pre-fetch:
 	@${ECHO} "Using mit-pthreads."
 	@${ECHO}
 .endif
-	
+
 pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
@@ -95,4 +96,4 @@ post-install:
 
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/mysql
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/databases/mysql41-client/Makefile b/databases/mysql41-client/Makefile
index 5ed51094cf47..58d40fc5d51e 100644
--- a/databases/mysql41-client/Makefile
+++ b/databases/mysql41-client/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.29 1998/10/08 01:20:26 asami Exp $
+# $Id: Makefile,v 1.30 1998/10/22 07:47:24 thepish Exp $
 #
 
 DISTNAME=	mysql-3.22.9-beta
@@ -30,7 +30,8 @@ CONFIGURE_ENV+=	PERL=${PERL5} \
 		PERL5=${PERL5} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
-OSVERSION!=	sysctl -n kern.osreldate
+.include <bsd.port.pre.mk>
+
 .if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
 CONFIGURE_ARGS+=	--with-named-thread-libs=-lc_r
 .else
@@ -58,7 +59,7 @@ pre-fetch:
 	@${ECHO} "Using mit-pthreads."
 	@${ECHO}
 .endif
-	
+
 pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
@@ -95,4 +96,4 @@ post-install:
 
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/mysql
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile
index 5ed51094cf47..58d40fc5d51e 100644
--- a/databases/mysql41-server/Makefile
+++ b/databases/mysql41-server/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.29 1998/10/08 01:20:26 asami Exp $
+# $Id: Makefile,v 1.30 1998/10/22 07:47:24 thepish Exp $
 #
 
 DISTNAME=	mysql-3.22.9-beta
@@ -30,7 +30,8 @@ CONFIGURE_ENV+=	PERL=${PERL5} \
 		PERL5=${PERL5} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
-OSVERSION!=	sysctl -n kern.osreldate
+.include <bsd.port.pre.mk>
+
 .if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
 CONFIGURE_ARGS+=	--with-named-thread-libs=-lc_r
 .else
@@ -58,7 +59,7 @@ pre-fetch:
 	@${ECHO} "Using mit-pthreads."
 	@${ECHO}
 .endif
-	
+
 pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
@@ -95,4 +96,4 @@ post-install:
 
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/mysql
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/databases/mysql50-client/Makefile b/databases/mysql50-client/Makefile
index 5ed51094cf47..58d40fc5d51e 100644
--- a/databases/mysql50-client/Makefile
+++ b/databases/mysql50-client/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.29 1998/10/08 01:20:26 asami Exp $
+# $Id: Makefile,v 1.30 1998/10/22 07:47:24 thepish Exp $
 #
 
 DISTNAME=	mysql-3.22.9-beta
@@ -30,7 +30,8 @@ CONFIGURE_ENV+=	PERL=${PERL5} \
 		PERL5=${PERL5} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
-OSVERSION!=	sysctl -n kern.osreldate
+.include <bsd.port.pre.mk>
+
 .if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
 CONFIGURE_ARGS+=	--with-named-thread-libs=-lc_r
 .else
@@ -58,7 +59,7 @@ pre-fetch:
 	@${ECHO} "Using mit-pthreads."
 	@${ECHO}
 .endif
-	
+
 pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
@@ -95,4 +96,4 @@ post-install:
 
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/mysql
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile
index 5ed51094cf47..58d40fc5d51e 100644
--- a/databases/mysql50-server/Makefile
+++ b/databases/mysql50-server/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.29 1998/10/08 01:20:26 asami Exp $
+# $Id: Makefile,v 1.30 1998/10/22 07:47:24 thepish Exp $
 #
 
 DISTNAME=	mysql-3.22.9-beta
@@ -30,7 +30,8 @@ CONFIGURE_ENV+=	PERL=${PERL5} \
 		PERL5=${PERL5} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
-OSVERSION!=	sysctl -n kern.osreldate
+.include <bsd.port.pre.mk>
+
 .if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
 CONFIGURE_ARGS+=	--with-named-thread-libs=-lc_r
 .else
@@ -58,7 +59,7 @@ pre-fetch:
 	@${ECHO} "Using mit-pthreads."
 	@${ECHO}
 .endif
-	
+
 pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
@@ -95,4 +96,4 @@ post-install:
 
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/mysql
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/databases/mysql51-client/Makefile b/databases/mysql51-client/Makefile
index 5ed51094cf47..58d40fc5d51e 100644
--- a/databases/mysql51-client/Makefile
+++ b/databases/mysql51-client/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.29 1998/10/08 01:20:26 asami Exp $
+# $Id: Makefile,v 1.30 1998/10/22 07:47:24 thepish Exp $
 #
 
 DISTNAME=	mysql-3.22.9-beta
@@ -30,7 +30,8 @@ CONFIGURE_ENV+=	PERL=${PERL5} \
 		PERL5=${PERL5} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
-OSVERSION!=	sysctl -n kern.osreldate
+.include <bsd.port.pre.mk>
+
 .if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
 CONFIGURE_ARGS+=	--with-named-thread-libs=-lc_r
 .else
@@ -58,7 +59,7 @@ pre-fetch:
 	@${ECHO} "Using mit-pthreads."
 	@${ECHO}
 .endif
-	
+
 pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
@@ -95,4 +96,4 @@ post-install:
 
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/mysql
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index 5ed51094cf47..58d40fc5d51e 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.29 1998/10/08 01:20:26 asami Exp $
+# $Id: Makefile,v 1.30 1998/10/22 07:47:24 thepish Exp $
 #
 
 DISTNAME=	mysql-3.22.9-beta
@@ -30,7 +30,8 @@ CONFIGURE_ENV+=	PERL=${PERL5} \
 		PERL5=${PERL5} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
-OSVERSION!=	sysctl -n kern.osreldate
+.include <bsd.port.pre.mk>
+
 .if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
 CONFIGURE_ARGS+=	--with-named-thread-libs=-lc_r
 .else
@@ -58,7 +59,7 @@ pre-fetch:
 	@${ECHO} "Using mit-pthreads."
 	@${ECHO}
 .endif
-	
+
 pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
@@ -95,4 +96,4 @@ post-install:
 
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/mysql
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/databases/mysql54-client/Makefile b/databases/mysql54-client/Makefile
index 5ed51094cf47..58d40fc5d51e 100644
--- a/databases/mysql54-client/Makefile
+++ b/databases/mysql54-client/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.29 1998/10/08 01:20:26 asami Exp $
+# $Id: Makefile,v 1.30 1998/10/22 07:47:24 thepish Exp $
 #
 
 DISTNAME=	mysql-3.22.9-beta
@@ -30,7 +30,8 @@ CONFIGURE_ENV+=	PERL=${PERL5} \
 		PERL5=${PERL5} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
-OSVERSION!=	sysctl -n kern.osreldate
+.include <bsd.port.pre.mk>
+
 .if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
 CONFIGURE_ARGS+=	--with-named-thread-libs=-lc_r
 .else
@@ -58,7 +59,7 @@ pre-fetch:
 	@${ECHO} "Using mit-pthreads."
 	@${ECHO}
 .endif
-	
+
 pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
@@ -95,4 +96,4 @@ post-install:
 
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/mysql
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile
index 5ed51094cf47..58d40fc5d51e 100644
--- a/databases/mysql54-server/Makefile
+++ b/databases/mysql54-server/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.29 1998/10/08 01:20:26 asami Exp $
+# $Id: Makefile,v 1.30 1998/10/22 07:47:24 thepish Exp $
 #
 
 DISTNAME=	mysql-3.22.9-beta
@@ -30,7 +30,8 @@ CONFIGURE_ENV+=	PERL=${PERL5} \
 		PERL5=${PERL5} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
-OSVERSION!=	sysctl -n kern.osreldate
+.include <bsd.port.pre.mk>
+
 .if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
 CONFIGURE_ARGS+=	--with-named-thread-libs=-lc_r
 .else
@@ -58,7 +59,7 @@ pre-fetch:
 	@${ECHO} "Using mit-pthreads."
 	@${ECHO}
 .endif
-	
+
 pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
@@ -95,4 +96,4 @@ post-install:
 
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/mysql
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/databases/mysql55-client/Makefile b/databases/mysql55-client/Makefile
index 5ed51094cf47..58d40fc5d51e 100644
--- a/databases/mysql55-client/Makefile
+++ b/databases/mysql55-client/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.29 1998/10/08 01:20:26 asami Exp $
+# $Id: Makefile,v 1.30 1998/10/22 07:47:24 thepish Exp $
 #
 
 DISTNAME=	mysql-3.22.9-beta
@@ -30,7 +30,8 @@ CONFIGURE_ENV+=	PERL=${PERL5} \
 		PERL5=${PERL5} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
-OSVERSION!=	sysctl -n kern.osreldate
+.include <bsd.port.pre.mk>
+
 .if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
 CONFIGURE_ARGS+=	--with-named-thread-libs=-lc_r
 .else
@@ -58,7 +59,7 @@ pre-fetch:
 	@${ECHO} "Using mit-pthreads."
 	@${ECHO}
 .endif
-	
+
 pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
@@ -95,4 +96,4 @@ post-install:
 
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/mysql
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index 5ed51094cf47..58d40fc5d51e 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.29 1998/10/08 01:20:26 asami Exp $
+# $Id: Makefile,v 1.30 1998/10/22 07:47:24 thepish Exp $
 #
 
 DISTNAME=	mysql-3.22.9-beta
@@ -30,7 +30,8 @@ CONFIGURE_ENV+=	PERL=${PERL5} \
 		PERL5=${PERL5} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
-OSVERSION!=	sysctl -n kern.osreldate
+.include <bsd.port.pre.mk>
+
 .if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
 CONFIGURE_ARGS+=	--with-named-thread-libs=-lc_r
 .else
@@ -58,7 +59,7 @@ pre-fetch:
 	@${ECHO} "Using mit-pthreads."
 	@${ECHO}
 .endif
-	
+
 pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
@@ -95,4 +96,4 @@ post-install:
 
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/mysql
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/databases/mysql60-client/Makefile b/databases/mysql60-client/Makefile
index 5ed51094cf47..58d40fc5d51e 100644
--- a/databases/mysql60-client/Makefile
+++ b/databases/mysql60-client/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.29 1998/10/08 01:20:26 asami Exp $
+# $Id: Makefile,v 1.30 1998/10/22 07:47:24 thepish Exp $
 #
 
 DISTNAME=	mysql-3.22.9-beta
@@ -30,7 +30,8 @@ CONFIGURE_ENV+=	PERL=${PERL5} \
 		PERL5=${PERL5} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
-OSVERSION!=	sysctl -n kern.osreldate
+.include <bsd.port.pre.mk>
+
 .if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
 CONFIGURE_ARGS+=	--with-named-thread-libs=-lc_r
 .else
@@ -58,7 +59,7 @@ pre-fetch:
 	@${ECHO} "Using mit-pthreads."
 	@${ECHO}
 .endif
-	
+
 pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
@@ -95,4 +96,4 @@ post-install:
 
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/mysql
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile
index 5ed51094cf47..58d40fc5d51e 100644
--- a/databases/mysql60-server/Makefile
+++ b/databases/mysql60-server/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.29 1998/10/08 01:20:26 asami Exp $
+# $Id: Makefile,v 1.30 1998/10/22 07:47:24 thepish Exp $
 #
 
 DISTNAME=	mysql-3.22.9-beta
@@ -30,7 +30,8 @@ CONFIGURE_ENV+=	PERL=${PERL5} \
 		PERL5=${PERL5} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
-OSVERSION!=	sysctl -n kern.osreldate
+.include <bsd.port.pre.mk>
+
 .if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
 CONFIGURE_ARGS+=	--with-named-thread-libs=-lc_r
 .else
@@ -58,7 +59,7 @@ pre-fetch:
 	@${ECHO} "Using mit-pthreads."
 	@${ECHO}
 .endif
-	
+
 pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
@@ -95,4 +96,4 @@ post-install:
 
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/mysql
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/databases/p5-DBI-137/Makefile b/databases/p5-DBI-137/Makefile
index 7a3d252682e8..d2e8cfd05fcd 100644
--- a/databases/p5-DBI-137/Makefile
+++ b/databases/p5-DBI-137/Makefile
@@ -3,7 +3,7 @@
 # Date created:				October 17th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-# $Id: Makefile,v 1.16 1998/09/16 12:48:16 vanilla Exp $
+# $Id: Makefile,v 1.17 1998/10/12 04:04:28 jseger Exp $
 #
 
 DISTNAME=	DBI-1.02
@@ -18,7 +18,8 @@ BUILD_DEPENDS=	${PREFIX}/lib/perl5/site_perl/${PERL_VER}/RPC/pServer.pm:${PORTSD
 
 USE_PERL5=	YES
 
-OSVERSION!=     sysctl -n kern.osreldate
+.include <bsd.port.pre.mk>
+
 .if ${OSVERSION} >= 300000
 BROKEN=         perl
 .endif
@@ -37,4 +38,4 @@ MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 do-configure:
 		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/databases/p5-DBI/Makefile b/databases/p5-DBI/Makefile
index 7a3d252682e8..d2e8cfd05fcd 100644
--- a/databases/p5-DBI/Makefile
+++ b/databases/p5-DBI/Makefile
@@ -3,7 +3,7 @@
 # Date created:				October 17th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-# $Id: Makefile,v 1.16 1998/09/16 12:48:16 vanilla Exp $
+# $Id: Makefile,v 1.17 1998/10/12 04:04:28 jseger Exp $
 #
 
 DISTNAME=	DBI-1.02
@@ -18,7 +18,8 @@ BUILD_DEPENDS=	${PREFIX}/lib/perl5/site_perl/${PERL_VER}/RPC/pServer.pm:${PORTSD
 
 USE_PERL5=	YES
 
-OSVERSION!=     sysctl -n kern.osreldate
+.include <bsd.port.pre.mk>
+
 .if ${OSVERSION} >= 300000
 BROKEN=         perl
 .endif
@@ -37,4 +38,4 @@ MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 do-configure:
 		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/databases/percona55-client/Makefile b/databases/percona55-client/Makefile
index 5ed51094cf47..58d40fc5d51e 100644
--- a/databases/percona55-client/Makefile
+++ b/databases/percona55-client/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.29 1998/10/08 01:20:26 asami Exp $
+# $Id: Makefile,v 1.30 1998/10/22 07:47:24 thepish Exp $
 #
 
 DISTNAME=	mysql-3.22.9-beta
@@ -30,7 +30,8 @@ CONFIGURE_ENV+=	PERL=${PERL5} \
 		PERL5=${PERL5} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
-OSVERSION!=	sysctl -n kern.osreldate
+.include <bsd.port.pre.mk>
+
 .if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
 CONFIGURE_ARGS+=	--with-named-thread-libs=-lc_r
 .else
@@ -58,7 +59,7 @@ pre-fetch:
 	@${ECHO} "Using mit-pthreads."
 	@${ECHO}
 .endif
-	
+
 pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
@@ -95,4 +96,4 @@ post-install:
 
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/mysql
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile
index 5ed51094cf47..58d40fc5d51e 100644
--- a/databases/percona55-server/Makefile
+++ b/databases/percona55-server/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.29 1998/10/08 01:20:26 asami Exp $
+# $Id: Makefile,v 1.30 1998/10/22 07:47:24 thepish Exp $
 #
 
 DISTNAME=	mysql-3.22.9-beta
@@ -30,7 +30,8 @@ CONFIGURE_ENV+=	PERL=${PERL5} \
 		PERL5=${PERL5} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
-OSVERSION!=	sysctl -n kern.osreldate
+.include <bsd.port.pre.mk>
+
 .if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
 CONFIGURE_ARGS+=	--with-named-thread-libs=-lc_r
 .else
@@ -58,7 +59,7 @@ pre-fetch:
 	@${ECHO} "Using mit-pthreads."
 	@${ECHO}
 .endif
-	
+
 pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
@@ -95,4 +96,4 @@ post-install:
 
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/mysql
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/cccc/Makefile b/devel/cccc/Makefile
index cefcff4a4fda..2a9b6b236139 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 aeb22726c28e..daa97e23454a 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 b905060419ab..defdc2096c99 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 eb2ff18aaacf..f825f9a42291 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 d2ffaaf70f33..81d1f99dc09b 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>
diff --git a/graphics/EZWGL/Makefile b/graphics/EZWGL/Makefile
index c0e794c31a07..fcdfa22d90fa 100644
--- a/graphics/EZWGL/Makefile
+++ b/graphics/EZWGL/Makefile
@@ -3,7 +3,7 @@
 # Date created:				4 May 1998
 # Whom:					Andrey Zakhvatov
 #
-# $Id: Makefile,v 1.10 1998/09/19 01:36:18 hoek Exp $
+# $Id: Makefile,v 1.11 1998/10/05 02:52:24 steve Exp $
 #
 
 DISTNAME=	EZWGL-1.39
@@ -21,6 +21,14 @@ WRKSRC=		${WRKDIR}/${PKGNAME}
 
 .include "files/manpages"
 
+.include <bsd.port.pre.mk>
+
+.if ${PORTOBJFORMAT} == "elf"
+VERSION=	1
+.else
+VERSION=	1.3
+.endif
+
 pre-install:
 	-@ ${RM} ${WRKSRC}/examples/Makefile.orig
 	-@ ${RM} ${WRKSRC}/examples/ExampleMsg
@@ -49,10 +57,4 @@ do-install:
 post-install:
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
-.include <bsd.port.mk>
-
-.if ${PORTOBJFORMAT} == "elf"
-VERSION=	1
-.else
-VERSION=	1.3
-.endif
+.include <bsd.port.post.mk>
diff --git a/graphics/Mesa3/Makefile b/graphics/Mesa3/Makefile
index 5781bf2fc0dc..67a6262036ae 100644
--- a/graphics/Mesa3/Makefile
+++ b/graphics/Mesa3/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Tue Feb  7 12:02:49  1995
 # Whom:                 hsu
 #
-# $Id: Makefile,v 1.28 1998/09/26 23:33:10 steve Exp $
+# $Id: Makefile,v 1.29 1998/10/01 02:17:42 jseger Exp $
 #
 
 DISTNAME=       MesaLib-3.0
@@ -20,6 +20,18 @@ WRKSRC=		${WRKDIR}/Mesa-3.0
 USE_X_PREFIX=	yes
 LIBS=		libMesaGL libMesaGLU
 
+.include <bsd.port.pre.mk>
+
+.if ${PORTOBJFORMAT} == "elf"
+ALL_TARGET=	freebsd-elf
+SHLIB_VERSION=	14
+GLUT_VERSION=	3
+.else
+ALL_TARGET=	freebsd
+SHLIB_VERSION=	14.0
+GLUT_VERSION=	3.7
+.endif
+
 do-install:
 .for file in ${LIBS}
 	${INSTALL_DATA} ${WRKSRC}/lib/${file}.a ${PREFIX}/lib
@@ -38,14 +50,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/include/GL/* ${PREFIX}/include/GL
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
-.include <bsd.port.mk>
-
-.if ${PORTOBJFORMAT} == "elf"
-ALL_TARGET=	freebsd-elf
-SHLIB_VERSION=	14
-GLUT_VERSION=	3
-.else
-ALL_TARGET=	freebsd
-SHLIB_VERSION=	14.0
-GLUT_VERSION=	3.7
-.endif
+.include <bsd.port.post.mk>
diff --git a/graphics/giflib/Makefile b/graphics/giflib/Makefile
index 04483b3ca512..d0d0e0eb89a6 100644
--- a/graphics/giflib/Makefile
+++ b/graphics/giflib/Makefile
@@ -3,7 +3,7 @@
 # Date created:		03 May 1997
 # Whom:			Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.2 1997/09/24 06:55:01 tg Exp $
+# $Id: Makefile,v 1.3 1998/09/19 01:22:38 steve Exp $
 #
 
 DISTNAME=	giflib-3.0
@@ -12,6 +12,14 @@ MASTER_SITES=	http://www.ccil.org/~esr/giflib/
 
 MAINTAINER=	tg@FreeBSD.ORG
 
+.include <bsd.port.pre.mk>
+
+.if ${PORTOBJFORMAT} == "elf"
+GIFLIB=	libgif.so.3
+.else
+GIFLIB=	libgif.so.3.0
+.endif
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/giflib
@@ -19,10 +27,4 @@ post-install:
 .endif
 	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
-.include <bsd.port.mk>
-
-.if ${PORTOBJFORMAT} == "elf"
-GIFLIB=	libgif.so.3
-.else
-GIFLIB=	libgif.so.3.0
-.endif
+.include <bsd.port.post.mk>
diff --git a/graphics/libungif/Makefile b/graphics/libungif/Makefile
index 04483b3ca512..d0d0e0eb89a6 100644
--- a/graphics/libungif/Makefile
+++ b/graphics/libungif/Makefile
@@ -3,7 +3,7 @@
 # Date created:		03 May 1997
 # Whom:			Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.2 1997/09/24 06:55:01 tg Exp $
+# $Id: Makefile,v 1.3 1998/09/19 01:22:38 steve Exp $
 #
 
 DISTNAME=	giflib-3.0
@@ -12,6 +12,14 @@ MASTER_SITES=	http://www.ccil.org/~esr/giflib/
 
 MAINTAINER=	tg@FreeBSD.ORG
 
+.include <bsd.port.pre.mk>
+
+.if ${PORTOBJFORMAT} == "elf"
+GIFLIB=	libgif.so.3
+.else
+GIFLIB=	libgif.so.3.0
+.endif
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/giflib
@@ -19,10 +27,4 @@ post-install:
 .endif
 	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
-.include <bsd.port.mk>
-
-.if ${PORTOBJFORMAT} == "elf"
-GIFLIB=	libgif.so.3
-.else
-GIFLIB=	libgif.so.3.0
-.endif
+.include <bsd.port.post.mk>
diff --git a/graphics/mesagl/Makefile b/graphics/mesagl/Makefile
index 5781bf2fc0dc..67a6262036ae 100644
--- a/graphics/mesagl/Makefile
+++ b/graphics/mesagl/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Tue Feb  7 12:02:49  1995
 # Whom:                 hsu
 #
-# $Id: Makefile,v 1.28 1998/09/26 23:33:10 steve Exp $
+# $Id: Makefile,v 1.29 1998/10/01 02:17:42 jseger Exp $
 #
 
 DISTNAME=       MesaLib-3.0
@@ -20,6 +20,18 @@ WRKSRC=		${WRKDIR}/Mesa-3.0
 USE_X_PREFIX=	yes
 LIBS=		libMesaGL libMesaGLU
 
+.include <bsd.port.pre.mk>
+
+.if ${PORTOBJFORMAT} == "elf"
+ALL_TARGET=	freebsd-elf
+SHLIB_VERSION=	14
+GLUT_VERSION=	3
+.else
+ALL_TARGET=	freebsd
+SHLIB_VERSION=	14.0
+GLUT_VERSION=	3.7
+.endif
+
 do-install:
 .for file in ${LIBS}
 	${INSTALL_DATA} ${WRKSRC}/lib/${file}.a ${PREFIX}/lib
@@ -38,14 +50,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/include/GL/* ${PREFIX}/include/GL
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
-.include <bsd.port.mk>
-
-.if ${PORTOBJFORMAT} == "elf"
-ALL_TARGET=	freebsd-elf
-SHLIB_VERSION=	14
-GLUT_VERSION=	3
-.else
-ALL_TARGET=	freebsd
-SHLIB_VERSION=	14.0
-GLUT_VERSION=	3.7
-.endif
+.include <bsd.port.post.mk>
diff --git a/graphics/p5-Image-Size/Makefile b/graphics/p5-Image-Size/Makefile
index 293b859b078c..a2222f50d23b 100644
--- a/graphics/p5-Image-Size/Makefile
+++ b/graphics/p5-Image-Size/Makefile
@@ -3,7 +3,7 @@
 # Date created:				October 20th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-# $Id: Makefile,v 1.14 1998/09/15 21:31:45 asami Exp $
+# $Id: Makefile,v 1.15 1998/10/12 02:59:12 jseger Exp $
 #
 
 DISTNAME=	Image-Size-2.7
@@ -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 paths
 .endif
@@ -28,4 +29,4 @@ MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 do-configure:
 		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/graphics/p5-PGPLOT/Makefile b/graphics/p5-PGPLOT/Makefile
index 6a0281fbc702..a506c3ffd489 100644
--- a/graphics/p5-PGPLOT/Makefile
+++ b/graphics/p5-PGPLOT/Makefile
@@ -3,7 +3,7 @@
 # Date created:		22 December 1996
 # Whom:			jmz
 #
-# $Id: Makefile,v 1.10 1998/10/05 03:17:10 steve Exp $
+# $Id: Makefile,v 1.11 1998/10/12 03:21:40 jseger Exp $
 #
 
 DISTNAME=       PGPLOT-2.08
@@ -18,7 +18,8 @@ LIB_DEPENDS=    pgplot.5:${PORTSDIR}/graphics/pgplot
 USE_PERL5=	yes
 ALL_TARGET=	dynamic
 
-OSVERSION!=     sysctl -n kern.osreldate
+.include <bsd.port.pre.mk>
+
 .if ${OSVERSION} >= 300000
 BROKEN=         depends on pgplot
 .endif
@@ -34,4 +35,4 @@ post-install:
 	@(cd ${WRKSRC}; ${INSTALL_DATA} LICENSE test* \
 		${PREFIX}/share/doc/pgperl)
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/graphics/pgperl/Makefile b/graphics/pgperl/Makefile
index 6a0281fbc702..a506c3ffd489 100644
--- a/graphics/pgperl/Makefile
+++ b/graphics/pgperl/Makefile
@@ -3,7 +3,7 @@
 # Date created:		22 December 1996
 # Whom:			jmz
 #
-# $Id: Makefile,v 1.10 1998/10/05 03:17:10 steve Exp $
+# $Id: Makefile,v 1.11 1998/10/12 03:21:40 jseger Exp $
 #
 
 DISTNAME=       PGPLOT-2.08
@@ -18,7 +18,8 @@ LIB_DEPENDS=    pgplot.5:${PORTSDIR}/graphics/pgplot
 USE_PERL5=	yes
 ALL_TARGET=	dynamic
 
-OSVERSION!=     sysctl -n kern.osreldate
+.include <bsd.port.pre.mk>
+
 .if ${OSVERSION} >= 300000
 BROKEN=         depends on pgplot
 .endif
@@ -34,4 +35,4 @@ post-install:
 	@(cd ${WRKSRC}; ${INSTALL_DATA} LICENSE test* \
 		${PREFIX}/share/doc/pgperl)
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/graphics/pgplot/Makefile b/graphics/pgplot/Makefile
index ef83f76f6c0e..2377bd57df05 100644
--- a/graphics/pgplot/Makefile
+++ b/graphics/pgplot/Makefile
@@ -3,7 +3,7 @@
 # Date created:		21 December 1996
 # Whom:			jmz
 #
-# $Id: Makefile,v 1.5 1998/10/05 03:01:29 steve Exp $
+# $Id: Makefile,v 1.6 1998/10/12 03:19:03 jseger Exp $
 #
 
 DISTNAME=       pgplot5.2
@@ -15,21 +15,22 @@ MAINTAINER=	jmz@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/pgplot
 
-OSVERSION!=     sysctl -n kern.osreldate
+.include <bsd.port.pre.mk>
+
 .if ${OSVERSION} >= 300000
 BROKEN=         makehtml not found
 .endif
 
+.if ${PORTOBJFORMAT} == "elf"
+VERSION=	5
+.else
+VERSION=	5.2
+.endif
+
 post-install:
 .for f in libcpgplot.so libpgplot.so
 	${LN} -sf $f.${VERSION} ${PREFIX}/lib/$f
 .endfor
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
-.include <bsd.port.mk>
-
-.if ${PORTOBJFORMAT} == "elf"
-VERSION=	5
-.else
-VERSION=	5.2
-.endif
+.include <bsd.port.post.mk>
diff --git a/graphics/xanim/Makefile b/graphics/xanim/Makefile
index b1c1ba7eafc7..fa6bb830c873 100644
--- a/graphics/xanim/Makefile
+++ b/graphics/xanim/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Sat Nov 5 11:43:03 PST 1994
 # Whom:                 piero
 #
-# $Id: Makefile,v 1.14 1998/09/14 20:37:01 markm Exp $
+# $Id: Makefile,v 1.15 1998/09/27 09:18:30 markm Exp $
 #
 
 DISTNAME=       xanim27070
@@ -18,22 +18,13 @@ MAINTAINER=	ports@FreeBSD.ORG
 EXTRACT_ONLY=   ${DISTNAME}.tar.gz
 USE_IMAKE=	yes
 MAN1=		xanim.1
-MANCOMPRESSED=	yes
-
-post-extract:
-	@for file in ${EXTRA_FILES}; do \
-	  ${CP} ${DISTDIR}/$$file ${WRKSRC}; \
-	  uncompress ${WRKSRC}/$$file; \
-	done
-	${CP} ${WRKSRC}/docs/xanim.man ${WRKSRC}
-
-MAKE_ENV+=	XA_IV32_DEF=-DXA_INDEO \
+MAKE_ENV=	XA_IV32_DEF=-DXA_INDEO \
 		XA_CVID_DEF=-DXA_CINEPAK \
 		XA_CYUV_DEF=-DXA_CYUV
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
 
-.if ${PORTOBJFORMAT} != elf
+.if ${PORTOBJFORMAT} == "aout"
 EXTRA_FILES=    xa2.0_cvid_netbsd386.o.Z xa2.0_iv32_netbsd386.o.Z \
 		xa1.0_cyuv_netbsd386.o.Z
 MAKE_ENV+=	XA_IV32_LIB=xa2.0_cvid_netbsd386.o \
@@ -46,3 +37,12 @@ MAKE_ENV+=	XA_IV32_LIB=xa2.0_cvid_linuxELF.o \
 		XA_CVID_LIB=xa2.0_iv32_linuxELF.o \
 		XA_CYUV_LIB=xa1.0_cyuv_linuxELF.o
 .endif
+
+post-extract:
+	@for file in ${EXTRA_FILES}; do \
+	  ${CP} ${DISTDIR}/$$file ${WRKSRC}; \
+	  uncompress ${WRKSRC}/$$file; \
+	done
+	${CP} ${WRKSRC}/docs/xanim.man ${WRKSRC}
+
+.include <bsd.port.post.mk>
diff --git a/graphics/xpm/Makefile b/graphics/xpm/Makefile
index 0cb844d106fe..e19bd1811734 100644
--- a/graphics/xpm/Makefile
+++ b/graphics/xpm/Makefile
@@ -3,7 +3,7 @@
 # Date created:		14 September 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.19 1998/10/04 20:45:48 jkh Exp $
+# $Id: Makefile,v 1.20 1998/10/05 04:03:38 jkh Exp $
 #
 
 DISTNAME=       xpm-3.4k
@@ -16,10 +16,12 @@ USE_IMAKE=	yes
 
 MAN1=		cxpm.1 sxpm.1
 
+.include <bsd.port.pre.mk>
+
 post-install:
-	if [ "${PORTOBJFORMAT}" = "aout" ]; then \
-		${LN} -sf libXpm.so.4.11 ${PREFIX}/lib/libXpm.so; \
-	fi
+.if ${PORTOBJFORMAT} == "aout"
+	${LN} -sf libXpm.so.4.11 ${PREFIX}/lib/libXpm.so
+.endif
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/lang/bc-gcc/Makefile b/lang/bc-gcc/Makefile
index 87c65b48158e..0f93507ba365 100644
--- a/lang/bc-gcc/Makefile
+++ b/lang/bc-gcc/Makefile
@@ -4,7 +4,7 @@
 # Date created:		Sun June 08, 1997
 # Whom:			David O'Brien (obrien@FreeBSD.org)
 #
-# $Id: Makefile,v 1.3 1997/06/08 12:58:59 andreas Exp $
+# $Id: Makefile,v 1.1.1.1 1998/08/26 09:41:56 obrien Exp $
 #
 
 DISTNAME=	gcc-2.7.2
@@ -24,7 +24,8 @@ PATCH_DIST_STRIP=	-p1 -N -E
 
 MAINTAINER=	obrien@FreeBSD.org
 
-OSVERSION!=	sysctl -n kern.osreldate
+.include <bsd.port.pre.mk>
+
 .if ${OSVERSION} >= 300000
 BROKEN=		"can't find /usr/lib/aout/crt0.o"
 .endif
@@ -58,4 +59,4 @@ post-install:
 		do strip $$prog ; \
 		done )
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/lang/gcc28/Makefile b/lang/gcc28/Makefile
index 13d635bb6784..b75eae1d973c 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.16 1998/10/08 01:19:19 asami Exp $
+# $Id: Makefile,v 1.17 1998/11/10 07:33:33 obrien Exp $
 #
 
 DISTNAME=	gcc-2.8.1
@@ -13,8 +13,9 @@ MASTER_SITES=	${MASTER_SITE_GNU}
 
 MAINTAINER=	obrien@FreeBSD.org
 
-ARE_WE_ELF!=	test -x /usr/bin/objformat && /usr/bin/objformat || echo aout
-.if ${ARE_WE_ELF} == "elf"
+.include <bsd.port.pre.mk>
+
+.if ${PORTOBJFORMAT} == "elf"
 GNUHOST=	i386-unknown-freebsdelf${OSREL}
 .else
 GNUHOST=	i386-unknown-freebsd${OSREL}
@@ -22,7 +23,7 @@ GNUHOST=	i386-unknown-freebsd${OSREL}
 
 PLIST_SUB=	GNUHOST=${GNUHOST}
 CONFIGURE_ARGS=	--with-gxx-include-dir=${PREFIX}/lib/gcc-lib/${GNUHOST}/2.8.1/include/g++ 
-.if ${ARE_WE_ELF} == "elf"
+.if ${PORTOBJFORMAT} == "elf"
 CONFIGURE_ARGS+=	--host=${GNUHOST}
 .endif
 GNU_CONFIGURE=	yes
@@ -31,7 +32,7 @@ ALL_TARGET=	bootstrap
 MAN1=		cccp28.1 g++28.1 gcc28.1
 
 pre-fetch:
-	@${ECHO} "GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${ARE_WE_ELF}"
+	@${ECHO} "GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}"
 
 pre-configure:
 	@(cd ${WRKSRC}/config/i386/ ; \
@@ -60,4 +61,4 @@ post-install:
 	@${MV} ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/g++28.1
 	@${MV} ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/gcc28.1
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/lang/glibstdc++28/Makefile b/lang/glibstdc++28/Makefile
index 684ab0f0ee09..44f36d31a778 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.11 1998/10/12 15:04:35 jseger Exp $
+# $Id: Makefile,v 1.12 1998/11/10 16:33:07 obrien Exp $
 #
 
 DISTNAME=	libstdc++-2.8.1.1
@@ -19,10 +19,11 @@ BUILD_DEPENDS=	gcc28:${PORTSDIR}/lang/gcc28 \
 RUN_DEPENDS=	gcc28:${PORTSDIR}/lang/gcc28 \
 		g++28:${PORTSDIR}/lang/gcc28
 
+.include <bsd.port.pre.mk>
+
 CC=		gcc28
 CXX=		g++28
-ARE_WE_ELF!=	text -x /usr/bin/objformat && /usr/bin/objformat || echo aout
-.if ${ARE_WE_ELF} == "elf"
+.if ${PORTOBJFORMAT} == "elf"
 GNUHOST=        i386-unknown-freebsdelf${OSREL}
 .else
 GNUHOST=        i386-unknown-freebsd${OSREL}
@@ -49,4 +50,4 @@ post-install:
 	${INSTALL_DATA} ${FILESDIR}/osfcn.h  \
 		${PREFIX}/${GCC28DIR}/include/g++
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/lang/perl5.10/Makefile b/lang/perl5.10/Makefile
index ff11ae222c62..8ecf159155dc 100644
--- a/lang/perl5.10/Makefile
+++ b/lang/perl5.10/Makefile
@@ -3,7 +3,7 @@
 # Date created:		16 April 1995
 # Whom:			markm
 #
-# $Id: Makefile,v 1.25 1998/08/15 16:33:13 markm Exp $
+# $Id: Makefile,v 1.26 1998/10/12 06:51:07 markm Exp $
 #
 
 DISTNAME=	perl5.005_02
@@ -18,8 +18,9 @@ HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	Configure
 CONFIGURE_ARGS=		-sde -Dprefix=${PREFIX}
 
-OSVER!= sysctl -n kern.osreldate
-.if ${OSVER} > 300003
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} > 300003
 BROKEN= perl is in system
 .endif
 
@@ -87,4 +88,4 @@ post-install:
 	@ln -sf ${PREFIX}/bin/perl ${PREFIX}/bin/perl5
 	@(cd /usr/include && ${PREFIX}/bin/h2ph *.h machine/*.h sys/*.h)
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/lang/perl5.12/Makefile b/lang/perl5.12/Makefile
index ff11ae222c62..8ecf159155dc 100644
--- a/lang/perl5.12/Makefile
+++ b/lang/perl5.12/Makefile
@@ -3,7 +3,7 @@
 # Date created:		16 April 1995
 # Whom:			markm
 #
-# $Id: Makefile,v 1.25 1998/08/15 16:33:13 markm Exp $
+# $Id: Makefile,v 1.26 1998/10/12 06:51:07 markm Exp $
 #
 
 DISTNAME=	perl5.005_02
@@ -18,8 +18,9 @@ HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	Configure
 CONFIGURE_ARGS=		-sde -Dprefix=${PREFIX}
 
-OSVER!= sysctl -n kern.osreldate
-.if ${OSVER} > 300003
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} > 300003
 BROKEN= perl is in system
 .endif
 
@@ -87,4 +88,4 @@ post-install:
 	@ln -sf ${PREFIX}/bin/perl ${PREFIX}/bin/perl5
 	@(cd /usr/include && ${PREFIX}/bin/h2ph *.h machine/*.h sys/*.h)
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/lang/perl5.14/Makefile b/lang/perl5.14/Makefile
index ff11ae222c62..8ecf159155dc 100644
--- a/lang/perl5.14/Makefile
+++ b/lang/perl5.14/Makefile
@@ -3,7 +3,7 @@
 # Date created:		16 April 1995
 # Whom:			markm
 #
-# $Id: Makefile,v 1.25 1998/08/15 16:33:13 markm Exp $
+# $Id: Makefile,v 1.26 1998/10/12 06:51:07 markm Exp $
 #
 
 DISTNAME=	perl5.005_02
@@ -18,8 +18,9 @@ HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	Configure
 CONFIGURE_ARGS=		-sde -Dprefix=${PREFIX}
 
-OSVER!= sysctl -n kern.osreldate
-.if ${OSVER} > 300003
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} > 300003
 BROKEN= perl is in system
 .endif
 
@@ -87,4 +88,4 @@ post-install:
 	@ln -sf ${PREFIX}/bin/perl ${PREFIX}/bin/perl5
 	@(cd /usr/include && ${PREFIX}/bin/h2ph *.h machine/*.h sys/*.h)
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/lang/perl5.16/Makefile b/lang/perl5.16/Makefile
index ff11ae222c62..8ecf159155dc 100644
--- a/lang/perl5.16/Makefile
+++ b/lang/perl5.16/Makefile
@@ -3,7 +3,7 @@
 # Date created:		16 April 1995
 # Whom:			markm
 #
-# $Id: Makefile,v 1.25 1998/08/15 16:33:13 markm Exp $
+# $Id: Makefile,v 1.26 1998/10/12 06:51:07 markm Exp $
 #
 
 DISTNAME=	perl5.005_02
@@ -18,8 +18,9 @@ HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	Configure
 CONFIGURE_ARGS=		-sde -Dprefix=${PREFIX}
 
-OSVER!= sysctl -n kern.osreldate
-.if ${OSVER} > 300003
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} > 300003
 BROKEN= perl is in system
 .endif
 
@@ -87,4 +88,4 @@ post-install:
 	@ln -sf ${PREFIX}/bin/perl ${PREFIX}/bin/perl5
 	@(cd /usr/include && ${PREFIX}/bin/h2ph *.h machine/*.h sys/*.h)
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/lang/perl5.6/Makefile b/lang/perl5.6/Makefile
index ff11ae222c62..8ecf159155dc 100644
--- a/lang/perl5.6/Makefile
+++ b/lang/perl5.6/Makefile
@@ -3,7 +3,7 @@
 # Date created:		16 April 1995
 # Whom:			markm
 #
-# $Id: Makefile,v 1.25 1998/08/15 16:33:13 markm Exp $
+# $Id: Makefile,v 1.26 1998/10/12 06:51:07 markm Exp $
 #
 
 DISTNAME=	perl5.005_02
@@ -18,8 +18,9 @@ HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	Configure
 CONFIGURE_ARGS=		-sde -Dprefix=${PREFIX}
 
-OSVER!= sysctl -n kern.osreldate
-.if ${OSVER} > 300003
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} > 300003
 BROKEN= perl is in system
 .endif
 
@@ -87,4 +88,4 @@ post-install:
 	@ln -sf ${PREFIX}/bin/perl ${PREFIX}/bin/perl5
 	@(cd /usr/include && ${PREFIX}/bin/h2ph *.h machine/*.h sys/*.h)
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/lang/perl5.8/Makefile b/lang/perl5.8/Makefile
index ff11ae222c62..8ecf159155dc 100644
--- a/lang/perl5.8/Makefile
+++ b/lang/perl5.8/Makefile
@@ -3,7 +3,7 @@
 # Date created:		16 April 1995
 # Whom:			markm
 #
-# $Id: Makefile,v 1.25 1998/08/15 16:33:13 markm Exp $
+# $Id: Makefile,v 1.26 1998/10/12 06:51:07 markm Exp $
 #
 
 DISTNAME=	perl5.005_02
@@ -18,8 +18,9 @@ HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	Configure
 CONFIGURE_ARGS=		-sde -Dprefix=${PREFIX}
 
-OSVER!= sysctl -n kern.osreldate
-.if ${OSVER} > 300003
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} > 300003
 BROKEN= perl is in system
 .endif
 
@@ -87,4 +88,4 @@ post-install:
 	@ln -sf ${PREFIX}/bin/perl ${PREFIX}/bin/perl5
 	@(cd /usr/include && ${PREFIX}/bin/h2ph *.h machine/*.h sys/*.h)
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile
index ff11ae222c62..8ecf159155dc 100644
--- a/lang/perl5/Makefile
+++ b/lang/perl5/Makefile
@@ -3,7 +3,7 @@
 # Date created:		16 April 1995
 # Whom:			markm
 #
-# $Id: Makefile,v 1.25 1998/08/15 16:33:13 markm Exp $
+# $Id: Makefile,v 1.26 1998/10/12 06:51:07 markm Exp $
 #
 
 DISTNAME=	perl5.005_02
@@ -18,8 +18,9 @@ HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	Configure
 CONFIGURE_ARGS=		-sde -Dprefix=${PREFIX}
 
-OSVER!= sysctl -n kern.osreldate
-.if ${OSVER} > 300003
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} > 300003
 BROKEN= perl is in system
 .endif
 
@@ -87,4 +88,4 @@ post-install:
 	@ln -sf ${PREFIX}/bin/perl ${PREFIX}/bin/perl5
 	@(cd /usr/include && ${PREFIX}/bin/h2ph *.h machine/*.h sys/*.h)
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/lang/python+ipv6/Makefile b/lang/python+ipv6/Makefile
index 491a1aa8f7a5..80e254d58a69 100644
--- a/lang/python+ipv6/Makefile
+++ b/lang/python+ipv6/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.39 1998/09/25 10:05:08 asami Exp $
+# $Id: Makefile,v 1.40 1998/10/06 06:49:12 tg Exp $
 #
 
 DISTNAME=       pyth151
@@ -82,7 +82,12 @@ post-configure:
 	${CAT} ${FILESDIR}/${file} >> ${WRKSRC}/Modules/Setup.local
 .endfor
 
-OSVERSION!=	sysctl -n kern.osreldate
+.include <bsd.port.pre.mk>
+
+.if ${PORTOBJFORMAT} == elf
+LDFLAGS+=	-rdynamic
+CONFIGURE_ENV?=	LDFLAGS="${LDFLAGS}"
+.endif
 
 pre-install:
 .if ${OSVERSION} < 300000
@@ -97,10 +102,4 @@ post-install:
 	${INSTALL_SCRIPT} ${PREFIX}/lib/python1.5/plat-freebsd2/regen ${PREFIX}/lib/python1.5/plat-freebsd3
 	strip ${PREFIX}/bin/python
 
-.include <bsd.port.mk>
-
-# need <bsd.port.mk> to get ${PORTOBJFORMAT}
-.if ${PORTOBJFORMAT} == elf
-LDFLAGS+=	-rdynamic
-CONFIGURE_ENV?=	LDFLAGS="${LDFLAGS}"
-.endif
+.include <bsd.port.post.mk>
diff --git a/lang/python-devel/Makefile b/lang/python-devel/Makefile
index 491a1aa8f7a5..80e254d58a69 100644
--- a/lang/python-devel/Makefile
+++ b/lang/python-devel/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.39 1998/09/25 10:05:08 asami Exp $
+# $Id: Makefile,v 1.40 1998/10/06 06:49:12 tg Exp $
 #
 
 DISTNAME=       pyth151
@@ -82,7 +82,12 @@ post-configure:
 	${CAT} ${FILESDIR}/${file} >> ${WRKSRC}/Modules/Setup.local
 .endfor
 
-OSVERSION!=	sysctl -n kern.osreldate
+.include <bsd.port.pre.mk>
+
+.if ${PORTOBJFORMAT} == elf
+LDFLAGS+=	-rdynamic
+CONFIGURE_ENV?=	LDFLAGS="${LDFLAGS}"
+.endif
 
 pre-install:
 .if ${OSVERSION} < 300000
@@ -97,10 +102,4 @@ post-install:
 	${INSTALL_SCRIPT} ${PREFIX}/lib/python1.5/plat-freebsd2/regen ${PREFIX}/lib/python1.5/plat-freebsd3
 	strip ${PREFIX}/bin/python
 
-.include <bsd.port.mk>
-
-# need <bsd.port.mk> to get ${PORTOBJFORMAT}
-.if ${PORTOBJFORMAT} == elf
-LDFLAGS+=	-rdynamic
-CONFIGURE_ENV?=	LDFLAGS="${LDFLAGS}"
-.endif
+.include <bsd.port.post.mk>
diff --git a/lang/python/Makefile b/lang/python/Makefile
index 491a1aa8f7a5..80e254d58a69 100644
--- a/lang/python/Makefile
+++ b/lang/python/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.39 1998/09/25 10:05:08 asami Exp $
+# $Id: Makefile,v 1.40 1998/10/06 06:49:12 tg Exp $
 #
 
 DISTNAME=       pyth151
@@ -82,7 +82,12 @@ post-configure:
 	${CAT} ${FILESDIR}/${file} >> ${WRKSRC}/Modules/Setup.local
 .endfor
 
-OSVERSION!=	sysctl -n kern.osreldate
+.include <bsd.port.pre.mk>
+
+.if ${PORTOBJFORMAT} == elf
+LDFLAGS+=	-rdynamic
+CONFIGURE_ENV?=	LDFLAGS="${LDFLAGS}"
+.endif
 
 pre-install:
 .if ${OSVERSION} < 300000
@@ -97,10 +102,4 @@ post-install:
 	${INSTALL_SCRIPT} ${PREFIX}/lib/python1.5/plat-freebsd2/regen ${PREFIX}/lib/python1.5/plat-freebsd3
 	strip ${PREFIX}/bin/python
 
-.include <bsd.port.mk>
-
-# need <bsd.port.mk> to get ${PORTOBJFORMAT}
-.if ${PORTOBJFORMAT} == elf
-LDFLAGS+=	-rdynamic
-CONFIGURE_ENV?=	LDFLAGS="${LDFLAGS}"
-.endif
+.include <bsd.port.post.mk>
diff --git a/lang/python15/Makefile b/lang/python15/Makefile
index 491a1aa8f7a5..80e254d58a69 100644
--- a/lang/python15/Makefile
+++ b/lang/python15/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.39 1998/09/25 10:05:08 asami Exp $
+# $Id: Makefile,v 1.40 1998/10/06 06:49:12 tg Exp $
 #
 
 DISTNAME=       pyth151
@@ -82,7 +82,12 @@ post-configure:
 	${CAT} ${FILESDIR}/${file} >> ${WRKSRC}/Modules/Setup.local
 .endfor
 
-OSVERSION!=	sysctl -n kern.osreldate
+.include <bsd.port.pre.mk>
+
+.if ${PORTOBJFORMAT} == elf
+LDFLAGS+=	-rdynamic
+CONFIGURE_ENV?=	LDFLAGS="${LDFLAGS}"
+.endif
 
 pre-install:
 .if ${OSVERSION} < 300000
@@ -97,10 +102,4 @@ post-install:
 	${INSTALL_SCRIPT} ${PREFIX}/lib/python1.5/plat-freebsd2/regen ${PREFIX}/lib/python1.5/plat-freebsd3
 	strip ${PREFIX}/bin/python
 
-.include <bsd.port.mk>
-
-# need <bsd.port.mk> to get ${PORTOBJFORMAT}
-.if ${PORTOBJFORMAT} == elf
-LDFLAGS+=	-rdynamic
-CONFIGURE_ENV?=	LDFLAGS="${LDFLAGS}"
-.endif
+.include <bsd.port.post.mk>
diff --git a/lang/python20/Makefile b/lang/python20/Makefile
index 491a1aa8f7a5..80e254d58a69 100644
--- a/lang/python20/Makefile
+++ b/lang/python20/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.39 1998/09/25 10:05:08 asami Exp $
+# $Id: Makefile,v 1.40 1998/10/06 06:49:12 tg Exp $
 #
 
 DISTNAME=       pyth151
@@ -82,7 +82,12 @@ post-configure:
 	${CAT} ${FILESDIR}/${file} >> ${WRKSRC}/Modules/Setup.local
 .endfor
 
-OSVERSION!=	sysctl -n kern.osreldate
+.include <bsd.port.pre.mk>
+
+.if ${PORTOBJFORMAT} == elf
+LDFLAGS+=	-rdynamic
+CONFIGURE_ENV?=	LDFLAGS="${LDFLAGS}"
+.endif
 
 pre-install:
 .if ${OSVERSION} < 300000
@@ -97,10 +102,4 @@ post-install:
 	${INSTALL_SCRIPT} ${PREFIX}/lib/python1.5/plat-freebsd2/regen ${PREFIX}/lib/python1.5/plat-freebsd3
 	strip ${PREFIX}/bin/python
 
-.include <bsd.port.mk>
-
-# need <bsd.port.mk> to get ${PORTOBJFORMAT}
-.if ${PORTOBJFORMAT} == elf
-LDFLAGS+=	-rdynamic
-CONFIGURE_ENV?=	LDFLAGS="${LDFLAGS}"
-.endif
+.include <bsd.port.post.mk>
diff --git a/lang/python21/Makefile b/lang/python21/Makefile
index 491a1aa8f7a5..80e254d58a69 100644
--- a/lang/python21/Makefile
+++ b/lang/python21/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.39 1998/09/25 10:05:08 asami Exp $
+# $Id: Makefile,v 1.40 1998/10/06 06:49:12 tg Exp $
 #
 
 DISTNAME=       pyth151
@@ -82,7 +82,12 @@ post-configure:
 	${CAT} ${FILESDIR}/${file} >> ${WRKSRC}/Modules/Setup.local
 .endfor
 
-OSVERSION!=	sysctl -n kern.osreldate
+.include <bsd.port.pre.mk>
+
+.if ${PORTOBJFORMAT} == elf
+LDFLAGS+=	-rdynamic
+CONFIGURE_ENV?=	LDFLAGS="${LDFLAGS}"
+.endif
 
 pre-install:
 .if ${OSVERSION} < 300000
@@ -97,10 +102,4 @@ post-install:
 	${INSTALL_SCRIPT} ${PREFIX}/lib/python1.5/plat-freebsd2/regen ${PREFIX}/lib/python1.5/plat-freebsd3
 	strip ${PREFIX}/bin/python
 
-.include <bsd.port.mk>
-
-# need <bsd.port.mk> to get ${PORTOBJFORMAT}
-.if ${PORTOBJFORMAT} == elf
-LDFLAGS+=	-rdynamic
-CONFIGURE_ENV?=	LDFLAGS="${LDFLAGS}"
-.endif
+.include <bsd.port.post.mk>
diff --git a/lang/python22/Makefile b/lang/python22/Makefile
index 491a1aa8f7a5..80e254d58a69 100644
--- a/lang/python22/Makefile
+++ b/lang/python22/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.39 1998/09/25 10:05:08 asami Exp $
+# $Id: Makefile,v 1.40 1998/10/06 06:49:12 tg Exp $
 #
 
 DISTNAME=       pyth151
@@ -82,7 +82,12 @@ post-configure:
 	${CAT} ${FILESDIR}/${file} >> ${WRKSRC}/Modules/Setup.local
 .endfor
 
-OSVERSION!=	sysctl -n kern.osreldate
+.include <bsd.port.pre.mk>
+
+.if ${PORTOBJFORMAT} == elf
+LDFLAGS+=	-rdynamic
+CONFIGURE_ENV?=	LDFLAGS="${LDFLAGS}"
+.endif
 
 pre-install:
 .if ${OSVERSION} < 300000
@@ -97,10 +102,4 @@ post-install:
 	${INSTALL_SCRIPT} ${PREFIX}/lib/python1.5/plat-freebsd2/regen ${PREFIX}/lib/python1.5/plat-freebsd3
 	strip ${PREFIX}/bin/python
 
-.include <bsd.port.mk>
-
-# need <bsd.port.mk> to get ${PORTOBJFORMAT}
-.if ${PORTOBJFORMAT} == elf
-LDFLAGS+=	-rdynamic
-CONFIGURE_ENV?=	LDFLAGS="${LDFLAGS}"
-.endif
+.include <bsd.port.post.mk>
diff --git a/lang/python23/Makefile b/lang/python23/Makefile
index 491a1aa8f7a5..80e254d58a69 100644
--- a/lang/python23/Makefile
+++ b/lang/python23/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.39 1998/09/25 10:05:08 asami Exp $
+# $Id: Makefile,v 1.40 1998/10/06 06:49:12 tg Exp $
 #
 
 DISTNAME=       pyth151
@@ -82,7 +82,12 @@ post-configure:
 	${CAT} ${FILESDIR}/${file} >> ${WRKSRC}/Modules/Setup.local
 .endfor
 
-OSVERSION!=	sysctl -n kern.osreldate
+.include <bsd.port.pre.mk>
+
+.if ${PORTOBJFORMAT} == elf
+LDFLAGS+=	-rdynamic
+CONFIGURE_ENV?=	LDFLAGS="${LDFLAGS}"
+.endif
 
 pre-install:
 .if ${OSVERSION} < 300000
@@ -97,10 +102,4 @@ post-install:
 	${INSTALL_SCRIPT} ${PREFIX}/lib/python1.5/plat-freebsd2/regen ${PREFIX}/lib/python1.5/plat-freebsd3
 	strip ${PREFIX}/bin/python
 
-.include <bsd.port.mk>
-
-# need <bsd.port.mk> to get ${PORTOBJFORMAT}
-.if ${PORTOBJFORMAT} == elf
-LDFLAGS+=	-rdynamic
-CONFIGURE_ENV?=	LDFLAGS="${LDFLAGS}"
-.endif
+.include <bsd.port.post.mk>
diff --git a/lang/python24/Makefile b/lang/python24/Makefile
index 491a1aa8f7a5..80e254d58a69 100644
--- a/lang/python24/Makefile
+++ b/lang/python24/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.39 1998/09/25 10:05:08 asami Exp $
+# $Id: Makefile,v 1.40 1998/10/06 06:49:12 tg Exp $
 #
 
 DISTNAME=       pyth151
@@ -82,7 +82,12 @@ post-configure:
 	${CAT} ${FILESDIR}/${file} >> ${WRKSRC}/Modules/Setup.local
 .endfor
 
-OSVERSION!=	sysctl -n kern.osreldate
+.include <bsd.port.pre.mk>
+
+.if ${PORTOBJFORMAT} == elf
+LDFLAGS+=	-rdynamic
+CONFIGURE_ENV?=	LDFLAGS="${LDFLAGS}"
+.endif
 
 pre-install:
 .if ${OSVERSION} < 300000
@@ -97,10 +102,4 @@ post-install:
 	${INSTALL_SCRIPT} ${PREFIX}/lib/python1.5/plat-freebsd2/regen ${PREFIX}/lib/python1.5/plat-freebsd3
 	strip ${PREFIX}/bin/python
 
-.include <bsd.port.mk>
-
-# need <bsd.port.mk> to get ${PORTOBJFORMAT}
-.if ${PORTOBJFORMAT} == elf
-LDFLAGS+=	-rdynamic
-CONFIGURE_ENV?=	LDFLAGS="${LDFLAGS}"
-.endif
+.include <bsd.port.post.mk>
diff --git a/lang/python25/Makefile b/lang/python25/Makefile
index 491a1aa8f7a5..80e254d58a69 100644
--- a/lang/python25/Makefile
+++ b/lang/python25/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.39 1998/09/25 10:05:08 asami Exp $
+# $Id: Makefile,v 1.40 1998/10/06 06:49:12 tg Exp $
 #
 
 DISTNAME=       pyth151
@@ -82,7 +82,12 @@ post-configure:
 	${CAT} ${FILESDIR}/${file} >> ${WRKSRC}/Modules/Setup.local
 .endfor
 
-OSVERSION!=	sysctl -n kern.osreldate
+.include <bsd.port.pre.mk>
+
+.if ${PORTOBJFORMAT} == elf
+LDFLAGS+=	-rdynamic
+CONFIGURE_ENV?=	LDFLAGS="${LDFLAGS}"
+.endif
 
 pre-install:
 .if ${OSVERSION} < 300000
@@ -97,10 +102,4 @@ post-install:
 	${INSTALL_SCRIPT} ${PREFIX}/lib/python1.5/plat-freebsd2/regen ${PREFIX}/lib/python1.5/plat-freebsd3
 	strip ${PREFIX}/bin/python
 
-.include <bsd.port.mk>
-
-# need <bsd.port.mk> to get ${PORTOBJFORMAT}
-.if ${PORTOBJFORMAT} == elf
-LDFLAGS+=	-rdynamic
-CONFIGURE_ENV?=	LDFLAGS="${LDFLAGS}"
-.endif
+.include <bsd.port.post.mk>
diff --git a/lang/python26/Makefile b/lang/python26/Makefile
index 491a1aa8f7a5..80e254d58a69 100644
--- a/lang/python26/Makefile
+++ b/lang/python26/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.39 1998/09/25 10:05:08 asami Exp $
+# $Id: Makefile,v 1.40 1998/10/06 06:49:12 tg Exp $
 #
 
 DISTNAME=       pyth151
@@ -82,7 +82,12 @@ post-configure:
 	${CAT} ${FILESDIR}/${file} >> ${WRKSRC}/Modules/Setup.local
 .endfor
 
-OSVERSION!=	sysctl -n kern.osreldate
+.include <bsd.port.pre.mk>
+
+.if ${PORTOBJFORMAT} == elf
+LDFLAGS+=	-rdynamic
+CONFIGURE_ENV?=	LDFLAGS="${LDFLAGS}"
+.endif
 
 pre-install:
 .if ${OSVERSION} < 300000
@@ -97,10 +102,4 @@ post-install:
 	${INSTALL_SCRIPT} ${PREFIX}/lib/python1.5/plat-freebsd2/regen ${PREFIX}/lib/python1.5/plat-freebsd3
 	strip ${PREFIX}/bin/python
 
-.include <bsd.port.mk>
-
-# need <bsd.port.mk> to get ${PORTOBJFORMAT}
-.if ${PORTOBJFORMAT} == elf
-LDFLAGS+=	-rdynamic
-CONFIGURE_ENV?=	LDFLAGS="${LDFLAGS}"
-.endif
+.include <bsd.port.post.mk>
diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index 491a1aa8f7a5..80e254d58a69 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.39 1998/09/25 10:05:08 asami Exp $
+# $Id: Makefile,v 1.40 1998/10/06 06:49:12 tg Exp $
 #
 
 DISTNAME=       pyth151
@@ -82,7 +82,12 @@ post-configure:
 	${CAT} ${FILESDIR}/${file} >> ${WRKSRC}/Modules/Setup.local
 .endfor
 
-OSVERSION!=	sysctl -n kern.osreldate
+.include <bsd.port.pre.mk>
+
+.if ${PORTOBJFORMAT} == elf
+LDFLAGS+=	-rdynamic
+CONFIGURE_ENV?=	LDFLAGS="${LDFLAGS}"
+.endif
 
 pre-install:
 .if ${OSVERSION} < 300000
@@ -97,10 +102,4 @@ post-install:
 	${INSTALL_SCRIPT} ${PREFIX}/lib/python1.5/plat-freebsd2/regen ${PREFIX}/lib/python1.5/plat-freebsd3
 	strip ${PREFIX}/bin/python
 
-.include <bsd.port.mk>
-
-# need <bsd.port.mk> to get ${PORTOBJFORMAT}
-.if ${PORTOBJFORMAT} == elf
-LDFLAGS+=	-rdynamic
-CONFIGURE_ENV?=	LDFLAGS="${LDFLAGS}"
-.endif
+.include <bsd.port.post.mk>
diff --git a/lang/python30/Makefile b/lang/python30/Makefile
index 491a1aa8f7a5..80e254d58a69 100644
--- a/lang/python30/Makefile
+++ b/lang/python30/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.39 1998/09/25 10:05:08 asami Exp $
+# $Id: Makefile,v 1.40 1998/10/06 06:49:12 tg Exp $
 #
 
 DISTNAME=       pyth151
@@ -82,7 +82,12 @@ post-configure:
 	${CAT} ${FILESDIR}/${file} >> ${WRKSRC}/Modules/Setup.local
 .endfor
 
-OSVERSION!=	sysctl -n kern.osreldate
+.include <bsd.port.pre.mk>
+
+.if ${PORTOBJFORMAT} == elf
+LDFLAGS+=	-rdynamic
+CONFIGURE_ENV?=	LDFLAGS="${LDFLAGS}"
+.endif
 
 pre-install:
 .if ${OSVERSION} < 300000
@@ -97,10 +102,4 @@ post-install:
 	${INSTALL_SCRIPT} ${PREFIX}/lib/python1.5/plat-freebsd2/regen ${PREFIX}/lib/python1.5/plat-freebsd3
 	strip ${PREFIX}/bin/python
 
-.include <bsd.port.mk>
-
-# need <bsd.port.mk> to get ${PORTOBJFORMAT}
-.if ${PORTOBJFORMAT} == elf
-LDFLAGS+=	-rdynamic
-CONFIGURE_ENV?=	LDFLAGS="${LDFLAGS}"
-.endif
+.include <bsd.port.post.mk>
diff --git a/lang/python31/Makefile b/lang/python31/Makefile
index 491a1aa8f7a5..80e254d58a69 100644
--- a/lang/python31/Makefile
+++ b/lang/python31/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.39 1998/09/25 10:05:08 asami Exp $
+# $Id: Makefile,v 1.40 1998/10/06 06:49:12 tg Exp $
 #
 
 DISTNAME=       pyth151
@@ -82,7 +82,12 @@ post-configure:
 	${CAT} ${FILESDIR}/${file} >> ${WRKSRC}/Modules/Setup.local
 .endfor
 
-OSVERSION!=	sysctl -n kern.osreldate
+.include <bsd.port.pre.mk>
+
+.if ${PORTOBJFORMAT} == elf
+LDFLAGS+=	-rdynamic
+CONFIGURE_ENV?=	LDFLAGS="${LDFLAGS}"
+.endif
 
 pre-install:
 .if ${OSVERSION} < 300000
@@ -97,10 +102,4 @@ post-install:
 	${INSTALL_SCRIPT} ${PREFIX}/lib/python1.5/plat-freebsd2/regen ${PREFIX}/lib/python1.5/plat-freebsd3
 	strip ${PREFIX}/bin/python
 
-.include <bsd.port.mk>
-
-# need <bsd.port.mk> to get ${PORTOBJFORMAT}
-.if ${PORTOBJFORMAT} == elf
-LDFLAGS+=	-rdynamic
-CONFIGURE_ENV?=	LDFLAGS="${LDFLAGS}"
-.endif
+.include <bsd.port.post.mk>
diff --git a/lang/python32/Makefile b/lang/python32/Makefile
index 491a1aa8f7a5..80e254d58a69 100644
--- a/lang/python32/Makefile
+++ b/lang/python32/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.39 1998/09/25 10:05:08 asami Exp $
+# $Id: Makefile,v 1.40 1998/10/06 06:49:12 tg Exp $
 #
 
 DISTNAME=       pyth151
@@ -82,7 +82,12 @@ post-configure:
 	${CAT} ${FILESDIR}/${file} >> ${WRKSRC}/Modules/Setup.local
 .endfor
 
-OSVERSION!=	sysctl -n kern.osreldate
+.include <bsd.port.pre.mk>
+
+.if ${PORTOBJFORMAT} == elf
+LDFLAGS+=	-rdynamic
+CONFIGURE_ENV?=	LDFLAGS="${LDFLAGS}"
+.endif
 
 pre-install:
 .if ${OSVERSION} < 300000
@@ -97,10 +102,4 @@ post-install:
 	${INSTALL_SCRIPT} ${PREFIX}/lib/python1.5/plat-freebsd2/regen ${PREFIX}/lib/python1.5/plat-freebsd3
 	strip ${PREFIX}/bin/python
 
-.include <bsd.port.mk>
-
-# need <bsd.port.mk> to get ${PORTOBJFORMAT}
-.if ${PORTOBJFORMAT} == elf
-LDFLAGS+=	-rdynamic
-CONFIGURE_ENV?=	LDFLAGS="${LDFLAGS}"
-.endif
+.include <bsd.port.post.mk>
diff --git a/misc/cwish/Makefile b/misc/cwish/Makefile
index 28e67d590631..5d78f7d0d436 100644
--- a/misc/cwish/Makefile
+++ b/misc/cwish/Makefile
@@ -4,7 +4,7 @@
 # Date created:			  Thur Sept 25, 1998
 # Whom:				  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/09/25 10:57:57 obrien Exp $
 #
 
 DISTNAME=	cwish
@@ -14,15 +14,16 @@ MASTER_SITES=	http://www.hcs.de/users/hm/packages/
 
 MAINTAINER=     obrien@FreeBSD.org
 
-OSVERSION!=	sysctl -n kern.osreldate
-.if ${OSVERSION} >= 300000
-BROKEN=		"headers problem"
-.endif
-
 NO_WRKSUBDIR=	yes
 ALL_TARGET=	#emtpy
 MAN1=		cwish.1
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 300000
+BROKEN=		"headers problem"
+.endif
+
 pre-configure:
 	${CP} ${WRKSRC}/Makefile.freebsd ${WRKSRC}/Makefile
 
@@ -30,4 +31,4 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/cwish ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/cwish.1 ${PREFIX}/man/man1
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/multimedia/xanim/Makefile b/multimedia/xanim/Makefile
index b1c1ba7eafc7..fa6bb830c873 100644
--- a/multimedia/xanim/Makefile
+++ b/multimedia/xanim/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Sat Nov 5 11:43:03 PST 1994
 # Whom:                 piero
 #
-# $Id: Makefile,v 1.14 1998/09/14 20:37:01 markm Exp $
+# $Id: Makefile,v 1.15 1998/09/27 09:18:30 markm Exp $
 #
 
 DISTNAME=       xanim27070
@@ -18,22 +18,13 @@ MAINTAINER=	ports@FreeBSD.ORG
 EXTRACT_ONLY=   ${DISTNAME}.tar.gz
 USE_IMAKE=	yes
 MAN1=		xanim.1
-MANCOMPRESSED=	yes
-
-post-extract:
-	@for file in ${EXTRA_FILES}; do \
-	  ${CP} ${DISTDIR}/$$file ${WRKSRC}; \
-	  uncompress ${WRKSRC}/$$file; \
-	done
-	${CP} ${WRKSRC}/docs/xanim.man ${WRKSRC}
-
-MAKE_ENV+=	XA_IV32_DEF=-DXA_INDEO \
+MAKE_ENV=	XA_IV32_DEF=-DXA_INDEO \
 		XA_CVID_DEF=-DXA_CINEPAK \
 		XA_CYUV_DEF=-DXA_CYUV
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
 
-.if ${PORTOBJFORMAT} != elf
+.if ${PORTOBJFORMAT} == "aout"
 EXTRA_FILES=    xa2.0_cvid_netbsd386.o.Z xa2.0_iv32_netbsd386.o.Z \
 		xa1.0_cyuv_netbsd386.o.Z
 MAKE_ENV+=	XA_IV32_LIB=xa2.0_cvid_netbsd386.o \
@@ -46,3 +37,12 @@ MAKE_ENV+=	XA_IV32_LIB=xa2.0_cvid_linuxELF.o \
 		XA_CVID_LIB=xa2.0_iv32_linuxELF.o \
 		XA_CYUV_LIB=xa1.0_cyuv_linuxELF.o
 .endif
+
+post-extract:
+	@for file in ${EXTRA_FILES}; do \
+	  ${CP} ${DISTDIR}/$$file ${WRKSRC}; \
+	  uncompress ${WRKSRC}/$$file; \
+	done
+	${CP} ${WRKSRC}/docs/xanim.man ${WRKSRC}
+
+.include <bsd.port.post.mk>
diff --git a/net/mpich/Makefile b/net/mpich/Makefile
index 25f3b1d599cd..3e6496d35961 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 25f3b1d599cd..3e6496d35961 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 acefb7519df6..5e2d5bb83adc 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 93fce753d6a2..bd5d5947bd7a 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 4ed2f27206ed..33ed73ecd96d 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 423aa760a27f..3f0d6d2010f2 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 dcab385fa172..6998a0df66b8 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>
diff --git a/sysutils/cd-write/Makefile b/sysutils/cd-write/Makefile
index 85e8d9add2aa..60eccb8d90f4 100644
--- a/sysutils/cd-write/Makefile
+++ b/sysutils/cd-write/Makefile
@@ -3,7 +3,7 @@
 # Date created:         1 May 1997
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.10 1998/10/09 10:05:56 asami Exp $
+# $Id: Makefile,v 1.11 1998/10/14 10:41:59 jseger Exp $
 #
 
 DISTNAME=       cd-write-1.4
@@ -16,7 +16,8 @@ LIB_DEPENDS=	tixsam4180.1:${PORTSDIR}/x11-toolkits/tix
 
 WRKSRC=		${WRKDIR}/cd-write
 
-OSVERSION!=     sysctl -n kern.osreldate
+.include <bsd.port.pre.mk>
+
 .if ${OSVERSION} >= 300000
 BROKEN=		scsi.h
 .endif
@@ -31,4 +32,4 @@ pre-build:
 post-install:
 	@PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/textproc/sgmlformat/Makefile b/textproc/sgmlformat/Makefile
index 4278f83db8b6..ea5b4a10ec02 100644
--- a/textproc/sgmlformat/Makefile
+++ b/textproc/sgmlformat/Makefile
@@ -3,7 +3,7 @@
 # Date created:		July 16, 1997
 # Whom:			jfieber
 #
-# $Id: Makefile,v 1.10 1998/09/15 21:18:06 jfieber Exp $
+# $Id: Makefile,v 1.11 1998/10/20 02:02:07 steve Exp $
 #
 
 DISTNAME=	sgmlformat-1.7
@@ -15,7 +15,9 @@ MAINTAINER=	jfieber@FreeBSD.ORG
 # There are two ports that satisfy the nsgmls requirement.
 # Jade is preferred, but it currently doesn't compile on 2.1.x
 # system, so use sp in that case.
-OSVERSION!=	sysctl -n kern.osreldate
+
+.include <bsd.port.pre.mk>
+
 .if ${OSVERSION} < 220000
 RUN_DEPENDS=	nsgmls:${PORTSDIR}/textproc/sp
 .else
@@ -34,4 +36,4 @@ MANCOMPRESSED=	yes
 post-install:
 	@${CAT} ${PKGDIR}/MESSAGE
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
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>
diff --git a/x11-toolkits/py-gnome/Makefile b/x11-toolkits/py-gnome/Makefile
index 3445862d71cc..afbfa2cd7380 100644
--- a/x11-toolkits/py-gnome/Makefile
+++ b/x11-toolkits/py-gnome/Makefile
@@ -3,7 +3,7 @@
 # Date created:		30 May 1998
 # Whom:			Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.12 1998/09/25 09:52:44 asami Exp $
+# $Id: Makefile,v 1.13 1998/10/15 14:31:45 jseger Exp $
 #
 
 DISTNAME=	pygtk-0.5.2
@@ -17,8 +17,8 @@ MASTER_SITES=	ftp://ftp.daa.com.au/pub/james/python/ \
 
 MAINTAINER=	ports@FreeBSD.ORG
 
+.include <bsd.port.pre.mk>
 
-OSVERSION!=     sysctl -n kern.osreldate
 .if ${OSVERSION} >= 300000
 BROKEN=         python
 .endif
@@ -41,4 +41,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/pygtk
 .endif
 
-.include <bsd.port.mk>
+BROKEN=		gtk
+
+.include <bsd.port.post.mk>
diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile
index 3445862d71cc..afbfa2cd7380 100644
--- a/x11-toolkits/py-gnome2/Makefile
+++ b/x11-toolkits/py-gnome2/Makefile
@@ -3,7 +3,7 @@
 # Date created:		30 May 1998
 # Whom:			Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.12 1998/09/25 09:52:44 asami Exp $
+# $Id: Makefile,v 1.13 1998/10/15 14:31:45 jseger Exp $
 #
 
 DISTNAME=	pygtk-0.5.2
@@ -17,8 +17,8 @@ MASTER_SITES=	ftp://ftp.daa.com.au/pub/james/python/ \
 
 MAINTAINER=	ports@FreeBSD.ORG
 
+.include <bsd.port.pre.mk>
 
-OSVERSION!=     sysctl -n kern.osreldate
 .if ${OSVERSION} >= 300000
 BROKEN=         python
 .endif
@@ -41,4 +41,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/pygtk
 .endif
 
-.include <bsd.port.mk>
+BROKEN=		gtk
+
+.include <bsd.port.post.mk>
diff --git a/x11-toolkits/py-gtk/Makefile b/x11-toolkits/py-gtk/Makefile
index 3445862d71cc..afbfa2cd7380 100644
--- a/x11-toolkits/py-gtk/Makefile
+++ b/x11-toolkits/py-gtk/Makefile
@@ -3,7 +3,7 @@
 # Date created:		30 May 1998
 # Whom:			Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.12 1998/09/25 09:52:44 asami Exp $
+# $Id: Makefile,v 1.13 1998/10/15 14:31:45 jseger Exp $
 #
 
 DISTNAME=	pygtk-0.5.2
@@ -17,8 +17,8 @@ MASTER_SITES=	ftp://ftp.daa.com.au/pub/james/python/ \
 
 MAINTAINER=	ports@FreeBSD.ORG
 
+.include <bsd.port.pre.mk>
 
-OSVERSION!=     sysctl -n kern.osreldate
 .if ${OSVERSION} >= 300000
 BROKEN=         python
 .endif
@@ -41,4 +41,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/pygtk
 .endif
 
-.include <bsd.port.mk>
+BROKEN=		gtk
+
+.include <bsd.port.post.mk>
diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile
index 3445862d71cc..afbfa2cd7380 100644
--- a/x11-toolkits/py-gtk2/Makefile
+++ b/x11-toolkits/py-gtk2/Makefile
@@ -3,7 +3,7 @@
 # Date created:		30 May 1998
 # Whom:			Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.12 1998/09/25 09:52:44 asami Exp $
+# $Id: Makefile,v 1.13 1998/10/15 14:31:45 jseger Exp $
 #
 
 DISTNAME=	pygtk-0.5.2
@@ -17,8 +17,8 @@ MASTER_SITES=	ftp://ftp.daa.com.au/pub/james/python/ \
 
 MAINTAINER=	ports@FreeBSD.ORG
 
+.include <bsd.port.pre.mk>
 
-OSVERSION!=     sysctl -n kern.osreldate
 .if ${OSVERSION} >= 300000
 BROKEN=         python
 .endif
@@ -41,4 +41,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/pygtk
 .endif
 
-.include <bsd.port.mk>
+BROKEN=		gtk
+
+.include <bsd.port.post.mk>
diff --git a/x11-toolkits/xforms/Makefile b/x11-toolkits/xforms/Makefile
index e91e42194bba..fff059208a4f 100644
--- a/x11-toolkits/xforms/Makefile
+++ b/x11-toolkits/xforms/Makefile
@@ -3,11 +3,13 @@
 # Date created:		28 March 1997
 # Whom:			gena
 #
-# $Id: Makefile,v 1.19 1998/09/26 23:14:12 steve Exp $
+# $Id: Makefile,v 1.20 1998/11/02 04:35:07 jseger Exp $
 #
 
-ARE_WE_ELF!=    test -x /usr/bin/objformat && /usr/bin/objformat || echo aout
-.if ${ARE_WE_ELF} == "elf"
+USE_X_PREFIX=	yes
+.include <bsd.port.pre.mk>
+
+.if ${PORTOBJFORMAT} == "elf"
 DISTNAME=	bxform-freebsd-elf
 MASTER_SITES=	http://bragg.phys.uwm.edu/~zhao/ftp/
 PATCHDIR=	${.CURDIR}/patches.elf
@@ -24,7 +26,6 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	gena@NetVision.net.il
 
 PATCH_STRIP=	-p0 -t
-USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/xforms
 MAN1=		fdesign.1 fd2ps.1
 MAN5=		xforms.5
@@ -36,4 +37,4 @@ post-install:
 	@ln -fs xforms.5.gz ${PREFIX}/man/man5/forms.5.gz
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile
index 0e2b77c05ac4..e0ab6b6f5bfc 100644
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -3,7 +3,7 @@
 # Date created:		9 November 1994
 # Whom:			smace
 #
-# $Id: Makefile,v 1.42 1998/10/01 02:17:49 jseger Exp $
+# $Id: Makefile,v 1.43 1998/10/01 06:19:19 tg Exp $
 #
 
 DISTNAME=       xlockmore-4.12
@@ -26,7 +26,8 @@ CONFIGURE_ARGS+= --enable-kerberos4
 USE_X_PREFIX=	yes
 MAN1=		xlock.1
 
-OSVERSION!=     sysctl -n kern.osreldate
+.include <bsd.port.pre.mk>
+
 .if ${OSVERSION} > 300000
 CONFIGURE_ARGS+= --with-libraries=/usr/lib/aout
 .endif
@@ -39,4 +40,4 @@ LIB_DEPENDS+=		GL.14:${PORTSDIR}/graphics/Mesa3
 CONFIGURE_ARGS+=	--without-mesagl
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>