From owner-freebsd-ports-bugs@FreeBSD.ORG Sun May 6 08:30:11 2012 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 7F2E11065672 for ; Sun, 6 May 2012 08:30:11 +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 51AD48FC16 for ; Sun, 6 May 2012 08:30:11 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q468UBNm076160 for ; Sun, 6 May 2012 08:30:11 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q468UBwg076156; Sun, 6 May 2012 08:30:11 GMT (envelope-from gnats) Resent-Date: Sun, 6 May 2012 08:30:11 GMT Resent-Message-Id: <201205060830.q468UBwg076156@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, Sunpoet Po-Chuan Hsieh Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F3A2D1065675; Sun, 6 May 2012 08:25:26 +0000 (UTC) (envelope-from sunpoet@sunpoet.net) Received: from sunpoet.net (sunpoet.net [220.133.12.240]) by mx1.freebsd.org (Postfix) with ESMTP id 855148FC08; Sun, 6 May 2012 08:25:26 +0000 (UTC) Received: by sunpoet.net (Postfix, from userid 1000) id 3Vlg4Q5DVSz375; Sun, 6 May 2012 16:24:54 +0800 (CST) Message-Id: <3Vlg4Q5DVSz375@sunpoet.net> Date: Sun, 6 May 2012 16:24:54 +0800 (CST) From: Sunpoet Po-Chuan Hsieh To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: kuriyama@FreeBSD.org Subject: ports/167636: [PATCH] textproc/expat2: update to 2.1.0 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: Sun, 06 May 2012 08:30:11 -0000 >Number: 167636 >Category: ports >Synopsis: [PATCH] textproc/expat2: update to 2.1.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun May 06 08:30:10 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Sunpoet Po-Chuan Hsieh >Release: FreeBSD 9.0-STABLE amd64 >Organization: The FreeBSD Project >Environment: System: FreeBSD bonjour.sunpoet.net 9.0-STABLE FreeBSD 9.0-STABLE #0: Mon Apr 23 19:27:08 CST 2012 >Description: - Update to 2.1.0 Removed file(s): - files/patch-Makefile.in - files/patch-xmlparse.c - files/patch-xmltok_impl.c Note that shlib version changed from 6 to 7. Port maintainer (kuriyama@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99_6 (mode: update, diff: CVS) >How-To-Repeat: >Fix: --- expat-2.1.0.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/textproc/expat2/Makefile,v retrieving revision 1.39 diff -u -u -r1.39 Makefile --- Makefile 9 Nov 2011 15:25:45 -0000 1.39 +++ Makefile 6 May 2012 08:24:35 -0000 @@ -6,8 +6,7 @@ # PORTNAME= expat -PORTVERSION= 2.0.1 -PORTREVISION= 2 +PORTVERSION= 2.1.0 CATEGORIES= textproc MASTER_SITES= SF @@ -16,14 +15,18 @@ GNU_CONFIGURE= yes ALL_TARGET= default +USE_GNOME= gnomehack USE_LDCONFIG= yes MAN1= xmlwf.1 -SHLIB_MAJOR= 6 +SHLIB_MAJOR= 7 MAKE_ENV= LIBCURRENT="${SHLIB_MAJOR}" PLIST_SUB= SHLIB_MAJOR="${SHLIB_MAJOR}" +post-patch: + @${REINPLACE_CMD} -e '/^DESTDIR = /d' ${WRKSRC}/Makefile.in + list-depend-ports: cd ${PORTSDIR}; \ ${FIND} . -mindepth 3 -maxdepth 3 -name Makefile -execdir ${SH} -c \ Index: distinfo =================================================================== RCS file: /home/ncvs/ports/textproc/expat2/distinfo,v retrieving revision 1.14 diff -u -u -r1.14 distinfo --- distinfo 3 Jul 2011 14:38:45 -0000 1.14 +++ distinfo 6 May 2012 08:24:35 -0000 @@ -1,2 +1,2 @@ -SHA256 (expat-2.0.1.tar.gz) = 847660b4df86e707c9150e33cd8c25bc5cd828f708c7418e765e3e983a2e5e93 -SIZE (expat-2.0.1.tar.gz) = 446456 +SHA256 (expat-2.1.0.tar.gz) = 823705472f816df21c8f6aa026dd162b280806838bb55b3432b0fb1fcca7eb86 +SIZE (expat-2.1.0.tar.gz) = 562616 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/textproc/expat2/pkg-plist,v retrieving revision 1.7 diff -u -u -r1.7 pkg-plist --- pkg-plist 23 Feb 2006 10:39:20 -0000 1.7 +++ pkg-plist 6 May 2012 08:24:35 -0000 @@ -5,3 +5,4 @@ lib/libexpat.la lib/libexpat.so lib/libexpat.so.%%SHLIB_MAJOR%% +libdata/pkgconfig/expat.pc Index: files/patch-Makefile.in =================================================================== RCS file: files/patch-Makefile.in diff -N files/patch-Makefile.in --- files/patch-Makefile.in 11 Apr 2008 13:57:34 -0000 1.4 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- Makefile.in.orig Sun Jun 10 21:10:33 2007 -+++ Makefile.in Sun Jun 10 21:11:18 2007 -@@ -44,8 +44,6 @@ - APIHEADER = $(srcdir)/lib/expat.h $(srcdir)/lib/expat_external.h - LIBRARY = libexpat.la - --DESTDIR = $(INSTALL_ROOT) -- - default: buildlib xmlwf/xmlwf - - buildlib: $(LIBRARY) Index: files/patch-xmlparse.c =================================================================== RCS file: files/patch-xmlparse.c diff -N files/patch-xmlparse.c --- files/patch-xmlparse.c 29 Aug 2011 14:33:26 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ ---- lib/xmlparse.c.orig 2007-05-08 11:25:35.000000000 +0900 -+++ lib/xmlparse.c 2011-08-29 23:22:09.007745673 +0900 -@@ -3703,6 +3703,9 @@ - return XML_ERROR_UNCLOSED_TOKEN; - case XML_TOK_PARTIAL_CHAR: - return XML_ERROR_PARTIAL_CHAR; -+ case -XML_TOK_PROLOG_S: -+ tok = -tok; -+ break; - case XML_TOK_NONE: - #ifdef XML_DTD - /* for internal PE NOT referenced between declarations */ Index: files/patch-xmltok_impl.c =================================================================== RCS file: files/patch-xmltok_impl.c diff -N files/patch-xmltok_impl.c --- files/patch-xmltok_impl.c 8 Dec 2009 01:34:32 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- lib/xmltok_impl.c.orig 2009-12-08 10:16:58.047943029 +0900 -+++ lib/xmltok_impl.c 2009-12-08 10:17:13.228143919 +0900 -@@ -1744,7 +1744,7 @@ - const char *end, - POSITION *pos) - { -- while (ptr != end) { -+ while (ptr < end) { - switch (BYTE_TYPE(enc, ptr)) { - #define LEAD_CASE(n) \ - case BT_LEAD ## n: \ --- expat-2.1.0.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: