diff --git a/textproc/expat/Makefile b/textproc/expat/Makefile
index fe20deff5e6..2a579589582 100644
--- a/textproc/expat/Makefile
+++ b/textproc/expat/Makefile
@@ -1,14 +1,14 @@
-# $OpenBSD: Makefile,v 1.10 2001/01/21 19:17:40 avsm Exp $
+# $OpenBSD: Makefile,v 1.11 2001/01/22 16:40:22 brad Exp $
 # $FreeBSD: Makefile,v 1.2 1999/08/31 02:09:14 peter Exp $
 
 DISTNAME=	expat-1.95.1
 CATEGORIES=	textproc
 NEED_VERSION=	1.351
-
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR= expat
 
 HOMEPAGE=	http://expat.sourceforge.net/
+
 MAINTAINER=	Dug Song <dugsong@monkey.org>
 
 PERMIT_PACKAGE_CDROM=   Yes
@@ -17,7 +17,8 @@ PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
 
 CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS= ${CONFIGURE_SHARED} --enable-static
+CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
+CONFIGURE_ARGS+= --enable-static
 
 post-install:
 	${INSTALL_PROGRAM} ${WRKBUILD}/xmlwf/xmlwf ${PREFIX}/bin
diff --git a/textproc/expat/patches/patch-conftools_ltconfig b/textproc/expat/patches/patch-conftools_ltconfig
index 4fa4590598d..48f23c78c5a 100644
--- a/textproc/expat/patches/patch-conftools_ltconfig
+++ b/textproc/expat/patches/patch-conftools_ltconfig
@@ -1,7 +1,6 @@
-$OpenBSD: patch-conftools_ltconfig,v 1.1 2001/01/21 19:17:40 avsm Exp $
---- conftools/ltconfig.orig	Sun Oct 22 19:47:34 2000
-+++ conftools/ltconfig	Sun Jan 21 02:09:50 2001
-@@ -1105,6 +1105,9 @@ cygwin* | mingw*)
+--- conftools/ltconfig.orig	Sun Oct 22 15:47:34 2000
++++ conftools/ltconfig	Mon Jan 22 11:10:57 2001
+@@ -1105,6 +1105,9 @@
      with_gnu_ld=no
    fi
    ;;
@@ -11,7 +10,7 @@ $OpenBSD: patch-conftools_ltconfig,v 1.1 2001/01/21 19:17:40 avsm Exp $
  
  esac
  
-@@ -1402,10 +1405,18 @@ else
+@@ -1402,10 +1405,21 @@
      ;;
  
    openbsd*)
@@ -20,19 +19,22 @@ $OpenBSD: patch-conftools_ltconfig,v 1.1 2001/01/21 19:17:40 avsm Exp $
      hardcode_direct=yes
      hardcode_shlibpath_var=no
 +    case "$host_os" in
-+      openbsd2.[01234567])
++      openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
 +	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
 +	hardcode_libdir_flag_spec='-R$libdir'
 +      ;;
 +      *)
 +	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
 +	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++	if [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then
++	  export_dynamic_flag_spec='${wl}-E'
++	fi
 +      ;;
 +    esac
      ;;
  
    os2*)
-@@ -2021,13 +2032,10 @@ netbsd*)
+@@ -2021,13 +2035,10 @@
  
  openbsd*)
    version_type=sunos
diff --git a/textproc/expat/patches/patch-conftools_ltmain_sh b/textproc/expat/patches/patch-conftools_ltmain_sh
index 5cdd1ff2c57..c4151f525e2 100644
--- a/textproc/expat/patches/patch-conftools_ltmain_sh
+++ b/textproc/expat/patches/patch-conftools_ltmain_sh
@@ -1,24 +1,6 @@
-$OpenBSD: patch-conftools_ltmain_sh,v 1.1 2001/01/21 19:17:40 avsm Exp $
---- conftools/ltmain.sh.orig	Sun Oct 22 19:47:34 2000
-+++ conftools/ltmain.sh	Sun Jan 21 02:09:50 2001
-@@ -627,14 +627,14 @@ compiler."
-       # we shouldn't force the makefile maintainer to figure out
-       # which system we are compiling for in order to pass an extra
-       # flag for every libtool invokation.
--      allow_undefined=no
-+      # allow_undefined=no
- 
-       # FIXME: Unfortunately, there are problems with the above when trying
-       # to make a dll which has undefined symbols, in which case not
-       # even a static library is built.  For now, we need to specify
-       # -no-undefined on the libtool link line when we can be certain
-       # that all symbols are satisfied, otherwise we get a static library.
--      # allow_undefined=yes
-+      allow_undefined=yes
- 
-       # This is a source program that is used to create dlls on Windows
-       # Don't remove nor modify the starting and closing comments
-@@ -1800,6 +1800,9 @@ compiler."
+--- conftools/ltmain.sh.orig	Sun Oct 22 15:47:34 2000
++++ conftools/ltmain.sh	Mon Jan 22 11:10:54 2001
+@@ -1800,6 +1800,9 @@
  	  # rhapsody is a little odd...
  	  deplibs="$deplibs -framework System"
  	  ;;
@@ -28,7 +10,7 @@ $OpenBSD: patch-conftools_ltmain_sh,v 1.1 2001/01/21 19:17:40 avsm Exp $
  	*)
  	  # Add libc to deplibs on all other systems.
  	  deplibs="$deplibs -lc"
-@@ -3568,40 +3571,6 @@ libdir='$install_libdir'\
+@@ -3568,40 +3571,6 @@
      # Exit here if they wanted silent mode.
      test "$show" = : && exit 0