Bump PKGREVISION for libpng shlib name change.

Also add some patches to remove use of deprecated symbols and fix other
problems when looking for or compiling against libpng-1.4.x.

39 files changed, 157 insertions, 75 deletions

diff --git a/www/amaya/Makefile b/www/amaya/Makefile
index 5fe6a9bdf4b..50efea94e15 100644
--- a/www/amaya/Makefile
+++ b/www/amaya/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.57 2010/01/18 09:59:30 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2010/06/13 22:45:32 wiz Exp $
 
 DISTNAME=	amaya-fullsrc-10.0.1
 PKGNAME=	${DISTNAME:S/-fullsrc//}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	http://www.w3.org/Amaya/Distribution/ \
 		ftp://ftp.w3.org/pub/amaya/ \
diff --git a/www/amaya/distinfo b/www/amaya/distinfo
index 0e1bec0f2d1..1dbcb5c35d7 100644
--- a/www/amaya/distinfo
+++ b/www/amaya/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2008/09/11 04:22:50 dholland Exp $
+$NetBSD: distinfo,v 1.20 2010/06/13 22:45:32 wiz Exp $
 
 SHA1 (amaya-fullsrc-10.0.1.tgz) = a2dcceedaa2c0256f04aaa86e3dc319d4ff26ade
 RMD160 (amaya-fullsrc-10.0.1.tgz) = d1a20a03a18ef3b06cf9dcbab907fb412de0ad6b
@@ -15,5 +15,5 @@ SHA1 (patch-al) = 172ab5106ecdc8fac825bcca8e57202010c980a3
 SHA1 (patch-am) = 152800baf4b750dbfe1bfa731313222b471d28ab
 SHA1 (patch-an) = 5d2e98d7046394960d7c172ed7d491ecb0f0992e
 SHA1 (patch-ao) = 34f6b0fe289d966c2a7553799be8bf59426091b4
-SHA1 (patch-ap) = d4ba3426bbeffc5f9f8f30002d4bb75e0c3816c6
+SHA1 (patch-ap) = 9d0eaa0bc05dc61f5d29cd78644fb854076590ce
 SHA1 (patch-aq) = 3885a77d86fa1c3892a6aab7c9538d119951cd4a
diff --git a/www/amaya/patches/patch-ap b/www/amaya/patches/patch-ap
index 4d3543350ed..d55dc7b901f 100644
--- a/www/amaya/patches/patch-ap
+++ b/www/amaya/patches/patch-ap
@@ -1,7 +1,7 @@
-$NetBSD: patch-ap,v 1.1 2008/09/11 04:22:50 dholland Exp $
+$NetBSD: patch-ap,v 1.2 2010/06/13 22:45:32 wiz Exp $
 
---- ../../wxWidgets/configure.orig	2007-05-14 05:08:25.000000000 -0400
-+++ ../../wxWidgets/configure	2008-09-08 06:27:09.000000000 -0400
+--- ../../wxWidgets/configure.orig	2007-05-14 09:08:25.000000000 +0000
++++ ../../wxWidgets/configure
 @@ -23470,43 +23470,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
@@ -78,6 +78,59 @@ $NetBSD: patch-ap,v 1.1 2008/09/11 04:22:50 dholland Exp $
    do
      if test -f "$ac_dir/X11/Intrinsic.h"; then
        ac_find_includes=$ac_dir
+@@ -24916,9 +24881,9 @@ echo "${ECHO_T}$ac_cv_header_png_h" >&6
+ 
+ 
+             if test "$ac_cv_header_png_h" = "yes"; then
+-                echo "$as_me:$LINENO: checking for png_check_sig in -lpng" >&5
+-echo $ECHO_N "checking for png_check_sig in -lpng... $ECHO_C" >&6
+-if test "${ac_cv_lib_png_png_check_sig+set}" = set; then
++                echo "$as_me:$LINENO: checking for png_sig_cmp in -lpng" >&5
++echo $ECHO_N "checking for png_sig_cmp in -lpng... $ECHO_C" >&6
++if test "${ac_cv_lib_png_png_sig_cmp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -24936,11 +24901,11 @@ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+-char png_check_sig ();
++char png_sig_cmp ();
+ int
+ main ()
+ {
+-png_check_sig ();
++png_sig_cmp ();
+   ;
+   return 0;
+ }
+@@ -24966,20 +24931,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_lib_png_png_check_sig=yes
++  ac_cv_lib_png_png_sig_cmp=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_png_png_check_sig=no
++ac_cv_lib_png_png_sig_cmp=no
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_check_sig" >&5
+-echo "${ECHO_T}$ac_cv_lib_png_png_check_sig" >&6
+-if test $ac_cv_lib_png_png_check_sig = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_sig_cmp" >&5
++echo "${ECHO_T}$ac_cv_lib_png_png_sig_cmp" >&6
++if test $ac_cv_lib_png_png_sig_cmp = yes; then
+   PNG_LINK=" -lpng -lz"
+ fi
+ 
 @@ -30134,7 +30099,7 @@ echo "$as_me: error: Unicode configurati
  echo $ECHO_N "checking for Motif/Lesstif headers... $ECHO_C" >&6
  
diff --git a/www/ap22-dnssd/Makefile b/www/ap22-dnssd/Makefile
index 5b88940b104..ead74feb509 100644
--- a/www/ap22-dnssd/Makefile
+++ b/www/ap22-dnssd/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2009/08/26 19:58:25 sno Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:45:32 wiz Exp $
 #
 
 DISTNAME=	mod_dnssd-0.5
 PKGNAME=	${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://0pointer.de/lennart/projects/mod_dnssd/
 
diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile
index 174fc462b80..4f160fc3408 100644
--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.82 2010/01/18 09:59:30 wiz Exp $
+# $NetBSD: Makefile,v 1.83 2010/06/13 22:45:32 wiz Exp $
 
 DISTNAME=	bluefish-1.0.7
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	www
 MASTER_SITES=	http://bluefish.mrball.net/stable/source/               \
 		http://www.bennewitz.com/bluefish/stable/source/
diff --git a/www/browser-bookmarks-menu/Makefile b/www/browser-bookmarks-menu/Makefile
index 1421f691390..35743398659 100644
--- a/www/browser-bookmarks-menu/Makefile
+++ b/www/browser-bookmarks-menu/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2010/02/10 19:17:47 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2010/06/13 22:45:32 wiz Exp $
 #
 
 DISTNAME=	browser-bookmarks-menu-0.6
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=browserbookapp/}
 
diff --git a/www/chimera/Makefile b/www/chimera/Makefile
index 026a984d4ca..8c9a3d05cb6 100644
--- a/www/chimera/Makefile
+++ b/www/chimera/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2010/01/18 09:59:30 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2010/06/13 22:45:32 wiz Exp $
 #
 
 DISTNAME=	chimera-2.0a19
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.cs.unlv.edu/pub/chimera-alpha/
 
diff --git a/www/chimera/distinfo b/www/chimera/distinfo
index f52170eca82..c3e8ef790fe 100644
--- a/www/chimera/distinfo
+++ b/www/chimera/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.6 2008/04/04 13:45:02 obache Exp $
+$NetBSD: distinfo,v 1.7 2010/06/13 22:45:32 wiz Exp $
 
 SHA1 (chimera-2.0a19.tar.gz) = c69b70b11cf12837e260eaa20e548bf9eb9ce309
 RMD160 (chimera-2.0a19.tar.gz) = d3f4d2ff3328c3bf5020490ed851b281e0492fe2
 Size (chimera-2.0a19.tar.gz) = 248431 bytes
-SHA1 (patch-aa) = 8e1f95a295f67f7357b2eb367e24492fd2d4d467
+SHA1 (patch-aa) = fb77753229ef9f2b9ef1424818ce704cdead18e0
 SHA1 (patch-ab) = 1fc2f5f97f46403359a00e42cc25f4cbf9bc5331
 SHA1 (patch-ac) = 5f18afd9a1452bfba010fe3eb4e773f5395789c6
-SHA1 (patch-ad) = 400a047e978ccb0c4ebcf69a93117b4c7ecfdddb
+SHA1 (patch-ad) = fcfc16397954269a8493017ca06707f043a0cf06
 SHA1 (patch-ae) = 8b8e1bc50791b635e5e87860302d0e758d159ed9
 SHA1 (patch-af) = 76256ccb4b5183a8d30a46a89a0cd75b113122fc
diff --git a/www/chimera/patches/patch-aa b/www/chimera/patches/patch-aa
index 1b116a9020b..1f53b694041 100644
--- a/www/chimera/patches/patch-aa
+++ b/www/chimera/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2008/04/04 13:45:02 obache Exp $
+$NetBSD: patch-aa,v 1.5 2010/06/13 22:45:32 wiz Exp $
 
 --- Common.tmpl.dist.orig	1999-05-30 21:43:52.000000000 +0000
 +++ Common.tmpl.dist
@@ -47,7 +47,7 @@ $NetBSD: patch-aa,v 1.4 2008/04/04 13:45:02 obache Exp $
 -PNGDEPLIB = $(PNGDIR)/lib/libpng$(IMGLEXT).a $(PNGDIR)/lib/libz$(IMGLEXT).a
 -*/
 +PNGLIB = -L$(PNGDIR)/lib -lpng$(IMGLEXT) -lz$(IMGLEXT) -Wl,-R$(PNGDIR)/lib
-+PNGDEPLIB = $(PNGDIR)/lib/libpng$(IMGLEXT).a
++PNGDEPLIB = $(PNGDIR)/lib/libpng14$(IMGLEXT).a
 +
  
  /* Tells Imakefile to set the flags for debugging.  Comment for -O. */
diff --git a/www/chimera/patches/patch-ad b/www/chimera/patches/patch-ad
index 3179b09d1d1..f9077ca4c62 100644
--- a/www/chimera/patches/patch-ad
+++ b/www/chimera/patches/patch-ad
@@ -1,8 +1,26 @@
-$NetBSD: patch-ad,v 1.3 2002/03/15 00:07:37 fredb Exp $
+$NetBSD: patch-ad,v 1.4 2010/06/13 22:45:32 wiz Exp $
 
---- image/png.c.orig	Mon Mar 29 03:23:46 1999
+--- image/png.c.orig	1999-03-29 02:23:46.000000000 +0000
 +++ image/png.c
-@@ -222,17 +222,11 @@
+@@ -126,7 +126,7 @@ lf_info_callback(png_struct *state, png_
+ 
+             val = 0;
+             for (i = 0; i < info->num_trans; ++i) {
+-                if (info->trans[i] < info->trans[val])
++                if (info->trans_alpha[i] < info->trans_alpha[val])
+                     val = i;
+             }
+             png->image->transparent = val;
+@@ -154,7 +154,7 @@ lf_info_callback(png_struct *state, png_
+         png->image->rgb.used = maxval + 1;
+ 
+         if (info->valid & PNG_INFO_tRNS)
+-            png->image->transparent = info->trans_values.gray;
++            png->image->transparent = info->trans_color.gray;
+     } else {
+         png->image = newTrueImage(info->width, info->height);
+        if (!png->image) {
+@@ -222,17 +222,11 @@ pngDestroy(void *pointer)
      if (setjmp(png->state->jmpbuf))
          return;
  
@@ -22,7 +40,7 @@ $NetBSD: patch-ad,v 1.3 2002/03/15 00:07:37 fredb Exp $
      if (png->image) {
          freeImage(png->image);
          png->image = 0;
-@@ -275,27 +269,21 @@
+@@ -275,28 +269,22 @@ pngInit(void (*lineProc)(void *, int, in
      memset(png, 0, sizeof(pngState));
      png->lineProc = lineProc;
      png->closure = closure;
@@ -49,9 +67,10 @@ $NetBSD: patch-ad,v 1.3 2002/03/15 00:07:37 fredb Exp $
 +        png_destroy_read_struct(&png->state, &png->info, (png_info **)NULL);
          return;
      }
--
+ 
 -    png_info_init(png->info);
 -    png_read_init(png->state);
- 
+-
      png_set_progressive_read_fn(png->state, (void *) png, lf_info_callback,
          lf_row_callback, lf_end_callback);
+     png->done = image_need_data;
diff --git a/www/dillo/Makefile b/www/dillo/Makefile
index 47881a75f08..0cbf491b9c4 100644
--- a/www/dillo/Makefile
+++ b/www/dillo/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.47 2010/02/14 20:19:24 snj Exp $
+# $NetBSD: Makefile,v 1.48 2010/06/13 22:45:32 wiz Exp $
 
 DISTNAME=	dillo-2.2
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.dillo.org/download/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/www/drivel/Makefile b/www/drivel/Makefile
index cc5e22fd2ef..d9804962c70 100644
--- a/www/drivel/Makefile
+++ b/www/drivel/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.50 2010/01/18 09:59:30 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2010/06/13 22:45:32 wiz Exp $
 #
 
 DISTNAME=	drivel-2.0.3
-PKGREVISION=	12
+PKGREVISION=	13
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=drivel/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index 2076f51ce9c..db1f18bbba0 100644
--- a/www/epiphany-extensions/Makefile
+++ b/www/epiphany-extensions/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.56 2010/01/18 09:59:31 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2010/06/13 22:45:33 wiz Exp $
 #
 
 DISTNAME=	epiphany-extensions-2.28.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/epiphany-extensions/2.28/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 88e5678b20e..f5454271d4d 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.105 2010/06/11 08:33:00 wiz Exp $
+# $NetBSD: Makefile,v 1.106 2010/06/13 22:45:33 wiz Exp $
 #
 
 DISTNAME=	epiphany-2.28.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/epiphany/2.28/}
 EXTRACT_SUFX=	.tar.bz2
@@ -21,6 +21,7 @@ USE_LANGUAGES=		c c++
 
 PKGCONFIG_OVERRIDE=	data/epiphany-2.28.pc
 
+# needed for epiphany-2.28 and gtk2-2.20 -- remove on next update
 BUILDLINK_TRANSFORM+=	rm:-DG_DISABLE_DEPRECATED
 BUILDLINK_TRANSFORM+=	rm:-DGDK_DISABLE_DEPRECATED
 BUILDLINK_TRANSFORM+=	rm:-DGDK_PIXBUF_DISABLE_DEPRECATED
diff --git a/www/epiphany/buildlink3.mk b/www/epiphany/buildlink3.mk
index 6ba20b897b5..b9e4c2c429d 100644
--- a/www/epiphany/buildlink3.mk
+++ b/www/epiphany/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.32 2010/01/18 09:59:30 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.33 2010/06/13 22:45:33 wiz Exp $
 #
 
 BUILDLINK_TREE+=	epiphany
@@ -7,7 +7,7 @@ BUILDLINK_TREE+=	epiphany
 EPIPHANY_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.epiphany+=		epiphany>=2.28
-BUILDLINK_ABI_DEPENDS.epiphany?=		epiphany>=2.28.2nb1
+BUILDLINK_ABI_DEPENDS.epiphany?=		epiphany>=2.28.2nb2
 BUILDLINK_PKGSRCDIR.epiphany?=		../../www/epiphany
 
 .include "../../mk/bsd.fast.prefs.mk"
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index e84ed2b04bc..d499e461fb7 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.73 2010/04/02 20:28:24 tnn Exp $
+# $NetBSD: Makefile,v 1.74 2010/06/13 22:45:33 wiz Exp $
 
 .include "../../devel/xulrunner/dist.mk"
 PKGNAME=	firefox-${FIREFOX_VER}
+PKGREVISION=	1
 CATEGORIES=	www
 
 MAINTAINER=	tnn@NetBSD.org
diff --git a/www/gtkhtml314/Makefile b/www/gtkhtml314/Makefile
index 41d3e073387..b482e786eb6 100644
--- a/www/gtkhtml314/Makefile
+++ b/www/gtkhtml314/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2010/06/05 11:34:29 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2010/06/13 22:45:33 wiz Exp $
 #
 # PKGNAME derives from the supported API (still from
 # release 3.14). See also PLIST.
@@ -6,6 +6,7 @@
 
 DISTNAME=	gtkhtml-3.30.1
 PKGNAME=	${DISTNAME:S/gtkhtml/gtkhtml314/}
+PKGREVISION=	1
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtkhtml/3.30/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/www/htmldoc/Makefile b/www/htmldoc/Makefile
index 81e6bc4b89f..db24d6faa79 100644
--- a/www/htmldoc/Makefile
+++ b/www/htmldoc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2010/01/18 09:59:31 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2010/06/13 22:45:33 wiz Exp $
 
 # This section contains variables that might be overridden.
 PKGNAME?=	${PKGNAME_BASE}
@@ -7,7 +7,7 @@ COMMENT?=	Converts HTML to indexed HTML, PDF and/or PostScript
 # Normal package Makefile contents follow.
 DISTNAME=	htmldoc-1.8.27-source
 PKGNAME_BASE=	${DISTNAME:S/-source//}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.easysw.com/pub/htmldoc/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/www/kazehakase/Makefile b/www/kazehakase/Makefile
index e44ff3764ff..4e9bda341a8 100644
--- a/www/kazehakase/Makefile
+++ b/www/kazehakase/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.34 2010/06/11 09:40:27 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2010/06/13 22:45:33 wiz Exp $
 #
 
-
 DISTNAME=	kazehakase-0.5.8
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP:=kazehakase/43802/}
 
diff --git a/www/kdewebdev3/Makefile b/www/kdewebdev3/Makefile
index 0bd426459bb..cc026734714 100644
--- a/www/kdewebdev3/Makefile
+++ b/www/kdewebdev3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2010/01/18 09:59:31 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2010/06/13 22:45:33 wiz Exp $
 
 DISTNAME=	kdewebdev-${_KDE_VERSION}
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	www
 COMMENT=	HTML editor and tools suitable for experienced web developers
 
diff --git a/www/kdewebdev4/Makefile b/www/kdewebdev4/Makefile
index 870d0a93450..ff3417c5f6f 100644
--- a/www/kdewebdev4/Makefile
+++ b/www/kdewebdev4/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2010/01/27 10:38:40 markd Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:45:33 wiz Exp $
 
 DISTNAME=	kdewebdev-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	www
 COMMENT=	HTML editor and tools suitable for experienced web developers
 
diff --git a/www/konq-plugins/Makefile b/www/konq-plugins/Makefile
index dfd43ef4298..23bac952c2e 100644
--- a/www/konq-plugins/Makefile
+++ b/www/konq-plugins/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2010/04/10 03:13:34 markd Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:45:33 wiz Exp $
 #
 
 DISTNAME=	konq-plugins-4.4.0
+PKGREVISION=	1
 CATEGORIES=	www kde
 MASTER_SITES=	${MASTER_SITE_KDE:=4.4.0/src/extragear/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile
index 7d987816748..aaf5521ab08 100644
--- a/www/libgtkhtml/Makefile
+++ b/www/libgtkhtml/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.50 2009/08/26 19:57:01 sno Exp $
+# $NetBSD: Makefile,v 1.51 2010/06/13 22:45:33 wiz Exp $
 #
 
 DISTNAME=	libgtkhtml-2.6.3
-PKGREVISION=	12
+PKGREVISION=	13
 CATEGORIES=	www devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgtkhtml/2.6/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/www/libgtkhtml/buildlink3.mk b/www/libgtkhtml/buildlink3.mk
index ab3bc9844c4..079a40a17b4 100644
--- a/www/libgtkhtml/buildlink3.mk
+++ b/www/libgtkhtml/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.23 2009/08/26 19:57:01 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.24 2010/06/13 22:45:33 wiz Exp $
 
 BUILDLINK_TREE+=	libgtkhtml
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libgtkhtml
 LIBGTKHTML_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libgtkhtml+=		libgtkhtml>=2.6.0
-BUILDLINK_ABI_DEPENDS.libgtkhtml+=	libgtkhtml>=2.6.3nb12
+BUILDLINK_ABI_DEPENDS.libgtkhtml+=	libgtkhtml>=2.6.3nb13
 BUILDLINK_PKGSRCDIR.libgtkhtml?=	../../www/libgtkhtml
 
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/www/liferea-current/Makefile b/www/liferea-current/Makefile
index 4f1ff434093..2bb519ac352 100644
--- a/www/liferea-current/Makefile
+++ b/www/liferea-current/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2010/02/24 18:37:09 drochner Exp $
+# $NetBSD: Makefile,v 1.14 2010/06/13 22:45:34 wiz Exp $
 
 DISTNAME=		liferea-1.6.3
+PKGREVISION=		1
 CATEGORIES=		www
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=liferea/}
 
diff --git a/www/liferea/Makefile b/www/liferea/Makefile
index 95aa3e63aa3..b9efc0e1d43 100644
--- a/www/liferea/Makefile
+++ b/www/liferea/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.89 2010/01/18 09:59:31 wiz Exp $
+# $NetBSD: Makefile,v 1.90 2010/06/13 22:45:34 wiz Exp $
 
 DISTNAME=		liferea-1.4.28
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		www
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=liferea/}
 
diff --git a/www/links-gui/Makefile b/www/links-gui/Makefile
index 829cf1e7a2a..7c58ff1c525 100644
--- a/www/links-gui/Makefile
+++ b/www/links-gui/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.59 2010/01/18 09:59:31 wiz Exp $
+# $NetBSD: Makefile,v 1.60 2010/06/13 22:45:34 wiz Exp $
 #
 
 PKGNAME=	${DISTNAME:S/links/&-gui/:S/pre/.0./}
-PKGREVISION=	3
+PKGREVISION=	4
 COMMENT=	Lynx-like text and graphics WWW browser
 
 CONFLICTS+=	links-[0-9]* elinks-0.3*
diff --git a/www/mMosaic/Makefile b/www/mMosaic/Makefile
index 6431569f3b3..0651abf4f42 100644
--- a/www/mMosaic/Makefile
+++ b/www/mMosaic/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2010/01/18 09:59:32 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2010/06/13 22:45:34 wiz Exp $
 #
 
 DISTNAME=	mMosaic-3.7.2
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.enst.fr/pub/mbone/mMosaic/
 
diff --git a/www/midori/Makefile b/www/midori/Makefile
index 89ca25de2e9..1735e026ceb 100644
--- a/www/midori/Makefile
+++ b/www/midori/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2010/05/19 18:01:29 drochner Exp $
+# $NetBSD: Makefile,v 1.21 2010/06/13 22:45:34 wiz Exp $
 
 DISTNAME=	midori-0.2.5
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://archive.xfce.org/src/apps/midori/0.2/
 
diff --git a/www/netsurf/Makefile b/www/netsurf/Makefile
index 0c0e70b6176..cd4fe0955f7 100644
--- a/www/netsurf/Makefile
+++ b/www/netsurf/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2010/06/11 09:42:21 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2010/06/13 22:45:34 wiz Exp $
 #
 
 DISTNAME=	netsurf-1.2-src
 PKGNAME=	${DISTNAME:S/-src$//}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	http://www.netsurf-browser.org/downloads/releases/
 
diff --git a/www/nspluginwrapper/Makefile b/www/nspluginwrapper/Makefile
index 18e363f19bf..0936df39c8e 100644
--- a/www/nspluginwrapper/Makefile
+++ b/www/nspluginwrapper/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2010/01/30 23:08:00 heinz Exp $
+# $NetBSD: Makefile,v 1.20 2010/06/13 22:45:34 wiz Exp $
 #
 
 DISTNAME=       nspluginwrapper-1.2.2
-PKGREVISION=    3
+PKGREVISION=    4
 CATEGORIES=     www
 MASTER_SITES=   http://gwenole.beauchesne.info/projects/nspluginwrapper/files/
 EXTRACT_SUFX=   .tar.bz2
diff --git a/www/p5-Apache-Gallery/Makefile b/www/p5-Apache-Gallery/Makefile
index c4ea0f0a324..9b7eb13fb7a 100644
--- a/www/p5-Apache-Gallery/Makefile
+++ b/www/p5-Apache-Gallery/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.44 2010/02/16 15:22:45 sno Exp $
+# $NetBSD: Makefile,v 1.45 2010/06/13 22:45:34 wiz Exp $
 #
 
 DISTNAME=	Apache-Gallery-0.9.1
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	10
+PKGREVISION=	11
 SVR4_PKGNAME=	p5aga
 CATEGORIES=	www graphics perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Apache/}
diff --git a/www/ruby-gnome2-gtkhtml2/Makefile b/www/ruby-gnome2-gtkhtml2/Makefile
index 0d5b55c2b17..9970d117e81 100644
--- a/www/ruby-gnome2-gtkhtml2/Makefile
+++ b/www/ruby-gnome2-gtkhtml2/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2009/10/12 03:09:32 obache Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:45:34 wiz Exp $
 #
 
 PKGNAME=		${RUBY_PKGPREFIX}-gnome2-gtkhtml2-${VERSION}
 COMMENT=		Ruby binding of gtkhtml2
+PKGREVISION=		1
 CATEGORIES=		www
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/www/ruby-gnome2-gtkmozembed/Makefile b/www/ruby-gnome2-gtkmozembed/Makefile
index 4424cb39c3a..370a7f2db21 100644
--- a/www/ruby-gnome2-gtkmozembed/Makefile
+++ b/www/ruby-gnome2-gtkmozembed/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2010/01/18 09:59:32 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2010/06/13 22:45:34 wiz Exp $
 #
 
 PKGNAME=		${RUBY_PKGPREFIX}-gnome2-gtkmozembed-${VERSION}
 COMMENT=		Ruby binding of gtkmozembed
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		www
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/www/sarg/Makefile b/www/sarg/Makefile
index 408159cdc0f..c71a0a50f26 100644
--- a/www/sarg/Makefile
+++ b/www/sarg/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2010/01/18 09:59:32 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2010/06/13 22:45:34 wiz Exp $
 
 DISTNAME=		sarg-2.1
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		www
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=sarg/}
 
diff --git a/www/skipstone/Makefile b/www/skipstone/Makefile
index 257e1d5e38c..f7d7a7c4ac2 100644
--- a/www/skipstone/Makefile
+++ b/www/skipstone/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2010/01/18 09:59:32 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2010/06/13 22:45:35 wiz Exp $
 
 DISTNAME=		skipstone-0.9.6
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		www
 MASTER_SITES=		${HOMEPAGE}
 
diff --git a/www/webalizer/Makefile b/www/webalizer/Makefile
index d3f3d033642..aaf91b592cc 100644
--- a/www/webalizer/Makefile
+++ b/www/webalizer/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.49 2010/06/02 13:13:14 adam Exp $
+# $NetBSD: Makefile,v 1.50 2010/06/13 22:45:35 wiz Exp $
 
 DISTNAME=	webalizer-2.21-02-src
 PKGNAME=	webalizer-2.21.2
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.mrunix.net/pub/webalizer/ \
 		http://webalizer.linux-mirror.org/pub/webalizer/ \
diff --git a/www/webkit-gtk/Makefile b/www/webkit-gtk/Makefile
index cb31ceeb6cc..16cec10ba11 100644
--- a/www/webkit-gtk/Makefile
+++ b/www/webkit-gtk/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2010/05/19 17:54:24 drochner Exp $
+# $NetBSD: Makefile,v 1.24 2010/06/13 22:45:35 wiz Exp $
 
 DISTNAME=	webkit-1.2.1
 PKGNAME=	${DISTNAME:S/webkit/webkit-gtk/}
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.webkitgtk.org/
 
diff --git a/www/webkit-gtk/buildlink3.mk b/www/webkit-gtk/buildlink3.mk
index 2bf04eb9805..940acd4a20f 100644
--- a/www/webkit-gtk/buildlink3.mk
+++ b/www/webkit-gtk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2010/01/18 09:59:32 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2010/06/13 22:45:35 wiz Exp $
 
 BUILDLINK_TREE+=	webkit-gtk
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	webkit-gtk
 WEBKIT_GTK_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.webkit-gtk+=	webkit-gtk>=1.1.3
-BUILDLINK_ABI_DEPENDS.webkit-gtk?=	webkit-gtk>=1.1.15.4nb2
+BUILDLINK_ABI_DEPENDS.webkit-gtk?=	webkit-gtk>=1.2.1nb1
 BUILDLINK_PKGSRCDIR.webkit-gtk?=	../../www/webkit-gtk
 
 .include "../../databases/sqlite3/buildlink3.mk"