11 files changed, 100 insertions, 84 deletions

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>