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, 26 insertions, 17 deletions

diff --git a/x11-toolkits/py-gnome/Makefile b/x11-toolkits/py-gnome/Makefile
index 3445862..afbfa2c 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 3445862..afbfa2c 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 3445862..afbfa2c 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 3445862..afbfa2c 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 e91e421..fff0592 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>