6 files changed, 51 insertions, 31 deletions

diff --git a/net/repeater/Makefile b/net/repeater/Makefile
index a7faf262e16b..fc2f6dfa0ce6 100644
--- a/net/repeater/Makefile
+++ b/net/repeater/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	repeater
-PORTVERSION=	0.08
-PORTREVISION=	3
+PORTVERSION=	0.14
 CATEGORIES=	net
 MASTER_SITES=	http://koti.mbnet.fi/jtko/uvncrepeater/
 DISTNAME=	repeater${PORTVERSION:C/\.//}
 
-MAINTAINER=	leeym@FreeBSD.org
+MAINTAINER=	rick@sloservers.com
 COMMENT=	UltraVNC repeater
 
 USE_ZIP=	yes
@@ -20,17 +19,25 @@ USE_RC_SUBR=	repeater
 WRKSRC=		${WRKDIR}/Ver${PORTVERSION:C/\.//}
 ALL_TARGET=	repeater
 
-PLIST_FILES=	sbin/repeater
+REP_USER?=	uvncrep
+REP_GROUP?=	uvncrep
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/repeater ${PREFIX}/sbin/repeater
+SUB_FILES=	pkg-install pkg-message
+SUB_LIST=	REP_USER=${REP_USER} REP_GROUP=${REP_GROUP}
 
-.if !defined(NOPORTDOCS)
+PLIST_FILES=	sbin/repeater etc/uvncrepeater.ini.sample
 PORTDOCS=	changelog.txt readme.txt ultravncrepeaterlinuxport.html
 
-post-install:
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/repeater ${PREFIX}/sbin/repeater
+	${INSTALL_DATA} ${WRKSRC}/uvncrepeater.ini ${PREFIX}/etc/uvncrepeater.ini.sample
+.if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
 
+post-install:
+	@${SETENV} @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	@${CAT} ${PKGMESSAGE}
+
 .include <bsd.port.mk>
diff --git a/net/repeater/distinfo b/net/repeater/distinfo
index c9d4d1c42a4b..64433df7aee0 100644
--- a/net/repeater/distinfo
+++ b/net/repeater/distinfo
@@ -1,3 +1,3 @@
-MD5 (repeater008.zip) = 5f0c6c34b44257b38e4d536f29c04d32
-SHA256 (repeater008.zip) = d29bc8177f1c75e760813903dd346094b081e9f9fc03eee069dcdb6044584104
-SIZE (repeater008.zip) = 23513
+MD5 (repeater014.zip) = 3005ebbb2f9442cbea4cbcaa71925dbf
+SHA256 (repeater014.zip) = 79178e9baa9cac05f26e43f742933958707cb5c0632c51a5706b13922f3bb5b0
+SIZE (repeater014.zip) = 61321
diff --git a/net/repeater/files/patch-repeater.cpp b/net/repeater/files/patch-repeater.cpp
deleted file mode 100644
index fe48c79953d4..000000000000
--- a/net/repeater/files/patch-repeater.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
---- repeater.cpp.orig	Wed Oct 19 03:12:05 2005
-+++ repeater.cpp	Sat Sep 30 10:01:56 2006
-@@ -28,6 +28,13 @@
- // Linux port (C) 2005 Jari Korhonen, jarit1.korhonen@dnainternet.net
- // ///////////////////////////////////////////////////////////////////////////
- 
-+#if defined(__FreeBSD__)
-+#if __FreeBSD__ < 5
-+#include <machine/limits.h>
-+#else
-+#include <sys/limits.h>
-+#endif
-+#endif	/* __FreeBSD__ */
- #include <sys/types.h>
- #include <sys/wait.h>
- #include <sys/stat.h>
diff --git a/net/repeater/files/pkg-install.in b/net/repeater/files/pkg-install.in
new file mode 100644
index 000000000000..bc5252d00cdc
--- /dev/null
+++ b/net/repeater/files/pkg-install.in
@@ -0,0 +1,24 @@
+#!/bin/sh
+# $FreeBSD$
+#
+
+PW="/usr/sbin/pw"
+CHOWN="/usr/sbin/chown"
+CHMOD="/bin/chmod"
+MKDIR="/bin/mkdir -p"
+NOLOGIN="/usr/sbin/nologin"
+
+REP_USER=%%REP_USER%%
+REP_GROUP=%%REP_GROUP%%
+
+case "$2" in
+
+POST-INSTALL)
+  ${PW} groupshow -n ${REP_GROUP} >/dev/null 2>&1 \
+    || ${PW} groupadd -n ${REP_GROUP} 
+  ${PW} usershow -n ${REP_USER} >/dev/null 2>&1 \
+    || ${PW} useradd ${REP_USER} -g ${REP_GROUP} -s ${NOLOGIN}
+  ;;
+
+esac
+exit 0
diff --git a/net/repeater/files/pkg-message.in b/net/repeater/files/pkg-message.in
new file mode 100644
index 000000000000..8501c7945548
--- /dev/null
+++ b/net/repeater/files/pkg-message.in
@@ -0,0 +1,7 @@
+############################################################################
+# Please create a config file in %%PREFIX%%/etc                            #
+# A sample configuration file is installed as uvncrepeater.ini.sample      #
+#                                                                          #
+# To enable UVNC Repeater, put the following to your /etc/rc.conf:         #
+#      repeater_enable="YES"                                               #
+############################################################################
diff --git a/net/repeater/files/repeater.in b/net/repeater/files/repeater.in
index fa4ec55a6745..3870fd049f8e 100644
--- a/net/repeater/files/repeater.in
+++ b/net/repeater/files/repeater.in
@@ -19,11 +19,9 @@ rcvar=`set_rcvar`
 load_rc_config $name
 
 repeater_enable=${repeater_enable:-"NO"}
-repeater_server_port=${repeater_server_port:-5500}
-repeater_viewer_port=${repeater_viewer_port:-5900}
-repeater_log=${repeater_log:-"/var/run/repeater.log"}
+repeater_log=${repeater_log:-"/var/log/repeater.log"}
 command=%%PREFIX%%/sbin/repeater
 start_precmd="echo Starting ${name}."
-start_cmd="daemon ${command} ${repeater_viewer_port} ${repeater_server_port} > ${repeater_log} 2>&1"
+start_cmd="daemon ${command} %%PREFIX%%/etc/uvncrepeater.ini > ${repeater_log} 2>&1"
 
 run_rc_command "$1"