17 files changed, 310 insertions, 92 deletions

diff --git a/x11-themes/bluecurve-themes/Makefile b/x11-themes/bluecurve-themes/Makefile
index 4657acb16f98..f2bbe66b77e8 100644
--- a/x11-themes/bluecurve-themes/Makefile
+++ b/x11-themes/bluecurve-themes/Makefile
@@ -5,8 +5,11 @@
 # $FreeBSD$
 #
 
+# NOTE TO VISITING COMMITTER: if you need to bump the port revisions
+# of the slave ports, you should add PORTREVISION?= to the "master
+# port" section below.
+
 PORTNAME?=	bluecurve-themes
-PORTREVISION?=	3
 CATEGORIES=	x11-themes
 
 MAINTAINER=	jylefort@FreeBSD.org
@@ -15,6 +18,11 @@ COMMENT?=	Meta-port for Bluecurve themes
 .if ${PORTNAME} == "bluecurve-themes"	# meta-port
 
 PORTVERSION=	1.0
+# PORTREVISION is useless for a meta-port, but it was incorrectly
+# added to the global section by someone (with the intent of bumping
+# the revisions of the slave ports) and it cannot be removed without
+# causing a version downgrade or using PORTEPOCH.
+PORTREVISION=	3
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 EXTRACT_ONLY=	# empty
@@ -32,14 +40,11 @@ do-install:	# empty
 
 .else					# master port
 
-PORTVERSION=	0.234
-RPMREVISION=	1
+PORTVERSION=	5.0.11
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_FEDORA_LINUX:S|$|:fedora|} ${MASTER_SITE_LOCAL:S|$|:local|}
-MASTER_SITE_SUBDIR=	development/SRPMS/:fedora jylefort/:local
-DISTFILES=	redhat-artwork-${PORTVERSION}-${RPMREVISION}.src.rpm:fedora,local
-
-BROKEN=		Size mismatch
+MASTER_SITE_SUBDIR=	development/source/SRPMS/:fedora jylefort/:local
+DISTFILES=	redhat-artwork-${PORTVERSION}-1.fc7.src.rpm:fedora,local
 
 EXTRACT_DEPENDS+=	rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
 
@@ -49,6 +54,7 @@ WRKSRC=		${WRKDIR}/redhat-artwork-${PORTVERSION}
 DESCR?=		${.CURDIR}/pkg-descr
 PLIST?=		${.CURDIR}/pkg-plist
 FILESDIR=	${.CURDIR}/files
+SCRIPTDIR=	${.CURDIR}/scripts
 
 do-extract:
 	@${MKDIR} ${WRKDIR}
diff --git a/x11-themes/bluecurve-themes/distinfo b/x11-themes/bluecurve-themes/distinfo
index a6481eebf3a4..15438b90f223 100644
--- a/x11-themes/bluecurve-themes/distinfo
+++ b/x11-themes/bluecurve-themes/distinfo
@@ -1,3 +1,3 @@
-MD5 (redhat-artwork-0.234-1.src.rpm) = e2833d085ccb341446b6a9c2b5b5a4f6
-SHA256 (redhat-artwork-0.234-1.src.rpm) = 8d3072c33d61a877416c7ec430b962161c5faf69b3e40584569e8517a2dfbffb
-SIZE (redhat-artwork-0.234-1.src.rpm) = 7921818
+MD5 (redhat-artwork-5.0.11-1.fc7.src.rpm) = fe71858a6a24b93392a6610a3dae7889
+SHA256 (redhat-artwork-5.0.11-1.fc7.src.rpm) = 82493092994c9c05afa1022061a0d454e4e17ed60b180dde08eb7a0853a5d838
+SIZE (redhat-artwork-5.0.11-1.fc7.src.rpm) = 9155581
diff --git a/x11-themes/bluecurve-themes/pkg-descr b/x11-themes/bluecurve-themes/pkg-descr
index 9730d2cf6ffe..314299a6664d 100644
--- a/x11-themes/bluecurve-themes/pkg-descr
+++ b/x11-themes/bluecurve-themes/pkg-descr
@@ -3,14 +3,14 @@ It attempts to provide an unified look for the open source desktop.
 
 This meta-port installs all the Bluecurve ports, namely:
 
-    - the GTK+ themes (1.x and 2.x, native and Linux versions)
+    - the GTK+ themes (native and Linux versions)
     - the QT theme
     - the Metacity themes
     - the icon set
     - the X cursor themes
     - the XMMS skin
 
-WWW: http://fedora.redhat.com/projects/artwork/
+WWW: http://fedoraproject.org/wiki/Artwork/
 
 - Jean-Yves Lefort
 jylefort@FreeBSD.org
