Sync w/ FreeBSD ports tree.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7073 df743ca5-7f9a-e211-a948-0013205c9059

32 files changed, 65 insertions, 126 deletions

diff --git a/audio/easytag-devel/Makefile b/audio/easytag-devel/Makefile
index 558f20ee6..fe10fe0c4 100644
--- a/audio/easytag-devel/Makefile
+++ b/audio/easytag-devel/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMESUFFIX=	-devel
 
-MAINTAINER=	adamw@FreeBSD.org
+MAINTAINER=	novel@FreeBSD.org
 COMMENT=	GTK2 Tag editor for MP3 and OGG files
 
 LIB_DEPENDS=	id3:${PORTSDIR}/audio/id3lib \
diff --git a/databases/glom/Makefile b/databases/glom/Makefile
index 08fb6a27e..35aad3b98 100644
--- a/databases/glom/Makefile
+++ b/databases/glom/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/databases/glom/Makefile,v 1.6 2006/07/25 18:16:27 mezz Exp $
 #
 
 PORTNAME=	glom
 PORTVERSION=	0.8.30
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.8
@@ -25,6 +25,7 @@ USE_BZIP2=	yes
 USE_XLIB=	yes
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix pygnomeextras
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
@@ -37,7 +38,7 @@ BROKEN=	needs an update to 1.0
 .include <bsd.port.pre.mk>
 
 .if (${OSVERSION} < 500000)
-BROKEN=		"Doesn't play well with 4.X."
+BROKEN=		does n't play well with 4.X.
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/databases/glom/pkg-plist b/databases/glom/pkg-plist
index 7ef7debe5..2d71c3ced 100644
--- a/databases/glom/pkg-plist
+++ b/databases/glom/pkg-plist
@@ -36,3 +36,5 @@ share/mime/packages/glom.xml
 @dirrm share/gnome/glom/xslt
 @dirrm share/gnome/glom/glade
 @dirrm share/gnome/glom
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
diff --git a/databases/mdbtools/Makefile b/databases/mdbtools/Makefile
index 1cc87f7d1..dde139981 100644
--- a/databases/mdbtools/Makefile
+++ b/databases/mdbtools/Makefile
@@ -21,7 +21,7 @@ USE_BISON=	yes
 USE_GNOME=	glib20
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 DOCS=		AUTHORS ChangeLog HACKING NEWS README TODO
 MAN1=		mdb-ver.1 mdb-tables.1 mdb-schema.1 mdb-sql.1 mdb-export.1
diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile
index 75b6bd7c6..46839bcbd 100644
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	devhelp
 PORTVERSION=	0.10
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES?=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C,^([[:digit:]]+\.[[:digit:]]+).*,\1,}
@@ -31,11 +31,11 @@ MOZILLA=	firefox
 
 USE_BZIP2=	yes
 USE_XLIB=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack intlhack gnomeprefix libgnomeui
-USE_RC_SUBR=	yes
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	${LOCALBASE}/lib/${MOZILLA}
 GCONF_SCHEMAS=	devhelp.schemas
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib"
@@ -55,13 +55,4 @@ pre-everything::
 	@${ECHO_MSG} "  firefox       "
 	@${ECHO_MSG} ""
 
-post-patch:
-	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \
-		-e 's|%%MOZILLA%%|${MOZILLA}|g' \
-		${FILESDIR}/devhelp.sh > ${WRKDIR}/devhelp.sh
-
-post-install:
-	@${INSTALL_SCRIPT} -m 555 ${WRKDIR}/devhelp.sh ${PREFIX}/etc/rc.d/000.devhelp.sh
-	@${LDCONFIG} -m ${LOCALBASE}/lib/${MOZILLA}
-
 .include <bsd.port.post.mk>
diff --git a/devel/devhelp/files/devhelp.sh b/devel/devhelp/files/devhelp.sh
deleted file mode 100755
index 676d01b65..000000000
--- a/devel/devhelp/files/devhelp.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: ports/devel/devhelp/files/devhelp.sh,v 1.3 2006/02/20 20:46:54 dougb Exp $
-#
-# PROVIDE: devhelp
-# REQUIRE: ldconfig
-
-. /etc/rc.subr
-
-name=devhelp
-
-start_cmd=devhelp_start
-stop_cmd=:
-
-[ -z "$devhelp_libdir" ] && devhelp_libdir="%%PREFIX%%/lib/%%MOZILLA%%"
-
-devhelp_start() {
-    if [ -d "$devhelp_libdir" ]; then
-	/sbin/ldconfig -m "$devhelp_libdir"
-    fi
-}
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/devel/devhelp/pkg-plist b/devel/devhelp/pkg-plist
index c9ff21e47..6f3906d57 100644
--- a/devel/devhelp/pkg-plist
+++ b/devel/devhelp/pkg-plist
@@ -1,5 +1,4 @@
 bin/devhelp
