- add HOMEPAGE

- remove FAKE=Yes
- remove parts of patch which are replaced by the use of MAKE_FLAGS
- use better filename for the patch
- add @comment with RCS id to PLIST

textproc/expat/Makefile

@@ -1,12 +1,15 @@
 # $FreeBSD: Makefile,v 1.2 1999/08/31 02:09:14 peter Exp $
-# $OpenBSD: Makefile,v 1.3 2000/03/24 15:59:34 kevlo Exp $
+# $OpenBSD: Makefile,v 1.4 2000/07/16 08:46:19 brad Exp $
 
 DISTNAME=	expat
 PKGNAME=	expat-1.1
 CATEGORIES=	textproc
+NEED_VERSION=	1.310
 MASTER_SITES=	ftp://ftp.jclark.com/pub/xml/ \
 		http://www.physik.TU-Berlin.DE/~ibex/ports/distfiles/
 
+HOMEPAGE=	http://www.jclark.com/xml/expat.html
+
 MAINTAINER=	dugsong@monkey.org
 
 PERMIT_PACKAGE_CDROM=   Yes
@@ -14,9 +17,10 @@ PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
 
-FAKE=		Yes
 USE_ZIP=	Yes
 
+MAKE_FLAGS=	CC="${CC}" CFLAGS="${CFLAGS} -Ixmltok -Ixmlparse -DXML_NS"
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xmlwf/xmlwf ${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${PREFIX}/include/xml

textproc/expat/patches/patch-Makefile.in

@@ -0,0 +1,22 @@
+--- Makefile.orig	Mon Mar  8 08:20:38 1999
++++ Makefile	Sun Jul 16 04:26:32 2000
+@@ -18,7 +18,7 @@
+   $(FILEMAP_OBJ)
+ EXE=
+ 
+-all: xmlwf/xmlwf$(EXE)
++all: xmlwf/xmlwf$(EXE) libexpat.a
+ 
+ xmlwf/xmlwf$(EXE): $(OBJS)
+ 	$(CC) $(CFLAGS) -o $@ $(OBJS)
+@@ -34,6 +34,10 @@
+ 	$(CC) $(CFLAGS) -o $@ gennmtab/gennmtab.c
+ 
+ xmltok/xmltok.o: xmltok/nametab.h
++
++libexpat.a: $(OBJS)
++	ar -rc $@ $(OBJS)
++	ranlib $@
+ 
+ .c.o:
+ 	$(CC) $(CFLAGS) -c -o $@ $<

textproc/expat/patches/patch-aa

@@ -1,34 +0,0 @@
---- Makefile.orig	Mon Mar  8 08:20:38 1999
-+++ Makefile	Thu Aug 26 14:49:24 1999
-@@ -1,10 +1,9 @@
--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
- # Use one of the next two lines; unixfilemap is better if it works.
- FILEMAP_OBJ=xmlwf/unixfilemap.o
- #FILEMAP_OBJ=xmlwf/readfilemap.o
-@@ -18,7 +17,7 @@
-   $(FILEMAP_OBJ)
- EXE=
- 
--all: xmlwf/xmlwf$(EXE)
-+all: xmlwf/xmlwf$(EXE) libexpat.a
- 
- xmlwf/xmlwf$(EXE): $(OBJS)
- 	$(CC) $(CFLAGS) -o $@ $(OBJS)
-@@ -34,6 +33,10 @@
- 	$(CC) $(CFLAGS) -o $@ gennmtab/gennmtab.c
- 
- xmltok/xmltok.o: xmltok/nametab.h
-+
-+libexpat.a: $(OBJS)
-+	ar -rc $@ $(OBJS)
-+	ranlib $@
- 
- .c.o:
- 	$(CC) $(CFLAGS) -c -o $@ $<

textproc/expat/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: ${HOMEPAGE}

textproc/expat/pkg/PLIST

@@ -1,3 +1,4 @@
+@comment $OpenBSD: PLIST,v 1.2 2000/07/16 08:46:20 brad Exp $
 bin/xmlwf
 include/xml/xmlparse.h
 include/xml/xmltok.h