diff --git a/x11-themes/cursor-bluecurve-theme/Makefile b/x11-themes/cursor-bluecurve-theme/Makefile
index e97388fe42d4..09fc5930c863 100644
--- a/x11-themes/cursor-bluecurve-theme/Makefile
+++ b/x11-themes/cursor-bluecurve-theme/Makefile
@@ -6,7 +6,6 @@
 #
 
 PORTNAME=	cursor-bluecurve-theme
-PORTREVISION=	2
 
 COMMENT=	The Bluecurve X cursor themes
 
@@ -17,7 +16,7 @@ MASTERDIR=	${.CURDIR}/../bluecurve-themes
 
 PREFIX=		${X11BASE}
 
-THEMES=		Bluecurve Bluecurve-inverse
+THEMES=		Bluecurve Bluecurve-inverse LBluecurve LBluecurve-inverse
 
 .for t in ${THEMES}
 BC_HIERS+=	${WRKSRC}/art/cursor/${t}/${t}:${PREFIX}/lib/X11/icons/${t}/cursors
@@ -29,8 +28,6 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|dnd_|dnd-|' \
 		${WRKSRC}/art/cursor/${t}/${t}.cursortheme
 .endfor
-	@${REINPLACE_CMD} -e 's|left-ptr-watch|left_ptr_watch|' \
-		${WRKSRC}/art/cursor/Bluecurve-inverse/Bluecurve-inverse.cursortheme
 
 do-build:
 	cd ${WRKSRC}/art/cursor/cursorthemegen \
diff --git a/x11-themes/cursor-bluecurve-theme/pkg-descr b/x11-themes/cursor-bluecurve-theme/pkg-descr
index 7227649eb404..be77d1717dbd 100644
--- a/x11-themes/cursor-bluecurve-theme/pkg-descr
+++ b/x11-themes/cursor-bluecurve-theme/pkg-descr
@@ -3,7 +3,7 @@ It attempts to provide an unified look for the open source desktop.
 
 This port contains the Bluecurve X cursor themes.
 
-WWW: http://fedora.redhat.com/projects/artwork/
+WWW: http://fedoraproject.org/wiki/Artwork/
 
 - Jean-Yves Lefort
 jylefort@FreeBSD.org
diff --git a/x11-themes/gnome-bluecurve-theme/Makefile b/x11-themes/gnome-bluecurve-theme/Makefile
index c4e08e5d6778..c0a3b22ef65a 100644
--- a/x11-themes/gnome-bluecurve-theme/Makefile
+++ b/x11-themes/gnome-bluecurve-theme/Makefile
@@ -6,7 +6,6 @@
 #
 
 PORTNAME=	gnome-bluecurve-theme
-PORTREVISION=	2
 
 COMMENT=	The Bluecurve GNOME meta-theme
 
diff --git a/x11-themes/gnome-bluecurve-theme/pkg-descr b/x11-themes/gnome-bluecurve-theme/pkg-descr
index 399b2d941844..8df91b50d3f3 100644
--- a/x11-themes/gnome-bluecurve-theme/pkg-descr
+++ b/x11-themes/gnome-bluecurve-theme/pkg-descr
@@ -7,7 +7,7 @@ This port contains the Bluecurve GNOME meta-theme, which includes:
     - the Metacity themes
     - the icon set
 
-WWW: http://fedora.redhat.com/projects/artwork/
+WWW: http://fedoraproject.org/wiki/Artwork/
 
 - Jean-Yves Lefort
 jylefort@FreeBSD.org
diff --git a/x11-themes/gtk-bluecurve-theme/Makefile b/x11-themes/gtk-bluecurve-theme/Makefile
index 45226e7d0807..2f8949a45a0c 100644
--- a/x11-themes/gtk-bluecurve-theme/Makefile
+++ b/x11-themes/gtk-bluecurve-theme/Makefile
@@ -6,30 +6,14 @@
 #
 
 PORTNAME=	gtk-bluecurve-theme
-PORTREVISION=	2
 
-COMMENT=	The Bluecurve GTK+ 1.x and 2.x themes
+COMMENT=	The Bluecurve GTK+ themes
 
 MASTERDIR=	${.CURDIR}/../bluecurve-themes
 
