Hi!
Attached is an update to expat-2.0.0. Thanks to steven@ for testing
this in a bulk build on i386.
Please test.
Comments, okays?
Bernd
Index: Makefile
===
RCS file: /cvs/ports/textproc/expat/Makefile,v
retrieving revision 1.27
diff -u -p -u -r1.27 Makefile
--- Makefile7 Jan 2006 10:17:12 - 1.27
+++ Makefile7 Mar 2006 15:39:06 -
@@ -3,9 +3,8 @@
COMMENT= "XML 1.0 parser written in C"
-DISTNAME= expat-1.95.6
-PKGNAME= ${DISTNAME}p1
-SHARED_LIBS= expat 4.0
+DISTNAME= expat-2.0.0
+SHARED_LIBS= expat 6.0
CATEGORIES=textproc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=expat/}
@@ -18,20 +17,21 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c
+USE_LIBTOOL= Yes
+SEPARATE_BUILD=simple
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
-NO_REGRESS=Yes
MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/conftools
-MAKE_FLAGS=VSNFLAG='-version-info ${LIBexpat_VERSION:S/./:/}:0'
DOC=${PREFIX}/share/doc/expat
EXAMPLES=${PREFIX}/share/examples/expat
-SEPARATE_BUILD=simple
post-install:
${INSTALL_DATA_DIR} ${DOC} ${EXAMPLES}
${INSTALL_DATA}
${WRKDIST}/doc/{reference.html,style.css,valid-xhtml10.png} ${DOC}
${INSTALL_DATA} ${WRKDIST}/examples/{elements.c,outline.c} ${EXAMPLES}
-USE_LIBTOOL=Yes
+pre-regress:
+ @cp ${WRKSRC}/lib/expat*.h ${WRKSRC}/tests
+
.include
Index: distinfo
===
RCS file: /cvs/ports/textproc/expat/distinfo,v
retrieving revision 1.4
diff -u -p -u -r1.4 distinfo
--- distinfo5 Jan 2005 17:34:19 - 1.4
+++ distinfo7 Mar 2006 15:39:06 -
@@ -1,4 +1,4 @@
-MD5 (expat-1.95.6.tar.gz) = ca78d94e83e9f077b5da2bfe28ba986a
-RMD160 (expat-1.95.6.tar.gz) = aa0ff4dc00729fc3f61161d7d5da175a5bab1426
-SHA1 (expat-1.95.6.tar.gz) = 1f062c91c6e51d3a91f9fdeacf202bb5b2b53d27
-SIZE (expat-1.95.6.tar.gz) = 291876
+MD5 (expat-2.0.0.tar.gz) = d945df7f1c0868c5c73cf66ba9596f3f
+RMD160 (expat-2.0.0.tar.gz) = f52ccab26950d0148c3e8b644d7c9021734de318
+SHA1 (expat-2.0.0.tar.gz) = 9ff011a75a1f5b60145c4afdec520442cb398d93
+SIZE (expat-2.0.0.tar.gz) = 450860
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/textproc/expat/patches/patch-Makefile_in,v
retrieving revision 1.4
diff -u -p -u -r1.4 patch-Makefile_in
--- patches/patch-Makefile_in 25 Dec 2005 16:08:25 - 1.4
+++ patches/patch-Makefile_in 7 Mar 2006 15:39:06 -
@@ -1,16 +1,17 @@
$OpenBSD: patch-Makefile_in,v 1.4 2005/12/25 16:08:25 steven Exp $
Makefile.in.orig Fri Jan 24 17:21:46 2003
-+++ Makefile.inSun Dec 25 01:31:05 2005
-@@ -24,6 +24,8 @@ srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-
-+DESTDIR =
-+
- prefix = @prefix@
- exec_prefix = @exec_prefix@
+--- Makefile.in.orig Thu Feb 10 16:52:02 2005
Makefile.inSat Jan 21 16:32:37 2006
+@@ -44,15 +44,15 @@ MANFILE = $(srcdir)/doc/xmlwf.1
+ APIHEADER = $(srcdir)/lib/expat.h $(srcdir)/lib/expat_external.h
+ LIBRARY = libexpat.la
+
+-ifndef INSTALL_ROOT
++.ifndef INSTALL_ROOT
+ INSTALL_ROOT=$(DESTDIR)
+-endif
++.endif
-@@ -49,7 +51,7 @@ default: buildlib xmlwf/xmlwf
+ default: buildlib xmlwf/xmlwf
buildlib: $(LIBRARY)
@@ -19,36 +20,30 @@ $OpenBSD: patch-Makefile_in,v 1.4 2005/1
clean:
cd lib && rm -f $(LIBRARY) *.o *.lo && rm -rf .libs _libs
-@@ -73,22 +75,22 @@ check: tests/runtests
- tests/runtests
+@@ -157,10 +157,10 @@ tests/chardata.o: tests/chardata.c tests
+ tests/minicheck.o: tests/minicheck.c tests/minicheck.h
+ tests/runtests.o: tests/runtests.c tests/chardata.h
+ tests/runtests: tests/runtests.o tests/chardata.o tests/minicheck.o $(LIBRARY)
+- $(LINK_EXE) $^
++ $(LINK_EXE) $?
+ tests/runtestspp.o: tests/runtestspp.cpp tests/runtests.c tests/chardata.h
+ tests/runtestspp: tests/runtestspp.o tests/chardata.o tests/minicheck.o
$(LIBRARY)
+- $(LINK_CXX_EXE) $^
++ $(LINK_CXX_EXE) $?
+
+ tests/xmlts.zip:
+ wget --output-document=tests/xmlts.zip \
+@@ -172,10 +172,12 @@ tests/XML-Test-Suite: tests/xmlts.zip
+ run-xmltest: xmlwf/xmlwf tests/XML-Test-Suite
+ tests/xmltest.sh
+
+-.SUFFIXES: .c .lo .o
++.SUFFIXES: .c .cpp .lo .o
+
+ .c.o:
+ $(COMPILE) -o $@ -c $<
++.cpp.o:
++ $(CXXCOMPILE) -o $@ -c $<
+ .c.lo:
+ $(LTCOMPILE) -o $@ -c $<
- install: xmlwf/xmlwf installlib
-- $(mkinstalldirs) $(bindir) $(mandir)
-- $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xmlwf/xmlwf $(bindir)/xmlwf
-- $(INSTALL_DATA) $(MANFILE) $(mandir)
-+ $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)
-+ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xmlwf/xmlwf
$(DESTDIR)$(bindir)/xmlwf
-+ $(INSTALL_DATA) $(MANFILE) $(DESTDIR)$(mandir)
-
- installlib: $(LIBRARY) $(APIHEADER)
-- $(mkinstalldirs)
