- update png to 1.5.10

author: Dirk Meyer <dinoex@FreeBSD.org> 2012-06-01 05:26:28 +0000
committer: Dirk Meyer <dinoex@FreeBSD.org> 2012-06-01 05:26:28 +0000
commit: 2b74a89bc8342f0b9b737c37d87737caf7b0ea1e (patch)
tree: c04604583d8be53b3ed7f10975be828c731f87cb /editors
parent: - Allow for larger database UIDs (diff)
87 files changed, 200 insertions, 75 deletions
diff --git a/editors/abiword-docs/Makefile b/editors/abiword-docs/Makefile
index 4bf104af3cbb..af14317f1ab1 100644
--- a/editors/abiword-docs/Makefile
+++ b/editors/abiword-docs/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	abiword-docs
 PORTVERSION=	2.8.4
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	http://www.abisource.com/downloads/%SUBDIR%/${PORTVERSION}/source/
 MASTER_SITE_SUBDIR=	abiword
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index bc6164976eca..bee43a93a248 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	abiword
 PORTVERSION=	2.8.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors
 MASTER_SITES=	http://www.abisource.com/downloads/%SUBDIR%/${PORTVERSION}/source/
 MASTER_SITE_SUBDIR=	abiword
@@ -18,7 +18,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	An open-source, cross-platform WYSIWYG word processor
 
 LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \
-		png.6:${PORTSDIR}/graphics/png \
+		png15:${PORTSDIR}/graphics/png \
 		wv-1.2:${PORTSDIR}/textproc/wv \
 		jpeg.11:${PORTSDIR}/graphics/jpeg \
 		fribidi.3:${PORTSDIR}/converters/fribidi \
