liblive: Fix whitespace issue when linking.

8 files changed, 204 insertions, 1 deletions

diff --git a/net/liblive/distinfo b/net/liblive/distinfo
index 8f5b17d9d05..38fe39e4041 100644
--- a/net/liblive/distinfo
+++ b/net/liblive/distinfo
@@ -1,9 +1,16 @@
-$NetBSD: distinfo,v 1.19 2021/10/26 11:05:55 nia Exp $
+$NetBSD: distinfo,v 1.20 2022/03/24 19:36:29 wiz Exp $
 
 BLAKE2s (live.2014.12.11.tar.gz) = e69dbb033094c33153c1aa1b738eb469171099f3af69c5d31143e5126dcdc056
 SHA512 (live.2014.12.11.tar.gz) = f0a538e78167f0390ca1f14ac90110fd7542db9e52b1ef6c64c9b1bccb2aff4ab5bef718801f58cc64afddd0dc6d065661220d692d4ad115feefc66db724c363
 Size (live.2014.12.11.tar.gz) = 628708 bytes
+SHA1 (patch-BasicUsageEnvironment_Makefile.tail) = b6d4706b78dbd2fc5fa5bad881248fc16b3feb28
+SHA1 (patch-UsageEnvironment_Makefile.tail) = d5083109c9050ee69c3c21e97f19c52e1f420cb6
 SHA1 (patch-aa) = 67d1928f6d085749aa19b6486b5fe841b76d4364
 SHA1 (patch-ba) = a60e7960c5e99a46ab2c974f3289a580cbfe9b4f
 SHA1 (patch-cc) = 1e968b8742c913f67654d83612bafe4fe01364c0
 SHA1 (patch-config.solaris-64bit) = a6c5f9b9027ebf3d78b939dc124efc964a9795c8
