diff -urN /usr/ports/comms/conserver-com/Makefile conserver-com/Makefile
--- /usr/ports/comms/conserver-com/Makefile	Tue Feb  1 08:29:00 2005
+++ conserver-com/Makefile	Thu Nov  3 02:28:13 2005
@@ -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=	ftp://ftp.conserver.com/conserver/ \
+		http://www.conserver.com/
 PKGNAMESUFFIX=	-com
 
 MAINTAINER=	kuriyama@FreeBSD.org
diff -urN /usr/ports/comms/conserver-com/distinfo conserver-com/distinfo
--- /usr/ports/comms/conserver-com/distinfo	Tue Feb  1 08:29:00 2005
+++ conserver-com/distinfo	Thu Nov  3 02:24:56 2005
@@ -1,2 +1,2 @@
-MD5 (conserver-8.1.11.tar.gz) = 94259cd71f38e94b3f247768e3bc731f
-SIZE (conserver-8.1.11.tar.gz) = 299281
+MD5 (conserver-8.1.12.tar.gz) = 1fb356224f018625be5c3d35529a4ac6
+SIZE (conserver-8.1.12.tar.gz) = 303891
diff -urN /usr/ports/comms/conserver-com/files/conserver.sh conserver-com/files/conserver.sh
--- /usr/ports/comms/conserver-com/files/conserver.sh	Sat Oct 25 17:11:16 2003
+++ conserver-com/files/conserver.sh	Thu Nov  3 02:46:12 2005
@@ -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 -urN /usr/ports/comms/conserver-com/files/patch-conserver-Makefile.in conserver-com/files/patch-conserver-Makefile.in
--- /usr/ports/comms/conserver-com/files/patch-conserver-Makefile.in	Thu Jan  1 03:00:00 1970
+++ conserver-com/files/patch-conserver-Makefile.in	Thu Nov  3 03:08:52 2005
@@ -0,0 +1,10 @@
+--- conserver/Makefile.in.orig	Thu Nov  3 03:03:03 2005
++++ conserver/Makefile.in	Thu Nov  3 03:05:55 2005
+@@ -66,6 +66,6 @@
+ 	$(MKDIR) $(DESTDIR)$(exampledir)
+ 	$(INSTALL) conserver.rc $(DESTDIR)$(exampledir)
+ 	$(MKDIR) $(DESTDIR)$(pkglibdir)
+-	$(INSTALL) convert $(DESTDIR)$(pkglibdir)/convert
++	$(INSTALL_PROGRAM) convert $(DESTDIR)$(sbindir)/conserver-convert
+ 
+ .PHONY: clean distclean install
diff -urN /usr/ports/comms/conserver-com/files/patch-conserver.cf conserver-com/files/patch-conserver.cf
--- /usr/ports/comms/conserver-com/files/patch-conserver.cf	Sun Dec  7 07:31:49 2003
+++ conserver-com/files/patch-conserver.cf	Thu Jan  1 03:00:00 1970
@@ -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 -urN /usr/ports/comms/conserver-com/files/patch-conserver.cf-conserver.cf conserver-com/files/patch-conserver.cf-conserver.cf
--- /usr/ports/comms/conserver-com/files/patch-conserver.cf-conserver.cf	Thu Jan  1 03:00:00 1970
+++ conserver-com/files/patch-conserver.cf-conserver.cf	Thu Nov  3 01:45:09 2005
@@ -0,0 +1,16 @@
+--- 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 -urN /usr/ports/comms/conserver-com/pkg-plist conserver-com/pkg-plist
--- /usr/ports/comms/conserver-com/pkg-plist	Sat Oct 25 17:11:15 2003
+++ conserver-com/pkg-plist	Thu Nov  3 03:10:21 2005
@@ -4,4 +4,5 @@
 %%EXAMPLESDIR%%/conserver.passwd
 %%EXAMPLESDIR%%/conserver.rc
 sbin/conserver
+sbin/conserver-convert
 @dirrm %%EXAMPLESDIR%%