diff --git a/editors/abiword/files/patch-src_af_util_xp_ut_png.cpp b/editors/abiword/files/patch-src_af_util_xp_ut_png.cpp
new file mode 100644
index 000000000000..89b99694aacd
--- /dev/null
+++ b/editors/abiword/files/patch-src_af_util_xp_ut_png.cpp
@@ -0,0 +1,11 @@
+--- src/af/util/xp/ut_png.cpp.orig	2010-04-14 23:50:11.000000000 +0200
++++ src/af/util/xp/ut_png.cpp	2012-04-28 06:58:49.000000000 +0200
+@@ -71,7 +71,7 @@
+ 	 * the normal method of doing things with libpng).  REQUIRED unless you
+ 	 * set up your own error handlers in the png_create_read_struct() earlier.
+ 	 */
+-	if (setjmp(png_ptr->jmpbuf))
++	if (setjmp(png_jmpbuf(png_ptr)))
+ 	{
+ 		/* Free all of the memory associated with the png_ptr and info_ptr */
+ 		png_destroy_read_struct(&png_ptr, &info_ptr, static_cast<png_infopp>(NULL));
diff --git a/editors/abiword/files/patch-src_wp_impexp_gtk_ie_impGraphic_GdkPixbuf.cpp b/editors/abiword/files/patch-src_wp_impexp_gtk_ie_impGraphic_GdkPixbuf.cpp
new file mode 100644
index 000000000000..3c3cf410290c
--- /dev/null
+++ b/editors/abiword/files/patch-src_wp_impexp_gtk_ie_impGraphic_GdkPixbuf.cpp
@@ -0,0 +1,20 @@
+--- src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp.orig	2010-04-14 23:50:13.000000000 +0200
++++ src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp	2012-04-28 07:25:54.000000000 +0200
+@@ -185,7 +185,7 @@
+ /** needed for the stejmp context */
+ UT_Error IE_ImpGraphic_GdkPixbuf::_png_write(GdkPixbuf * pixbuf)
+ {
+-	if (setjmp(m_pPNG->jmpbuf))
++	if (setjmp(png_jmpbuf(m_pPNG)))
+ 	{
+ 		DELETEP(m_pPngBB);
+ 		png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
+@@ -446,7 +446,7 @@
+ 	 * the normal method of doing things with libpng).  REQUIRED unless you
+ 	 * set up your own error handlers in the png_create_read_struct() earlier.
+ 	 */
+-	if (setjmp(m_pPNG->jmpbuf))
++	if (setjmp(png_jmpbuf(m_pPNG)))
+ 	{
+ 		/* Free all of the memory associated with the png_ptr and info_ptr */
+ 		png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
diff --git a/editors/apel/Makefile b/editors/apel/Makefile
index 7484bb27499b..8f3c9754bcd0 100644
--- a/editors/apel/Makefile
+++ b/editors/apel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	apel
 PORTVERSION=	${APEL_VER}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	editors elisp
 MASTER_SITES=	http://kanji.zinbun.kyoto-u.ac.jp/~tomo/lemi/dist/apel/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
diff --git a/editors/biew/Makefile b/editors/biew/Makefile
index 000511213e83..42be21f3bdda 100644
--- a/editors/biew/Makefile
+++ b/editors/biew/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	biew
 PORTVERSION=	6.1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	editors
 MASTER_SITES=	SF/beye/biew/${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}-src
diff --git a/editors/bless/Makefile b/editors/bless/Makefile
index 36c2eac58290..2427566b513b 100644
--- a/editors/bless/Makefile
+++ b/editors/bless/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	bless
 PORTVERSION=	0.6.0
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	editors
 MASTER_SITES=	http://download.gna.org/bless/
diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile
index 1bb9803f4af0..d9729d55a47c 100644
--- a/editors/calligra/Makefile
+++ b/editors/calligra/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	calligra
 PORTVERSION=	${CALLIGRA_VERSION}
+PORTREVISION=	1
 CATEGORIES=	editors kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${CALLIGRA_BRANCH}/${PORTNAME}-${PORTVERSION}/
@@ -15,7 +16,7 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE graphic art and office suite
 
-LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
 		IlmImf.6:${PORTSDIR}/graphics/OpenEXR \
 		boost_thread.4:${PORTSDIR}/devel/boost-libs \
 		qca.2:${PORTSDIR}/devel/qca \
diff --git a/editors/code-browser/Makefile b/editors/code-browser/Makefile
index 0d934c9562e0..a7fb64fd8d8e 100644
--- a/editors/code-browser/Makefile
+++ b/editors/code-browser/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	code-browser
 PORTVERSION=	3.18
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	http://tibleiz.net/download/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
diff --git a/editors/codelite/Makefile b/editors/codelite/Makefile
index 7bb459e259f7..29e0a3e32a1a 100644
--- a/editors/codelite/Makefile
+++ b/editors/codelite/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	codelite
 DISTVERSION=	3.5.${SVN_REVISION}
+PORTREVISION=	1
 CATEGORIES=	editors devel
 MASTER_SITES=	SF/${PORTNAME}/Releases/${PORTNAME}-${PORTVERSION:R}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-gtk.src
diff --git a/editors/conglomerate/Makefile b/editors/conglomerate/Makefile
index ea68c7b80f07..b9d436035421 100644
--- a/editors/conglomerate/Makefile
+++ b/editors/conglomerate/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	conglomerate
 PORTVERSION=	0.9.1
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	editors
 MASTER_SITES=	SF/${PORTNAME}/Conglomerate%20XML%20Editor/${PORTVERSION}
 
diff --git a/editors/cream/Makefile b/editors/cream/Makefile
index 2feb16403a47..001c27cdf1cb 100644
--- a/editors/cream/Makefile
+++ b/editors/cream/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cream
 PORTVERSION=	0.42
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	SF/${PORTNAME}/Cream/${PORTVERSION}
 
diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile
index 44755f88b262..a8d1a62eb4d3 100644
--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	emacs
 PORTVERSION=	${EMACS_VER}.${EMACS_REV}
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	editors ipv6
 MASTER_SITES=	http://distfiles.pirateparty.in/%SUBDIR%/ \
@@ -162,7 +163,7 @@ LIB_DEPENDS+=   gif.5:${PORTSDIR}/graphics/giflib
 .if defined(WITHOUT_PNG)
 CONFIGURE_ARGS+=	--without-png
 .else
-LIB_DEPENDS+=	png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS+=	png15:${PORTSDIR}/graphics/png
 .endif
 
 .if defined(WITHOUT_XPM)
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index 243bc371fab1..d0abab27ad5d 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	emacs
 PORTVERSION=	${EMACS_VER}
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	editors ipv6
 MASTER_SITES=	${MASTER_SITE_GNU}
@@ -149,7 +150,7 @@ LIB_DEPENDS+=	gif.5:${PORTSDIR}/graphics/giflib
 .if defined(WITHOUT_PNG)
 CONFIGURE_ARGS+=	--without-png
 .else
-LIB_DEPENDS+=	png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS+=	png15:${PORTSDIR}/graphics/png
 .endif
 
 .if defined(WITHOUT_XPM)
diff --git a/editors/emacs21/Makefile b/editors/emacs21/Makefile
index f5910efc6aa7..4f2158d6ddd3 100644
--- a/editors/emacs21/Makefile
+++ b/editors/emacs21/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	emacs
 PORTVERSION=	21.3
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	editors ipv6
 MASTER_SITES=	${MASTER_SITE_GNU:C/\/gnu\//\/old-gnu\//g}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -30,7 +30,7 @@ LIB_DEPENDS=	Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d \
 		jpeg.11:${PORTSDIR}/graphics/jpeg \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		ungif.5:${PORTSDIR}/graphics/libungif \
-		png.6:${PORTSDIR}/graphics/png
+		png15:${PORTSDIR}/graphics/png
 USE_XORG=	xpm
 .endif
 
diff --git a/editors/emacs21/files/patch-src-xfns.c b/editors/emacs21/files/patch-src-xfns.c
index 7bd3eca788c0..82d69e484658 100644
--- a/editors/emacs21/files/patch-src-xfns.c
+++ b/editors/emacs21/files/patch-src-xfns.c
@@ -1,5 +1,14 @@
 --- src/xfns.c.orig	2002-12-06 18:05:35.000000000 +0100
-+++ src/xfns.c	2010-03-28 21:27:43.000000000 +0200
++++ src/xfns.c	2012-05-02 19:50:40.000000000 +0200
+@@ -8541,7 +8541,7 @@
+ {
+   xassert (png_ptr != NULL);
+   image_error ("PNG error: %s", build_string (msg), Qnil);
+-  longjmp (png_ptr->jmpbuf, 1);
++  longjmp (png_jmpbuf(png_ptr), 1);
+ }
+ 
+ 
 @@ -8641,7 +8641,7 @@
  
        /* Check PNG signature.  */
@@ -18,3 +27,12 @@
  	{
  	  image_error ("Not a PNG image: `%s'", img->spec, Qnil);
  	  UNGCPRO;
+@@ -8699,7 +8699,7 @@
+ 
+   /* Set error jump-back.  We come back here when the PNG library
+      detects an error.  */
+-  if (setjmp (png_ptr->jmpbuf))
++  if (setjmp (png_jmpbuf(png_ptr)))
+     {
+     error:
+       if (png_ptr)
diff --git a/editors/emacs22/Makefile b/editors/emacs22/Makefile
index 2a538e092c6b..b22eeaa848f1 100644
--- a/editors/emacs22/Makefile
+++ b/editors/emacs22/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	emacs
 PORTVERSION=	${EMACS_VER}
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	editors ipv6
 MASTER_SITES=	${MASTER_SITE_GNU}
@@ -23,7 +23,7 @@ LIB_DEPENDS=	Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
 LIB_DEPENDS+=	jpeg.11:${PORTSDIR}/graphics/jpeg \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		ungif.5:${PORTSDIR}/graphics/libungif \
-		png.6:${PORTSDIR}/graphics/png
+		png15:${PORTSDIR}/graphics/png
 .endif
 
 CONFLICTS=	emacs-19.* emacs-21.* emacs-23.* emacs-24.* \
diff --git a/editors/emacs23/Makefile b/editors/emacs23/Makefile
index 243bc371fab1..d0abab27ad5d 100644
--- a/editors/emacs23/Makefile
+++ b/editors/emacs23/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	emacs
 PORTVERSION=	${EMACS_VER}
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	editors ipv6
 MASTER_SITES=	${MASTER_SITE_GNU}
@@ -149,7 +150,7 @@ LIB_DEPENDS+=	gif.5:${PORTSDIR}/graphics/giflib
 .if defined(WITHOUT_PNG)
 CONFIGURE_ARGS+=	--without-png
 .else
-LIB_DEPENDS+=	png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS+=	png15:${PORTSDIR}/graphics/png
 .endif
 
 .if defined(WITHOUT_XPM)
diff --git a/editors/f4l/Makefile b/editors/f4l/Makefile
index a0108c0e139c..97d9c58f462b 100644
--- a/editors/f4l/Makefile
+++ b/editors/f4l/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	f4l
 PORTVERSION=	0.2.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	editors multimedia www
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}_beta_swfExport/${PORTVERSION}
 
diff --git a/editors/flim/Makefile b/editors/flim/Makefile
index d2b812e1dd6e..bf6a726fbb0f 100644
--- a/editors/flim/Makefile
+++ b/editors/flim/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	flim
 PORTVERSION=	${FLIM_VER}
-PORTREVISION=	7
+PORTREVISION=	8
 PORTEPOCH=	1
 CATEGORIES=	editors elisp
 MASTER_SITES=	http://www.kanji.zinbun.kyoto-u.ac.jp/~tomo/lemi/dist/flim/flim-1.14/
diff --git a/editors/fpc-ide/Makefile b/editors/fpc-ide/Makefile
index cc40c85f65c8..6b19bfd9c9f2 100644
--- a/editors/fpc-ide/Makefile
+++ b/editors/fpc-ide/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	editors lang
 PKGNAMESUFFIX=	-ide
 
diff --git a/editors/fxite/Makefile b/editors/fxite/Makefile
index 6960c0254881..7a927e62a6dc 100644
--- a/editors/fxite/Makefile
+++ b/editors/fxite/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fxite
 PORTVERSION=	0.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 
diff --git a/editors/gedit-plugins/Makefile b/editors/gedit-plugins/Makefile
index 7ddfd62da9bc..7fb8d73f8600 100644
--- a/editors/gedit-plugins/Makefile
+++ b/editors/gedit-plugins/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gedit-plugins
 PORTVERSION=	2.32.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index bd31ad794ce0..6a1bda362d7d 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gedit
 PORTVERSION=	2.30.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/editors/ghex/Makefile b/editors/ghex/Makefile
index 0a5222437baf..882099d9dd63 100644
--- a/editors/ghex/Makefile
+++ b/editors/ghex/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	ghex
 PORTVERSION=	2.24.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	editors gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/editors/glimmer/Makefile b/editors/glimmer/Makefile
index 26c379b90e5f..d06297e468e1 100644
--- a/editors/glimmer/Makefile
+++ b/editors/glimmer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	glimmer
 PORTVERSION=	1.2.1
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	editors gnome python
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-source/${PORTVERSION}
 
diff --git a/editors/gmanedit/Makefile b/editors/gmanedit/Makefile
index 6226c977bb34..1509ea4c3b1f 100644
--- a/editors/gmanedit/Makefile
+++ b/editors/gmanedit/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gmanedit
 PORTVERSION=	0.4.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	editors gnome
 MASTER_SITES=	SF/${PORTNAME}2/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
diff --git a/editors/gnuserv/Makefile b/editors/gnuserv/Makefile
index f5b0972a16fc..f8854b294876 100644
--- a/editors/gnuserv/Makefile
+++ b/editors/gnuserv/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnuserv
 PORTVERSION=	3.12.8
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	editors
 MASTER_SITES=	http://meltin.net/hacks/emacs/src/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
diff --git a/editors/gobby/Makefile b/editors/gobby/Makefile
index 2e0e574fdb52..55ee5d07b2fa 100644
--- a/editors/gobby/Makefile
+++ b/editors/gobby/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gobby
 PORTVERSION=	0.4.12
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	editors
 MASTER_SITES=	http://releases.0x539.de/gobby/
 
diff --git a/editors/gwrite/Makefile b/editors/gwrite/Makefile
index 64803d841dec..df8ea17e9df3 100644
--- a/editors/gwrite/Makefile
+++ b/editors/gwrite/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gwrite
 PORTVERSION=	0.5.1
+PORTREVISION=	1
 CATEGORIES=	editors python
 MASTER_SITES=	GOOGLE_CODE
 
diff --git a/editors/jed/Makefile b/editors/jed/Makefile
index 318ba0f9c64e..7082ffa12e92 100644
--- a/editors/jed/Makefile
+++ b/editors/jed/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jed
 PORTVERSION=	0.99.19
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	editors
 MASTER_SITES=	ftp://space.mit.edu/pub/davis/jed/v${PORTVERSION:R}/ \
 		ftp://ftp.fu-berlin.de/pub/unix/editors/jed/v${PORTVERSION:R}/ \
diff --git a/editors/kate/Makefile b/editors/kate/Makefile
index 736471c4537e..5e0af2b9563c 100644
--- a/editors/kate/Makefile
+++ b/editors/kate/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kate
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	editors kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/editors/kile-kde4/Makefile b/editors/kile-kde4/Makefile
index 39759da6a29b..08aa77ff60fa 100644
--- a/editors/kile-kde4/Makefile
+++ b/editors/kile-kde4/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kile
 PORTVERSION=	2.1.2
+PORTREVISION=	1
 CATEGORIES=	editors kde
 MASTER_SITES=	SF/${PORTNAME}/stable/${PORTNAME}-${DISTVERSION}
 
diff --git a/editors/kile/Makefile b/editors/kile/Makefile
index 50d6daa19776..5c4368a76f75 100644
--- a/editors/kile/Makefile
+++ b/editors/kile/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kile
 PORTVERSION=	2.0.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	editors kde
 MASTER_SITES=	SF/${PORTNAME}/stable/${PORTNAME}-${PORTVERSION}
 
diff --git a/editors/klat/Makefile b/editors/klat/Makefile
index 095823486064..82c6ac47c247 100644
--- a/editors/klat/Makefile
+++ b/editors/klat/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	klat
 PORTVERSION=	0.5.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	editors
 MASTER_SITES=	http://research.edm.uhasselt.be/jori/klat/ \
 		http://research.edm.luc.ac.be/jori/klat/
diff --git a/editors/klat4/Makefile b/editors/klat4/Makefile
index 432be083cf52..90727234a0d9 100644
--- a/editors/klat4/Makefile
+++ b/editors/klat4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	klat4
 PORTVERSION=	0.6.1
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	editors
 MASTER_SITES=	http://klat.algebraic.ru/
 
diff --git a/editors/komodo-edit/Makefile b/editors/komodo-edit/Makefile
index 0f59beaeb95a..1ccc7c74e411 100644
--- a/editors/komodo-edit/Makefile
+++ b/editors/komodo-edit/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	komodo-edit
 PORTVERSION=	6.1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors
 MASTER_SITES=	http://downloads.activestate.com/Komodo/releases/${PORTVERSION}/
 DISTNAME=	Komodo-Edit-${PORTVERSION}-8334-linux-libcpp6-x86
diff --git a/editors/kxmleditor/Makefile b/editors/kxmleditor/Makefile
index 31896b801140..407af31ea257 100644
--- a/editors/kxmleditor/Makefile
+++ b/editors/kxmleditor/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kxmleditor
 PORTVERSION=	1.1.4
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	editors kde
 MASTER_SITES=	SF/${PORTNAME}/KXMLEditor/${PORTVERSION}
 
diff --git a/editors/lazarus/Makefile b/editors/lazarus/Makefile
index b66d4d76d6bd..68f37ff09243 100644
--- a/editors/lazarus/Makefile
+++ b/editors/lazarus/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lazarus
 PORTVERSION=	0.9.30.4
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES=	editors devel
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE} \
 		${MASTER_SITE_LOCAL:S|$|acm/freepascal/|} \
diff --git a/editors/leafpad/Makefile b/editors/leafpad/Makefile
index 8a292f3e64c8..608486797ac9 100644
--- a/editors/leafpad/Makefile
+++ b/editors/leafpad/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	leafpad
 PORTVERSION=	0.8.18.1
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/editors/leo/Makefile b/editors/leo/Makefile
index bcfdd53495da..20a0829ec4f0 100644
--- a/editors/leo/Makefile
+++ b/editors/leo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	leo
 PORTVERSION=	4.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors python
 MASTER_SITES=	SF/${PORTNAME}/Leo/${PORTVERSION}%20final
 DISTNAME=	Leo-${PORTVERSION}-final
diff --git a/editors/lfhex/Makefile b/editors/lfhex/Makefile
index 62968f8cd07f..a4cebea0b629 100644
--- a/editors/lfhex/Makefile
+++ b/editors/lfhex/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	lfhex
 PORTVERSION=	0.42
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	http://stoopidsimple.com/files/
 
diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
index 05ed5ebf823f..97e56d19eb5b 100644
--- a/editors/libreoffice/Makefile
+++ b/editors/libreoffice/Makefile
@@ -7,7 +7,7 @@
 
 .include "${.CURDIR}/Makefile.common"
 
-PORTREVISION=	3
+PORTREVISION=	4
 
 MASTER_SITE_SUBDIR=	src/${PORTVERSION}/
 MASTER_SITES+=	http://dev-www.libreoffice.org/src/:ext \
@@ -51,7 +51,7 @@ LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo \
 		graphite2.2:${PORTSDIR}/graphics/graphite2 \
 		nss3.1:${PORTSDIR}/security/nss \
 		SampleICC.2:${PORTSDIR}/graphics/sampleicc \
-		png.6:${PORTSDIR}/graphics/png \
+		png15:${PORTSDIR}/graphics/png \
 		cmis-0.2.0:${PORTSDIR}/net/libcmis \
 
 RUN_DEPENDS=	${LOCALBASE}/lib/X11/fonts/Liberation/LiberationMono-Bold.ttf:${PORTSDIR}/x11-fonts/liberation-fonts-ttf \
diff --git a/editors/madedit/Makefile b/editors/madedit/Makefile
index 8a30c157b455..66acbc147640 100644
--- a/editors/madedit/Makefile
+++ b/editors/madedit/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	madedit
 PORTVERSION=	0.2.9
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	editors
 MASTER_SITES=	SF/${PORTNAME}/MadEdit/MadEdit-${PORTVERSION}
 
diff --git a/editors/mlview/Makefile b/editors/mlview/Makefile
index 356782fbd62c..d748c28fbb92 100644
--- a/editors/mlview/Makefile
+++ b/editors/mlview/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mlview
 PORTVERSION=	0.8
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	editors gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/editors/mode-info/Makefile b/editors/mode-info/Makefile
index 2cadf30e8f63..c6747a7a865c 100644
--- a/editors/mode-info/Makefile
+++ b/editors/mode-info/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mode-info
 PORTVERSION=	0.8.5
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	editors elisp
 MASTER_SITES=	http://namazu.org/~tsuchiya/elisp/
 
diff --git a/editors/morla/Makefile b/editors/morla/Makefile
index 9ff59076e101..6b5954d8ce1e 100644
--- a/editors/morla/Makefile
+++ b/editors/morla/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	morla
 PORTVERSION=	0.16.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors textproc
 MASTER_SITES=	http://www.morlardf.net/src/ \
 		http://nivi.interfree.it/distfiles/${PORTNAME}/${PORTVERSION}/
diff --git a/editors/mousepad/Makefile b/editors/mousepad/Makefile
index d8e62aa03547..c0aad455e4e8 100644
--- a/editors/mousepad/Makefile
+++ b/editors/mousepad/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mousepad
 PORTVERSION=	0.2.16
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	editors xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=src/apps/${PORTNAME}/${PORTVERSION:R}
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index e023633ee7f4..a6980f23e756 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	apache-openoffice
 PORTVERSION=	3.4.${SVNREVISION}
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	editors java
 MASTER_SITES=	${MASTER_SITE_LOCAL}
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index fa46a0d5edc6..11007803dcea 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	openoffice.org-vcltesttool
 PORTVERSION=	2.4.${SNAPDATE}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		http://tools.openoffice.org/unowinreg_prebuild/680/:unowinreg
diff --git a/editors/p5-Vimana/Makefile b/editors/p5-Vimana/Makefile
index 75c6b3df31d6..3a91a69c9700 100644
--- a/editors/p5-Vimana/Makefile
+++ b/editors/p5-Vimana/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Vimana
 PORTVERSION=	2010.09303
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:CORNELIUS
diff --git a/editors/pdfedit/Makefile b/editors/pdfedit/Makefile
index 2813cafb5bd4..e21aa5f0729b 100644
--- a/editors/pdfedit/Makefile
+++ b/editors/pdfedit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pdfedit
 PORTVERSION=	0.4.5
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	SF
 
diff --git a/editors/poedit/Makefile b/editors/poedit/Makefile
index 6f442353ff84..c1d2aa1c37ee 100644
--- a/editors/poedit/Makefile
+++ b/editors/poedit/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	poedit
 PORTVERSION=	1.4.6.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/1.4.6/
 
diff --git a/editors/psgml/Makefile b/editors/psgml/Makefile
index 6fe79a5bcc1d..53fa5e7e9844 100644
--- a/editors/psgml/Makefile
+++ b/editors/psgml/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	psgml
 PORTVERSION=	1.3.2
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	editors elisp
 MASTER_SITES=	SF/${PORTNAME}/ALPHA%20${PORTNAME}/${PORTVERSION}
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
diff --git a/editors/py-room/Makefile b/editors/py-room/Makefile
index 8939dac16995..767bf07f2b5a 100644
--- a/editors/py-room/Makefile
+++ b/editors/py-room/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	room
 PORTVERSION=	0.4.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	editors python
 MASTER_SITES=	https://launchpad.net/pyroom/${PORTVERSION:R}/${PORTVERSION}/+download/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/editors/rospell/Makefile b/editors/rospell/Makefile
index 758a08593b7d..43981cd6a65a 100644
--- a/editors/rospell/Makefile
+++ b/editors/rospell/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	rospell
 PORTVERSION=	2009.02.r2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors textproc # this should/will be romanian ;)
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	rospell/rospell/2008.00
diff --git a/editors/rox-edit/Makefile b/editors/rox-edit/Makefile
index 2a6929910af8..6cc5191e0f4a 100644
--- a/editors/rox-edit/Makefile
+++ b/editors/rox-edit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	rox-edit
 PORTVERSION=	2.2
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	SF/rox/Edit/${PORTVERSION}
 DISTNAME=	edit-${PORTVERSION}
diff --git a/editors/scite/Makefile b/editors/scite/Makefile
index 9e6e19c4efcb..34cf1b27511b 100644
--- a/editors/scite/Makefile
+++ b/editors/scite/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	scite
 PORTVERSION=	3.1.0
+PORTREVISION=	1
 CATEGORIES=	editors gnome
 MASTER_SITES=	SF/scintilla/SciTE/${PORTVERSION}
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
diff --git a/editors/scribes/Makefile b/editors/scribes/Makefile
index c670718aa200..cb95026ffaa7 100644
--- a/editors/scribes/Makefile
+++ b/editors/scribes/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scribes
 PORTVERSION=	0.3.3.3
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	editors
 MASTER_SITES=	SF/${PORTNAME}/Stable%20Branch/${PORTNAME}-${PORTVERSION}
 
diff --git a/editors/semi/Makefile b/editors/semi/Makefile
index acc4dcc1c706..57633c38da0e 100644
--- a/editors/semi/Makefile
+++ b/editors/semi/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	semi
 PORTVERSION=	${SEMI_VER}
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	editors elisp
 MASTER_SITES=	http://www.kanji.zinbun.kyoto-u.ac.jp/~tomo/comp/emacsen/lisp/semi/semi-1.14-for-flim-1.14/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
diff --git a/editors/slime/Makefile b/editors/slime/Makefile
index 4591a5b8f7bb..865d890ab1fa 100644
--- a/editors/slime/Makefile
+++ b/editors/slime/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	slime
 PORTVERSION=	20110714
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	editors elisp
 MASTER_SITES=	ftp://ftp.SpringDaemons.com/soft/
diff --git a/editors/spe/Makefile b/editors/spe/Makefile
index 6809a2701b3a..d1f4afcc1395 100644
--- a/editors/spe/Makefile
+++ b/editors/spe/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	SPE
 PORTVERSION=	0.8.4.h
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	editors devel python
 MASTER_SITES=	${MASTER_SITE_BERLIOS}
 MASTER_SITE_SUBDIR=	python
diff --git a/editors/speedbar/Makefile b/editors/speedbar/Makefile
index 9158aa90a15a..7d21269f5ed2 100644
--- a/editors/speedbar/Makefile
+++ b/editors/speedbar/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	speedbar
 PORTVERSION=	0.14.b4
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	editors elisp
 MASTER_SITES=	SF/cedet/${PORTNAME}/1.4beta4 \
 		http://dryice.name/computer/FreeBSD/distfiles/
diff --git a/editors/tamago/Makefile b/editors/tamago/Makefile
index 7019f4f5a1e5..bd4f3c04ee54 100644
--- a/editors/tamago/Makefile
+++ b/editors/tamago/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tamago
 PORTVERSION=	4.0.6.0.20041122.18
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	editors elisp
 MASTER_SITES=	${MASTER_SITE_DEBIAN}
 MASTER_SITE_SUBDIR=	pool/main/e/egg
diff --git a/editors/tea/Makefile b/editors/tea/Makefile
index fc09ea8104cb..234e4537675c 100644
--- a/editors/tea/Makefile
+++ b/editors/tea/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tea
 DISTVERSION=	33.0.0
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	SF/${PORTNAME}-editor/${PORTNAME}-editor/${PORTVERSION} \
 		http://semiletov.ho.ua/${PORTNAME}-releases/
diff --git a/editors/ted/Makefile b/editors/ted/Makefile
index bdef16142df0..2b98000d60cf 100644
--- a/editors/ted/Makefile
+++ b/editors/ted/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ted
 PORTVERSION=	2.22
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/
 EXTRACT_SUFX=	.src.tar.gz
@@ -17,7 +18,7 @@ COMMENT=	X11 based RTF editor
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	pcre.1:${PORTSDIR}/devel/pcre \
-		png.6:${PORTSDIR}/graphics/png \
+		png15:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		paper.2:${PORTSDIR}/print/libpaper
 RUN_DEPENDS=	${LOCALBASE}/share/ghostscript/fonts/a010013l.pfb:${PORTSDIR}/print/gsfonts
@@ -30,6 +31,7 @@ USE_XORG=	xext xft
 USE_ICONV=	yes
 USE_GHOSTSCRIPT_RUN=	yes
 GNU_CONFIGURE=	yes
+CFLAGS+=	-I${LOCALBASE}/include/libpng15
 MAKE_ENV=	DEF_AFMDIR="-DAFMDIR=\"\\\"${AFMDIR}/\\\"\"" \
 		DEF_INDDIR="-DINDDIR=\"\\\"${INDDIR}/\\\"\"" \
 		DEF_DOCUMENT_DIR="-DDOCUMENT_DIR=\"\\\"${DOCSDIR}/\\\"\"" \
diff --git a/editors/ted/files/patch-bitmap-bmpng.c b/editors/ted/files/patch-bitmap-bmpng.c
new file mode 100644
index 000000000000..7f9a5b18f25f
--- /dev/null
+++ b/editors/ted/files/patch-bitmap-bmpng.c
@@ -0,0 +1,10 @@
+--- bitmap/bmpng.c.orig	2012-04-01 11:57:27.000000000 +0200
++++ bitmap/bmpng.c	2012-05-04 12:44:03.000000000 +0200
+@@ -4,6 +4,7 @@
+ #   include	"bmintern.h"
+ #   include	"bmio.h"
+ #   include	<png.h>
++#   include	<pngpriv.h>
+ #   include	<appDebugon.h>
+ #   include	<sioFileio.h>
+ #   include	<utilEndian.h>
diff --git a/editors/texmacs/Makefile b/editors/texmacs/Makefile
index 3e9b8652cd28..f94a2cb7acb7 100644
--- a/editors/texmacs/Makefile
+++ b/editors/texmacs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	texmacs
 PORTVERSION=	1.0.7.14
+PORTREVISION=	1
 CATEGORIES=	editors print
 MASTER_SITES=	ftp://ftp.texmacs.org/TeXmacs/tmftp/source/ \
 		http://www.predatorlabs.net/dl/
diff --git a/editors/texmaker/Makefile b/editors/texmaker/Makefile
index 83033082a21b..39ee3bd9f5ec 100644
--- a/editors/texmaker/Makefile
+++ b/editors/texmaker/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	texmaker
 PORTVERSION=	3.3.3
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	editors
 MASTER_SITES=	http://www.xm1math.net/texmaker/
diff --git a/editors/texmakerx/Makefile b/editors/texmakerx/Makefile
index 85c59e480089..5280e97a1f01 100644
--- a/editors/texmakerx/Makefile
+++ b/editors/texmakerx/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	texmakerx
 PORTVERSION=	2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	editors
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/TexMakerX%20${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION:S:.0::}
diff --git a/editors/textroom/Makefile b/editors/textroom/Makefile
index eb7f7579b4a6..c599ee914ecd 100644
--- a/editors/textroom/Makefile
+++ b/editors/textroom/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	textroom
 PORTVERSION=	0.8.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	editors
 MASTER_SITES=	SF
 
diff --git a/editors/texworks/Makefile b/editors/texworks/Makefile
index ccf8ec72f964..63af8365e551 100644
--- a/editors/texworks/Makefile
+++ b/editors/texworks/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	texworks
 PORTVERSION=	0.2.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 
diff --git a/editors/tree-widget/Makefile b/editors/tree-widget/Makefile
index 4f5795f78dad..56b69cb84728 100644
--- a/editors/tree-widget/Makefile
+++ b/editors/tree-widget/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tree-widget
 PORTVERSION=	2.0
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	editors elisp
 MASTER_SITES=	SF/emhacks/${PORTNAME}/${PORTVERSION} \
 		http://dryice.name/computer/FreeBSD/distfiles/
diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index a9e483ad2259..7c9df4e97ea8 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -13,7 +13,7 @@ PORTNAME?=	vim
 PATCHLEVEL=	515
 PORTVERSION=	7.3.${PATCHLEVEL}
 RELEASE=	vim-${PORTVERSION:C/\.[0-9a-z]*$//}
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	editors
 MASTER_SITES=	${MASTER_SITE_VIM}
 DISTFILES=	${RELEASE}${EXTRACT_SUFX}
diff --git a/editors/winefish/Makefile b/editors/winefish/Makefile
index 6a8d1e46914c..b9fe688e3dbd 100644
--- a/editors/winefish/Makefile
+++ b/editors/winefish/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	winefish
 DISTVERSION=	1.3.3
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	editors print
 MASTER_SITES=	http://download.berlios.de/winefish/ \
 		http://nivi.interfree.it/distfiles/winefish/
diff --git a/editors/xemacs-devel-mule/Makefile b/editors/xemacs-devel-mule/Makefile
index 50aad21a0a72..b74841065459 100644
--- a/editors/xemacs-devel-mule/Makefile
+++ b/editors/xemacs-devel-mule/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xemacs-devel-mule
 PORTVERSION=	${XEMACS_VER:S/-/./}
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES+=	editors
 MASTER_SITES=	${MASTER_SITE_XEMACS}
 MASTER_SITE_SUBDIR=	xemacs-${XEMACS_REL}
@@ -40,15 +40,15 @@ RUN_DEPENDS+=	${LOCALBASE}/lib/xemacs-${XEMACS_VER}/lisp/x-win-xfree86.elc:${POR
 .if !defined(WITHOUT_X11)
 BUILD_DEPENDS+=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
-		png.6:${PORTSDIR}/graphics/png \
+		png15:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		compface.1:${PORTSDIR}/mail/faces
 
-USE_XORG+=	x11 xft xpm
+USE_XORG+=	x11 xft xpm xbitmaps
 CONFIGURE_ARGS=--with-xpm --with-xft=all
 # XXX: needed until port updated to work nicely with autoconf >= 2.64
 #      see files/patch-configure.ac for more details
-CFLAGS+=	-I${LOCALBASE}/include/freetype2
+CFLAGS+=	-I${LOCALBASE}/include/freetype2 -I${LOCALBASE}/include/libpng15
 .endif
 
 XEMACS_REL=	21.5
diff --git a/editors/xemacs-devel-mule/files/patch-glyphs-eimage.c b/editors/xemacs-devel-mule/files/patch-glyphs-eimage.c
new file mode 100644
index 000000000000..768bd74aae5a
--- /dev/null
+++ b/editors/xemacs-devel-mule/files/patch-glyphs-eimage.c
@@ -0,0 +1,10 @@
+--- src/glyphs-eimage.c.orig	2007-02-21 11:49:33.000000000 +0100
++++ src/glyphs-eimage.c	2012-05-02 20:02:02.000000000 +0200
+@@ -61,6 +61,7 @@
+ 
+ #define message message_ /* Yuck */
+ #include <png.h>
++#include <pngpriv.h>
+ #undef message
+ 
+ END_C_DECLS
diff --git a/editors/xemacs-devel/Makefile b/editors/xemacs-devel/Makefile
index 44e45cc62c87..ca1a34a4b2be 100644
--- a/editors/xemacs-devel/Makefile
+++ b/editors/xemacs-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xemacs-devel
 PORTVERSION=	${XEMACS_VER:S/-/./}
-PORTREVISION=	9
+PORTREVISION=	10
 PORTEPOCH=	1
 CATEGORIES+=	editors
 MASTER_SITES=	${MASTER_SITE_XEMACS}
@@ -26,10 +26,11 @@ CONFLICTS=	emacs-19.* emacs-21.* emacs-22.* \
 RUN_DEPENDS+=	${LOCALBASE}/lib/xemacs/xemacs-packages/etc/enriched.doc:${PORTSDIR}/editors/xemacs-packages
 .if !defined(WITHOUT_X11)
 LIB_DEPENDS+=	jpeg.11:${PORTSDIR}/graphics/jpeg \
-		png.6:${PORTSDIR}/graphics/png \
+		png15:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		compface.1:${PORTSDIR}/mail/faces
 USE_XORG+=	xbitmaps x11 ice xext xaw xt xmu
+CFLAGS+=	-I${LOCALBASE}/include/libpng15
 .endif
 
 XEMACS_MAJOR_VER?=	21
diff --git a/editors/xemacs-devel/files/patch-glyphs-eimage.c b/editors/xemacs-devel/files/patch-glyphs-eimage.c
new file mode 100644
index 000000000000..768bd74aae5a
--- /dev/null
+++ b/editors/xemacs-devel/files/patch-glyphs-eimage.c
@@ -0,0 +1,10 @@
+--- src/glyphs-eimage.c.orig	2007-02-21 11:49:33.000000000 +0100
++++ src/glyphs-eimage.c	2012-05-02 20:02:02.000000000 +0200
+@@ -61,6 +61,7 @@
+ 
+ #define message message_ /* Yuck */
+ #include <png.h>
++#include <pngpriv.h>
+ #undef message
+ 
+ END_C_DECLS
diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile
index b4eff16e82da..ad1350cbe8a2 100644
--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xemacs
 PORTVERSION=	${XEMACS_VER}
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_XEMACS}
 MASTER_SITE_SUBDIR=	xemacs-${XEMACS_REL}
@@ -91,11 +91,12 @@ CONFIGURE_ARGS+=	--without-postgresql
 RUN_DEPENDS+=	${LOCALBASE}/lib/xemacs/xemacs-packages/etc/enriched.doc:${PORTSDIR}/editors/xemacs-packages
 .endif
 .if !defined(WITHOUT_X11)
-LIB_DEPENDS+=	png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS+=	png15:${PORTSDIR}/graphics/png \
 		jpeg.11:${PORTSDIR}/graphics/jpeg \
 		tiff.4:${PORTSDIR}/graphics/tiff
 CONFIGURE_ARGS+=	--with-png --with-jpeg --with-tiff
-USE_XORG=	xpm x11
+USE_XORG=	xpm x11 xbitmaps xaw
+CFLAGS+=	-I${LOCALBASE}/include/libpng15
 .if !defined(WITHOUT_MOTIF) && !defined(MOTIF_STATIC)
 USE_MOTIF=	yes
 WITH_SCROLLBARS=	--with-scrollbars=motif
diff --git a/editors/xemacs/files/patch-src__glyphs-eimage.c b/editors/xemacs/files/patch-src__glyphs-eimage.c
new file mode 100644
index 000000000000..fc854bd37715
--- /dev/null
+++ b/editors/xemacs/files/patch-src__glyphs-eimage.c
@@ -0,0 +1,10 @@
+--- src/glyphs-eimage.c.orig	2007-08-20 21:52:28.000000000 +0200
++++ src/glyphs-eimage.c	2012-05-02 20:05:31.000000000 +0200
+@@ -65,6 +65,7 @@
+ extern "C" {
+ #endif
+ #include <png.h>
++#include <pngpriv.h>
+ #ifdef __cplusplus
+ }
+ #endif
diff --git a/editors/xemacs21-mule/Makefile b/editors/xemacs21-mule/Makefile
index 68d8cb218d5b..44e19c10ad9c 100644
--- a/editors/xemacs21-mule/Makefile
+++ b/editors/xemacs21-mule/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xemacs-mule
 PORTVERSION=	${XEMACS_VER}
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES+=	editors
 MASTER_SITES=	${MASTER_SITE_XEMACS}
 MASTER_SITE_SUBDIR=	xemacs-${XEMACS_REL}
@@ -38,7 +38,7 @@ RUN_DEPENDS=	${LOCALBASE}/lib/xemacs/mule-packages/pkginfo/MANIFEST.mule-base:${
 RUN_DEPENDS+=	${LOCALBASE}/lib/xemacs-${XEMACS_VER}/lisp/x-win-xfree86.elc:${PORTSDIR}/editors/xemacs21-mule
 .endif
 LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
-		png.6:${PORTSDIR}/graphics/png \
+		png15:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		compface.1:${PORTSDIR}/mail/faces
 
@@ -48,10 +48,11 @@ XEMACS_ARCH=	${CONFIGURE_TARGET}
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
-USE_XORG=	xpm
+USE_XORG=	xpm xbitmaps xaw
 STRIP=
 USE_AUTOTOOLS=	autoconf213
 CONFIGURE_TARGET=${MACHINE_ARCH}--freebsd
+CFLAGS+=	-I${LOCALBASE}/include/libpng15
 
 CONFIGURE_ARGS=	--with-x11 \
 		--with-mule \
diff --git a/editors/xemacs21-mule/files/patch-glyphs-eimage.c b/editors/xemacs21-mule/files/patch-glyphs-eimage.c
new file mode 100644
index 000000000000..f1469697ff6c
--- /dev/null
+++ b/editors/xemacs21-mule/files/patch-glyphs-eimage.c
@@ -0,0 +1,10 @@
+--- src/glyphs-eimage.c.orig	2007-08-20 21:52:28.000000000 +0200
++++ src/glyphs-eimage.c	2012-05-02 20:31:49.000000000 +0200
+@@ -65,6 +65,7 @@
+ extern "C" {
+ #endif
+ #include <png.h>
++#include <pngpriv.h>
+ #ifdef __cplusplus
+ }
+ #endif
diff --git a/editors/xmlcopyeditor/Makefile b/editors/xmlcopyeditor/Makefile
index a04a634c92ec..bdf082249761 100644
--- a/editors/xmlcopyeditor/Makefile
+++ b/editors/xmlcopyeditor/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmlcopyeditor
 PORTVERSION=	1.2.0.4
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	editors
 MASTER_SITES=	SF/xml-copy-editor/${PORTNAME}-linux/${PORTVERSION}
 
diff --git a/editors/xmleditor/Makefile b/editors/xmleditor/Makefile
index 125b9e4f0ed5..2274036a2696 100644
--- a/editors/xmleditor/Makefile
+++ b/editors/xmleditor/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	xmleditor
 PORTVERSION=	0.5.3
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	editors
 MASTER_SITES=	SF
 
diff --git a/editors/yzis/Makefile b/editors/yzis/Makefile
index 974ffd6fd789..8f892b64041c 100644
--- a/editors/yzis/Makefile
+++ b/editors/yzis/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	yzis
 PORTVERSION=	1.0.a.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	editors
 MASTER_SITES=	http://labs.freehackers.org/attachments/download/45/ \
 		http://contribs.martymac.org/FreeBSD-ports/distfiles/
diff --git a/editors/zim/Makefile b/editors/zim/Makefile
index e9cef232a07a..b1f89cc87442 100644
--- a/editors/zim/Makefile
+++ b/editors/zim/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	zim
 PORTVERSION=	0.56
+PORTREVISION=	1
 CATEGORIES=	editors python
 MASTER_SITES=	http://www.zim-wiki.org/downloads/
author	Dirk Meyer <dinoex@FreeBSD.org>	2012-06-01 05:26:28 +0000
committer	Dirk Meyer <dinoex@FreeBSD.org>	2012-06-01 05:26:28 +0000
commit	2b74a89bc8342f0b9b737c37d87737caf7b0ea1e (patch)
tree	c04604583d8be53b3ed7f10975be828c731f87cb /editors
parent	- Allow for larger database UIDs (diff)