-etc/rc.d/000.devhelp.sh
 include/devhelp-1.0/devhelp/dh-base.h
 include/devhelp-1.0/devhelp/dh-book-tree.h
 include/devhelp-1.0/devhelp/dh-error.h
@@ -77,3 +76,5 @@ share/locale/zh_TW/LC_MESSAGES/devhelp.mo
 @dirrm share/gnome/devhelp
 @dirrm include/devhelp-1.0/devhelp
 @dirrm include/devhelp-1.0
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
diff --git a/devel/libglademm24/Makefile b/devel/libglademm24/Makefile
index 2d0a2cbc5..3753d0401 100644
--- a/devel/libglademm24/Makefile
+++ b/devel/libglademm24/Makefile
@@ -3,11 +3,11 @@
 # Whom:                 Alexander Nedotsukov <bland@mail.ru>
 #
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/devel/libglademm24/Makefile,v 1.7 2006/07/25 06:47:27 mezz Exp $
 #
 
 PORTNAME=	libglademm
-PORTVERSION=	2.6.2
+PORTVERSION=	2.6.3
 PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/devel/libglademm24/pkg-plist b/devel/libglademm24/pkg-plist
index 9d4aa8a01..4aecc16a8 100644
--- a/devel/libglademm24/pkg-plist
+++ b/devel/libglademm24/pkg-plist
@@ -23,10 +23,10 @@ libdata/pkgconfig/libglademm-%%API_VERSION%%.pc
 %%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/classGnome_1_1Glade_1_1XmlError__inherit__graph.png
 %%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/classGnome_1_1Glade_1_1Xml__inherit__graph.png
 %%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/classes.html
-%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/dir_000000_dep.png
 %%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/dir_000000.html
-%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/dir_000001_dep.png
+%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/dir_000000_dep.png
 %%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/dir_000001.html
+%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/dir_000001_dep.png
 %%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/dirs.html
 %%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/doxygen.css
 %%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/doxygen.png
@@ -178,10 +178,10 @@ libdata/pkgconfig/libglademm-%%API_VERSION%%.pc
 %%PORTDOCS%%@dirrm share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference
 %%PORTDOCS%%@dirrm share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs
 %%PORTDOCS%%@dirrm share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%
-%%PORTDOCS%%@unexec /bin/rmdir %D/share/doc/gnomemm-2.6 2> /dev/null || /usr/bin/true
+%%PORTDOCS%%@dirrmtry share/doc/gnomemm-2.6
 %%PORTDOCS%%@dirrm share/devhelp/books/libglademm-%%API_VERSION%%
-%%PORTDOCS%%@unexec /bin/rmdir %D/share/devhelp/books 2> /dev/null || /usr/bin/true
-%%PORTDOCS%%@unexec /bin/rmdir %D/share/devhelp 2> /dev/null || /usr/bin/true
+%%PORTDOCS%%@dirrmtry share/devhelp/books
+%%PORTDOCS%%@dirrmtry share/devhelp
 @dirrm lib/libglademm-%%API_VERSION%%/proc/m4
 @dirrm lib/libglademm-%%API_VERSION%%/proc
 @dirrm lib/libglademm-%%API_VERSION%%/include
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index 6ae11a24a..faa037792 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -3,7 +3,7 @@
 # Whom:				  David O'Brien (obrien@NUXI.com)
 #
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/finance/gnucash/Makefile,v 1.3 2006/07/26 02:30:09 mezz Exp $
 #
 
 PORTNAME=	gnucash
@@ -38,7 +38,7 @@ USE_XPM=	yes
 USE_PERL5=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomeprint libglade gtkhtml libghttp intltool intlhack
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-glib-config=${GLIB_CONFIG} \
 		--enable-ofx \
 		--disable-error-on-warning
