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.

6 files changed, 52 insertions, 41 deletions

diff --git a/x11-toolkits/Xaw3d/Makefile b/x11-toolkits/Xaw3d/Makefile
index d24d5af9a671..8ac25703739a 100644
--- a/x11-toolkits/Xaw3d/Makefile
+++ b/x11-toolkits/Xaw3d/Makefile
@@ -3,7 +3,7 @@
 # Date created:		18 November 1994
 # Whom:			asami
 #
-# $Id: Makefile,v 1.18 1998/09/21 01:33:22 steve Exp $
+# $Id: Makefile,v 1.19 1998/09/21 21:29:23 steve Exp $
 #
 
 DISTNAME=	Xaw3d-1.3
@@ -16,16 +16,18 @@ MAINTAINER=	ports@FreeBSD.ORG
 WRKSRC=		${WRKDIR}/xc/lib/Xaw3d
 USE_IMAKE=	yes
 
+.include <bsd.port.pre.mk>
+
 post-extract:
 	${MKDIR} ${WRKSRC}/X11/Xaw3d
 	cd ${WRKSRC}/X11/Xaw3d; ln -sf ../../*.h .
 
 post-install:
-	if [ "${PORTOBJFORMAT}" = "aout" ]; then \
-		${LN} -sf libXaw3d.so.6.1 ${PREFIX}/lib/libXaw3d.so; \
-	fi
+.if ${PORTOBJFORMAT} == "aout"
+	${LN} -sf libXaw3d.so.6.1 ${PREFIX}/lib/libXaw3d.so
+.endif
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 	${MKDIR} ${PREFIX}/share/doc/Xaw3d
 	${CP} ${WRKSRC}/README.XAW3D ${PREFIX}/share/doc/Xaw3d
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11-toolkits/blt/Makefile b/x11-toolkits/blt/Makefile
index 8086dd61c78d..4739dbbfc479 100644
--- a/x11-toolkits/blt/Makefile
+++ b/x11-toolkits/blt/Makefile
@@ -3,7 +3,7 @@
 # Date created:		22 September 1998
 # Whom:			Kenjiro Cho <kjc@csl.sony.co.jp>
 #
-# $Id: Makefile,v 1.22 1998/10/14 03:00:44 jseger Exp $
+# $Id: Makefile,v 1.23 1998/10/20 01:24:32 steve Exp $
 #
 
 DISTNAME=	BLT2.4f
@@ -22,14 +22,16 @@ MANN=		BLT.n barchart.n bgexec.n bitmap.n bltdebug.n busy.n \
 		stripchart.n table.n tabset.n tile.n vector.n watch.n winop.n \
 		beep.n cutbuffer.n
 
-post-install:
-	${LN} -sf libBLT.so.${SO_VERSION} ${PREFIX}/lib/libBLT.so
-	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
-
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
 
 .if ${PORTOBJFORMAT} == "elf"
 SO_VERSION=	2
 .else
 SO_VERSION=	2.4
 .endif
+
+post-install:
+	${LN} -sf libBLT.so.${SO_VERSION} ${PREFIX}/lib/libBLT.so
+	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+
+.include <bsd.port.post.mk>
diff --git a/x11-toolkits/neXtaw/Makefile b/x11-toolkits/neXtaw/Makefile
index 90c3a3f46afb..c0a9215205a9 100644
--- a/x11-toolkits/neXtaw/Makefile
+++ b/x11-toolkits/neXtaw/Makefile
@@ -3,7 +3,7 @@
 # Date created:		16 January 1997
 # Whom:			Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.8 1998/09/21 22:21:37 steve Exp $
+# $Id: Makefile,v 1.9 1998/10/28 08:06:37 tg Exp $
 #
 
 DISTNAME=	neXtaw-0.5.1
@@ -15,6 +15,8 @@ MAINTAINER=	tg@FreeBSD.ORG
 
 USE_IMAKE=	yes
 
+.include <bsd.port.pre.mk>
+
 post-extract:
 	@${RM} -rf ${WRKSRC}/X11
 
@@ -29,9 +31,9 @@ post-install:
 	@${MKDIR} ${PREFIX}/share/doc/neXtaw
 	${INSTALL_DATA} ${WRKSRC}/README.neXtaw ${PREFIX}/share/doc/neXtaw
 .endif
-	if [ "${PORTOBJFORMAT}" = "aout" ]; then \
-		${LN} -sf libneXtaw.so.6.1 ${PREFIX}/lib/libneXtaw.so; \
-	fi
+.if ${PORTOBJFORMAT} == "aout"
+	${LN} -sf libneXtaw.so.6.1 ${PREFIX}/lib/libneXtaw.so
+.endif
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11-toolkits/tix/Makefile b/x11-toolkits/tix/Makefile
index fd2034abbfc5..a486a764f778 100644
--- a/x11-toolkits/tix/Makefile
+++ b/x11-toolkits/tix/Makefile
@@ -3,7 +3,7 @@
 # Date created:		22 December 1996
 # Whom:			Thomas Gellekum <tg@freebsd.org>
 #
-# $Id: Makefile,v 1.18 1998/09/25 10:05:14 asami Exp $
+# $Id: Makefile,v 1.19 1998/10/06 08:05:43 tg Exp $
 #
 
 DISTNAME=	Tix4.1.0.006
@@ -35,6 +35,16 @@ MANN=		BtnBox.n Balloon.n ChkList.n Destroy.n ComboBox.n Control.n \
 TIX_LIB=	libtix4180.so
 TIXSAM_LIB=	libtixsam4180.so
 
+.include <bsd.port.pre.mk>
+
+.if ${PORTOBJFORMAT} == "elf"
+TIX_LIB_FILE=	${TIX_LIB}.1
+TIXSAM_LIB_FILE=${TIXSAM_LIB}.1
+.else
+TIX_LIB_FILE=	${TIX_LIB}.1.2
+TIXSAM_LIB_FILE=${TIXSAM_LIB}.1.2
+.endif
+
 pre-configure:
 	@(cd ${WRKSRC}/.. && \
 	    CC="${CC}" ac_cv_path_CC="${CC}" CFLAGS="${CFLAGS}" \
@@ -59,12 +69,4 @@ post-install:
 	@# These two files are the same
 	/bin/ln -sf ../../tix.h ${PREFIX}/include/tix/generic
 
-.include <bsd.port.mk>
-
-.if ${PORTOBJFORMAT} == "elf"
-TIX_LIB_FILE=	${TIX_LIB}.1
-TIXSAM_LIB_FILE=${TIXSAM_LIB}.1
-.else
-TIX_LIB_FILE=	${TIX_LIB}.1.2
-TIXSAM_LIB_FILE=${TIXSAM_LIB}.1.2
-.endif
+.include <bsd.port.post.mk>
diff --git a/x11-toolkits/tk80/Makefile b/x11-toolkits/tk80/Makefile
index ddfb9aac105a..9dfc1185fb28 100644
--- a/x11-toolkits/tk80/Makefile
+++ b/x11-toolkits/tk80/Makefile
@@ -3,7 +3,7 @@
 # Date created:		19 August 1997
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.12 1998/09/17 22:31:32 steve Exp $
+# $Id: Makefile,v 1.13 1998/11/11 02:02:14 asami Exp $
 #
 
 DISTNAME=	tk8.0p2
@@ -20,12 +20,21 @@ WRKSRC=		${WRKDIR}/tk8.0/unix
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
 CONFIGURE_ENV=  PORTSDIR=${PORTSDIR}
+EXTRA_PKG_ARGS=	-i ${PKGDIR}/INSTALL.wish
 
 SHLIB_MAJOR=    1
 SHLIB_MINOR=    2
 MAKEFILE=       makefile
 TK_LIB=		libtk80.so
 
+.include <bsd.port.pre.mk>
+
+.if ${PORTOBJFORMAT} == "elf"
+TK_LIB_FILE=  ${TK_LIB}.${SHLIB_MAJOR}
+.else
+TK_LIB_FILE=  ${TK_LIB}.${SHLIB_MAJOR}.${SHLIB_MINOR}
+.endif
+
 post-configure:
 	@${CP} ${FILESDIR}/Makefile.lib ${WRKSRC}
 	@${CP} ${FILESDIR}/makefile     ${WRKSRC}
@@ -44,12 +53,4 @@ post-install:
 test:
 	cd ${WRKSRC}; make test
 
-.include <bsd.port.mk>
-
-PKG_ARGS+=	-i ${PKGDIR}/INSTALL.wish
-
-.if ${PORTOBJFORMAT} == "elf"
-TK_LIB_FILE=  ${TK_LIB}.${SHLIB_MAJOR}
-.else
-TK_LIB_FILE=  ${TK_LIB}.${SHLIB_MAJOR}.${SHLIB_MINOR}
-.endif
+.include <bsd.port.post.mk>
diff --git a/x11-toolkits/xbae/Makefile b/x11-toolkits/xbae/Makefile
index da74f4261b15..94d0dc72336e 100644
--- a/x11-toolkits/xbae/Makefile
+++ b/x11-toolkits/xbae/Makefile
@@ -5,7 +5,7 @@
 # With some
 # modifications from:	Andreas Klemm <andreas@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.4 1998/08/07 22:56:47 asami Exp $
+# $Id: Makefile,v 1.5 1998/09/21 21:36:27 steve Exp $
 #
 
 DISTNAME=	Xbae-4.6.2
@@ -20,10 +20,12 @@ REQUIRES_MOTIF= YES
 USE_IMAKE=	YES
 MAN3=		XbaeCaption.3 XbaeMatrix.3
 
+.include <bsd.port.pre.mk>
+
 post-install:
-	if [ "${PORTOBJFORMAT}" = "aout" ]; then \
-		${LN} -sf libXbae.so.6.2 ${PREFIX}/lib/libXbae.so; \
-	fi
+.if ${PORTOBJFORMAT} == "aout"
+	${LN} -sf libXbae.so.6.2 ${PREFIX}/lib/libXbae.so
+.endif
 	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>