From owner-svn-ports-all@freebsd.org Sun Nov 20 23:54:23 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9A1E3C341E9; Sun, 20 Nov 2016 23:54:23 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5C4776D1; Sun, 20 Nov 2016 23:54:23 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uAKNsMPX039415; Sun, 20 Nov 2016 23:54:22 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAKNsMT1039413; Sun, 20 Nov 2016 23:54:22 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201611202354.uAKNsMT1039413@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Sun, 20 Nov 2016 23:54:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r426652 - head/astro/cfitsio X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Nov 2016 23:54:23 -0000 Author: sunpoet Date: Sun Nov 20 23:54:22 2016 New Revision: 426652 URL: https://svnweb.freebsd.org/changeset/ports/426652 Log: - Use USES=localbase - Cosmetic change Modified: head/astro/cfitsio/Makefile head/astro/cfitsio/pkg-plist Modified: head/astro/cfitsio/Makefile ============================================================================== --- head/astro/cfitsio/Makefile Sun Nov 20 23:54:17 2016 (r426651) +++ head/astro/cfitsio/Makefile Sun Nov 20 23:54:22 2016 (r426652) @@ -19,32 +19,30 @@ LIB_DEPENDS= libf2c.so:lang/f2c OPTIONS_DEFINE= DOCS ALL_TARGET= libcfitsio.a shared -CFLAGS+= -I${INCLUDEDIR} CONFIGURE_ARGS= ac_cv_prog_FC=f2c GNU_CONFIGURE= yes -LIBS+= -L${LIBDIR} -lz MAKE_ARGS= ZLIB_SOURCES="zlib/zcompress.c zlib/zuncompress.c" USE_LDCONFIG= yes -USES= pkgconfig +USES= localbase pkgconfig WRKSRC= ${WRKDIR}/${PORTNAME} -PLIST_SUB= SHLIB_MAJOR_VER=${SHLIB_MAJOR_VER} \ - SHLIB_MINOR_VER=${SHLIB_MINOR_VER} +PLIST_SUB= SHLIB_MAJOR=${SHLIB_MAJOR} \ + SHLIB_MINOR=${SHLIB_MINOR} PORTDOCS= * -SHLIB_MAJOR_VER=5 -SHLIB_MINOR_VER=${PORTVERSION:S|0$||} +SHLIB_MAJOR= 5 +SHLIB_MINOR= ${PORTVERSION:S|0$||} post-patch: @${REINPLACE_CMD} -e 's|||' ${WRKSRC}/*.[chl] ${WRKSRC}/zlib/*.h do-install: cd ${WRKSRC}/ && ${INSTALL_DATA} drvrsmem.h fitsio.h fitsio2.h longnam.h ${STAGEDIR}${PREFIX}/include/ - cd ${WRKSRC}/ && ${INSTALL_DATA} libcfitsio.a ${STAGEDIR}${PREFIX}/lib/ - cd ${WRKSRC}/ && ${INSTALL_LIB} libcfitsio.so.${SHLIB_MAJOR_VER}.${SHLIB_MINOR_VER} ${STAGEDIR}${PREFIX}/lib/ - cd ${WRKSRC}/ && ${INSTALL_DATA} cfitsio.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/ - ${LN} -fs libcfitsio.so.${SHLIB_MAJOR_VER}.${SHLIB_MINOR_VER} ${STAGEDIR}${PREFIX}/lib/libcfitsio.so.${SHLIB_MAJOR_VER} - ${LN} -fs libcfitsio.so.${SHLIB_MAJOR_VER} ${STAGEDIR}${PREFIX}/lib/libcfitsio.so + ${INSTALL_DATA} ${WRKSRC}/libcfitsio.a ${STAGEDIR}${PREFIX}/lib/ + ${INSTALL_LIB} ${WRKSRC}/libcfitsio.so.${SHLIB_MAJOR}.${SHLIB_MINOR} ${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 do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR}/ Modified: head/astro/cfitsio/pkg-plist ============================================================================== --- head/astro/cfitsio/pkg-plist Sun Nov 20 23:54:17 2016 (r426651) +++ head/astro/cfitsio/pkg-plist Sun Nov 20 23:54:22 2016 (r426652) @@ -4,6 +4,6 @@ include/fitsio2.h include/longnam.h lib/libcfitsio.a lib/libcfitsio.so -lib/libcfitsio.so.%%SHLIB_MAJOR_VER%% -lib/libcfitsio.so.%%SHLIB_MAJOR_VER%%.%%SHLIB_MINOR_VER%% +lib/libcfitsio.so.%%SHLIB_MAJOR%% +lib/libcfitsio.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% libdata/pkgconfig/cfitsio.pc