diff --git a/graphics/djvulibre/Makefile b/graphics/djvulibre/Makefile
index 8e1b35f64..fe7573bb9 100644
--- a/graphics/djvulibre/Makefile
+++ b/graphics/djvulibre/Makefile
@@ -32,7 +32,7 @@ CONFIGURE_ENV=	JPEG_CFLAGS="-I${LOCALBASE}/include" \
 		CXX="${CXX}" \
 		X11BASE="${X11BASE}"
 CONFIGURE_ARGS=	--enable-threads=pthread --enable-shared
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 MANLANG=	"" ja
 MAN1=		bzz.1 c44.1 cjb2.1 cpaldjvu.1 csepdjvu.1 ddjvu.1 djvm.1 \
diff --git a/irc/xchat1/Makefile b/irc/xchat1/Makefile
index 62f548659..7f790ce3c 100644
--- a/irc/xchat1/Makefile
+++ b/irc/xchat1/Makefile
@@ -35,7 +35,7 @@ CONFIGURE_ARGS+=	--without-included-gettext \
 			--enable-ipv6 \
 			--datadir="${PREFIX}/share" \
 			--enable-perl
-LATEST_LINK=		xchat1
+LATEST_LINK?=		xchat1
 
 .if defined(WITH_SSL)
 USE_OPENSSL=		YES
diff --git a/math/guppi/Makefile b/math/guppi/Makefile
index f9057fd42..9c6a59c39 100644
--- a/math/guppi/Makefile
+++ b/math/guppi/Makefile
@@ -24,7 +24,7 @@ USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomelibs bonobo libglade gal gnometarget
 USE_PYTHON=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-gnumeric --enable-explicit-python-linking
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libglade-1.0" \
diff --git a/net/liferea/Makefile b/net/liferea/Makefile
index d07e792e1..bfcad1348 100644
--- a/net/liferea/Makefile
+++ b/net/liferea/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	liferea
-PORTVERSION=	1.0.19
+PORTVERSION=	1.0.21
 PORTREVISION=	1
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -68,15 +68,10 @@ LIB_DEPENDS+=	dbus-1.2:${PORTSDIR}/devel/dbus
 
 post-patch:
 .ifdef WITH_MOZILLA
-	${REINPLACE_CMD} -e 's,/usr/lib/mozilla,${LOCALBASE}/lib/${GECKO},g ; \
-		s,%FREEBSD_MOZILLA_HOME%,${LOCALBASE}/lib/${GECKO},' \
-		${WRKSRC}/src/liferea.in
 	${REINPLACE_CMD} -e 's,firefox-,$$gecko_provider-,g' \
 		-e 's,\(gecko_provider=\).*$$,\1${GECKO},' \
 		-e 's,{print $$1},{print $$2},g' \
 		${WRKSRC}/configure
-	${REINPLACE_CMD} -e 's|gtk_moz_embed_set_comp_path(NULL)|gtk_moz_embed_set_comp_path("${LOCALBASE}/lib/${GECKO}")|' \
-		${WRKSRC}/src/mozilla/mozilla.c
 .endif
 .ifdef WITH_XPI
 	@${MKDIR} ${WRKDIR}/{79ea0ec1-3fc3-4ade-8220-262d4c4825ab}
