From 655c2c15d5b23d42bcebf7b1f4c3ee2276891aac Mon Sep 17 00:00:00 2001
From: jmmv <jmmv@pkgsrc.org>
Date: Wed, 8 Jan 2003 17:57:42 +0000
Subject: Update pkg_comp to 1.5. Fixes:

- Check if all sets exist before extracting any of them.
- Treat EXTRAMK properly: only process the variable if it is non-empty.
---
 pkgtools/pkg_comp/files/pkg_comp.sh | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

(limited to 'pkgtools/pkg_comp/files')

diff --git a/pkgtools/pkg_comp/files/pkg_comp.sh b/pkgtools/pkg_comp/files/pkg_comp.sh
index 24b1e471db1..d8215e3d621 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.4 2002/12/24 16:28:34 jmmv Exp $
+# $NetBSD: pkg_comp.sh,v 1.5 2003/01/08 17:57:42 jmmv Exp $
 #
 # pkg_comp - Build packages inside a clean chroot environment
 # Copyright (c) 2002, Julio Merino <jmmv@netbsd.org>
@@ -249,11 +249,19 @@ pkg_makeroot()
     if [ -d $DESTDIR ]; then
         err "DESTDIR $DESTDIR already exists"
     fi
+
+    allsets="$SETS $SETS_X11"
+
+    for s in $allsets; do
+        if [ ! -f $DISTRIBDIR/binary/sets/$s ]; then
+            err "$DISTRIBDIR/binary/sets/$s does not exist"
+        fi
+    done
+
     mkdir -p $DESTDIR
     cd $DESTDIR
 
     printf "Unpacking sets:"
-    allsets="$SETS $SETS_X11"
     for s in $allsets; do
         printf " $s"
         tar xzpf $DISTRIBDIR/binary/sets/$s
@@ -328,10 +336,13 @@ makeroot_mkconf()
     echo "LOCALBASE=$LOCALBASE" >> $file
     echo "PKG_SYSCONFBASE=$PKG_SYSCONFBASE" >> $file
 
-    if [ ! -f "$EXTRAMK" ]; then
-        err "Cannot find $EXTRAMK"
+    if [ -n "$EXTRAMK" ]; then
+        if [ ! -f "$EXTRAMK" ]; then
+            err "Cannot find $EXTRAMK"
+        else
+            cat $EXTRAMK >> $file
+        fi
     fi
-    cat $EXTRAMK >> $file
 }
 
 makeroot_xpkgwedge()
-- 
cgit v1.2.3