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.
author: Satoshi Asami <asami@FreeBSD.org> 1998-11-14 09:43:39 +0000
committer: Satoshi Asami <asami@FreeBSD.org> 1998-11-14 09:43:39 +0000
commit: 96bc8048c3217bb231f2f30eadeb628134b557f5 (patch)
tree: c75d5bd5a6faba5d6ec73da367e4bfe5b0d4285d
parent: Checksum changed.... (diff)
70 files changed, 723 insertions, 584 deletions
diff --git a/archivers/rar/Makefile b/archivers/rar/Makefile
index a214ee873202..ad67163ba6f1 100644
--- a/archivers/rar/Makefile
+++ b/archivers/rar/Makefile
@@ -4,7 +4,7 @@
 # Date created:         15 May 1996
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.8 1997/11/26 01:41:36 jseger Exp $
+# $Id: Makefile,v 1.9 1998/09/23 00:59:38 steve Exp $
 #
 
 DISTNAME=       rarbsd
@@ -21,6 +21,12 @@ NO_WRKSUBDIR=   yes
 EXTRACT_CMD=
 EXTRACT_BEFORE_ARGS=
 
+.include <bsd.port.pre.mk>
+
+.if ${PORTOBJFORMAT} == "elf"
+STRIP=
+.endif
+
 post-fetch:
 	chmod a+x ${DISTDIR}/${DISTFILES}
 
@@ -46,8 +52,4 @@ do-install:
 		${INSTALL_DATA} Dos.SFX \
 			${PREFIX}/share/rar/dos.sfx
 
-.include <bsd.port.mk>
-
-.if ${PORTOBJFORMAT} == "elf"
-STRIP=
-.endif
+.include <bsd.port.post.mk>
diff --git a/audio/mpg123/Makefile b/audio/mpg123/Makefile
index 01cf7b24fe71..cd36ce45dd08 100644
--- a/audio/mpg123/Makefile
+++ b/audio/mpg123/Makefile
@@ -3,7 +3,7 @@
 # Date created:			25 June 1997
 # Whom:				Carey Jones <mcj@acquiesce.org>
 #
-# $Id: Makefile,v 1.7 1998/09/28 01:50:59 steve Exp $
+# $Id: Makefile,v 1.8 1998/10/03 12:09:54 jkoshy Exp $
 #
 
 DISTNAME=	mpg123-0.59o
@@ -15,10 +15,12 @@ MAINTAINER=	jkoshy@freebsd.org
 
 MAN1=		mpg123.1
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
 
 .if ${PORTOBJFORMAT} == "elf"
 ALL_TARGET=	freebsd-elf
 .else
 ALL_TARGET=	freebsd
 .endif
+
+.include <bsd.port.post.mk>
diff --git a/audio/x11amp/Makefile b/audio/x11amp/Makefile
index 591fe77fea45..aa97a31f084f 100644
--- a/audio/x11amp/Makefile
+++ b/audio/x11amp/Makefile
@@ -3,7 +3,7 @@
 # Date created:         13 Jul 1998
 # Whom:                 Donald Burr <dburr@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.3 1998/08/05 09:30:44 asami Exp $
+# $Id: Makefile,v 1.4 1998/09/28 01:55:08 steve Exp $
 #
 
 DISTNAME=	x11amp-0.7-FreeBSD
@@ -20,14 +20,16 @@ WRKSRC=		${WRKDIR}/x11amp
 USE_X_PREFIX=	YES
 NO_BUILD=	YES
 
+.include <bsd.port.pre.mk>
+
+.if ${PORTOBJFORMAT} == "elf"
+STRIP=
+.endif
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/x11amp ${PREFIX}/bin/x11amp
 
 post-install:
 	@${CAT} ${PKGDIR}/MESSAGE
 
-.include <bsd.port.mk>
-
-.if ${PORTOBJFORMAT} == "elf"
-STRIP=
-.endif
+.include <bsd.port.post.mk>
diff --git a/biology/kinemage/Makefile b/biology/kinemage/Makefile
index 7b5be3520455..ad305924618c 100644
--- a/biology/kinemage/Makefile
+++ b/biology/kinemage/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Dec 4 1997
 # Whom:                 frankch@waru.life.nthu.edu.tw
 #
-# $Id: Makefile,v 1.3 1998/09/27 01:36:52 steve Exp $
+# $Id: Makefile,v 1.4 1998/11/13 15:27:42 billf Exp $
 #
 
 DISTNAME=	MAGE_4_2.LINUX
@@ -20,6 +20,12 @@ RUN_DEPENDS=	/compat/linux/lib/libc.so.5:${PORTSDIR}/emulators/linux_lib
 NO_WRKSUBDIR=	YES
 NO_BUILD=	YES
 
+.include <bsd.port.pre.mk>
+
+.if ${PORTOBJFORMAT} == "elf"
+STRIP=
+.endif
+
 do-extract:
 	@${MKDIR} ${WRKDIR}
 	@${CP} ${DISTDIR}/${DISTFILES} ${WRKDIR}
@@ -28,8 +34,4 @@ do-extract:
 do-install:
 	@${INSTALL_PROGRAM} ${WRKDIR}/MAGE_4_2.LINUX ${PREFIX}/bin/kinemage
 
-.include <bsd.port.mk>
-
-.if ${PORTOBJFORMAT} == "elf"
-STRIP=
-.endif
+.include <bsd.port.post.mk>
diff --git a/converters/uulib/Makefile b/converters/uulib/Makefile
index 7c782d22ca8c..5c9dbbeff06b 100644
--- a/converters/uulib/Makefile
+++ b/converters/uulib/Makefile
@@ -3,7 +3,7 @@
 # Date Created:		04 Aug 1996
 # Whom:			Tim Vanderhoek <ac199@freenet.hamilton.on.ca>
 #
