From nobody Mon Mar 07 18:16:14 2022 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 B772E19F9AF5; Mon, 7 Mar 2022 18:16:15 +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 4KC68v0HTjz3HNS; Mon, 7 Mar 2022 18:16:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646676975; 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=q+p6XpAv6KZbQ5zf0+UDV0UqzaSVSkiJWx1Byxq6IZw=; b=jHrvlqOHZpuD7WZrK1xzFOy4V/cg7yUXlcw9aqVFjqkKosbungVB8fRGdJsaGaHD4tXgit gsoLn0lfU7X6wJFnWP59A/koohOJAkyokI3sqjVR2C7nEr3bNZ2NjFDMoEavVwvzojYpRO tgoaO7e9QCkLMzhTD1fiN3xlp/3+djStBnL4p6wI8Q+hnP/feDKCE+fXqwfmcnMl+UTzgZ xhC0rRMNGIITbERXq8eVkFqEhIy6os5WE7uWSQoaCA+JejfxtoEMoUBDTS0aZDoETbrkXc c2fFReleo7A6sFXGfbX8imLo6fMGnERji6zaLQLqBJPqxAcHuZQJ8uDy/soODA== 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 3D3E153CF; Mon, 7 Mar 2022 18:16:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 227IGELn058793; Mon, 7 Mar 2022 18:16:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 227IGExQ058792; Mon, 7 Mar 2022 18:16:14 GMT (envelope-from git) Date: Mon, 7 Mar 2022 18:16:14 GMT Message-Id: <202203071816.227IGExQ058792@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 62a530d3162e - main - astro/cfitsio: Simplify Makefile 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 62a530d3162e2dc0e95c318a8ed77712e40bc869 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646676975; 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=q+p6XpAv6KZbQ5zf0+UDV0UqzaSVSkiJWx1Byxq6IZw=; b=QTnhUH7T9srDqr5dR3cay3UtgtlaLZ4vm54GxerO36gdpMEJDAkpSLCNAGFIFiW/4K8Y3n agBDh5C28AId3fBvDGJbUJZgyaDQBiEl7uyVBWMajbKLCO91+fxGPWZoKTERy2fkkiUBWy xrH9At6eOkUabZj41cWmqvVuu4fPscgKS1IV2jWxWbZyxzVGSP/zguBw8MsqtzcxI0eq8W 8Hb4GvyuuYJYJ9zzfDn/nbfcMEUCCeUHv9LEfud80DWGF3jN9ovSJAzE3nABuieoU8izLL XQjeK94ucUi0ev58/8zScTiu+rcLxLiIeRdY9xzFECuzNHAKxrXjZMsAC+hjlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646676975; a=rsa-sha256; cv=none; b=FZQCWfNudqHAOMCi3aUeGLxyciCR9kHxPaOT3iadGbUrkFzXEU6XTtrfuwP6z0rAYi/42U NMWIzZPCiImyiZfyHkRUl9tmDKoJUlu1S4SVaRgY4zwZsg5/x8ptCTWLDKcVQx52SGmdQ1 nc0awwJnuFj74UlmnMrSiugCoM5UQesscjTzfv//3LSSViqvLxrmCHa8E1OyO650nnBMKv 8ly7Q3hqA69beh5rQ6UKSTuh4URMwtbnR+NnFNDRaN1QwJBsWKCECwvbajYytzE1ITiDhh aU4tjLBGNzif94hqE4bsObehgCqI/5JDo80eQjL+86iYmLktqQvPIvwiNlnGBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=62a530d3162e2dc0e95c318a8ed77712e40bc869 commit 62a530d3162e2dc0e95c318a8ed77712e40bc869 Author: Po-Chuan Hsieh AuthorDate: 2022-03-07 17:50:09 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-03-07 18:10:54 +0000 astro/cfitsio: Simplify Makefile - Use hard-coded shlib version It helps remind maintainer to bump PORTREVISION of dependent ports. --- astro/cfitsio/Makefile | 13 ++++--------- astro/cfitsio/pkg-plist | 4 ++-- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/astro/cfitsio/Makefile b/astro/cfitsio/Makefile index 79e59239f022..9f2daa893f1f 100644 --- a/astro/cfitsio/Makefile +++ b/astro/cfitsio/Makefile @@ -22,14 +22,9 @@ CONFIGURE_ARGS= ac_cv_prog_FC=f2c GNU_CONFIGURE= yes USE_LDCONFIG= yes -PLIST_SUB= SHLIB_MAJOR=${SHLIB_MAJOR} \ - SHLIB_MINOR=${SHLIB_MINOR} - +PLIST_SUB= PORTVERSION=${PORTVERSION} CPE_VENDOR= nasa -SHLIB_MAJOR= 9 -SHLIB_MINOR= ${PORTVERSION} - OPTIONS_DEFINE= DOCS post-patch: @@ -38,10 +33,10 @@ post-patch: do-install: cd ${WRKSRC}/ && ${INSTALL_DATA} drvrsmem.h fitsio.h fitsio2.h longnam.h ${STAGEDIR}${PREFIX}/include/ ${INSTALL_DATA} ${WRKSRC}/libcfitsio.a ${STAGEDIR}${PREFIX}/lib/ - ${INSTALL_LIB} ${WRKSRC}/libcfitsio.so.${SHLIB_MAJOR}.${SHLIB_MINOR} ${STAGEDIR}${PREFIX}/lib/ + ${INSTALL_LIB} ${WRKSRC}/libcfitsio.so.9.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/ ${INSTALL_DATA} ${WRKSRC}/cfitsio.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/ - ${LN} -fs libcfitsio.so.${SHLIB_MAJOR}.${SHLIB_MINOR} ${STAGEDIR}${PREFIX}/lib/libcfitsio.so.${SHLIB_MAJOR} - ${LN} -fs libcfitsio.so.${SHLIB_MAJOR}.${SHLIB_MINOR} ${STAGEDIR}${PREFIX}/lib/libcfitsio.so + ${LN} -fs libcfitsio.so.9.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libcfitsio.so.9 + ${LN} -fs libcfitsio.so.9.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libcfitsio.so do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR}/ diff --git a/astro/cfitsio/pkg-plist b/astro/cfitsio/pkg-plist index f8ee6e6117a9..c91dfcd3843b 100644 --- a/astro/cfitsio/pkg-plist +++ b/astro/cfitsio/pkg-plist @@ -4,8 +4,8 @@ include/fitsio2.h include/longnam.h lib/libcfitsio.a lib/libcfitsio.so -lib/libcfitsio.so.%%SHLIB_MAJOR%% -lib/libcfitsio.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% +lib/libcfitsio.so.9 +lib/libcfitsio.so.9.%%PORTVERSION%% libdata/pkgconfig/cfitsio.pc %%PORTDOCS%%%%DOCSDIR%%/cfortran.doc %%PORTDOCS%%%%DOCSDIR%%/fitsio.doc