Attachment #21379 for bug #37494




#

PORTNAME=	neon
PORTVERSION=	0.19.4
CATEGORIES=	www
MASTER_SITES=	http://www.webdav.org/neon/

MAINTAINER=	rooneg@electricjellyfish.net

LIB_DEPENDS=	expat:${PORTSDIR}/textproc/expat

.ifndef WITHOUT_OPENSSL
USE_OPENSSL=	yes

CONFIGURE_ARGS=	--with-ssl=${OPENSSLBASE} \
		--enable-xml \
		--enable-shared \
		--with-expat=${PREFIX}
CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}

MAN1=	neon-config.1

Line 1 Link Here

(-)distinfo (-1 / +1 lines)
1	MD5 (neon-0.19.3.tar.gz) = 9dbb8c276e5fc58a707b6e908abdce63	1	MD5 (neon-0.19.4.tar.gz) = 66b09cfdcfef0492d2adc6f37f5f4406




--- 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"

Return to bug 37494

Lines 6-18 Link Here

(-)Makefile (-3 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= neon	8	PORTNAME= neon
9	PORTVERSION= 0.19.3	9	PORTVERSION= 0.19.4
10	CATEGORIES= www	10	CATEGORIES= www
11	MASTER_SITES= http://www.webdav.org/neon/	11	MASTER_SITES= http://www.webdav.org/neon/
12		12
13	MAINTAINER= rooneg@electricjellyfish.net	13	MAINTAINER= rooneg@electricjellyfish.net
14		14
15	LIB_DEPENDS= xml.5:${PORTSDIR}/textproc/libxml	15	LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat
16		16
17	.ifndef WITHOUT_OPENSSL	17	.ifndef WITHOUT_OPENSSL
18	USE_OPENSSL= yes	18	USE_OPENSSL= yes
Lines 22-28 Link Here
22	CONFIGURE_ARGS= --with-ssl=${OPENSSLBASE} \	22	CONFIGURE_ARGS= --with-ssl=${OPENSSLBASE} \
23	--enable-xml \	23	--enable-xml \
24	--enable-shared \	24	--enable-shared \
25	--with-libxml1	25	--with-expat=${PREFIX}
26	CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}	26	CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
27		27
28	MAN1= neon-config.1	28	MAN1= neon-config.1

Added Link Here

(-)files/patch-configure (+23 lines)
1	--- configure.orig Fri Apr 26 17:15:20 2002
2	+++ configure Fri Apr 26 17:15:51 2002
3	@@ -10792,7 +10792,7 @@
4	_ACEOF
5
6	fi
7	-if test -r "$neon_expat_dir/expat.h"; then
8	+if test -r "$neon_expat_dir/include/expat.h"; then
9	ne_found_hdr=yes
10
11	cat >>confdefs.h <<\_ACEOF
12	@@ -10806,9 +10806,9 @@
13	#define HAVE_EXPAT 1
14	_ACEOF
15
16	- CFLAGS="$CFLAGS -I$neon_expat_dir"
17	+ CFLAGS="$CFLAGS -I$neon_expat_dir/include"
18	if test -z "$neon_using_libtool_expat"; then
19	- NEON_LIBS="$NEON_LIBS -L$neon_expat_dir -lexpat"
20	+ NEON_LIBS="$NEON_LIBS -L$neon_expat_dir/lib -lexpat"
21	fi
22	neon_xml_parser_message="expat in $neon_expat_dir"
23	neon_found_parser="yes"