- Update gtk-bluecurve-theme and qt-bluecurve-theme to 0.122, take

  maintainership [1]
- Add bluecurve-themes
- Add cursor-bluecurve-theme
- Add gnome-bluecurve-theme
- Add icon-bluecurve-theme
- Add metacity-bluecurve-theme
- Add xmms-bluecurve-theme

Approved by:	former maintainer [1]

6 files changed, 62 insertions, 160 deletions

diff --git a/x11-themes/gtk-bluecurve-theme/Makefile b/x11-themes/gtk-bluecurve-theme/Makefile
index 325be6c59ae8..3fc277ef194a 100644
--- a/x11-themes/gtk-bluecurve-theme/Makefile
+++ b/x11-themes/gtk-bluecurve-theme/Makefile
@@ -6,77 +6,76 @@
 #
 
 PORTNAME=	gtk-bluecurve-theme
-PORTVERSION=	0.73
-PORTREVISION=	1
-CATEGORIES=	x11-themes
-MASTER_SITES=	${MASTER_SITE_REDHAT_LINUX}
-MASTER_SITE_SUBDIR=	9/en/os/i386/SRPMS
-DISTFILES=	redhat-artwork-${PORTVERSION}-${RH_SUBVERSION}.src.rpm
 
-MAINTAINER=	rzheka@users.sourceforge.net
-COMMENT=	Bluecurve unified-look theme for GTK1 and GTK2 from RedHat 8.0
+COMMENT=	The Bluecurve GTK+ 1.x and 2.x themes
 
-EXTRACT_DEPENDS=	rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
+MASTERDIR=	${.CURDIR}/../bluecurve-themes
 
-WRKSRC= 	${WRKDIR}/redhat-artwork-${PORTVERSION}
-USE_GMAKE=	yes
-USE_X_PREFIX=	yes
-USE_GNOME=	gdkpixbuf
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=13
 