-# $Id: Makefile,v 1.15 1998/06/14 17:31:23 hoek Exp $
+# $Id: Makefile,v 1.16 1998/09/26 23:48:21 steve Exp $
 #
 
 DISTNAME=       uudeview-0.5.13
@@ -20,6 +20,14 @@ MAN3=		uulib.3
 
 ALL_TARGET=	libuu.a	libuu.so.${VERSION}
 
+.include <bsd.port.pre.mk>
+
+.if ${PORTOBJFORMAT} == "elf"
+VERSION=	1
+.else
+VERSION=	1.0
+.endif
+
 DOCFILES=	HISTORY doc/Makefile doc/README doc/binhex.fig \
 		doc/library.ltx doc/structure.fig doc/td-v1.c doc/td-v2.c \
 		doc/td-v3.c doc/test.txt
@@ -42,10 +50,4 @@ do-install:
 .endfor
 .endif
 
-.include <bsd.port.mk>
-
-.if ${PORTOBJFORMAT} == "elf"
-VERSION=	1
-.else
-VERSION=	1.0
-.endif
+.include <bsd.port.post.mk>
diff --git a/databases/typhoon/Makefile b/databases/typhoon/Makefile
index e05d77c7def9..802610d500c7 100644
--- a/databases/typhoon/Makefile
+++ b/databases/typhoon/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Wed Dec 11 15:16:19 CST 1996
 # Whom:			erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.4 1998/10/20 01:30:01 steve Exp $
+# $Id: Makefile,v 1.5 1998/10/22 02:30:24 asami Exp $
 #
 
 DISTNAME=	typhoon-1.10.3
@@ -22,13 +22,15 @@ MAN3=d_close.3 d_crget.3 d_crread.3 d_crset.3 d_dbdpath.3 d_dbfpath.3 \
      d_recwrite.3 d_setfiles.3
 MAN1=ddlp.1
 
+.include <bsd.port.pre.mk>
+
 post-install:
 	@${MKDIR} ${PREFIX}/share/typhoon
 	@${INSTALL_DATA} ${WRKSRC}/man/manual.asc ${PREFIX}/share/typhoon
 	@${INSTALL_DATA} ${WRKSRC}/include/environ.h ${WRKSRC}/include/typhoon.h ${PREFIX}/include
-	@if [ ${PORTOBJFORMAT} = "aout" ]; then \
-		${LN} -sf libtyphoon.so.1.10 ${PREFIX}/lib/libtyphoon.so; \
-	fi
+.if ${PORTOBJFORMAT} == "aout"
+	${LN} -sf libtyphoon.so.1.10 ${PREFIX}/lib/libtyphoon.so
+.endif
 	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/amulet/Makefile b/devel/amulet/Makefile
index ed5183bda5af..e785723ada5e 100644
--- a/devel/amulet/Makefile
+++ b/devel/amulet/Makefile
@@ -3,7 +3,7 @@
 # Date created:       26 July 1997
 # Whom:               Filip Bovyn (bovynf@awe.be)
 #
-# $Id: Makefile,v 1.5 1998/10/12 15:36:27 jseger Exp $
+# $Id: Makefile,v 1.6 1998/10/20 01:32:14 steve Exp $
 
 DISTNAME=	amulet
 PKGNAME=	amulet-3.0
@@ -17,6 +17,14 @@ USE_X_PREFIX=	yes
 WRKSRC=		$(WRKDIR)/amulet
 MAKE_ENV=	AMULET_DIR=$(WRKSRC) AMULET_VARS_FILE=Makefile.vars.gcc.FreeBSD
 
+.include <bsd.port.pre.mk>
+
+.if $(PORTOBJFORMAT) == "elf"
+SO_VERSION=	3
+.else
+SO_VERSION=	3.0
+.endif
+
 pre-build:
 	${CP} $(FILESDIR)/Makefile.vars.gcc.FreeBSD $(WRKSRC)/bin
 
@@ -93,10 +101,4 @@ do-install:
 	   $(INSTALL_PROGRAM) $(WRKSRC)/bin/$$a $(PREFIX)/share/amulet/samples; \
 	 done)
 
-.include <bsd.port.mk>
-
-.if $(PORTOBJFORMAT) == "elf"
-SO_VERSION=	3
-.else
-SO_VERSION=	3.0
-.endif
+.include <bsd.port.post.mk>
diff --git a/devel/ilu/Makefile b/devel/ilu/Makefile
index 30e062d3dc46..59b55fbd0230 100644
--- a/devel/ilu/Makefile
+++ b/devel/ilu/Makefile
@@ -3,7 +3,7 @@
 # Date created:         29.9.1997
 # Whom:                 cracauer@cons.org "Martin Cracauer"
 #
-# $Id: Makefile,v 1.12 1998/10/08 16:37:18 cracauer Exp $
+# $Id: Makefile,v 1.13 1998/10/08 18:48:56 cracauer Exp $
 #
 
 DISTNAME=	ilu-2.0alpha12
@@ -25,6 +25,22 @@ CONFIGURE_ARGS+=	--prefix=${PREFIX}/ilu
 INSTALL_TARGET=	Install
 PLIST=		${WRKSRC}/PLIST
 
