git: 5354c31ea1a7 - main - net/liveMedia: Update to 2024.09.25
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 26 Sep 2024 05:27:48 UTC
The branch main has been updated by jhale:
URL: https://cgit.FreeBSD.org/ports/commit/?id=5354c31ea1a75fd6c343a44a71347f2ef8adb0a4
commit 5354c31ea1a75fd6c343a44a71347f2ef8adb0a4
Author: Jason E. Hale <jhale@FreeBSD.org>
AuthorDate: 2024-09-26 03:39:11 +0000
Commit: Jason E. Hale <jhale@FreeBSD.org>
CommitDate: 2024-09-26 05:27:34 +0000
net/liveMedia: Update to 2024.09.25
Fix LICENSE block. This is LGPL 3.0 or greater. Remove the "MAT" license
which appears to have been added as a misinterpretation from when this
port had NO_CDROM defined. There's no need for a bogus license just
because the port is versioned by date.
Set previously undefined c++ standard as a precaution.
Simplify Makefile. Move CFLAGS (builds fine on amd64 with -fpic, so
there's no need to conditionalize it) and the openssl sub (MAKE_ENV
already defines OPENSSLLIB) out to files/config.fixed-freebsd. Respect
PREFIX with a more concise sub and no logic requiring <b.p.p.m>.
Strip binaries by subbing the install commands with BSD_INSTALL_* and
patch Makefile.head/tail in the post-patch target instead of the
generated Makefile in the post-configure target.
Pet portclippy(1).
Remove pkg-message that only provided very obious information.
---
net/liveMedia/Makefile | 52 ++++++++++++--------------------
net/liveMedia/distinfo | 6 ++--
net/liveMedia/files/config.fixed-freebsd | 7 +++--
net/liveMedia/pkg-message | 9 ------
4 files changed, 26 insertions(+), 48 deletions(-)
diff --git a/net/liveMedia/Makefile b/net/liveMedia/Makefile
index 66f5517e5b54..72aafa53ccf5 100644
--- a/net/liveMedia/Makefile
+++ b/net/liveMedia/Makefile
@@ -1,5 +1,5 @@
PORTNAME= liveMedia
-DISTVERSION= 2024.08.01
+DISTVERSION= 2024.09.25
PORTEPOCH= 2
CATEGORIES= net devel
MASTER_SITES= https://download.videolan.org/contrib/live555/
@@ -9,42 +9,28 @@ MAINTAINER= multimedia@FreeBSD.org
COMMENT= LIVE.COM Streaming Media
WWW= http://www.live555.com/liveMedia/
-LICENSE= LGPL21 MAT
-LICENSE_COMB= multi
-LICENSE_NAME_MAT= dated material
-LICENSE_TEXT_MAT= dated material
-LICENSE_PERMS_MAT= pkg-mirror dist-mirror auto-accept
-
-WRKSRC= ${WRKDIR}/live
-
-HAS_CONFIGURE= yes
-
-CONFIGURE_SCRIPT= genMakefiles
-CONFIGURE_ARGS= fixed-freebsd
+LICENSE= LGPL3+
+LICENSE_FILE= ${WRKSRC}/COPYING.LESSER
USES= compiler:c++11-lang gmake ssl
+USE_CXXSTD= c++11
USE_LDCONFIG= yes
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "amd64"
-CFLAGS+= -fPIC
-.else
-CFLAGS+= -fpic
-.endif
+HAS_CONFIGURE= yes
+CONFIGURE_SCRIPT= genMakefiles
+CONFIGURE_ARGS= fixed-freebsd
-post-extract:
- ${CP} ${FILESDIR}/config.fixed-freebsd ${WRKSRC}
+WRKSRC= ${WRKDIR}/live
post-patch:
- # LIBS_FOR_CONSOLE_APPLICATION = -lssl -lcrypto
- ${REINPLACE_CMD} '/LIBS_FOR_CONSOLE_APPLICATION/s|$$|-L${OPENSSLLIB} -lssl -lcrypto|' \
- ${WRKSRC}/config.fixed-freebsd
-
-.if ${PREFIX} != "/usr/local"
-post-configure:
- ${REINPLACE_CMD} -e 's,^PREFIX = /usr/local,PREFIX = "${PREFIX}",' \
- ${WRKSRC}/Makefile ${WRKSRC}/*/Makefile
-.endif
-
-.include <bsd.port.post.mk>
+ ${CP} ${FILESDIR}/config.fixed-freebsd ${WRKSRC}
+ @${REINPLACE_CMD} \
+ -e '/^PREFIX/s|=|?=|' \
+ ${WRKSRC}/*/Makefile.head
+ @${REINPLACE_CMD} \
+ -e 's|install -m 644 include|$${BSD_INSTALL_DATA} include|' \
+ -e 's|install -m 644|$${BSD_INSTALL_LIB}|' \
+ -e 's|install -m 755|$${BSD_INSTALL_PROGRAM}|' \
+ ${WRKSRC}/*/Makefile.tail
+
+.include <bsd.port.mk>
diff --git a/net/liveMedia/distinfo b/net/liveMedia/distinfo
index f9326618c699..a534533df299 100644
--- a/net/liveMedia/distinfo
+++ b/net/liveMedia/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1725175235
-SHA256 (live.2024.08.01.tar.gz) = 839ab7437d01e629f8094ea1ec8c7a7bb504c7deed9edfc9e17ac34f9a1a193f
-SIZE (live.2024.08.01.tar.gz) = 694206
+TIMESTAMP = 1727234508
+SHA256 (live.2024.09.25.tar.gz) = 0b7e54a9982291d6ad7935276e86a0778d6cc0b5c61d8344de90db55d48e9495
+SIZE (live.2024.09.25.tar.gz) = 696345
diff --git a/net/liveMedia/files/config.fixed-freebsd b/net/liveMedia/files/config.fixed-freebsd
index fee83627c20c..9374167a8060 100644
--- a/net/liveMedia/files/config.fixed-freebsd
+++ b/net/liveMedia/files/config.fixed-freebsd
@@ -24,13 +24,13 @@ libgroupsock_VERSION_AGE= 0
libgroupsock_LIB_SUFFIX= so.$(shell expr $(libgroupsock_VERSION_CURRENT) - $(libgroupsock_VERSION_AGE)).$(libgroupsock_VERSION_AGE).$(libgroupsock_VERSION_REVISION)
#####
-COMPILE_OPTS = $(INCLUDES) -I. -DBSD=1 -DNEWLOCALE_NOT_USED=1 -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DHAVE_SOCKADDR_LEN=1
+COMPILE_OPTS = $(INCLUDES) -I. -DBSD=1 -DNEWLOCALE_NOT_USED=1 -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DHAVE_SOCKADDR_LEN=1 -fpic
C = c
C_COMPILER = $(CC)
C_FLAGS = $(COMPILE_OPTS) $(CPPFLAGS) $(CFLAGS)
CPP = cpp
CPLUSPLUS_COMPILER = $(CXX)
-CPLUSPLUS_FLAGS = $(COMPILE_OPTS) -Wall -DBSD=1 $(CPPFLAGS) $(CXXFLAGS) -Wno-deprecated
+CPLUSPLUS_FLAGS = $(COMPILE_OPTS) -Wall -Wno-deprecated $(CPPFLAGS) $(CXXFLAGS)
OBJ = o
LINK = $(CXX) -o
LINK_OPTS = -L. $(LDFLAGS)
@@ -39,7 +39,8 @@ LIBRARY_LINK = $(CC) -o
SHORT_LIB_SUFFIX= so.$(shell expr $($(NAME)_VERSION_CURRENT) - $($(NAME)_VERSION_AGE))
LIB_SUFFIX = $(SHORT_LIB_SUFFIX).$($(NAME)_VERSION_AGE).$($(NAME)_VERSION_REVISION)
LIBRARY_LINK_OPTS = -shared -Wl,-soname,$(NAME).$(SHORT_LIB_SUFFIX) $(LDFLAGS)
-LIBS_FOR_CONSOLE_APPLICATION =
+LIBS_FOR_CONSOLE_APPLICATION = -L$(OPENSSLLIB) -lssl -lcrypto
LIBS_FOR_GUI_APPLICATION =
+LIBS_FOR_LIVEMEDIA_LIB = -L$(OPENSSLLIB) -lssl -lcrypto
EXE =
INSTALL2 = install_shared_libraries
diff --git a/net/liveMedia/pkg-message b/net/liveMedia/pkg-message
deleted file mode 100644
index 726774ebe0a7..000000000000
--- a/net/liveMedia/pkg-message
+++ /dev/null
@@ -1,9 +0,0 @@
-[
-{ type: install
- message: <<EOM
-For more documentation on this software
-(and to get the latest version), please
-see <http://www.live555.com/liveMedia/>.
-EOM
-}
-]