- Fix build on systems without Perl

- Fix rc script, it failed to background the daemon process

PR:		ports/83067
Submitted by:	Vivek Khera <vivek@khera.org> (maintainer)

6 files changed, 42 insertions, 2 deletions

diff --git a/databases/slony1/Makefile b/databases/slony1/Makefile
index 4a46cda..6c2449d 100644
--- a/databases/slony1/Makefile
+++ b/databases/slony1/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	slony1
 PORTVERSION=	1.1.0
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	http://developer.postgresql.org/~wieck/slony1/download/
 
diff --git a/databases/slony1/files/patch-tools-altperl-Makefile b/databases/slony1/files/patch-tools-altperl-Makefile
new file mode 100644
index 0000000..1a12e4e
--- /dev/null
+++ b/databases/slony1/files/patch-tools-altperl-Makefile
@@ -0,0 +1,19 @@
+--- tools/altperl/Makefile.dist	Wed Jul  6 11:31:10 2005
++++ tools/altperl/Makefile	Wed Jul  6 11:31:45 2005
+@@ -13,6 +13,8 @@
+ DISTFILES = Makefile ToDo README $(wildcard *.pl) $(wildcard *.pm) slon_tools.conf-sample
+ 
+ all:
++ifdef toolsbin
++
+ ifndef PERL
+ 	@echo "The altperl tools require that Perl be installed."
+ 	exit 1;
+@@ -31,6 +33,7 @@
+                        $$file > $$tmpname; \
+ 		chmod 755 $$tmpname; \
+ 	done
++endif
+ 
+ install: all installdirs
+ ifndef toolsbin
diff --git a/databases/slony1/files/slon.sh.in b/databases/slony1/files/slon.sh.in
index 7a23515..c64c117 100644
--- a/databases/slony1/files/slon.sh.in
+++ b/databases/slony1/files/slon.sh.in
@@ -20,7 +20,7 @@ rcvar=`set_rcvar`
 
 pidfile="/var/run/$name.pid"
 command="%%PREFIX%%/bin/slon"
-command_args="-f %%PREFIX%%/etc/$name.conf -p $pidfile"
+command_args="-f %%PREFIX%%/etc/$name.conf -p $pidfile &"
 required_files="%%PREFIX%%/etc/$name.conf"
 
 # read configuration and set defaults
diff --git a/databases/slony1v2/Makefile b/databases/slony1v2/Makefile
index 4a46cda..6c2449d 100644
--- a/databases/slony1v2/Makefile
+++ b/databases/slony1v2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	slony1
 PORTVERSION=	1.1.0
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	http://developer.postgresql.org/~wieck/slony1/download/
 
diff --git a/databases/slony1v2/files/patch-tools-altperl-Makefile b/databases/slony1v2/files/patch-tools-altperl-Makefile
new file mode 100644
index 0000000..1a12e4e
--- /dev/null
+++ b/databases/slony1v2/files/patch-tools-altperl-Makefile
@@ -0,0 +1,19 @@
+--- tools/altperl/Makefile.dist	Wed Jul  6 11:31:10 2005
++++ tools/altperl/Makefile	Wed Jul  6 11:31:45 2005
+@@ -13,6 +13,8 @@
+ DISTFILES = Makefile ToDo README $(wildcard *.pl) $(wildcard *.pm) slon_tools.conf-sample
+ 
+ all:
++ifdef toolsbin
++
+ ifndef PERL
+ 	@echo "The altperl tools require that Perl be installed."
+ 	exit 1;
+@@ -31,6 +33,7 @@
+                        $$file > $$tmpname; \
+ 		chmod 755 $$tmpname; \
+ 	done
++endif
+ 
+ install: all installdirs
+ ifndef toolsbin
diff --git a/databases/slony1v2/files/slon.sh.in b/databases/slony1v2/files/slon.sh.in
index 7a23515..c64c117 100644
--- a/databases/slony1v2/files/slon.sh.in
+++ b/databases/slony1v2/files/slon.sh.in
@@ -20,7 +20,7 @@ rcvar=`set_rcvar`
 
 pidfile="/var/run/$name.pid"
 command="%%PREFIX%%/bin/slon"
-command_args="-f %%PREFIX%%/etc/$name.conf -p $pidfile"
+command_args="-f %%PREFIX%%/etc/$name.conf -p $pidfile &"
 required_files="%%PREFIX%%/etc/$name.conf"
 
 # read configuration and set defaults