From c3512e82cfd1ef757581484eb740c7cd398411b9 Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Sun, 13 Jun 2010 22:43:46 +0000
Subject: 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.

---
 editors/Sigil/Makefile          |  3 ++-
 editors/abiword/Makefile        |  4 ++--
 editors/beaver/Makefile         |  4 ++--
 editors/conglomerate/Makefile   |  4 ++--
 editors/dasher/Makefile         |  4 ++--
 editors/gconf-editor/Makefile   |  4 ++--
 editors/gedit/Makefile          |  3 ++-
 editors/gedit/buildlink3.mk     |  4 ++--
 editors/ghex/Makefile           |  4 ++--
 editors/gice/Makefile           |  4 ++--
 editors/gobby/Makefile          |  3 ++-
 editors/gtranslator/Makefile    |  4 ++--
 editors/kdissert/Makefile       |  4 ++--
 editors/kile/Makefile           |  4 ++--
 editors/leafpad/Makefile        |  3 ++-
 editors/lyx/Makefile            |  3 ++-
 editors/mlview/Makefile         |  4 ++--
 editors/notecase/Makefile       |  4 ++--
 editors/p5-Padre/Makefile       |  3 ++-
 editors/poedit/Makefile         |  3 ++-
 editors/tea/Makefile            |  4 ++--
 editors/ted/Makefile            | 11 ++++++-----
 editors/texmaker/Makefile       |  4 ++--
 editors/tomboy/Makefile         |  4 ++--
 editors/vim-gtk2/Makefile       |  4 ++--
 editors/xfce4-mousepad/Makefile |  3 ++-
 26 files changed, 56 insertions(+), 47 deletions(-)

(limited to 'editors')

