8 files changed, 132 insertions, 112 deletions

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>