Bug 181924

Comment 1 Edwin Groothuis 2013-09-08 03:00:08 UTC

Class Changed
From-To: update->maintainer-update

Fix category (submitter is maintainer) (via the GNATS Auto Assign Tool)

Please disregard the previosu *.shar file. This is the new one which fixes the clang compilation issues

Best regards,
Andrei

Comment 3 William Grzybowski 2013-09-08 15:02:11 UTC

Responsible Changed
From-To: freebsd-ports-bugs->wg

I'll take it.

Hi,

As you're the maintainer would you mind sending a patch, either with
diff -ur or svn diff?
It is very easier for us to check the changes and apply them.

Thank you!

-- 
William Grzybowski
------------------------------------------
Curitiba/PR - Brasil

Hi,

Here is the patch. I have created it like this:

diff -ur /usr/ports/net/crtmpserver /tmp/crtmpserver >/tmp/crtmpserver.patch

where /tmp/crtmpserver is the new version

I have removed the sparc64 restriction because I believe is now fixed. Since I don't have such a machine around, is quite hard for me to say if is really fixed or not. If it fails, I will make a deeper investigation and try to find such a machine to play around with.

Best regards,
Andrei

------
C++ RTMP Server Support
Email: support@rtmpd.com
Web: http://www.rtmpd.com

Comment 6 dfilter service 2013-09-09 23:54:54 UTC

Author: wg
Date: Mon Sep  9 22:54:40 2013
New Revision: 326852
URL: http://svnweb.freebsd.org/changeset/ports/326852

Log:
  net/crtmpserver: update to 0.806
  
  - Update to 0.806 [1]
  - Convert lib depends to new syntax
  - Add LICENSE (GPLv3)
  - Fix pkg-plist
  
  PR:		ports/181924 [1]
  Submitted by:	Gavriloaie Eugen-Andrei <support rtmpd.com> (maintainer)

Modified:
  head/net/crtmpserver/Makefile
  head/net/crtmpserver/distinfo
  head/net/crtmpserver/files/crtmpserver.in
  head/net/crtmpserver/pkg-descr
  head/net/crtmpserver/pkg-plist

Modified: head/net/crtmpserver/Makefile
==============================================================================
--- head/net/crtmpserver/Makefile	Mon Sep  9 22:52:20 2013	(r326851)
+++ head/net/crtmpserver/Makefile	Mon Sep  9 22:54:40 2013	(r326852)
@@ -2,23 +2,24 @@
 # $FreeBSD$
 
 PORTNAME=	crtmpserver
-PORTVERSION=	0.545
+PORTVERSION=	0.806
 CATEGORIES=	net
 MASTER_SITES=	http://rtmpd.com/assets/sources/
 
 MAINTAINER=	support@rtmpd.com
 COMMENT=	C++ RTSP/RTMP/MPEG-TS Server
 
-LIB_DEPENDS=	execinfo:${PORTSDIR}/devel/libexecinfo
+LICENSE=	GPLv3
 
-WRKSRC=	${WRKDIR}/crtmpserver-545
+LIB_DEPENDS=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo
 
-BROKEN=		fails to build
+USE_LUA=	5.1
+WANT_LUA_VER=	5.1
 
+USE_LDCONFIG=	yes
 USES=		cmake:outsource
-CMAKE_ENV=	"COMPILE_STATIC=1"
 CMAKE_SOURCE_PATH=	${WRKSRC}/builders/cmake
-CMAKE_ARGS=	-DCRTMPSERVER_INSTALL_PREFIX:STRING=${PREFIX} -DTEMP_FRAMEWORK_VER=0.545
+CMAKE_ARGS=	-DCRTMPSERVER_INSTALL_PREFIX:STRING=${PREFIX} -DTEMP_FRAMEWORK_VER=${PORTVERSION}
 
 USERS=	crtmpserver
 GROUPS=	crtmpserver
@@ -27,15 +28,17 @@ USE_RC_SUBR=	crtmpserver
 
 MAN1=	crtmpserver.1
 
-post-install:
-   @if [ ! -f ${PREFIX}/etc/crtmpserver.lua ]; then \
-       ${CP} -p ${PREFIX}/etc/crtmpserver.lua.sample ${PREFIX}/etc/crtmpserver.lua ; \
-   fi
-
-.include <bsd.port.pre.mk>
+pre-install:
+	@${SH} $(WRKSRC)/fixConfFile.sh "${WRKSRC}/builders/cmake/crtmpserver/crtmpserver.lua" "${PREFIX}" "${WRKSRC}"
+	@${SH} $(WRKSRC)/fixConfFile.sh "${WRKSRC}/builders/cmake/crtmpserver/all.debug.lua" "${PREFIX}" "${WRKSRC}"
 
-.if ${ARCH} == "sparc64"
-BROKEN=		Does not compile on sparc64
-.endif
+post-install:
+	@if [ ! -f ${PREFIX}/etc/crtmpserver.lua ]; then \
+		${CP} -p ${PREFIX}/etc/crtmpserver.lua.sample ${PREFIX}/etc/crtmpserver.lua ; \
+	fi
+	@if [ ! -f ${PREFIX}/etc/crtmpserver.all.lua ]; then \
+		${CP} -p ${PREFIX}/etc/crtmpserver.all.lua.sample ${PREFIX}/etc/crtmpserver.all.lua ; \
+	fi
+	@${MKDIR} ${PREFIX}/var/log/crtmpserver
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/net/crtmpserver/distinfo
==============================================================================
--- head/net/crtmpserver/distinfo	Mon Sep  9 22:52:20 2013	(r326851)
+++ head/net/crtmpserver/distinfo	Mon Sep  9 22:54:40 2013	(r326852)
@@ -1,2 +1,2 @@
-SHA256 (crtmpserver-0.545.tar.gz) = 8ba7920c8a90f1e79dbddfeb4c8e22ccaec8dda1ad7f374a210baf57a3e61698
-SIZE (crtmpserver-0.545.tar.gz) = 1605578
+SHA256 (crtmpserver-0.806.tar.gz) = 162333b8559cfdcd1506368eaae0a7143fd4d5ce6d594bc9f44d32db619dab48
+SIZE (crtmpserver-0.806.tar.gz) = 1399313