-RH_SUBVERSION=	1
-THEMES_SUBDIRS= ${WRKSRC}/art/gtk/Bluecurve1
+# GTK+ 1.x theme engine
+USE_GNOME+=	gdkpixbuf
+GTK1_CFLAGS=	`${X11BASE}/bin/gdk-pixbuf-config --cflags`
+GTK1_LIBS=	`${X11BASE}/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
 
-.if defined(WITH_GTK2)
+# GTK+ 2.x theme engine
 USE_GNOME+=	gtk20
-THEMES_SUBDIRS+=	${WRKSRC}/art/gtk/Bluecurve
-PLIST_SUB+=	GTK2="" GTKVERSION="2.4.0"
-.else
-PLIST_SUB+=	GTK2="@comment "
-.endif
+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/2.4.0/engines
 
-pre-everything::
-	@${ECHO} ""
-	@${ECHO} "By default only gtk-1.2 theme engine will be built."
-	@${ECHO} "You may use the following build options:"
-	@${ECHO} ""
-	@${ECHO} "      WITH_GTK2=yes   Build gtk-2 theme"
-	@${ECHO} ""
-
-do-extract:
-	@${RM} -rf ${WRKDIR}
-	@${MKDIR} ${WRKDIR}
-	@if ! (cd ${WRKDIR} && rpm2cpio.pl ${_DISTDIR}/${DISTFILES} | cpio -i redhat-artwork-${PORTVERSION}.tar.gz 2>/dev/null && ${GZIP_CMD} -dc redhat-artwork-${PORTVERSION}.tar.gz | tar -xf - && ${RM} redhat-artwork-${PORTVERSION}.tar.gz);\
-		then \
-			exit 1; \
-		fi
-	${CP} ${FILESDIR}/Makefile-gtk1 ${WRKSRC}/art/gtk/Bluecurve1/Makefile
-	${CP} ${FILESDIR}/Makefile-gtk2 ${WRKSRC}/art/gtk/Bluecurve/Makefile
+PLIST=		${WRKDIR}/pkg-plist
+EXTRA_STYLES=	BerriesAndCream Gnome Grape Lime Slate Strawberry Tangerine
 
 post-patch:
-	@${REINPLACE_CMD} -e 's#-O2#${CFLAGS}#' ${WRKSRC}/art/gtk/Bluecurve1/Makefile
-	@${REINPLACE_CMD} -e 's#-O2#${CFLAGS}#' ${WRKSRC}/art/gtk/Bluecurve/Makefile
-
-do-configure:
-	@${DO_NADA}
+.for v in 1 2
+.  for s in ${EXTRA_STYLES}
+	@${REINPLACE_CMD} -e 's|/usr|${X11BASE}|' \
+		${WRKSRC}/art/gtk/Bluecurve-${s}/${GTK${v}_RCDIR}/gtkrc
+.  endfor
+.endfor
 
 do-build:
-	@for theme_dir in ${THEMES_SUBDIRS};do \
-		(cd $$theme_dir; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}); \
-	done
+.for v in 1 2
+	cd ${GTK${v}_WRKSRC} && \
+	${CC} ${CFLAGS} -Wl,-export-dynamic -shared \
+		${GTK${v}_CFLAGS} ${GTK${v}_LIBS} -o libbluecurve.so \
+			${GTK${v}_SOURCES}
+.endfor
+
+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
+.endfor
+	@${ECHO_CMD} "@unexec rmdir %D/share/themes/Bluecurve 2>/dev/null || true" >> ${PLIST}
+.for s in ${EXTRA_STYLES}
+	@${ECHO_CMD} "@dirrm share/themes/Bluecurve-${s}" >> ${PLIST}
+.endfor
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/themes/Bluecurve && ${CHMOD} a+rx ${PREFIX}/share/themes/Bluecurve
-.if defined(WITH_GTK2)
-	@${MKDIR} ${PREFIX}/lib/gtk-2.0/2.4.0/engines && ${CHMOD} a+rx ${PREFIX}/lib/gtk-2.0/2.4.0/engines
-	@${MKDIR} ${PREFIX}/share/themes/Bluecurve/gtk-2.0 && ${CHMOD} a+rx ${PREFIX}/share/themes/Bluecurve/gtk-2.0
-	@${INSTALL_PROGRAM} ${WRKSRC}/art/gtk/Bluecurve/.libs/libbluecurve.so ${PREFIX}/lib/gtk-2.0/2.4.0/engines
-	@${INSTALL_DATA} ${WRKSRC}/art/gtk/Bluecurve/gtk-2.0/gtkrc ${PREFIX}/share/themes/Bluecurve/gtk-2.0
-.endif
-	@${MKDIR} ${PREFIX}/lib/gtk/themes/engines && ${CHMOD} a+rx ${PREFIX}/lib/gtk/themes/engines
-	@${INSTALL_PROGRAM} ${WRKSRC}/art/gtk/Bluecurve1/.libs/libbluecurve.so ${PREFIX}/lib/gtk/themes/engines
-	@${MKDIR} ${PREFIX}/share/themes/Bluecurve/gtk && ${CHMOD} a+rx ${PREFIX}/share/themes/Bluecurve/gtk
-	@${INSTALL_DATA} ${WRKSRC}/art/gtk/Bluecurve1/gtk/gtkrc ${PREFIX}/share/themes/Bluecurve/gtk
+.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
+.endfor
 
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/x11-themes/gtk-bluecurve-theme/distinfo b/x11-themes/gtk-bluecurve-theme/distinfo
deleted file mode 100644
index 3157687d17ff..000000000000
--- a/x11-themes/gtk-bluecurve-theme/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (redhat-artwork-0.73-1.src.rpm) = 8928ed251e5f997bbf51b6011c459310
-SIZE (redhat-artwork-0.73-1.src.rpm) = 9227635
diff --git a/x11-themes/gtk-bluecurve-theme/files/Makefile-gtk1 b/x11-themes/gtk-bluecurve-theme/files/Makefile-gtk1
deleted file mode 100644
index d1df167fe446..000000000000
--- a/x11-themes/gtk-bluecurve-theme/files/Makefile-gtk1
+++ /dev/null
@@ -1,46 +0,0 @@
-CC = cc
-CPP = cc -E
-CXX = c++
-CXXCPP = c++ -E
-GDK_PIXBUF_CFLAGS = `$(GDK_PIXBUF_CONFIG) --cflags`
-GDK_PIXBUF_CONFIG = /usr/X11R6/bin/gdk-pixbuf-config
-GDK_PIXBUF_LIBS = `$(GDK_PIXBUF_CONFIG) --libs`
-GTK_CFLAGS = `$(GTK_CONFIG) --cflags`
-GTK_CONFIG = /usr/X11R6/bin/gtk12-config
-GTK_LIBS = `$(GTK_CONFIG) --libs`
-LIBTOOL = libtool
-LN_S = ln -s
-INCLUDES = $(GTK_CFLAGS) $(GDK_PIXBUF_CFLAGS)
-libdir=/usr/X11R6/lib
-enginedir = $(libdir)/gtk/themes/engines
-engine_LTLIBRARIES = libbluecurve.la
-libbluecurve_la_LDFLAGS = -module -avoid-version
-libbluecurve_la_LIBADD = $(GTK_LIBS) $(GDK_PIXBUF_LIBS)
-EXTRA_DIST = raleigh_dot.c
-LTLIBRARIES =  $(engine_LTLIBRARIES)
-CPPFLAGS = -I/usr/local/include -I/usr/X11R6/include  -I/usr/X11R6/include -D_GETOPT_H -D_THREAD_SAFE
-LDFLAGS = 
-LIBS = -Wl,-export-dynamic -L/usr/local/lib -L/usr/X11R6/lib
-libbluecurve_la_DEPENDENCIES = 
-libbluecurve_la_OBJECTS =  bluecurve1_theme_main.lo \
-bluecurve1_theme_draw.lo
-CFLAGS = -O2
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-all: all-am
-.SUFFIXES:
-.SUFFIXES: .S .c .lo .o .obj .s
-.c.o:
-	$(COMPILE) -c $<
-.c.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-.s.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-.S.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-libbluecurve.la: $(libbluecurve_la_OBJECTS) $(libbluecurve_la_DEPENDENCIES)
-	$(LINK) -rpath $(enginedir) $(libbluecurve_la_LDFLAGS) $(libbluecurve_la_OBJECTS) $(libbluecurve_la_LIBADD) $(LIBS)
-all-am: $(LTLIBRARIES)
-.NOEXPORT:
diff --git a/x11-themes/gtk-bluecurve-theme/files/Makefile-gtk2 b/x11-themes/gtk-bluecurve-theme/files/Makefile-gtk2
deleted file mode 100644
index 5e99070a92ef..000000000000
--- a/x11-themes/gtk-bluecurve-theme/files/Makefile-gtk2
+++ /dev/null
@@ -1,43 +0,0 @@
-libdir = ${exec_prefix}/lib
-CC = cc
-CPP = cc -E
-CXX = c++
-CXXCPP = c++ -E
-GTK2_CFLAGS = `$(PKG_CONFIG) gtk+-2.0 --cflags`
-GTK2_LIBS = `$(PKG_CONFIG) gtk+-2.0 --libs`
-LN_S = ln -s
-PKG_CONFIG = /usr/local/bin/pkg-config
-INCLUDES = $(GTK2_CFLAGS)
-enginedir = /usr/X11R6/lib/gtk-2.0/2.0.0/engines
-engine_LTLIBRARIES = libbluecurve.la
-libbluecurve_la_LDFLAGS = -module -avoid-version
-libbluecurve_la_LIBADD = $(GTK2_LIBS)
-EXTRA_DIST = bits.c
-LTLIBRARIES =  $(engine_LTLIBRARIES)
-CPPFLAGS = -I/usr/local/include -I/usr/X11R6/include  -I/usr/X11R6/include -D_GETOPT_H -D_THREAD_SAFE
-LDFLAGS = 
-LIBS = -Wl,-export-dynamic -L/usr/local/lib -L/usr/X11R6/lib
-libbluecurve_la_DEPENDENCIES = 
-libbluecurve_la_OBJECTS =  bluecurve_rc_style.lo bluecurve_style.lo \
-bluecurve_theme_main.lo
-CFLAGS =  -O2
-LIBTOOL = libtool
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(CFLAGS) $(LDFLAGS) -o $@
-all: all-am
-.SUFFIXES:
-.SUFFIXES: .S .c .lo .o .obj .s
-.c.o:
-	$(COMPILE) -c $<
-.c.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-.s.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-.S.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-libbluecurve.la: $(libbluecurve_la_OBJECTS) $(libbluecurve_la_DEPENDENCIES)
-	$(LINK) -rpath $(enginedir) $(libbluecurve_la_LDFLAGS) $(libbluecurve_la_OBJECTS) $(libbluecurve_la_LIBADD) $(LIBS)
-all-am: $(LTLIBRARIES)
-.NOEXPORT:
diff --git a/x11-themes/gtk-bluecurve-theme/pkg-descr b/x11-themes/gtk-bluecurve-theme/pkg-descr
index 823cb48bb867..2efd2fd19cb1 100644
--- a/x11-themes/gtk-bluecurve-theme/pkg-descr
+++ b/x11-themes/gtk-bluecurve-theme/pkg-descr
@@ -1,6 +1,7 @@
-This is a port of RedHat 8.0 "Bluecurve" theme for GTK/GNOME.
-It won't install RedHat logos and pixmaps, but only the required
-theme engines.
+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.
 
 - Ryzhyk Eugeney
 rzheka@users.sourceforge.net
diff --git a/x11-themes/gtk-bluecurve-theme/pkg-plist b/x11-themes/gtk-bluecurve-theme/pkg-plist
deleted file mode 100644
index cdae50e88ebf..000000000000
--- a/x11-themes/gtk-bluecurve-theme/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-lib/gtk/themes/engines/libbluecurve.so
-%%GTK2%%lib/gtk-2.0/%%GTKVERSION%%/engines/libbluecurve.so
-share/themes/Bluecurve/gtk/gtkrc
-%%GTK2%%share/themes/Bluecurve/gtk-2.0/gtkrc
-@dirrm share/themes/Bluecurve/gtk
-%%GTK2%%@dirrm share/themes/Bluecurve/gtk-2.0
-@dirrm share/themes/Bluecurve