diff options
author | Dmitry Sivachenko <demon@FreeBSD.org> | 2003-10-19 08:33:39 +0000 |
---|---|---|
committer | Dmitry Sivachenko <demon@FreeBSD.org> | 2003-10-19 08:33:39 +0000 |
commit | 35ee82db50e058c12bf537cffc3f66e207b5b9d4 (patch) | |
tree | 3c01d2db234797b6ba6214879f338a74d144db95 /www/slash/files | |
parent | Respect CC and CFLAGS (diff) |
Revive www/slash port.
Slash -- Slashdot Like Automated Storytelling Homepage -- is the code
that runs Slashdot.
PR: 57199
Submitted by: Autrijus Tang <autrijus@autrijus.org>
Notes
Notes:
svn path=/head/; revision=91628
Diffstat (limited to 'www/slash/files')
-rw-r--r-- | www/slash/files/patch-Makefile | 21 | ||||
-rw-r--r-- | www/slash/files/patch-bin::install-slashsite | 30 | ||||
-rw-r--r-- | www/slash/files/patch-util::slash | 11 |
3 files changed, 62 insertions, 0 deletions
diff --git a/www/slash/files/patch-Makefile b/www/slash/files/patch-Makefile new file mode 100644 index 000000000000..d4b5b649434b --- /dev/null +++ b/www/slash/files/patch-Makefile @@ -0,0 +1,21 @@ +--- Makefile.orig Mon Mar 18 19:22:59 2002 ++++ Makefile Mon Mar 18 19:22:25 2002 +@@ -167,15 +167,11 @@ + if [ -d $(INIT) ]; then \ + init=$(INIT); \ + fi; \ +- elif [ -d /etc/init.d ]; then \ +- init=/etc; \ +- elif [ -d /etc/rc.d/init.d ]; then \ +- init=/etc/rc.d; \ ++ elif [ -d /usr/local/etc/rc.d ]; then \ ++ init=/usr/local/etc/rc.d; \ + fi; \ + if [ $$init ]; then \ +- $(INSTALL) utils/slash $$init/init.d/; \ +- ln -s -f ../init.d/slash $$init/rc3.d/S99slash; \ +- ln -s -f ../init.d/slash $$init/rc6.d/K99slash; \ ++ $(INSTALL) utils/slash $$init/slash.sh; \ + else \ + echo "*** Makefile can't determine where your init scripts live."; \ + if [ $$init ]; then \ diff --git a/www/slash/files/patch-bin::install-slashsite b/www/slash/files/patch-bin::install-slashsite new file mode 100644 index 000000000000..1c0f3ca0c43c --- /dev/null +++ b/www/slash/files/patch-bin::install-slashsite @@ -0,0 +1,30 @@ +--- bin/install-slashsite.orig Mon Mar 18 18:35:35 2002 ++++ bin/install-slashsite Mon Mar 18 18:42:08 2002 +@@ -89,7 +89,7 @@ + + # THIS IS DANGEROUS ... when run as root on a non-GNU + # system, it can blank out the hostname entirely +-chomp($hostname_f = `hostname -f`); ++chomp($hostname_f = `hostname -f 2> /dev/null` || `hostname 2> /dev/null`); + unless ($opts{'H'}) { + print " + What is hostname of your Slash site +@@ -431,6 +431,7 @@ + sub apache_site_conf { + my $host_port = $hostname; + $host_port .= ":80" unless $host_port =~ /:/; ++ my $log_path = (-d '/usr/local/logs' ? "logs" : "/var/log"); + my $text = qq| + # note that if your site's path is a symlink, the + # path listed here is most likely the actual path; +@@ -446,8 +447,8 @@ + ServerAdmin $email + DocumentRoot $prefix_site/$sitename/htdocs + ServerName $host_noport +- ErrorLog logs/${sitename}_error_log +- CustomLog logs/${sitename}_access_log common ++ ErrorLog $log_path/${sitename}_error_log ++ CustomLog $log_path/${sitename}_access_log common + + PerlSetupEnv On + PerlSetEnv TZ GMT diff --git a/www/slash/files/patch-util::slash b/www/slash/files/patch-util::slash new file mode 100644 index 000000000000..b6a620fac8fd --- /dev/null +++ b/www/slash/files/patch-util::slash @@ -0,0 +1,11 @@ +--- utils/slash.orig Thu Nov 1 01:13:59 2001 ++++ utils/slash Sat Jun 8 13:39:11 2002 +@@ -66,7 +66,7 @@ + # if you aren't using GMT for internal dates, please change + # the appropriate lines, below. + if [ "$OS" = "FreeBSD" ] ; then +- su - $USERNAME "-c 'TZ=GMT $SLASHD $SERVER_NAME'" & ++ TZ=GMT su $USERNAME -c "$SLASHD $SERVER_NAME" & + elif [ "$OS" = "Linux" ] ; then + su - $USERNAME -c "TZ=GMT $SLASHD $SERVER_NAME" & + else |