From nobody Sun Apr 14 19:53:49 2024 X-Original-To: dev-commits-ports-main@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 4VHgwY6FnZz5Gxx0; Sun, 14 Apr 2024 19:53: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VHgwY2ySRz4mWH; Sun, 14 Apr 2024 19:53:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713124429; 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=a0Uxqmanlx9IjmOXc6DOQqpOZMlJT88TgVCMnvHcuIo=; b=YPL3h8gqFYOc8GyO4NrwTtOMVYW+3NY2yfdLDtNqey7+bNVGDeZ2KjhB3i3+HK6rTZqneP pInt1yu9h0sRDpudTKEFSbvt6JqeQ41j/tb4SDEYCdtKpr7SPUMtghO5cOLhBx4M4LGRJT tIP5qdaI7qkmb83GRQkPmPXx+bNSrc1wc5oEiDu9Mq2V94WQj2+FhBEYjgatbd3citzV0E zMAD8QwFA8/byNcQcEpBFzAlFuAUU69NNXkHQe5Idcaos7M79VW9i7f2xbdg9r27cuHSCt QHdK8yzJHYMb7Td3dCwr839NyRAWORsbj+xxV6E70zrN40eudKOSdi1pZUai0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713124429; a=rsa-sha256; cv=none; b=AS8IzCczeu28No/bMTRVftBbsr0UWuoXr0q8o/aTBwblms9hwKLyolNKv/DQXXu7MeoJ4i 0ewIx7VgNfNmJMYTnjvJgYphsopzMOqmUrWdgtqwg70im+xLOa3i6jkmP/ZKUnZ8Fe8Mrq 9IbBydHekAUEFvBnCFtCUq+9oqy4/3F+jbNpdGi+vFsBwE5IArhyPdu7DEpasGnzHSs6hZ ozHRpFgEvi2o4zTbJRDHPH8Mnx3Gw2ngSbQ5p21Umz9BcM0IDX6sni3GDlqxCTtCDs6B1j kgrxUJp1DLj3wRRiOaJ3F4Nc3tXxTLD3mYsjA31KGeXYx4xLUNaqOKuGjWVZ3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713124429; 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=a0Uxqmanlx9IjmOXc6DOQqpOZMlJT88TgVCMnvHcuIo=; b=h7hlEr+xYHbgk/+HIt5z/VeWSTV9Nb32D5+a4aEUcYCEgXk6yln7iCkdrNs9jChaw113GN y0VsblPaW5H5+fW/92QOdxpY5AsVvHeOeTQkFZhDhd6sh9dc459E0YJbektwUiC+IGRwmz J/siWnF557ZTN/v0WMehwALu0UQ9sTBLVBP1b8jVB4ppgG1XJ8BmF+kXcET6Si/Jgl6IKw M366cz41YYkYvWO3nZaX1H84PEzv47aYmQNTq/ZBfWHcaVI7jf4hbjWqwixWLTnSAyXF2J 4oMV9yhffTOSxIs3GuBo9XUiPeXH8ksSSUstGSPoG8MPOnarvuMZsOXNaOtVDQ== 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 4VHgwY2VFqzV5M; Sun, 14 Apr 2024 19:53:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43EJrnmD023810; Sun, 14 Apr 2024 19:53:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43EJrn6d023808; Sun, 14 Apr 2024 19:53:49 GMT (envelope-from git) Date: Sun, 14 Apr 2024 19:53:49 GMT Message-Id: <202404141953.43EJrn6d023808@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 23fc1486dcc2 - main - converters/libb64: Switch to maintained fork and update to commit 382c274 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 23fc1486dcc2f0b3ab18541f005b237e3d05e2ee Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=23fc1486dcc2f0b3ab18541f005b237e3d05e2ee commit 23fc1486dcc2f0b3ab18541f005b237e3d05e2ee Author: Daniel Engberg AuthorDate: 2024-04-14 19:26:39 +0000 Commit: Daniel Engberg CommitDate: 2024-04-14 19:52:59 +0000 converters/libb64: Switch to maintained fork and update to commit 382c274 * Switch to CMake Changelog: https://github.com/stefantalpalaru/libb64/compare/v1.2.1...382c274 PR: 277919 Approved by: portmgr (maintainer timeout, 2+ weeks) --- converters/libb64/Makefile | 26 ++++++++++--------- converters/libb64/distinfo | 5 ++-- converters/libb64/files/patch-src_Makefile | 40 ------------------------------ converters/libb64/pkg-plist | 13 +++++++++- 4 files changed, 29 insertions(+), 55 deletions(-) diff --git a/converters/libb64/Makefile b/converters/libb64/Makefile index b93acd881d21..a3e95857a655 100644 --- a/converters/libb64/Makefile +++ b/converters/libb64/Makefile @@ -1,24 +1,26 @@ PORTNAME= libb64 -PORTVERSION= 1.2.1 +DISTVERSION= 2.0.0-15 CATEGORIES= converters mail MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME} MAINTAINER= ismail.yenigul@surgate.com COMMENT= Library for fast Base64 encoding and decoding -WWW= https://libb64.sourceforge.net/ +WWW= https://github.com/stefantalpalaru/libb64 -BUILD_DEPENDS= makedepend:devel/makedepend +LICENSE= MIT -USES= gmake zip -ALL_TARGET= all_src +USES= cmake:testing USE_LDCONFIG= yes -do-install: - ${INSTALL_DATA} ${WRKSRC}/src/libb64.a ${STAGEDIR}${PREFIX}/lib - ${INSTALL_LIB} ${WRKSRC}/src/libb64.so.0 ${STAGEDIR}${PREFIX}/lib - ${LN} -fs libb64.so.0 ${STAGEDIR}${PREFIX}/lib/libb64.so - @${MKDIR} ${STAGEDIR}${PREFIX}/include/b64 - ${INSTALL_DATA} ${WRKSRC}/include/b64/*.h \ - ${STAGEDIR}${PREFIX}/include/b64 +USE_GITHUB= yes +GH_ACCOUNT= stefantalpalaru +GH_TAGNAME= 382c274 + +CMAKE_TESTING_ON= LIBB64_BUILD_EXAMPLES LIBB64_ENABLE_TESTS +CMAKE_OFF= LIBB64_BUILD_EXAMPLES LIBB64_BUILD_PROGRAMS LIBB64_ENABLE_TESTS +CMAKE_ON= LIBB64_SHARED + +post-install: + ${RLN} ${STAGEDIR}${PREFIX}/lib/libb64.so ${STAGEDIR}${PREFIX}/lib/libb64.so.0 .include diff --git a/converters/libb64/distinfo b/converters/libb64/distinfo index 707945707cb3..8386204aa7fa 100644 --- a/converters/libb64/distinfo +++ b/converters/libb64/distinfo @@ -1,2 +1,3 @@ -SHA256 (libb64-1.2.1.zip) = 20106f0ba95cfd9c35a13c71206643e3fb3e46512df3e2efb2fdbf87116314b2 -SIZE (libb64-1.2.1.zip) = 23316 +TIMESTAMP = 1711281226 +SHA256 (stefantalpalaru-libb64-2.0.0-15-382c274_GH0.tar.gz) = d317f7db8c000b6e268b4b4efaee72e892abbb188c4581a64b157221d2d461ca +SIZE (stefantalpalaru-libb64-2.0.0-15-382c274_GH0.tar.gz) = 25074 diff --git a/converters/libb64/files/patch-src_Makefile b/converters/libb64/files/patch-src_Makefile deleted file mode 100644 index 4d6e71375ef8..000000000000 --- a/converters/libb64/files/patch-src_Makefile +++ /dev/null @@ -1,40 +0,0 @@ ---- src/Makefile.orig 2013-06-18 12:49:36 UTC -+++ src/Makefile -@@ -1,9 +1,10 @@ --LIBRARIES = libb64.a -+LIBRARIES = libb64.a libb64.so -+SOVERSION ?= 0 - - # Build flags (uncomment one) - ############################# - # Release build flags --CFLAGS += -O3 -+#CFLAGS += -O3 - ############################# - # Debug build flags - #CFLAGS += -g -@@ -15,7 +16,7 @@ TARGETS = $(LIBRARIES) - - LINK.o = gcc - --CFLAGS += -Werror -pedantic -+CFLAGS += -Werror -pedantic -fsigned-char - CFLAGS += -I../include - - vpath %.h ../include/b64 -@@ -27,6 +28,15 @@ all: $(TARGETS) #strip - libb64.a: cencode.o cdecode.o - $(AR) $(ARFLAGS) $@ $^ - -+libb64.so.$(SOVERSION): cencode.So cdecode.So -+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname,$@ -o $@ $^ -+ -+%.So: %.c -+ $(CC) -fPIC -c $(CFLAGS) $(CPPFLAGS) $< -o $@ -+ -+%.so: %.so.$(SOVERSION) -+ ln -fs $< $@ -+ - strip: - strip $(BINARIES) *.exe - diff --git a/converters/libb64/pkg-plist b/converters/libb64/pkg-plist index c0fcae5aee6a..05233831c285 100644 --- a/converters/libb64/pkg-plist +++ b/converters/libb64/pkg-plist @@ -1,7 +1,18 @@ +include/b64/ccommon.h include/b64/cdecode.h include/b64/cencode.h include/b64/decode.h include/b64/encode.h -lib/libb64.a +lib/cmake/libb64/libb64-config-version.cmake +lib/cmake/libb64/libb64-config.cmake +lib/cmake/libb64/libb64-targets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/libb64/libb64-targets.cmake lib/libb64.so lib/libb64.so.0 +%%DOCSDIR%%/AUTHORS.md +%%DOCSDIR%%/BENCHMARKS.md +%%DOCSDIR%%/CHANGELOG.md +%%DOCSDIR%%/INSTALL.md +%%DOCSDIR%%/LICENSE.md +%%DOCSDIR%%/README.md +%%DOCSDIR%%/TODO.md