Modified: head/net/crtmpserver/files/crtmpserver.in
==============================================================================
--- head/net/crtmpserver/files/crtmpserver.in	Mon Sep  9 22:52:20 2013	(r326851)
+++ head/net/crtmpserver/files/crtmpserver.in	Mon Sep  9 22:54:40 2013	(r326852)
@@ -15,25 +15,31 @@
 #               by default.
 # crtmpserver_username (username): Set to crtmpserver
 #               by default.
+#
 
 . /etc/rc.subr
 
 name="crtmpserver"
-rcvar=crtmpserver_enable
+rcvar=${name}_enable
 
 command=%%PREFIX%%/sbin/${name}
+pidfile=/var/run/${name}.pid
+
+start_postcmd="${name}_poststart"
+
+crtmpserver_poststart()
+{
+	pgrep crtmpserver > /var/run/crtmpserver.pid
+}
 
 load_rc_config $name
 
 : ${crtmpserver_enable="NO"}
 : ${crtmpserver_config="%%PREFIX%%/etc/crtmpserver.lua"}
 : ${crtmpserver_username="crtmpserver"}
-: ${crtmpserver_groupname="crtmpserver"}
-: ${crtmpserver_pidfile="/var/run/${name}.pid"}
 
 required_files="$crtmpserver_config"
 
-command_args="--daemon --uid=`id -u ${crtmpserver_username}` --gid=`pw groupshow ${crtmpserver_groupname} | awk -F ":" '{print $3}'` --pid=${crtmpserver_pidfile} $required_files"
+command_args="--daemon --gid=`id -g ${crtmpserver_username}` --uid=`id -u ${crtmpserver_username}` ${required_files}"
 
 run_rc_command "$1"
-

Modified: head/net/crtmpserver/pkg-descr
==============================================================================
--- head/net/crtmpserver/pkg-descr	Mon Sep  9 22:52:20 2013	(r326851)
+++ head/net/crtmpserver/pkg-descr	Mon Sep  9 22:54:40 2013	(r326852)
@@ -5,11 +5,11 @@ High performance RTMP/RTSP streaming ser
   - To and from embedded devices: iPhone, Android
   - From surveillance cameras
   - IP-TV using MPEG-TS and RTSP/RTCP/RTP protocols
- Also, rtmpd can be used as a high performance rendes-vous server.
+ Also, rtmpd can be used as a high performance rendez-vous server.
  For example, it enables you to do:
   - Audio/Video conferencing
   - Online gaming
   - Online collaboration
   - Simple/complex chat applications
 
-WWW: http://www.rtmpd.com
+WWW: http://www.rtmpd.com/

Modified: head/net/crtmpserver/pkg-plist
==============================================================================
--- head/net/crtmpserver/pkg-plist	Mon Sep  9 22:52:20 2013	(r326851)
+++ head/net/crtmpserver/pkg-plist	Mon Sep  9 22:54:40 2013	(r326852)
@@ -1,7 +1,29 @@
-@stopdaemon crtmpserver
 @unexec if cmp -s %D/etc/crtmpserver.lua.sample %D/etc/crtmpserver.lua; then rm -f %D/etc/crtmpserver.lua; fi
 etc/crtmpserver.lua.sample
 @exec if [ ! -f %D/etc/crtmpserver.lua ] ; then cp -p %D/%F %B/crtmpserver.lua; fi
+@unexec if cmp -s %D/etc/crtmpserver.all.lua.sample %D/etc/crtmpserver.all.lua; then rm -f %D/etc/crtmpserver.all.lua; fi
+etc/crtmpserver.all.lua.sample
+@exec if [ ! -f %D/etc/crtmpserver.all.lua ] ; then cp -p %D/%F %B/crtmpserver.all.lua; fi
+lib/crtmpserver/libtinyxml.so
+lib/crtmpserver/libcommon.so
+lib/crtmpserver/libthelib.so
+lib/crtmpserver/applications/flvplayback/libflvplayback.so
+lib/crtmpserver/applications/appselector/libappselector.so
+lib/crtmpserver/applications/samplefactory/libsamplefactory.so
+lib/crtmpserver/applications/vptests/libvptests.so
+lib/crtmpserver/applications/admin/libadmin.so
+lib/crtmpserver/applications/proxypublish/libproxypublish.so
+lib/crtmpserver/applications/stresstest/libstresstest.so
 sbin/crtmpserver
 @dirrmtry var/crtmpserver/media
 @dirrmtry var/crtmpserver
+@dirrmtry lib/crtmpserver/applications/flvplayback
+@dirrmtry lib/crtmpserver/applications/appselector
+@dirrmtry lib/crtmpserver/applications/samplefactory
+@dirrmtry lib/crtmpserver/applications/vptests
+@dirrmtry lib/crtmpserver/applications/admin
+@dirrmtry lib/crtmpserver/applications/proxypublish
+@dirrmtry lib/crtmpserver/applications/stresstest
+@dirrmtry lib/crtmpserver/applications
+@dirrmtry lib/crtmpserver
+@dirrmtry var/log/crtmpserver
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"

Comment 7 William Grzybowski 2013-09-09 23:58:23 UTC

State Changed
From-To: open->closed

Committed, with minor changes. Thanks!