Wed Mar 18 12:40:52 2009 UTC ()
ntohl etc are in POSIX, no need for _NETBSD_SOURCE


(drochner)
diff -r1.3 -r1.4 pkgsrc/www/libproxy/distinfo
diff -r1.3 -r1.4 pkgsrc/www/libproxy/patches/patch-aa
cvs diff -r1.3 -r1.4 pkgsrc/www/libproxy/distinfo (expand / switch to unified diff)

--- pkgsrc/www/libproxy/distinfo 2009/03/18 03:55:29 1.3
+++ pkgsrc/www/libproxy/distinfo 2009/03/18 12:40:52 1.4
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.3 2009/03/18 03:55:29 hasso Exp $ 1$NetBSD: distinfo,v 1.4 2009/03/18 12:40:52 drochner Exp $
2 2
3SHA1 (libproxy-0.2.3.tar.gz) = 2b2b00a179740548035a1145bbae600db9b0a2ce 3SHA1 (libproxy-0.2.3.tar.gz) = 2b2b00a179740548035a1145bbae600db9b0a2ce
4RMD160 (libproxy-0.2.3.tar.gz) = c86c4f8403cb879380e101d074af469c960b5c1c 4RMD160 (libproxy-0.2.3.tar.gz) = c86c4f8403cb879380e101d074af469c960b5c1c
5Size (libproxy-0.2.3.tar.gz) = 378773 bytes 5Size (libproxy-0.2.3.tar.gz) = 378773 bytes
6SHA1 (patch-aa) = b657736fc5dd29c33f099b757cfbe98735736dc5 6SHA1 (patch-aa) = 6e6c7b1e0e396bed522480ca6fb347c5787a1359
7SHA1 (patch-ab) = 092f99af979d3a456e188386a3e62da1ac6e843d 7SHA1 (patch-ab) = 092f99af979d3a456e188386a3e62da1ac6e843d
8SHA1 (patch-ac) = 891e6217c1d7cd78a5f57afb8b1267aed8c1de75 8SHA1 (patch-ac) = 891e6217c1d7cd78a5f57afb8b1267aed8c1de75
9SHA1 (patch-ad) = f88c2818f861533a504119333e5aff44bb12ce0f 9SHA1 (patch-ad) = f88c2818f861533a504119333e5aff44bb12ce0f
cvs diff -r1.3 -r1.4 pkgsrc/www/libproxy/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/www/libproxy/patches/Attic/patch-aa 2009/03/18 03:55:29 1.3
+++ pkgsrc/www/libproxy/patches/Attic/patch-aa 2009/03/18 12:40:52 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-aa,v 1.3 2009/03/18 03:55:29 hasso Exp $ 1$NetBSD: patch-aa,v 1.4 2009/03/18 12:40:52 drochner Exp $
2 2
3--- configure.ac.orig 2008-06-05 23:56:16 +0300 3--- configure.ac.orig 2008-06-05 23:56:16 +0300
4+++ configure.ac 2009-03-18 05:25:38 +0200 4+++ configure.ac 2009-03-18 05:25:38 +0200
5@@ -41,14 +41,14 @@ AC_ARG_WITH([gnome], 5@@ -41,14 +41,14 @@ AC_ARG_WITH([gnome],
6 [AS_HELP_STRING([--with-gnome], 6 [AS_HELP_STRING([--with-gnome],
7 [build GNOME configuration plugin @<:@automatic@:>@])], 7 [build GNOME configuration plugin @<:@automatic@:>@])],
8 [], 8 [],
9- [test x$have_gconf == xyes &&  9- [test x$have_gconf == xyes &&
10- test x$have_x11 == xyes && 10- test x$have_x11 == xyes &&
11- test x$have_xmu == xyes && 11- test x$have_xmu == xyes &&
12+ [test x$have_gconf = xyes &&  12+ [test x$have_gconf = xyes &&
13+ test x$have_x11 = xyes && 13+ test x$have_x11 = xyes &&
14+ test x$have_xmu = xyes && 14+ test x$have_xmu = xyes &&
@@ -66,33 +66,30 @@ $NetBSD: patch-aa,v 1.3 2009/03/18 03:55 @@ -66,33 +66,30 @@ $NetBSD: patch-aa,v 1.3 2009/03/18 03:55
66 AC_SUBST(MOZJS_CFLAGS) 66 AC_SUBST(MOZJS_CFLAGS)
67@@ -133,9 +133,9 @@ AC_ARG_WITH([networkmanager], 67@@ -133,9 +133,9 @@ AC_ARG_WITH([networkmanager],
68 [AS_HELP_STRING([--with-networkmanager], 68 [AS_HELP_STRING([--with-networkmanager],
69 [build NetworkManager plugin @<:@automatic@:>@])], 69 [build NetworkManager plugin @<:@automatic@:>@])],
70 [], 70 [],
71- [test x$have_networkmanager == xyes && with_networkmanager=yes]) 71- [test x$have_networkmanager == xyes && with_networkmanager=yes])
72+ [test x$have_networkmanager = xyes && with_networkmanager=yes]) 72+ [test x$have_networkmanager = xyes && with_networkmanager=yes])
73 if test x$with_networkmanager = xyes; then 73 if test x$with_networkmanager = xyes; then
74- if test x$have_networkmanager == xyes; then 74- if test x$have_networkmanager == xyes; then
75+ if test x$have_networkmanager = xyes; then 75+ if test x$have_networkmanager = xyes; then
76 NETWORKMANAGER_CFLAGS="$NetworkManager_CFLAGS" 76 NETWORKMANAGER_CFLAGS="$NetworkManager_CFLAGS"
77 NETWORKMANAGER_LIBS="$NetworkManager_LIBS" 77 NETWORKMANAGER_LIBS="$NetworkManager_LIBS"
78 AC_SUBST(NETWORKMANAGER_CFLAGS) 78 AC_SUBST(NETWORKMANAGER_CFLAGS)
79@@ -178,10 +178,19 @@ PLUGINDIR=$libdir/$PACKAGE_NAME/$PACKAGE 79@@ -176,12 +176,15 @@ AC_C_CONST
 80 AC_TYPE_SIZE_T
 81 PLUGINDIR=$libdir/$PACKAGE_NAME/$PACKAGE_VERSION/plugins
80 AC_SUBST(PLUGINDIR) 82 AC_SUBST(PLUGINDIR)
81 CFLAGS="-g -std=c99 $CFLAGS -DPLUGINDIR=\\\"$PLUGINDIR\\\" -DSYSCONFDIR=\\\"$sysconfdir\\\" -D_POSIX_C_SOURCE=1" 83-CFLAGS="-g -std=c99 $CFLAGS -DPLUGINDIR=\\\"$PLUGINDIR\\\" -DSYSCONFDIR=\\\"$sysconfdir\\\" -D_POSIX_C_SOURCE=1"
 84+CFLAGS="-g -std=c99 $CFLAGS -DPLUGINDIR=\\\"$PLUGINDIR\\\" -DSYSCONFDIR=\\\"$sysconfdir\\\" -D_POSIX_C_SOURCE=200112"
82  85
83+case $host_os in 
84+ netbsd*) 
85+ CFLAGS="$CFLAGS -D_NETBSD_SOURCE" 
86+ ;; 
87+esac 
88+ 
89 ### Checks for library functions. 86 ### Checks for library functions.
90 AC_FUNC_MALLOC 87 AC_FUNC_MALLOC
91 #AC_CHECK_FUNCS([gethostbyname gethostname memset socket strdup strstr]) 88 #AC_CHECK_FUNCS([gethostbyname gethostname memset socket strdup strstr])
92  89
93+AC_CHECK_LIB(dl, dlopen, DL_LIBS="-ldl") 90+AC_CHECK_LIB(dl, dlopen, DL_LIBS="-ldl")
94+AC_SUBST(DL_LIBS) 91+AC_SUBST(DL_LIBS)
95+ 92+
96 AC_CONFIG_FILES([libproxy-1.0.pc Makefile src/Makefile src/lib/Makefile 93 AC_CONFIG_FILES([libproxy-1.0.pc Makefile src/Makefile src/lib/Makefile
97 src/plugins/Makefile src/bin/Makefile src/bindings/Makefile 94 src/plugins/Makefile src/bin/Makefile src/bindings/Makefile
98 src/bindings/python/Makefile src/bindings/java/Makefile 95 src/bindings/python/Makefile src/bindings/java/Makefile