From nobody Thu Sep 26 05:27:48 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XDhv90pL4z5YDsc; Thu, 26 Sep 2024 05:27:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XDhv86Sb1z4k1b; Thu, 26 Sep 2024 05:27:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727328468; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WN6aBXZFjIPPu/5C4ChoXE4JepCbQMyjfFDvI8XKEGk=; b=CMR1SD1JZ0G8em/SE4wFpc3hWXYsJQbsSxz4RTwfsTECWFp8Hbf4uNFAo2UnTIHZrwghAN IXJBllKEx78X7R+tTABQw1pD86WumiIRvEkqp1wiZ7wkQGsZiG32IgrztxOxUXiqCWU+xd Y1O9DnfJoAgC0cbrhekd17HJDilHxrqUXBee4B/hdBti29qkb9qtZZruNMJCRoovBM9hsJ pGr6QwHVio9+zYH8m5zNBx9//agiSmZqEZ6URBe0g8JpsB35FW7hrCR4XGWD88FPmxJJ0a a5bK6rW/X7L/FqTUdcHCgc3Zta057QXyosM0n/TA3AufRrZ7olptmhfI0pbFpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727328468; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WN6aBXZFjIPPu/5C4ChoXE4JepCbQMyjfFDvI8XKEGk=; b=BvccSTyxlp8vMYCPIdg+iahjt2mTiuLaXmuGYG09pRmPtVuWatx8g7j1NJfhMgBd9RPjUY GhU4ykzEAaIeFn2K1PBufmGwHqw15tBfIv36DyTZlmZgwU8CuHzvLkOivqGCA5DUhz6tmu DWok3XG09A5o8I2a2UWeaE3BvrKS9FjlTSO6Pe06bjU4r69RgFUdvQ2IsAOTKPQMlQrtRd c7s1OG4EcvQ18BSwF8Kv1UVsMr6TW5E4d84/zWESDV5OUfYquAkCaWUsItrkIFGx2iknty EFk0FTPHubxVifYvV0BBG7wiI3kZgbLbPzXdRgPXRRlMmTax5gSJKnib34lxOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727328468; a=rsa-sha256; cv=none; b=i0cmO9AgEAVzzMd22HSRO3WRCpWuTxhs+oiNr4OZxrCSXX8obYZAoYX+cKy7wTTFKO8B8B ducPODJzOpzuUZ3jn37wUQCbhk79wudLm8QJ2YAzHIadl8MYr3TWLGPW06S7NYDBoxFKv1 gshsNbTQ6WQMH/6dVBLZf+IQ1phivcoo7nXRmQdWahcHM8vlbHsIBv0lFABScsZ5GjAZXG V5FYPvBHqcSHR7sTuz51kTF0Ey0lVYI0+TDHYf13kZzXOG++Wpo0+BDfa/SMOYsdxqJbuX SORShk4A/MhJRRFyasf4AAv+FjGlDWGAJyb6LySbsgYhY4HaTf3JD2HAUKfMHQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XDhv85x3fzk9Y; Thu, 26 Sep 2024 05:27:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48Q5RmWG086436; Thu, 26 Sep 2024 05:27:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48Q5Rm6w086433; Thu, 26 Sep 2024 05:27:48 GMT (envelope-from git) Date: Thu, 26 Sep 2024 05:27:48 GMT Message-Id: <202409260527.48Q5Rm6w086433@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: 5354c31ea1a7 - main - net/liveMedia: Update to 2024.09.25 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5354c31ea1a75fd6c343a44a71347f2ef8adb0a4 Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=5354c31ea1a75fd6c343a44a71347f2ef8adb0a4 commit 5354c31ea1a75fd6c343a44a71347f2ef8adb0a4 Author: Jason E. Hale AuthorDate: 2024-09-26 03:39:11 +0000 Commit: Jason E. Hale 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 . 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 - -.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 @@ -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 -} -]