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, 86 insertions, 64 deletions

diff --git a/math/bihar/Makefile b/math/bihar/Makefile
index f96ae79d5ccf..6fa72e4a63bf 100644
--- a/math/bihar/Makefile
+++ b/math/bihar/Makefile
@@ -3,7 +3,7 @@
 # Date created:         31 October 1996
 # Whom:			Pedro Giffuni S.
 #
-# $Id: Makefile,v 1.6 1997/11/19 01:41:27 asami Exp $
+# $Id: Makefile,v 1.7 1998/10/09 03:36:39 asami Exp $
 #
 
 DISTNAME=	bihar
@@ -18,6 +18,8 @@ MAINTAINER=	giffunip@asme.org
 IGNOREFILES=	${DISTFILES}
 EXTRACT_BEFORE_ARGS=	-xf
 
+.include <bsd.port.pre.mk>
+
 post-extract:
 	gunzip $(WRKSRC)/*.f.gz
 
@@ -31,9 +33,9 @@ post-install:
 	-${GZIP_CMD} ${GZIP} ${WRKSRC}/fft.doc
 	${CP} $(WRKSRC)/fft.doc.gz $(PREFIX)/share/doc/fftpack/
 .endif
-	if [ "${PORTOBJFORMAT}" = "aout" ]; then \
-		${LN} -sf libbihar.so.1 ${PREFIX}/lib/libbihar.so; \
-	fi
+.if ${PORTOBJFORMAT} == "aout"
+	${LN} -sf libbihar.so.1 ${PREFIX}/lib/libbihar.so
+.endif
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/math/blas/Makefile b/math/blas/Makefile
index 81299401a731..f04d91620d97 100644
--- a/math/blas/Makefile
+++ b/math/blas/Makefile
@@ -3,7 +3,7 @@
 # Date created:         27 October 1994
 # Whom:                 ljo
 #
-# $Id: Makefile,v 1.19 1998/08/09 00:05:49 steve Exp $
+# $Id: Makefile,v 1.20 1998/09/28 09:44:23 asami Exp $
 #
 
 DISTNAME=	blas
@@ -18,13 +18,15 @@ MAINTAINER=	ports@FreeBSD.org
 
 WRKSRC=		${WRKDIR}
 
+.include <bsd.port.pre.mk>
+
 pre-build:
 	${CP} ${FILESDIR}/makefile.lib ${WRKDIR}/Makefile
 
 post-install:
 	${LDCONFIG} -m ${PREFIX}/lib
-	if [ "${PORTOBJFORMAT}" = "aout" ]; then \
-		${LN} -sf libblas.so.1.0 ${PREFIX}/lib/libblas.so; \
-	fi
+.if ${PORTOBJFORMAT} == "aout"
+	${LN} -sf libblas.so.1.0 ${PREFIX}/lib/libblas.so
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/math/eispack/Makefile b/math/eispack/Makefile
index a74a17eff0f7..b2f5d92c0ae2 100644
--- a/math/eispack/Makefile
+++ b/math/eispack/Makefile
@@ -3,7 +3,7 @@
 # Date created:         31 October 1994
 # Whom:                 ljo
 #
-# $Id: Makefile,v 1.16 1998/09/28 10:49:21 asami Exp $
+# $Id: Makefile,v 1.17 1998/11/07 18:31:13 fenner Exp $
 #
 
 DISTNAME=	eispack
@@ -36,6 +36,8 @@ SRCS =	csroot.f epslon.f pythag.f bakvec.f balanc.f balbak.f bandr.f \
 
 DISTFILES=	${SRCS:.f=.f.gz}
 
+.include <bsd.port.pre.mk>
+
 pre-build:
 	cp Makefile.lib ${WRKDIR}/Makefile
 
@@ -44,8 +46,8 @@ pre-extract:
 
 post-install:
 	${LDCONFIG} -m ${PREFIX}/lib
-	if [ "${PORTOBJFORMAT}" = "aout" ]; then \
-		${LN} -sf libeispack.so.1.0 ${PREFIX}/lib/libeispack.so; \
-	fi
+.if ${PORTOBJFORMAT} == "aout"
+	${LN} -sf libeispack.so.1.0 ${PREFIX}/lib/libeispack.so
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/math/fftpack/Makefile b/math/fftpack/Makefile
index f96ae79d5ccf..6fa72e4a63bf 100644
--- a/math/fftpack/Makefile
+++ b/math/fftpack/Makefile
@@ -3,7 +3,7 @@
 # Date created:         31 October 1996
 # Whom:			Pedro Giffuni S.
 #
-# $Id: Makefile,v 1.6 1997/11/19 01:41:27 asami Exp $
+# $Id: Makefile,v 1.7 1998/10/09 03:36:39 asami Exp $
 #
 
 DISTNAME=	bihar
@@ -18,6 +18,8 @@ MAINTAINER=	giffunip@asme.org
 IGNOREFILES=	${DISTFILES}
 EXTRACT_BEFORE_ARGS=	-xf
 
+.include <bsd.port.pre.mk>
+
 post-extract:
 	gunzip $(WRKSRC)/*.f.gz
 
@@ -31,9 +33,9 @@ post-install:
 	-${GZIP_CMD} ${GZIP} ${WRKSRC}/fft.doc
 	${CP} $(WRKSRC)/fft.doc.gz $(PREFIX)/share/doc/fftpack/
 .endif
-	if [ "${PORTOBJFORMAT}" = "aout" ]; then \
-		${LN} -sf libbihar.so.1 ${PREFIX}/lib/libbihar.so; \
-	fi
+.if ${PORTOBJFORMAT} == "aout"
+	${LN} -sf libbihar.so.1 ${PREFIX}/lib/libbihar.so
+.endif
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/math/lapack/Makefile b/math/lapack/Makefile
index caa193bada9c..f7feec1fcdef 100644
--- a/math/lapack/Makefile
+++ b/math/lapack/Makefile
@@ -3,7 +3,7 @@
 # Date created:         2 July 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.8 1998/08/25 02:26:19 asami Exp $
+# $Id: Makefile,v 1.9 1998/09/27 20:08:00 steve Exp $
 #
 
 DISTNAME=	LAPACK
@@ -181,18 +181,20 @@ MANL=	cgbmv.l cgemm.l cgemv.l cgerc.l cgeru.l chbmv.l chemm.l chemv.l \
 	zungtr.l zunm2l.l zunm2r.l zunmbr.l zunmhr.l zunml2.l zunmlq.l \
 	zunmql.l zunmqr.l zunmr2.l zunmrq.l zunmtr.l zupgtr.l zupmtr.l \
 
+.include <bsd.port.pre.mk>
+
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/BLAS/SRC/libblas.* ${PREFIX}/lib
 	${INSTALL_DATA} ${WRKSRC}/SRC/liblapack.* ${PREFIX}/lib
-	if [ "${PORTOBJFORMAT}" = "elf" ]; then \
-		${LN} -sf libblas.so.2 ${PREFIX}/lib/libblas.so; \
-		${LN} -sf liblapack.so.2 ${PREFIX}/lib/liblapack.so; \
-	else \
-		${LN} -sf libblas.so.2.0 ${PREFIX}/lib/libblas.so; \
-		${LN} -sf liblapack.so.2.0 ${PREFIX}/lib/liblapack.so; \
-	fi
+.if ${PORTOBJFORMAT} == "elf"
+	${LN} -sf libblas.so.2 ${PREFIX}/lib/libblas.so
+	${LN} -sf liblapack.so.2 ${PREFIX}/lib/liblapack.so
+.else
+	${LN} -sf libblas.so.2.0 ${PREFIX}/lib/libblas.so
+	${LN} -sf liblapack.so.2.0 ${PREFIX}/lib/liblapack.so
+.endif
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 	${INSTALL_MAN} ${WRKDIR}/blas/man/manl/*.l ${PREFIX}/man/manl
 	${INSTALL_MAN} ${WRKDIR}/man/manl/*.l ${PREFIX}/man/manl
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/math/librandlib/Makefile b/math/librandlib/Makefile
index 7f899107d9ed..427dbe91cabf 100644
--- a/math/librandlib/Makefile
+++ b/math/librandlib/Makefile
@@ -3,7 +3,7 @@
 # Date created:		06 April 1997
 # Whom:			Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.2 1997/04/23 06:57:54 tg Exp $
+# $Id: Makefile,v 1.3 1998/10/26 07:45:01 asami Exp $
 #
 
 DISTNAME=	ranlib.c
@@ -15,6 +15,8 @@ MAINTAINER=	tg@FreeBSD.ORG
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
+.include <bsd.port.pre.mk>
+
 post-extract:
 	@${CP} ${FILESDIR}/Makefile.lib ${WRKSRC}/Makefile
 
@@ -23,9 +25,9 @@ post-install:
 	@${MKDIR} ${PREFIX}/share/doc/ranlib
 	@${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/doc/* ${PREFIX}/share/doc/ranlib
 .endif
-	if [ "${PORTOBJFORMAT}" = "aout" ]; then \
-		${LN} -sf libranlib.so.1.0 ${PREFIX}/lib/libranlib.so; \
-	fi
+.if ${PORTOBJFORMAT} == "aout"
+	${LN} -sf libranlib.so.1.0 ${PREFIX}/lib/libranlib.so
+.endif
 	@${LDCONFIG} -m ${PREFIX}/lib
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/math/libranlib/Makefile b/math/libranlib/Makefile
index 7f899107d9ed..427dbe91cabf 100644
--- a/math/libranlib/Makefile
+++ b/math/libranlib/Makefile
@@ -3,7 +3,7 @@
 # Date created:		06 April 1997
 # Whom:			Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.2 1997/04/23 06:57:54 tg Exp $
+# $Id: Makefile,v 1.3 1998/10/26 07:45:01 asami Exp $
 #
 
 DISTNAME=	ranlib.c
@@ -15,6 +15,8 @@ MAINTAINER=	tg@FreeBSD.ORG
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
+.include <bsd.port.pre.mk>
+
 post-extract:
 	@${CP} ${FILESDIR}/Makefile.lib ${WRKSRC}/Makefile
 
@@ -23,9 +25,9 @@ post-install:
 	@${MKDIR} ${PREFIX}/share/doc/ranlib
 	@${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/doc/* ${PREFIX}/share/doc/ranlib
 .endif
-	if [ "${PORTOBJFORMAT}" = "aout" ]; then \
-		${LN} -sf libranlib.so.1.0 ${PREFIX}/lib/libranlib.so; \
-	fi
+.if ${PORTOBJFORMAT} == "aout"
+	${LN} -sf libranlib.so.1.0 ${PREFIX}/lib/libranlib.so
+.endif
 	@${LDCONFIG} -m ${PREFIX}/lib
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/math/linpack/Makefile b/math/linpack/Makefile
index 65a107ee54d0..6796f7f1d877 100644
--- a/math/linpack/Makefile
+++ b/math/linpack/Makefile
@@ -3,7 +3,7 @@
 # Date created:         31 October 1994
 # Whom:                 ljo
 #
-# $Id: Makefile,v 1.15 1998/09/27 05:39:37 steve Exp $
+# $Id: Makefile,v 1.16 1998/09/28 10:49:17 asami Exp $
 #
 
 DISTNAME=	linpack
@@ -49,6 +49,8 @@ SRCS =	cchdc.f cchdd.f cchex.f cchud.f cgbco.f cgbdi.f cgbfa.f cgbsl.f \
 
 DISTFILES=	${SRCS:.f=.f.gz}
 
+.include <bsd.port.pre.mk>
+
 pre-build:
 	cp Makefile.lib ${WRKDIR}/Makefile
 
@@ -57,8 +59,8 @@ pre-extract:
 
 post-install:
 	${LDCONFIG} -m ${PREFIX}/lib
-	if [ "${PORTOBJFORMAT}" = "aout" ]; then \
-		${LN} -sf liblinpack.so.1.0 ${PREFIX}/lib/liblinpack.so; \
-	fi
+.if ${PORTOBJFORMAT} == "aout"
+	${LN} -sf liblinpack.so.1.0 ${PREFIX}/lib/liblinpack.so
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/math/plplot/Makefile b/math/plplot/Makefile
index 1a5f28b022e1..055ff6f3167d 100644
--- a/math/plplot/Makefile
+++ b/math/plplot/Makefile
@@ -3,7 +3,7 @@
 # Date created:         03 Oct 1997
 # Whom:                 Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.4 1997/12/24 01:21:31 alex Exp $
+# $Id: Makefile,v 1.5 1998/09/27 20:11:17 steve Exp $
 #
 
 DISTNAME=       plplot4p99j
@@ -16,15 +16,17 @@ MAINTAINER=	tg@FreeBSD.ORG
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --with-gcc=yes --with-double=yes
 
+.include <bsd.port.pre.mk>
+
 post-patch:
 	@perl -pi.bak -e "s|/usr/local/plplot/lib|${PREFIX}/lib/plplot|g;" \
 		${WRKSRC}/src/plctrl.c
 
 post-install:
-	if [ "${PORTOBJFORMAT}" = "elf" ]; then \
-		${LN} -sf libplplotdX.so.4 ${PREFIX}/lib/libplplotdX.so; \
-	else \
-		${LN} -sf libplplotdX.so.4.99 ${PREFIX}/lib/libplplotdX.so; \
-	fi
+.if ${PORTOBJFORMAT} == "elf"
+	${LN} -sf libplplotdX.so.4 ${PREFIX}/lib/libplplotdX.so
+.else
+	${LN} -sf libplplotdX.so.4.99 ${PREFIX}/lib/libplplotdX.so
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/math/randlib/Makefile b/math/randlib/Makefile
index 7f899107d9ed..427dbe91cabf 100644
--- a/math/randlib/Makefile
+++ b/math/randlib/Makefile
@@ -3,7 +3,7 @@
 # Date created:		06 April 1997
 # Whom:			Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.2 1997/04/23 06:57:54 tg Exp $
+# $Id: Makefile,v 1.3 1998/10/26 07:45:01 asami Exp $
 #
 
 DISTNAME=	ranlib.c
@@ -15,6 +15,8 @@ MAINTAINER=	tg@FreeBSD.ORG
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
+.include <bsd.port.pre.mk>
+
 post-extract:
 	@${CP} ${FILESDIR}/Makefile.lib ${WRKSRC}/Makefile
 
@@ -23,9 +25,9 @@ post-install:
 	@${MKDIR} ${PREFIX}/share/doc/ranlib
 	@${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/doc/* ${PREFIX}/share/doc/ranlib
 .endif
-	if [ "${PORTOBJFORMAT}" = "aout" ]; then \
-		${LN} -sf libranlib.so.1.0 ${PREFIX}/lib/libranlib.so; \
-	fi
+.if ${PORTOBJFORMAT} == "aout"
+	${LN} -sf libranlib.so.1.0 ${PREFIX}/lib/libranlib.so
+.endif
 	@${LDCONFIG} -m ${PREFIX}/lib
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/math/simpack/Makefile b/math/simpack/Makefile
index 9a0b9f30ee78..96f0e882adaa 100644
--- a/math/simpack/Makefile
+++ b/math/simpack/Makefile
@@ -3,7 +3,7 @@
 # Date created:        5 June 1997
 # Whom:                Ruslan Shevchenko <rssh@cki.ipri.kiev.ua>
 #
-# $Id: Makefile,v 1.2 1997/07/13 18:49:24 max Exp $
+# $Id: Makefile,v 1.3 1998/09/27 20:13:13 steve Exp $
 #
 
 DISTNAME=	simpack-3.0
@@ -15,6 +15,14 @@ MAINTAINER=	rssh@cki.ipri.kiev.ua
 
 WRKSRC=	${WRKDIR}/simpack
 
+.include <bsd.port.pre.mk>
+
+.if ${PORTOBJFORMAT} == "elf"
+VERSION=	1
+.else
+VERSION=	1.0
+.endif
+
 post-build: create-libs create-scripts
 
 do-install: do-install-bin do-install-include do-install-lib do-install-doc
@@ -131,10 +139,4 @@ create-deq-alias:
 	@${ECHO} ${PREFIX}/lib/SimPack/constraint/differential/deq $$*       \
 			   >> ${WRKDIR}/temp/deq.alias
 
-.include <bsd.port.mk>
-
-.if ${PORTOBJFORMAT} == "elf"
-VERSION=	1
-.else
-VERSION=	1.0
-.endif
+.include <bsd.port.post.mk>