From owner-freebsd-ports Fri Apr 26 15: 0:35 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id C8D0637B41A for ; Fri, 26 Apr 2002 15:00:06 -0700 (PDT) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3QM06g28337; Fri, 26 Apr 2002 15:00:06 -0700 (PDT) (envelope-from gnats) Received: from neroon.user.acm.rpi.edu (neroon.user.acm.rpi.edu [128.213.5.66]) by hub.freebsd.org (Postfix) with ESMTP id 22BAF37B419; Fri, 26 Apr 2002 14:57:27 -0700 (PDT) Received: (from rooneg@localhost) by neroon.user.acm.rpi.edu (8.11.6/8.11.6) id g3QLuWJ57124; Fri, 26 Apr 2002 17:56:32 -0400 (EDT) (envelope-from rooneg) Message-Id: <200204262156.g3QLuWJ57124@neroon.user.acm.rpi.edu> Date: Fri, 26 Apr 2002 17:56:32 -0400 (EDT) From: garrett rooney Reply-To: garrett rooney To: FreeBSD-gnats-submit@FreeBSD.org Cc: roberto@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/37494: [MAINTAINER UPDATE] update neon and subversion ports Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 37494 >Category: ports >Synopsis: [MAINTAINER UPDATE] update neon and subversion ports >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Apr 26 15:00:06 PDT 2002 >Closed-Date: >Last-Modified: >Originator: garrett rooney >Release: FreeBSD 4.5-STABLE i386 >Organization: >Environment: System: FreeBSD quicksilver.electricjellyfish.net 4.5-STABLE FreeBSD 4.5-STABLE #0: Tue Mar 19 21:41:22 EST 2002 rooneg@quicksilver.electricjellyfish.net:/usr/obj/usr/src/sys/QUICKSILVER i386 >Description: the neon port is out of date. version 0.19.4 was released a few days ago. the subversion port will also need to be patched to function with the newer neon. >How-To-Repeat: N/A >Fix: apply the following patches. in addition to updating the neon port, this also makes it depend on expat rather than libxml1. expat has significantly fewer dependencies than libxml1, and in the case of neon anyway, provides equivalent functionality. note: these patches include two new patches in the files directories, so a cvs add will be required in addition to simply applying the patches. first for neon: 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" and now for subversion: --- /dev/null Fri Apr 26 17:39:04 2002 +++ files/patch-build::buildcheck.sh Fri Apr 26 17:47:47 2002 @@ -0,0 +1,13 @@ +--- build/buildcheck.sh.orig Fri Apr 26 17:39:27 2002 ++++ build/buildcheck.sh Fri Apr 26 17:39:47 2002 +@@ -53,8 +53,8 @@ + #-------------------------------------------------------------------------- + # check for the correct version of Neon + # +-NEON_WANTED_REGEX=0.19.[2-3] +-NEON_LATEST_WORKING_VER=0.19.3 ++NEON_WANTED_REGEX=0.19.[2-4] ++NEON_LATEST_WORKING_VER=0.19.4 + NEON_URL="http://www.webdav.org/neon/neon-${NEON_LATEST_WORKING_VER}.tar.gz" + if test -d ./neon; then + NEON_VERSION="`./ac-helpers/get-neon-ver.sh neon`" >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message