Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 25 Nov 2016 00:40:40 +0000 (UTC)
From:      "Carlos J. Puga Medina" <cpm@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r427070 - in branches/2016Q4/devel/libcrossguid: . files
Message-ID:  <201611250040.uAP0ee4r021672@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: cpm
Date: Fri Nov 25 00:40:40 2016
New Revision: 427070
URL: https://svnweb.freebsd.org/changeset/ports/427070

Log:
  MFH: r427007
  
  devel/libcrossguid: Add SONAME, cosmetic fixes
  
  - Add SONAME to libcrossguid.so
  - Cosmetic fixes
  - Bump PORTREVISION
  
  PR:		214499
  Submitted by:	cpm
  Reviewed by:	Mickael Maillot <mickael.maillot@gmail.com> (maintainer), amdmi3 (mentor)
  Approved by:	Mickael Maillot <mickael.maillot@gmail.com> (maintainer), amdmi3 (mentor)
  
  Approved by:	ports-secteam (feld)

Modified:
  branches/2016Q4/devel/libcrossguid/Makefile
  branches/2016Q4/devel/libcrossguid/files/libcrossguid.pc.in
Directory Properties:
  branches/2016Q4/   (props changed)

Modified: branches/2016Q4/devel/libcrossguid/Makefile
==============================================================================
--- branches/2016Q4/devel/libcrossguid/Makefile	Thu Nov 24 21:40:15 2016	(r427069)
+++ branches/2016Q4/devel/libcrossguid/Makefile	Fri Nov 25 00:40:40 2016	(r427070)
@@ -2,6 +2,7 @@
 
 PORTNAME=	libcrossguid
 PORTVERSION=	20150803
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	mickael.maillot@gmail.com
@@ -20,18 +21,25 @@ GH_TAGNAME=	8f399e8
 USES=		compiler:c++11-lang pkgconfig
 USE_CXXSTD=	c++11
 CXXFLAGS+=	`pkg-config --cflags uuid`
-PLIST_FILES=	include/guid.h lib/libcrossguid.so libdata/pkgconfig/libcrossguid.pc
+USE_LDCONFIG=	yes
+
+PLIST_FILES=	include/guid.h \
+		lib/libcrossguid.so \
+		lib/libcrossguid.so.0 \
+		libdata/pkgconfig/libcrossguid.pc
 
 post-patch:
-	@${SED} -e 's|%PREFIX%|${PREFIX}|g ; s|%VERSION%|${PORTVERSION}|g' \
+	@${SED} -e 's|%PREFIX%|${PREFIX}|' -e 's|%VERSION%|${PORTVERSION}|' \
 		${FILESDIR}/libcrossguid.pc.in > ${WRKDIR}/libcrossguid.pc
 
 do-build:
-	@cd ${WRKSRC} && ${CXX} ${CXXFLAGS} -shared -fPIC guid.cpp -o libcrossguid.so -DGUID_LIBUUID
+	cd ${WRKSRC} && ${CXX} ${CXXFLAGS} -shared -fPIC -Wl,-soname,libcrossguid.so.0 \
+		-DGUID_LIBUUID -L${LOCALBASE}/lib guid.cpp -o libcrossguid.so.0 -luuid
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/guid.h ${STAGEDIR}${PREFIX}/include
-	${INSTALL_LIB} ${WRKSRC}/libcrossguid.so ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_LIB} ${WRKSRC}/libcrossguid.so.0 ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_DATA} ${WRKDIR}/libcrossguid.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig
+	${LN} -sf libcrossguid.so.0 ${STAGEDIR}${PREFIX}/lib/libcrossguid.so
 
 .include <bsd.port.mk>

Modified: branches/2016Q4/devel/libcrossguid/files/libcrossguid.pc.in
==============================================================================
--- branches/2016Q4/devel/libcrossguid/files/libcrossguid.pc.in	Thu Nov 24 21:40:15 2016	(r427069)
+++ branches/2016Q4/devel/libcrossguid/files/libcrossguid.pc.in	Fri Nov 25 00:40:40 2016	(r427070)
@@ -5,6 +5,5 @@ includedir=${prefix}/include
 Name: libguid
 Description: minimal and cross platform C++ GUID library
 Version: %VERSION%
-Libs: -L${libdir} -lguid
+Libs: -L${libdir} -lcrossguid
 Cflags: -I${includedir}
-



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