From owner-svn-ports-all@FreeBSD.ORG Fri Feb 14 15:09:31 2014 Return-Path: Delivered-To: svn-ports-all@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 956B0C7B; Fri, 14 Feb 2014 15:09:31 +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 80B821227; Fri, 14 Feb 2014 15:09:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1EF9VIF088520; Fri, 14 Feb 2014 15:09:31 GMT (envelope-from gahr@svn.freebsd.org) Received: (from gahr@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1EF9UOE088512; Fri, 14 Feb 2014 15:09:30 GMT (envelope-from gahr@svn.freebsd.org) Message-Id: <201402141509.s1EF9UOE088512@svn.freebsd.org> From: Pietro Cerutti Date: Fri, 14 Feb 2014 15:09:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r344246 - in head/print/libharu: . 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-all@freebsd.org X-Mailman-Version: 2.1.17 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: Fri, 14 Feb 2014 15:09:31 -0000 Author: gahr Date: Fri Feb 14 15:09:30 2014 New Revision: 344246 URL: http://svnweb.freebsd.org/changeset/ports/344246 QAT: https://qat.redports.org/buildarchive/r344246/ Log: - Update to 2.3.0 PR: 184052 Submitted by: gahr Approved by: maintainer (timeout) Added: head/print/libharu/files/patch-demo_CMakeLists.txt (contents, props changed) Deleted: head/print/libharu/files/patch-hpdf_image_png.c Modified: head/print/libharu/Makefile head/print/libharu/distinfo head/print/libharu/pkg-plist Modified: head/print/libharu/Makefile ============================================================================== --- head/print/libharu/Makefile Fri Feb 14 15:03:54 2014 (r344245) +++ head/print/libharu/Makefile Fri Feb 14 15:09:30 2014 (r344246) @@ -2,28 +2,38 @@ # $FreeBSD$ PORTNAME= libharu -PORTVERSION= 2.2.1 -PORTREVISION= 1 +PORTVERSION= 2.3.0 CATEGORIES= print -MASTER_SITES= http://libharu.org/files/ MAINTAINER= jlaffaye@FreeBSD.org COMMENT= Haru Free PDF Library -LIB_DEPENDS= png15:${PORTSDIR}/graphics/png +LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png + +OPTIONS_DEFINE= EXAMPLES -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-png=${LOCALBASE} -CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15 USE_LDCONFIG= yes +USES+= cmake:outsource +CMAKE_ARGS+= -DDEVPAK:BOOL=ON + +USE_GITHUB= yes +GH_ACCOUNT= libharu +GH_TAGNAME= RELEASE_2_3_0 +GH_COMMIT= 4ae1d5f SOVERSION= 2 -PLIST_SUB+= PORTVERSION=${PORTVERSION} \ - SOVERSION=${SOVERSION} +PLIST_SUB+= SOVERSION=${SOVERSION} +PORTEXAMPLES= * + +.include + +.if ${PORT_OPTIONS:MEXAMPLES} +CMAKE_ARGS+= -DLIBHPDF_EXAMPLES:BOOL=ON \ + -DEXAMPLESDIR:STRING=share/examples/${PORTNAME} +.endif -NO_STAGE= yes post-install: - ${LN} -s ${PREFIX}/lib/libhpdf-${PORTVERSION}.so \ - ${PREFIX}/lib/libhpdf.so.${SOVERSION} + ${LN} -s ${PREFIX}/lib/libhpdf.so \ + ${STAGEDIR}${PREFIX}/lib/libhpdf.so.${SOVERSION} .include Modified: head/print/libharu/distinfo ============================================================================== --- head/print/libharu/distinfo Fri Feb 14 15:03:54 2014 (r344245) +++ head/print/libharu/distinfo Fri Feb 14 15:09:30 2014 (r344246) @@ -1,2 +1,2 @@ -SHA256 (libharu-2.2.1.tar.gz) = 45fd57044042c0e290ad0f11fc19eeb31b50c4b9edadf9d89dd5a7d9ae4865a7 -SIZE (libharu-2.2.1.tar.gz) = 967530 +SHA256 (libharu-2.3.0.tar.gz) = 05d21b32baaa2780b2eae45c7958684239b64560063de229714a8729911ca87e +SIZE (libharu-2.3.0.tar.gz) = 1396376 Added: head/print/libharu/files/patch-demo_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/print/libharu/files/patch-demo_CMakeLists.txt Fri Feb 14 15:09:30 2014 (r344246) @@ -0,0 +1,21 @@ +--- demo/CMakeLists.txt.orig 2013-11-18 14:51:59.000000000 +0100 ++++ demo/CMakeLists.txt 2013-11-18 14:52:21.000000000 +0100 +@@ -86,15 +86,15 @@ + # ======================================================================= + install( + TARGETS ${demos_NAMES} ${demos_with_grid_NAMES} grid_sheet +- DESTINATION demo ++ DESTINATION ${EXAMPLESDIR} + ) + foreach(demo ${demos_NAMES} ${demos_with_grid_NAMES} grid_sheet) +- install(FILES ${demo}.c DESTINATION demo) ++ install(FILES ${demo}.c DESTINATION ${EXAMPLESDIR}) + endforeach(demo) + + # install demo files + install( + DIRECTORY images mbtext pngsuite rawimage ttfont type1 +- DESTINATION demo ++ DESTINATION ${EXAMPLESDIR} + ) + endif(LIBHPDF_EXAMPLES) Modified: head/print/libharu/pkg-plist ============================================================================== --- head/print/libharu/pkg-plist Fri Feb 14 15:03:54 2014 (r344245) +++ head/print/libharu/pkg-plist Fri Feb 14 15:09:30 2014 (r344246) @@ -1,4 +1,5 @@ include/hpdf.h +include/hpdf_3dmeasure.h include/hpdf_annotation.h include/hpdf_catalog.h include/hpdf_conf.h @@ -10,6 +11,7 @@ include/hpdf_encoder.h include/hpdf_encrypt.h include/hpdf_encryptdict.h include/hpdf_error.h +include/hpdf_exdata.h include/hpdf_ext_gstate.h include/hpdf_font.h include/hpdf_fontdef.h @@ -18,7 +20,6 @@ include/hpdf_image.h include/hpdf_info.h include/hpdf_list.h include/hpdf_mmgr.h -include/hpdf_namedict.h include/hpdf_objects.h include/hpdf_outline.h include/hpdf_page_label.h @@ -29,8 +30,6 @@ include/hpdf_types.h include/hpdf_u3d.h include/hpdf_utils.h include/hpdf_version.h -lib/libhpdf-%%PORTVERSION%%.so -lib/libhpdf.a -lib/libhpdf.la +lib/libhpdfs.a lib/libhpdf.so lib/libhpdf.so.%%SOVERSION%%