diff --git a/en/gnome/Makefile b/en/gnome/Makefile
index 3c3c061db2..9b653a970c 100644
--- a/en/gnome/Makefile
+++ b/en/gnome/Makefile
@@ -1,43 +1,43 @@
-# $FreeBSD: www/en/gnome/Makefile,v 1.16 2004/06/17 00:28:54 adamw Exp $
+# $FreeBSD: www/en/gnome/Makefile,v 1.17 2004/06/27 21:41:07 marcus Exp $
.if exists(../Makefile.conf)
.include "../Makefile.conf"
.endif
.if exists(../Makefile.inc)
.include "../Makefile.inc"
.endif
SUBDIR= docs
SUBDIR+= images
DOCS= screenshots.sgml
DOCS+= contact.sgml
-DATA= index.html newsflash.html news.rdf gnome_upgrade.sh gnomelogalyzer.sh builditinator.sh omf.pl gconf.pl
+DATA= index.html newsflash.html news.rdf gnome_upgrade.sh gnomelogalyzer.sh omf.pl gconf.pl
CLEANFILES= index.html
CLEANFILES+= newsflash.html
CLEANFILES+= news.rdf
index.html! index.xsl news.xml includes.xsl ../includes.xsl
${XSLTPROC} ${XSLTPROCOPTS:N-nonet} -o index.html \
${.CURDIR}/index.xsl ${.CURDIR}/news.xml
.if !defined(NO_TIDY)
-${TIDY} ${TIDYOPTS} index.html
.endif
news.rdf: rss.xsl news.xml includes.xsl ../includes.xsl
${XSLTPROC} ${XSLTPROCOPTS} -o news.rdf \
${.CURDIR}/rss.xsl ${.CURDIR}/news.xml
.if !defined(NO_TIDY)
-${TIDY} -xml -wrap 0 ${TIDYOPTS} news.rdf
.endif
newsflash.html: newsflash.xsl news.xml includes.xsl ../includes.xsl
${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
${.CURDIR}/newsflash.xsl ${.CURDIR}/news.xml
.if !defined(NO_TIDY)
-${TIDY} ${TIDYOPTS} ${.TARGET}
.endif
.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/gnome/builditinator.sh b/en/gnome/builditinator.sh
deleted file mode 100644
index 977dfd0fb1..0000000000
--- a/en/gnome/builditinator.sh
+++ /dev/null
@@ -1,226 +0,0 @@
-#!/bin/sh
-
-# builditinator.sh
-# written by Adam Weinberger
-# pwned by the FreeBSD GNOME team
-# under the BSD Public Licence
-# Adam hungry. need taco. unga.
-
-# handles the basic processes of testing old and new GNOME versions
-
-SKIP_CVSUP=${SKIP_CVSUP:=0}
-
-#### Be sure to change these variables to match your system:
-
-LOGDIR=/build/output
-MCOM_PORTS=/usr/ports/MARCUSCOM/ports
-MCOM_PORTSTOOLS=/usr/ports/MARCUSCOM/portstools
-MCOM_PORTSEXP=/usr/ports/MARCUSCOM/ports-experimental
-FBSD_PORTS=/usr/ports
-MCOM_PATCHES=/usr/ports/PATCHES/marcuscom
-FBSD_PATCHES=/usr/ports/PATCHES/freebsd
-
-CVSUP_CONF=/etc/cvsup.conf
-# Re-order these to install them in differing orders
-# (low-key dependency checking):
-METAPORTS="${METAPORTS} x11/gnome2"
-METAPORTS="${METAPORTS} x11/gnome2-fifth-toe"
-METAPORTS="${METAPORTS} x11/gnome2-power-tools"
-METAPORTS="${METAPORTS} editors/gnome2-office"
-METAPORTS="${METAPORTS} devel/gnome2-hacker-tools"
-
-
-#### There are no interesting user-settable variables below this line.
-
-BUILDITINATOR_VERSION=2.7.2
-
-OLDVER=2.6
-NEWVER=2.7
-
-echo "`basename $0` version ${BUILDITINATOR_VERSION}"
-
-clean() {
- echo "==> Cleaning system..."
- echo "Clearing out work directories..."
- find ${FBSD_PORTS} ${MCOM_PORTS} ${MCOM_PORTSEXP} -type d -name work | xargs rm -R 2>/dev/null
- echo "Removing all ports..."
- pkg_delete -a
- echo "Finding missing plist items in /usr/local..."
- find /usr/local -type f -o -type l > ${LOGDIR}/missing-plist-items-localbase 2>/dev/null
- echo -n "Number of items found: "
- wc -l ${LOGDIR}/missing-plist-items-localbase | cut -f1 -d/ ; echo
- echo "Finding missing plist items in /usr/X11R6..."
- find /usr/X11R6 -type f -o -type l > ${LOGDIR}/missing-plist-items-x11base 2>/dev/null
- echo -n "Number of items found: "
- wc -l ${LOGDIR}/missing-plist-items-x11base | cut -f1 -d/ ; echo
- echo "Backing up extra files..."
- tar cfy ${LOGDIR}/localbase-missing-items.tbz /usr/local 2>/dev/null
- tar cfy ${LOGDIR}/x11base-missing-items.tbz /usr/X11R6 2>/dev/null
- echo "Removing /usr/local..."
- rm -R /usr/local 2>/dev/null
- echo "Removing /usr/X11R6..."
- rm -R /usr/X11R6 2>/dev/null
-}
-
-update() {
- echo "==> Updating repositories..."
-# prevent stale patches by removing files/ directories prn before cvsupping.
- for dir in `find ${MCOM_PORTS} -type f -name distinfo | sed -e "s|${MCOM_PORTS}|${FBSD_PORTS}|g; s|/distinfo|/files/|g"`
- do
- rm -R ${dir} 2>/dev/null
- done
- for dir in `find ${MCOM_PORTSEXP} -type f -name distinfo | sed -e "s|${MCOM_PORTSEXP}|${FBSD_PORTS}|g; s|/distinfo|/files/|g"`
- do
- rm -R ${dir} 2>/dev/null
- done
- if [ ! -f /usr/local/bin/cvsup ]; then
- if [ -f ~/cvsup-without-gui.tgz ]; then
- pkg_add ~/cvsup-without-gui.tgz
- else
- pkg_add -r cvsup-without-gui
- fi
- fi
- if [ ${SKIP_CVSUP} = 0 ]; then
- cvsup ${CVSUP_CONF}
- fi
- make -C ${MCOM_PORTSTOOLS} clean all
- mkdir -p /usr/local/bin
- install -m 755 ${MCOM_PORTSTOOLS}/marcusmerge.sh /usr/local/bin/marcusmerge
- install -m 755 ${MCOM_PORTSTOOLS}/gnome_upgrade.sh /usr/local/bin/
-}
-
-prime() {
- echo "==> Priming system..."
- make -C ${FBSD_PORTS}/sysutils/portupgrade install clean
- pkgdb -F
-# if you prefer any particular tools in your build environment, put them here.
- WITHOUT_X11=yes portinstall editors/vim
-}
-
-install_new() {
- echo "==> Installing metaports..."
- for port in ${METAPORTS}
- do
- rm ${LOGDIR}/`basename ${port}`output.log 2>/dev/null
- portinstall ${port} 2>&1 | tee ${LOGDIR}/`basename ${port}`output.log
- done
-}
-
-upgrade() {
- echo "==> Updating to ${NEWVER}..."
- /usr/local/bin/gnome_upgrade.sh
-}
-
-patches() {
- if find ${MCOM_PATCHES} -type f 2>/dev/null; then
- for patchfile in ${MCOM_PATCHES}/*; do
- cd ${MCOM_PORTS} && patch -p0 < patchfile
- done
- fi
- if find ${FBSD_PATCHES} -type f 2>/dev/null; then
- for patchfile in ${FBSD_PATCHES}/*; do
- cd ${FBSD_PORTS} && patch -p0 < patchfile
- done
- fi
-}
-
-cat <
-
Test existing ports, and
report bugs. Try to build with
weird configurations intentionally, before someone else tries
to do so cluelessly.
-
Regularly install GNOME from packages, and report any problems
with the install or the functionality.
-
Find GNOME applications not yet ported to FreeBSD, and
work on porting them over.
-
Subscribe to the freebsd-gnome mailing list, and help
answer users' questions.
-
Proofread the FreeBSD GNOME project pages,
and offer feedback and updates.
-
If you are brave, please help fix the lang/mono port!
-
Build, upgrade, and rebuild both stable and development
- versions. The builditinator.sh
- script can automate the entire process, from start to finish.
+ versions. The builditinator.sh script, available from the
+ MarcusCOM portstools repository,
+ can automate the entire process, from start to finish.
Send any feedback to
&email;@FreeBSD.org.
&footer;