diff --git a/editors/Sigil/Makefile b/editors/Sigil/Makefile
index 0764d6f1c64..e58b0f88888 100644
--- a/editors/Sigil/Makefile
+++ b/editors/Sigil/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2010/02/16 15:37:05 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2010/06/13 22:44:11 wiz Exp $
 #
 
 DISTNAME=	Sigil-0.1.9-Code
 PKGNAME=	${DISTNAME:S/-Code//}
+PKGREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	http://sigil.googlecode.com/files/
 EXTRACT_SUFX=	.zip
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index 4a962fa1e6e..60893fc9416 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.122 2010/01/18 09:58:47 wiz Exp $
+# $NetBSD: Makefile,v 1.123 2010/06/13 22:44:11 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "Makefile.common"
 
-PKGREVISION=	4
+PKGREVISION=	6
 
 COMMENT=	Open Source cross-platform word processor
 
diff --git a/editors/beaver/Makefile b/editors/beaver/Makefile
index cd143e23c7a..87c7b15310a 100644
--- a/editors/beaver/Makefile
+++ b/editors/beaver/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2009/08/26 19:57:23 sno Exp $
+# $NetBSD: Makefile,v 1.17 2010/06/13 22:44:11 wiz Exp $
 #
 
 DISTNAME=	beaver${BEAVER_VERSION:S/./_/g}
 PKGNAME=	beaver-${BEAVER_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	editors
 MASTER_SITES=	http://download.savannah.gnu.org/releases/beaver/0.3.0.1%20-%202008.06.26/
 EXTRACT_SUFX=	.tgz
diff --git a/editors/conglomerate/Makefile b/editors/conglomerate/Makefile
index 72f70783cf7..3298590e25e 100644
--- a/editors/conglomerate/Makefile
+++ b/editors/conglomerate/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.60 2010/04/14 23:58:47 wiz Exp $
+# $NetBSD: Makefile,v 1.61 2010/06/13 22:44:11 wiz Exp $
 #
 
 DISTNAME=	conglomerate-0.9.1
-PKGREVISION=	11
+PKGREVISION=	12
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=conglomerate/}
 
diff --git a/editors/dasher/Makefile b/editors/dasher/Makefile
index a35cca65cf7..ee92ae7d79f 100644
--- a/editors/dasher/Makefile
+++ b/editors/dasher/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.54 2010/01/22 19:55:07 ghen Exp $
+# $NetBSD: Makefile,v 1.55 2010/06/13 22:44:11 wiz Exp $
 
 DISTNAME=	dasher-4.10.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	editors gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/dasher/4.10/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/editors/gconf-editor/Makefile b/editors/gconf-editor/Makefile
index 1e1a4c8e581..257ee146c2c 100644
--- a/editors/gconf-editor/Makefile
+++ b/editors/gconf-editor/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.67 2010/06/11 08:36:19 wiz Exp $
+# $NetBSD: Makefile,v 1.68 2010/06/13 22:44:11 wiz Exp $
 #
 
 DISTNAME=		gconf-editor-2.28.0
-#PKGREVISION=		1
+PKGREVISION=		1
 CATEGORIES=		editors gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gconf-editor/2.28/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index e97c16252dc..31809a755dc 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.103 2010/04/13 16:52:39 drochner Exp $
+# $NetBSD: Makefile,v 1.104 2010/06/13 22:44:12 wiz Exp $
 #
 
 DISTNAME=		gedit-2.28.4
+PKGREVISION=		1
 CATEGORIES=		editors gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gedit/2.28/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/editors/gedit/buildlink3.mk b/editors/gedit/buildlink3.mk
index 89cfec6a851..7a46874f857 100644
--- a/editors/gedit/buildlink3.mk
+++ b/editors/gedit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2009/08/26 19:57:06 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2010/06/13 22:44:12 wiz Exp $
 
 BUILDLINK_TREE+=	gedit
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	gedit
 GEDIT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gedit+=	gedit>=2.12.1nb4
-BUILDLINK_ABI_DEPENDS.gedit?=	gedit>=2.26.3nb1
+BUILDLINK_ABI_DEPENDS.gedit?=	gedit>=2.28.4nb1
 BUILDLINK_PKGSRCDIR.gedit?=	../../editors/gedit
 
 .include "../../x11/gtksourceview2/buildlink3.mk"
diff --git a/editors/ghex/Makefile b/editors/ghex/Makefile
index 3946d625121..ee9ba7b9e69 100644
--- a/editors/ghex/Makefile
+++ b/editors/ghex/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2010/01/29 19:43:32 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:44:12 wiz Exp $
 #
 
 DISTNAME=	ghex-2.24.0
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/ghex/2.24/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/editors/gice/Makefile b/editors/gice/Makefile
index 557738af7c4..a3406bf3daf 100644
--- a/editors/gice/Makefile
+++ b/editors/gice/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2009/08/26 19:57:24 sno Exp $
+# $NetBSD: Makefile,v 1.31 2010/06/13 22:44:12 wiz Exp $
 #
 
 DISTNAME=		gice-0.6.2
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		editors
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gice/}
 EXTRACT_SUFX=		.tgz
diff --git a/editors/gobby/Makefile b/editors/gobby/Makefile
index f7b13a1e02b..4541469ad91 100644
--- a/editors/gobby/Makefile
+++ b/editors/gobby/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2009/10/27 19:47:54 drochner Exp $
+# $NetBSD: Makefile,v 1.11 2010/06/13 22:44:12 wiz Exp $
 #
 
 DISTNAME=	gobby-0.4.11
+PKGREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	http://releases.0x539.de/gobby/
 
diff --git a/editors/gtranslator/Makefile b/editors/gtranslator/Makefile
index 59b7db6ee77..44010f3d508 100644
--- a/editors/gtranslator/Makefile
+++ b/editors/gtranslator/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2010/01/18 09:58:48 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2010/06/13 22:44:12 wiz Exp $
 
 DISTNAME=	gtranslator-1.1.7
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtranslator/1.1/}
 
