Attachment #124158 for bug #167636




#

PORTNAME=	expat
PORTVERSION=	2.1.0
PORTREVISION=	2
CATEGORIES=	textproc
MASTER_SITES=	SF



GNU_CONFIGURE=	yes
ALL_TARGET=	default
USE_GNOME=	gnomehack
USE_LDCONFIG=	yes
MAN1=		xmlwf.1

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 \

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (expat-2.0.1.tar.gz) = 847660b4df86e707c9150e33cd8c25bc5cd828f708c7418e765e3e983a2e5e93	1	SHA256 (expat-2.1.0.tar.gz) = 823705472f816df21c8f6aa026dd162b280806838bb55b3432b0fb1fcca7eb86
2	SIZE (expat-2.0.1.tar.gz) = 446456	2	SIZE (expat-2.1.0.tar.gz) = 562616

Lines 5-7 Link Here

(-)pkg-plist (+1 lines)
5	lib/libexpat.la	5	lib/libexpat.la
6	lib/libexpat.so	6	lib/libexpat.so
7	lib/libexpat.so.%%SHLIB_MAJOR%%	7	lib/libexpat.so.%%SHLIB_MAJOR%%
		8	libdata/pkgconfig/expat.pc

Removed Link Here

(-)files/patch-Makefile.in (-11 lines)
1	--- Makefile.in.orig Sun Jun 10 21:10:33 2007
2	+++ Makefile.in Sun Jun 10 21:11:18 2007
3	@@ -44,8 +44,6 @@
4	APIHEADER = $(srcdir)/lib/expat.h $(srcdir)/lib/expat_external.h
5	LIBRARY = libexpat.la
6
7	-DESTDIR = $(INSTALL_ROOT)
8	-
9	default: buildlib xmlwf/xmlwf
10
11	buildlib: $(LIBRARY)




--- 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 */

Removed Link Here

(-)files/patch-xmltok_impl.c (-11 lines)
1	--- lib/xmltok_impl.c.orig 2009-12-08 10:16:58.047943029 +0900
2	+++ lib/xmltok_impl.c 2009-12-08 10:17:13.228143919 +0900
3	@@ -1744,7 +1744,7 @@
4	const char *end,
5	POSITION *pos)
6	{
7	- while (ptr != end) {
8	+ while (ptr < end) {
9	switch (BYTE_TYPE(enc, ptr)) {
10	#define LEAD_CASE(n) \
11	case BT_LEAD ## n: \

Return to bug 167636

Lines 6-13 Link Here

(-)Makefile (-3 / +6 lines)
6	#	6	#
7		7
8	PORTNAME= expat	8	PORTNAME= expat
9	PORTVERSION= 2.0.1	9	PORTVERSION= 2.1.0
10	PORTREVISION= 2
11	CATEGORIES= textproc	10	CATEGORIES= textproc
12	MASTER_SITES= SF	11	MASTER_SITES= SF
13		12
Lines 16-29 Link Here
16		15
17	GNU_CONFIGURE= yes	16	GNU_CONFIGURE= yes
18	ALL_TARGET= default	17	ALL_TARGET= default
		18	USE_GNOME= gnomehack
19	USE_LDCONFIG= yes	19	USE_LDCONFIG= yes
20	MAN1= xmlwf.1	20	MAN1= xmlwf.1
21		21
22	SHLIB_MAJOR= 6	22	SHLIB_MAJOR= 7
23		23
24	MAKE_ENV= LIBCURRENT="${SHLIB_MAJOR}"	24	MAKE_ENV= LIBCURRENT="${SHLIB_MAJOR}"
25	PLIST_SUB= SHLIB_MAJOR="${SHLIB_MAJOR}"	25	PLIST_SUB= SHLIB_MAJOR="${SHLIB_MAJOR}"
26		26
		27	post-patch:
		28	@${REINPLACE_CMD} -e '/^DESTDIR = /d' ${WRKSRC}/Makefile.in
		29
27	list-depend-ports:	30	list-depend-ports:
28	cd ${PORTSDIR}; \	31	cd ${PORTSDIR}; \
29	${FIND} . -mindepth 3 -maxdepth 3 -name Makefile -execdir ${SH} -c \	32	${FIND} . -mindepth 3 -maxdepth 3 -name Makefile -execdir ${SH} -c \

Removed Link Here

(-)files/patch-xmlparse.c (-12 lines)
1	--- lib/xmlparse.c.orig 2007-05-08 11:25:35.000000000 +0900
2	+++ lib/xmlparse.c 2011-08-29 23:22:09.007745673 +0900
3	@@ -3703,6 +3703,9 @@
4	return XML_ERROR_UNCLOSED_TOKEN;
5	case XML_TOK_PARTIAL_CHAR:
6	return XML_ERROR_PARTIAL_CHAR;
7	+ case -XML_TOK_PROLOG_S:
8	+ tok = -tok;
9	+ break;
10	case XML_TOK_NONE:
11	#ifdef XML_DTD
12	/* for internal PE NOT referenced between declarations */