Thu Dec 15 15:24:06 2011 UTC ()
build against pkgsrc neon which is newer than the bundled one,
should fix build error due to neon incompatibility with newer openssl
seen in bulk build
bump PKGREV


(drochner)
diff -r1.44 -r1.45 pkgsrc/www/sitecopy/Makefile
diff -r1.8 -r1.9 pkgsrc/www/sitecopy/distinfo
diff -r0 -r1.4 pkgsrc/www/sitecopy/patches/patch-ab
cvs diff -r1.44 -r1.45 pkgsrc/www/sitecopy/Makefile (expand / switch to unified diff)

--- pkgsrc/www/sitecopy/Makefile 2011/04/22 13:45:00 1.44
+++ pkgsrc/www/sitecopy/Makefile 2011/12/15 15:24:05 1.45
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: Makefile,v 1.44 2011/04/22 13:45:00 obache Exp $ 1# $NetBSD: Makefile,v 1.45 2011/12/15 15:24:05 drochner Exp $
2 2
3DISTNAME= sitecopy-0.16.6 3DISTNAME= sitecopy-0.16.6
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= www 5CATEGORIES= www
6MASTER_SITES= http://www.manyfish.co.uk/sitecopy/ 6MASTER_SITES= http://www.manyfish.co.uk/sitecopy/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.manyfish.co.uk/sitecopy/ 9HOMEPAGE= http://www.manyfish.co.uk/sitecopy/
10COMMENT= Utility for synchronizing remote and local web sites 10COMMENT= Utility for synchronizing remote and local web sites
11 11
12PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
13 13
14USE_FEATURES= getopt_long 14USE_FEATURES= getopt_long
15USE_TOOLS+= gmake msgfmt 15USE_TOOLS+= gmake msgfmt
16USE_PKGLOCALEDIR= yes 16USE_PKGLOCALEDIR= yes
17 17
18GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
19CONFIGURE_ARGS+= --with-ssl 19CONFIGURE_ARGS+= --with-ssl
20CONFIGURE_ARGS+= --with-included-neon 20#CONFIGURE_ARGS+= --with-included-neon
21CONFIGURE_ARGS+= --with-libxml2 21CONFIGURE_ARGS+= --with-libxml2
22 22
23# The build process doesn't correctly find the header for GNU fnmatch, which 23# The build process doesn't correctly find the header for GNU fnmatch, which
24# is provided in ${WRKSRC}/lib. Help the compiler by linking the header 24# is provided in ${WRKSRC}/lib. Help the compiler by linking the header
25# to ${WRKSRC} and explicitly passing -I. to the compiler. 25# to ${WRKSRC} and explicitly passing -I. to the compiler.
26# 26#
27CFLAGS+= -I. 27CFLAGS+= -I.
28 28
29pre-build: 29pre-build:
30 ${RM} -f ${WRKSRC:Q}/fnmatch.h 30 ${RM} -f ${WRKSRC:Q}/fnmatch.h
31 ${LN} -sf ${WRKSRC:Q}/lib/fnmatch.h ${WRKSRC:Q}/fnmatch.h 31 ${LN} -sf ${WRKSRC:Q}/lib/fnmatch.h ${WRKSRC:Q}/fnmatch.h
32 32
33.include "../../devel/gettext-lib/buildlink3.mk" 33.include "../../devel/gettext-lib/buildlink3.mk"
34.include "../../security/openssl/buildlink3.mk" 34.include "../../security/openssl/buildlink3.mk"
35.include "../../textproc/libxml2/buildlink3.mk" 35.include "../../www/neon/buildlink3.mk"
36 36
37.include "../../mk/pthread.buildlink3.mk" 37.include "../../mk/pthread.buildlink3.mk"
38.include "../../mk/bsd.pkg.mk" 38.include "../../mk/bsd.pkg.mk"
cvs diff -r1.8 -r1.9 pkgsrc/www/sitecopy/distinfo (expand / switch to unified diff)

--- pkgsrc/www/sitecopy/distinfo 2010/03/14 21:06:15 1.8
+++ pkgsrc/www/sitecopy/distinfo 2011/12/15 15:24:05 1.9
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.8 2010/03/14 21:06:15 gls Exp $ 1$NetBSD: distinfo,v 1.9 2011/12/15 15:24:05 drochner Exp $
2 2
3SHA1 (sitecopy-0.16.6.tar.gz) = 2de3679d98c31331f48ff10e824c615a180f2d3b 3SHA1 (sitecopy-0.16.6.tar.gz) = 2de3679d98c31331f48ff10e824c615a180f2d3b
4RMD160 (sitecopy-0.16.6.tar.gz) = 9e1bb73272e88aa06ebf12323080f23dfe8f7ad8 4RMD160 (sitecopy-0.16.6.tar.gz) = 9e1bb73272e88aa06ebf12323080f23dfe8f7ad8
5Size (sitecopy-0.16.6.tar.gz) = 1022265 bytes 5Size (sitecopy-0.16.6.tar.gz) = 1022265 bytes
6SHA1 (patch-aa) = 191f7e417f41fc6c5a140b2df03a01ae54e74120 6SHA1 (patch-aa) = 191f7e417f41fc6c5a140b2df03a01ae54e74120
 7SHA1 (patch-ab) = 1c5301ffa91e67bf56933614a08955c9c0c635dc
File Added: pkgsrc/www/sitecopy/patches/patch-ab
$NetBSD: patch-ab,v 1.4 2011/12/15 15:24:05 drochner Exp $

--- configure.orig	2011-03-19 14:55:03.000000000 +0000
+++ configure
@@ -8456,7 +8456,7 @@ fi
 echo "${ECHO_T}$ne_cv_lib_neon" >&6; }
     if test "$ne_cv_lib_neon" = "yes"; then
        ne_cv_lib_neonver=no
-       for v in 24 25 26 27 28; do
+       for v in 24 25 26 27 28 29; do
           case $ne_libver in
           0.$v.*) ne_cv_lib_neonver=yes ;;
           esac