+.include <bsd.port.pre.mk>
+
+.if ${PORTOBJFORMAT} == "elf"
+SHLIBPATCH=files/shlib-elf.patch
+# The FreeBSD Java Development Kit is still in aout object format.
+# You might want to enable it if you have an ELF JDK and/or build
+# a seperate aout ILU runtime to use with Java.
+CONFIGURE_ARGS+=	--disable-java-support
+.else
+SHLIBPATCH=files/shlib-aout.patch
+# Java support on -stable does not work (ILU runtime dumps core).
+# You might want to enable it if you know what you are doing.
+# Maybe taking -O out of patches/patch-1-cra-cflags help.
+CONFIGURE_ARGS+=	--disable-java-support
+.endif
+
 # Startup script, run at boot time
 startup_dir=	${PREFIX}/etc/rc.d
 startup_script=	${startup_dir}/50.ilu.sh
@@ -63,18 +79,4 @@ do-install:
 	chmod 755 ${startup_script};
 	${startup_script}
 
-.include <bsd.port.mk>
-
-.if ${PORTOBJFORMAT} == "elf"
-SHLIBPATCH=files/shlib-elf.patch
-# The FreeBSD Java Development Kit is still in aout object format.
-# You might want to enable it if you have an ELF JDK and/or build
-# a seperate aout ILU runtime to use with Java.
-CONFIGURE_ARGS+=	--disable-java-support
-.else
-SHLIBPATCH=files/shlib-aout.patch
-# Java support on -stable does not work (ILU runtime dumps core).
-# You might want to enable it if you know what you are doing.
-# Maybe taking -O out of patches/patch-1-cra-cflags help.
-CONFIGURE_ARGS+=	--disable-java-support
-.endif
+.include <bsd.port.post.mk>
diff --git a/dns/hesiod/Makefile b/dns/hesiod/Makefile
index 62e9db4ddeac..860693495738 100644
--- a/dns/hesiod/Makefile
+++ b/dns/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/emulators/ines/Makefile b/emulators/ines/Makefile
index 92e061df244c..3f1fd55bbd0a 100644
--- a/emulators/ines/Makefile
+++ b/emulators/ines/Makefile
@@ -3,7 +3,7 @@
 # Date created:		02 November 1996
 # Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.8 1998/10/13 03:43:37 jseger Exp $
+# $Id: Makefile,v 1.9 1998/10/13 04:01:21 jseger Exp $
 #
 
 DISTNAME=	iNES07-FreeBSD-80x86-bin
@@ -18,6 +18,12 @@ WRKSRC=		${WRKDIR}/NES
 USE_X_PREFIX=	yes
 NO_BUILD=	yes
 
+.include <bsd.port.pre.mk>
+
+.if ${PORTOBJFORMAT} == "elf"
+STRIP=
+.endif
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ines ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/ines-debug ${PREFIX}/bin
@@ -26,8 +32,4 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/headers.tgz ${PREFIX}/share/ines
 	@${INSTALL_DATA} ${WRKSRC}/CART.* ${PREFIX}/share/ines
 
-.include <bsd.port.mk>
-
-.if ${PORTOBJFORMAT} == "elf"
-STRIP=
-.endif
+.include <bsd.port.post.mk>
diff --git a/ftp/ncftp3/Makefile b/ftp/ncftp3/Makefile
index 12278a6e6dad..52d053001d00 100644
--- a/ftp/ncftp3/Makefile
+++ b/ftp/ncftp3/Makefile
@@ -4,7 +4,7 @@
 # Date created:         4 Nov 1994
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.59 1998/09/28 09:31:59 asami Exp $
+# $Id: Makefile,v 1.60 1998/11/11 20:58:49 obrien Exp $
 #
 
 DISTNAME=	ncftp-3.0beta15-src
@@ -21,6 +21,16 @@ MAN1=		ncftp3.1 ncftpbatch.1 ncftpget.1 ncftpls.1 ncftpput.1
 MAN3=		Strn.3
 NO_LATEST_LINK=	yes
 
+.include <bsd.port.pre.mk>
+
+.if ${PORTOBJFORMAT} == "elf"
+LIBNCFTP= libncftp.so.2
+LIBSTRN=libStrn.so.1
+.else
+LIBNCFTP= libncftp.so.2.0
+LIBSTRN=libStrn.so.1.0
+.endif
+
 post-patch:
 	@${MV} ${WRKSRC}/ncftp/pref.h ${WRKSRC}/ncftp/pref.h.in
 	@${SED} -e 's:/etc/ncftp.firewall:${PREFIX}/etc/ncftp.firewall:' \
@@ -46,12 +56,4 @@ do-install:
 		$(PREFIX)/man/man1
 	@$(INSTALL_MAN) $(WRKSRC)/Strn/Strn.3 $(PREFIX)/man/man3
 
-.include <bsd.port.mk>
-
-.if ${PORTOBJFORMAT} == "elf"
-LIBNCFTP= libncftp.so.2
-LIBSTRN=libStrn.so.1
-.else
-LIBNCFTP= libncftp.so.2.0
-LIBSTRN=libStrn.so.1.0
-.endif
+.include <bsd.port.post.mk>
diff --git a/games/libshhcards/Makefile b/games/libshhcards/Makefile
index ce69f3a2017f..26197db1e98e 100644
--- a/games/libshhcards/Makefile
+++ b/games/libshhcards/Makefile
@@ -3,7 +3,7 @@
 # Date created:				12 April 1998
 # Whom:					Andrey Zakhvatov
 #
-# $Id: Makefile,v 1.3 1998/09/28 02:08:56 steve Exp $
+# $Id: Makefile,v 1.4 1998/10/01 06:08:59 steve Exp $
 #
 
 DISTNAME=	shhcards-1.0.3
