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.

5 files changed, 54 insertions, 47 deletions

diff --git a/net/hesiod/Makefile b/net/hesiod/Makefile
index 62e9db4ddeac..860693495738 100644
--- a/net/hesiod/Makefile
+++ b/net/hesiod/Makefile
@@ -3,7 +3,7 @@
 # Date created:				6/11/1998
 # Whom:					n@nectar.com
 #
-# $Id: Makefile,v 1.2 1998/07/05 13:09:46 asami Exp $
+# $Id: Makefile,v 1.3 1998/10/07 19:34:45 nectar Exp $
 #
 
 DISTNAME=		hesiod-3.0.2
@@ -23,16 +23,7 @@ MAN5=			hesiod.conf.5
 
 GNU_CONFIGURE=		YES
 
-post-install:
-	${SETENV} OBJFORMAT="${PORTOBJFORMAT}" ${LDCONFIG} -m ${PREFIX}/lib
-
-.include <bsd.port.mk>
-
-.if !defined(PORTOBJFORMAT) # bsd.port.mk must be out of date
-PORTOBJFORMAT=		aout
-CONFIGURE_ENV+=		PORTOBJFORMAT="${PORTOBJFORMAT}"
-MAKE_ENV+=		PORTOBJFORMAT="${PORTOBJFORMAT}"
-.endif
+.include <bsd.port.pre.mk>
 
 .if ${PORTOBJFORMAT} == elf
 SHLIB=libhesiod.so.3
@@ -43,3 +34,8 @@ CONFIGURE_ENV+=		LDFLAGS="-shared"
 .endif
 
 MAKE_ENV+=		SHLIB="${SHLIB}"
+
+post-install:
+	${SETENV} OBJFORMAT="${PORTOBJFORMAT}" ${LDCONFIG} -m ${PREFIX}/lib
+
+.include <bsd.port.post.mk>
diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile
index f9c8ac74ffc0..44acc26a7de0 100644
--- a/net/net-snmp/Makefile
+++ b/net/net-snmp/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 June 1996
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.21 1998/08/30 15:51:13 steve Exp $
+# $Id: Makefile,v 1.22 1998/10/19 22:43:08 nectar Exp $
 #
 
 DISTNAME=	ucd-snmp-3.5.3
@@ -36,6 +36,17 @@ SBIN=		snmpd snmptrapd
 
 STARTUP_FILE=	${PREFIX}/etc/rc.d/snmpd.sh.sample
 
+.include <bsd.port.pre.mk>
+
+
+.if ${PORTOBJFORMAT} == "aout"
+SHLIB_VERSION=3.5
+PATCHDIR=patches.aout
+.else
+SHLIB_VERSION=3
+.endif
+MAKE_ENV+= SHLIB_VERSION=${SHLIB_VERSION}
+
 post-install:
 	( cd ${PREFIX}/bin && strip ${BIN} )
 	( cd ${PREFIX}/sbin && strip ${SBIN} )
@@ -51,12 +62,4 @@ post-install:
 	 fi
 	${SETENV} OBJFORMAT="${PORTOBJFORMAT}" ${LDCONFIG} -m ${PREFIX}/lib
 
-.include <bsd.port.mk>
-
-.if (${PORTOBJFORMAT} == "aout")
-SHLIB_VERSION=3.5
-PATCHDIR=patches.aout
-.else
-SHLIB_VERSION=3
-.endif
-MAKE_ENV+= SHLIB_VERSION=${SHLIB_VERSION}
+.include <bsd.port.post.mk>
diff --git a/net/net-snmp4/Makefile b/net/net-snmp4/Makefile
index f9c8ac74ffc0..44acc26a7de0 100644
--- a/net/net-snmp4/Makefile
+++ b/net/net-snmp4/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 June 1996
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.21 1998/08/30 15:51:13 steve Exp $
+# $Id: Makefile,v 1.22 1998/10/19 22:43:08 nectar Exp $
 #
 
 DISTNAME=	ucd-snmp-3.5.3
@@ -36,6 +36,17 @@ SBIN=		snmpd snmptrapd
 
 STARTUP_FILE=	${PREFIX}/etc/rc.d/snmpd.sh.sample
 
