aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorleeym <leeym@FreeBSD.org>2006-09-30 11:10:46 +0800
committerleeym <leeym@FreeBSD.org>2006-09-30 11:10:46 +0800
commitb826758dfb01db7d405319358f68f6c24f36e425 (patch)
treeaa96ace4b66e1d3f17c06426f36a69878722e4e2 /net
parenta11fa868e5d2b61a57e6f365f714e132b8135761 (diff)
downloadfreebsd-ports-gnome-b826758dfb01db7d405319358f68f6c24f36e425.tar.gz
freebsd-ports-gnome-b826758dfb01db7d405319358f68f6c24f36e425.tar.zst
freebsd-ports-gnome-b826758dfb01db7d405319358f68f6c24f36e425.zip
- utilize USR_RC_SUBR for new start script
- handle version-dependent patch better - bump PORTREVISION
Diffstat (limited to 'net')
-rw-r--r--net/repeater/Makefile18
-rw-r--r--net/repeater/files/patch-repeater.cpp14
-rw-r--r--net/repeater/files/repeater.in (renamed from net/repeater/files/repeater.sh)4
3 files changed, 16 insertions, 20 deletions
diff --git a/net/repeater/Makefile b/net/repeater/Makefile
index 16b4900ca359..a7faf262e16b 100644
--- a/net/repeater/Makefile
+++ b/net/repeater/Makefile
@@ -7,7 +7,7 @@
PORTNAME= repeater
PORTVERSION= 0.08
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net
MASTER_SITES= http://koti.mbnet.fi/jtko/uvncrepeater/
DISTNAME= repeater${PORTVERSION:C/\.//}
@@ -16,15 +16,14 @@ MAINTAINER= leeym@FreeBSD.org
COMMENT= UltraVNC repeater
USE_ZIP= yes
-USE_RC_SUBR= yes
+USE_RC_SUBR= repeater
WRKSRC= ${WRKDIR}/Ver${PORTVERSION:C/\.//}
ALL_TARGET= repeater
-PLIST_FILES= sbin/repeater etc/rc.d/repeater.sh
+PLIST_FILES= sbin/repeater
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/repeater ${PREFIX}/sbin/repeater
- ${INSTALL_SCRIPT} ${FILESDIR}/repeater.sh ${PREFIX}/etc/rc.d
.if !defined(NOPORTDOCS)
PORTDOCS= changelog.txt readme.txt ultravncrepeaterlinuxport.html
@@ -34,13 +33,4 @@ post-install:
cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
.endif
-.include <bsd.port.pre.mk>
-
-post-patch:
-.if ${OSVERSION} < 500000
- @${REINPLACE_CMD} -e 's,%%LIMITS_H%%,machine/limits.h,g' ${WRKSRC}/repeater.cpp
-.else
- @${REINPLACE_CMD} -e 's,%%LIMITS_H%%,sys/limits.h,g' ${WRKSRC}/repeater.cpp
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/repeater/files/patch-repeater.cpp b/net/repeater/files/patch-repeater.cpp
index fd878b1e71af..fe48c79953d4 100644
--- a/net/repeater/files/patch-repeater.cpp
+++ b/net/repeater/files/patch-repeater.cpp
@@ -1,10 +1,16 @@
---- repeater.cpp.orig Wed Dec 14 14:49:03 2005
-+++ repeater.cpp Wed Dec 14 14:49:16 2005
-@@ -28,6 +28,7 @@
+--- 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
// ///////////////////////////////////////////////////////////////////////////
-+#include <%%LIMITS_H%%>
++#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/repeater.sh b/net/repeater/files/repeater.in
index 5d8c098150a3..fa4ec55a6745 100644
--- a/net/repeater/files/repeater.sh
+++ b/net/repeater/files/repeater.in
@@ -11,7 +11,7 @@
# repeater_enable="YES"
#
-. /etc/rc.subr
+. %%RC_SUBR%%
name=repeater
rcvar=`set_rcvar`
@@ -22,7 +22,7 @@ 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"}
-command=/usr/local/sbin/repeater
+command=%%PREFIX%%/sbin/repeater
start_precmd="echo Starting ${name}."
start_cmd="daemon ${command} ${repeater_viewer_port} ${repeater_server_port} > ${repeater_log} 2>&1"