diff --git a/net/liferea/distinfo b/net/liferea/distinfo
index 9ab1b62d2..7868314ae 100644
--- a/net/liferea/distinfo
+++ b/net/liferea/distinfo
@@ -1,3 +1,3 @@
-MD5 (liferea-1.0.19.tar.gz) = ca51d163b2ec831e91567b5a2c52effe
-SHA256 (liferea-1.0.19.tar.gz) = 89e9485736d8146c53c62e90c4e30e330cbd73a7d4ce1e8287eb39fb6baa0b4a
-SIZE (liferea-1.0.19.tar.gz) = 1578161
+MD5 (liferea-1.0.21.tar.gz) = 4230b2267d7a69e902ecdca9fbd0a498
+SHA256 (liferea-1.0.21.tar.gz) = 785be806f3270754be7bb854321e0decfb8c85997f6d9456a6ba25cd19a84371
+SIZE (liferea-1.0.21.tar.gz) = 1578056
diff --git a/net/liferea/files/patch-src-liferea.in b/net/liferea/files/patch-src-liferea.in
deleted file mode 100644
index 79bda00fe..000000000
--- a/net/liferea/files/patch-src-liferea.in
+++ /dev/null
@@ -1,37 +0,0 @@
---- src/liferea.in.orig	Sun Mar 19 03:50:55 2006
-+++ src/liferea.in	Tue Mar 21 09:56:50 2006
-@@ -22,15 +22,17 @@
- 
- look_for_mozilla() {
- 
--	results=`ls -1d $1 2>/dev/null | sort -n`
--	while [ -n "$results" ]
--	do
--		path=`echo "$results" | tail -n 1`
--		results=`echo "$results" | grep -v $path`
--		path=`dirname $path` 	# strip comm.jar
--		path=`dirname $path`	# strip chrome
--		run_with_mozilla $path
--		
-+	for p in $1; do
-+		results=`ls -1d $p 2>/dev/null | sort -n`
-+		while [ -n "$results" ]
-+		do
-+			path=`echo "$results" | tail -n 1`
-+			results=`echo "$results" | grep -v $path`
-+			path=`dirname $path` 	# strip comm.jar
-+			path=`dirname $path`	# strip chrome
-+			run_with_mozilla $path
-+			
-+		done
- 	done
- }
- 
-@@ -39,6 +41,7 @@
- fi
- 
- @MOZILLA_LIB_DIR_SEARCH@
-+look_for_mozilla "%FREEBSD_MOZILLA_HOME%/chrome/comm.jar"
- look_for_mozilla "/usr/lib/mozilla*/chrome/comm.jar"
- look_for_mozilla "/usr/lib64/mozilla*/chrome/comm.jar"
- look_for_mozilla "/usr/local/mozilla*/chrome/comm.jar"
diff --git a/net/penguintv-devel/distinfo b/net/penguintv-devel/distinfo
deleted file mode 100644
index f94e22abf..000000000
--- a/net/penguintv-devel/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (PenguinTV-1.93.tar.gz) = 9b914decfc9f279327e0eff1f0bd94d1
-SHA256 (PenguinTV-1.93.tar.gz) = 8ad9cbeed49f72252ddfc4a614071304e0ce5b9f10b64d1af588d319101df1b8
-SIZE (PenguinTV-1.93.tar.gz) = 314661
diff --git a/net/penguintv-devel/Makefile b/net/penguintv/Makefile
index acde74b6e..b20053586 100644
--- a/net/penguintv-devel/Makefile
+++ b/net/penguintv/Makefile
@@ -5,15 +5,14 @@
 # $FreeBSD$
 
 PORTNAME=	PenguinTV
-PORTVERSION=	1.93
+PORTVERSION=	2.0.1
 PORTREVISION=	1
 CATEGORIES=	net audio multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	penguintv
-PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	edwin@mavetju.org
-COMMENT=	Graphical RSS feed reader with incorperated playback functions - development version
+COMMENT=	Graphical RSS feed reader with incorperated playback functions
 
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/pysqlite2/_sqlite.so:${PORTSDIR}/databases/py-pysqlite21 \
 		${PYTHON_SITELIBDIR}/pycurl.so:${PORTSDIR}/ftp/py-curl \
@@ -31,7 +30,7 @@ USE_PYTHON=	yes
 
 GCONF_SCHEMAS=	penguintv.schema
 
-CONFLICTS=	PenguinTV-1.*
+CONFLICTS=	PenguinTV-devel-[0-9]*
 
 .include <bsd.port.pre.mk>
 
@@ -44,6 +43,10 @@ EXTRA_PATCHES+=	${FILESDIR}/patchmozilla-setup.py
 PLIST_SUB+=	WITH_MOZILLA="@comment "
 .endif
 
+pre-fetch:
+	@${ECHO_MSG} If you are upgrading from 1.x, please export your subscriptions for save-keeping!
+	@sleep 5
+
 do-build:
 	cd ${WRKSRC} && ${PYTHON_CMD} setup.py build
 