+.include <bsd.port.pre.mk>
+
+
+.if ${PORTOBJFORMAT} == "aout"
+SHLIB_VERSION=3.5
+PATCHDIR=patches.aout
+.else
+SHLIB_VERSION=3
+.endif
+MAKE_ENV+= SHLIB_VERSION=${SHLIB_VERSION}
+
 post-install:
 	( cd ${PREFIX}/bin && strip ${BIN} )
 	( cd ${PREFIX}/sbin && strip ${SBIN} )
@@ -51,12 +62,4 @@ post-install:
 	 fi
 	${SETENV} OBJFORMAT="${PORTOBJFORMAT}" ${LDCONFIG} -m ${PREFIX}/lib
 
-.include <bsd.port.mk>
-
-.if (${PORTOBJFORMAT} == "aout")
-SHLIB_VERSION=3.5
-PATCHDIR=patches.aout
-.else
-SHLIB_VERSION=3
-.endif
-MAKE_ENV+= SHLIB_VERSION=${SHLIB_VERSION}
+.include <bsd.port.post.mk>
diff --git a/net/ucd-snmp/Makefile b/net/ucd-snmp/Makefile
index f9c8ac74ffc0..44acc26a7de0 100644
--- a/net/ucd-snmp/Makefile
+++ b/net/ucd-snmp/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 June 1996
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.21 1998/08/30 15:51:13 steve Exp $
+# $Id: Makefile,v 1.22 1998/10/19 22:43:08 nectar Exp $
 #
 
 DISTNAME=	ucd-snmp-3.5.3
@@ -36,6 +36,17 @@ SBIN=		snmpd snmptrapd
 
 STARTUP_FILE=	${PREFIX}/etc/rc.d/snmpd.sh.sample
 
+.include <bsd.port.pre.mk>
+
+
+.if ${PORTOBJFORMAT} == "aout"
+SHLIB_VERSION=3.5
+PATCHDIR=patches.aout
+.else
+SHLIB_VERSION=3
+.endif
+MAKE_ENV+= SHLIB_VERSION=${SHLIB_VERSION}
+
 post-install:
 	( cd ${PREFIX}/bin && strip ${BIN} )
 	( cd ${PREFIX}/sbin && strip ${SBIN} )
@@ -51,12 +62,4 @@ post-install:
 	 fi
 	${SETENV} OBJFORMAT="${PORTOBJFORMAT}" ${LDCONFIG} -m ${PREFIX}/lib
 
-.include <bsd.port.mk>
-
-.if (${PORTOBJFORMAT} == "aout")
-SHLIB_VERSION=3.5
-PATCHDIR=patches.aout
-.else
-SHLIB_VERSION=3
-.endif
-MAKE_ENV+= SHLIB_VERSION=${SHLIB_VERSION}
+.include <bsd.port.post.mk>
diff --git a/net/wb/Makefile b/net/wb/Makefile
index 9d3452c1c051..0409f57862b9 100644
--- a/net/wb/Makefile
+++ b/net/wb/Makefile
@@ -3,7 +3,7 @@
 # Date created:		2 Novermber 1996
 # Whom:			fenner
 #
-# $Id: Makefile,v 1.4 1998/08/05 09:31:33 asami Exp $
+# $Id: Makefile,v 1.5 1998/09/27 01:43:59 steve Exp $
 #
 
 DISTNAME=       wb-1.59
@@ -20,6 +20,12 @@ USE_X_PREFIX=	yes
 # XXX ghostscript, ghostscript3, ghostscript4 or ghostscript5 will all do.
 RUN_DEPENDS=	gs:${PORTSDIR}/print/ghostscript5
 
+.include <bsd.port.pre.mk>
+
+.if ${PORTOBJFORMAT} == "elf"
+STRIP=
+.endif
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/wb ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
@@ -30,8 +36,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/lblwb.ps ${PREFIX}/share/doc/wb
 .endif
 
-.include <bsd.port.mk>
-
-.if ${PORTOBJFORMAT} == "elf"
-STRIP=
-.endif
+.include <bsd.port.post.mk>