Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 20 Nov 2016 23:54:22 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r426652 - head/astro/cfitsio
Message-ID:  <201611202354.uAKNsMT1039413@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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|<malloc.h>|<stdlib.h>|' ${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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611202354.uAKNsMT1039413>