@@ -18,6 +18,14 @@ USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 SOLIB=		libshhcards.so
 
+.include <bsd.port.pre.mk>
+
+.if ${PORTOBJFORMAT} == "elf"
+SOVERSION=	1
+.else
+SOVERSION=	1.1
+.endif
+
 do-install:
 	@ ${INSTALL_DATA} ${WRKSRC}/shhcards.h ${PREFIX}/include
 	@ ${INSTALL_DATA} ${WRKSRC}/${SOLIB}.${SOVERSION} ${PREFIX}/lib
@@ -27,10 +35,4 @@ do-install:
 	@ ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/libshhcards
 	@ ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
-.include <bsd.port.mk>
-
-.if ${PORTOBJFORMAT} == "elf"
-SOVERSION=	1
-.else
-SOVERSION=	1.1
-.endif
+.include <bsd.port.post.mk>
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>
diff --git a/lang/expect/Makefile b/lang/expect/Makefile
index 87a39bc90732..88292de0aa39 100644
--- a/lang/expect/Makefile
+++ b/lang/expect/Makefile
@@ -3,7 +3,7 @@
 # Whom:			pst
 # Version required:	5.28
 #
-# $Id: Makefile,v 1.36 1998/10/05 05:02:28 steve Exp $
+# $Id: Makefile,v 1.37 1998/10/10 04:07:04 steve Exp $
 #
 # Note this file is included from japanese/expect/Makefile
 
@@ -28,14 +28,16 @@ MAN1=		autoexpect.1 cryptdir.1 decryptdir.1 dislocate.1 \
 MAN3=		libexpect.3
 .endif
 
-post-install:
-	${LN} -sf ${SOLIB} ${PREFIX}/lib/libexpect528.so
-	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
-
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
 
 .if ${PORTOBJFORMAT} == "elf"
 SOLIB=	libexpect528.so.1
 .else
 SOLIB=	libexpect528.so.1.2
 .endif
+
+post-install:
+	${LN} -sf ${SOLIB} ${PREFIX}/lib/libexpect528.so
+	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+
+.include <bsd.port.post.mk>
diff --git a/lang/tcl80/Makefile b/lang/tcl80/Makefile
index 873790850830..44a06426e998 100644
--- a/lang/tcl80/Makefile
+++ b/lang/tcl80/Makefile
@@ -3,7 +3,7 @@
 # Date created:		19 August 1997
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.7 1998/07/27 21:14:46 hoek Exp $
+# $Id: Makefile,v 1.8 1998/09/17 22:30:01 steve Exp $
 #
 
 DISTNAME=	tcl8.0p2
@@ -17,12 +17,21 @@ WRKSRC=		${WRKDIR}/tcl8.0/unix
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
 CONFIGURE_ENV=  PORTSDIR=${PORTSDIR}
+EXTRA_PKG_ARGS=	-i ${PKGDIR}/INSTALL.tclsh
 
 SHLIB_MAJOR=	1
 SHLIB_MINOR=	2
 MAKEFILE=	makefile
 TCL_LIB=	libtcl80.so
 
+.include <bsd.port.pre.mk>
+
+.if ${PORTOBJFORMAT} == "elf"
+TCL_LIB_FILE=	${TCL_LIB}.${SHLIB_MAJOR}
+.else
+TCL_LIB_FILE=	${TCL_LIB}.${SHLIB_MAJOR}.${SHLIB_MINOR}
+.endif
+
 post-configure:
 	@${CP} ${FILESDIR}/Makefile.lib ${WRKSRC}
 	@${CP} ${FILESDIR}/makefile     ${WRKSRC}
@@ -41,12 +50,4 @@ post-install:
 test:
 	cd ${WRKSRC} && ${MAKE} test
 
-.include <bsd.port.mk>
-
-PKG_ARGS+=	-i ${PKGDIR}/INSTALL.tclsh
-
-.if ${PORTOBJFORMAT} == "elf"
-TCL_LIB_FILE=	${TCL_LIB}.${SHLIB_MAJOR}
-.else
-TCL_LIB_FILE=	${TCL_LIB}.${SHLIB_MAJOR}.${SHLIB_MINOR}
-.endif
+.include <bsd.port.post.mk>
diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index 6b07f8ef59d0..c7ee09d22500 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -3,7 +3,7 @@
 # Date created:		9 Jan 1997
 # Whom:			pst
 #
-# $Id: Makefile,v 1.20 1998/10/23 18:42:49 asami Exp $
+# $Id: Makefile,v 1.21 1998/10/26 13:54:20 steve Exp $
 #
 
 DISTNAME=	imap-4.2
@@ -18,6 +18,14 @@ MAINTAINER=	imap-uw@freebsd.ady.ro
 ALL_TARGET=	bsf
 MAN8=		ipopd.8 imapd.8
 
+.include <bsd.port.pre.mk>
+
+.if ${PORTOBJFORMAT} == "elf"
+SHLIB=	libc-client.so.2
+.else
+SHLIB=	libc-client.so.2.1
+.endif
+
 #pre-build:
 #	@chmod 755 ${WRKSRC}/src/osdep/unix/drivers ${WRKSRC}/src/osdep/unix/mkauths
 