+SHA1 (patch-groupsock_Makefile.tail) = 1835e499bb53d140ed6b4e3e9e60c5d5599513b8
+SHA1 (patch-liveMedia_Makefile.tail) = 77725685dbecf5b4bf22b9b7f1bd2609717d3db3
+SHA1 (patch-mediaServer_Makefile.tail) = 576867eee345eb2e638d38408d93827947da5c85
+SHA1 (patch-proxyServer_Makefile.tail) = 5fb4040a2e6f79e851467ebc291062fd8b602603
+SHA1 (patch-testProgs_Makefile.tail) = 254aaa5cfb6a04e49ca1624d55c380371e1ed6a2
diff --git a/net/liblive/patches/patch-BasicUsageEnvironment_Makefile.tail b/net/liblive/patches/patch-BasicUsageEnvironment_Makefile.tail
new file mode 100644
index 00000000000..dc0c89643ea
--- /dev/null
+++ b/net/liblive/patches/patch-BasicUsageEnvironment_Makefile.tail
@@ -0,0 +1,15 @@
+$NetBSD: patch-BasicUsageEnvironment_Makefile.tail,v 1.1 2022/03/24 19:36:29 wiz Exp $
+
+Fix whitespace issue when linking.
+
+--- BasicUsageEnvironment/Makefile.tail.orig	2014-12-11 10:33:25.000000000 +0000
++++ BasicUsageEnvironment/Makefile.tail
+@@ -10,7 +10,7 @@ OBJS = BasicUsageEnvironment0.$(OBJ) Bas
+ 	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/liblive/patches/patch-UsageEnvironment_Makefile.tail b/net/liblive/patches/patch-UsageEnvironment_Makefile.tail
new file mode 100644
index 00000000000..946a719f1bd
--- /dev/null
+++ b/net/liblive/patches/patch-UsageEnvironment_Makefile.tail
@@ -0,0 +1,15 @@
+$NetBSD: patch-UsageEnvironment_Makefile.tail,v 1.1 2022/03/24 19:36:29 wiz Exp $
+
+Fix whitespace issue when linking.
+
+--- UsageEnvironment/Makefile.tail.orig	2014-12-11 10:33:25.000000000 +0000
++++ UsageEnvironment/Makefile.tail
+@@ -8,7 +8,7 @@ all:	$(ALL)
+ 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/liblive/patches/patch-groupsock_Makefile.tail b/net/liblive/patches/patch-groupsock_Makefile.tail
new file mode 100644
index 00000000000..fc8ed70601c
--- /dev/null
+++ b/net/liblive/patches/patch-groupsock_Makefile.tail
@@ -0,0 +1,15 @@
+$NetBSD: patch-groupsock_Makefile.tail,v 1.1 2022/03/24 19:36:29 wiz Exp $
+
+Fix whitespace issue when linking.
+
+--- groupsock/Makefile.tail.orig	2014-12-11 10:33:25.000000000 +0000
++++ groupsock/Makefile.tail
+@@ -27,7 +27,7 @@ IOHandlers.$(CPP):	include/IOHandlers.hh
+ 
+ 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/liblive/patches/patch-liveMedia_Makefile.tail b/net/liblive/patches/patch-liveMedia_Makefile.tail
new file mode 100644
index 00000000000..859c68bdd08
--- /dev/null
+++ b/net/liblive/patches/patch-liveMedia_Makefile.tail
@@ -0,0 +1,15 @@
+$NetBSD: patch-liveMedia_Makefile.tail,v 1.1 2022/03/24 19:36:29 wiz Exp $
+
+Fix whitespace issue when linking.
+
+--- liveMedia/Makefile.tail.orig	2014-12-11 10:33:25.000000000 +0000
++++ liveMedia/Makefile.tail
+@@ -57,7 +57,7 @@ LIVEMEDIA_LIB_OBJS = Media.$(OBJ) $(MISC
+ 
+ $(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
diff --git a/net/liblive/patches/patch-mediaServer_Makefile.tail b/net/liblive/patches/patch-mediaServer_Makefile.tail
new file mode 100644
index 00000000000..405efeac838
--- /dev/null
+++ b/net/liblive/patches/patch-mediaServer_Makefile.tail
@@ -0,0 +1,15 @@
+$NetBSD: patch-mediaServer_Makefile.tail,v 1.1 2022/03/24 19:36:29 wiz Exp $
+
+Fix whitespace issue when linking.
+
+--- mediaServer/Makefile.tail.orig	2014-12-11 10:33:25.000000000 +0000
++++ mediaServer/Makefile.tail
+@@ -29,7 +29,7 @@ LOCAL_LIBS =	$(LIVEMEDIA_LIB) $(GROUPSOC
+ LIBS =			$(LOCAL_LIBS) $(LIBS_FOR_CONSOLE_APPLICATION)
+ 
+ live555MediaServer$(EXE):	$(MEDIA_SERVER_OBJS) $(LOCAL_LIBS)
+-	$(LINK)$@ $(CONSOLE_LINK_OPTS) $(MEDIA_SERVER_OBJS) $(LIBS)
++	$(LINK) $@ $(CONSOLE_LINK_OPTS) $(MEDIA_SERVER_OBJS) $(LIBS)
+ 
+ clean:
+ 	-rm -rf *.$(OBJ) $(ALL) core *.core *~ include/*~
diff --git a/net/liblive/patches/patch-proxyServer_Makefile.tail b/net/liblive/patches/patch-proxyServer_Makefile.tail
new file mode 100644
index 00000000000..291f1ada631
--- /dev/null
+++ b/net/liblive/patches/patch-proxyServer_Makefile.tail
@@ -0,0 +1,15 @@
+$NetBSD: patch-proxyServer_Makefile.tail,v 1.1 2022/03/24 19:36:29 wiz Exp $
+
+Fix whitespace issue when linking.
+
+--- proxyServer/Makefile.tail.orig	2014-12-11 10:33:25.000000000 +0000
++++ proxyServer/Makefile.tail
+@@ -26,7 +26,7 @@ LOCAL_LIBS =	$(LIVEMEDIA_LIB) $(GROUPSOC
+ LIBS =			$(LOCAL_LIBS) $(LIBS_FOR_CONSOLE_APPLICATION)
+ 
+ live555ProxyServer$(EXE):	$(PROXY_SERVER_OBJS) $(LOCAL_LIBS)
+-	$(LINK)$@ $(CONSOLE_LINK_OPTS) $(PROXY_SERVER_OBJS) $(LIBS)
++	$(LINK) $@ $(CONSOLE_LINK_OPTS) $(PROXY_SERVER_OBJS) $(LIBS)
+ 
+ clean:
+ 	-rm -rf *.$(OBJ) $(ALL) core *.core *~ include/*~
diff --git a/net/liblive/patches/patch-testProgs_Makefile.tail b/net/liblive/patches/patch-testProgs_Makefile.tail
new file mode 100644
index 00000000000..7ffbc2a3e28
--- /dev/null
+++ b/net/liblive/patches/patch-testProgs_Makefile.tail
@@ -0,0 +1,106 @@
+$NetBSD: patch-testProgs_Makefile.tail,v 1.1 2022/03/24 19:36:29 wiz Exp $
+
+Fix whitespace issue when linking.
+
+--- testProgs/Makefile.tail.orig	2014-12-11 10:33:25.000000000 +0000
++++ testProgs/Makefile.tail
+@@ -72,68 +72,68 @@ LOCAL_LIBS =	$(LIVEMEDIA_LIB) $(GROUPSOC
+ LIBS =			$(LOCAL_LIBS) $(LIBS_FOR_CONSOLE_APPLICATION)
+ 
+ testMP3Streamer$(EXE):	$(MP3_STREAMER_OBJS) $(LOCAL_LIBS)
+-	$(LINK)$@ $(CONSOLE_LINK_OPTS) $(MP3_STREAMER_OBJS) $(LIBS)
++	$(LINK) $@ $(CONSOLE_LINK_OPTS) $(MP3_STREAMER_OBJS) $(LIBS)
+ testMP3Receiver$(EXE):	$(MP3_RECEIVER_OBJS) $(LOCAL_LIBS)
+-	$(LINK)$@ $(CONSOLE_LINK_OPTS) $(MP3_RECEIVER_OBJS) $(LIBS)
++	$(LINK) $@ $(CONSOLE_LINK_OPTS) $(MP3_RECEIVER_OBJS) $(LIBS)
+ testRelay$(EXE):	$(RELAY_OBJS) $(LOCAL_LIBS)
+-	$(LINK)$@ $(CONSOLE_LINK_OPTS) $(RELAY_OBJS) $(LIBS)
++	$(LINK) $@ $(CONSOLE_LINK_OPTS) $(RELAY_OBJS) $(LIBS)
+ testReplicator$(EXE):	$(REPLICATOR_OBJS) $(LOCAL_LIBS)
+-	$(LINK)$@ $(CONSOLE_LINK_OPTS) $(REPLICATOR_OBJS) $(LIBS)
++	$(LINK) $@ $(CONSOLE_LINK_OPTS) $(REPLICATOR_OBJS) $(LIBS)
+ testMPEG1or2Splitter$(EXE):	$(MPEG_1OR2_SPLITTER_OBJS) $(LOCAL_LIBS)
+-	$(LINK)$@ $(CONSOLE_LINK_OPTS) $(MPEG_1OR2_SPLITTER_OBJS) $(LIBS)
++	$(LINK) $@ $(CONSOLE_LINK_OPTS) $(MPEG_1OR2_SPLITTER_OBJS) $(LIBS)
+ testMPEG1or2VideoStreamer$(EXE):	$(MPEG_1OR2_VIDEO_STREAMER_OBJS) $(LOCAL_LIBS)
+-	$(LINK)$@ $(CONSOLE_LINK_OPTS) $(MPEG_1OR2_VIDEO_STREAMER_OBJS) $(LIBS)
++	$(LINK) $@ $(CONSOLE_LINK_OPTS) $(MPEG_1OR2_VIDEO_STREAMER_OBJS) $(LIBS)
+ testMPEG1or2VideoReceiver$(EXE):	$(MPEG_1OR2_VIDEO_RECEIVER_OBJS) $(LOCAL_LIBS)
+-	$(LINK)$@ $(CONSOLE_LINK_OPTS) $(MPEG_1OR2_VIDEO_RECEIVER_OBJS) $(LIBS)
++	$(LINK) $@ $(CONSOLE_LINK_OPTS) $(MPEG_1OR2_VIDEO_RECEIVER_OBJS) $(LIBS)
+ testMPEG1or2AudioVideoStreamer$(EXE):	$(MPEG_1OR2_AUDIO_VIDEO_STREAMER_OBJS) $(LOCAL_LIBS)
+-	$(LINK)$@ $(CONSOLE_LINK_OPTS) $(MPEG_1OR2_AUDIO_VIDEO_STREAMER_OBJS) $(LIBS)
++	$(LINK) $@ $(CONSOLE_LINK_OPTS) $(MPEG_1OR2_AUDIO_VIDEO_STREAMER_OBJS) $(LIBS)
+ testMPEG2TransportStreamer$(EXE):	$(MPEG2_TRANSPORT_STREAMER_OBJS) $(LOCAL_LIBS)
+-	$(LINK)$@ $(CONSOLE_LINK_OPTS) $(MPEG2_TRANSPORT_STREAMER_OBJS) $(LIBS)
++	$(LINK) $@ $(CONSOLE_LINK_OPTS) $(MPEG2_TRANSPORT_STREAMER_OBJS) $(LIBS)
+ testMPEG2TransportReceiver$(EXE):	$(MPEG2_TRANSPORT_RECEIVER_OBJS) $(LOCAL_LIBS)
+-	$(LINK)$@ $(CONSOLE_LINK_OPTS) $(MPEG2_TRANSPORT_RECEIVER_OBJS) $(LIBS)
++	$(LINK) $@ $(CONSOLE_LINK_OPTS) $(MPEG2_TRANSPORT_RECEIVER_OBJS) $(LIBS)
+ testMPEG4VideoStreamer$(EXE):	$(MPEG4_VIDEO_STREAMER_OBJS) $(LOCAL_LIBS)
+-	$(LINK)$@ $(CONSOLE_LINK_OPTS) $(MPEG4_VIDEO_STREAMER_OBJS) $(LIBS)
++	$(LINK) $@ $(CONSOLE_LINK_OPTS) $(MPEG4_VIDEO_STREAMER_OBJS) $(LIBS)
+ testH264VideoStreamer$(EXE):	$(H264_VIDEO_STREAMER_OBJS) $(LOCAL_LIBS)
+-	$(LINK)$@ $(CONSOLE_LINK_OPTS) $(H264_VIDEO_STREAMER_OBJS) $(LIBS)
++	$(LINK) $@ $(CONSOLE_LINK_OPTS) $(H264_VIDEO_STREAMER_OBJS) $(LIBS)
+ testH265VideoStreamer$(EXE):	$(H265_VIDEO_STREAMER_OBJS) $(LOCAL_LIBS)
+-	$(LINK)$@ $(CONSOLE_LINK_OPTS) $(H265_VIDEO_STREAMER_OBJS) $(LIBS)
++	$(LINK) $@ $(CONSOLE_LINK_OPTS) $(H265_VIDEO_STREAMER_OBJS) $(LIBS)
+ testDVVideoStreamer$(EXE):	$(DV_VIDEO_STREAMER_OBJS) $(LOCAL_LIBS)
+-	$(LINK)$@ $(CONSOLE_LINK_OPTS) $(DV_VIDEO_STREAMER_OBJS) $(LIBS)
++	$(LINK) $@ $(CONSOLE_LINK_OPTS) $(DV_VIDEO_STREAMER_OBJS) $(LIBS)
+ testWAVAudioStreamer$(EXE):	$(WAV_AUDIO_STREAMER_OBJS) $(LOCAL_LIBS)
+-	$(LINK)$@ $(CONSOLE_LINK_OPTS) $(WAV_AUDIO_STREAMER_OBJS) $(LIBS)
++	$(LINK) $@ $(CONSOLE_LINK_OPTS) $(WAV_AUDIO_STREAMER_OBJS) $(LIBS)
+ testAMRAudioStreamer$(EXE):	$(AMR_AUDIO_STREAMER_OBJS) $(LOCAL_LIBS)
+-	$(LINK)$@ $(CONSOLE_LINK_OPTS) $(AMR_AUDIO_STREAMER_OBJS) $(LIBS)
++	$(LINK) $@ $(CONSOLE_LINK_OPTS) $(AMR_AUDIO_STREAMER_OBJS) $(LIBS)
+ testOnDemandRTSPServer$(EXE):	$(ON_DEMAND_RTSP_SERVER_OBJS) $(LOCAL_LIBS)
+-	$(LINK)$@ $(CONSOLE_LINK_OPTS) $(ON_DEMAND_RTSP_SERVER_OBJS) $(LIBS)
++	$(LINK) $@ $(CONSOLE_LINK_OPTS) $(ON_DEMAND_RTSP_SERVER_OBJS) $(LIBS)
+ testMKVStreamer$(EXE):	$(MKV_STREAMER_OBJS) $(LOCAL_LIBS)
+-	$(LINK)$@ $(CONSOLE_LINK_OPTS) $(MKV_STREAMER_OBJS) $(LIBS)
++	$(LINK) $@ $(CONSOLE_LINK_OPTS) $(MKV_STREAMER_OBJS) $(LIBS)
+ testOggStreamer$(EXE):	$(OGG_STREAMER_OBJS) $(LOCAL_LIBS)
+-	$(LINK)$@ $(CONSOLE_LINK_OPTS) $(OGG_STREAMER_OBJS) $(LIBS)
++	$(LINK) $@ $(CONSOLE_LINK_OPTS) $(OGG_STREAMER_OBJS) $(LIBS)
+ vobStreamer$(EXE):	$(VOB_STREAMER_OBJS) $(LOCAL_LIBS)
+-	$(LINK)$@ $(CONSOLE_LINK_OPTS) $(VOB_STREAMER_OBJS) $(LIBS)
++	$(LINK) $@ $(CONSOLE_LINK_OPTS) $(VOB_STREAMER_OBJS) $(LIBS)
+ testRTSPClient$(EXE):	$(TEST_RTSP_CLIENT_OBJS) $(LOCAL_LIBS)
+-	$(LINK)$@ $(CONSOLE_LINK_OPTS) $(TEST_RTSP_CLIENT_OBJS) $(LIBS)
++	$(LINK) $@ $(CONSOLE_LINK_OPTS) $(TEST_RTSP_CLIENT_OBJS) $(LIBS)
+ openRTSP$(EXE):	$(OPEN_RTSP_OBJS) $(LOCAL_LIBS)
+-	$(LINK)$@ $(CONSOLE_LINK_OPTS) $(OPEN_RTSP_OBJS) $(LIBS)
++	$(LINK) $@ $(CONSOLE_LINK_OPTS) $(OPEN_RTSP_OBJS) $(LIBS)
+ playSIP$(EXE):	$(PLAY_SIP_OBJS) $(LOCAL_LIBS)
+-	$(LINK)$@ $(CONSOLE_LINK_OPTS) $(PLAY_SIP_OBJS) $(LIBS)
++	$(LINK) $@ $(CONSOLE_LINK_OPTS) $(PLAY_SIP_OBJS) $(LIBS)
+ sapWatch$(EXE):	$(SAP_WATCH_OBJS) $(LOCAL_LIBS)
+-	$(LINK)$@ $(CONSOLE_LINK_OPTS) $(SAP_WATCH_OBJS) $(LIBS)
++	$(LINK) $@ $(CONSOLE_LINK_OPTS) $(SAP_WATCH_OBJS) $(LIBS)
+ testMPEG1or2ProgramToTransportStream$(EXE):	$(MPEG_1OR2_PROGRAM_TO_TRANSPORT_STREAM_OBJS) $(LOCAL_LIBS)
+-	$(LINK)$@ $(CONSOLE_LINK_OPTS) $(MPEG_1OR2_PROGRAM_TO_TRANSPORT_STREAM_OBJS) $(LIBS)
++	$(LINK) $@ $(CONSOLE_LINK_OPTS) $(MPEG_1OR2_PROGRAM_TO_TRANSPORT_STREAM_OBJS) $(LIBS)
+ testH264VideoToTransportStream$(EXE):	$(H264_VIDEO_TO_TRANSPORT_STREAM_OBJS) $(LOCAL_LIBS)
+-	$(LINK)$@ $(CONSOLE_LINK_OPTS) $(H264_VIDEO_TO_TRANSPORT_STREAM_OBJS) $(LIBS)
++	$(LINK) $@ $(CONSOLE_LINK_OPTS) $(H264_VIDEO_TO_TRANSPORT_STREAM_OBJS) $(LIBS)
+ testH265VideoToTransportStream$(EXE):	$(H265_VIDEO_TO_TRANSPORT_STREAM_OBJS) $(LOCAL_LIBS)
+-	$(LINK)$@ $(CONSOLE_LINK_OPTS) $(H265_VIDEO_TO_TRANSPORT_STREAM_OBJS) $(LIBS)
++	$(LINK) $@ $(CONSOLE_LINK_OPTS) $(H265_VIDEO_TO_TRANSPORT_STREAM_OBJS) $(LIBS)
+ MPEG2TransportStreamIndexer$(EXE):	$(MPEG2_TRANSPORT_STREAM_INDEXER_OBJS) $(LOCAL_LIBS)
+-	$(LINK)$@ $(CONSOLE_LINK_OPTS) $(MPEG2_TRANSPORT_STREAM_INDEXER_OBJS) $(LIBS)
++	$(LINK) $@ $(CONSOLE_LINK_OPTS) $(MPEG2_TRANSPORT_STREAM_INDEXER_OBJS) $(LIBS)
+ testMPEG2TransportStreamTrickPlay$(EXE):	$(MPEG2_TRANSPORT_STREAM_TRICK_PLAY_OBJS) $(LOCAL_LIBS)
+-	$(LINK)$@ $(CONSOLE_LINK_OPTS) $(MPEG2_TRANSPORT_STREAM_TRICK_PLAY_OBJS) $(LIBS)
++	$(LINK) $@ $(CONSOLE_LINK_OPTS) $(MPEG2_TRANSPORT_STREAM_TRICK_PLAY_OBJS) $(LIBS)
+ registerRTSPStream$(EXE):	$(REGISTER_RTSP_STREAM_OBJS) $(LOCAL_LIBS)
+-	$(LINK)$@ $(CONSOLE_LINK_OPTS) $(REGISTER_RTSP_STREAM_OBJS) $(LIBS)
++	$(LINK) $@ $(CONSOLE_LINK_OPTS) $(REGISTER_RTSP_STREAM_OBJS) $(LIBS)
+ 
+ testGSMStreamer$(EXE):	$(GSM_STREAMER_OBJS) $(LOCAL_LIBS)
+-	$(LINK)$@ $(CONSOLE_LINK_OPTS) $(GSM_STREAMER_OBJS) $(LIBS)
++	$(LINK) $@ $(CONSOLE_LINK_OPTS) $(GSM_STREAMER_OBJS) $(LIBS)
+ 
+ clean:
+ 	-rm -rf *.$(OBJ) $(ALL) core *.core *~ include/*~