From owner-svn-ports-head@FreeBSD.ORG Mon Aug 25 15:12:11 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EF1FDA94; Mon, 25 Aug 2014 15:12:11 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C093736D8; Mon, 25 Aug 2014 15:12:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PFCBre053603; Mon, 25 Aug 2014 15:12:11 GMT (envelope-from adamw@FreeBSD.org) Received: (from adamw@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PFCBaW053600; Mon, 25 Aug 2014 15:12:11 GMT (envelope-from adamw@FreeBSD.org) Message-Id: <201408251512.s7PFCBaW053600@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: adamw set sender to adamw@FreeBSD.org using -f From: Adam Weinberger Date: Mon, 25 Aug 2014 15:12:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r366086 - in head/textproc/pugixml: . files 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.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 15:12:12 -0000 Author: adamw Date: Mon Aug 25 15:12:10 2014 New Revision: 366086 URL: http://svnweb.freebsd.org/changeset/ports/366086 QAT: https://qat.redports.org/buildarchive/r366086/ Log: Install both the shared and static library. Approved by: maintainer Added: head/textproc/pugixml/files/ head/textproc/pugixml/files/patch-scripts__CMakeLists.txt (contents, props changed) head/textproc/pugixml/pkg-plist (contents, props changed) Modified: head/textproc/pugixml/Makefile Modified: head/textproc/pugixml/Makefile ============================================================================== --- head/textproc/pugixml/Makefile Mon Aug 25 15:11:46 2014 (r366085) +++ head/textproc/pugixml/Makefile Mon Aug 25 15:12:10 2014 (r366086) @@ -13,6 +13,4 @@ LICENSE= MIT USES= cmake CMAKE_SOURCE_PATH= ${WRKSRC}/scripts -PLIST_FILES= include/pugiconfig.hpp include/pugixml.hpp lib/libpugixml.a - .include Added: head/textproc/pugixml/files/patch-scripts__CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/pugixml/files/patch-scripts__CMakeLists.txt Mon Aug 25 15:12:10 2014 (r366086) @@ -0,0 +1,20 @@ +--- ./scripts/CMakeLists.txt.orig 2014-08-23 08:28:21.562183999 -0400 ++++ ./scripts/CMakeLists.txt 2014-08-23 08:41:29.301439998 -0400 +@@ -10,13 +10,11 @@ + set(HEADERS ../src/pugixml.hpp ../src/pugiconfig.hpp) + set(SOURCES ${HEADERS} ../src/pugixml.cpp) + +-if(BUILD_SHARED_LIBS) +- add_library(pugixml SHARED ${SOURCES}) +-else() +- add_library(pugixml STATIC ${SOURCES}) +-endif() ++add_library(pugixml SHARED ${SOURCES}) ++add_library(pugixml_static STATIC ${SOURCES}) + + set_target_properties(pugixml PROPERTIES VERSION 1.4 SOVERSION 1) ++set_target_properties(pugixml_static PROPERTIES OUTPUT_NAME pugixml) + +-install(TARGETS pugixml LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++install(TARGETS pugixml pugixml_static LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + install(FILES ${HEADERS} DESTINATION include) Added: head/textproc/pugixml/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/pugixml/pkg-plist Mon Aug 25 15:12:10 2014 (r366086) @@ -0,0 +1,6 @@ +include/pugiconfig.hpp +include/pugixml.hpp +lib/libpugixml.a +lib/libpugixml.so +lib/libpugixml.so.1 +lib/libpugixml.so.1.4