Update pkg_comp to 1.4:

- Added an EXTRAMK variable to allow the addition of any kind of stuff
  into the generated mk.conf.
- While creating the template, quote ${LOCALBASE} so it does not get
  replaced. Reported by Douglas Brebner in PR pkg/19509.

3 files changed, 18 insertions, 6 deletions

diff --git a/pkgtools/pkg_comp/Makefile b/pkgtools/pkg_comp/Makefile
index a22f786d623..964c586fd5e 100644
--- a/pkgtools/pkg_comp/Makefile
+++ b/pkgtools/pkg_comp/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2002/12/19 14:47:04 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2002/12/24 16:28:33 jmmv Exp $
 
-DISTNAME=	pkg_comp-1.3
+DISTNAME=	pkg_comp-1.4
 CATEGORIES=	pkgtools
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/pkgtools/pkg_comp/files/pkg_comp.8 b/pkgtools/pkg_comp/files/pkg_comp.8
index 44a3c7ebc9e..58fc5c84d7e 100644
--- a/pkgtools/pkg_comp/files/pkg_comp.8
+++ b/pkgtools/pkg_comp/files/pkg_comp.8
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_comp.8,v 1.4 2002/12/19 14:47:05 jmmv Exp $
+.\" $NetBSD: pkg_comp.8,v 1.5 2002/12/24 16:28:34 jmmv Exp $
 .\"
 .\" pkg_comp - Build packages inside a clean chroot environment
 .\" Copyright (c) 2002, Julio Merino <jmmv@netbsd.org>
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd September 25, 2002
+.Dd December 24, 2002
 .Dt PKG_COMP 8
 .Os
 .Sh NAME
@@ -134,6 +134,11 @@ distributions, that is, tgz files must reside inside
 .Pa $DISTRIBDIR/binary/sets .
 Defaults to
 .Pa /var/pub/NetBSD .
+.It EXTRAMK
+Specifies a file that must be appended to
+.Pa $DESTDIR/etc/mk.conf .
+This is useful to add special items to this configuration file.
+Defaults to nothing.
 .It INSTALL_PACKAGES
 A list of packages to automatically install after the
 .Sy makeroot
diff --git a/pkgtools/pkg_comp/files/pkg_comp.sh b/pkgtools/pkg_comp/files/pkg_comp.sh
index 925416abbd9..24b1e471db1 100644
--- a/pkgtools/pkg_comp/files/pkg_comp.sh
+++ b/pkgtools/pkg_comp/files/pkg_comp.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: pkg_comp.sh,v 1.3 2002/12/19 14:47:05 jmmv Exp $
+# $NetBSD: pkg_comp.sh,v 1.4 2002/12/24 16:28:34 jmmv Exp $
 #
 # pkg_comp - Build packages inside a clean chroot environment
 # Copyright (c) 2002, Julio Merino <jmmv@netbsd.org>
@@ -194,7 +194,7 @@ USE_XF86_4="yes"
 
 # pkgsrc configuration.
 LOCALBASE="/usr/pkg"
-PKG_SYSCONFBASE="${LOCALBASE}/etc"
+PKG_SYSCONFBASE="\${LOCALBASE}/etc"
 
 # Special directories. They are mounted inside the chroot jail using
 # mount_null. Leave empty to avoid mounting.
@@ -214,6 +214,8 @@ MAKE_PACKAGES=""
 # inside REAL_PACKAGES. You must specify the complete name.
 INSTALL_PACKAGES=""
 
+# Append this file to the generated mk.conf.
+EXTRAMK=
 EOF
 }
 
@@ -325,6 +327,11 @@ makeroot_mkconf()
 
     echo "LOCALBASE=$LOCALBASE" >> $file
     echo "PKG_SYSCONFBASE=$PKG_SYSCONFBASE" >> $file
+
+    if [ ! -f "$EXTRAMK" ]; then
+        err "Cannot find $EXTRAMK"
+    fi
+    cat $EXTRAMK >> $file
 }
 
 makeroot_xpkgwedge()