s/firebird/firefox/ and other minor edits for style etc.

PR:		69250
Submitted by:	Brad Davis <so14k@so14k.com>
This commit is contained in:
Jens Schweikhardt 2004-07-19 20:42:14 +00:00
parent e59de34fd4
commit 9609a694cf
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/head/; revision=21586
2 changed files with 38 additions and 47 deletions

View file

@ -1,8 +1,9 @@
# vim: syntax=sh
# $Id: stage_2.conf.default,v 1.2 2004-01-21 19:39:26 schweikh Exp $
# $Id: stage_2.conf.default,v 1.3 2004-07-19 20:42:13 schweikh Exp $
# $FreeBSD$
shells zsh
lang perl5 make install; use.perl port
devel gettext make BATCH=yes install
lang perl5.8 make install; use.perl port
archivers unzip
archivers zip
security sudo
@ -34,7 +35,7 @@ java jdk14 mount -a linproc; make -DNODEBUG install
www apache2
www weblint
www amaya
www mozilla-firebird
www firefox make BATCH=yes install
www mozilla make WITHOUT_MAILNEWS=yes WITHOUT_COMPOSER=yes WITHOUT_LDAP=yes WITHOUT_CHATZILLA=yes WITHOUT_XMLTERM=yes install
www checkbot
www privoxy
@ -49,23 +50,24 @@ news tin
net freebsd-uucp
net cvsup-without-gui
net pathchar make NO_CHECKSUM=yes install
net smokeping
ftp wget
ftp ncftp3
textproc ispell
german ispell-neu
german ispell-alt
textproc docproj make JADETEX=no HAVE_MOTIF=yes install
textproc docproj make JADETEX=no HAVE_MOTIF=yes BATCH=yes install < /dev/null
sysutils samefile
sysutils lsof
sysutils pstree
sysutils mkisofs
sysutils cdrtools
#sysutils grub currently (0.93) marked BROKEN
sysutils grub
sysutils smartmontools
sysutils vobcopy
devel ddd
devel gindent
devel ctags
devel ElectricFence
devel strace
devel perltidy
mail procmail make BATCH=yes install
mail metamail
mail mutt-devel
@ -73,9 +75,11 @@ emulators mtools
sysutils portupgrade
news inn-stable CONFIGURE_ARGS="--enable-uucp-rnews --enable-setgid-inews" make install
misc figlet-fonts
textproc gmat
security gpa
mail spamoracle
multimedia mplayer make WITHOUT_RUNTIME_CPUDETECTION=yes WITH_GUI=yes BATCH=yes install
multimedia mplayer-fonts
audio wavplay
games xmahjongg
games xdemineur
editors openoffice-1.1

View file

