diff --git a/net/liveMedia/Makefile b/net/liveMedia/Makefile index 66f5517e5b54..72aafa53ccf5 100644 --- a/net/liveMedia/Makefile +++ b/net/liveMedia/Makefile @@ -1,50 +1,36 @@ PORTNAME= liveMedia -DISTVERSION= 2024.08.01 +DISTVERSION= 2024.09.25 PORTEPOCH= 2 CATEGORIES= net devel MASTER_SITES= https://download.videolan.org/contrib/live555/ DISTNAME= live.${DISTVERSION} 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 - -.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 + ${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 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 @@ -1,45 +1,46 @@ # 'CURRENT':'REVISION':'AGE' are updated - whenever a library changes - as follows: # The library code changes, but without any changes to the API (i.e., interfaces) => increment REVISION # At least one interface changes, or is removed => CURRENT += 1; REVISION = 0; AGE = 0 # One or more interfaces were added, but no existing interfaces were changed or removed => CURRENT += 1; REVISION = 0; AGE += 1 libliveMedia_VERSION_CURRENT= 16 libliveMedia_VERSION_REVISION= 1 libliveMedia_VERSION_AGE= 0 libliveMedia_LIB_SUFFIX= so.$(shell expr $(libliveMedia_VERSION_CURRENT) - $(libliveMedia_VERSION_AGE)).$(libliveMedia_VERSION_AGE).$(libliveMedia_VERSION_REVISION) libBasicUsageEnvironment_VERSION_CURRENT= 0 libBasicUsageEnvironment_VERSION_REVISION= 1 libBasicUsageEnvironment_VERSION_AGE= 0 libBasicUsageEnvironment_LIB_SUFFIX= so.$(shell expr $(libBasicUsageEnvironment_VERSION_CURRENT) - $(libBasicUsageEnvironment_VERSION_AGE)).$(libBasicUsageEnvironment_VERSION_AGE).$(libBasicUsageEnvironment_VERSION_REVISION) libUsageEnvironment_VERSION_CURRENT= 1 libUsageEnvironment_VERSION_REVISION= 0 libUsageEnvironment_VERSION_AGE= 0 libUsageEnvironment_LIB_SUFFIX= so.$(shell expr $(libUsageEnvironment_VERSION_CURRENT) - $(libUsageEnvironment_VERSION_AGE)).$(libUsageEnvironment_VERSION_AGE).$(libUsageEnvironment_VERSION_REVISION) libgroupsock_VERSION_CURRENT= 1 libgroupsock_VERSION_REVISION= 1 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) CONSOLE_LINK_OPTS = $(LINK_OPTS) 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 -} -]