Use bsd.port.{pre,post}.mk to move PORTOBJFORMAT to front, or change

shell loops to make loops.  Use EXTRA_PKG_FLAGS to add install scripts
instead of adding it to PKG_FLAGS after bsd.port.mk.

3 files changed, 47 insertions, 39 deletions

diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile
index c18f56f5fadd..c9c26b77fc43 100644
--- a/x11-servers/XFree86-4-Server-snap/Makefile
+++ b/x11-servers/XFree86-4-Server-snap/Makefile
@@ -3,7 +3,7 @@
 # Date created:         5 January 1995
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.46 1998/09/22 06:08:34 asami Exp $
+# $Id: Makefile,v 1.47 1998/10/27 04:12:44 jmz Exp $
 #
 
 DISTNAME=	xc
@@ -61,23 +61,26 @@ pre-fetch:
 .endif
 .endif
 
+.include <bsd.port.pre.mk>
+
 pre-install:
-	${MKDIR} /usr/X11R6
+	${MKDIR} ${X11BASE}
+
 post-install:
-	if [ "${PORTOBJFORMAT}" = "aout" ]; then \
-	    for lib in PEX5 SM X11 XIE Xi Xmu Xt oldX; do \
-		${LN} -sf lib$${lib}.so.6.0 ${PREFIX}/lib/lib$${lib}.so; \
-	    done; \
-	    for lib in X11 Xaw Xtst; do \
-		${LN} -sf lib$${lib}.so.6.1 ${PREFIX}/lib/lib$${lib}.so; \
-	    done; \
-	    for lib in Xp; do \
-		${LN} -sf lib$${lib}.so.6.2 ${PREFIX}/lib/lib$${lib}.so; \
-	    done; \
-	    for lib in ICE Xext; do \
-		${LN} -sf lib$${lib}.so.6.3 ${PREFIX}/lib/lib$${lib}.so; \
-	    done; \
-	fi
+.if ${PORTOBJFORMAT} == "aout"
+.for lib in PEX5 SM X11 XIE Xi Xmu Xt oldX
+	${LN} -sf lib${lib}.so.6.0 ${PREFIX}/lib/lib${lib}.so
+.endfor
+.for lib in X11 Xaw Xtst
+	${LN} -sf lib${lib}.so.6.1 ${PREFIX}/lib/lib${lib}.so
+.endfor
+.for lib in Xp
+	${LN} -sf lib${lib}.so.6.2 ${PREFIX}/lib/lib${lib}.so
+.endfor
+.for lib in ICE Xext
+	${LN} -sf lib${lib}.so.6.3 ${PREFIX}/lib/lib${lib}.so
+.endfor
+.endif
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile
index c18f56f5fadd..c9c26b77fc43 100644
--- a/x11-servers/XFree86-4-Server/Makefile
+++ b/x11-servers/XFree86-4-Server/Makefile
@@ -3,7 +3,7 @@
 # Date created:         5 January 1995
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.46 1998/09/22 06:08:34 asami Exp $
+# $Id: Makefile,v 1.47 1998/10/27 04:12:44 jmz Exp $
 #
 
 DISTNAME=	xc
@@ -61,23 +61,26 @@ pre-fetch:
 .endif
 .endif
 
+.include <bsd.port.pre.mk>
+
 pre-install:
-	${MKDIR} /usr/X11R6
+	${MKDIR} ${X11BASE}
+
 post-install:
-	if [ "${PORTOBJFORMAT}" = "aout" ]; then \
-	    for lib in PEX5 SM X11 XIE Xi Xmu Xt oldX; do \
-		${LN} -sf lib$${lib}.so.6.0 ${PREFIX}/lib/lib$${lib}.so; \
-	    done; \
-	    for lib in X11 Xaw Xtst; do \
-		${LN} -sf lib$${lib}.so.6.1 ${PREFIX}/lib/lib$${lib}.so; \
-	    done; \
-	    for lib in Xp; do \
-		${LN} -sf lib$${lib}.so.6.2 ${PREFIX}/lib/lib$${lib}.so; \
-	    done; \
-	    for lib in ICE Xext; do \
-		${LN} -sf lib$${lib}.so.6.3 ${PREFIX}/lib/lib$${lib}.so; \
-	    done; \
-	fi
+.if ${PORTOBJFORMAT} == "aout"
+.for lib in PEX5 SM X11 XIE Xi Xmu Xt oldX
+	${LN} -sf lib${lib}.so.6.0 ${PREFIX}/lib/lib${lib}.so
+.endfor
+.for lib in X11 Xaw Xtst
+	${LN} -sf lib${lib}.so.6.1 ${PREFIX}/lib/lib${lib}.so
+.endfor
+.for lib in Xp
+	${LN} -sf lib${lib}.so.6.2 ${PREFIX}/lib/lib${lib}.so
+.endfor
+.for lib in ICE Xext
+	${LN} -sf lib${lib}.so.6.3 ${PREFIX}/lib/lib${lib}.so
+.endfor
+.endif
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11-servers/XttXF86srv-common/Makefile b/x11-servers/XttXF86srv-common/Makefile
index cec1cdf8432b..ff4a2f76c3a8 100644
--- a/x11-servers/XttXF86srv-common/Makefile
+++ b/x11-servers/XttXF86srv-common/Makefile
@@ -3,7 +3,7 @@
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
-# $Id: Makefile,v 1.6 1998/10/15 01:18:23 jseger Exp $
+# $Id: Makefile,v 1.7 1998/10/22 00:25:53 steve Exp $
 #
 
 DISTNAME=	xc
@@ -82,6 +82,8 @@ TMPPLIST=		${WRKDIR}/.PLIST.common.mktmp
 BROKEN=		This port is dummy.
 .endif
 
+.include <bsd.port.pre.mk>
+
 .if defined(SERVER)
 .if ${SERVER} != xfs
 pre-fetch:
@@ -139,14 +141,14 @@ do-install:
 	@( \
 	cd ${WRKSRC}/lib/font; \
 	${SETENV} ${MAKE_ENV} ${MAKE} install; \
-	if [ "${PORTOBJFORMAT}" = "aout" ]; then \
-		${LN} -sf libfont.so.1.0 ${PREFIX}/lib/libfont.so; \
-	fi; \
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib; \
 	${INSTALL_SCRIPT} ${FILESDIR}/mkfontdir.pl ${PREFIX}/bin; \
 	${MKDIR} ${DOCDIR}; \
 	${INSTALL_DATA} ${XTTDIR}/xtt10-*.eng ${DOCDIR}; \
 	${INSTALL_DATA} ${XTTDIR}/xtt10-*.jis ${DOCDIR} )
+.if ${PORTOBJFORMAT} == "aout"
+	${LN} -sf libfont.so.1.0 ${PREFIX}/lib/libfont.so
+.endif
 .elif defined(SERVER) && ${SERVER} == xfs
 do-install:
 	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${INSTALL_PROGRAM} ${WRKSRC}/programs/xfs/xfs ${PREFIX}/bin/xfs.xtt
@@ -163,4 +165,4 @@ post-install:
 post-package:
 	@${TOUCH} ${TOUCH_FLAGS} ${PACKAGE_COOKIE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>