diff --git a/editors/kdissert/Makefile b/editors/kdissert/Makefile
index eff8fad5b9a..01ebcbaa57d 100644
--- a/editors/kdissert/Makefile
+++ b/editors/kdissert/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2010/04/01 06:07:43 obache Exp $
+# $NetBSD: Makefile,v 1.26 2010/06/13 22:44:12 wiz Exp $
 #
 
 DISTNAME=		kdissert-1.0.7
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		editors
 MASTER_SITES=		http://freehackers.org/~tnagy/kdissert/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/editors/kile/Makefile b/editors/kile/Makefile
index 67f4947a82d..205f37c9a01 100644
--- a/editors/kile/Makefile
+++ b/editors/kile/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.52 2010/01/18 09:58:48 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2010/06/13 22:44:12 wiz Exp $
 
 DISTNAME=		kile-2.0.2
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		editors kde
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=kile/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/editors/leafpad/Makefile b/editors/leafpad/Makefile
index b0a2ac722ed..c7b5b80ac9c 100644
--- a/editors/leafpad/Makefile
+++ b/editors/leafpad/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2009/11/17 03:55:19 snj Exp $
+# $NetBSD: Makefile,v 1.20 2010/06/13 22:44:12 wiz Exp $
 
 DISTNAME=	leafpad-0.8.17
+PKGREVISION=	1
 CATEGORIES=	editors gnome
 MASTER_SITES=	http://savannah.nongnu.org/download/leafpad/
 
diff --git a/editors/lyx/Makefile b/editors/lyx/Makefile
index a0451371b41..0e56942df5c 100644
--- a/editors/lyx/Makefile
+++ b/editors/lyx/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2010/05/06 10:46:49 drochner Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:44:12 wiz Exp $
 #
 
 DISTNAME=		lyx-1.6.5
+PKGREVISION=		1
 CATEGORIES=		editors
 MASTER_SITES=		ftp://ftp.lyx.org/pub/lyx/stable/1.6.x/ \
 			http://gd.tuwien.ac.at/publishing/tex/lyx/stable/1.6.x/ \
diff --git a/editors/mlview/Makefile b/editors/mlview/Makefile
index ac471800b23..96791ab2dc4 100644
--- a/editors/mlview/Makefile
+++ b/editors/mlview/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.40 2010/01/18 09:58:48 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2010/06/13 22:44:12 wiz Exp $
 #
 
 DISTNAME=	mlview-0.9.0
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	editors gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/mlview/0.9/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/editors/notecase/Makefile b/editors/notecase/Makefile
index 935bc9c809d..579960b105c 100644
--- a/editors/notecase/Makefile
+++ b/editors/notecase/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2010/01/29 19:54:39 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2010/06/13 22:44:12 wiz Exp $
 #
 
 DISTNAME=	notecase-1.8.8_src
 PKGNAME=	notecase-1.8.8
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=notecase/}
 
diff --git a/editors/p5-Padre/Makefile b/editors/p5-Padre/Makefile
index f79d90f111d..32fdf767e68 100644
--- a/editors/p5-Padre/Makefile
+++ b/editors/p5-Padre/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2010/03/09 21:56:59 sno Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:44:13 wiz Exp $
 #
 
 DISTNAME=	Padre-0.58
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	editors perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Padre/}
 
diff --git a/editors/poedit/Makefile b/editors/poedit/Makefile
index c86e3863db0..b3d73aa5db9 100644
--- a/editors/poedit/Makefile
+++ b/editors/poedit/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2010/06/02 12:32:18 adam Exp $
+# $NetBSD: Makefile,v 1.29 2010/06/13 22:44:13 wiz Exp $
 
 DISTNAME=	poedit-1.4.6.1
+PKGREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=poedit/}
 
