diff options
author | mi <mi@FreeBSD.org> | 2004-05-05 05:26:41 +0800 |
---|---|---|
committer | mi <mi@FreeBSD.org> | 2004-05-05 05:26:41 +0800 |
commit | 8f8fe7a32d002909cfbb82f1d71b9e56322afe91 (patch) | |
tree | 2c4ddcfc441f35d6f9204b86b298ba7268d77390 /www/cadaver | |
parent | 277821f51df1bebb5fdfb738c85a8b3c6bfa1bcd (diff) | |
download | freebsd-ports-gnome-8f8fe7a32d002909cfbb82f1d71b9e56322afe91.tar.gz freebsd-ports-gnome-8f8fe7a32d002909cfbb82f1d71b9e56322afe91.tar.zst freebsd-ports-gnome-8f8fe7a32d002909cfbb82f1d71b9e56322afe91.zip |
Upgrade from 0.22.0 to 0.22.1 (April 14th). Drop expat-dependency --
this port uses whatever www/neon provides. Loosen the neon-dependency --
don't require the exact version of -lneon. Don't extract the expat and
libneon bundled with the cadaver -- to avoid #include-ing a wrong header
accidentally. Patch some warnings.
Diffstat (limited to 'www/cadaver')
-rw-r--r-- | www/cadaver/Makefile | 16 | ||||
-rw-r--r-- | www/cadaver/distinfo | 4 | ||||
-rw-r--r-- | www/cadaver/files/patch-warnings | 9 |
3 files changed, 21 insertions, 8 deletions
diff --git a/www/cadaver/Makefile b/www/cadaver/Makefile index 356d6134b7ad..e0f98ae164b5 100644 --- a/www/cadaver/Makefile +++ b/www/cadaver/Makefile @@ -6,27 +6,31 @@ # PORTNAME= cadaver -PORTVERSION= 0.22.0 -PORTREVISION= 1 +PORTVERSION= 0.22.1 CATEGORIES= www MASTER_SITES= http://www.webdav.org/cadaver/ MAINTAINER= ports@FreeBSD.org COMMENT= Commandline client for DAV -LIB_DEPENDS= expat.5:${PORTSDIR}/textproc/expat2 \ - neon.24:${PORTSDIR}/www/neon +LIB_DEPENDS= neon:${PORTSDIR}/www/neon USE_GETOPT_LONG= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CONFIGURE_ARGS= --enable-netrc \ - --with-expat +CONFIGURE_ARGS= --enable-netrc ALL_TARGET= cadaver MAN1= cadaver.1 PLIST_FILES= bin/cadaver +# Neither expat nor libneon are needed at all, but the configure +# script breaks if it can not find the Makefile* in them. Exclude +# them to be sure, a stray .h is not included instead of what's +# found under PREFIX (installed by the neon port): +EXTRACT_AFTER_ARGS= | ${TAR} -xf - \ + --exclude '${PORTNAME}-${PORTVERSION}/expat/*.[ch]' \ + --exclude '${PORTNAME}-${PORTVERSION}/libneon/*.[ch]' CPPFLAGS= -I${LOCALBASE}/include LDFLAGS= -L${LOCALBASE}/lib diff --git a/www/cadaver/distinfo b/www/cadaver/distinfo index 3829d3b1eabe..0a3ba2228f89 100644 --- a/www/cadaver/distinfo +++ b/www/cadaver/distinfo @@ -1,2 +1,2 @@ -MD5 (cadaver-0.22.0.tar.gz) = a46235f79b54f12c241d271edbc8be06 -SIZE (cadaver-0.22.0.tar.gz) = 442940 +MD5 (cadaver-0.22.1.tar.gz) = 21da0cbb5fb8f753926d0628e7f734b5 +SIZE (cadaver-0.22.1.tar.gz) = 441126 diff --git a/www/cadaver/files/patch-warnings b/www/cadaver/files/patch-warnings new file mode 100644 index 000000000000..7742e2dfaa87 --- /dev/null +++ b/www/cadaver/files/patch-warnings @@ -0,0 +1,9 @@ +--- src/cadaver.c Tue Apr 13 15:23:17 2004 ++++ src/cadaver.c Tue May 4 11:45:45 2004 +@@ -1015,5 +1015,5 @@ + (n==(len-1)?'>':' ')); + } +- printf(_("] %5.1f%% of %ld bytes"), pc*100, total); ++ printf(_("] %5.1f%% of %llu bytes"), pc*100, (unsigned long long)total); + fflush(stdout); + } |