From 239d0a11d145b6486f301f2e0732f3de4b6b5e6d Mon Sep 17 00:00:00 2001
From: todd <todd@openbsd.org>
Date: Wed, 28 Mar 2007 20:07:23 +0000
Subject: [PATCH] mimic src maketars script by putting `./usr/X11R6/lib' first
 looks ok matthieu@

---
 distrib/sets/maketars | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/distrib/sets/maketars b/distrib/sets/maketars
index da13e9adc..a10651e5f 100644
--- a/distrib/sets/maketars
+++ b/distrib/sets/maketars
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$OpenBSD: maketars,v 1.1.1.1 2006/11/27 11:25:45 matthieu Exp $
+#	$OpenBSD: maketars,v 1.2 2007/03/28 20:07:23 todd Exp $
 
 # xy
 RELEASE=$1
@@ -26,14 +26,21 @@ pwd=`pwd`
 listsdir=`pwd`/lists
 tardir=$RELEASEDIR
 
+TMPDIR=`mktemp -d /tmp/_maketarsx.XXXXXXXXXX`
+trap 'rm -f $TMP1 $TMP2; rmdir $TMPDIR; exit 1' 1 15
+TMP1=$TMPDIR/one
+TMP2=$TMPDIR/two
+
 lists=`sh ./genlists $arch`
 
 cd $DESTDIR
 
 for setname in $lists; do
 	echo -n "${setname}: "
-	(cd $pwd; sh gensetlist $setname $Release) | sort | \
-	    pax -w -d | gzip -9 > ${tardir}/${setname}${RELEASE}.tgz
+	(cd $pwd; sh gensetlist $setname $Release) | sort > $TMP1
+	grep    '^./usr/X11R6/lib' $TMP1 > $TMP2
+	grep -v '^./usr/X11R6/lib' $TMP1 >> $TMP2
+	pax -w -d < $TMP2 | gzip -9 > ${tardir}/${setname}${RELEASE}.tgz
 	echo    "done."
 done