From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Mar 31 09:20:05 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1A82A106566C for ; Wed, 31 Mar 2010 09:20:05 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id C92138FC28 for ; Wed, 31 Mar 2010 09:20:04 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o2V9K4FS015814 for ; Wed, 31 Mar 2010 09:20:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o2V9K4Vb015813; Wed, 31 Mar 2010 09:20:04 GMT (envelope-from gnats) Resent-Date: Wed, 31 Mar 2010 09:20:04 GMT Resent-Message-Id: <201003310920.o2V9K4Vb015813@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Martin Matuska Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6E367106566C for ; Wed, 31 Mar 2010 09:12:28 +0000 (UTC) (envelope-from mm@mail2.vx.sk) Received: from mail2.vx.sk (neo.vx.sk [188.40.111.84]) by mx1.freebsd.org (Postfix) with ESMTP id BCE3E8FC0A for ; Wed, 31 Mar 2010 09:12:27 +0000 (UTC) Received: from neo.vx.sk (localhost [127.0.0.1]) by mail2.vx.sk (Postfix) with ESMTP id A9210F335; Wed, 31 Mar 2010 11:12:26 +0200 (CEST) Received: from mail2.vx.sk ([127.0.0.1]) by neo.vx.sk (neo.vx.sk [127.0.0.1]) (amavisd-new, port 10024) with LMTP id Byswu84kAG66; Wed, 31 Mar 2010 11:12:19 +0200 (CEST) Received: by mail2.vx.sk (Postfix, from userid 1001) id AF9E5F2ED; Wed, 31 Mar 2010 11:12:19 +0200 (CEST) Message-Id: <20100331091219.AF9E5F2ED@mail2.vx.sk> Date: Wed, 31 Mar 2010 11:12:19 +0200 (CEST) From: Martin Matuska To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: anders@FreeBSD.org Subject: ports/145236: [PATCH] multimedia/libkate: update to 0.3.7 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 Mar 2010 09:20:05 -0000 >Number: 145236 >Category: ports >Synopsis: [PATCH] multimedia/libkate: update to 0.3.7 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Mar 31 09:20:04 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Martin Matuska >Release: FreeBSD 8.0-RELEASE-p2 amd64 >Organization: >Environment: System: FreeBSD neo.vx.sk 8.0-RELEASE-p2 FreeBSD 8.0-RELEASE-p2 #16: Fri Jan 15 21:10:48 CET 2010 >Description: - Update to 0.3.7 - Make HTML docs optional - Fix build with PNG v.14 [1] Added file(s): - files/patch-tools-kpng.c Port maintainer (anders@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99 References: [1] http://code.google.com/p/libkate/issues/detail?id=15 >How-To-Repeat: >Fix: --- libkate-0.3.7.patch begins here --- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/multimedia/libkate/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- Makefile 28 Mar 2010 06:40:50 -0000 1.4 +++ Makefile 31 Mar 2010 09:08:39 -0000 @@ -6,8 +6,7 @@ # PORTNAME= libkate -PORTVERSION= 0.1.12 -PORTREVISION= 3 +PORTVERSION= 0.3.7 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} @@ -23,35 +22,39 @@ USE_GNOME= pkgconfig USE_LDCONFIG= yes -CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include" +CFLAGS+= "-I${LOCALBASE}/include" MAN1= kateenc.1 katedec.1 -OPTIONS= DOXYGEN "Build docs with doxygen (requires TeX, QT, etc.)" off +OPTIONS= DOXYGEN "Build docs with doxygen (requires TeX, QT, etc.)" off \ + HTMLDOCS "Install bundled html documentation" off + +PORTDOCS= * .include -.ifdef(WITH_DOXYGEN || exists(${LOCALBASE}/bin/doxygen)) +.ifdef(WITH_DOXYGEN) BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen -PLIST_SUB+= DOXYGEN="" .else -PLIST_SUB+= DOXYGEN="@comment " +CONFIGURE_ARGS+= --disable-doc .endif post-patch: @${REINPLACE_CMD} -E -e "s|^(katepcdir =).*|\1 ${LOCALBASE}/libdata/pkgconfig|" \ ${WRKSRC}/Makefile.in -.ifdef(NOPORTDOCS) - @${REINPLACE_CMD} -E \ - -e 's|^([[:space:]]*SUBDIRS[[:space:]]*=.*)doc|\1|' \ - ${BUILD_WRKSRC}/Makefile.in -.endif post-install: -.ifdef(NOPORTDOCS) .for f in ${MAN1} ${INSTALL_MAN} ${WRKSRC}/doc/man/${f} ${PREFIX}/man/man1 .endfor +.if !defined(NOPORTDOCS) + ${MKDIR} ${DOCSDIR} +. for FILE in README AUTHORS COPYING THANKS ChangeLog + ${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR} +. endfor +. if defined(WITH_HTMLDOCS) + ${CP} -RPpn ${WRKSRC}/doc/html ${DOCSDIR}/html +. endif .endif .include Index: distinfo =================================================================== RCS file: /home/pcvs/ports/multimedia/libkate/distinfo,v retrieving revision 1.1 diff -u -r1.1 distinfo --- distinfo 18 Oct 2008 17:33:44 -0000 1.1 +++ distinfo 31 Mar 2010 09:08:39 -0000 @@ -1,3 +1,3 @@ -MD5 (libkate-0.1.12.tar.gz) = a4771bbb74fc5b1b61c2d15a8cd6ba90 -SHA256 (libkate-0.1.12.tar.gz) = f74e261ce621729413fd32da9ee4479f598bc456852175edeac897b3fc816618 -SIZE (libkate-0.1.12.tar.gz) = 871941 +MD5 (libkate-0.3.7.tar.gz) = e5c287b4f40498e5bde48c0a52225292 +SHA256 (libkate-0.3.7.tar.gz) = b9af203bb731de961807ad13820911fab57230d42da877336cf98c12c11c3c51 +SIZE (libkate-0.3.7.tar.gz) = 728239 Index: pkg-plist =================================================================== RCS file: /home/pcvs/ports/multimedia/libkate/pkg-plist,v retrieving revision 1.1 diff -u -r1.1 pkg-plist --- pkg-plist 18 Oct 2008 17:33:44 -0000 1.1 +++ pkg-plist 31 Mar 2010 09:08:39 -0000 @@ -1,111 +1,17 @@ +bin/katalyzer bin/katedec bin/kateenc -%%PORTDOCS%%%%DOCSDIR%%/html/Format.html -%%PORTDOCS%%%%DOCSDIR%%/html/HOWTO.html -%%PORTDOCS%%%%DOCSDIR%%/html/Support.html -%%PORTDOCS%%%%DOCSDIR%%/html/annotated.html -%%PORTDOCS%%%%DOCSDIR%%/html/categories.html -%%PORTDOCS%%%%DOXYGEN%%%%DOCSDIR%%/html/classes.html -%%PORTDOCS%%%%DOCSDIR%%/html/config_8h-source.html -%%PORTDOCS%%%%DOCSDIR%%/html/decoding_8c-example.html -%%PORTDOCS%%%%DOCSDIR%%/html/doxygen.css -%%PORTDOCS%%%%DOCSDIR%%/html/doxygen.png -%%PORTDOCS%%%%DOCSDIR%%/html/encoding_8c-example.html -%%PORTDOCS%%%%DOCSDIR%%/html/errors.html -%%PORTDOCS%%%%DOCSDIR%%/html/examples.html -%%PORTDOCS%%%%DOCSDIR%%/html/files.html -%%PORTDOCS%%%%DOCSDIR%%/html/format_0x00.html -%%PORTDOCS%%%%DOCSDIR%%/html/format_0x01.html -%%PORTDOCS%%%%DOCSDIR%%/html/format_0x7f.html -%%PORTDOCS%%%%DOCSDIR%%/html/format_0x80.html -%%PORTDOCS%%%%DOCSDIR%%/html/format_0x81.html -%%PORTDOCS%%%%DOCSDIR%%/html/format_0x82.html -%%PORTDOCS%%%%DOCSDIR%%/html/format_0x83.html -%%PORTDOCS%%%%DOCSDIR%%/html/format_0x84.html -%%PORTDOCS%%%%DOCSDIR%%/html/format_0x85.html -%%PORTDOCS%%%%DOCSDIR%%/html/format_0x86.html -%%PORTDOCS%%%%DOCSDIR%%/html/format_0x87.html -%%PORTDOCS%%%%DOCSDIR%%/html/format_0x88.html -%%PORTDOCS%%%%DOCSDIR%%/html/format_32v.html -%%PORTDOCS%%%%DOCSDIR%%/html/format_bitmap.html -%%PORTDOCS%%%%DOCSDIR%%/html/format_color.html -%%PORTDOCS%%%%DOCSDIR%%/html/format_curve.html -%%PORTDOCS%%%%DOCSDIR%%/html/format_font_range.html -%%PORTDOCS%%%%DOCSDIR%%/html/format_fp.html -%%PORTDOCS%%%%DOCSDIR%%/html/format_motion.html -%%PORTDOCS%%%%DOCSDIR%%/html/format_palette.html -%%PORTDOCS%%%%DOCSDIR%%/html/format_region.html -%%PORTDOCS%%%%DOCSDIR%%/html/format_rle.html -%%PORTDOCS%%%%DOCSDIR%%/html/format_style.html -%%PORTDOCS%%%%DOCSDIR%%/html/format_warp.html -%%PORTDOCS%%%%DOCSDIR%%/html/functions.html -%%PORTDOCS%%%%DOCSDIR%%/html/functions_vars.html -%%PORTDOCS%%%%DOCSDIR%%/html/globals.html -%%PORTDOCS%%%%DOCSDIR%%/html/globals_defs.html -%%PORTDOCS%%%%DOCSDIR%%/html/globals_enum.html -%%PORTDOCS%%%%DOCSDIR%%/html/globals_eval.html -%%PORTDOCS%%%%DOCSDIR%%/html/globals_func.html -%%PORTDOCS%%%%DOCSDIR%%/html/granule.html -%%PORTDOCS%%%%DOCSDIR%%/html/group__comments.html -%%PORTDOCS%%%%DOCSDIR%%/html/group__decoding.html -%%PORTDOCS%%%%DOCSDIR%%/html/group__encoding.html -%%PORTDOCS%%%%DOCSDIR%%/html/group__font.html -%%PORTDOCS%%%%DOCSDIR%%/html/group__granule.html -%%PORTDOCS%%%%DOCSDIR%%/html/group__high.html -%%PORTDOCS%%%%DOCSDIR%%/html/group__info.html -%%PORTDOCS%%%%DOCSDIR%%/html/group__misc.html -%%PORTDOCS%%%%DOCSDIR%%/html/group__ogg__decode.html -%%PORTDOCS%%%%DOCSDIR%%/html/group__ogg__encode.html -%%PORTDOCS%%%%DOCSDIR%%/html/group__packet.html -%%PORTDOCS%%%%DOCSDIR%%/html/group__text.html -%%PORTDOCS%%%%DOCSDIR%%/html/group__tracker.html -%%PORTDOCS%%%%DOCSDIR%%/html/group__version.html -%%PORTDOCS%%%%DOCSDIR%%/html/high_8c-example.html -%%PORTDOCS%%%%DOCSDIR%%/html/index.html -%%PORTDOCS%%%%DOCSDIR%%/html/kate_8h-source.html -%%PORTDOCS%%%%DOCSDIR%%/html/kate_8h.html -%%PORTDOCS%%%%DOCSDIR%%/html/kate__config_8h-source.html -%%PORTDOCS%%%%DOCSDIR%%/html/modules.html -%%PORTDOCS%%%%DOCSDIR%%/html/oggkate_8h-source.html -%%PORTDOCS%%%%DOCSDIR%%/html/oggkate_8h.html -%%PORTDOCS%%%%DOCSDIR%%/html/pages.html -%%PORTDOCS%%%%DOCSDIR%%/html/structkate__bitmap.html -%%PORTDOCS%%%%DOCSDIR%%/html/structkate__color.html -%%PORTDOCS%%%%DOCSDIR%%/html/structkate__comment.html -%%PORTDOCS%%%%DOCSDIR%%/html/tab_b.gif -%%PORTDOCS%%%%DOCSDIR%%/html/structkate__curve.html -%%PORTDOCS%%%%DOCSDIR%%/html/structkate__event.html -%%PORTDOCS%%%%DOCSDIR%%/html/structkate__font__mapping.html -%%PORTDOCS%%%%DOCSDIR%%/html/structkate__font__range.html -%%PORTDOCS%%%%DOCSDIR%%/html/structkate__info.html -%%PORTDOCS%%%%DOCSDIR%%/html/structkate__motion.html -%%PORTDOCS%%%%DOCSDIR%%/html/structkate__packet.html -%%PORTDOCS%%%%DOCSDIR%%/html/structkate__palette.html -%%PORTDOCS%%%%DOCSDIR%%/html/structkate__region.html -%%PORTDOCS%%%%DOCSDIR%%/html/structkate__state.html -%%PORTDOCS%%%%DOCSDIR%%/html/structkate__style.html -%%PORTDOCS%%%%DOCSDIR%%/html/structkate__tracker.html -%%PORTDOCS%%%%DOCSDIR%%/html/tab_l.gif -%%PORTDOCS%%%%DOCSDIR%%/html/tab_r.gif -%%PORTDOCS%%%%DOCSDIR%%/html/tabs.css -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/AUTHORS -%%PORTDOCS%%%%DOCSDIR%%/COPYING -%%PORTDOCS%%%%DOCSDIR%%/THANKS -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog include/kate/kate.h include/kate/kate_config.h include/kate/oggkate.h -lib/libkate.so.1 +lib/libkate.so.3 lib/libkate.so lib/libkate.la lib/libkate.a lib/liboggkate.a lib/liboggkate.la -lib/liboggkate.so.1 +lib/liboggkate.so.3 lib/liboggkate.so libdata/pkgconfig/kate.pc libdata/pkgconfig/oggkate.pc @dirrm include/kate -%%PORTDOCS%%@dirrm %%DOCSDIR%%/html -%%PORTDOCS%%@dirrm %%DOCSDIR%% Index: files/patch-tools-kpng.c =================================================================== RCS file: files/patch-tools-kpng.c diff -N files/patch-tools-kpng.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-tools-kpng.c 31 Mar 2010 09:08:39 -0000 @@ -0,0 +1,36 @@ +--- tools/kpng.c.old 2010-02-06 03:57:36.000000000 -0200 ++++ tools/kpng.c 2010-02-06 03:57:55.000000000 -0200 +@@ -179,13 +179,13 @@ + } + } + +- png_destroy_read_struct(&png_ptr,&info_ptr,png_infopp_NULL); ++ png_destroy_read_struct(&png_ptr,&info_ptr,NULL); + fclose(f); + + return 0; + + error: +- if (png_ptr) png_destroy_read_struct(&png_ptr,info_ptr?&info_ptr:png_infopp_NULL,png_infopp_NULL); ++ if (png_ptr) png_destroy_read_struct(&png_ptr,info_ptr?&info_ptr:NULL,NULL); + if (f) fclose(f); + return -1; + } +@@ -224,7 +224,7 @@ + if (w) *w=png_get_image_width(png_ptr,info_ptr); + if (h) *h=png_get_image_height(png_ptr,info_ptr); + +- png_destroy_read_struct(&png_ptr,&info_ptr,png_infopp_NULL); ++ png_destroy_read_struct(&png_ptr,&info_ptr,NULL); + + /* now read the whole file as a binary blob */ + fseek(f,0,SEEK_END); +@@ -246,7 +246,7 @@ + return 0; + + error: +- if (png_ptr) png_destroy_read_struct(&png_ptr,info_ptr?&info_ptr:png_infopp_NULL,png_infopp_NULL); ++ if (png_ptr) png_destroy_read_struct(&png_ptr,info_ptr?&info_ptr:NULL,NULL); + if (f) fclose(f); + return -1; + } --- libkate-0.3.7.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: