aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--www/slash/files/patch-Makefile14
-rw-r--r--www/slash/pkg-plist1
2 files changed, 9 insertions, 6 deletions
diff --git a/www/slash/files/patch-Makefile b/www/slash/files/patch-Makefile
index b508e3654805..71e2e393bec9 100644
--- a/www/slash/files/patch-Makefile
+++ b/www/slash/files/patch-Makefile
@@ -1,23 +1,25 @@
--- Makefile.orig Wed Jul 3 17:22:34 2002
-+++ Makefile Mon Mar 7 09:50:44 2005
++++ Makefile Tue Mar 8 10:57:41 2005
@@ -62,7 +62,7 @@
slash:
@echo "=== INSTALLING SLASH MODULES ==="
@if [ ! "$(RPM)" ] ; then \
- (cd Slash; $(PERL) Makefile.PL; make install UNINST=1); \
-+ (cd Slash; $(PERL) Makefile.PL PREFIX=$(PREFIX); make install UNINST=1); \
++ (cd Slash; $(PERL) Makefile.PL PREFIX=$(PREFIX); make all pure_install UNINST=1); \
else \
echo " - Performing an RPM build"; \
(cd Slash; $(PERL) Makefile.PL INSTALLSITEARCH=$(INSTALLSITEARCH) INSTALLSITELIB=$(INSTALLSITELIB) INSTALLMAN3DIR=$(INSTALLMAN3DIR); make install UNINST=1); \
-@@ -76,7 +76,7 @@
+@@ -76,8 +76,8 @@
echo == $$PWD; \
if [ -f Makefile.PL ]; then \
if [ ! "$(RPM)" ] ; then \
- $(PERL) Makefile.PL; \
+- make install UNINST=1;\
+ $(PERL) Makefile.PL PREFIX=$(PREFIX); \
- make install UNINST=1;\
++ make all pure_install UNINST=1;\
else \
echo " - Performing an RPM build."; \
+ $(PERL) Makefile.PL INSTALLSITEARCH=$(INSTALLSITEARCH) INSTALLSITELIB=$(INSTALLSITELIB) INSTALLMAN3DIR=$(INSTALLMAN3DIR); \
@@ -86,7 +86,7 @@
fi); \
done)
@@ -35,8 +37,8 @@
- 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; \
++ elif [ -d $(PREFIX)/etc/rc.d ]; then \
++ init=$(PREFIX)/etc/rc.d; \
fi; \
if [ $$init ]; then \
- $(INSTALL) utils/slash $$init/init.d/; \
diff --git a/www/slash/pkg-plist b/www/slash/pkg-plist
index 99997b937b27..433220bdbe88 100644
--- a/www/slash/pkg-plist
+++ b/www/slash/pkg-plist
@@ -42,6 +42,7 @@
%%SITE_PERL%%/Slash/Messages.pm
%%SITE_PERL%%/Slash/Messages/DB/MySQL.pm
%%SITE_PERL%%/Slash/XML/FZ.pm
+etc/rc.d/slash.sh
slash/bin/install-theme
slash/bin/install-plugin
slash/bin/backup-blocks