Update to 2009.09.21.

Feature safe:	yes

8 files changed, 82 insertions, 6 deletions

diff --git a/net/liveMedia/Makefile b/net/liveMedia/Makefile
index 07aa95d0dd71..1481ded806d5 100644
--- a/net/liveMedia/Makefile
+++ b/net/liveMedia/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	liveMedia
-PORTVERSION=	2009.09.04
+PORTVERSION=	2009.09.21
 PORTREVISION=	0
 PORTEPOCH=	1
 CATEGORIES=	net devel
diff --git a/net/liveMedia/distinfo b/net/liveMedia/distinfo
index ba314e10b3eb..28146b807722 100644
--- a/net/liveMedia/distinfo
+++ b/net/liveMedia/distinfo
@@ -1,3 +1,3 @@
-MD5 (live.2009.09.04.tar.gz) = ca70b121f09c1b64ca57321fca88820c
-SHA256 (live.2009.09.04.tar.gz) = bea51061867d1bc6e728f22481438407f566aa0e17cd8f0f15908dcd07b31818
-SIZE (live.2009.09.04.tar.gz) = 449276
+MD5 (live.2009.09.21.tar.gz) = 1edc70c86bbbe7c6349f710295fe732c
+SHA256 (live.2009.09.21.tar.gz) = 0b6b984d60b1c88d73c948cab75066d980dd6f556f4d862b2915eaba3fc267cf
+SIZE (live.2009.09.21.tar.gz) = 449654
diff --git a/net/liveMedia/files/config.fixed-freebsd b/net/liveMedia/files/config.fixed-freebsd
index 7dfd86ea4116..24c6df805c84 100644
--- a/net/liveMedia/files/config.fixed-freebsd
+++ b/net/liveMedia/files/config.fixed-freebsd
@@ -8,8 +8,8 @@ OBJ =			o
 LINK =			$(CXX) -o
 LINK_OPTS =		-L.
 CONSOLE_LINK_OPTS =	$(LINK_OPTS)
-LIBRARY_LINK =		$(LD) -o
-LIBRARY_LINK_OPTS =	$(LINK_OPTS) -r -Bstatic
+LIBRARY_LINK =		$(AR) cr
+LIBRARY_LINK_OPTS =	
 LIB_SUFFIX =			a
 LIBS_FOR_CONSOLE_APPLICATION =
 LIBS_FOR_GUI_APPLICATION =
