svn commit: r363588 - in head: . net/repeater net/repeater/files

[Adam Weinberger]

Author: adamw
Date: Thu Jul 31 13:28:45 2014
New Revision: 363588
URL: http://svnweb.freebsd.org/changeset/ports/363588
QAT: https://qat.redports.org/buildarchive/r363588/

Log:
  Stage, and fix build without gcc.

Added:
  head/net/repeater/pkg-plist   (contents, props changed)
Deleted:
  head/net/repeater/files/pkg-install.in
Modified:
  head/GIDs
  head/UIDs
  head/net/repeater/Makefile
  head/net/repeater/files/pkg-message.in

Modified: head/GIDs
==============================================================================
--- head/GIDs	Thu Jul 31 13:16:29 2014	(r363587)
+++ head/GIDs	Thu Jul 31 13:28:45 2014	(r363588)
@@ -286,5 +286,6 @@ unifi:*:975:
 minetest:*:976:
 ums:*:979:
 hbase:*:980:
+uvncrep:*:981:
 nogroup:*:65533:
 nobody:*:65534:

Modified: head/UIDs
==============================================================================
--- head/UIDs	Thu Jul 31 13:16:29 2014	(r363587)
+++ head/UIDs	Thu Jul 31 13:28:45 2014	(r363588)
@@ -292,4 +292,5 @@ tests:*:977:65534::0:0:Unprivileged user
 _dnscrypt-proxy:*:978:65534::0:0:dnscrypt-proxy user:/var/empty:/usr/sbin/nologin
 ums:*:979:979::0:0:Universal Media Server:/nonexistent:/usr/sbin/nologin
 hbase:*:980:980::0:0:HBase user:/nonexistent:/usr/sbin/nologin
+uvncrep:*:981:981::0:0:UltraVNC Repeater daemon:/nonexistent:/usr/sbin/nologin
 nobody:*:65534:65534::0:0:Unprivileged user:/nonexistent:/usr/sbin/nologin

Modified: head/net/repeater/Makefile
==============================================================================
--- head/net/repeater/Makefile	Thu Jul 31 13:16:29 2014	(r363587)
+++ head/net/repeater/Makefile	Thu Jul 31 13:28:45 2014	(r363588)
@@ -11,30 +11,28 @@ MAINTAINER=	ports at FreeBSD.org
 COMMENT=	UltraVNC repeater
 
 USES=		zip
-USE_RC_SUBR=	repeater
+USE_RC_SUBR=	${PORTNAME}
 WRKSRC=		${WRKDIR}/Ver${PORTVERSION:C/\.//}
-ALL_TARGET=	repeater
+ALL_TARGET=	${PORTNAME}
 
 REP_USER?=	uvncrep
 REP_GROUP?=	uvncrep
+USERS=		${REP_USER}
+GROUPS=		${REP_GROUP}
 
-SUB_FILES=	pkg-install pkg-message
-SUB_LIST=	REP_USER=${REP_USER} REP_GROUP=${REP_GROUP}
+SUB_FILES=	pkg-message
 
-PLIST_FILES=	sbin/repeater etc/uvncrepeater.ini.sample
 PORTDOCS=	changelog.txt readme.txt ultravncrepeaterlinuxport.html
 
-NO_STAGE=	yes
+OPTIONS_DEFINE=	DOCS
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|g++|${CXX}|' ${WRKSRC}/Makefile
+
 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}
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_DATA} ${WRKSRC}/uvncrepeater.ini ${STAGEDIR}${PREFIX}/etc/uvncrepeater.ini.sample
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>

Modified: head/net/repeater/files/pkg-message.in
==============================================================================
--- head/net/repeater/files/pkg-message.in	Thu Jul 31 13:16:29 2014	(r363587)
+++ head/net/repeater/files/pkg-message.in	Thu Jul 31 13:28:45 2014	(r363588)
@@ -1,7 +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"                                               #
-############################################################################
+
+Please edit %%PREFIX%%/etc/uvncrepeater.ini before using UltraVNC
+Repeater!
+
+To enable UVNC Repeater, put the following in your /etc/rc.conf:
+	repeater_enable="YES"
+

Added: head/net/repeater/pkg-plist
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/repeater/pkg-plist	Thu Jul 31 13:28:45 2014	(r363588)
@@ -0,0 +1,2 @@
+ at sample etc/uvncrepeater.ini.sample
+sbin/repeater