diff --git a/net/penguintv/distinfo b/net/penguintv/distinfo
new file mode 100644
index 000000000..e7a748737
--- /dev/null
+++ b/net/penguintv/distinfo
@@ -0,0 +1,3 @@
+MD5 (PenguinTV-2.0.1.tar.gz) = 24cd9037b10e00293f1da89bb905a0a8
+SHA256 (PenguinTV-2.0.1.tar.gz) = 01d4c4827a70419aaea4df6e921132672a35d2b586ce9a6a914574097b065cea
+SIZE (PenguinTV-2.0.1.tar.gz) = 320611
diff --git a/net/penguintv-devel/files/patch-share__defaultsubs.opml b/net/penguintv/files/patch-share__defaultsubs.opml
index 77ab8c655..77ab8c655 100644
--- a/net/penguintv-devel/files/patch-share__defaultsubs.opml
+++ b/net/penguintv/files/patch-share__defaultsubs.opml
diff --git a/net/penguintv-devel/files/patchmozilla-setup.py b/net/penguintv/files/patchmozilla-setup.py
index c1fd8554b..c1fd8554b 100644
--- a/net/penguintv-devel/files/patchmozilla-setup.py
+++ b/net/penguintv/files/patchmozilla-setup.py
diff --git a/net/penguintv-devel/pkg-descr b/net/penguintv/pkg-descr
index a3dbcda7f..a3dbcda7f 100644
--- a/net/penguintv-devel/pkg-descr
+++ b/net/penguintv/pkg-descr
diff --git a/net/penguintv-devel/pkg-message b/net/penguintv/pkg-message
index e7b6353c7..e7b6353c7 100644
--- a/net/penguintv-devel/pkg-message
+++ b/net/penguintv/pkg-message
diff --git a/net/penguintv-devel/pkg-plist b/net/penguintv/pkg-plist
index b90c1edc9..b90c1edc9 100644
--- a/net/penguintv-devel/pkg-plist
+++ b/net/penguintv/pkg-plist
diff --git a/www/openvrml/Makefile b/www/openvrml/Makefile
index 9d4fc3805..156b7387b 100644
--- a/www/openvrml/Makefile
+++ b/www/openvrml/Makefile
@@ -34,7 +34,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		XPIDLFLAGS="-I${LOCALBASE}/share/idl/mozilla"
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GMAKE=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 PLIST_SUB=	VER=${PORTVERSION}
 SUB_FILES=	lookat.sh
diff --git a/x11-themes/gtk-qt-engine/Makefile b/x11-themes/gtk-qt-engine/Makefile
index 69ff1e0da..9889046a4 100644
--- a/x11-themes/gtk-qt-engine/Makefile
+++ b/x11-themes/gtk-qt-engine/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk-qt-engine
 PORTVERSION=	0.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://people.freedesktop.org/~davidsansome/ \
 		http://freebsd.ricin.com/ports/distfiles/
@@ -15,8 +15,7 @@ MASTER_SITES=	http://people.freedesktop.org/~davidsansome/ \
 MAINTAINER=	danny@ricin.com
 COMMENT=	GTK-QT Theme Engine allows GTK2 apps to use QT (KDE) themes
 
-LIB_DEPENDS=	kdecore:${PORTSDIR}/x11/kdelibs3 \
-		bonoboui-2:${PORTSDIR}/x11-toolkits/libbonoboui
+LIB_DEPENDS=	kdecore:${PORTSDIR}/x11/kdelibs3
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -32,6 +31,12 @@ CONFIGURE_ARGS+=--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include
 
 OPTIONS=	BONOBOUI "With libbonoboui (recommended)" on
 
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_BONOBOUI)
+LIB_DEPENDS+=	bonoboui-2:${PORTSDIR}/x11-toolkits/libbonoboui
+.endif
+
 pre-configure:
 	@${REINPLACE_CMD} -e "s|/share/themes/|${LOCALBASE}/share/themes/|" \
 		${WRKSRC}/kcm_gtk/kcmgtk.cpp
@@ -47,4 +52,4 @@ post-install:
 	@${RM} /tmp/menu/kcmgtk.menu
 	@if [ "`ls /tmp/menu`" = "" ]; then ${RMDIR} /tmp/menu; fi
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11-themes/rezlooks/Makefile b/x11-themes/rezlooks/Makefile
index b3874d38c..0aff86d76 100644
--- a/x11-themes/rezlooks/Makefile
+++ b/x11-themes/rezlooks/Makefile
@@ -24,6 +24,10 @@ OPTIONS+=	ANIMATION "Animation support" On
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} < 500000
+BROKEN=		does not build on 4.x
+.endif
+
 .if !defined(WITHOUT_ANIMATION)
 CONFIGURE_ARGS+=	--enable-animation
 .endif