@ -7,7 +7,7 @@
# It is a good idea to make sure any target can be made more than
# once without ill effect.
#
# $Id: stage_3.mk,v 1.3 2004-01-21 19:39:26 schweikh Exp $
# $Id: stage_3.mk,v 1.4 2004-07-19 20:42:14 schweikh Exp $
# $FreeBSD$
.POSIX:
@ -15,13 +15,12 @@
message:
@echo "Please use one of the following targets:"
@echo "config_apache"
@echo "config_firebird"
@echo "config_firefox"
@echo "config_inn"
@echo "config_javaplugin"
@echo "config_nullplugin"
@echo "config_privoxy"
@echo "config_sgml"
@echo "config_smokeping"
@echo "config_smartd"
@echo "config_sudo"
@echo "config_TeX"
@echo "config_tin"
@ -31,18 +30,18 @@ message:
all: \
config_apache \
config_firebird \
config_firefox \
config_inn \
config_javaplugin \
config_nullplugin \
config_privoxy \
config_sgml \
config_smokeping \
config_smartd \
config_sudo \
config_TeX \
config_tin \
config_uucp
config_apache:
# 1. Modify httpd.conf.
perl -pi \
@ -63,14 +62,15 @@ config_apache:
diff -u /usr/local/etc/apache2/httpd.conf httpd.conf; \
fi
if test -f /var/run/httpd.pid; then \
/usr/local/etc/rc.d/apache2.sh restart; \
/usr/local/etc/rc.d/apache2.sh stop; \
/usr/local/etc/rc.d/apache2.sh start; \
else \
/usr/local/etc/rc.d/apache2.sh start; \
fi
config_firebird:
config_firefox:
# Make this group wheel writable to allow extensions being installed.
chmod -R g+w /usr/X11R6/lib/firebird/lib/mozilla-1.5/chrome
chmod -R g+w /usr/X11R6/lib/firefox/lib/mozilla-1.6/chrome
config_inn:
pw usermod -n news -d /usr/local/news -s /bin/sh
@ -150,25 +150,18 @@ config_inn:
fi
config_javaplugin:
# Mozilla Firebird:
cd /usr/X11R6/lib/firebird/lib/mozilla-1.5/plugins; \
# Mozilla Firefox:
cd /usr/X11R6/lib/firefox/lib/mozilla-1.6/plugins; \
ln -fs /usr/local/jdk1.4.2/jre/plugin/i386/ns610/libjavaplugin_oji.so
# Plain Mozilla:
cd /usr/X11R6/lib/mozilla/plugins; \
ln -fs /usr/local/jdk1.4.2/jre/plugin/i386/ns610/libjavaplugin_oji.so
#cd /usr/X11R6/lib/mozilla/plugins; \
#ln -fs /usr/local/jdk1.4.2/jre/plugin/i386/ns610/libjavaplugin_oji.so
# Move the nullplugin out of the way. With a .mozilla/*/*/prefs.js entry of
# user_pref("plugin.display_plugin_downloader_dialog", false);
# this suppresses popup dialogs for unavailable plugins (flash, shockwave, ...)
NULLPLUGINS = /usr/X11R6/lib/mozilla/libnullplugin.so \
/usr/X11R6/lib/mozilla/plugins/libnullplugin.so
# this suppresses popup dialogs for unavailable plugins (flash, ...)
config_nullplugin:
for p in $(NULLPLUGINS); do \
if test -r $$p; then \
mv $$p $$p.orig; \
fi; \
done
find /usr/X11R6/lib -name libnullplugin.so -exec mv {} {}.orig \;
config_privoxy:
install -C -o root -g wheel -m 644 conf/privoxy/config \
@ -177,15 +170,9 @@ config_privoxy:
/usr/local/etc/rc.d
/usr/local/etc/rc.d/privoxy.sh restart
config_sgml:
cp -p /usr/local/share/gmat/sgml/ISO_8879-1986/entities/* \
/usr/local/share/sgml/docbook/4.1
config_smokeping:
cp conf/smokeping/config conf/smokeping/basepage.html \
/usr/local/etc/smokeping
/usr/local/etc/rc.d/smokeping.sh stop
/usr/local/etc/rc.d/smokeping.sh start
config_smartd:
cp smartd.sh /usr/local/etc/rc.d/smartd.sh
cp smartd.conf /usr/local/etc/smartd.conf
config_sudo:
if ! grep -q schweikh /usr/local/etc/sudoers; then \
@ -195,12 +182,12 @@ config_sudo:
config_TeX:
# textproc/docproj advises: to typeset the FreeBSD Handbook with JadeTeX,
# change the following settings to the listed values:
perl -pi \
-e 's/^% original texmf.cnf/% texmf.cnf/;' \
-e 's/^(hash_extra\s*=).*/$${1}60000/;' \
-e 's/^(pool_size\s*=).*/$${1}1000000/;' \
-e 's/^(max_strings\s*=).*/$${1}70000/;' \
-e 's/^(save_size\s*=).*/$${1}10000/;' \
perl -pi \
-e 's/^% original texmf.cnf/% texmf.cnf/;' \
-e 's/^(hash_extra\s*=\s*).*/$${1}60000/;' \
-e 's/^(pool_size\s*=\s*).*/$${1}1000000/;' \
-e 's/^(max_strings\s*=\s*).*/$${1}70000/;' \
-e 's/^(save_size\s*=\s*).*/$${1}10000/;' \
/usr/local/share/texmf/web2c/texmf.cnf
# Test if the texmf.cnf has changed.
@if ! cmp -s /usr/local/share/texmf/web2c/texmf.cnf texmf.cnf; then \