From nobody Sun Apr 07 16:51:13 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 4VCJC63tzsz5H7bQ; Sun, 7 Apr 2024 16:51:14 +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 4VCJC61q3xz4L4m; Sun, 7 Apr 2024 16:51:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712508674; 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=kTC/BnF99mPzYHV5vnttRll/lD/HjSqYJR9NNWuL5CE=; b=ZigIzf6lr8s96IX47Cm8eWAr4MXtYCgNSY93DZGYeJqmGr5VKdduyN0t0PGP4jhZeJOZA+ cT1I06OfEnCgb3JFRxuo4jSy67JI40Z3xzcXsxpEt41jvmXSBPei8M5+eDuMC4Y5uoqQDS UGezTP1XIzUyA98HHECd42au2riCdRq76GqEOQ89t20zWq+3yVnJgnqv9uBVwgXILFzfLs MPR1KE3aoEimrF0nCXPnJA5MwGs+E8usLKXQ8nqYGiBuoPrA2ld6e+YmZXombousaUq60o nf96yKPjNXIMl0FHqQWs31DdAilTL4mGm1bE0/8UUn+5yW4KWhbhDJ0mkTgiLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712508674; a=rsa-sha256; cv=none; b=QnPpWi5El6eAbx+B3+2/kJLsO9CKs++AfbBbhLPkI/tmA32zT/PMzLv4kKc0lmEKAb+iXn cxXhyhd42PxSjj+/+OW4kZcYa4zMOgGK0HM6i/bbZjJP44GxYwMgCR9rD1CmqoQ5c/nREO lq07qzPMKIgfR7bow36OAnfkek9TNxY15ngRd2gHm0Vdobg5M/+3u6qmHYOusjEPYNTZzZ S/fXBPiAmZF/c6pOI9Rfr588Hyj0jlNJST+rAVmkqUXxopYvA9Aq7U2Tq0ALtHzwjj5o+7 9q/C3XdZp5gQBwJUng5msgkmivRb8WjkakJJXm+CiHfdw5w4UXN3xqORPT+cbw== 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=1712508674; 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=kTC/BnF99mPzYHV5vnttRll/lD/HjSqYJR9NNWuL5CE=; b=ci9dQ0Ket2UeclIq4LGihWYiVukkx/cFp2m28wRg4O2J+aJ9Lf0L+2+GeKm5OMsvDQVRZL bZjVqT7kUSAMneuhz3vIMIlh0VCfzTIiLkrK1DfDdEYjnSF0zTlWObsYaMhsOFc/po1HRq QOYnk43hwm0PRoSO/D7PYFgpMUPatvO5E2pp4M8P+AMdl/Ib3PkCOfqRucs1Q58wcp1tEK UMI/lsjVqhr1gAH0DYAieGF+0TgoxrPn3Q+no7AWJWDxIILgsM7+G6iSvRvQzojXLEA6wD 0iYGOb/pOvuoyHqqpPPTwDfiSKxRYNnYfhEQfKNZwxXiG9BjoHMqqkmNhlnNeA== 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 4VCJC60g92zc1t; Sun, 7 Apr 2024 16:51:14 +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 437GpDol020042; Sun, 7 Apr 2024 16:51:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 437GpDDO020039; Sun, 7 Apr 2024 16:51:13 GMT (envelope-from git) Date: Sun, 7 Apr 2024 16:51:13 GMT Message-Id: <202404071651.437GpDDO020039@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: ab0d5c811bbb - main - archivers/snappy: Improve port 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: Sender: owner-dev-commits-ports-main@freebsd.org 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: ab0d5c811bbb3ea28b023b5d6d37871078cd100f Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=ab0d5c811bbb3ea28b023b5d6d37871078cd100f commit ab0d5c811bbb3ea28b023b5d6d37871078cd100f Author: Daniel Engberg AuthorDate: 2024-04-07 16:04:35 +0000 Commit: Daniel Engberg CommitDate: 2024-04-07 16:50:07 +0000 archivers/snappy: Improve port * Convert from PORTVERSION to DISTVERSION * Define LICENSE_FILE * Remove CMAKE_BUILD_TYPE * Use = instead of += for PLIST_SUB, SUB_FILES, SUB_LIST * Rearrange port for better readability PR: 278228 Reviewed by: vanilla (maintainer) --- archivers/snappy/Makefile | 24 ++++++++++++++---------- archivers/snappy/files/snappy.pc.in | 2 +- archivers/snappy/pkg-plist | 2 +- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/archivers/snappy/Makefile b/archivers/snappy/Makefile index 010babcbf1f4..074e745ee6dd 100644 --- a/archivers/snappy/Makefile +++ b/archivers/snappy/Makefile @@ -1,6 +1,5 @@ PORTNAME= snappy -PORTVERSION= 1.2.0 -PORTREVISION= 0 +DISTVERSION= 1.2.0 CATEGORIES= archivers MAINTAINER= vanilla@FreeBSD.org @@ -8,22 +7,27 @@ COMMENT= Fast compressor/decompressor library WWW= https://google.github.io/snappy/ LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/COPYING USES= cmake compiler:c++11-lang cpe -USE_LDCONFIG= yes -CMAKE_ON= BUILD_SHARED_LIBS -CMAKE_OFF= SNAPPY_BUILD_TESTS SNAPPY_BUILD_BENCHMARKS -CMAKE_BUILD_TYPE= Release CPE_VENDOR= google +USE_LDCONFIG= yes + USE_GITHUB= yes GH_ACCOUNT= google -PLIST_SUB+= PORTVERSION=${PORTVERSION} -SUB_FILES+= snappy.pc -SUB_LIST+= PORTVERSION=${PORTVERSION} + PIE_UNSAFE= yes +PLIST_SUB= DISTVERSION=${DISTVERSION} +SUB_FILES= snappy.pc +SUB_LIST= DISTVERSION=${DISTVERSION} + +CMAKE_OFF= SNAPPY_BUILD_BENCHMARKS \ + SNAPPY_BUILD_TESTS +CMAKE_ON= BUILD_SHARED_LIBS + post-install: - @${STRIP_CMD} ${STAGEDIR}${LOCALBASE}/lib/libsnappy.so.${PORTVERSION} + @${STRIP_CMD} ${STAGEDIR}${LOCALBASE}/lib/libsnappy.so.${DISTVERSION} ${INSTALL_DATA} ${WRKDIR}/snappy.pc ${STAGEDIR}${LOCALBASE}/libdata/pkgconfig .include diff --git a/archivers/snappy/files/snappy.pc.in b/archivers/snappy/files/snappy.pc.in index 8957d6fc2869..1839981c155d 100644 --- a/archivers/snappy/files/snappy.pc.in +++ b/archivers/snappy/files/snappy.pc.in @@ -5,6 +5,6 @@ includedir=${prefix}/include Name: snappy Description: A fast compression/decompression library -Version: %%PORTVERSION%% +Version: %%DISTVERSION%% Libs: -L${libdir} -lsnappy Cflags: -I${includedir} diff --git a/archivers/snappy/pkg-plist b/archivers/snappy/pkg-plist index 8eca7d24cf00..2d1cdf9f8f90 100644 --- a/archivers/snappy/pkg-plist +++ b/archivers/snappy/pkg-plist @@ -9,5 +9,5 @@ lib/cmake/Snappy/SnappyTargets.cmake lib/libsnappy.a lib/libsnappy.so lib/libsnappy.so.1 -lib/libsnappy.so.%%PORTVERSION%% +lib/libsnappy.so.%%DISTVERSION%% libdata/pkgconfig/snappy.pc