From owner-svn-ports-head@FreeBSD.ORG  Wed Feb  5 20:02:27 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E7522AAA;
 Wed,  5 Feb 2014 20:02:27 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id B7E8512CE;
 Wed,  5 Feb 2014 20:02:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s15K2Rjo017498;
 Wed, 5 Feb 2014 20:02:27 GMT (envelope-from sunpoet@svn.freebsd.org)
Received: (from sunpoet@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s15K2RsF017495;
 Wed, 5 Feb 2014 20:02:27 GMT (envelope-from sunpoet@svn.freebsd.org)
Message-Id: <201402052002.s15K2RsF017495@svn.freebsd.org>
From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
Date: Wed, 5 Feb 2014 20:02:27 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r342829 - 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-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 05 Feb 2014 20:02:28 -0000

Author: sunpoet
Date: Wed Feb  5 20:02:27 2014
New Revision: 342829
URL: http://svnweb.freebsd.org/changeset/ports/342829
QAT: https://qat.redports.org/buildarchive/r342829/

Log:
  - Fix shared library installation
  - Bump PORTREVISION for package change
  - While I'm here, convert to new LIB_DEPENDS format
  
  PR:		ports/185951
  Submitted by:	Florian Degner <f.degner@gmx.de>

Modified:
  head/astro/cfitsio/Makefile
  head/astro/cfitsio/pkg-plist

Modified: head/astro/cfitsio/Makefile
==============================================================================
--- head/astro/cfitsio/Makefile	Wed Feb  5 19:56:17 2014	(r342828)
+++ head/astro/cfitsio/Makefile	Wed Feb  5 20:02:27 2014	(r342829)
@@ -3,6 +3,7 @@
 
 PORTNAME=	cfitsio
 PORTVERSION=	3.350
+PORTREVISION=	1
 CATEGORIES=	astro
 MASTER_SITES=	http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/ \
 		http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/oldvers/ \
@@ -27,18 +28,21 @@ USE_LDCONFIG=	yes
 USES=		pkgconfig
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
+PLIST_SUB=	SHLIB_VER=${SHLIB_VER}
 PORTDOCS=	*
 
+SHLIB_VER=	1.${PORTVERSION:S/0$//}
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|="\.so"|=".so.0"|g' ${WRKSRC}/configure
 	@${MV} ${WRKSRC}/zlib.h ${WRKSRC}/zlib.h.dist
 	@${GREP} -lR "<malloc.\h>" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e 's|<malloc\.h>|<stdlib.h>|g'
 
 do-install:
 	cd ${WRKSRC}/ && ${INSTALL_DATA} drvrsmem.h fitsio.h fitsio2.h longnam.h ${STAGEDIR}${PREFIX}/include/
-	cd ${WRKSRC}/ && ${INSTALL_LIB} libcfitsio.so.0 ${STAGEDIR}${PREFIX}/lib/
+	cd ${WRKSRC}/ && ${INSTALL_LIB} libcfitsio.so.${SHLIB_VER} ${STAGEDIR}${PREFIX}/lib/
 	cd ${WRKSRC}/ && ${INSTALL_DATA} cfitsio.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/
-	${LN} -fs libcfitsio.so.0 ${STAGEDIR}${PREFIX}/lib/libcfitsio.so
+	${LN} -fs libcfitsio.so.${SHLIB_VER} ${STAGEDIR}${PREFIX}/lib/libcfitsio.so.1
+	${LN} -fs libcfitsio.so.1 ${STAGEDIR}${PREFIX}/lib/libcfitsio.so
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/
 	${INSTALL_DATA} ${WRKSRC}/*.doc ${STAGEDIR}${DOCSDIR}/
 

Modified: head/astro/cfitsio/pkg-plist
==============================================================================
--- head/astro/cfitsio/pkg-plist	Wed Feb  5 19:56:17 2014	(r342828)
+++ head/astro/cfitsio/pkg-plist	Wed Feb  5 20:02:27 2014	(r342829)
@@ -3,5 +3,6 @@ include/fitsio.h
 include/fitsio2.h
 include/longnam.h
 lib/libcfitsio.so
-lib/libcfitsio.so.0
+lib/libcfitsio.so.1
+lib/libcfitsio.so.%%SHLIB_VER%%
 libdata/pkgconfig/cfitsio.pc