summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorDirk Meyer <dinoex@FreeBSD.org>2012-06-01 05:26:28 +0000
committerDirk Meyer <dinoex@FreeBSD.org>2012-06-01 05:26:28 +0000
commit2b74a89bc8342f0b9b737c37d87737caf7b0ea1e (patch)
treec04604583d8be53b3ed7f10975be828c731f87cb /x11
parent- Allow for larger database UIDs (diff)
- update png to 1.5.10
Notes
Notes: svn path=/head/; revision=297915
Diffstat (limited to 'x11')
-rw-r--r--x11/3ddesktop/Makefile2
-rw-r--r--x11/Terminal/Makefile1
-rw-r--r--x11/alltray/Makefile2
-rw-r--r--x11/apwal/Makefile2
-rw-r--r--x11/aterm/Makefile2
-rw-r--r--x11/avant-window-navigator-gnome/Makefile2
-rw-r--r--x11/avant-window-navigator/Makefile2
-rw-r--r--x11/bbdock/Makefile4
-rw-r--r--x11/bbdock/files/patch-Slot.cc10
-rw-r--r--x11/bbrun/Makefile2
-rw-r--r--x11/bgrot/Makefile2
-rw-r--r--x11/bgs/Makefile2
-rw-r--r--x11/brightside/Makefile2
-rw-r--r--x11/decurs/Makefile2
-rw-r--r--x11/dgs/Makefile4
-rw-r--r--x11/eaglemode/Makefile4
-rw-r--r--x11/emprint/Makefile1
-rw-r--r--x11/erun/Makefile2
-rw-r--r--x11/eterm/Makefile1
-rw-r--r--x11/evilvte/Makefile1
-rw-r--r--x11/fbdesk/Makefile4
-rw-r--r--x11/fbdesk/files/patch-ImagePNG.cc21
-rw-r--r--x11/fbpanel/Makefile1
-rw-r--r--x11/florence/Makefile2
-rw-r--r--x11/fluxbg/Makefile2
-rw-r--r--x11/gcb/Makefile2
-rw-r--r--x11/gdesklets-tasklist/Makefile2
-rw-r--r--x11/gdm/Makefile2
-rw-r--r--x11/gmrun/Makefile2
-rw-r--r--x11/gnome-applets/Makefile2
-rw-r--r--x11/gnome-clipboard-daemon/Makefile2
-rw-r--r--x11/gnome-desktop/Makefile2
-rw-r--r--x11/gnome-libs/Makefile5
-rw-r--r--x11/gnome-libs/files/patch-gtk-xmhtml-readPNG.c28
-rw-r--r--x11/gnome-libs/files/patch-tools-convertrgb-loadpng.c21
-rw-r--r--x11/gnome-panel/Makefile2
-rw-r--r--x11/gnome-screensaver/Makefile2
-rw-r--r--x11/gnome-session/Makefile2
-rw-r--r--x11/gnome-swallow/Makefile2
-rw-r--r--x11/gnome-terminal/Makefile2
-rw-r--r--x11/gnome2-fifth-toe/Makefile2
-rw-r--r--x11/gromit/Makefile2
-rw-r--r--x11/gsynaptics/Makefile2
-rw-r--r--x11/gtk-theme-switch2/Makefile2
-rw-r--r--x11/gtkchtheme/Makefile2
-rw-r--r--x11/gtkterm2/Makefile2
-rw-r--r--x11/gtstarter/Makefile2
-rw-r--r--x11/hotwire-shell/Makefile2
-rw-r--r--x11/i3lock/Makefile1
-rw-r--r--x11/idesk/Makefile2
-rw-r--r--x11/ipager/Makefile2
-rw-r--r--x11/kde4-baseapps/Makefile1
-rw-r--r--x11/kde4-runtime/Makefile1
-rw-r--r--x11/kde4-workspace/Makefile3
-rw-r--r--x11/kdebase3/Makefile2
-rw-r--r--x11/kdelibs3/Makefile2
-rw-r--r--x11/kdelibs4/Makefile3
-rw-r--r--x11/keybinder/Makefile1
-rw-r--r--x11/keyboardcast/Makefile1
-rw-r--r--x11/keynav/Makefile1
-rw-r--r--x11/kgamma/Makefile1
-rw-r--r--x11/konsole/Makefile1
-rw-r--r--x11/libexo/Makefile1
-rw-r--r--x11/libfm/Makefile1
-rw-r--r--x11/libgnome-java/Makefile2
-rw-r--r--x11/libgnome/Makefile2
-rw-r--r--x11/libgnomekbd/Makefile1
-rw-r--r--x11/libgnomemm/Makefile2
-rw-r--r--x11/libgnomemm26/Makefile1
-rw-r--r--x11/libxfce4menu/Makefile1
-rw-r--r--x11/lxpanel/Makefile2
-rw-r--r--x11/menu-cache/Makefile2
-rw-r--r--x11/metalock/Makefile1
-rw-r--r--x11/metisse/Makefile6
-rw-r--r--x11/metisse/files/patch-fvwm-insitu-libs-PictureImageLoader.c10
-rw-r--r--x11/mlterm/Makefile1
-rw-r--r--x11/mrxvt-devel/Makefile4
-rw-r--r--x11/mrxvt/Makefile4
-rw-r--r--x11/multi-gnome-terminal/Makefile2
-rw-r--r--x11/nvidia-settings/Makefile1
-rw-r--r--x11/oooqs/Makefile2
-rw-r--r--x11/oooqs2/Makefile2
-rw-r--r--x11/peeper/Makefile2
-rw-r--r--x11/plasma-scriptengine-python/Makefile1
-rw-r--r--x11/plasma-scriptengine-ruby/Makefile1
-rw-r--r--x11/powershell/Makefile2
-rw-r--r--x11/py-qt4-opengl/Makefile1
-rw-r--r--x11/qimageblitz/Makefile1
-rw-r--r--x11/qt4-graphicssystems-opengl/Makefile1
-rw-r--r--x11/qt4-inputmethods/Makefile1
-rw-r--r--x11/qt4-opengl/Makefile1
-rw-r--r--x11/rox-wallpaper/Makefile1
-rw-r--r--x11/roxbg/Makefile2
-rw-r--r--x11/roxterm/Makefile1
-rw-r--r--x11/rsibreak-kde4/Makefile2
-rw-r--r--x11/rsibreak/Makefile2
-rw-r--r--x11/rxvt-unicode/Makefile1
-rw-r--r--x11/silo/Makefile2
-rw-r--r--x11/simdock/Makefile2
-rw-r--r--x11/sisctrl/Makefile2
-rw-r--r--x11/slim/Makefile4
-rw-r--r--x11/slim/files/patch-png.c11
-rw-r--r--x11/stjerm/Makefile1
-rw-r--r--x11/terminator/Makefile2
-rw-r--r--x11/tilda/Makefile2
-rw-r--r--x11/tint/Makefile1
-rw-r--r--x11/trayer-srg/Makefile1
-rw-r--r--x11/trayer/Makefile1
-rw-r--r--x11/wbar/Makefile2
-rw-r--r--x11/wbarconf/Makefile2
-rw-r--r--x11/wdm/Makefile2
-rw-r--r--x11/wmblob/Makefile2
-rw-r--r--x11/wmcliphist/Makefile1
-rw-r--r--x11/wmdrawer/Makefile2
-rw-r--r--x11/workrave/Makefile1
-rw-r--r--x11/xautomation/Makefile4
-rw-r--r--x11/xcursorgen/Makefile3
-rw-r--r--x11/xfce4-clipman-plugin/Makefile2
-rw-r--r--x11/xfce4-conf/Makefile1
-rw-r--r--x11/xfce4-quicklauncher-plugin/Makefile2
-rw-r--r--x11/xfce4-screenshooter-plugin/Makefile2
-rw-r--r--x11/xfce4-taskmanager/Makefile2
-rw-r--r--x11/xfce4-verve-plugin/Makefile2
-rw-r--r--x11/xfce4-wmdock-plugin/Makefile2
-rw-r--r--x11/xfce4-xfapplet-plugin/Makefile2
-rw-r--r--x11/xloadimage/Makefile3
-rw-r--r--x11/xorg-edit/Makefile2
-rw-r--r--x11/xpra/Makefile1
-rw-r--r--x11/xscreensaver-gnome-hacks/Makefile2
-rw-r--r--x11/xscreensaver-gnome/Makefile2
-rw-r--r--x11/xscreensaver-kde/Makefile2
-rw-r--r--x11/xscreensaver/Makefile1
-rw-r--r--x11/xvattr/Makefile2
-rw-r--r--x11/yakuake-kde4/Makefile2
-rw-r--r--x11/yakuake/Makefile2
-rw-r--r--x11/yalias/Makefile2
-rw-r--r--x11/yelp/Makefile2
-rw-r--r--x11/zenity/Makefile2
138 files changed, 247 insertions, 105 deletions
diff --git a/x11/3ddesktop/Makefile b/x11/3ddesktop/Makefile
index e7c2976ea1bc..63776df8be8c 100644
--- a/x11/3ddesktop/Makefile
+++ b/x11/3ddesktop/Makefile
@@ -7,7 +7,7 @@
PORTNAME= 3ddesktop
PORTVERSION= 0.2.9
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= x11
MASTER_SITES= SF/desk3d/${PORTNAME}/${PORTVERSION}
diff --git a/x11/Terminal/Makefile b/x11/Terminal/Makefile
index 79a4b9b75a30..4262014a8d6c 100644
--- a/x11/Terminal/Makefile
+++ b/x11/Terminal/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Terminal
PORTVERSION= 0.4.8
+PORTREVISION= 1
CATEGORIES= x11 xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR= src/apps/${PORTNAME:L}/${PORTVERSION:R}
diff --git a/x11/alltray/Makefile b/x11/alltray/Makefile
index 6dcb0bbd7f97..aa49b22eb110 100644
--- a/x11/alltray/Makefile
+++ b/x11/alltray/Makefile
@@ -7,7 +7,7 @@
PORTNAME= alltray
PORTVERSION= 0.70
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11
MASTER_SITES= SF
diff --git a/x11/apwal/Makefile b/x11/apwal/Makefile
index bcf994b4ac3d..e3c81d9c495d 100644
--- a/x11/apwal/Makefile
+++ b/x11/apwal/Makefile
@@ -7,7 +7,7 @@
PORTNAME= apwal
PORTVERSION= 0.4.5
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= x11
MASTER_SITES= http://apwal.free.fr/download/
diff --git a/x11/aterm/Makefile b/x11/aterm/Makefile
index 8f4dbcbd49cd..96c16dd571b4 100644
--- a/x11/aterm/Makefile
+++ b/x11/aterm/Makefile
@@ -65,7 +65,7 @@ CONFIGURE_ARGS+= --disable-mousewheel
.if defined(WITH_BGIMG)
LIB_DEPENDS+= AfterImage.0:${PORTSDIR}/graphics/libafterimage \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg
CONFIGURE_ARGS+= --with-afterimage-config --with-png --with-jpeg
.else
diff --git a/x11/avant-window-navigator-gnome/Makefile b/x11/avant-window-navigator-gnome/Makefile
index 089fd097a945..a6dd37302b45 100644
--- a/x11/avant-window-navigator-gnome/Makefile
+++ b/x11/avant-window-navigator-gnome/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 6
+PORTREVISION= 7
AWN_DESKTOP= gnome
MASTERDIR= ${.CURDIR}/../avant-window-navigator
diff --git a/x11/avant-window-navigator/Makefile b/x11/avant-window-navigator/Makefile
index 440ba98aca2c..33e4360cf3d5 100644
--- a/x11/avant-window-navigator/Makefile
+++ b/x11/avant-window-navigator/Makefile
@@ -7,7 +7,7 @@
PORTNAME= avant-window-navigator
PORTVERSION= 0.3.2.1
-PORTREVISION?= 7
+PORTREVISION?= 8
CATEGORIES= x11
MASTER_SITES= http://launchpadlibrarian.net/26374006/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/x11/bbdock/Makefile b/x11/bbdock/Makefile
index 5bcf6fe37731..9caca70b5756 100644
--- a/x11/bbdock/Makefile
+++ b/x11/bbdock/Makefile
@@ -7,6 +7,7 @@
PORTNAME= bbdock
PORTVERSION= 0.2.9
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://bbdock.nethence.com/download/
@@ -15,10 +16,11 @@ COMMENT= An application launcher for Blackbox-like window manager
LICENSE= BSD
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
GNU_CONFIGURE= yes
USE_XORG= x11
+CPPFLAGS+= -I${LOCALBASE}/include/libpng15
PORTDOCS= README
PLIST_FILES= bin/bbdock
diff --git a/x11/bbdock/files/patch-Slot.cc b/x11/bbdock/files/patch-Slot.cc
new file mode 100644
index 000000000000..5ddeebaad37c
--- /dev/null
+++ b/x11/bbdock/files/patch-Slot.cc
@@ -0,0 +1,10 @@
+--- src/Slot.cc.orig 2011-03-29 21:48:36.000000000 +0200
++++ src/Slot.cc 2012-05-06 10:01:10.000000000 +0200
+@@ -38,6 +38,7 @@
+ #include <string>
+
+ #include "Slot.hh"
++#include "pngpriv.h"
+
+ extern char **environ;
+
diff --git a/x11/bbrun/Makefile b/x11/bbrun/Makefile
index 30fef53bf759..915a35dcecc9 100644
--- a/x11/bbrun/Makefile
+++ b/x11/bbrun/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bbrun
PORTVERSION= 1.6
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= x11
MASTER_SITES= http://www.bsd-geek.de/FreeBSD/distfiles/
diff --git a/x11/bgrot/Makefile b/x11/bgrot/Makefile
index 4993561ef71f..6eb7818ebab1 100644
--- a/x11/bgrot/Makefile
+++ b/x11/bgrot/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bgrot
PORTVERSION= 1.30
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11
MASTER_SITES= http://www.over-yonder.net/~fullermd/projects/bgrot/ \
http://distfiles.over-yonder.net/bgrot/
diff --git a/x11/bgs/Makefile b/x11/bgs/Makefile
index c84138fb40e6..985d10bf279b 100644
--- a/x11/bgs/Makefile
+++ b/x11/bgs/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bgs
PORTVERSION= 0.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11
MASTER_SITES= http://s01.de/~gottox/files/bgs/ \
http://laffaye.free.fr/distfiles/
diff --git a/x11/brightside/Makefile b/x11/brightside/Makefile
index d980bf83436a..1db06988181f 100644
--- a/x11/brightside/Makefile
+++ b/x11/brightside/Makefile
@@ -7,7 +7,7 @@
PORTNAME= brightside
PORTVERSION= 1.4.0
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= x11
MASTER_SITES= LOCAL/marcus
diff --git a/x11/decurs/Makefile b/x11/decurs/Makefile
index e38812ba1e8a..ce57f2d92cdf 100644
--- a/x11/decurs/Makefile
+++ b/x11/decurs/Makefile
@@ -7,7 +7,7 @@
PORTNAME= decurs
PORTVERSION= 0.55.1
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= x11
MASTER_SITES= http://freebsd.nsu.ru/distfiles/ \
#http://varg.dyndns.org/psi/files/
diff --git a/x11/dgs/Makefile b/x11/dgs/Makefile
index 1fee5b40bcb3..2059e93be038 100644
--- a/x11/dgs/Makefile
+++ b/x11/dgs/Makefile
@@ -7,7 +7,7 @@
PORTNAME= dgs
PORTVERSION= 0.5.9.1
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= ../old-gnu/dgs
@@ -16,7 +16,7 @@ MAINTAINER= dinoex@FreeBSD.org
COMMENT= A display ghostscript system
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff
USE_GHOSTSCRIPT_RUN= yes
diff --git a/x11/eaglemode/Makefile b/x11/eaglemode/Makefile
index d58141fb2668..5af1e5bc85eb 100644
--- a/x11/eaglemode/Makefile
+++ b/x11/eaglemode/Makefile
@@ -7,7 +7,7 @@
PORTNAME= eaglemode
PORTVERSION= 0.82.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}
@@ -15,7 +15,7 @@ MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Futuristic zoomable user environment
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
freetype.9:${PORTSDIR}/print/freetype2
diff --git a/x11/emprint/Makefile b/x11/emprint/Makefile
index 9e7246be5ee1..36aadf6fbae5 100644
--- a/x11/emprint/Makefile
+++ b/x11/emprint/Makefile
@@ -7,6 +7,7 @@
PORTNAME= emprint
PORTVERSION= 20110129
+PORTREVISION= 1
CATEGORIES= x11 enlightenment
MASTER_SITES= http://files.roorback.net/e17/2011-01-29/extra/
diff --git a/x11/erun/Makefile b/x11/erun/Makefile
index 2adffaa0832d..f837ce4ff083 100644
--- a/x11/erun/Makefile
+++ b/x11/erun/Makefile
@@ -7,7 +7,7 @@
PORTNAME= E-Run
PORTVERSION= 1.2
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= kbyanc
diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index 31b464868f85..7f980971a629 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= eterm
PORTVERSION= 0.9.6
+PORTREVISION= 1
CATEGORIES+= x11
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Eterm-${PORTVERSION}
DISTNAME= Eterm-${PORTVERSION}
diff --git a/x11/evilvte/Makefile b/x11/evilvte/Makefile
index 3d6474bebb4b..e9c4fad1a9a5 100644
--- a/x11/evilvte/Makefile
+++ b/x11/evilvte/Makefile
@@ -7,6 +7,7 @@
PORTNAME= evilvte
PORTVERSION= 0.5.0
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= http://www.calno.com/${PORTNAME}/ \
LOCAL/glarkin
diff --git a/x11/fbdesk/Makefile b/x11/fbdesk/Makefile
index 7791119678fe..4e03ea831f48 100644
--- a/x11/fbdesk/Makefile
+++ b/x11/fbdesk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fbdesk
PORTVERSION= 1.4.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11
MASTER_SITES= http://fluxbox.sourceforge.net/download/ \
GENTOO/distfiles
@@ -17,7 +17,7 @@ COMMENT= A Fluxbox utility to create and manage icons on the desktop
LICENSE= MIT
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
OPTIONS_DEFINE= IMLIB2 DOCS
OPTIONS_DEFAULT= IMLIB2
diff --git a/x11/fbdesk/files/patch-ImagePNG.cc b/x11/fbdesk/files/patch-ImagePNG.cc
index 40c49462c946..28de77bce3b4 100644
--- a/x11/fbdesk/files/patch-ImagePNG.cc
+++ b/x11/fbdesk/files/patch-ImagePNG.cc
@@ -1,6 +1,14 @@
--- src/FbTk/ImagePNG.cc.orig 2004-09-20 16:04:11.000000000 +0200
-+++ src/FbTk/ImagePNG.cc 2010-03-29 21:44:37.000000000 +0200
-@@ -88,7 +88,7 @@
++++ src/FbTk/ImagePNG.cc 2012-05-06 09:59:07.000000000 +0200
+@@ -28,6 +28,7 @@
+ #include "PixmapWithMask.hh"
+
+ #include <png.h>
++#include <pngpriv.h>
+ #include <cstdio>
+ #include <iostream>
+ using namespace std;
+@@ -88,7 +89,7 @@
// check header
unsigned char tag[4];
fread(tag, 1, 4, fp);
@@ -9,3 +17,12 @@
fclose(fp);
return 0;
}
+@@ -102,7 +103,7 @@
+ return 0;
+ }
+
+- if (setjmp(png.png()->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png.png()))) {
+ fclose(fp);
+ return 0;
+ }
diff --git a/x11/fbpanel/Makefile b/x11/fbpanel/Makefile
index 1db38089eaa9..d4a3c36fdfc5 100644
--- a/x11/fbpanel/Makefile
+++ b/x11/fbpanel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fbpanel
PORTVERSION= 6.1
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= SF
EXTRACT_SUFX= .tbz2
diff --git a/x11/florence/Makefile b/x11/florence/Makefile
index f7a9a3437e31..440c994084b1 100644
--- a/x11/florence/Makefile
+++ b/x11/florence/Makefile
@@ -7,7 +7,7 @@
PORTNAME= florence
PORTVERSION= 0.5.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= SF/florence/florence/${PORTVERSION}
diff --git a/x11/fluxbg/Makefile b/x11/fluxbg/Makefile
index 68ed30591e60..629450cdba65 100644
--- a/x11/fluxbg/Makefile
+++ b/x11/fluxbg/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fluxbg
PORTVERSION= 0.7
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= x11
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/x11/gcb/Makefile b/x11/gcb/Makefile
index bc0bd715c90e..75c3fd585d4c 100644
--- a/x11/gcb/Makefile
+++ b/x11/gcb/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gcb
PORTVERSION= 0.2.8
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11
MASTER_SITES= http://freebsd.flatrate.ru/distfiles/ \
http://ccbsd9.csie.nctu.edu.tw/~cp76/gcb/
diff --git a/x11/gdesklets-tasklist/Makefile b/x11/gdesklets-tasklist/Makefile
index 64a5ee3afb8e..0d2d5bdbc0f2 100644
--- a/x11/gdesklets-tasklist/Makefile
+++ b/x11/gdesklets-tasklist/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tasklist
PORTVERSION= 0.10
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= x11 gnome
MASTER_SITES= http://gdesklets.zencomputer.ca/
PKGNAMEPREFIX= gdesklets-
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 4a14618805e1..e5a702086f78 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gdm
PORTVERSION= 2.30.5
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11/gmrun/Makefile b/x11/gmrun/Makefile
index ed25ab252486..db13d305d78d 100644
--- a/x11/gmrun/Makefile
+++ b/x11/gmrun/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gmrun
PORTVERSION= 0.9.2
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= x11
MASTER_SITES= SF
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 17d90546f04b..ad16bdd1887a 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnome-applets
PORTVERSION= 2.32.1.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11/gnome-clipboard-daemon/Makefile b/x11/gnome-clipboard-daemon/Makefile
index 4a5f538058c8..0d47297495b1 100644
--- a/x11/gnome-clipboard-daemon/Makefile
+++ b/x11/gnome-clipboard-daemon/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnome-clipboard-daemon
PORTVERSION= 1.0
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= x11 gnome
MASTER_SITES= http://members.chello.nl/~h.lai/gnome-clipboard-daemon/
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 1762fcc7e830..49049ea98a29 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnome-desktop
PORTVERSION= 2.32.1
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index 26a363f05bef..1d163b2380ad 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnome-libs
PORTVERSION= 1.4.2
-PORTREVISION= 17
+PORTREVISION= 18
CATEGORIES?= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
@@ -17,6 +17,7 @@ MAINTAINER?= gnome@FreeBSD.org
COMMENT= Libraries for GNOME, a GNU desktop environment
BUILD_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
RUN_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian
USE_BZIP2= yes
@@ -29,7 +30,7 @@ USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-test-gnome
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
-CPPFLAGS+= -I${LOCALBASE}/include
+CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
MAN1= dns-helper.1 gconfigger.1 gnome-bug.1 gnome-config.1 \
gnome-doc.1 gnome-dump-metadata.1 gnome-gen-mimedb.1 \
diff --git a/x11/gnome-libs/files/patch-gtk-xmhtml-readPNG.c b/x11/gnome-libs/files/patch-gtk-xmhtml-readPNG.c
new file mode 100644
index 000000000000..d3c6f8bbcb0d
--- /dev/null
+++ b/x11/gnome-libs/files/patch-gtk-xmhtml-readPNG.c
@@ -0,0 +1,28 @@
+--- gtk-xmhtml/readPNG.c.orig 2002-08-06 23:25:46.000000000 +0200
++++ gtk-xmhtml/readPNG.c 2012-05-11 18:06:35.000000000 +0200
+@@ -158,6 +158,7 @@
+
+ #ifdef HAVE_LIBPNG
+ #include <png.h>
++#include <pngpriv.h>
+ #include <setjmp.h>
+ #include <math.h> /* required for full alpha channel processing */
+ #endif
+@@ -208,7 +209,7 @@
+
+ _XmHTMLWarning(__WFUNC__(NULL, "png_error"),
+ "libpng error on image %s: %s", ib->file, msg);
+- longjmp(png_ptr->jmpbuf, 1);
++ longjmp(png_jmpbuf(png_ptr), 1);
+ }
+
+ /*****
+@@ -308,7 +309,7 @@
+ return((XmHTMLRawImageData*)NULL);
+ }
+ /* now set error handler */
+- if(setjmp(png_ptr->jmpbuf))
++ if(setjmp(png_jmpbuf(png_ptr)))
+ {
+ /*
+ * PNG signalled an error. Destroy image data, free any allocated
diff --git a/x11/gnome-libs/files/patch-tools-convertrgb-loadpng.c b/x11/gnome-libs/files/patch-tools-convertrgb-loadpng.c
index 029d3bfffa9c..8307927f80b6 100644
--- a/x11/gnome-libs/files/patch-tools-convertrgb-loadpng.c
+++ b/x11/gnome-libs/files/patch-tools-convertrgb-loadpng.c
@@ -1,6 +1,23 @@
--- tools/convertrgb/loadpng.c.orig 1998-09-25 17:33:59.000000000 +0200
-+++ tools/convertrgb/loadpng.c 2010-03-29 09:05:19.000000000 +0200
-@@ -161,7 +161,7 @@
++++ tools/convertrgb/loadpng.c 2012-05-09 13:02:52.000000000 +0200
+@@ -3,6 +3,7 @@
+ */
+
+ #include "convertrgb.h"
++#include "pngpriv.h"
+
+ static int transp;
+
+@@ -29,7 +30,7 @@
+ return NULL;
+ }
+
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ return NULL;
+@@ -161,7 +162,7 @@
return 0;
fread(buf, 1, 8, f);
fclose(f);
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index bc2d84c50678..96b627b3a43f 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnome-panel
PORTVERSION= 2.32.1
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index e23121595bd5..65dd6f4ef497 100644
--- a/x11/gnome-screensaver/Makefile
+++ b/x11/gnome-screensaver/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnome-screensaver
PORTVERSION= 2.30.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 73a300af4c01..fe3650ca17ad 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnome-session
PORTVERSION= 2.32.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11/gnome-swallow/Makefile b/x11/gnome-swallow/Makefile
index 1fcc595ae40c..f32811ab5115 100644
--- a/x11/gnome-swallow/Makefile
+++ b/x11/gnome-swallow/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnome-swallow
PORTVERSION= 1.2
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= x11 gnome
MASTER_SITES= http://interreality.org/~tetron/technology/swallow/
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index 46d3e465f79b..64a9b5285f3c 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnome-terminal
PORTVERSION= 2.32.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11/gnome2-fifth-toe/Makefile b/x11/gnome2-fifth-toe/Makefile
index ba08fa1f70d7..d46aeaac0db4 100644
--- a/x11/gnome2-fifth-toe/Makefile
+++ b/x11/gnome2-fifth-toe/Makefile
@@ -6,7 +6,7 @@
# $MCom: ports/x11/gnome2-fifth-toe/Makefile,v 1.92 2007/10/18 23:45:20 marcus Exp $
#
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11 gnome
PKGNAMESUFFIX= -fifth-toe
diff --git a/x11/gromit/Makefile b/x11/gromit/Makefile
index 7177cf1c62e0..b7a46f346aae 100644
--- a/x11/gromit/Makefile
+++ b/x11/gromit/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gromit
PORTVERSION= 20041213
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11
MASTER_SITES= http://www.home.unix-ag.org/simon/gromit/
diff --git a/x11/gsynaptics/Makefile b/x11/gsynaptics/Makefile
index ecaacf1b750d..40aa439d48bb 100644
--- a/x11/gsynaptics/Makefile
+++ b/x11/gsynaptics/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gsynaptics
PORTVERSION= 0.9.9
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
MASTER_SITE_SUBDIR= gsynaptics/21527
diff --git a/x11/gtk-theme-switch2/Makefile b/x11/gtk-theme-switch2/Makefile
index e1bdcf2a0cfb..24dbc9a70004 100644
--- a/x11/gtk-theme-switch2/Makefile
+++ b/x11/gtk-theme-switch2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtk-theme-switch
DISTVERSION= 2.0.0rc2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11
MASTER_SITES= http://www.muhri.net/
diff --git a/x11/gtkchtheme/Makefile b/x11/gtkchtheme/Makefile
index 8471a21f2057..05c0d7521e58 100644
--- a/x11/gtkchtheme/Makefile
+++ b/x11/gtkchtheme/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtkchtheme
PORTVERSION= 0.3.1
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= x11
MASTER_SITES= http://plasmasturm.org/code/gtk-chtheme/
DISTNAME= gtk-chtheme-${PORTVERSION}
diff --git a/x11/gtkterm2/Makefile b/x11/gtkterm2/Makefile
index 9821c0e14e41..ac6e93c7379e 100644
--- a/x11/gtkterm2/Makefile
+++ b/x11/gtkterm2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtkterm2
PORTVERSION= 0.2.3
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= x11
MASTER_SITES= SF/gtkterm/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/x11/gtstarter/Makefile b/x11/gtstarter/Makefile
index b1a9885b7a1a..7f1258fbf375 100644
--- a/x11/gtstarter/Makefile
+++ b/x11/gtstarter/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtstarter
PORTVERSION= 0.4.6.3
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11 gnome
MASTER_SITES= http://webonaut.com/distfiles/${PORTNAME}/
diff --git a/x11/hotwire-shell/Makefile b/x11/hotwire-shell/Makefile
index bfabce8a8813..3056d9de9ce0 100644
--- a/x11/hotwire-shell/Makefile
+++ b/x11/hotwire-shell/Makefile
@@ -7,7 +7,7 @@
PORTNAME= hotwire-shell
PORTVERSION= 0.721
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/x11/i3lock/Makefile b/x11/i3lock/Makefile
index a4e5c8351e4f..9059f71c7ebf 100644
--- a/x11/i3lock/Makefile
+++ b/x11/i3lock/Makefile
@@ -7,6 +7,7 @@
PORTNAME= i3lock
PORTVERSION= 2.4
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://i3wm.org/${PORTNAME}/ \
http://mirror.4bit.ws/ \
diff --git a/x11/idesk/Makefile b/x11/idesk/Makefile
index a515250dde6f..f4cd83883bfd 100644
--- a/x11/idesk/Makefile
+++ b/x11/idesk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= idesk
PORTVERSION= 0.7.5
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= x11
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/x11/ipager/Makefile b/x11/ipager/Makefile
index b74de86ba811..ae1e5b018500 100644
--- a/x11/ipager/Makefile
+++ b/x11/ipager/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ipager
PORTVERSION= 1.1.0
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= x11
MASTER_SITES= http://useperl.ru/ipager/src/
DISTNAME= ipager-${PORTVERSION}
diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile
index e8abf6c96d0d..da7449dac8ff 100644
--- a/x11/kde4-baseapps/Makefile
+++ b/x11/kde4-baseapps/Makefile
@@ -8,6 +8,7 @@
PORTNAME= kde-baseapps
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index 5d96b80d0131..6603742f86f8 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -8,6 +8,7 @@
PORTNAME= kde-runtime
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index 7cf42be57ca7..33adda3825d8 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -8,6 +8,7 @@
PORTNAME= kde-workspace
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE_kde} \
${MASTER_SITE_LOCAL} \
@@ -32,7 +33,7 @@ LIB_DEPENDS= dbus-1.3:${PORTSDIR}/devel/dbus \
dbusmenu-qt.2:${PORTSDIR}/devel/libdbusmenu-qt \
fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
freetype.9:${PORTSDIR}/print/freetype2 \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg \
kactivities.6:${PORTSDIR}/x11/kactivities
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index e5fafc95e85c..112ebf5fe4a1 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -8,7 +8,7 @@
PORTNAME= kdebase
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 7b5f8dbd161b..c492210337f1 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -8,7 +8,7 @@
PORTNAME= kdelibs
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= x11 kde ipv6
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 04fac5d2f209..4748829a0ab1 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -8,6 +8,7 @@
PORTNAME= kdelibs
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= x11 kde ipv6
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
@@ -23,7 +24,7 @@ LIB_DEPENDS= IlmImf.6:${PORTSDIR}/graphics/OpenEXR \
avahi-core.7:${PORTSDIR}/net/avahi-app \
enchant.1:${PORTSDIR}/textproc/enchant \
gif.5:${PORTSDIR}/graphics/giflib \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg \
hal.1:${PORTSDIR}/sysutils/hal \
qca.2:${PORTSDIR}/devel/qca \
diff --git a/x11/keybinder/Makefile b/x11/keybinder/Makefile
index 64457395bc70..9accb6a433df 100644
--- a/x11/keybinder/Makefile
+++ b/x11/keybinder/Makefile
@@ -7,6 +7,7 @@
PORTNAME= keybinder
PORTVERSION= 0.2.2
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://kaizer.se/publicfiles/${PORTNAME}/
diff --git a/x11/keyboardcast/Makefile b/x11/keyboardcast/Makefile
index 6cce05b1f974..30ca0ef5aab4 100644
--- a/x11/keyboardcast/Makefile
+++ b/x11/keyboardcast/Makefile
@@ -7,6 +7,7 @@
PORTNAME= keyboardcast
PORTVERSION= 0.1.1
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://desrt.mcmaster.ca/code/keyboardcast/
diff --git a/x11/keynav/Makefile b/x11/keynav/Makefile
index 5ff5349f757c..e552da45f036 100644
--- a/x11/keynav/Makefile
+++ b/x11/keynav/Makefile
@@ -7,6 +7,7 @@
PORTNAME= keynav
DISTVERSION= 0.20110708.0
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11
MASTER_SITES= http://semicomplete.googlecode.com/files/
diff --git a/x11/kgamma/Makefile b/x11/kgamma/Makefile
index 41432131a9e6..911b615d1228 100644
--- a/x11/kgamma/Makefile
+++ b/x11/kgamma/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kgamma
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/x11/konsole/Makefile b/x11/konsole/Makefile
index 9a600741d19e..18cc1e686181 100644
--- a/x11/konsole/Makefile
+++ b/x11/konsole/Makefile
@@ -6,6 +6,7 @@
PORTNAME= konsole
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/x11/libexo/Makefile b/x11/libexo/Makefile
index efb42fb413f8..b04328a2c801 100644
--- a/x11/libexo/Makefile
+++ b/x11/libexo/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libexo
PORTVERSION= 0.8.0
+PORTREVISION= 1
CATEGORIES= x11 xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
DISTNAME= exo-${PORTVERSION}
diff --git a/x11/libfm/Makefile b/x11/libfm/Makefile
index 7ab8954814ff..81aba7b86dfb 100644
--- a/x11/libfm/Makefile
+++ b/x11/libfm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libfm
PORTVERSION= 0.1.17
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= SF/pcmanfm/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/libfm%20%28required%20by%20PCManFM%29/
diff --git a/x11/libgnome-java/Makefile b/x11/libgnome-java/Makefile
index 07c4f50bba55..68eb99010b16 100644
--- a/x11/libgnome-java/Makefile
+++ b/x11/libgnome-java/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libgnome-java
PORTVERSION= 2.12.7
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11 java
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index 12c4878055f5..f22b01f77c9b 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libgnome
PORTVERSION= 2.32.0
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile
index 9aac3868fb29..5e79cd673c30 100644
--- a/x11/libgnomekbd/Makefile
+++ b/x11/libgnomekbd/Makefile
@@ -8,6 +8,7 @@
PORTNAME= libgnomekbd
PORTVERSION= 2.32.0
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11/libgnomemm/Makefile b/x11/libgnomemm/Makefile
index 18b94006f9dc..0611dc1f1ab4 100644
--- a/x11/libgnomemm/Makefile
+++ b/x11/libgnomemm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libgnomemm
PORTVERSION= 2.0.1
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= x11 gnome
MASTER_SITES= SF/gtkmm/OldFiles
DIST_SUBDIR= gnome2
diff --git a/x11/libgnomemm26/Makefile b/x11/libgnomemm26/Makefile
index 6f44f03afaf5..ea3ebbc43199 100644
--- a/x11/libgnomemm26/Makefile
+++ b/x11/libgnomemm26/Makefile
@@ -8,6 +8,7 @@
PORTNAME= libgnomemm
PORTVERSION= 2.30.0
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11/libxfce4menu/Makefile b/x11/libxfce4menu/Makefile
index 59938edff7ef..8729cac23d12 100644
--- a/x11/libxfce4menu/Makefile
+++ b/x11/libxfce4menu/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libxfce4menu
PORTVERSION= 4.10.0
+PORTREVISION= 1
CATEGORIES= x11 xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
DISTNAME= libxfce4ui-${PORTVERSION}
diff --git a/x11/lxpanel/Makefile b/x11/lxpanel/Makefile
index ee4538c267ce..94dc5d5380f8 100644
--- a/x11/lxpanel/Makefile
+++ b/x11/lxpanel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= lxpanel
PORTVERSION= 0.5.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= SF/lxde/LXPanel%20%28desktop%20panel%29/LXPanel%20${PORTVERSION}
diff --git a/x11/menu-cache/Makefile b/x11/menu-cache/Makefile
index a50363b83472..627f7498fa3d 100644
--- a/x11/menu-cache/Makefile
+++ b/x11/menu-cache/Makefile
@@ -7,7 +7,7 @@
PORTNAME= menu-cache
PORTVERSION= 0.3.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MASTER_SITES= SF/lxde/menu-cache/menu-cache%20${PORTVERSION}/
diff --git a/x11/metalock/Makefile b/x11/metalock/Makefile
index c2211f54f3b4..844ea3aa9aea 100644
--- a/x11/metalock/Makefile
+++ b/x11/metalock/Makefile
@@ -7,6 +7,7 @@
PORTNAME= metalock
PORTVERSION= 0.8.0
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= BERLIOS GOOGLE_CODE
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
diff --git a/x11/metisse/Makefile b/x11/metisse/Makefile
index 44c7d07db9ff..6ef2d0310303 100644
--- a/x11/metisse/Makefile
+++ b/x11/metisse/Makefile
@@ -7,6 +7,7 @@
PORTNAME= metisse
PORTVERSION= 0.4.1
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://insitu.lri.fr/metisse/download/metisse/
@@ -17,12 +18,13 @@ LICENSE= GPLv3
CONFLICTS= fvwm-1.* fvwm-2.5.*
-LIB_DEPENDS= Nucleo.0:${PORTSDIR}/x11-toolkits/nucleo
+LIB_DEPENDS= Nucleo.0:${PORTSDIR}/x11-toolkits/nucleo \
+ png15:${PORTSDIR}/graphics/png
RUN_DEPENDS= ${LOCALBASE}/libdata/xorg/fonts:${PORTSDIR}/x11-fonts/xorg-fonts
USE_BZIP2= yes
GNU_CONFIGURE= yes
-CPPFLAGS+= -I${LOCALBASE}/include
+CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-fontdir=${LOCALBASE}/lib/X11/fonts
MAKE_ARGS= METISSE_DOC_DIR="${DOCSDIR}"
diff --git a/x11/metisse/files/patch-fvwm-insitu-libs-PictureImageLoader.c b/x11/metisse/files/patch-fvwm-insitu-libs-PictureImageLoader.c
new file mode 100644
index 000000000000..908412dbccbd
--- /dev/null
+++ b/x11/metisse/files/patch-fvwm-insitu-libs-PictureImageLoader.c
@@ -0,0 +1,10 @@
+--- fvwm-insitu/libs/PictureImageLoader.c.orig 2008-12-09 13:52:20.000000000 +0100
++++ fvwm-insitu/libs/PictureImageLoader.c 2012-05-22 07:28:06.000000000 +0200
+@@ -44,6 +44,7 @@
+ #include "Fgdk-pixbuf.h"
+ #include "FRenderInit.h"
+ #include "FImage.h"
++#include "pngpriv.h"
+
+ /* ---------------------------- local definitions -------------------------- */
+ #define FIMAGE_CMD_ARGS Display *dpy, Window win, char *path, \
diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index c586aff642eb..4421f8c87ccf 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= mlterm
PORTVERSION= 3.1.0
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= SF/${PORTNAME}/01release/${PORTNAME}-${PORTVERSION}
diff --git a/x11/mrxvt-devel/Makefile b/x11/mrxvt-devel/Makefile
index 52140a9fa251..f4d006588aaa 100644
--- a/x11/mrxvt-devel/Makefile
+++ b/x11/mrxvt-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mrxvt-devel
PORTVERSION= 0.5.4
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11
MASTER_SITES= SF/materm/mrxvt%20source/${PORTVERSION}
DISTNAME= mrxvt-${PORTVERSION}
@@ -75,7 +75,7 @@ LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg
.if defined(WITHOUT_PNG) || defined(WITHOUT_BACKGROUND)
CONFIGURE_ARGS+= --disable-png
.else
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
.endif
.if defined(WITHOUT_TRANSPARENCY)
diff --git a/x11/mrxvt/Makefile b/x11/mrxvt/Makefile
index 29e819775fe7..f579ed3f278c 100644
--- a/x11/mrxvt/Makefile
+++ b/x11/mrxvt/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mrxvt
PORTVERSION= 0.4.2
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= x11
MASTER_SITES= SF/materm/${PORTNAME}%20source/${PORTVERSION}
EXTRACT_SUFX= .tgz
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A tabbed version of rxvt
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png
+ png15:${PORTSDIR}/graphics/png
CONFLICTS= mrxvt-0.5.*
diff --git a/x11/multi-gnome-terminal/Makefile b/x11/multi-gnome-terminal/Makefile
index 64f23c5b6f89..33b5fdff0153 100644
--- a/x11/multi-gnome-terminal/Makefile
+++ b/x11/multi-gnome-terminal/Makefile
@@ -8,7 +8,7 @@
PORTNAME= multi-gnome-terminal
PORTVERSION= 1.6.2
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= x11 gnome
MASTER_SITES= SF/multignometerm/multignometerm/mgt-${PORTVERSION}
diff --git a/x11/nvidia-settings/Makefile b/x11/nvidia-settings/Makefile
index e378ecaad987..da977006768c 100644
--- a/x11/nvidia-settings/Makefile
+++ b/x11/nvidia-settings/Makefile
@@ -7,6 +7,7 @@
PORTNAME= nvidia-settings
PORTVERSION= 295.40
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://download.nvidia.com/XFree86/nvidia-settings/ \
ftp://download1.nvidia.com/XFree86/nvidia-settings/
diff --git a/x11/oooqs/Makefile b/x11/oooqs/Makefile
index 3a9d38c6af4d..dc9e8e11fbb8 100644
--- a/x11/oooqs/Makefile
+++ b/x11/oooqs/Makefile
@@ -6,7 +6,7 @@
PORTNAME= oooqs
PORTVERSION= 2.0.3
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= x11
MASTER_SITES= http://download.berlios.de/segfaultskde/
diff --git a/x11/oooqs2/Makefile b/x11/oooqs2/Makefile
index ce6563bcb309..de18cfdd5288 100644
--- a/x11/oooqs2/Makefile
+++ b/x11/oooqs2/Makefile
@@ -6,7 +6,7 @@
PORTNAME= oooqs2
PORTVERSION= 1.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11
MASTER_SITES= http://download.berlios.de/segfaultskde/ \
http://download2.berlios.de/segfaultskde/ \
diff --git a/x11/peeper/Makefile b/x11/peeper/Makefile
index b0a20511c527..dd774ac12a11 100644
--- a/x11/peeper/Makefile
+++ b/x11/peeper/Makefile
@@ -8,7 +8,7 @@
PORTNAME= peeper
PORTVERSION= 0.1
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= x11
MASTER_SITES= http://peeper.sourceforge.net/
diff --git a/x11/plasma-scriptengine-python/Makefile b/x11/plasma-scriptengine-python/Makefile
index 9ccc4bb7d238..640728450fdb 100644
--- a/x11/plasma-scriptengine-python/Makefile
+++ b/x11/plasma-scriptengine-python/Makefile
@@ -7,6 +7,7 @@
PORTNAME= plasma-scriptengine-python
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/x11/plasma-scriptengine-ruby/Makefile b/x11/plasma-scriptengine-ruby/Makefile
index b64df6f3419a..6332f82fb75f 100644
--- a/x11/plasma-scriptengine-ruby/Makefile
+++ b/x11/plasma-scriptengine-ruby/Makefile
@@ -7,6 +7,7 @@
PORTNAME= plasma-scriptengine-ruby
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/x11/powershell/Makefile b/x11/powershell/Makefile
index cbaad3d02c2c..5d11254b7a70 100644
--- a/x11/powershell/Makefile
+++ b/x11/powershell/Makefile
@@ -7,7 +7,7 @@
PORTNAME= powershell
PORTVERSION= 0.8
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= x11 gnome
MASTER_SITES= SF
diff --git a/x11/py-qt4-opengl/Makefile b/x11/py-qt4-opengl/Makefile
index 3dd0e2bd5748..3cba32608da1 100644
--- a/x11/py-qt4-opengl/Makefile
+++ b/x11/py-qt4-opengl/Makefile
@@ -6,6 +6,7 @@
PORTNAME= opengl
PORTVERSION= ${PYQT4_VERSION}
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11 devel python
MASTER_SITES= ${MASTER_SITES_PYQT4}
diff --git a/x11/qimageblitz/Makefile b/x11/qimageblitz/Makefile
index 460a7198e560..3ce4299a4712 100644
--- a/x11/qimageblitz/Makefile
+++ b/x11/qimageblitz/Makefile
@@ -7,6 +7,7 @@
PORTNAME= qimageblitz
PORTVERSION= 0.0.6
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTNAME}
diff --git a/x11/qt4-graphicssystems-opengl/Makefile b/x11/qt4-graphicssystems-opengl/Makefile
index 025f56393b59..4f06486ad20d 100644
--- a/x11/qt4-graphicssystems-opengl/Makefile
+++ b/x11/qt4-graphicssystems-opengl/Makefile
@@ -7,6 +7,7 @@
PORTNAME= graphicssystems
DISTVERSION= ${QT4_VERSION}
+PORTREVISION= 1
CATEGORIES?= x11
PKGNAMEPREFIX= qt4-
PKGNAMESUFFIX= -opengl
diff --git a/x11/qt4-inputmethods/Makefile b/x11/qt4-inputmethods/Makefile
index ef8f2ff8274e..211dafb87341 100644
--- a/x11/qt4-inputmethods/Makefile
+++ b/x11/qt4-inputmethods/Makefile
@@ -8,6 +8,7 @@
PORTNAME= inputmethods
DISTVERSION= ${QT4_VERSION}
+PORTREVISION= 1
CATEGORIES?= x11
PKGNAMEPREFIX= qt4-
diff --git a/x11/qt4-opengl/Makefile b/x11/qt4-opengl/Makefile
index 8c733042cc92..b049e02f321f 100644
--- a/x11/qt4-opengl/Makefile
+++ b/x11/qt4-opengl/Makefile
@@ -8,6 +8,7 @@
PORTNAME= opengl
DISTVERSION= ${QT4_VERSION}
+PORTREVISION= 1
CATEGORIES?= x11
PKGNAMEPREFIX= qt4-
diff --git a/x11/rox-wallpaper/Makefile b/x11/rox-wallpaper/Makefile
index 9b1a9fbf3328..7a83ed5050f3 100644
--- a/x11/rox-wallpaper/Makefile
+++ b/x11/rox-wallpaper/Makefile
@@ -7,6 +7,7 @@
PORTNAME= rox-wallpaper
PORTVERSION= 2.3
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= SF/rox/Wallpaper/${PORTVERSION}
DISTNAME= Wallpaper-${PORTVERSION}
diff --git a/x11/roxbg/Makefile b/x11/roxbg/Makefile
index 40bec7fde214..57fc69741b10 100644
--- a/x11/roxbg/Makefile
+++ b/x11/roxbg/Makefile
@@ -7,7 +7,7 @@
PORTNAME= roxbg
PORTVERSION= 1.0.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11 deskutils
MASTER_SITES= http://vvelox.net/programs/unix/x11/
EXTRACT_SUFX=
diff --git a/x11/roxterm/Makefile b/x11/roxterm/Makefile
index 8b4877aa88ff..9553aa28b2a1 100644
--- a/x11/roxterm/Makefile
+++ b/x11/roxterm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= roxterm
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= SF
diff --git a/x11/rsibreak-kde4/Makefile b/x11/rsibreak-kde4/Makefile
index 4eaaf8ea14b6..6a1923d12d8a 100644
--- a/x11/rsibreak-kde4/Makefile
+++ b/x11/rsibreak-kde4/Makefile
@@ -7,7 +7,7 @@
PORTNAME= rsibreak
DISTVERSION= 0.11-beta1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 kde
MASTER_SITES= http://www.rsibreak.org/files/
diff --git a/x11/rsibreak/Makefile b/x11/rsibreak/Makefile
index 204fba5bcf52..0dff622f1d27 100644
--- a/x11/rsibreak/Makefile
+++ b/x11/rsibreak/Makefile
@@ -7,7 +7,7 @@
PORTNAME= rsibreak
PORTVERSION= 0.8.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11 kde
MASTER_SITES= http://www.rsibreak.org/files/
diff --git a/x11/rxvt-unicode/Makefile b/x11/rxvt-unicode/Makefile
index 3b3af817c80f..b63ada9ade19 100644
--- a/x11/rxvt-unicode/Makefile
+++ b/x11/rxvt-unicode/Makefile
@@ -7,6 +7,7 @@
PORTNAME= rxvt-unicode
PORTVERSION= 9.15
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://dist.schmorp.de/rxvt-unicode/%SUBDIR%/
MASTER_SITE_SUBDIR= . Attic
diff --git a/x11/silo/Makefile b/x11/silo/Makefile
index fb69117e0e05..20a5a59dcda2 100644
--- a/x11/silo/Makefile
+++ b/x11/silo/Makefile
@@ -7,7 +7,7 @@
PORTNAME= silo
PORTVERSION= 1.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= x11
MASTER_SITES= http://doublef.nm.ru/silo/sources/
diff --git a/x11/simdock/Makefile b/x11/simdock/Makefile
index 8d03e273653c..623947f1a70b 100644
--- a/x11/simdock/Makefile
+++ b/x11/simdock/Makefile
@@ -7,7 +7,7 @@
PORTNAME= simdock
PORTVERSION= 1.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11
MASTER_SITES= SF
DISTNAME= ${PORTNAME}_${PORTVERSION}
diff --git a/x11/sisctrl/Makefile b/x11/sisctrl/Makefile
index dad85ffdf93a..2aefc3f073ff 100644
--- a/x11/sisctrl/Makefile
+++ b/x11/sisctrl/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sisctrl
PORTVERSION= 0.0.20051202
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11
MASTER_SITES= http://www.winischhofer.net/sis/
diff --git a/x11/slim/Makefile b/x11/slim/Makefile
index 639148312d0b..6534ffa3d36a 100644
--- a/x11/slim/Makefile
+++ b/x11/slim/Makefile
@@ -7,7 +7,7 @@
PORTNAME= slim
PORTVERSION= 1.3.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_BERLIOS} \
http://depot.fsck.ch/mirror/distfiles/
@@ -17,7 +17,7 @@ MAINTAINER= henry.hu.sh@gmail.com
COMMENT= Graphical login manager for X11, derived from Login.app
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
freetype:${PORTSDIR}/print/freetype2 \
fontconfig:${PORTSDIR}/x11-fonts/fontconfig
diff --git a/x11/slim/files/patch-png.c b/x11/slim/files/patch-png.c
new file mode 100644
index 000000000000..06b60c641b5b
--- /dev/null
+++ b/x11/slim/files/patch-png.c
@@ -0,0 +1,11 @@
+--- png.c.orig 2010-07-08 07:04:10.000000000 +0200
++++ png.c 2012-05-06 10:02:42.000000000 +0200
+@@ -57,7 +57,7 @@
+ return(0);
+ }
+
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL);
+ fclose(infile);
diff --git a/x11/stjerm/Makefile b/x11/stjerm/Makefile
index e261b0a81505..d60e928af2c1 100644
--- a/x11/stjerm/Makefile
+++ b/x11/stjerm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= stjerm
PORTVERSION= 0.15
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://stjerm-terminal.googlecode.com/files/
diff --git a/x11/terminator/Makefile b/x11/terminator/Makefile
index fe714b83c845..c847317057ae 100644
--- a/x11/terminator/Makefile
+++ b/x11/terminator/Makefile
@@ -7,7 +7,7 @@
PORTNAME= terminator
PORTVERSION= 0.96
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11 python
MASTER_SITES= http://launchpadlibrarian.net/80778747/ \
http://hur.st/mirror/terminator/
diff --git a/x11/tilda/Makefile b/x11/tilda/Makefile
index 69cb3e727859..a7e9eb239a8d 100644
--- a/x11/tilda/Makefile
+++ b/x11/tilda/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tilda
PORTVERSION= 0.9.6
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/x11/tint/Makefile b/x11/tint/Makefile
index e14394084f4e..78d88bb258d8 100644
--- a/x11/tint/Makefile
+++ b/x11/tint/Makefile
@@ -7,6 +7,7 @@
PORTNAME= tint2
PORTVERSION= 0.11
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
diff --git a/x11/trayer-srg/Makefile b/x11/trayer-srg/Makefile
index 273cd2223260..4ed276714f05 100644
--- a/x11/trayer-srg/Makefile
+++ b/x11/trayer-srg/Makefile
@@ -8,6 +8,7 @@
PORTNAME= trayer
PORTVERSION= 1.1.4
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://github.com/sargon/${PORTNAME}${PKGNAMESUFFIX}/tarball/${PORTNAME}-${PORTVERSION}/
PKGNAMESUFFIX= -srg
diff --git a/x11/trayer/Makefile b/x11/trayer/Makefile
index fe8052231053..d21546808e77 100644
--- a/x11/trayer/Makefile
+++ b/x11/trayer/Makefile
@@ -7,6 +7,7 @@
PORTNAME= trayer
PORTVERSION= 1.1.1
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_DEBIAN}
MASTER_SITE_SUBDIR= pool/main/t/trayer
diff --git a/x11/wbar/Makefile b/x11/wbar/Makefile
index 3d1a1a708933..70bf9a9ab8b2 100644
--- a/x11/wbar/Makefile
+++ b/x11/wbar/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wbar
PORTVERSION= 2.2.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \
http://nivi.interfree.it/distfiles/${PORTNAME}/
diff --git a/x11/wbarconf/Makefile b/x11/wbarconf/Makefile
index 6331894396df..bc26552290e2 100644
--- a/x11/wbarconf/Makefile
+++ b/x11/wbarconf/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wbarconf
PORTVERSION= 0.7.2.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= http://www.ihku.biz/wbarconf/
DISTNAME= wbarconf-${PORTVERSION}
diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile
index a18d2b2296b8..87362af9bd1d 100644
--- a/x11/wdm/Makefile
+++ b/x11/wdm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wdm
PORTVERSION= 1.28
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= x11 windowmaker
MASTER_SITES= http://voins.program.ru/wdm/:wdm \
http://wolfram.schneider.org/bsd/gif/bsd/:pic_large \
diff --git a/x11/wmblob/Makefile b/x11/wmblob/Makefile
index a00538cfcd11..37fdbcf8e6ad 100644
--- a/x11/wmblob/Makefile
+++ b/x11/wmblob/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wmblob
PORTVERSION= 1.0.3
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= x11 windowmaker
MASTER_SITES= http://www.dockapps.org/files/155/541/
diff --git a/x11/wmcliphist/Makefile b/x11/wmcliphist/Makefile
index d02a3613a960..461d586b9c8f 100644
--- a/x11/wmcliphist/Makefile
+++ b/x11/wmcliphist/Makefile
@@ -7,6 +7,7 @@
PORTNAME= wmcliphist
PORTVERSION= 1.0
+PORTREVISION= 1
CATEGORIES= x11 windowmaker
MASTER_SITES= http://linux.nawebu.cz/wmcliphist/ \
${MASTER_SITE_LOCAL}
diff --git a/x11/wmdrawer/Makefile b/x11/wmdrawer/Makefile
index 7f996fac43d2..91f57eccadac 100644
--- a/x11/wmdrawer/Makefile
+++ b/x11/wmdrawer/Makefile
@@ -8,7 +8,7 @@
PORTNAME= wmdrawer
PORTVERSION= 0.10.5
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= x11 windowmaker
MASTER_SITES= http://people.easter-eggs.org/~valos/wmdrawer/:tarball \
http://wikitest.freebsd.org/wiki/common/:pixmap
diff --git a/x11/workrave/Makefile b/x11/workrave/Makefile
index 88309bb5c81c..8ddaa007ee99 100644
--- a/x11/workrave/Makefile
+++ b/x11/workrave/Makefile
@@ -7,6 +7,7 @@
PORTNAME= workrave
PORTVERSION= 1.9.4
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= SF
diff --git a/x11/xautomation/Makefile b/x11/xautomation/Makefile
index 685a0ce830e6..a83fdd2602e5 100644
--- a/x11/xautomation/Makefile
+++ b/x11/xautomation/Makefile
@@ -8,14 +8,14 @@
PORTNAME= xautomation
PORTVERSION= 1.03
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= http://hoopajoo.net/static/projects/
MAINTAINER= ports@FreeBSD.org
COMMENT= Control X from the command line for scripts
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
USE_XORG= xtst
GNU_CONFIGURE= yes
diff --git a/x11/xcursorgen/Makefile b/x11/xcursorgen/Makefile
index f6d5aa870fb3..7e5f3b2b1bc2 100644
--- a/x11/xcursorgen/Makefile
+++ b/x11/xcursorgen/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xcursorgen
PORTVERSION= 1.0.4
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
@@ -14,7 +15,7 @@ COMMENT= Create an X cursor file from a collection of PNG images
LICENSE= MIT
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
XORG_CAT= app
USE_XORG= x11 xcursor xextproto
diff --git a/x11/xfce4-clipman-plugin/Makefile b/x11/xfce4-clipman-plugin/Makefile
index 0fe05cef53a6..4f0f170c6fc7 100644
--- a/x11/xfce4-clipman-plugin/Makefile
+++ b/x11/xfce4-clipman-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-clipman-plugin
PORTVERSION= 1.2.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR= src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
diff --git a/x11/xfce4-conf/Makefile b/x11/xfce4-conf/Makefile
index 12b48478788e..8657ccfb646e 100644
--- a/x11/xfce4-conf/Makefile
+++ b/x11/xfce4-conf/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xfce4-conf
PORTVERSION= 4.10.0
+PORTREVISION= 1
CATEGORIES= x11 xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
DISTNAME= xfconf-${PORTVERSION}
diff --git a/x11/xfce4-quicklauncher-plugin/Makefile b/x11/xfce4-quicklauncher-plugin/Makefile
index 776f948b8e49..88f55663306b 100644
--- a/x11/xfce4-quicklauncher-plugin/Makefile
+++ b/x11/xfce4-quicklauncher-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-quicklauncher-plugin
PORTVERSION= 1.9.4
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= x11 xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR=/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
diff --git a/x11/xfce4-screenshooter-plugin/Makefile b/x11/xfce4-screenshooter-plugin/Makefile
index dba4da194015..5b23c0264290 100644
--- a/x11/xfce4-screenshooter-plugin/Makefile
+++ b/x11/xfce4-screenshooter-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-screenshooter-plugin
PORTVERSION= 1.8.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR=/src/apps/xfce4-screenshooter/${PORTVERSION:R}
diff --git a/x11/xfce4-taskmanager/Makefile b/x11/xfce4-taskmanager/Makefile
index 45b992d63078..6dae3857a993 100644
--- a/x11/xfce4-taskmanager/Makefile
+++ b/x11/xfce4-taskmanager/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-taskmanager
PORTVERSION= 1.0.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11 xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR= src/apps/${PORTNAME}/${PORTVERSION:R}
diff --git a/x11/xfce4-verve-plugin/Makefile b/x11/xfce4-verve-plugin/Makefile
index 8db32274825f..eec56f090232 100644
--- a/x11/xfce4-verve-plugin/Makefile
+++ b/x11/xfce4-verve-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= verve-plugin
PORTVERSION= 1.0.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11 xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR=/src/panel-plugins/${PKGNAMEPREFIX}${PORTNAME}/${PORTVERSION:R}
diff --git a/x11/xfce4-wmdock-plugin/Makefile b/x11/xfce4-wmdock-plugin/Makefile
index 8a7a95a1255c..60d740e95846 100644
--- a/x11/xfce4-wmdock-plugin/Makefile
+++ b/x11/xfce4-wmdock-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-wmdock-plugin
PORTVERSION= 0.3.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 xfce
MASTER_SITES= http://www.ibh.de/~ellguth/develop/
diff --git a/x11/xfce4-xfapplet-plugin/Makefile b/x11/xfce4-xfapplet-plugin/Makefile
index 2f47427204d6..5af1162b2b0e 100644
--- a/x11/xfce4-xfapplet-plugin/Makefile
+++ b/x11/xfce4-xfapplet-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-xfapplet-plugin
PORTVERSION= 0.1.0
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= x11 xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR=/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
diff --git a/x11/xloadimage/Makefile b/x11/xloadimage/Makefile
index 1fa0e55b2ad8..fc9eb40680cd 100644
--- a/x11/xloadimage/Makefile
+++ b/x11/xloadimage/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xloadimage
PORTVERSION= 4.1.17
+PORTREVISION= 1
CATEGORIES= x11 graphics
MASTER_SITES= ftp://ftp.x.org/R5contrib/:x11 \
${MASTER_SITE_DEBIAN_POOL}
@@ -18,7 +19,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= X11 Image Loading Utility
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
- png.6:${PORTSDIR}/graphics/png \
+ png15:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff
LICENCE= MIT
diff --git a/x11/xorg-edit/Makefile b/x11/xorg-edit/Makefile
index 4a4611afe9d8..c471a7ef1302 100644
--- a/x11/xorg-edit/Makefile
+++ b/x11/xorg-edit/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xorg-edit
PORTVERSION= 07.08.11
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11
MASTER_SITES= SF
DISTNAME= ${PORTNAME}_${PORTVERSION}_src
diff --git a/x11/xpra/Makefile b/x11/xpra/Makefile
index 1a4f40cc9024..984bccbf7235 100644
--- a/x11/xpra/Makefile
+++ b/x11/xpra/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xpra
PORTVERSION= 0.3.1
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://xpra.org/src/
diff --git a/x11/xscreensaver-gnome-hacks/Makefile b/x11/xscreensaver-gnome-hacks/Makefile
index 610895bf458d..7f7afc08829e 100644
--- a/x11/xscreensaver-gnome-hacks/Makefile
+++ b/x11/xscreensaver-gnome-hacks/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xscreensaver-gnome-hacks
-PORTREVISION= 0
+PORTREVISION= 1
MAINTAINER= gnome@FreeBSD.org
COMMENT= Screensaver modules for use with xscreensaver and gnome-screensaver
diff --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile
index 360dd0d4601a..a6f6e12623f6 100644
--- a/x11/xscreensaver-gnome/Makefile
+++ b/x11/xscreensaver-gnome/Makefile
@@ -8,7 +8,7 @@
PORTNAME?= xscreensaver-gnome
PORTVERSION= 5.12
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= x11 gnome
MASTER_SITES= http://www.jwz.org/xscreensaver/
DISTNAME= xscreensaver-${PORTVERSION}
diff --git a/x11/xscreensaver-kde/Makefile b/x11/xscreensaver-kde/Makefile
index 862716328ee2..23801873862e 100644
--- a/x11/xscreensaver-kde/Makefile
+++ b/x11/xscreensaver-kde/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xscreensaver-kde
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index 3f4af317f7f0..2ca6f780d664 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xscreensaver
PORTVERSION= 5.15
+PORTREVISION= 1
CATEGORIES?= x11
MASTER_SITES= http://www.jwz.org/xscreensaver/ \
http://dougbarton.us/Downloads/
diff --git a/x11/xvattr/Makefile b/x11/xvattr/Makefile
index 3c9c2baf3ab3..e2c453a9fa21 100644
--- a/x11/xvattr/Makefile
+++ b/x11/xvattr/Makefile
@@ -8,7 +8,7 @@
PORTNAME= xvattr
PORTVERSION= 1.3
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= x11
MASTER_SITES= ftp://ftp.SpringDaemons.com/soft/ \
http://www.dtek.chalmers.se/groups/dvd/dist/
diff --git a/x11/yakuake-kde4/Makefile b/x11/yakuake-kde4/Makefile
index 412de469b62b..fa07270b9b8b 100644
--- a/x11/yakuake-kde4/Makefile
+++ b/x11/yakuake-kde4/Makefile
@@ -7,7 +7,7 @@
PORTNAME= yakuake
PORTVERSION= 2.9.8
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTNAME}/${PORTVERSION}/src
diff --git a/x11/yakuake/Makefile b/x11/yakuake/Makefile
index cb0b8d598803..5e91e661bfc6 100644
--- a/x11/yakuake/Makefile
+++ b/x11/yakuake/Makefile
@@ -7,7 +7,7 @@
PORTNAME= yakuake
PORTVERSION= 2.8.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= x11 kde
MASTER_SITES= BERLIOS
diff --git a/x11/yalias/Makefile b/x11/yalias/Makefile
index 122133e6f331..27c1f8174586 100644
--- a/x11/yalias/Makefile
+++ b/x11/yalias/Makefile
@@ -7,7 +7,7 @@
PORTNAME= yalias
PORTVERSION= 0.7
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= x11
MASTER_SITES= http://offog.org/files/ \
ftp://ftp.i-scream.org/pub/offog.org/files/ \
diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile
index 2588c6cd4597..b3843967b838 100644
--- a/x11/yelp/Makefile
+++ b/x11/yelp/Makefile
@@ -8,7 +8,7 @@
PORTNAME= yelp
PORTVERSION= 2.30.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile
index 1705efbc3bea..273742fdd6a6 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -8,7 +8,7 @@
PORTNAME= zenity
PORTVERSION= 2.32.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2