>Number: 184052 >Category: misc >Synopsis: [patch] print/libharu -- update to 2.3.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Mon Nov 18 14:00:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Pietro Cerutti >Release: >Organization: The FreeBSD Project >Environment: >Description: - Update to 2.3.0 - Inclusion of EXAMPLES >How-To-Repeat:
>Fix: Patch attached with submission follows: Index: Makefile =================================================================== --- Makefile (revision 334173) +++ Makefile (working copy) @@ -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= jlaff...@freebsd.org COMMENT= Haru Free PDF Library -LIB_DEPENDS= png15:${PORTSDIR}/graphics/png +LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-png=${LOCALBASE} -CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15 +OPTIONS_DEFINE= EXAMPLES + 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= * -NO_STAGE= yes +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MEXAMPLES} +CMAKE_ARGS+= -DLIBHPDF_EXAMPLES:BOOL=ON \ + -DEXAMPLESDIR:STRING=share/examples/${PORTNAME} +.endif + 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 <bsd.port.mk> Index: distinfo =================================================================== --- distinfo (revision 334173) +++ distinfo (working copy) @@ -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 Index: files/patch-demo_CMakeLists.txt =================================================================== --- files/patch-demo_CMakeLists.txt (revision 0) +++ files/patch-demo_CMakeLists.txt (working copy) @@ -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) Property changes on: files/patch-demo_CMakeLists.txt ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: files/patch-hpdf_image_png.c =================================================================== --- files/patch-hpdf_image_png.c (revision 334173) +++ files/patch-hpdf_image_png.c (working copy) @@ -1,10 +0,0 @@ ---- src/hpdf_image_png.c.orig 2010-02-08 10:27:51.000000000 +0100 -+++ src/hpdf_image_png.c 2012-05-06 06:53:50.000000000 +0200 -@@ -21,6 +21,7 @@ - - #ifndef LIBHPDF_HAVE_NOPNGLIB - #include <png.h> -+#include <pngpriv.h> - - static void - PngErrorFunc (png_structp png_ptr, Index: pkg-plist =================================================================== --- pkg-plist (revision 334173) +++ pkg-plist (working copy) @@ -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_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_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_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%% >Release-Note: >Audit-Trail: >Unformatted: _______________________________________________ freebsd-bugs@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-bugs To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
