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.

11 files changed, 95 insertions, 73 deletions

diff --git a/japanese/Canna/Makefile b/japanese/Canna/Makefile
index ae91cb6723a6..f470d02b0b63 100644
--- a/japanese/Canna/Makefile
+++ b/japanese/Canna/Makefile
@@ -4,7 +4,7 @@
 # Whom:			Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
 #			NIIMI Satoshi <sa2c@and.or.jp>
 #
-# $Id: Makefile,v 1.21 1998/09/21 22:31:23 steve Exp $
+# $Id: Makefile,v 1.22 1998/10/10 15:27:26 kuriyama Exp $
 #
 
 DISTNAME=	Canna32p2
@@ -33,17 +33,19 @@ MANCOMPRESSED=	no
 
 STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/canna.sh
 
+.include <bsd.port.pre.mk>
+
 pre-install:
 	${MKDIR} /var/run/canna
 	chown bin.bin /var/run/canna
 
 post-install:
-	if [ "${PORTOBJFORMAT}" = "aout" ]; then \
-		${LN} -sf libRKC.so.1.0 ${PREFIX}/lib/libRKC.so; \
-		${LN} -sf libRKC16.so.1.0 ${PREFIX}/lib/libRKC16.so; \
-		${LN} -sf libcanna.so.1.0 ${PREFIX}/lib/libcanna.so; \
-		${LN} -sf libcanna16.so.1.0 ${PREFIX}/lib/libcanna16.so; \
-	fi
+.if ${PORTOBJFORMAT} == "aout"
+	${LN} -sf libRKC.so.1.0 ${PREFIX}/lib/libRKC.so
+	${LN} -sf libRKC16.so.1.0 ${PREFIX}/lib/libRKC16.so
+	${LN} -sf libcanna.so.1.0 ${PREFIX}/lib/libcanna.so
+	${LN} -sf libcanna16.so.1.0 ${PREFIX}/lib/libcanna16.so
+.endif
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 	@if [ ! -f ${STARTUP_SCRIPT} ]; then 				\
 		echo "Installing ${STARTUP_SCRIPT} startup file."; 	\