diff --git a/net/liveMedia/files/patch-BasicUsageEnvironment-Makefile.tail b/net/liveMedia/files/patch-BasicUsageEnvironment-Makefile.tail
new file mode 100644
index 000000000000..297ae96dd86a
--- /dev/null
+++ b/net/liveMedia/files/patch-BasicUsageEnvironment-Makefile.tail
@@ -0,0 +1,11 @@
+--- BasicUsageEnvironment/Makefile.tail.orig	2009-09-21 10:42:12.000000000 +0900
++++ BasicUsageEnvironment/Makefile.tail	2009-09-28 23:51:46.405510187 +0900
+@@ -9,7 +9,7 @@
+ 	DelayQueue.$(OBJ) BasicHashTable.$(OBJ)
+ 
+ libBasicUsageEnvironment.$(LIB_SUFFIX): $(OBJS)
+-	$(LIBRARY_LINK)$@ $(LIBRARY_LINK_OPTS) \
++	$(LIBRARY_LINK) $@ $(LIBRARY_LINK_OPTS) \
+ 		$(OBJS)
+ 
+ .$(C).$(OBJ):
diff --git a/net/liveMedia/files/patch-Makefile.tail b/net/liveMedia/files/patch-Makefile.tail
new file mode 100644
index 000000000000..536463ac26fa
--- /dev/null
+++ b/net/liveMedia/files/patch-Makefile.tail
@@ -0,0 +1,32 @@
+--- Makefile.tail.orig	2009-09-21 10:42:12.000000000 +0900
++++ Makefile.tail	2009-09-28 23:50:17.993980949 +0900
+@@ -10,17 +10,17 @@
+ MEDIA_SERVER_DIR = mediaServer
+ 
+ all:
+-	cd $(LIVEMEDIA_DIR) ; $(MAKE)
+-	cd $(GROUPSOCK_DIR) ; $(MAKE)
+-	cd $(USAGE_ENVIRONMENT_DIR) ; $(MAKE)
+-	cd $(BASIC_USAGE_ENVIRONMENT_DIR) ; $(MAKE)
+-	cd $(TESTPROGS_DIR) ; $(MAKE)
+-	cd $(MEDIA_SERVER_DIR) ; $(MAKE)
++	(cd $(LIVEMEDIA_DIR) ; $(MAKE))
++	(cd $(GROUPSOCK_DIR) ; $(MAKE))
++	(cd $(USAGE_ENVIRONMENT_DIR) ; $(MAKE))
++	(cd $(BASIC_USAGE_ENVIRONMENT_DIR) ; $(MAKE))
++	(cd $(TESTPROGS_DIR) ; $(MAKE))
++	(cd $(MEDIA_SERVER_DIR) ; $(MAKE))
+ 
+ clean:
+-	cd $(LIVEMEDIA_DIR) ; $(MAKE) clean
+-	cd $(GROUPSOCK_DIR) ; $(MAKE) clean
+-	cd $(USAGE_ENVIRONMENT_DIR) ; $(MAKE) clean
+-	cd $(BASIC_USAGE_ENVIRONMENT_DIR) ; $(MAKE) clean
+-	cd $(TESTPROGS_DIR) ; $(MAKE) clean
+-	cd $(MEDIA_SERVER_DIR) ; $(MAKE) clean
++	(cd $(LIVEMEDIA_DIR) ; $(MAKE) clean)
++	(cd $(GROUPSOCK_DIR) ; $(MAKE) clean)
++	(cd $(USAGE_ENVIRONMENT_DIR) ; $(MAKE) clean)
++	(cd $(BASIC_USAGE_ENVIRONMENT_DIR) ; $(MAKE) clean)
++	(cd $(TESTPROGS_DIR) ; $(MAKE) clean)
++	(cd $(MEDIA_SERVER_DIR) ; $(MAKE) clean)
diff --git a/net/liveMedia/files/patch-UsageEnvironment-Makefile.tail b/net/liveMedia/files/patch-UsageEnvironment-Makefile.tail
new file mode 100644
index 000000000000..d51aa8f4f7dc
--- /dev/null
+++ b/net/liveMedia/files/patch-UsageEnvironment-Makefile.tail
@@ -0,0 +1,11 @@
+--- UsageEnvironment/Makefile.tail.orig	2009-09-21 10:42:12.000000000 +0900
++++ UsageEnvironment/Makefile.tail	2009-09-28 23:50:57.387554379 +0900
+@@ -7,7 +7,7 @@
+ OBJS = UsageEnvironment.$(OBJ) HashTable.$(OBJ) strDup.$(OBJ)
+ 
+ $(USAGE_ENVIRONMENT_LIB): $(OBJS)
+-	$(LIBRARY_LINK)$@ $(LIBRARY_LINK_OPTS) $(OBJS)
++	$(LIBRARY_LINK) $@ $(LIBRARY_LINK_OPTS) $(OBJS)
+ 
+ .$(C).$(OBJ):
+ 	$(C_COMPILER) -c $(C_FLAGS) $<       
diff --git a/net/liveMedia/files/patch-groupsock-Makefile.tail b/net/liveMedia/files/patch-groupsock-Makefile.tail
new file mode 100644
index 000000000000..b7f22767b771
--- /dev/null
+++ b/net/liveMedia/files/patch-groupsock-Makefile.tail
@@ -0,0 +1,11 @@
+--- groupsock/Makefile.tail.orig	2009-09-21 10:42:12.000000000 +0900
++++ groupsock/Makefile.tail	2009-09-28 23:49:03.130995435 +0900
+@@ -27,7 +27,7 @@
+ 
+ libgroupsock.$(LIB_SUFFIX): $(GROUPSOCK_LIB_OBJS) \
+     $(PLATFORM_SPECIFIC_LIB_OBJS)
+-	$(LIBRARY_LINK)$@ $(LIBRARY_LINK_OPTS) \
++	$(LIBRARY_LINK) $@ $(LIBRARY_LINK_OPTS) \
+ 		$(GROUPSOCK_LIB_OBJS)
+ 
+ clean:
diff --git a/net/liveMedia/files/patch-liveMedia-Makefile.tail b/net/liveMedia/files/patch-liveMedia-Makefile.tail
new file mode 100644
index 000000000000..902ae8f1444c
--- /dev/null
+++ b/net/liveMedia/files/patch-liveMedia-Makefile.tail
@@ -0,0 +1,11 @@
+--- liveMedia/Makefile.tail.orig	2009-09-21 10:42:12.000000000 +0900
++++ liveMedia/Makefile.tail	2009-09-28 23:46:58.992036507 +0900
+@@ -47,7 +47,7 @@
+ 
+ $(LIVEMEDIA_LIB): $(LIVEMEDIA_LIB_OBJS) \
+     $(PLATFORM_SPECIFIC_LIB_OBJS)
+-	$(LIBRARY_LINK)$@ $(LIBRARY_LINK_OPTS) \
++	$(LIBRARY_LINK) $@ $(LIBRARY_LINK_OPTS) \
+ 		$(LIVEMEDIA_LIB_OBJS)
+ 
+ Media.$(CPP):		include/Media.hh