3 files changed, 21 insertions, 70 deletions

diff --git a/textproc/expat2/Makefile b/textproc/expat2/Makefile
index a01169965a1a..39d7ff067ad8 100644
--- a/textproc/expat2/Makefile
+++ b/textproc/expat2/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/expat2/distinfo b/textproc/expat2/distinfo
index cfa337b1a010..7f391274e6c4 100644
--- a/textproc/expat2/distinfo
+++ b/textproc/expat2/distinfo
@@ -1 +1 @@
-MD5 (expat.zip) = 9111cc7764ff900229d9e51c03f4a593
+MD5 (expat-1.2.tar.gz) = 9e3ecda3493f73fbc6632a00f8e42724
diff --git a/textproc/expat2/files/patch-aa b/textproc/expat2/files/patch-aa
deleted file mode 100644
index 807621a158e7..000000000000
--- a/textproc/expat2/files/patch-aa
+++ /dev/null
@@ -1,56 +0,0 @@
---- Makefile.orig	Mon Mar  8 08:20:38 1999
-+++ Makefile	Wed Aug  9 04:48:01 2000
-@@ -1,30 +1,30 @@
--CC=gcc
- # 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
--CFLAGS=-O2 -Ixmltok -Ixmlparse -DXML_NS
-+CFLAGS+=-Ixmltok -Ixmlparse -DXML_NS -fpic
- # Use one of the next two lines; unixfilemap is better if it works.
- FILEMAP_OBJ=xmlwf/unixfilemap.o
- #FILEMAP_OBJ=xmlwf/readfilemap.o
- OBJS=xmltok/xmltok.o \
-   xmltok/xmlrole.o \
--  xmlwf/xmlwf.o \
--  xmlwf/xmlfile.o \
--  xmlwf/codepage.o \
-   xmlparse/xmlparse.o \
-   xmlparse/hashtable.o \
-   $(FILEMAP_OBJ)
-+XOBJS=xmlwf/xmlwf.o \
-+  xmlwf/xmlfile.o \
-+  xmlwf/codepage.o
-+
- EXE=
- 
--all: xmlwf/xmlwf$(EXE)
-+all: xmlwf/xmlwf$(EXE) libexpat.a libexpat.so
- 
--xmlwf/xmlwf$(EXE): $(OBJS)
--	$(CC) $(CFLAGS) -o $@ $(OBJS)
-+xmlwf/xmlwf$(EXE): $(XOBJS) libexpat.a
-+	$(CC) $(CFLAGS) -o $@ $(XOBJS) -L. -lexpat
- 
- clean:
--	rm -f $(OBJS) xmlwf/xmlwf$(EXE)
-+	rm -f $(OBJS) $(XOBJS) xmlwf/xmlwf$(EXE)
- 
- xmltok/nametab.h: gennmtab/gennmtab$(EXE)
- 	rm -f $@
-@@ -34,6 +34,13 @@
- 	$(CC) $(CFLAGS) -o $@ gennmtab/gennmtab.c
- 
- xmltok/xmltok.o: xmltok/nametab.h
-+
-+libexpat.a: $(OBJS)
-+	ar -rc $@ $(OBJS)
-+	ranlib $@
-+
-+libexpat.so: $(OBJS)
-+	$(CC) -shared -o $@ $(OBJS)
- 
- .c.o:
- 	$(CC) $(CFLAGS) -c -o $@ $<