diff --git a/x11-toolkits/easygtk/Makefile b/x11-toolkits/easygtk/Makefile
index 70ddc3de1..0ea1bd841 100644
--- a/x11-toolkits/easygtk/Makefile
+++ b/x11-toolkits/easygtk/Makefile
@@ -23,7 +23,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomelibs
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 MAKE_ENV=	MKDIR="${MKDIR}" \
 		LN="${LN}"
 
diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index 193045a90..675eccaca 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	icewm
-PORTVERSION=	1.2.26
+PORTVERSION=	1.2.27
 PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/x11-wm/icewm/distinfo b/x11-wm/icewm/distinfo
index e716e656e..1253e2e5d 100644
--- a/x11-wm/icewm/distinfo
+++ b/x11-wm/icewm/distinfo
@@ -1,3 +1,3 @@
-MD5 (icewm-1.2.26.tar.gz) = 097b12d3f8e0f57a964e4821bc1825ed
-SHA256 (icewm-1.2.26.tar.gz) = 96ed51cbaead5bd8c33522be5bf0baac4c051db0a826f764eb8528b2ec0c5497
-SIZE (icewm-1.2.26.tar.gz) = 1042824
+MD5 (icewm-1.2.27.tar.gz) = 777ba54008cba6e9a1efbb051119c511
+SHA256 (icewm-1.2.27.tar.gz) = 4943e90952be2bcb8913c27d8dbbc6bf526d999db9345bc7752330c9eef6bf9a
+SIZE (icewm-1.2.27.tar.gz) = 1065165
diff --git a/x11-wm/icewm/files/patch-src_ylocale.cc b/x11-wm/icewm/files/patch-src_ylocale.cc
index e1b299708..1a2002112 100644
--- a/x11-wm/icewm/files/patch-src_ylocale.cc
+++ b/x11-wm/icewm/files/patch-src_ylocale.cc
@@ -1,6 +1,6 @@
---- src/ylocale.cc.orig	Mon Apr 17 01:12:31 2006
-+++ src/ylocale.cc	Mon Apr 17 16:19:46 2006
-@@ -149,10 +149,11 @@
+--- src/ylocale.cc.orig	Mon Aug  7 03:38:14 2006
++++ src/ylocale.cc	Tue Aug  8 01:00:33 2006
+@@ -149,7 +149,8 @@
          return NULL;
  
      YUChar * uStr(new YUChar[lLen + 1]);
@@ -9,8 +9,4 @@
 +    char * outbuf((char *) uStr);
      size_t inlen(lLen), outlen(4 * lLen);
  
--    if (0 > (int) iconv(instance->toUnicode, const_cast<char **>(&inbuf), &inlen, &outbuf, &outlen))
-+    if (0 > (int) iconv(instance->toUnicode, &inbuf, &inlen, &outbuf, &outlen))
-         warn(_("Invalid multibyte string \"%s\": %s"), lStr, strerror(errno));
- 
-     *((YUChar *) outbuf) = 0;
+     if (0 > (int) iconv(instance->toUnicode, &inbuf, &inlen, &outbuf, &outlen))
diff --git a/x11-wm/icewm/pkg-plist b/x11-wm/icewm/pkg-plist
index 2c8625505..84df26203 100644
--- a/x11-wm/icewm/pkg-plist
+++ b/x11-wm/icewm/pkg-plist
@@ -1,4 +1,4 @@
-@comment $FreeBSD: ports/x11-wm/icewm/pkg-plist,v 1.43 2006/02/13 10:03:30 lawrance Exp $
+@comment $FreeBSD$
 bin/icehelp
 bin/icesh
 bin/icesound
@@ -338,6 +338,7 @@ bin/icewmtray
 %%NLS%%share/locale/bg/LC_MESSAGES/icewm.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/icewm.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/icewm.mo
+%%NLS%%share/locale/da/LC_MESSAGES/icewm.mo
 %%NLS%%share/locale/de/LC_MESSAGES/icewm.mo
 %%NLS%%share/locale/el/LC_MESSAGES/icewm.mo
 %%NLS%%share/locale/en/LC_MESSAGES/icewm.mo
@@ -352,6 +353,7 @@ bin/icewmtray
 %%NLS%%share/locale/ko/LC_MESSAGES/icewm.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/icewm.mo
 %%NLS%%share/locale/lv/LC_MESSAGES/icewm.mo
+%%NLS%%share/locale/mk/LC_MESSAGES/icewm.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/icewm.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/icewm.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/icewm.mo