diff --git a/editors/tea/Makefile b/editors/tea/Makefile
index 364779fea21..d85318784af 100644
--- a/editors/tea/Makefile
+++ b/editors/tea/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2009/08/26 19:57:26 sno Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:44:13 wiz Exp $
 #
 
 DISTNAME=		tea-16.0.5
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		editors
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=tea-editor/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/editors/ted/Makefile b/editors/ted/Makefile
index aeeed83816b..5edc154c8d3 100644
--- a/editors/ted/Makefile
+++ b/editors/ted/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:58:48 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:44:13 wiz Exp $
 
 DISTNAME=	ted-2.16.src
 PKGNAME=	ted-2.16
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/
 
@@ -24,8 +24,9 @@ INFODIR=	${PREFIX}/share/doc/Ted
 
 CONFIGURE_ENV+=	ac_jpeg_includes="${BUILDLINK_PREFIX.jpeg}/include"
 CONFIGURE_ENV+=	ac_jpeg_libraries="${BUILDLINK_PREFIX.jpeg}/lib"
-CONFIGURE_ENV+=	ac_png_includes="${BUILDLINK_PREFIX.png}/include"
-CONFIGURE_ENV+=	ac_png_libraries="${BUILDLINK_PREFIX.png}/lib"
+# disabled, has not been update since about libpng-0.90
+#CONFIGURE_ENV+=	ac_png_includes="${BUILDLINK_PREFIX.png}/include"
+#CONFIGURE_ENV+=	ac_png_libraries="${BUILDLINK_PREFIX.png}/lib"
 CONFIGURE_ENV+=	ac_tiff_includes="${BUILDLINK_PREFIX.tiff}/include"
 CONFIGURE_ENV+=	ac_tiff_libraries="${BUILDLINK_PREFIX.tiff}/lib"
 CONFIGURE_ENV+=	ac_xm_includes="${BUILDLINK_PREFIX.openmotif}/include"
@@ -85,7 +86,7 @@ do-install:
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
+#.include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/motif.buildlink3.mk"
diff --git a/editors/texmaker/Makefile b/editors/texmaker/Makefile
index 6d335497198..a911ebed2eb 100644
--- a/editors/texmaker/Makefile
+++ b/editors/texmaker/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2010/01/29 20:06:06 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2010/06/13 22:44:13 wiz Exp $
 
 DISTNAME=	texmaker-1.8
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	editors
 MASTER_SITES=	http://www.xm1math.net/texmaker/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/editors/tomboy/Makefile b/editors/tomboy/Makefile
index 3e95d9dce30..fc635ff91e2 100644
--- a/editors/tomboy/Makefile
+++ b/editors/tomboy/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2010/01/18 09:58:48 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2010/06/13 22:44:13 wiz Exp $
 #
 
 DISTNAME=		tomboy-1.0.1
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		editors misc
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/tomboy/1.0/}
 
diff --git a/editors/vim-gtk2/Makefile b/editors/vim-gtk2/Makefile
index 44fa2e6ee9c..3275cde0c08 100644
--- a/editors/vim-gtk2/Makefile
+++ b/editors/vim-gtk2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2010/01/18 09:58:48 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2010/06/13 22:44:13 wiz Exp $
 
 PKGNAME=		vim-gtk2-${VIM_VERSION}.${VIM_PATCHLEVEL}
-PKGREVISION=		2
+PKGREVISION=		3
 
 COMMENT=		Vim editor (vi clone) with X11 GTK2 GUI
 
diff --git a/editors/xfce4-mousepad/Makefile b/editors/xfce4-mousepad/Makefile
index be919900d00..3de8ae4e123 100644
--- a/editors/xfce4-mousepad/Makefile
+++ b/editors/xfce4-mousepad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2009/09/16 01:15:33 reed Exp $
+# $NetBSD: Makefile,v 1.9 2010/06/13 22:44:13 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -8,6 +8,7 @@ XFCE4_VERSION=	0.2.16
 
 DISTNAME=	mousepad-${XFCE4_VERSION}
 PKGNAME=	xfce4-mousepad-${XFCE4_VERSION}
+PKGREVISION=	1
 CATEGORIES=	editors
 COMMENT=	Xfce text editor
 
-- 
cgit v1.2.3