-EXTRA_PATCHES=	${WRKDIR}/redhat-artwork-0.122-padding-fix.patch
-PATCH_STRIP=	-p1
-
-# GTK+ 1.x theme engine
-USE_GNOME+=	gdkpixbuf
-GTK1_CFLAGS=	`${LOCALBASE}/bin/gdk-pixbuf-config --cflags`
-GTK1_LIBS=	`${LOCALBASE}/bin/gdk-pixbuf-config --libs`
-GTK1_WRKSRC=	${WRKSRC}/art/gtk/Bluecurve1
-GTK1_RCDIR=	gtk
-GTK1_SOURCES=	bluecurve1_theme_main.c bluecurve1_theme_draw.c
-GTK1_ENGINEDIR=	lib/gtk/themes/engines
-
-# GTK+ 2.x theme engine
 USE_GNOME+=	gtk20
 GTK2_CFLAGS=	`${LOCALBASE}/bin/pkg-config --cflags gtk+-2.0`
 GTK2_LIBS=	`${LOCALBASE}/bin/pkg-config --libs gtk+-2.0`
-GTK2_WRKSRC=	${WRKSRC}/art/gtk/Bluecurve
-GTK2_RCDIR=	gtk-2.0
 GTK2_SOURCES=	bluecurve_rc_style.c bluecurve_style.c bluecurve_theme_main.c
 GTK2_ENGINEDIR=	lib/gtk-2.0/${GTK2_VERSION}/engines
 
@@ -37,31 +21,25 @@ PLIST=		${WRKDIR}/pkg-plist
 EXTRA_STYLES=	BerriesAndCream Gnome Grape Lime Slate Strawberry Tangerine
 
 post-patch:
-.for v in 1 2
-.  for s in ${EXTRA_STYLES}
+.for s in ${EXTRA_STYLES}
 	@${REINPLACE_CMD} -e 's|/usr|${LOCALBASE}|' \
-		${WRKSRC}/art/gtk/Bluecurve-${s}/${GTK${v}_RCDIR}/gtkrc
-.  endfor
+		${WRKSRC}/art/gtk/Bluecurve-${s}/gtk-2.0/gtkrc
 .endfor
 
 do-build:
-.for v in 1 2
-	cd ${GTK${v}_WRKSRC} && \
+	cd ${WRKSRC}/art/gtk/Bluecurve && \
 	${CC} ${CFLAGS} -Wl,-export-dynamic -shared -fPIC \
-		${GTK${v}_CFLAGS} ${GTK${v}_LIBS} -o libbluecurve.so \
-			${GTK${v}_SOURCES}
-.endfor
+		${GTK2_CFLAGS} ${GTK2_LIBS} -o libbluecurve.so \
+			${GTK2_SOURCES}
 
 pre-install:
 	@${RM} -f ${PLIST}
-.for v in 1 2
-	@${ECHO_CMD} "${GTK${v}_ENGINEDIR}/libbluecurve.so" >> ${PLIST}
-	@${ECHO_CMD} "share/themes/Bluecurve/${GTK${v}_RCDIR}/gtkrc" >> ${PLIST}
-	@${ECHO_CMD} "@dirrm share/themes/Bluecurve/${GTK${v}_RCDIR}" >> ${PLIST}
-.  for s in ${EXTRA_STYLES}
-	@${ECHO_CMD} "share/themes/Bluecurve-${s}/${GTK${v}_RCDIR}/gtkrc" >> ${PLIST}
-	@${ECHO_CMD} "@dirrm share/themes/Bluecurve-${s}/${GTK${v}_RCDIR}" >> ${PLIST}
-.  endfor
+	@${ECHO_CMD} "${GTK2_ENGINEDIR}/libbluecurve.so" >> ${PLIST}
+	@${ECHO_CMD} "share/themes/Bluecurve/gtk-2.0/gtkrc" >> ${PLIST}
+	@${ECHO_CMD} "@dirrm share/themes/Bluecurve/gtk-2.0" >> ${PLIST}
+.for s in ${EXTRA_STYLES}
+	@${ECHO_CMD} "share/themes/Bluecurve-${s}/gtk-2.0/gtkrc" >> ${PLIST}
+	@${ECHO_CMD} "@dirrm share/themes/Bluecurve-${s}/gtk-2.0" >> ${PLIST}
 .endfor
 	@${ECHO_CMD} "@dirrmtry share/themes/Bluecurve" >> ${PLIST}
 .for s in ${EXTRA_STYLES}
@@ -69,15 +47,13 @@ pre-install:
 .endfor
 
 do-install:
