Introduce latest version of expat.

This development version will be released as 2.0 and maintained on
sourceforge.

Submitted by:	Naoki IDO <ido@hitachi-ms.co.jp>
Repo-copied by:	PW

6 files changed, 38 insertions, 28 deletions

diff --git a/textproc/expat2/Makefile b/textproc/expat2/Makefile
index 12d106740b87..5b28f43d72b9 100644
--- a/textproc/expat2/Makefile
+++ b/textproc/expat2/Makefile
@@ -6,34 +6,25 @@
 #
 
 PORTNAME=	expat
-PORTVERSION= 	1.2
+PORTVERSION= 	1.95.1
 CATEGORIES=	textproc
-MASTER_SITES=	ftp://ftp.jclark.com/pub/xml/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	expat
 
-MAINTAINER=	knu@FreeBSD.org
+MAINTAINER=	kuriyama@FreeBSD.org
 
-SHLIB_MAJOR=	1
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--enable-shared --enable-static
+USE_LIBTOOL=	yes
+USE_GMAKE=	yes
+
+INSTALLS_SHLIBS=	yes
+
+SHLIB_MAJOR=	0
 
-MAKEFILES=	Makefile.lib Makefile.prog
-MAKE_ARGS=	SHLIB_MAJOR="${SHLIB_MAJOR}" NOPROFILE=true
 PLIST_SUB=	SHLIB_MAJOR="${SHLIB_MAJOR}"
 
-do-build:
-.for f in ${MAKEFILES}
-	${CP} ${FILESDIR}/${f} ${WRKSRC}/
-.endfor
-	${MV} ${WRKSRC}/xmlwf/* ${WRKSRC}/
-	${RMDIR} ${WRKSRC}/xmlwf
-.for f in ${MAKEFILES}
-	@(cd ${WRKSRC}; \
-	${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${f} ${MAKE_ARGS} ${ALL_TARGET})
-.endfor
-
-do-install:
-	${MKDIR} ${PREFIX}/include/xml
-.for f in ${MAKEFILES}
-	@(cd ${WRKSRC}; \
-	${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${f} ${MAKE_ARGS} ${INSTALL_TARGET})
-.endfor
+post-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/xmlwf/xmlwf ${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/textproc/expat2/distinfo b/textproc/expat2/distinfo
index 7f391274e6c4..66ab86a3fc03 100644
--- a/textproc/expat2/distinfo
+++ b/textproc/expat2/distinfo
@@ -1 +1 @@
-MD5 (expat-1.2.tar.gz) = 9e3ecda3493f73fbc6632a00f8e42724
+MD5 (expat-1.95.1.tar.gz) = 113ebbf7efaf7179d869341cbb2879f7
diff --git a/textproc/expat2/files/patch-aa b/textproc/expat2/files/patch-aa
new file mode 100644
index 000000000000..5ccbc7c23e10
--- /dev/null
+++ b/textproc/expat2/files/patch-aa
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Sat Sep 30 00:54:52 2000
++++ Makefile.in	Thu Oct 12 00:04:32 2000
+@@ -76,7 +76,7 @@
+ RANLIB = @RANLIB@
+ VERSION = @VERSION@
+ 
+-SUBDIRS = lib
++SUBDIRS = lib xmlwf
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ CONFIG_HEADERS = config.h:config.hin
+ 
diff --git a/textproc/expat2/files/patch-ab b/textproc/expat2/files/patch-ab
new file mode 100644
index 000000000000..e67c0d3eab89
--- /dev/null
+++ b/textproc/expat2/files/patch-ab
@@ -0,0 +1,10 @@
+--- xmlwf/Makefile.in.orig	Sat Sep 30 00:54:54 2000
++++ xmlwf/Makefile.in	Thu Oct 12 00:42:22 2000
+@@ -11,5 +11,7 @@
+ xmlwf: $(OBJS)
+ 	$(CC) -o xmlwf $(LDFLAGS) $(OBJS) $(LIBS)
+ 
++install:
++
+ clean:
+	rm -f xmlwf core *.o
diff --git a/textproc/expat2/pkg-descr b/textproc/expat2/pkg-descr
index 6039c62ce09e..196c94ab5aa9 100644
--- a/textproc/expat2/pkg-descr
+++ b/textproc/expat2/pkg-descr
@@ -1,4 +1,4 @@
 Expat is an XML 1.0 parser written in C. It aims to be fully
 conforming. It is currently not a validating XML processor.
 
-WWW: http://www.jclark.com/xml/expat.html
+WWW: http://sourceforge.net/projects/expat/
diff --git a/textproc/expat2/pkg-plist b/textproc/expat2/pkg-plist
index 9aa0f13a1918..6e18c5b9e5f1 100644
--- a/textproc/expat2/pkg-plist
+++ b/textproc/expat2/pkg-plist
@@ -1,7 +1,5 @@
 bin/xmlwf
-include/xml/xmlparse.h
-include/xml/xmltok.h
+include/expat.h
 lib/libexpat.a
 lib/libexpat.so
 lib/libexpat.so.%%SHLIB_MAJOR%%
-@dirrm include/xml