add slash 2.2.5

Slash-Like Automatic Storytelling Homepage system

PR:		36066
Submitted by:	Autrijus Tang <autrijus@egb.elixus.org>

4 files changed, 92 insertions, 0 deletions

diff --git a/www/slash/files/patch-Makefile b/www/slash/files/patch-Makefile
new file mode 100644
index 000000000000..0542de396887
--- /dev/null
+++ b/www/slash/files/patch-Makefile
@@ -0,0 +1,21 @@
+--- Makefile.old	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-aa b/www/slash/files/patch-aa
new file mode 100644
index 000000000000..975db92663ed
--- /dev/null
+++ b/www/slash/files/patch-aa
@@ -0,0 +1,30 @@
+--- bin/install-slashsite.old	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-install-slashsite b/www/slash/files/patch-install-slashsite
new file mode 100644
index 000000000000..975db92663ed
--- /dev/null
+++ b/www/slash/files/patch-install-slashsite
@@ -0,0 +1,30 @@
+--- bin/install-slashsite.old	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-slash b/www/slash/files/patch-slash
new file mode 100644
index 000000000000..279b26c6087e
--- /dev/null
+++ b/www/slash/files/patch-slash
@@ -0,0 +1,11 @@
+--- util/slash.old	Thu Nov  1 01:13:59 2001
++++ util/slash	Mon Mar 18 20:01:37 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