Fix build on current.

PR:		ports/44301
Submitted by:	maintainer

5 files changed, 87 insertions, 0 deletions

diff --git a/net/osrtspproxy/Makefile b/net/osrtspproxy/Makefile
index 77f632214ea7..44a5e8427853 100644
--- a/net/osrtspproxy/Makefile
+++ b/net/osrtspproxy/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	osrtspproxy
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://docs.real.com/docs/proxykit/
 DISTNAME=	${PORTNAME}_2_0
diff --git a/net/osrtspproxy/files/patch-Makefile.in b/net/osrtspproxy/files/patch-Makefile.in
new file mode 100644
index 000000000000..f9141f96fcc8
--- /dev/null
+++ b/net/osrtspproxy/files/patch-Makefile.in
@@ -0,0 +1,29 @@
+--- Makefile.in.orig	Sun Oct 20 13:22:10 2002
++++ Makefile.in	Sun Oct 20 13:26:06 2002
+@@ -3,21 +3,21 @@
+ all: rtspproxy/rtspproxy
+ 
+ rtspproxy/rtspproxy: libapp/libapp.a librtsp/librtsp.a
+-	cd rtspproxy && make
++	cd rtspproxy && ${MAKE}
+ 
+ librtsp/librtsp.a:
+-	cd librtsp && make
++	cd librtsp && ${MAKE}
+ 
+ libapp/libapp.a:
+-	cd libapp && make
++	cd libapp && ${MAKE}
+ 
+ clean:
+ 	for D in rtspproxy librtsp libapp; do \
+-		cd $$D && make clean && cd ..; \
++		cd $$D && ${MAKE} clean && cd ..; \
+ 	done
+ 
+ distclean:
+ 	for D in rtspproxy librtsp libapp; do \
+-		cd $$D && make distclean && cd ..; \
++		cd $$D && ${MAKE} distclean && cd ..; \
+ 	done
+ 	rm Makefile
diff --git a/net/osrtspproxy/files/patch-libapp-Makefile.in b/net/osrtspproxy/files/patch-libapp-Makefile.in
new file mode 100644
index 000000000000..f4f88b51f292
--- /dev/null
+++ b/net/osrtspproxy/files/patch-libapp-Makefile.in
@@ -0,0 +1,16 @@
+--- libapp/Makefile.in.orig	Sun Oct 20 13:26:38 2002
++++ libapp/Makefile.in	Sun Oct 20 13:30:06 2002
+@@ -1,9 +1,9 @@
+-CC=@CC@
+-CXX=@CXX@
++CC?=@CC@
++CXX?=@CXX@
+ AR=@AR@
+ 
+-CFLAGS=@CFLAGS@ -I.
+-CXXFLAGS=@CXXFLAGS@ -I.
++CFLAGS+=@CFLAGS@ -I.
++CXXFLAGS+=@CXXFLAGS@ -I.
+ ARFLAGS=@ARFLAGS@
+ 
+ SRCS=types.cpp md5.c dbg.cpp str.cpp bitset.cpp variant.cpp valmap.cpp \
diff --git a/net/osrtspproxy/files/patch-librtsp-Makefile.in b/net/osrtspproxy/files/patch-librtsp-Makefile.in
new file mode 100644
index 000000000000..c753922bbbb5
--- /dev/null
+++ b/net/osrtspproxy/files/patch-librtsp-Makefile.in
@@ -0,0 +1,16 @@
+--- librtsp/Makefile.in.orig	Sun Oct 20 13:32:26 2002
++++ librtsp/Makefile.in	Sun Oct 20 13:33:01 2002
+@@ -1,9 +1,9 @@
+-CC=@CC@
+-CXX=@CXX@
++CC?=@CC@
++CXX?=@CXX@
+ AR=@AR@
+ 
+-CFLAGS=@CFLAGS@ -I../libapp -I.
+-CXXFLAGS=@CXXFLAGS@ -I../libapp -I.
++CFLAGS+=@CFLAGS@ -I../libapp -I.
++CXXFLAGS+=@CXXFLAGS@ -I../libapp -I.
+ ARFLAGS=@ARFLAGS@
+ 
+ SRCS=rtspmsg.cpp rtspprot.cpp pkt.cpp proxypkt.cpp tran.cpp   
diff --git a/net/osrtspproxy/files/patch-rtspproxy-Makefile.in b/net/osrtspproxy/files/patch-rtspproxy-Makefile.in
new file mode 100644
index 000000000000..72e245532815
--- /dev/null
+++ b/net/osrtspproxy/files/patch-rtspproxy-Makefile.in
@@ -0,0 +1,25 @@
+--- 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 @@
+-CC=@CC@
+-CXX=@CXX@
++CC?=@CC@
++CXX?=@CXX@
+ LD=@LD@
+ 
+-CFLAGS=@CFLAGS@ -I../libapp -I../librtsp -I.
+-CXXFLAGS=@CXXFLAGS@ -I../libapp -I../librtsp -I.
++CFLAGS+=@CFLAGS@ -I../libapp -I../librtsp -I.
++CXXFLAGS+=@CXXFLAGS@ -I../libapp -I../librtsp -I.
+ LDFLAGS=@LDFLAGS@
+ SYSLIBS=@SYSLIBS@
+ 
+@@ -24,7 +24,7 @@
+ all: $(TARGET)
+ 
+ $(TARGET): $(OBJS) $(LIBS)
+-	$(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
++	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+ 
+ clean:
+ 	rm -f rtspproxy $(OBJS) core