? portbuild.diff
Index: errorlogs/index.shtml
===================================================================
RCS file: /home/ncvs/ports/Tools/portbuild/errorlogs/index.shtml,v
retrieving revision 1.2
diff -u -r1.2 index.shtml
--- errorlogs/index.shtml 15 Oct 2007 00:40:38 -0000 1.2
+++ errorlogs/index.shtml 11 Apr 2008 09:40:56 -0000
@@ -487,7 +487,7 @@
|tarball for 7.x-current
|tarball for 8.x-current
), starting with an
-empty /usr/local and /usr/X11R6. /usr/local. The dependencies are installed as packages just before
the build. You can see the list of dependencies on the third line
of the log -- the "foo.tgz bar.tgz" stuff are the dependencies. To
Index: scripts/buildenv
===================================================================
RCS file: /home/ncvs/ports/Tools/portbuild/scripts/buildenv,v
retrieving revision 1.23
diff -u -r1.23 buildenv
--- scripts/buildenv 14 Jan 2008 17:10:32 -0000 1.23
+++ scripts/buildenv 11 Apr 2008 09:40:56 -0000
@@ -10,7 +10,6 @@
case "x$branch" in
x5)
export INDEXFILE=INDEX-5
- export USE_NONDEFAULT_X11BASE=1
;;
x6)
export INDEXFILE=INDEX-6
@@ -48,7 +47,6 @@
export ARCH=${arch}
export MACHINE_ARCH=${arch}
- export X11BASE=/usr/local
export LOCALBASE=/usr/local
export PKGSUFFIX=.tbz
export PKGZIPCMD=bzip2
Index: scripts/buildfailure
===================================================================
RCS file: /home/ncvs/ports/Tools/portbuild/scripts/buildfailure,v
retrieving revision 1.5
diff -u -r1.5 buildfailure
--- scripts/buildfailure 9 Jan 2005 10:21:16 -0000 1.5
+++ scripts/buildfailure 11 Apr 2008 09:40:56 -0000
@@ -24,7 +24,6 @@
# Don't pick up installed packages from the host
export LOCALBASE=/nonexistentlocal
-export X11BASE=/nonexistentx
index=${PORTSDIR}/${INDEXFILE}
Index: scripts/buildscript
===================================================================
RCS file: /home/ncvs/ports/Tools/portbuild/scripts/buildscript,v
retrieving revision 1.31
diff -u -r1.31 buildscript
--- scripts/buildscript 13 Mar 2008 09:54:03 -0000 1.31
+++ scripts/buildscript 11 Apr 2008 09:40:56 -0000
@@ -117,7 +117,6 @@
export MALLOC_OPTIONS=AJ
L=`echo ${LOCALBASE} | sed 's,^/,,'`
-X=`echo ${X11BASE} | sed 's,^/,,'`
Z=`ident ${dir}/Makefile | grep 'FreeBSD:' | sed 's/^[ \t]*//'`
if [ $phase = 1 ]; then
@@ -135,7 +134,7 @@
echo "BUILD_DEPENDS=${BD}"
echo "RUN_DEPENDS=${RD}"
- echo "prefixes: LOCALBASE=${L} X11BASE=${X}"
+ echo "prefixes: LOCALBASE=${L}"
#Allow ports to notice they're being run on bento
export PACKAGE_BUILDING=1
@@ -159,7 +158,6 @@
./usr/local/etc/apache2
./usr/local/news
./usr/local/share/xml
-./usr/X11R6/etc/gconf
./usr/local/etc/gconf
./var/db/fontconfig
EOF
@@ -227,7 +225,6 @@
./usr/local/etc/apache2
./usr/local/news
./usr/local/share/xml
-./usr/X11R6/etc/gconf
./usr/local/etc/gconf
./var/db/fontconfig
EOF
@@ -238,8 +235,8 @@
if which -s Xvfb; then
xvfb=1
pid=$(echo $$ % 32768 | bc)
- X11BASE=$(which Xvfb | sed -e 's./bin/Xvfb..')
- Xvfb :${pid} -fp ${X11BASE}/lib/X11/fonts/misc &
+ LOCALBASE=$(which Xvfb | sed -e 's./bin/Xvfb..')
+ Xvfb :${pid} -fp ${LOCALBASE}/lib/X11/fonts/misc &
DISPLAY=${JAIL_ADDR}:${pid}
export DISPLAY
fi
@@ -253,7 +250,7 @@
cd $dir
/pnohang $TIMEOUT /tmp/make.log5 ${pkgname} make -k regression-test
cat /tmp/make.log5
- mtree -X /tmp/mtree.buildexclude -x -f /tmp/mtree.prebuild -p / | egrep -v "^(${L}/var|${X}/lib/X11/xserver/SecurityPolicy|${L}/share/nls/POSIX|${L}/share/nls/en_US.US-ASCII|etc/services|compat |${X} |etc/manpath.config|etc/.*.bak|${L}/info/dir|${X}/lib/X11/fonts/.*/fonts\.|usr/(X11R6|local)/man/..( |/man. )|${X}/lib/X11/fonts/TrueType|${X}/etc/gconf/gconf.xml.defaults/%gconf-tree.*.xml|${L}/etc/gconf/gconf.xml.defaults/%gconf-tree.*.xml|var/db/fontconfig/* )" > /tmp/list.preinstall
+ mtree -X /tmp/mtree.buildexclude -x -f /tmp/mtree.prebuild -p / | egrep -v "^(${L}/var|${L)/lib/X11/xserver/SecurityPolicy|${L}/share/nls/POSIX|${L}/share/nls/en_US.US-ASCII|etc/services|compat |${L} |etc/manpath.config|etc/.*.bak|${L}/info/dir|${L}/lib/X11/fonts/.*/fonts\.|usr/local/man/..( |/man. )|${L}/lib/X11/fonts/TrueType|${L}/etc/gconf/gconf.xml.defaults/%gconf-tree.*.xml|var/db/fontconfig/* )" > /tmp/list.preinstall
if [ -s /tmp/list.preinstall ]; then
echo "================================================================"
@@ -299,7 +296,7 @@
cleanup 7
fi
- mtree -X /tmp/mtree.exclude -x -f /tmp/mtree -p / | egrep -v "^(${L}/var|${X}/lib/X11/xserver/SecurityPolicy|${L}/share/nls/POSIX|${L}/share/nls/en_US.US-ASCII|etc/services|compat |${X} |etc/manpath.config|etc/.*.bak|${L}/info/dir|${X}/lib/X11/fonts/.*/fonts\.|usr/(X11R6|local)/man/..( |/man. )|${X}/lib/X11/fonts/TrueType|${X}/etc/gconf/gconf.xml.defaults/%gconf-tree.*.xml|${L}/etc/gconf/gconf.xml.defaults/%gconf-tree.*.xml|var/db/fontconfig/* )" > /tmp/list3
+ mtree -X /tmp/mtree.exclude -x -f /tmp/mtree -p / | egrep -v "^(${L}/var|${L}/lib/X11/xserver/SecurityPolicy|${L}/share/nls/POSIX|${L}/share/nls/en_US.US-ASCII|etc/services|compat |${L} |etc/manpath.config|etc/.*.bak|${L}/info/dir|${L}/lib/X11/fonts/.*/fonts\.|usr/local/man/..( |/man. )|${L}/lib/X11/fonts/TrueType|${L}/etc/gconf/gconf.xml.defaults/%gconf-tree.*.xml|var/db/fontconfig/* )" > /tmp/list3
# Compare the state of the filesystem now to before the 'make install' phase
dirty=0
@@ -309,7 +306,7 @@
grep ' missing$' /tmp/list3 > /tmp/list5
grep -vE ' (extra|missing)$' /tmp/list3 > /tmp/list6
if [ "x${NOPLISTCHECK}" = "x" ]; then
- if grep -vqE "($X|$L)/etc/" /tmp/list4; then
+ if grep -vq "$L/etc/" /tmp/list4; then
echo "1" > /tmp/status
dirty=1
fi
@@ -353,7 +350,7 @@
fi
# Compare the state of the filesystem now to clean system (should again be clean)
- mtree -X /tmp/mtree.preexclude -x -f /tmp/mtree.pristine -p / | egrep -v "^(${L}/var|${X}/lib/X11/xserver/SecurityPolicy|${L}/share/nls/POSIX|${L}/share/nls/en_US.US-ASCII|etc/services|compat |${X} |etc/manpath.config|etc/.*.bak|${L}/info/dir|${X}/lib/X11/fonts/.*/fonts\.|usr/(X11R6|local)/man/..( |/man. )|${X}/lib/X11/fonts/TrueType )" > /tmp/list3
+ mtree -X /tmp/mtree.preexclude -x -f /tmp/mtree.pristine -p / | egrep -v "^(${L}/var|${L}/lib/X11/xserver/SecurityPolicy|${L}/share/nls/POSIX|${L}/share/nls/en_US.US-ASCII|etc/services|compat |${L} |etc/manpath.config|etc/.*.bak|${L}/info/dir|${L}/lib/X11/fonts/.*/fonts\.|usr/local/man/..( |/man. )|${L}/lib/X11/fonts/TrueType )" > /tmp/list3
echo
echo "=== Checking filesystem state after all packages deleted"
@@ -364,7 +361,7 @@
grep ' missing$' /tmp/list3 > /tmp/list5
grep -vE ' (extra|missing)$' /tmp/list3 > /tmp/list6
if [ "x${NOPLISTCHECK}" = "x" ]; then
- if grep -vqE "($X|$L)/etc/" /tmp/list4; then
+ if grep -vq "$L/etc/" /tmp/list4; then
#echo "1" > /tmp/status
fi
if [ -s /tmp/list5 ]; then
Index: scripts/buildsuccess
===================================================================
RCS file: /home/ncvs/ports/Tools/portbuild/scripts/buildsuccess,v
retrieving revision 1.6
diff -u -r1.6 buildsuccess
--- scripts/buildsuccess 11 Feb 2006 09:48:53 -0000 1.6
+++ scripts/buildsuccess 11 Apr 2008 09:40:56 -0000
@@ -18,7 +18,6 @@
# Don't pick up installed packages from the host
export LOCALBASE=/nonexistentlocal
-export X11BASE=/nonexistentx
index=${PORTSDIR}/${INDEXFILE}
Index: scripts/clean-chroot
===================================================================
RCS file: /home/ncvs/ports/Tools/portbuild/scripts/clean-chroot,v
retrieving revision 1.14
diff -u -r1.14 clean-chroot
--- scripts/clean-chroot 29 Jul 2007 20:27:54 -0000 1.14
+++ scripts/clean-chroot 11 Apr 2008 09:40:56 -0000
@@ -45,7 +45,7 @@
buildenv ${pb} ${arch} ${branch}
# directories to clean
-cleandirs="${LOCALBASE} ${X11BASE} /compat /var/db/pkg"
+cleandirs="${LOCALBASE} /compat /var/db/pkg"
if [ ! -d "${chroot}" ]; then
exit 0
Index: scripts/dopackages
===================================================================
RCS file: /home/ncvs/ports/Tools/portbuild/scripts/dopackages,v
retrieving revision 1.46
diff -u -r1.46 dopackages
--- scripts/dopackages 14 Jan 2008 17:10:33 -0000 1.46
+++ scripts/dopackages 11 Apr 2008 09:40:56 -0000
@@ -157,7 +157,7 @@
starttime=$(date +%s)
-PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin
+PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin
if [ $# = 0 ]; then
usage
Index: scripts/makeduds
===================================================================
RCS file: /home/ncvs/ports/Tools/portbuild/scripts/makeduds,v
retrieving revision 1.18
diff -u -r1.18 makeduds
--- scripts/makeduds 18 Feb 2007 08:58:24 -0000 1.18
+++ scripts/makeduds 11 Apr 2008 09:40:56 -0000
@@ -32,7 +32,6 @@
export PACKAGE_BUILDING=1
export LOCALBASE=/nonexistentlocal
-export X11BASE=/nonexistentx
export LINUXBASE=/nonexistentlinux
export PKG_DBDIR=/nonexistentpkg
export PORT_DBDIR=/nonexistentport
Index: scripts/makeindex
===================================================================
RCS file: /home/ncvs/ports/Tools/portbuild/scripts/makeindex,v
retrieving revision 1.25
diff -u -r1.25 makeindex
--- scripts/makeindex 11 Mar 2008 17:05:55 -0000 1.25
+++ scripts/makeindex 11 Apr 2008 09:40:56 -0000
@@ -70,12 +70,11 @@
# Don't pick up installed packages from the host
export LOCALBASE=/nonexistentlocal
-export X11BASE=/nonexistentx
cd ${PORTSDIR}
make index
# remove extra spaces in dependency list -- this causes problems
# Also transform the dummy paths to their canonical locations
-sed -e 's/ */ /g' -e 's/| */|/g' -e 's/ *|/|/g' -e "s,${LOCALBASE},/usr/local," -e "s,${X11BASE},/usr/X11R6," ${INDEXFILE} > ${INDEXFILE}.tmp
+sed -e 's/ */ /g' -e 's/| */|/g' -e 's/ *|/|/g' -e "s,${LOCALBASE},/usr/local," ${INDEXFILE} > ${INDEXFILE}.tmp
mv -f ${INDEXFILE}.tmp ${INDEXFILE}
Index: scripts/mkbindist
===================================================================
RCS file: /home/ncvs/ports/Tools/portbuild/scripts/mkbindist,v
retrieving revision 1.17
diff -u -r1.17 mkbindist
--- scripts/mkbindist 14 Jan 2008 17:10:33 -0000 1.17
+++ scripts/mkbindist 11 Apr 2008 09:40:56 -0000
@@ -58,7 +58,7 @@
# files.
if [ "${ftp}" = 0 ]; then
(cd ${worlddir}; find -dx . | \
- grep -v -E '^./usr/(X11R6|local|obj|opt|ports|src)' | \
+ grep -v -E '^./usr/(local|obj|opt|ports|src)' | \
grep -v '^./home' | \
grep -v '^./var/db/pkg' | \
cpio -dump ${tmpdir})
Index: scripts/portbuild
===================================================================
RCS file: /home/ncvs/ports/Tools/portbuild/scripts/portbuild,v
retrieving revision 1.58
diff -u -r1.58 portbuild
--- scripts/portbuild 29 Jul 2007 19:56:36 -0000 1.58
+++ scripts/portbuild 11 Apr 2008 09:40:56 -0000
@@ -137,13 +137,13 @@
ulimit -t 7200
# directories to clean
-cleandirs="${LOCALBASE} ${X11BASE} /compat /var/db/pkg"
+cleandirs="${LOCALBASE} /compat /var/db/pkg"
# 15 minutes
export FTP_TIMEOUT=900
export HTTP_TIMEOUT=900
-export PATH=/sbin:/bin:/usr/sbin:/usr/bin:${LOCALBASE}/sbin:${LOCALBASE}/bin:${X11BASE}/bin
+export PATH=/sbin:/bin:/usr/sbin:/usr/bin:${LOCALBASE}/sbin:${LOCALBASE}/bin
echo "building $pkgname in $chroot"
Index: scripts/processlogs2
===================================================================
RCS file: /home/ncvs/ports/Tools/portbuild/scripts/processlogs2,v
retrieving revision 1.9
diff -u -r1.9 processlogs2
--- scripts/processlogs2 11 Dec 2005 04:35:44 -0000 1.9
+++ scripts/processlogs2 11 Apr 2008 09:40:56 -0000
@@ -43,7 +43,7 @@
maints="$maints $maint"
echo -n "$maint" >>$of
echo "" >>$of
- cat $log.log | sed -e '1,/^list of extra files and directories/d' -e '/^list of/,$d' | awk '{print $11}' | sed -E -e 's,^,,' -e 's,(usr/(local|X11R6)),\1,g' -e 's,$,
,' >>$of
+ cat $log.log | sed -e '1,/^list of extra files and directories/d' -e '/^list of/,$d' | awk '{print $11}' | sed -E -e 's,^,,' -e 's,(usr/local),\1,g' -e 's,$,
,' >>$of
cat $log.log | sed -e '1,/^list of files present before this port was installed/d' -e '/^list of/,$d' -e 's,^\./,,' | awk '{print $1}' | sed -e 's,^,,' -e 's,$, (missing)
,' >> $of
cat $log.log | sed -e '1,/^list of filesystem changes/d' -e '/^ /d' | awk '{print $1}' | sed -e 's,^,,' -e 's,$, (changed)
,' >>$of
echo " | " >>$of