4 files changed, 58 insertions, 14 deletions

diff --git a/textproc/expat/Makefile b/textproc/expat/Makefile
index a01169965a1a..39d7ff067ad8 100644
--- a/textproc/expat/Makefile
+++ b/textproc/expat/Makefile
@@ -6,27 +6,34 @@
 #
 
 PORTNAME=	expat
-PORTVERSION= 	1.1
+PORTVERSION= 	1.2
 CATEGORIES=	textproc
-MASTER_SITES=	ftp://ftp.jclark.com/pub/xml/ \
-		http://www.physik.TU-Berlin.DE/~ibex/ports/distfiles/
-DISTNAME=	${PORTNAME}
+MASTER_SITES=	ftp://ftp.jclark.com/pub/xml/
 
-MAINTAINER=	dirk@FreeBSD.org
-
-USE_ZIP=	yes
+MAINTAINER=	knu@FreeBSD.org
 
 SHLIB_MAJOR=	1
 
+MAKEFILES=	Makefile.lib Makefile.prog
+MAKE_ARGS=	SHLIB_MAJOR="${SHLIB_MAJOR}"
 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:
-	${INSTALL_PROGRAM} ${WRKSRC}/xmlwf/xmlwf ${PREFIX}/bin
 	${MKDIR} ${PREFIX}/include/xml
-	${INSTALL_DATA} ${WRKSRC}/xmlparse/xmlparse.h ${PREFIX}/include/xml
-	${INSTALL_DATA} ${WRKSRC}/xmltok/xmltok.h ${PREFIX}/include/xml
-	${INSTALL_DATA} ${WRKSRC}/libexpat.a ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/libexpat.so ${PREFIX}/lib/libexpat.so.${SHLIB_MAJOR}
-	${LN} -s libexpat.so.${SHLIB_MAJOR} ${PREFIX}/lib/libexpat.so
+.for f in ${MAKEFILES}
+	@(cd ${WRKSRC}; \
+	${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${f} ${MAKE_ARGS} ${INSTALL_TARGET})
+.endfor
 
 .include <bsd.port.mk>
diff --git a/textproc/expat/distinfo b/textproc/expat/distinfo
index cfa337b1a010..7f391274e6c4 100644
--- a/textproc/expat/distinfo
+++ b/textproc/expat/distinfo
@@ -1 +1 @@
-MD5 (expat.zip) = 9111cc7764ff900229d9e51c03f4a593
+MD5 (expat-1.2.tar.gz) = 9e3ecda3493f73fbc6632a00f8e42724
diff --git a/textproc/expat/files/Makefile.lib b/textproc/expat/files/Makefile.lib
new file mode 100644
index 000000000000..b3a0f177cd35
--- /dev/null
+++ b/textproc/expat/files/Makefile.lib
@@ -0,0 +1,24 @@
+# $FreeBSD$
+
+LIB=		expat
+SHLIB_MAJOR?=	1
+SHLIB_MINOR?=	2
+
+# If you know what your system's byte order is, define XML_BYTE_ORDER:
+# use -DXML_BYTE_ORDER=12 for little-endian byte order;
+# use -DXML_BYTE_ORDER=21 for big-endian (network) byte order.
+# -DXML_NS adds support for checking of lexical aspects of XML namespaces spec
+# -DXML_MIN_SIZE makes a smaller but slower parser
+# -DXML_DTD adds full support for parsing DTDs
+CFLAGS+=	-Wall -I${.CURDIR}/xmltok -I${.CURDIR}/xmlparse -DXML_NS -DXML_DTD
+
+SRCS=		xmltok/xmltok.c \
+		xmltok/xmlrole.c \
+		xmlparse/xmlparse.c
+INCS=		xmlparse/xmlparse.h \
+		xmltok/xmltok.h
+NOMAN=		YES
+INCDIR=		${LOCALBASE}/include/xml
+LIBDIR=		${LOCALBASE}/lib
+
+.include <bsd.lib.mk>
diff --git a/textproc/expat/files/Makefile.prog b/textproc/expat/files/Makefile.prog
new file mode 100644
index 000000000000..4a4ce96f4ab4
--- /dev/null
+++ b/textproc/expat/files/Makefile.prog
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PROG=		xmlwf
+SRCS=		xmlwf.c \
+		xmlfile.c \
+		codepage.c \
+		unixfilemap.c
+CFLAGS+=	-I${.CURDIR}/xmltok -I${.CURDIR}/xmlparse
+LDADD=		-L${.CURDIR} -lexpat
+NOMAN=		YES
+BINDIR=		${LOCALBASE}/bin
+
+.include <bsd.prog.mk>