Date: Mon, 20 Oct 2014 12:42:10 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r371264 - in head/net/osrtspproxy: . files Message-ID: <201410201242.s9KCgAqm038587@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Mon Oct 20 12:42:09 2014 New Revision: 371264 URL: https://svnweb.freebsd.org/changeset/ports/371264 QAT: https://qat.redports.org/buildarchive/r371264/ Log: net/osrtspproxy: use -lpthread instead of pthread, fix on DragonFly Also enable passing of LDFLAGS but this functionality isn't needed atm. Added: head/net/osrtspproxy/files/patch-configure (contents, props changed) Modified: head/net/osrtspproxy/Makefile head/net/osrtspproxy/files/patch-rtspproxy-Makefile.in Modified: head/net/osrtspproxy/Makefile ============================================================================== --- head/net/osrtspproxy/Makefile Mon Oct 20 12:18:56 2014 (r371263) +++ head/net/osrtspproxy/Makefile Mon Oct 20 12:42:09 2014 (r371264) @@ -9,20 +9,12 @@ MASTER_SITES= SF/rtsp/RTSP%20Proxy%20Kit DISTNAME= ${PORTNAME}_2_0 MAINTAINER= ports@FreeBSD.org -COMMENT= The RTSP Proxy Kit - A reference implementation of an RTSP proxy +COMMENT= Reference implementation kit of an RTSP proxy HAS_CONFIGURE= yes PLIST_FILES= sbin/rtspproxy etc/rc.d/rtspproxy.sh.sample -post-patch: - @${REINPLACE_CMD} -e \ - '/CC=/s|^|#| ; \ - /CXX=/s|^|#| ; \ - /LD=/s|^|#| ; \ - s|-I/usr/local/include|| ; \ - s|-L/usr/local/lib||' ${WRKSRC}/configure - do-install: (cd ${WRKSRC}/rtspproxy && ${INSTALL_PROGRAM} rtspproxy \ ${STAGEDIR}${PREFIX}/sbin) Added: head/net/osrtspproxy/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/osrtspproxy/files/patch-configure Mon Oct 20 12:42:09 2014 (r371264) @@ -0,0 +1,46 @@ +--- configure.orig 2001-02-09 06:07:26 UTC ++++ configure +@@ -58,22 +58,8 @@ case "$UNAME_S" in + LDFLAGS="$LDDBG -L/usr/local/lib" + SYSLIBS="-lpthread" + ;; +- FreeBSD) +- case "$UNAME_R" in +- 2.*) +- OSVER=20 +- ;; +- 3.*) +- OSVER=30 +- ;; +- 4.*) +- OSVER=40 +- ;; +- *) +- # Assume 5.0 + +- OSVER=50 +- ;; +- esac ++ FreeBSD|DragonFly) ++ OSVER=50 + if [ "$DEBUG" -ne 0 ]; then + CCDBG="-g" + LDDBG="-g" +@@ -81,15 +67,12 @@ case "$UNAME_S" in + CCDBG="-DNDEBUG" + LDDBG="" + fi +- CC=gcc +- CFLAGS="$CCDBG -D_UNIX -D_BSD=$OSVER -Wall -I/usr/local/include" +- CXX=g++ ++ CFLAGS="$CCDBG -D_UNIX -D_BSD=$OSVER -Wall" + CXXFLAGS=${CFLAGS} + AR=ar + ARFLAGS="-rc" +- LD=gcc +- LDFLAGS="$LDDBG -pthread -L/usr/local/lib" +- SYSLIBS="" ++ LDFLAGS="$LDDBG" ++ SYSLIBS="-lpthread" + ;; + SunOS) + case "$UNAME_R" in Modified: head/net/osrtspproxy/files/patch-rtspproxy-Makefile.in ============================================================================== --- head/net/osrtspproxy/files/patch-rtspproxy-Makefile.in Mon Oct 20 12:18:56 2014 (r371263) +++ head/net/osrtspproxy/files/patch-rtspproxy-Makefile.in Mon Oct 20 12:42:09 2014 (r371264) @@ -1,6 +1,6 @@ ---- rtspproxy/Makefile.in.orig Thu Feb 8 00:40:54 2001 -+++ rtspproxy/Makefile.in Sun Oct 20 13:43:49 2002 -@@ -1,9 +1,9 @@ +--- rtspproxy/Makefile.in.orig 2001-02-07 23:40:54 UTC ++++ rtspproxy/Makefile.in +@@ -1,10 +1,10 @@ -CC=@CC@ -CXX=@CXX@ +CC?=@CC@ @@ -9,12 +9,14 @@ -CFLAGS=@CFLAGS@ -I../libapp -I../librtsp -I. -CXXFLAGS=@CXXFLAGS@ -I../libapp -I../librtsp -I. +-LDFLAGS=@LDFLAGS@ +CFLAGS+=@CFLAGS@ -I../libapp -I../librtsp -I. +CXXFLAGS+=@CXXFLAGS@ -I../libapp -I../librtsp -I. - LDFLAGS=@LDFLAGS@ ++LDFLAGS+=@LDFLAGS@ SYSLIBS=@SYSLIBS@ -@@ -24,7 +24,7 @@ + OBJS=rtspproxy.o proxysession.o tranhdr.o proxytran.o +@@ -24,7 +24,7 @@ TARGET=rtspproxy all: $(TARGET) $(TARGET): $(OBJS) $(LIBS)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410201242.s9KCgAqm038587>