-.for v in 1 2
-	${MKDIR} ${PREFIX}/${GTK${v}_ENGINEDIR}
-	${INSTALL_PROGRAM} ${GTK${v}_WRKSRC}/libbluecurve.so ${PREFIX}/${GTK${v}_ENGINEDIR}
-	${MKDIR} ${PREFIX}/share/themes/Bluecurve/${GTK${v}_RCDIR}
-	${INSTALL_DATA} ${GTK${v}_WRKSRC}/${GTK${v}_RCDIR}/gtkrc ${PREFIX}/share/themes/Bluecurve/${GTK${v}_RCDIR}
-.  for s in ${EXTRA_STYLES}
-	${MKDIR} ${PREFIX}/share/themes/Bluecurve-${s}/${GTK${v}_RCDIR}
-	${INSTALL_DATA} ${WRKSRC}/art/gtk/Bluecurve-${s}/${GTK${v}_RCDIR}/gtkrc ${PREFIX}/share/themes/Bluecurve-${s}/${GTK${v}_RCDIR}
-.  endfor
+	${MKDIR} ${PREFIX}/${GTK2_ENGINEDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/art/gtk/Bluecurve/libbluecurve.so ${PREFIX}/${GTK2_ENGINEDIR}
+	${MKDIR} ${PREFIX}/share/themes/Bluecurve/gtk-2.0
+	${INSTALL_DATA} ${WRKSRC}/art/gtk/Bluecurve/gtk-2.0/gtkrc ${PREFIX}/share/themes/Bluecurve/gtk-2.0
+.for s in ${EXTRA_STYLES}
+	${MKDIR} ${PREFIX}/share/themes/Bluecurve-${s}/gtk-2.0
+	${INSTALL_DATA} ${WRKSRC}/art/gtk/Bluecurve-${s}/gtk-2.0/gtkrc ${PREFIX}/share/themes/Bluecurve-${s}/gtk-2.0
 .endfor
 
 .include "${MASTERDIR}/Makefile"
diff --git a/x11-themes/gtk-bluecurve-theme/pkg-descr b/x11-themes/gtk-bluecurve-theme/pkg-descr
index 007846ce2d9c..766ed5e49e9f 100644
--- a/x11-themes/gtk-bluecurve-theme/pkg-descr
+++ b/x11-themes/gtk-bluecurve-theme/pkg-descr
@@ -1,9 +1,9 @@
 Bluecurve is a set of themes created by the Red Hat Artwork project.
 It attempts to provide an unified look for the open source desktop.
 
-This port contains the Bluecurve GTK+ 1.x and 2.x themes.
+This port contains the Bluecurve GTK+ themes.
 
-WWW: http://fedora.redhat.com/projects/artwork/
+WWW: http://fedoraproject.org/wiki/Artwork/
 
 - Ryzhyk Eugeney
 rzheka@users.sourceforge.net
diff --git a/x11-themes/icon-bluecurve-theme/Makefile b/x11-themes/icon-bluecurve-theme/Makefile
index 1c0504991607..f3d2631d7c01 100644
--- a/x11-themes/icon-bluecurve-theme/Makefile
+++ b/x11-themes/icon-bluecurve-theme/Makefile
@@ -9,10 +9,14 @@ PORTNAME=	icon-bluecurve-theme
 
 COMMENT=	The Bluecurve icon set
 
-BUILD_DEPENDS=	icon-slicer:${PORTSDIR}/graphics/icon-slicer
+BUILD_DEPENDS=	icon-slicer:${PORTSDIR}/graphics/icon-slicer \
+		pamrgbatopng:${PORTSDIR}/graphics/netpbm-devel
 
 MASTERDIR=	${.CURDIR}/../bluecurve-themes
 
+EXTRA_PATCHES=	${WRKDIR}/redhat-artwork-5.0.5-add-dirs-to-bluecurve-theme-index.patch
+PATCH_STRIP=	-p1
+
 WANT_GNOME=	yes
 INSTALLS_ICONS=	yes
 
@@ -20,27 +24,7 @@ BUILD_WRKSRC=	${WRKSRC}/art/icon/Bluecurve/sheets
 BC_HIERS=	${BUILD_WRKSRC}/Bluecurve:${PREFIX}/share/icons/Bluecurve
 
 do-build:
-	${MKDIR} ${BUILD_WRKSRC}/Bluecurve
-.for t in added apps dialogs emblems files stock ooo
-	${LOCALBASE}/bin/icon-slicer \
-		--output-dir=${BUILD_WRKSRC}/Bluecurve \
-		--image-dir=${BUILD_WRKSRC} \
-		${BUILD_WRKSRC}/icons-${t}.icontheme
-.endfor
-	${MKDIR} ${BUILD_WRKSRC}/Bluecurve/36x36/apps
-	${MV} -f ${BUILD_WRKSRC}/gnome-spinner*.png ${BUILD_WRKSRC}/Bluecurve/36x36/apps
-	${MV} -f ${WRKSRC}/art/icon/Bluecurve/index.theme ${BUILD_WRKSRC}/Bluecurve
-.for d in 16x16 24x24 32x32 48x48
-	cd ${BUILD_WRKSRC}/Bluecurve/${d}/apps && \
-	${LN} -sf icon-db-user.png openofficeorg-base.png && \
-	${LN} -sf redhat-spreadsheet.png openofficeorg-calc.png && \
-	${LN} -sf icon-vector-editor.png openofficeorg-draw.png && \
-	${LN} -sf redhat-presentations.png openofficeorg-impress.png && \
-	${LN} -sf icon-calculator.png openofficeorg-math.png && \
-	${LN} -sf redhat-word-processor.png openofficeorg-writer.png
-.endfor
-	cd ${BUILD_WRKSRC}/Bluecurve/48x48/filesystems && \
-	${LN} -sf ../mimetypes/fileshare.png gnome-fs-ftp.png
+	@BUILD_WRKSRC="${BUILD_WRKSRC}" ${SH} ${SCRIPTDIR}/do-build
 
 pre-install:
 	@${ECHO_CMD} "@dirrm share/icons/Bluecurve" >> ${PLIST}
diff --git a/x11-themes/icon-bluecurve-theme/pkg-descr b/x11-themes/icon-bluecurve-theme/pkg-descr
index e07e009d4ec0..0e61866b605d 100644
--- a/x11-themes/icon-bluecurve-theme/pkg-descr
+++ b/x11-themes/icon-bluecurve-theme/pkg-descr
@@ -3,7 +3,7 @@ It attempts to provide an unified look for the open source desktop.
 
 This port contains the Bluecurve icon set.
 
-WWW: http://fedora.redhat.com/projects/artwork/
+WWW: http://fedoraproject.org/wiki/Artwork/
 
 - Jean-Yves Lefort
 jylefort@FreeBSD.org
diff --git a/x11-themes/icon-bluecurve-theme/scripts/do-build b/x11-themes/icon-bluecurve-theme/scripts/do-build
new file mode 100644
index 000000000000..4242e7603b8e
--- /dev/null
+++ b/x11-themes/icon-bluecurve-theme/scripts/do-build
@@ -0,0 +1,258 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+### Adapted from ${WRKSRC}/art/icon/Bluecurve/sheets/Makefile.am
+
+mkdir -p $BUILD_WRKSRC/Bluecurve
+for t in added apps dialogs emblems files stock ooo; do
+	icon-slicer \
+		--output-dir=$BUILD_WRKSRC/Bluecurve \
+		--image-dir=$BUILD_WRKSRC \
+		$BUILD_WRKSRC/icons-$t.icontheme
+done
+
+mkdir -p $BUILD_WRKSRC/Bluecurve/36x36/apps
+mv -f $BUILD_WRKSRC/gnome-spinner*.png $BUILD_WRKSRC/Bluecurve/36x36/apps
+mv -f $BUILD_WRKSRC/../index.theme $BUILD_WRKSRC/Bluecurve
+
+### Adapted from ${WRKDIR}/redhat-artwork.spec
+
+# link upstream icon names to the redhat ones in bluecurve
+for d in 48x48 32x32 24x24 16x16; do
+	cd $BUILD_WRKSRC/Bluecurve/$d/apps
+	ln -s icon-db-user.png openofficeorg-base.png
+	ln -s redhat-spreadsheet.png openofficeorg-calc.png
+	ln -s icon-vector-editor.png openofficeorg-draw.png
+	ln -s redhat-presentations.png openofficeorg-impress.png
+	ln -s icon-calculator.png openofficeorg-math.png
+	ln -s redhat-word-processor.png openofficeorg-writer.png
+	ln -s redhat-accessories.png gnome-util.png
+	ln -sf redhat-programming.png gnome-devel.png
+	ln -sf redhat-games.png gnome-joystick.png
+	ln -s redhat-graphics.png gnome-graphics.png
+	ln -sf redhat-internet.png gnome-globe.png
+	ln -sf redhat-sound_video.png gnome-multimedia.png
+	ln -sf redhat-office.png gnome-applications.png
+	ln -sf redhat-preferences.png gnome-settings.png
+	ln -sf redhat-system_settings.png gnome-system.png
+done
+
+cd $BUILD_WRKSRC/Bluecurve/48x48/filesystems
+ln -s ../mimetypes/fileshare.png gnome-fs-ftp.png
+
+# link upstream icon names to the redhat ones in bluecurve
+for s in 16x16 20x20 24x24 32x32 36x36 48x48 64x64 96x96; do
+	cd $BUILD_WRKSRC/Bluecurve/$s/apps 2>/dev/null || continue
+	ln -sf redhat-office.png package_wordprocessing.png
+	ln -sf redhat-internet.png package_network.png
+	ln -sf redhat-accessories.png package_applications.png
+	ln -sf redhat-graphics.png package_graphics.png
+	ln -sf redhat-games.png package_games.png
+	ln -sf redhat-sound_video.png multimedia.png
+	ln -sf redhat-preferences.png package_settings.png
+	ln -sf redhat-programming.png package_development.png
+	ln -sf redhat-system_tools.png package_utilities.png
+	ln -sf redhat-system_settings.png package_system.png
+	ln -sf redhat-tools.png package_utilities.png
+	# app icons
+	ln -sf redhat-email.png kmail.png
+	ln -sf redhat-web-browser.png konqueror.png
+	ln -sf redhat-filemanager.png kfm.png
+	ln -sf redhat-home.png kfm_home.png
+	ln -sf redhat-logviewer.png kviewshell.png
+	ln -sf system-logviewer.png logviewer.png
+	# system settings
+	ln -sf system-config-soundcard.png multimedia.png
+done
+
+flip_icon () {
+	pngtopnm $1.png > $1.rgb
+	pngtopnm -alpha $1.png > $1.alpha
+	pamstack $1.rgb $1.alpha > $1.pam
+	pamflip -lr $1.pam > $2.pam
+	pamrgbatopng $2.pam > $2.png
+	rm -f $1.rgb $1.alpha $1.pam $2.pam
+}
+
+ln_icon () {
+	if [ -f $1.png ]; then
+		ln -s $1.png $2.png
+	fi
+	if [ -f $1.icon ]; then
+		ln -s $1.icon $2.icon
+	fi
+	if [ -f $1.svg ]; then
+		ln -s $1.svg $2.svg
+	fi
+}
+
+# link gtk stock icon names to bluecurve ones
+for s in 16x16 24x24 36x36 48x48; do
+	if cd $BUILD_WRKSRC/Bluecurve/$s/filesystems 2>/dev/null; then
+		ln_icon gnome-fs-directory gtk-directory
+		ln_icon gnome-fs-network gtk-network
+	fi
+	if cd $BUILD_WRKSRC/Bluecurve/$s/mimetypes 2>/dev/null; then
+		ln_icon file-container gtk-file
+		ln_icon harddrive gtk-harddisk
+	fi
+	if cd $BUILD_WRKSRC/Bluecurve/$s/stock 2>/dev/null; then
+		ln_icon stock-about gtk-about
+		ln_icon stock-connect gtk-connect
+		ln_icon stock-disconnect gtk-disconnect
+		ln_icon stock-edit gtk-edit
+		ln_icon stock-media-ffwd gtk-media-forward-ltr 
+		ln_icon stock-media-rewind gtk-media-forward-rtl
+		ln_icon stock-media-next gtk-media-next-ltr
+		ln_icon stock-media-prev gtk-media-next-rtl
+		ln_icon stock-media-pause gtk-media-pause
+		ln_icon stock-media-play gtk-media-play-ltr
+		ln_icon stock-media-prev gtk-media-previous-ltr
+		ln_icon stock-media-next gtk-media-previous-rtl
+		ln_icon stock-media-rec gtk-media-record
+		ln_icon stock-media-rewind gtk-media-rewind-ltr
+		ln_icon stock-media-ffwd gtk-media-rewind-rtl 
+		ln_icon stock-media-stop gtk-media-stop
+		ln_icon stock-undo gtk-undo-ltr
+		ln_icon stock-redo gtk-redo-ltr
+		ln_icon stock-font gtk-select-font
+		flip_icon stock-media-play gtk-media-play-rtl
+		flip_icon stock-undo gtk-undo-rtl
+		flip_icon stock-redo gtk-redo-rtl
+	fi
+done
+if cd $BUILD_WRKSRC/Bluecurve/48x48/stock 2>/dev/null; then
+	ln_icon stock-lockscreen gtk-dialog-authentication
+fi
+
+# link icon-naming spec names to bluecurve ones
+for s in 16x16 20x20 24x24 32x32 36x36 48x48 64x64 96x96; do
+	if cd $BUILD_WRKSRC/Bluecurve/$s/filesystems 2>/dev/null; then
+		ln_icon gnome-fs-trash-empty user-trash
+		ln_icon gnome-fs-trash-full user-trash-full
+	fi
+	if cd $BUILD_WRKSRC/Bluecurve/$s/stock 2>/dev/null; then
+		ln_icon stock-properties document-properties
+		ln_icon stock-find-and-replace edit-find-and-replace
+		ln_icon stock-undo edit-undo
+		ln_icon stock-justify-center format-justify-center
+		ln_icon stock-justify-fill format-justify-fill
+		ln_icon stock-justify-left format-justify-left
+		ln_icon stock-justify-right format-justify-right
+		ln_icon stock-strikethrough format-text-strikethrough
+		ln_icon stock-underline format-text-underline
+		ln_icon stock-goto-bottom go-bottom
+		ln_icon stock-go-down go-down
+		ln_icon stock-goto-first go-first
+		ln_icon stock-goto-last go-last
+		ln_icon stock-jump-to go-jump
+		ln_icon stock-go-forward go-next
+		ln_icon stock-go-back go-previous
+		ln_icon stock-go-up go-up
+		ln_icon stock-goto-top go-top
+		ln_icon stock-zoom-fit zoom-best-fit
+		ln_icon stock-quit system-log-out
+		ln_icon stock-quit application-exit
+		ln_icon stock-apply dialog-ok
+		ln_icon stock-close dialog-close
+		ln_icon stock-cancel dialog-cancel
+		ln_icon stock-bookmark-page bookmark-new
+		ln_icon stock-new document-new
+		ln_icon stock-open document-open
+		ln_icon stock-open document-open-recent
+		ln_icon stock-print document-print
+		ln_icon stock-print-preview document-print-preview
+		ln_icon stock-save document-save
+		ln_icon stock-save-as document-save-as
+		ln_icon stock-copy edit-copy
+		ln_icon stock-cut edit-cut
+		ln_icon stock-delete edit-delete
+		ln_icon stock-paste edit-paste
+		ln_icon stock-bold format-text-bold
+		ln_icon stock-italic format-text-italic
+		ln_icon stock-mic audio-input-microphone
+		ln_icon stock-about help-about
+		ln_icon stock-book help-contents
+		ln_icon stock-missing-image image-missing
+		ln_icon stock-media-pause media-playback-pause
+		ln_icon stock-media-play media-playback-start
+		ln_icon stock-media-stop media-playback-stop
+		ln_icon stock-media-rec media-record
+		ln_icon stock-media-rewind media-seek-backward
+		ln_icon stock-media-ffwd media-seek-forward 
+		ln_icon stock-media-prev media-skip-backward
+		ln_icon stock-media-next media-skip-forward
+	fi
+	if cd $BUILD_WRKSRC/Bluecurve/$s/stock 2>/dev/null; then
+		ln_icon harddrive drive-harddisk
+		ln_icon cd drive-removable-media
+		ln_icon cd drive-optical
+		ln_icon floppy media-floppy
+		ln_icon cd media-optical
+		ln_icon dvd media-flash
+		ln_icon folder-home user-home
+		ln_icon file-font font-x-generic
+		ln_icon file-gfx image-x-generic
+		ln_icon file-video video-x-generic
+		ln_icon file text-x-generic
+		ln_icon file text-x-generic-template
+		ln_icon file-executable text-x-script
+		ln_icon file-launcher application-x-executable
+		ln_icon file-wordprocessor x-office-document
+		ln_icon file-presentation x-office-presentation
+		ln_icon file-spreadsheet x-office-spreadsheet
+		# FIXME
+		ln_icon file-wordprocessor x-office-calendar
+		ln_icon file-wordprocessor x-office-address-book
+	fi 
+	if cd $BUILD_WRKSRC/Bluecurve/$s/apps 2>/dev/null; then
+		ln_icon icon-calculator accessories-calculator
+		ln_icon icon-character-map accessories-character-map
+		ln_icon icon-documentation accessories-dictionary
+		ln_icon icon-notepad accessories-text-editor
+		ln_icon icon-accessories applications-accessories 
+		ln_icon icon-development applications-development 
+		ln_icon icon-games applications-games 
+		ln_icon icon-help help-browser 
+		ln_icon icon-help system-help 
+		ln_icon icon-gfx applications-graphics 
+		ln_icon icon-network applications-internet 
+		ln_icon icon-media applications-multimedia 
+		ln_icon icon-office applications-office 
+		ln_icon icon-system-configuration applications-system 
+		ln_icon icon-computer computer 
+		ln_icon icon-system-settings preferences-desktop 
+		ln_icon icon-accessibility preferences-desktop-accessibility 
+		ln_icon icon-fonts preferences-desktop-font 
+		ln_icon icon-keyboard preferences-desktop-keyboard 
+		ln_icon icon-languages preferences-desktop-locale 
+		ln_icon icon-sound preferences-desktop-multimedia 
+		# preferences-desktop-peripherals
+		ln_icon icon-user preferences-desktop-personal
+		# preferences-desktop-screensaver
+		ln_icon icon-themes preferences-desktop-theme
+		ln_icon icon-background-picture preferences-desktop-wallpaper
+		ln_icon icon-system-configuration preferences-system 
+		ln_icon icon-network preferences-system-network
+		ln_icon gpm-primary-80 battery 
+		ln_icon gpm-primary-20 battery-caution 
+		ln_icon gpm-primary-10 battery-low 
+		ln_icon camera camera-photo 
+		ln_icon icon-games input-gaming 
+		ln_icon icon-keyboard input-keyboard 
+		ln_icon icon-mouse input-mouse 
+		ln_icon icon-systemhealth utilities-system-monitor
+	fi
+	if cd $BUILD_WRKSRC/Bluecurve/$s/mimetypes 2>/dev/null; then
+		ln_icon stock_insert_image insert-image
+		ln_icon stock_insert_url insert-link
+		ln_icon stock_insert_ole-object insert-object
+	fi
+done
+# some 48 only icons
+if cd $BUILD_WRKSRC/Bluecurve/48x48/stock 2>/dev/null; then
+	ln_icon stock-lockscreen dialog-password
+	ln_icon dialog-info dialog-information
+fi
diff --git a/x11-themes/metacity-bluecurve-theme/pkg-descr b/x11-themes/metacity-bluecurve-theme/pkg-descr
index 4d49440d0a6e..ed1ba241d8e9 100644
--- a/x11-themes/metacity-bluecurve-theme/pkg-descr
+++ b/x11-themes/metacity-bluecurve-theme/pkg-descr
@@ -3,7 +3,7 @@ It attempts to provide an unified look for the open source desktop.
 
 This port contains the Bluecurve Metacity themes.
 
-WWW: http://fedora.redhat.com/projects/artwork/
+WWW: http://fedoraproject.org/wiki/Artwork/
 
 - Jean-Yves Lefort
 jylefort@FreeBSD.org
diff --git a/x11-themes/qt-bluecurve-theme/Makefile b/x11-themes/qt-bluecurve-theme/Makefile
index 4cd58dce5875..946b1f2016cc 100644
--- a/x11-themes/qt-bluecurve-theme/Makefile
+++ b/x11-themes/qt-bluecurve-theme/Makefile
@@ -6,7 +6,6 @@
 #
 
 PORTNAME=	qt-bluecurve-theme
-PORTREVISION=	1
 
 COMMENT=	The Bluecurve QT theme
 
diff --git a/x11-themes/qt-bluecurve-theme/pkg-descr b/x11-themes/qt-bluecurve-theme/pkg-descr
index f1a4e79e7547..1705cf1540aa 100644
--- a/x11-themes/qt-bluecurve-theme/pkg-descr
+++ b/x11-themes/qt-bluecurve-theme/pkg-descr
@@ -3,7 +3,7 @@ It attempts to provide an unified look for the open source desktop.
 
 This port contains the Bluecurve QT theme.
 
-WWW: http://fedora.redhat.com/projects/artwork/
+WWW: http://fedoraproject.org/wiki/Artwork/
 
 - Ryzhyk Eugeney
 rzheka@users.sourceforge.net
diff --git a/x11-themes/xmms-bluecurve-theme/Makefile b/x11-themes/xmms-bluecurve-theme/Makefile
index f0f43adf73eb..00729e135917 100644
--- a/x11-themes/xmms-bluecurve-theme/Makefile
+++ b/x11-themes/xmms-bluecurve-theme/Makefile
@@ -6,7 +6,6 @@
 #
 
 PORTNAME=	xmms-bluecurve-theme
-PORTREVISION=	1
 
 COMMENT=	The Bluecurve XMMS skin
 
diff --git a/x11-themes/xmms-bluecurve-theme/pkg-descr b/x11-themes/xmms-bluecurve-theme/pkg-descr
index 8a469f3eb22a..0d7be711be8d 100644
--- a/x11-themes/xmms-bluecurve-theme/pkg-descr
+++ b/x11-themes/xmms-bluecurve-theme/pkg-descr
@@ -3,7 +3,7 @@ It attempts to provide an unified look for the open source desktop.
 
 This port contains the Bluecurve XMMS skin.
 
-WWW: http://fedora.redhat.com/projects/artwork/
+WWW: http://fedoraproject.org/wiki/Artwork/
 
 - Jean-Yves Lefort
 jylefort@FreeBSD.org