Update pkgtools/buildlink-x11 to 0.7. Changes from version 0.6 include

installing buildlinkX11.rules as X11.rules via a symlink to ensure that
buildlinkX11.rules gets used in place of X11.rules everywhere.  This should
fix pkg/13638 by Martin Husemann <martin@duskware.de>.

5 files changed, 37 insertions, 10 deletions

diff --git a/pkgtools/buildlink-x11/Makefile b/pkgtools/buildlink-x11/Makefile
index 5d827a5119d..6581fe7a710 100644
--- a/pkgtools/buildlink-x11/Makefile
+++ b/pkgtools/buildlink-x11/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2001/07/13 07:09:21 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2001/08/08 07:23:28 jlam Exp $
 
-DISTNAME=	buildlink-x11-0.6
+DISTNAME=	buildlink-x11-0.7
 CATEGORIES=	pkgtools devel x11
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -24,6 +24,8 @@ FILES_SUBST+=		PREFIX=${PREFIX}
 FILES_SUBST+=		CMP=${CMP:Q}
 FILES_SUBST+=		CP=${CP:Q}
 FILES_SUBST+=		GREP=${GREP:Q}
+FILES_SUBST+=		LN=${LN:Q}
+FILES_SUBST+=		MV=${MV:Q}
 FILES_SUBST+=		RM=${RM:Q}
 FILES_SUBST+=		RMDIR=${RMDIR:Q}
 FILES_SUBST+=		TRUE=${TRUE:Q}
diff --git a/pkgtools/buildlink-x11/files/buildlinkX11.def b/pkgtools/buildlink-x11/files/buildlinkX11.def
index 4d724ced60e..706da4f2d53 100644
--- a/pkgtools/buildlink-x11/files/buildlinkX11.def
+++ b/pkgtools/buildlink-x11/files/buildlinkX11.def
@@ -1,12 +1,9 @@
-/*	$NetBSD: buildlinkX11.def,v 1.1.1.1 2001/07/02 21:00:44 jlam Exp $	*/
+/*	$NetBSD: buildlinkX11.def,v 1.2 2001/08/08 07:23:28 jlam Exp $	*/
 
 #ifdef AfterVendorCF
 
 #ifdef UseInstalled
 # ifdef BuildLink
-#  ifndef ProjectRulesFile
-#   define ProjectRulesFile	<buildlinkX11.rules>
-#  endif
 
 /*
  * Force the buildlink include and lib directories to the head of the
diff --git a/pkgtools/buildlink-x11/files/buildlinkX11.rules b/pkgtools/buildlink-x11/files/buildlinkX11.rules
index 0f353242e8b..a8545f1e5d0 100644
--- a/pkgtools/buildlink-x11/files/buildlinkX11.rules
+++ b/pkgtools/buildlink-x11/files/buildlinkX11.rules
@@ -1,6 +1,6 @@
-/*	$NetBSD: buildlinkX11.rules,v 1.2 2001/07/05 17:23:00 jlam Exp $	*/
+/*	$NetBSD: buildlinkX11.rules,v 1.3 2001/08/08 07:23:28 jlam Exp $	*/
 
-#include <X11.rules>
+#include <X11.dist.rules>
 
 #ifdef UseInstalled
 # ifdef BuildLink
diff --git a/pkgtools/buildlink-x11/pkg/DEINSTALL b/pkgtools/buildlink-x11/pkg/DEINSTALL
index 700edae5d2c..d1480f7cf24 100644
--- a/pkgtools/buildlink-x11/pkg/DEINSTALL
+++ b/pkgtools/buildlink-x11/pkg/DEINSTALL
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: DEINSTALL,v 1.2 2001/07/13 07:09:21 jlam Exp $
+# $NetBSD: DEINSTALL,v 1.3 2001/08/08 07:23:28 jlam Exp $
 
 PKGNAME=$1
 STAGE=$2
@@ -8,6 +8,7 @@ STAGE=$2
 CMP="@CMP@"
 CP="@CP@"
 GREP="@GREP@"
+MV="@MV@"
 RM="@RM@"
 RMDIR="@RMDIR@"
 TRUE="@TRUE@"
@@ -16,6 +17,10 @@ X11BASE=@X11BASE@
 X11_HOSTDEF=${X11BASE}/lib/X11/config/host.def
 HOSTDEF=${PKG_PREFIX}/lib/X11/config/host.def
 
+X11_X11_RULES=${X11BASE}/lib/X11/config/X11.rules
+X11_RULES=${PKG_PREFIX}/lib/X11/config/X11.rules
+X11_DIST_RULES=${PKG_PREFIX}/lib/X11/config/X11.dist.rules
+
 case ${STAGE} in
 DEINSTALL)
 	;;
@@ -31,6 +36,13 @@ POST-DEINSTALL)
 		${RM} -f ${HOSTDEF}
 	fi
 	echo "done."
+
+	${RM} -f ${X11_RULES} ${X11_DIST_RULES}
+	if [ ${PKG_PREFIX} = ${X11BASE} ]
+	then
+		${MV} -f ${X11_X11_RULES}.buildlink.bak ${X11_X11_RULES}
+	fi
+	
 	${RMDIR} -p ${PKG_PREFIX}/lib/X11/config 2>/dev/null || ${TRUE}
 	;;
 
diff --git a/pkgtools/buildlink-x11/pkg/INSTALL b/pkgtools/buildlink-x11/pkg/INSTALL
index 2534cce6fee..58ff29d9213 100644
--- a/pkgtools/buildlink-x11/pkg/INSTALL
+++ b/pkgtools/buildlink-x11/pkg/INSTALL
@@ -1,23 +1,39 @@
 #!/bin/sh
 #
-# $NetBSD: INSTALL,v 1.1.1.1 2001/07/02 21:00:44 jlam Exp $
+# $NetBSD: INSTALL,v 1.2 2001/08/08 07:23:28 jlam Exp $
 
 PKGNAME=$1
 STAGE=$2
 
 CP="@CP@"
 GREP="@GREP@"
+LN="@LN@"
+MV="@MV@"
 RM="@RM@"
 
 X11BASE=@X11BASE@
 X11_HOSTDEF=${X11BASE}/lib/X11/config/host.def
 HOSTDEF=${PKG_PREFIX}/lib/X11/config/host.def
 
+X11_X11_RULES=${X11BASE}/lib/X11/config/X11.rules
+X11_RULES=${PKG_PREFIX}/lib/X11/config/X11.rules
+X11_DIST_RULES=${PKG_PREFIX}/lib/X11/config/X11.dist.rules
+
 case ${STAGE} in
 PRE-INSTALL)
 	;;
 
 POST-INSTALL)
+	${RM} -f ${X11_DIST_RULES}
+	if [ ${PKG_PREFIX} = ${X11BASE} ]
+	then
+		${MV} -f ${X11_X11_RULES} ${X11_X11_RULES}.buildlink.bak
+		${LN} -sf ${X11_X11_RULES}.buildlink.bak ${X11_DIST_RULES}
+	else
+		${LN} -sf ${X11_X11_RULES} ${X11_DIST_RULES}
+	fi
+	${LN} -sf buildlinkX11.rules ${X11_RULES}
+
 	if [ ${PKG_PREFIX} = ${X11BASE} -o -f ${HOSTDEF} ]
 	then
 		echo -n "Updating ${HOSTDEF}..."