@@ -42,10 +50,4 @@ do-install:
 post-install:
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
-.include <bsd.port.mk>
-
-.if ${PORTOBJFORMAT} == "elf"
-SHLIB=	libc-client.so.2
-.else
-SHLIB=	libc-client.so.2.1
-.endif
+.include <bsd.port.post.mk>
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>
diff --git a/mbone/wb/Makefile b/mbone/wb/Makefile
index 9d3452c1c051..0409f57862b9 100644
--- a/mbone/wb/Makefile
+++ b/mbone/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>
diff --git a/net-mgmt/net-snmp-devel/Makefile b/net-mgmt/net-snmp-devel/Makefile
index f9c8ac74ffc0..44acc26a7de0 100644
--- a/net-mgmt/net-snmp-devel/Makefile
+++ b/net-mgmt/net-snmp-devel/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-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile
index f9c8ac74ffc0..44acc26a7de0 100644
--- a/net-mgmt/net-snmp/Makefile
+++ b/net-mgmt/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-mgmt/net-snmp4/Makefile b/net-mgmt/net-snmp4/Makefile
index f9c8ac74ffc0..44acc26a7de0 100644
--- a/net-mgmt/net-snmp4/Makefile
+++ b/net-mgmt/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-mgmt/net-snmp53/Makefile b/net-mgmt/net-snmp53/Makefile
index f9c8ac74ffc0..44acc26a7de0 100644
--- a/net-mgmt/net-snmp53/Makefile
+++ b/net-mgmt/net-snmp53/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/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>
diff --git a/security/krb5-16/Makefile b/security/krb5-16/Makefile
index e8c16064d25d..a363b461dd32 100644
--- a/security/krb5-16/Makefile
+++ b/security/krb5-16/Makefile
@@ -3,7 +3,7 @@
 # Date created:				6/5/1998
 # Whom:					n@nectar.com
 #
-# $Id: Makefile,v 1.6 1998/09/27 11:34:28 markm Exp $
+# $Id: Makefile,v 1.7 1998/11/07 02:33:44 nectar Exp $
 #
 
 DISTNAME=		krb5-1.0.5
@@ -110,6 +110,8 @@ SETUID_EXE=		bin/ksu bin/v4rcp
 CHOWN?=		chown
 SUPERUSER?=	root
 
