- Upgrade to 8.1.12.

- Add HTTP to MASTER_SITE.
- Minor fixes to conserver.sh.
- Remove harmful patch for conserver.cf sample.

Submitted by:	Andrew Pantyukhin
PR:		ports/88420

6 files changed, 11 insertions, 26 deletions

diff --git a/comms/conserver-com/Makefile b/comms/conserver-com/Makefile
index bdb1f63..de6a5b0 100644
--- a/comms/conserver-com/Makefile
+++ b/comms/conserver-com/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	conserver
-PORTVERSION=	8.1.11
+PORTVERSION=	8.1.12
 CATEGORIES=	comms
-MASTER_SITES=	ftp://ftp.conserver.com/conserver/
+MASTER_SITES=	http://www.conserver.com/ \
+		ftp://ftp.conserver.com/conserver/
 PKGNAMESUFFIX=	-com
 
 MAINTAINER=	kuriyama@FreeBSD.org
diff --git a/comms/conserver-com/distinfo b/comms/conserver-com/distinfo
index e286215..58267fd 100644
--- a/comms/conserver-com/distinfo
+++ b/comms/conserver-com/distinfo
@@ -1,2 +1,3 @@
-MD5 (conserver-8.1.11.tar.gz) = 94259cd71f38e94b3f247768e3bc731f
-SIZE (conserver-8.1.11.tar.gz) = 299281
+MD5 (conserver-8.1.12.tar.gz) = 1fb356224f018625be5c3d35529a4ac6
+SHA256 (conserver-8.1.12.tar.gz) = 9e442714e618a2c1e040e4df756672b8146fa04d660b6466cbeb7da5b7e98dbe
+SIZE (conserver-8.1.12.tar.gz) = 303891
diff --git a/comms/conserver-com/files/conserver.sh b/comms/conserver-com/files/conserver.sh
index 6a52474..136e308 100644
--- a/comms/conserver-com/files/conserver.sh
+++ b/comms/conserver-com/files/conserver.sh
@@ -8,17 +8,15 @@
 
 . %%RC_SUBR%%
 
-name=conserver
+name="conserver"
 rcvar=`set_rcvar`
 
-command=%%PREFIX%%/sbin/conserver
+command=%%PREFIX%%/sbin/${name}
 pidfile=/var/run/conserver.pid
 required_files=%%PREFIX%%/etc/conserver.cf
 
-# set defaults
-[ -z "$conserver_enable" ]	&& conserver_enable=NO
-[ -z "$conserver_flags" ]	&& conserver_flags="-d"
-
 load_rc_config $name
+: ${conserver_enable="NO"}
+: ${conserver_flags="-d"}
 
 run_rc_command "$1"
diff --git a/comms/conserver-com/files/patch-Makefile.in b/comms/conserver-com/files/patch-Makefile.in
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/comms/conserver-com/files/patch-Makefile.in
diff --git a/comms/conserver-com/files/patch-conserver.cf b/comms/conserver-com/files/patch-conserver.cf
deleted file mode 100644
index 296b360..0000000
--- a/comms/conserver-com/files/patch-conserver.cf
+++ /dev/null
@@ -1,16 +0,0 @@
---- conserver.cf/conserver.cf.orig	Sun Nov  9 08:45:41 2003
-+++ conserver.cf/conserver.cf	Wed Dec  3 17:51:49 2003
-@@ -50,10 +50,10 @@
- 	motd "just a simple ssh to localhost";
- }
- 
--# connect to /dev/ttya
--console ttya {
-+# connect to /dev/cuaa0
-+console cuaa0 {
- 	type device;
--	device /dev/ttya; parity none; baud 9600;
-+	device /dev/cuaa0; parity none; baud 9600;
- 	idlestring "#";
- 	idletimeout 5m;		# send a '#' every 5 minutes of idle
- 	timestamp "";		# no timestamps on this console
diff --git a/comms/conserver-com/pkg-plist b/comms/conserver-com/pkg-plist
index 529a464..8caab96 100644
--- a/comms/conserver-com/pkg-plist
+++ b/comms/conserver-com/pkg-plist
@@ -4,4 +4,5 @@ etc/rc.d/conserver.sh
 %%EXAMPLESDIR%%/conserver.passwd
 %%EXAMPLESDIR%%/conserver.rc
 sbin/conserver
+sbin/conserver-convert
 @dirrm %%EXAMPLESDIR%%