@@ -63,4 +65,4 @@ post-install:
 	fi
 	@${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/japanese/canna-lib/Makefile b/japanese/canna-lib/Makefile
index ae91cb6723a6..f470d02b0b63 100644
--- a/japanese/canna-lib/Makefile
+++ b/japanese/canna-lib/Makefile
@@ -4,7 +4,7 @@
 # Whom:			Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
 #			NIIMI Satoshi <sa2c@and.or.jp>
 #
-# $Id: Makefile,v 1.21 1998/09/21 22:31:23 steve Exp $
+# $Id: Makefile,v 1.22 1998/10/10 15:27:26 kuriyama Exp $
 #
 
 DISTNAME=	Canna32p2
@@ -33,17 +33,19 @@ MANCOMPRESSED=	no
 
 STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/canna.sh
 
+.include <bsd.port.pre.mk>
+
 pre-install:
 	${MKDIR} /var/run/canna
 	chown bin.bin /var/run/canna
 
 post-install:
-	if [ "${PORTOBJFORMAT}" = "aout" ]; then \
-		${LN} -sf libRKC.so.1.0 ${PREFIX}/lib/libRKC.so; \
-		${LN} -sf libRKC16.so.1.0 ${PREFIX}/lib/libRKC16.so; \
-		${LN} -sf libcanna.so.1.0 ${PREFIX}/lib/libcanna.so; \
-		${LN} -sf libcanna16.so.1.0 ${PREFIX}/lib/libcanna16.so; \
-	fi
+.if ${PORTOBJFORMAT} == "aout"
+	${LN} -sf libRKC.so.1.0 ${PREFIX}/lib/libRKC.so
+	${LN} -sf libRKC16.so.1.0 ${PREFIX}/lib/libRKC16.so
+	${LN} -sf libcanna.so.1.0 ${PREFIX}/lib/libcanna.so
+	${LN} -sf libcanna16.so.1.0 ${PREFIX}/lib/libcanna16.so
+.endif
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 	@if [ ! -f ${STARTUP_SCRIPT} ]; then 				\
 		echo "Installing ${STARTUP_SCRIPT} startup file."; 	\
@@ -63,4 +65,4 @@ post-install:
 	fi
 	@${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/japanese/canna-server/Makefile b/japanese/canna-server/Makefile
index ae91cb6723a6..f470d02b0b63 100644
--- a/japanese/canna-server/Makefile
+++ b/japanese/canna-server/Makefile
@@ -4,7 +4,7 @@
 # Whom:			Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
 #			NIIMI Satoshi <sa2c@and.or.jp>
 #
-# $Id: Makefile,v 1.21 1998/09/21 22:31:23 steve Exp $
+# $Id: Makefile,v 1.22 1998/10/10 15:27:26 kuriyama Exp $
 #
 
 DISTNAME=	Canna32p2
@@ -33,17 +33,19 @@ MANCOMPRESSED=	no
 
 STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/canna.sh
 
+.include <bsd.port.pre.mk>
+
 pre-install:
 	${MKDIR} /var/run/canna
 	chown bin.bin /var/run/canna
 
 post-install:
-	if [ "${PORTOBJFORMAT}" = "aout" ]; then \
-		${LN} -sf libRKC.so.1.0 ${PREFIX}/lib/libRKC.so; \
-		${LN} -sf libRKC16.so.1.0 ${PREFIX}/lib/libRKC16.so; \
-		${LN} -sf libcanna.so.1.0 ${PREFIX}/lib/libcanna.so; \
-		${LN} -sf libcanna16.so.1.0 ${PREFIX}/lib/libcanna16.so; \
-	fi
+.if ${PORTOBJFORMAT} == "aout"
+	${LN} -sf libRKC.so.1.0 ${PREFIX}/lib/libRKC.so
+	${LN} -sf libRKC16.so.1.0 ${PREFIX}/lib/libRKC16.so
+	${LN} -sf libcanna.so.1.0 ${PREFIX}/lib/libcanna.so
+	${LN} -sf libcanna16.so.1.0 ${PREFIX}/lib/libcanna16.so
+.endif
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 	@if [ ! -f ${STARTUP_SCRIPT} ]; then 				\
 		echo "Installing ${STARTUP_SCRIPT} startup file."; 	\
@@ -63,4 +65,4 @@ post-install:
 	fi
 	@${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/japanese/expect/Makefile b/japanese/expect/Makefile
index f1ea81110472..1f50b8cfe238 100644
--- a/japanese/expect/Makefile
+++ b/japanese/expect/Makefile
@@ -3,7 +3,7 @@
 # Date created:		17 Oct 1997
 # Whom:			taguchi
 #
-# $Id: Makefile,v 1.11 1998/09/28 15:15:04 kuriyama Exp $
+# $Id: Makefile,v 1.12 1998/10/10 04:08:54 steve Exp $
 #
 
 DISTNAME=	expect-5.28
@@ -24,10 +24,12 @@ CONFIGURE_ARGS=	--enable-shared --with-tclconfig=${PREFIX}/lib/tcl8.0jp \
 
 NO_MAN_INSTALL=	yes
 
+.include <bsd.port.pre.mk>
+
 post-install:
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
-	if [ "${PORTOBJFORMAT}" = "aout" ]; then \
-		${LN} -sf libexpect528jp.so.1.2 ${PREFIX}/lib/libexpect528jp.so; \
-	fi
+.if ${PORTOBJFORMAT} == "aout"
+	${LN} -sf libexpect528jp.so.1.2 ${PREFIX}/lib/libexpect528jp.so
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/japanese/gd/Makefile b/japanese/gd/Makefile
index 2e4aace509a1..1acf667d3417 100644
--- a/japanese/gd/Makefile
+++ b/japanese/gd/Makefile
@@ -3,7 +3,7 @@
 # Date created:				19 Aug 1998
 # Whom:					ichiro@ichiro.org
 #
-# $Id: Makefile,v 1.2 1998/10/06 20:52:44 asami Exp $
+# $Id: Makefile,v 1.3 1998/10/07 06:08:23 asami Exp $
 #
 
 DISTNAME=	gd1.3
@@ -24,6 +24,8 @@ BROKEN_ELF=	linker command line
 
 FETCH_BEFORE_ARGS=	-b
 
+.include <bsd.port.pre.mk>
+
 pre-install:
 	${MKDIR} ${PREFIX}/include/gd
 	${MKDIR} ${PREFIX}/share/examples/gd
@@ -33,12 +35,12 @@ do-install:
 		${INSTALL} -c -o bin -g bin -m 555 ${WRKSRC}/$$i \
 			${PREFIX}/lib; \
 	done
-	if [ "${PORTOBJFORMAT}" = "aout" ]; then \
-		(cd ${PREFIX}/lib; ${LN} -sf libgd.so.1.3 libgd.so); \
-	else \
-		(cd ${PREFIX}/lib; ${MV} -sf libgd.so.1.3 libgd.so.1; \
-		${LN} -sf libgd.so.1 libgd.so); \
-	fi
+.if ${PORTOBJFORMAT} == "aout"
+	cd ${PREFIX}/lib; ${LN} -sf libgd.so.1.3 libgd.so
+.else
+	cd ${PREFIX}/lib; ${MV} -sf libgd.so.1.3 libgd.so.1
+	${LN} -sf libgd.so.1 libgd.so
+.endif
 	for i in gddemo giftogd webgif; do \
 	${INSTALL} -c -o bin -g bin -m 755 ${WRKSRC}/$$i \
 		${PREFIX}/bin; \
@@ -55,4 +57,4 @@ do-install:
 post-install:
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/japanese/gd1/Makefile b/japanese/gd1/Makefile
index 2e4aace509a1..1acf667d3417 100644
--- a/japanese/gd1/Makefile
+++ b/japanese/gd1/Makefile
@@ -3,7 +3,7 @@
 # Date created:				19 Aug 1998
 # Whom:					ichiro@ichiro.org
 #
-# $Id: Makefile,v 1.2 1998/10/06 20:52:44 asami Exp $
+# $Id: Makefile,v 1.3 1998/10/07 06:08:23 asami Exp $
 #
 
 DISTNAME=	gd1.3
@@ -24,6 +24,8 @@ BROKEN_ELF=	linker command line
 
 FETCH_BEFORE_ARGS=	-b
 
+.include <bsd.port.pre.mk>
+
 pre-install:
 	${MKDIR} ${PREFIX}/include/gd
 	${MKDIR} ${PREFIX}/share/examples/gd
@@ -33,12 +35,12 @@ do-install:
 		${INSTALL} -c -o bin -g bin -m 555 ${WRKSRC}/$$i \
 			${PREFIX}/lib; \
 	done
-	if [ "${PORTOBJFORMAT}" = "aout" ]; then \
-		(cd ${PREFIX}/lib; ${LN} -sf libgd.so.1.3 libgd.so); \
-	else \
-		(cd ${PREFIX}/lib; ${MV} -sf libgd.so.1.3 libgd.so.1; \
-		${LN} -sf libgd.so.1 libgd.so); \
-	fi
+.if ${PORTOBJFORMAT} == "aout"
+	cd ${PREFIX}/lib; ${LN} -sf libgd.so.1.3 libgd.so
+.else
+	cd ${PREFIX}/lib; ${MV} -sf libgd.so.1.3 libgd.so.1
+	${LN} -sf libgd.so.1 libgd.so
+.endif
 	for i in gddemo giftogd webgif; do \
 	${INSTALL} -c -o bin -g bin -m 755 ${WRKSRC}/$$i \
 		${PREFIX}/bin; \
@@ -55,4 +57,4 @@ do-install:
 post-install:
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/japanese/iv/Makefile b/japanese/iv/Makefile
index f3fd9e699c66..08c0f2c46b70 100644
--- a/japanese/iv/Makefile
+++ b/japanese/iv/Makefile
@@ -3,7 +3,7 @@
 # Date created:		23.Feb.1996
 # Whom:			sanpei@yy.cs.keio.ac.jp
 #
-# $Id: Makefile,v 1.5 1998/10/16 03:10:45 jseger Exp $
+# $Id: Makefile,v 1.6 1998/10/20 01:23:06 steve Exp $
 #
 
 DISTNAME=	iv-3.1
@@ -57,6 +57,14 @@ MANN=		Adjuster.n Banner.n BasicDialog.n Border.n Box2_6.n \
 		statevars.n stateviews.n struct.n transfns.n \
 		transforms.n uctrls.n viewcmds.n
 
+.include <bsd.port.pre.mk>
+
+.if ${PORTOBJFORMAT} == "elf"
+IV_LIB_VER=	3
+.else
+IV_LIB_VER=	3.1
+.endif
+
 pre-patch:
 	${PATCH} ${PATCH_DIST_ARGS} < ${WRKDIR}/diff-2.0gamma
 
@@ -69,10 +77,4 @@ post-install:
 	@${LN} -fs ${PREFIX}/lib/libUnidraw.so.${IV_LIB_VER} ${PREFIX}/lib/libUnidraw.so
 	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
-.include <bsd.port.mk>
-
-.if ${PORTOBJFORMAT} == "elf"
-IV_LIB_VER=	3
-.else
-IV_LIB_VER=	3.1
-.endif
+.include <bsd.port.post.mk>
diff --git a/japanese/tcl76/Makefile b/japanese/tcl76/Makefile
index 423689c01767..39741beb46d7 100644
--- a/japanese/tcl76/Makefile
+++ b/japanese/tcl76/Makefile
@@ -3,7 +3,7 @@
 # Date created:		11 March 1997
 # Whom:			taguchi@tohoku.iij.ad.jp
 #
-# $Id: Makefile,v 1.6 1998/09/26 12:45:10 kuriyama Exp $
+# $Id: Makefile,v 1.7 1998/09/28 09:53:08 asami Exp $
 #
 
 DISTNAME=	tcl7.6p2
@@ -29,6 +29,8 @@ PATCH_DIST_ARGS=	-d ${WRKDIR}/${DISTNAME} -E ${PATCH_DIST_STRIP}
 PATCH_DIST_ARGS=	-d ${WRKDIR}/${DISTNAME} --forward --quiet -E ${PATCH_DIST_STRIP}
 .endif
 
+.include <bsd.port.pre.mk>
+
 post-extract:
 	@${MV} ${WRKDIR}/tcl7.6 ${WRKDIR}/${DISTNAME}
 
@@ -45,9 +47,9 @@ pre-install:
 
 post-install:
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
-	if [ "${PORTOBJFORMAT}" = "aout" ]; then \
-		${LN} -sf libtcl76jp.so.1.0 ${PREFIX}/lib/libtcl76jp.so; \
-	fi
+.if ${PORTOBJFORMAT} == "aout" 
+	${LN} -sf libtcl76jp.so.1.0 ${PREFIX}/lib/libtcl76jp.so
+.endif
 
 test:
 	cd ${WRKSRC} && ${SETENV} PORTOBJFORMAT=${PORTOBJFORMAT} ${MAKE} test
@@ -55,4 +57,4 @@ test:
 install-man:
 	cd ${WRKSRC} && ${SETENV} PORTOBJFORMAT=${PORTOBJFORMAT} ${MAKE} install-man
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/japanese/tcl80/Makefile b/japanese/tcl80/Makefile
index 756e36dce8d0..83912efe30fb 100644
--- a/japanese/tcl80/Makefile
+++ b/japanese/tcl80/Makefile
@@ -3,7 +3,7 @@
 # Date created:		23 Jan 1998
 # Whom:			taguchi@tohoku.iij.ad.jp
 #
-# $Id: Makefile,v 1.5 1998/09/27 11:17:06 kuriyama Exp $
+# $Id: Makefile,v 1.6 1998/09/28 10:23:58 asami Exp $
 #
 
 DISTNAME=	tcl8.0.3
@@ -28,6 +28,8 @@ GNU_CONFIGURE=	yes
 USE_AUTOCONF=	yes
 CONFIGURE_ARGS=	--enable-shared
 
+.include <bsd.port.pre.mk>
+
 .if !defined(NOPORTDOCS)
 post-patch:
 	@${CP} ${FILESDIR}/README.FreeBSD.in ${TOPDIR}/README.FreeBSD.JP.in
@@ -47,9 +49,9 @@ post-install:
 	 )
 .endif
 	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
-	if [ "${PORTOBJFORMAT}" = "aout" ]; then \
-		${LN} -sf libtcl80jp.so.1.2 ${PREFIX}/lib/libtcl80jp.so; \
-	fi
+.if ${PORTOBJFORMAT} == "aout" 
+	${LN} -sf libtcl80jp.so.1.2 ${PREFIX}/lib/libtcl80jp.so
+.endif
 	@${CAT}	${PKGDIR}/MESSAGE
 
 test:
@@ -58,4 +60,4 @@ test:
 install-man:
 	cd ${WRKSRC} && ${SETENV} PORTOBJFORMAT=${PORTOBJFORMAT} ${MAKE} install-man
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/japanese/tk42/Makefile b/japanese/tk42/Makefile
index a26c2c567b05..d2616dae6d37 100644
--- a/japanese/tk42/Makefile
+++ b/japanese/tk42/Makefile
@@ -3,7 +3,7 @@
 # Date created:		
 # Whom:			taguchi@tohoku.iij.ad.jp
 #
-# $Id: Makefile,v 1.6 1998/09/27 08:24:35 kuriyama Exp $
+# $Id: Makefile,v 1.7 1998/09/28 09:59:02 asami Exp $
 #
 
 DISTNAME=	tk4.2p2
@@ -34,6 +34,8 @@ PATCH_ARGS=		-d ${WRKDIR}/${DISTNAME} --forward --quiet -E ${PATCH_STRIP}
 
 VERSION=	4.2jp
 
+.include <bsd.port.pre.mk>
+
 post-extract:
 	@${MV} ${WRKDIR}/tk4.2 ${WRKDIR}/${DISTNAME}
 
@@ -50,9 +52,9 @@ pre-install:
 post-install:
 	cd ${WRKSRC} && ${MAKE} -f Makefile.lib PREFIX=${PREFIX} VERSION=${VERSION} install
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
-	if [ "${PORTOBJFORMAT}" = "aout" ]; then \
-		${LN} -sf libtk42jp.so.1.0 ${PREFIX}/lib/libtk42jp.so; \
-	fi
+.if ${PORTOBJFORMAT} == "aout"
+	${LN} -sf libtk42jp.so.1.0 ${PREFIX}/lib/libtk42jp.so
+.endif
 	@echo "**********"
 	@echo "IMPORTANT:"
 	@echo "**********"
@@ -68,4 +70,4 @@ test:
 install-man:
 	cd ${WRKSRC} && ${SETENV} PORTOBJFORMAT=${PORTOBJFORMAT} ${MAKE} install-man
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/japanese/tk80/Makefile b/japanese/tk80/Makefile
index 802fe6b03974..08f1f700bc08 100644
--- a/japanese/tk80/Makefile
+++ b/japanese/tk80/Makefile
@@ -3,7 +3,7 @@
 # Date created:		26 Dec 1997
 # Whom:			taguchi@tohoku.iij.ad.jp
 #
-# $Id: Makefile,v 1.7 1998/09/28 15:15:11 kuriyama Exp $
+# $Id: Makefile,v 1.8 1998/11/02 03:47:50 steve Exp $
 #
 
 DISTNAME=	tk8.0.3
@@ -31,6 +31,8 @@ USE_AUTOCONF=	yes
 USE_XLIB=	yes
 CONFIGURE_ARGS=	--enable-shared --with-tcl=${PREFIX}/lib/tcl${VERSION}jp
 
+.include <bsd.port.pre.mk>
+
 .if !defined(NOPORTDOCS)
 post-patch:
 	@${CP} ${FILESDIR}/README.FreeBSD.in ${TOPDIR}/README.FreeBSD.JP.in
@@ -50,9 +52,9 @@ post-install:
 	 )
 .endif
 	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
-	if [ "${PORTOBJFORMAT}" = "aout" ]; then \
-		${LN} -sf libtk80jp.so.1.2 ${PREFIX}/lib/libtk80jp.so; \
-	fi
+.if ${PORTOBJFORMAT} == "aout"
+	${LN} -sf libtk80jp.so.1.2 ${PREFIX}/lib/libtk80jp.so
+.endif
 	@${CAT}	${PKGDIR}/MESSAGE
 
 test:
@@ -61,4 +63,4 @@ test:
 install-man:
 	cd ${WRKSRC} && ${MAKE} install-man
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>