Update createbuildlink to 1.2. This revision addresses a couple of styling

issues pointed out in private email by Thomas Klausner:
	* Include $PKGVERSION instead of RCS revision in script output
	* Add a few line breaks to make the output more readable

2 files changed, 21 insertions, 11 deletions

diff --git a/pkgtools/createbuildlink/Makefile b/pkgtools/createbuildlink/Makefile
index ed5d87fef68..68f567a83f6 100644
--- a/pkgtools/createbuildlink/Makefile
+++ b/pkgtools/createbuildlink/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2002/05/05 00:00:37 rh Exp $
+# $NetBSD: Makefile,v 1.3 2002/05/05 23:23:34 rh Exp $
 #
 
-DISTNAME=	createbuildlink-1.1
+DISTNAME=	createbuildlink-1.2
 CATEGORIES=	pkgtools sysutils
 MASTER_SITES=	# Nothing
 DISTFILES=	# Nothing
@@ -16,8 +16,15 @@ NO_BUILD=	yes
 NO_PATCH=	yes
 EXTRACT_CMD=	${ECHO}
 
+do-configure:
+	${SED} -e 's/@PKGVERSION@/${PKGVERSION}/'		\
+		< ${FILESDIR}/${DISTNAME:C/-.*$//}		\
+		> ${WRKSRC}/${DISTNAME:C/-.*$//}
+
 do-install:
-	${INSTALL_SCRIPT} ${FILESDIR}/${DISTNAME:C/-.*$//} ${PREFIX}/bin/${DISTNAME:C/-.*$//}
-	${INSTALL_MAN} ${FILESDIR}/${DISTNAME:C/-.*$//}.8 ${PREFIX}/man/man8
+	${INSTALL_SCRIPT} ${WRKSRC}/${DISTNAME:C/-.*$//}	\
+		${PREFIX}/bin/${DISTNAME:C/-.*$//}
+	${INSTALL_MAN} ${FILESDIR}/${DISTNAME:C/-.*$//}.8	\
+		${PREFIX}/man/man8
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/pkgtools/createbuildlink/files/createbuildlink b/pkgtools/createbuildlink/files/createbuildlink
index c162788d457..50a9834ef5d 100755
--- a/pkgtools/createbuildlink/files/createbuildlink
+++ b/pkgtools/createbuildlink/files/createbuildlink
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#	$NetBSD: createbuildlink,v 1.2 2002/05/05 00:00:38 rh Exp $
+#	$NetBSD: createbuildlink,v 1.3 2002/05/05 23:23:35 rh Exp $
 #
 # Copyright (c) 2002 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -39,7 +39,7 @@
 # Create an initial buildlink.mk from a package's Makefile and PLIST
 #
 
-REV=`echo '$Revision: 1.2 $' | sed 's/\\$//g'`
+REV=`echo '$Revision: 1.3 $' | sed 's/\\$//g'`
 tmpdir=/tmp
 makefile=Makefile
 sedrules=$tmpdir/sedrules.buildlink.$$
@@ -86,6 +86,7 @@ echo >>$sedrules "s|@@PKGUPPER@@|$PKGUPPER|g"
 echo >>$sedrules "s|@@PKGVER@@|$PKGVER|g"
 echo >>$sedrules "s|@@PREFIX@@|$PREFIX|g"
 echo >>$sedrules "s|@@REV@@|$REV|g"
+echo >>$sedrules "s|@@PKGVERSION@@|@PKGVERSION@|g"
 
 #
 # buildlink header
@@ -95,7 +96,7 @@ sed -f $sedrules <<EOF
 #
 # This Makefile fragment is included by packages that use $PKGNOVER.
 #
-# This file was created automatically using createbuildlink @@REV@@
+# This file was created automatically using createbuildlink @PKGVERSION@.
 #
 # To use this Makefile fragment, simply:
 #
@@ -173,17 +174,19 @@ echo ""
 for i in $configs ; do
 	cfg=`echo $i | sed 's|.*/||'`
 	ctg=`echo $cfg | sed 's|\(.*\)-config|\1|'`
-	echo "BUILDLINK_CONFIG.$PKGNOVER-$ctg=	\${BUILDLINK_PREFIX.$PKGNOVER}/$i"
-	echo "BUILDLINK_CONFIG_WRAPPER.$PKGNOVER-$ctg=	\${BUILDLINK_DIR}/$i"
-	echo "REPLACE_BUILDLINK_SED+=	\\"
+	echo "BUILDLINK_CONFIG.$PKGNOVER-$ctg=					\\"
+	echo "	\${BUILDLINK_PREFIX.$PKGNOVER}/$i"
+	echo "BUILDLINK_CONFIG_WRAPPER.$PKGNOVER-$ctg=				\\"
+	echo "	\${BUILDLINK_DIR}/$i"
+	echo "REPLACE_BUILDLINK_SED+=							\\"
 	echo "-e \"s|\${BUILDLINK_CONFIG_WRAPPER.$PKGNOVER-$ctg}|\${BUILDLINK_CONFIG.$PKGNOVER-$ctg}|g\""
+	echo ""
 done
 
 ##
 ## environment variables to help dependent packages find config scripts
 ##
 if [ ! -z "$configs" ]; then
-    echo ""
     echo '.if defined(USE_CONFIG_WRAPPER)'
     for i in $configs ; do
 	cfg=`echo $i | sed 's|.*/||'`