+.include <bsd.port.pre.mk>
+
 do-fetch:
 	@${MKDIR} ${_DISTDIR}
 	@(cd ${_DISTDIR};                 \
@@ -192,11 +194,11 @@ post-install:
 	install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir
 .endfor
 # fixup packing list (no libs without version numbers in aout case)
-	@if test "${PORTOBJFORMAT}" = "aout"; then                   \
-		${ECHO_MSG} "Fixing packing list for a.out";         \
-		${MV} ${TMPPLIST} ${TMPPLIST}.new;                   \
-		${GREP} -v '\.so$$' ${TMPPLIST}.new > ${TMPPLIST};   \
-		${RM} ${TMPPLIST}.new;                               \
-	fi
+.if ${PORTOBJFORMAT} == "aout"
+	${ECHO_MSG} "Fixing packing list for a.out"
+	${MV} ${TMPPLIST} ${TMPPLIST}.new
+	${GREP} -v '\.so$$' ${TMPPLIST}.new > ${TMPPLIST}
+	${RM} ${TMPPLIST}.new
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/security/krb5-17/Makefile b/security/krb5-17/Makefile
index e8c16064d25d..a363b461dd32 100644
--- a/security/krb5-17/Makefile
+++ b/security/krb5-17/Makefile
@@ -3,7 +3,7 @@
 # Date created:				6/5/1998
 # Whom:					n@nectar.com
 #
-# $Id: Makefile,v 1.6 1998/09/27 11:34:28 markm Exp $
+# $Id: Makefile,v 1.7 1998/11/07 02:33:44 nectar Exp $
 #
 
 DISTNAME=		krb5-1.0.5
@@ -110,6 +110,8 @@ SETUID_EXE=		bin/ksu bin/v4rcp
 CHOWN?=		chown
 SUPERUSER?=	root
 
+.include <bsd.port.pre.mk>
+
 do-fetch:
 	@${MKDIR} ${_DISTDIR}
 	@(cd ${_DISTDIR};                 \
@@ -192,11 +194,11 @@ post-install:
 	install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir
 .endfor
 # fixup packing list (no libs without version numbers in aout case)
-	@if test "${PORTOBJFORMAT}" = "aout"; then                   \
-		${ECHO_MSG} "Fixing packing list for a.out";         \
-		${MV} ${TMPPLIST} ${TMPPLIST}.new;                   \
-		${GREP} -v '\.so$$' ${TMPPLIST}.new > ${TMPPLIST};   \
-		${RM} ${TMPPLIST}.new;                               \
-	fi
+.if ${PORTOBJFORMAT} == "aout"
+	${ECHO_MSG} "Fixing packing list for a.out"
+	${MV} ${TMPPLIST} ${TMPPLIST}.new
+	${GREP} -v '\.so$$' ${TMPPLIST}.new > ${TMPPLIST}
+	${RM} ${TMPPLIST}.new
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/security/krb5-appl/Makefile b/security/krb5-appl/Makefile
index e8c16064d25d..a363b461dd32 100644
--- a/security/krb5-appl/Makefile
+++ b/security/krb5-appl/Makefile
@@ -3,7 +3,7 @@
 # Date created:				6/5/1998
 # Whom:					n@nectar.com
 #
-# $Id: Makefile,v 1.6 1998/09/27 11:34:28 markm Exp $
+# $Id: Makefile,v 1.7 1998/11/07 02:33:44 nectar Exp $
 #
 
 DISTNAME=		krb5-1.0.5
@@ -110,6 +110,8 @@ SETUID_EXE=		bin/ksu bin/v4rcp
 CHOWN?=		chown
 SUPERUSER?=	root
 
+.include <bsd.port.pre.mk>
+
 do-fetch:
 	@${MKDIR} ${_DISTDIR}
 	@(cd ${_DISTDIR};                 \
@@ -192,11 +194,11 @@ post-install:
 	install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir
 .endfor
 # fixup packing list (no libs without version numbers in aout case)
-	@if test "${PORTOBJFORMAT}" = "aout"; then                   \
-		${ECHO_MSG} "Fixing packing list for a.out";         \
-		${MV} ${TMPPLIST} ${TMPPLIST}.new;                   \
-		${GREP} -v '\.so$$' ${TMPPLIST}.new > ${TMPPLIST};   \
-		${RM} ${TMPPLIST}.new;                               \
-	fi
+.if ${PORTOBJFORMAT} == "aout"
+	${ECHO_MSG} "Fixing packing list for a.out"
+	${MV} ${TMPPLIST} ${TMPPLIST}.new
+	${GREP} -v '\.so$$' ${TMPPLIST}.new > ${TMPPLIST}
+	${RM} ${TMPPLIST}.new
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/security/krb5/Makefile b/security/krb5/Makefile
index e8c16064d25d..a363b461dd32 100644
--- a/security/krb5/Makefile
+++ b/security/krb5/Makefile
@@ -3,7 +3,7 @@
 # Date created:				6/5/1998
 # Whom:					n@nectar.com
 #
-# $Id: Makefile,v 1.6 1998/09/27 11:34:28 markm Exp $
+# $Id: Makefile,v 1.7 1998/11/07 02:33:44 nectar Exp $
 #
 
 DISTNAME=		krb5-1.0.5
@@ -110,6 +110,8 @@ SETUID_EXE=		bin/ksu bin/v4rcp
 CHOWN?=		chown
 SUPERUSER?=	root
 
+.include <bsd.port.pre.mk>
+
 do-fetch:
 	@${MKDIR} ${_DISTDIR}
 	@(cd ${_DISTDIR};                 \
@@ -192,11 +194,11 @@ post-install:
 	install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir
 .endfor
 # fixup packing list (no libs without version numbers in aout case)
-	@if test "${PORTOBJFORMAT}" = "aout"; then                   \
-		${ECHO_MSG} "Fixing packing list for a.out";         \
-		${MV} ${TMPPLIST} ${TMPPLIST}.new;                   \
-		${GREP} -v '\.so$$' ${TMPPLIST}.new > ${TMPPLIST};   \
-		${RM} ${TMPPLIST}.new;                               \
-	fi
+.if ${PORTOBJFORMAT} == "aout"
+	${ECHO_MSG} "Fixing packing list for a.out"
+	${MV} ${TMPPLIST} ${TMPPLIST}.new
+	${GREP} -v '\.so$$' ${TMPPLIST}.new > ${TMPPLIST}
+	${RM} ${TMPPLIST}.new
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
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>
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>
diff --git a/x11-wm/windowmaker-i18n/Makefile b/x11-wm/windowmaker-i18n/Makefile
index 5416ff0eaedc..d1a9ee03f576 100644
--- a/x11-wm/windowmaker-i18n/Makefile
+++ b/x11-wm/windowmaker-i18n/Makefile
@@ -3,7 +3,7 @@
 # Date created:		August 13, 1997
 # Whom:			handy@physics.montana.edu
 #
-# $Id: Makefile,v 1.35 1998/10/19 10:57:04 tg Exp $
+# $Id: Makefile,v 1.36 1998/10/30 08:24:36 tg Exp $
 
 DISTNAME=	WindowMaker-0.20.2
 PKGNAME=	windowmaker-0.20.2
@@ -35,6 +35,8 @@ MAN1=	geticonset.1x getstyle.1x seticons.1x setstyle.1x \
 
 DATAFILES=	WindowMaker-data.tar.gz
 
+.include <bsd.port.pre.mk>
+
 post-patch:
 	@perl -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/WPrefs.app/Paths.c
 
@@ -42,11 +44,11 @@ post-install:
 	${MKDIR} ${PREFIX}/share/WindowMaker/Pixmaps/
 	${INSTALL_DATA} ${WRKDIR}/WindowMaker-data/pixmaps/* \
 		${PREFIX}/share/WindowMaker/Pixmaps/
-	if [ "${PORTOBJFORMAT}" = "elf" ]; then \
-		${LN} -sf libPropList.so.0 ${PREFIX}/lib/libPropList.so; \
-	else \
-		${LN} -sf libPropList.so.0.8 ${PREFIX}/lib/libPropList.so; \
-	fi
+.if ${PORTOBJFORMAT} == "elf"
+	${LN} -sf libPropList.so.0 ${PREFIX}/lib/libPropList.so
+.else
+	${LN} -sf libPropList.so.0.8 ${PREFIX}/lib/libPropList.so
+.endif
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index 5416ff0eaedc..d1a9ee03f576 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -3,7 +3,7 @@
 # Date created:		August 13, 1997
 # Whom:			handy@physics.montana.edu
 #
-# $Id: Makefile,v 1.35 1998/10/19 10:57:04 tg Exp $
+# $Id: Makefile,v 1.36 1998/10/30 08:24:36 tg Exp $
 
 DISTNAME=	WindowMaker-0.20.2
 PKGNAME=	windowmaker-0.20.2
@@ -35,6 +35,8 @@ MAN1=	geticonset.1x getstyle.1x seticons.1x setstyle.1x \
 
 DATAFILES=	WindowMaker-data.tar.gz
 
+.include <bsd.port.pre.mk>
+
 post-patch:
 	@perl -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/WPrefs.app/Paths.c
 
@@ -42,11 +44,11 @@ post-install:
 	${MKDIR} ${PREFIX}/share/WindowMaker/Pixmaps/
 	${INSTALL_DATA} ${WRKDIR}/WindowMaker-data/pixmaps/* \
 		${PREFIX}/share/WindowMaker/Pixmaps/
-	if [ "${PORTOBJFORMAT}" = "elf" ]; then \
-		${LN} -sf libPropList.so.0 ${PREFIX}/lib/libPropList.so; \
-	else \
-		${LN} -sf libPropList.so.0.8 ${PREFIX}/lib/libPropList.so; \
-	fi
+.if ${PORTOBJFORMAT} == "elf"
+	${LN} -sf libPropList.so.0 ${PREFIX}/lib/libPropList.so
+.else
+	${LN} -sf libPropList.so.0.8 ${PREFIX}/lib/libPropList.so
+.endif
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11/XFree86-4-clients/Makefile b/x11/XFree86-4-clients/Makefile
index c18f56f5fadd..c9c26b77fc43 100644
--- a/x11/XFree86-4-clients/Makefile
+++ b/x11/XFree86-4-clients/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/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile
index c18f56f5fadd..c9c26b77fc43 100644
--- a/x11/XFree86-4-libraries/Makefile
+++ b/x11/XFree86-4-libraries/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/XFree86-4/Makefile b/x11/XFree86-4/Makefile
index c18f56f5fadd..c9c26b77fc43 100644
--- a/x11/XFree86-4/Makefile
+++ b/x11/XFree86-4/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/XFree86/Makefile b/x11/XFree86/Makefile
index c18f56f5fadd..c9c26b77fc43 100644
--- a/x11/XFree86/Makefile
+++ b/x11/XFree86/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/kdelibs11/Makefile b/x11/kdelibs11/Makefile
index 0d1fba67e4ba..3feeceac2c32 100644
--- a/x11/kdelibs11/Makefile
+++ b/x11/kdelibs11/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan E�er <se@freebsd.org>
 #
-# $Id: Makefile,v 1.20 1998/10/01 18:35:32 brian Exp $
+# $Id: Makefile,v 1.21 1998/10/10 06:43:48 kuriyama Exp $
 #
 
 DISTNAME=	kdelibs-1.0
@@ -23,16 +23,18 @@ CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
 		"--x-lib=$(X11BASE)/lib"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)"
 
+.include <bsd.port.pre.mk>
+
 post-install:
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
-	if [ "${PORTOBJFORMAT}" = "aout" ]; then \
-		${LN} -sf libjscript.so.0.90  ${PREFIX}/lib/libjscript.so; \
-		${LN} -sf libkdecore.so.1.0   ${PREFIX}/lib/libkdecore.so; \
-		${LN} -sf libkdeui.so.1.0     ${PREFIX}/lib/libkdeui.so; \
-		${LN} -sf libkfile.so.1.0     ${PREFIX}/lib/libkfile.so; \
-		${LN} -sf libkfm.so.1.0       ${PREFIX}/lib/libkfm.so; \
-		${LN} -sf libkhtmlw.so.1.0    ${PREFIX}/lib/libkhtmlw.so; \
-		${LN} -sf libmediatool.so.1.0 ${PREFIX}/lib/libmediatool.so; \
-	fi
+.if ${PORTOBJFORMAT} == "aout"
+	${LN} -sf libjscript.so.0.90  ${PREFIX}/lib/libjscript.so
+	${LN} -sf libkdecore.so.1.0   ${PREFIX}/lib/libkdecore.so
+	${LN} -sf libkdeui.so.1.0     ${PREFIX}/lib/libkdeui.so
+	${LN} -sf libkfile.so.1.0     ${PREFIX}/lib/libkfile.so
+	${LN} -sf libkfm.so.1.0       ${PREFIX}/lib/libkfm.so
+	${LN} -sf libkhtmlw.so.1.0    ${PREFIX}/lib/libkhtmlw.so
+	${LN} -sf libmediatool.so.1.0 ${PREFIX}/lib/libmediatool.so
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile
index 0d1fba67e4ba..3feeceac2c32 100644
--- a/x11/kdelibs2/Makefile
+++ b/x11/kdelibs2/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan E�er <se@freebsd.org>
 #
-# $Id: Makefile,v 1.20 1998/10/01 18:35:32 brian Exp $
+# $Id: Makefile,v 1.21 1998/10/10 06:43:48 kuriyama Exp $
 #
 
 DISTNAME=	kdelibs-1.0
@@ -23,16 +23,18 @@ CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
 		"--x-lib=$(X11BASE)/lib"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)"
 
+.include <bsd.port.pre.mk>
+
 post-install:
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
-	if [ "${PORTOBJFORMAT}" = "aout" ]; then \
-		${LN} -sf libjscript.so.0.90  ${PREFIX}/lib/libjscript.so; \
-		${LN} -sf libkdecore.so.1.0   ${PREFIX}/lib/libkdecore.so; \
-		${LN} -sf libkdeui.so.1.0     ${PREFIX}/lib/libkdeui.so; \
-		${LN} -sf libkfile.so.1.0     ${PREFIX}/lib/libkfile.so; \
-		${LN} -sf libkfm.so.1.0       ${PREFIX}/lib/libkfm.so; \
-		${LN} -sf libkhtmlw.so.1.0    ${PREFIX}/lib/libkhtmlw.so; \
-		${LN} -sf libmediatool.so.1.0 ${PREFIX}/lib/libmediatool.so; \
-	fi
+.if ${PORTOBJFORMAT} == "aout"
+	${LN} -sf libjscript.so.0.90  ${PREFIX}/lib/libjscript.so
+	${LN} -sf libkdecore.so.1.0   ${PREFIX}/lib/libkdecore.so
+	${LN} -sf libkdeui.so.1.0     ${PREFIX}/lib/libkdeui.so
+	${LN} -sf libkfile.so.1.0     ${PREFIX}/lib/libkfile.so
+	${LN} -sf libkfm.so.1.0       ${PREFIX}/lib/libkfm.so
+	${LN} -sf libkhtmlw.so.1.0    ${PREFIX}/lib/libkhtmlw.so
+	${LN} -sf libmediatool.so.1.0 ${PREFIX}/lib/libmediatool.so
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 0d1fba67e4ba..3feeceac2c32 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan E�er <se@freebsd.org>
 #
-# $Id: Makefile,v 1.20 1998/10/01 18:35:32 brian Exp $
+# $Id: Makefile,v 1.21 1998/10/10 06:43:48 kuriyama Exp $
 #
 
 DISTNAME=	kdelibs-1.0
@@ -23,16 +23,18 @@ CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
 		"--x-lib=$(X11BASE)/lib"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)"
 
+.include <bsd.port.pre.mk>
+
 post-install:
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
-	if [ "${PORTOBJFORMAT}" = "aout" ]; then \
-		${LN} -sf libjscript.so.0.90  ${PREFIX}/lib/libjscript.so; \
-		${LN} -sf libkdecore.so.1.0   ${PREFIX}/lib/libkdecore.so; \
-		${LN} -sf libkdeui.so.1.0     ${PREFIX}/lib/libkdeui.so; \
-		${LN} -sf libkfile.so.1.0     ${PREFIX}/lib/libkfile.so; \
-		${LN} -sf libkfm.so.1.0       ${PREFIX}/lib/libkfm.so; \
-		${LN} -sf libkhtmlw.so.1.0    ${PREFIX}/lib/libkhtmlw.so; \
-		${LN} -sf libmediatool.so.1.0 ${PREFIX}/lib/libmediatool.so; \
-	fi
+.if ${PORTOBJFORMAT} == "aout"
+	${LN} -sf libjscript.so.0.90  ${PREFIX}/lib/libjscript.so
+	${LN} -sf libkdecore.so.1.0   ${PREFIX}/lib/libkdecore.so
+	${LN} -sf libkdeui.so.1.0     ${PREFIX}/lib/libkdeui.so
+	${LN} -sf libkfile.so.1.0     ${PREFIX}/lib/libkfile.so
+	${LN} -sf libkfm.so.1.0       ${PREFIX}/lib/libkfm.so
+	${LN} -sf libkhtmlw.so.1.0    ${PREFIX}/lib/libkhtmlw.so
+	${LN} -sf libmediatool.so.1.0 ${PREFIX}/lib/libmediatool.so
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 0d1fba67e4ba..3feeceac2c32 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan E�er <se@freebsd.org>
 #
-# $Id: Makefile,v 1.20 1998/10/01 18:35:32 brian Exp $
+# $Id: Makefile,v 1.21 1998/10/10 06:43:48 kuriyama Exp $
 #
 
 DISTNAME=	kdelibs-1.0
@@ -23,16 +23,18 @@ CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
 		"--x-lib=$(X11BASE)/lib"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)"
 
+.include <bsd.port.pre.mk>
+
 post-install:
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
-	if [ "${PORTOBJFORMAT}" = "aout" ]; then \
-		${LN} -sf libjscript.so.0.90  ${PREFIX}/lib/libjscript.so; \
-		${LN} -sf libkdecore.so.1.0   ${PREFIX}/lib/libkdecore.so; \
-		${LN} -sf libkdeui.so.1.0     ${PREFIX}/lib/libkdeui.so; \
-		${LN} -sf libkfile.so.1.0     ${PREFIX}/lib/libkfile.so; \
-		${LN} -sf libkfm.so.1.0       ${PREFIX}/lib/libkfm.so; \
-		${LN} -sf libkhtmlw.so.1.0    ${PREFIX}/lib/libkhtmlw.so; \
-		${LN} -sf libmediatool.so.1.0 ${PREFIX}/lib/libmediatool.so; \
-	fi
+.if ${PORTOBJFORMAT} == "aout"
+	${LN} -sf libjscript.so.0.90  ${PREFIX}/lib/libjscript.so
+	${LN} -sf libkdecore.so.1.0   ${PREFIX}/lib/libkdecore.so
+	${LN} -sf libkdeui.so.1.0     ${PREFIX}/lib/libkdeui.so
+	${LN} -sf libkfile.so.1.0     ${PREFIX}/lib/libkfile.so
+	${LN} -sf libkfm.so.1.0       ${PREFIX}/lib/libkfm.so
+	${LN} -sf libkhtmlw.so.1.0    ${PREFIX}/lib/libkhtmlw.so
+	${LN} -sf libmediatool.so.1.0 ${PREFIX}/lib/libmediatool.so
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
author	Satoshi Asami <asami@FreeBSD.org>	1998-11-14 09:43:39 +0000
committer	Satoshi Asami <asami@FreeBSD.org>	1998-11-14 09:43:39 +0000
commit	96bc8048c3217bb231f2f30eadeb628134b557f5 (patch)
tree	c75d5bd5a6faba5d6ec73da367e4bfe5b0d4285d
parent	Checksum changed.... (diff)