7 files changed, 15 insertions, 70 deletions

diff --git a/textproc/expat2/Makefile b/textproc/expat2/Makefile
index e10de2ab7b12..b2ccec848597 100644
--- a/textproc/expat2/Makefile
+++ b/textproc/expat2/Makefile
@@ -6,17 +6,18 @@
 #
 
 PORTNAME=	expat
-PORTVERSION=	1.95.2
+PORTVERSION=	1.95.3
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	expat
 
 MAINTAINER=	kuriyama@FreeBSD.org
 
-CONFIGURE_ARGS=	--enable-shared --enable-static
 USE_LIBTOOL=	yes
-
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+ALL_TARGET=	default
 INSTALLS_SHLIB=	yes
+MAN1=		xmlwf.1
 
 SHLIB_MAJOR=	2
 
@@ -24,7 +25,4 @@ MAKE_ENV=	LIBCURRENT="${SHLIB_MAJOR}" \
 		SHELL="/bin/sh"
 PLIST_SUB=	SHLIB_MAJOR="${SHLIB_MAJOR}"
 
-post-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/xmlwf/xmlwf ${PREFIX}/bin
-
 .include <bsd.port.mk>
diff --git a/textproc/expat2/distinfo b/textproc/expat2/distinfo
index d3f54c29ac60..b783345932da 100644
--- a/textproc/expat2/distinfo
+++ b/textproc/expat2/distinfo
@@ -1 +1 @@
-MD5 (expat-1.95.2.tar.gz) = 159c8a36523dc37f4cbcd1d6f970ccfb
+MD5 (expat-1.95.3.tar.gz) = 738ea1f00b58d8a0e96b308b793bd10f
diff --git a/textproc/expat2/files/patch-Makefile.in b/textproc/expat2/files/patch-Makefile.in
deleted file mode 100644
index 897a27378c98..000000000000
--- a/textproc/expat2/files/patch-Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.in	2002/05/10 17:17:43	1.1
-+++ Makefile.in	2002/05/10 17:18:54
-@@ -108,7 +108,7 @@
- 	$(SHELL) ./config.status
- 
- $(SUBDIRS):
--	cd $@ && $(MAKE)
-+	cd $@ && $(MAKE) all
- 
- clean:
- 	for dir in $(SUBDIRS); do \
diff --git a/textproc/expat2/files/patch-configure b/textproc/expat2/files/patch-configure
new file mode 100644
index 000000000000..9a6a809b219b
--- /dev/null
+++ b/textproc/expat2/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Tue Jun  4 04:12:02 2002
++++ configure	Sat Jun 29 12:58:20 2002
+@@ -6824,6 +6824,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/textproc/expat2/files/patch-examples::Makefile.in b/textproc/expat2/files/patch-examples::Makefile.in
deleted file mode 100644
index 0247408dd5d7..000000000000
--- a/textproc/expat2/files/patch-examples::Makefile.in
+++ /dev/null
@@ -1,18 +0,0 @@
-
-$FreeBSD$
-
---- examples/Makefile.in	2002/05/10 17:22:56	1.1
-+++ examples/Makefile.in	2002/05/10 17:30:01
-@@ -35,10 +35,10 @@
- all: elements outline
- 
- elements: elements.o
--	$(CC) -o $@ $< $(LDFLAGS) $(LIBS)
-+	$(CC) -o $@ elements.o $(LDFLAGS) $(LIBS)
- 
- outline: outline.o
--	$(CC) -o $@ $< $(LDFLAGS) $(LIBS)
-+	$(CC) -o $@ outline.o $(LDFLAGS) $(LIBS)
- 
- check:	$(SUBDIRS)
- 	@echo
diff --git a/textproc/expat2/files/patch-lib::Makefile.in b/textproc/expat2/files/patch-lib::Makefile.in
deleted file mode 100644
index d314a0d8e2f8..000000000000
--- a/textproc/expat2/files/patch-lib::Makefile.in
+++ /dev/null
@@ -1,18 +0,0 @@
-
-$FreeBSD$
-
---- lib/Makefile.in	2002/05/10 17:34:58	1.1
-+++ lib/Makefile.in	2002/05/10 17:35:11
-@@ -83,9 +83,9 @@
- LIBS = @LIBS@
- CFLAGS = @CFLAGS@
- 
--LIBREVISION = @LIBREVISION@
--LIBCURRENT  = @LIBCURRENT@
--LIBAGE      = @LIBAGE@
-+LIBREVISION ?= @LIBREVISION@
-+LIBCURRENT  ?= @LIBCURRENT@
-+LIBAGE      ?= @LIBAGE@
- 
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
diff --git a/textproc/expat2/files/patch-xmlwf::Makefile.in b/textproc/expat2/files/patch-xmlwf::Makefile.in
deleted file mode 100644
index a76e2ef45fc5..000000000000
--- a/textproc/expat2/files/patch-xmlwf::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- xmlwf/Makefile.in	2002/05/10 17:31:29	1.1
-+++ xmlwf/Makefile.in	2002/05/10 17:31:48
-@@ -43,6 +43,7 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- 
-+all: xmlwf
- 
- xmlwf: $(OBJS)
- 	$(CC) -o xmlwf $(LDFLAGS) $(OBJS) $(LIBS)