Index: Makefile =================================================================== RCS file: /home/ncvs/ports/www/neon/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- Makefile 2002/03/29 06:31:40 1.12 +++ Makefile 2002/04/26 21:25:33 @@ -6,13 +6,13 @@ # PORTNAME= neon -PORTVERSION= 0.19.3 +PORTVERSION= 0.19.4 CATEGORIES= www MASTER_SITES= http://www.webdav.org/neon/ MAINTAINER= rooneg@electricjellyfish.net -LIB_DEPENDS= xml.5:${PORTSDIR}/textproc/libxml +LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat .ifndef WITHOUT_OPENSSL USE_OPENSSL= yes @@ -22,7 +22,7 @@ CONFIGURE_ARGS= --with-ssl=${OPENSSLBASE} \ --enable-xml \ --enable-shared \ - --with-libxml1 + --with-expat=${PREFIX} CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} MAN1= neon-config.1 Index: distinfo =================================================================== RCS file: /home/ncvs/ports/www/neon/distinfo,v retrieving revision 1.10 diff -u -r1.10 distinfo --- distinfo 2002/03/02 19:46:12 1.10 +++ distinfo 2002/04/26 21:25:33 @@ -1 +1 @@ -MD5 (neon-0.19.3.tar.gz) = 9dbb8c276e5fc58a707b6e908abdce63 +MD5 (neon-0.19.4.tar.gz) = 66b09cfdcfef0492d2adc6f37f5f4406 --- /dev/null Fri Apr 26 17:19:06 2002 +++ files/patch-configure Fri Apr 26 17:17:27 2002 @@ -0,0 +1,23 @@ +--- configure.orig Fri Apr 26 17:15:20 2002 ++++ configure Fri Apr 26 17:15:51 2002 +@@ -10792,7 +10792,7 @@ + _ACEOF + + fi +-if test -r "$neon_expat_dir/expat.h"; then ++if test -r "$neon_expat_dir/include/expat.h"; then + ne_found_hdr=yes + + cat >>confdefs.h <<\_ACEOF +@@ -10806,9 +10806,9 @@ + #define HAVE_EXPAT 1 + _ACEOF + +- CFLAGS="$CFLAGS -I$neon_expat_dir" ++ CFLAGS="$CFLAGS -I$neon_expat_dir/include" + if test -z "$neon_using_libtool_expat"; then +- NEON_LIBS="$NEON_LIBS -L$neon_expat_dir -lexpat" ++ NEON_LIBS="$NEON_LIBS -L$neon_expat_dir/lib -lexpat" + fi + neon_xml_parser_message="expat in $neon_expat_dir" + neon_found_parser="yes"