6 files changed, 44 insertions, 91 deletions

diff --git a/x11-themes/qt-bluecurve-theme/Makefile b/x11-themes/qt-bluecurve-theme/Makefile
index de283e4c3abc..5eeb1fda5652 100644
--- a/x11-themes/qt-bluecurve-theme/Makefile
+++ b/x11-themes/qt-bluecurve-theme/Makefile
@@ -6,52 +6,42 @@
 #
 
 PORTNAME=	qt-bluecurve-theme
-PORTVERSION=	0.88
-CATEGORIES=	x11-themes
-MASTER_SITES=	${MASTER_SITE_FEDORA_LINUX}
-MASTER_SITE_SUBDIR=	fedora/fedora/1/i386/SRPMS.os
-DISTFILES=	redhat-artwork-${PORTVERSION}-${RH_SUBVERSION}.src.rpm
-
-MAINTAINER=	rzheka@users.sourceforge.net
-COMMENT=	Bluecurve unified-look theme for QT3 from Fedora
-
-EXTRACT_DEPENDS=	rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
-
-WRKSRC= 	${WRKDIR}/redhat-artwork-${PORTVERSION}
-USE_LIBTOOL_VER=13
-#LIBTOOLFILES=	# none
-USE_GMAKE=	yes
-USE_X_PREFIX=	yes
-USE_REINPLACE=	yes
 
-RH_SUBVERSION=	1
+COMMENT=	The Bluecurve QT theme
+
+MASTERDIR=	${.CURDIR}/../bluecurve-themes
 
+USE_REINPLACE=	yes
 USE_QT_VER=	3
-THEMES_SUBDIRS =	${WRKSRC}/art/qt/Bluecurve
+BUILD_WRKSRC=	${WRKSRC}/art/qt/Bluecurve
 
-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-qt3 ${WRKSRC}/art/qt/Bluecurve/Makefile
+QT_CFLAGS=	-I${X11BASE}/include -DQT_THREAD_SUPPORT ${PTHREAD_CFLAGS}
+QT_LIBS=	-L${X11BASE}/lib -lqt-mt ${PTHREAD_LIBS}
 
-# There's no configure script, but we need libtool to build
-do-configure:
-	@${DO_NADA}
+SUB_FILES=	pkg-message
 
 post-patch:
-	@${REINPLACE_CMD} -e 's#-O2#${CFLAGS}#' ${WRKSRC}/art/qt/Bluecurve/Makefile
-	@${RM} ${THEMES_SUBDIRS}/bluecurve.moc
+	@${REINPLACE_CMD} -e 's|GtkStyle|0|' ${BUILD_WRKSRC}/bluecurve.cpp
+	@${REINPLACE_CMD} -e \
+		's|^\(libraryPath\)=.*|\1=${X11BASE}/lib/plugins|' \
+		${WRKSRC}/art/qt/qtrc
 
 do-build:
-	@for theme_dir in ${THEMES_SUBDIRS};do \
-		(cd $$theme_dir; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}); \
-	done
+	cd ${BUILD_WRKSRC} && \
+	${MOC} -o bluecurve.moc bluecurve.h && \
+	${CXX} ${CXXFLAGS} -Wl,-export-dynamic -shared \
+		${QT_CFLAGS} ${QT_LIBS} -o bluecurve.so \
+			bluecurve.cpp plugin.cpp
+
 do-install:
-	@${MKDIR} ${PREFIX}/lib/plugins/styles && ${CHMOD} a+rx ${PREFIX}/lib/plugins/styles
-	@${INSTALL_PROGRAM} ${WRKSRC}/art/qt/Bluecurve/.libs/bluecurve.so ${PREFIX}/lib/plugins/styles
+	${MKDIR} ${PREFIX}/lib/plugins/styles
+	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/bluecurve.so ${PREFIX}/lib/plugins/styles
+	${MKDIR} ${PREFIX}/etc/settings
+	${INSTALL_DATA} ${WRKSRC}/art/qt/qtrc ${PREFIX}/etc/settings/qtrc.bluecurve
+
+post-install:
+	[ -f ${PREFIX}/etc/settings/qtrc ] || \
+		${INSTALL_DATA} ${WRKSRC}/art/qt/qtrc ${PREFIX}/etc/settings
+	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/x11-themes/qt-bluecurve-theme/distinfo b/x11-themes/qt-bluecurve-theme/distinfo
deleted file mode 100644
index 629291aa0abe..000000000000
--- a/x11-themes/qt-bluecurve-theme/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (redhat-artwork-0.88-1.src.rpm) = 022ae5389cdfe5b0a741a1351125c92d
-SIZE (redhat-artwork-0.88-1.src.rpm) = 8273914
diff --git a/x11-themes/qt-bluecurve-theme/files/Makefile-qt3 b/x11-themes/qt-bluecurve-theme/files/Makefile-qt3
deleted file mode 100644
index bb005ff1a2b4..000000000000
--- a/x11-themes/qt-bluecurve-theme/files/Makefile-qt3
+++ /dev/null
@@ -1,47 +0,0 @@
-CC = cc
-CPP = cc -E
-CXX = c++
-CXXCPP = c++ -E
-ECHO = echo
-EXEEXT = 
-LIBJPEG = -ljpeg
-LIBPNG = -lpng -lz -lm
-LIBTOOL = libtool
-LIB_QT = -lqt-mt  $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)
-LN_S = ln -s
-INCLUDES = -I/usr/X11R6/include
-styledir = /usr/X11R6/plugins/styles
-style_LTLIBRARIES = bluecurve.la
-bluecurve_la_LDFLAGS = -module -avoid-version -no-undefined
-bluecurve_la_LIBADD = -L/usr/X11R6/lib -lqt-mt
-bluecurve_la_SOURCES = plugin.cpp bluecurve.cpp bluecurve.moc
-LTLIBRARIES =  $(style_LTLIBRARIES)
-DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I../../..
-CPPFLAGS = -DQT_THREAD_SUPPORT  -I/usr/local/include -I/usr/X11R6/include -D_THREAD_SAFE
-LDFLAGS = 
-LIBS = -Wl,-export-dynamic -L/usr/local/lib -L/usr/X11R6/lib -ljpeg  -L/usr/X11R6/lib
-bluecurve_la_DEPENDENCIES = 
-bluecurve_la_OBJECTS =  plugin.lo bluecurve.lo
-CFLAGS = -O2
-CXXFLAGS = -Wnon-virtual-dtor -Wno-long-long -Wbad-function-cast -Wundef -Wall -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -fno-exceptions -fno-check-new
-CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) $(CFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) $(CFLAGS)
-CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .cpp .lo .o .obj .s
-bluecurve.la: $(bluecurve_la_OBJECTS) $(bluecurve_la_DEPENDENCIES)
-	$(CXXLINK) -rpath $(styledir) $(bluecurve_la_LDFLAGS) $(bluecurve_la_OBJECTS) $(bluecurve_la_LIBADD) $(LIBS)
-.cpp.o:
-	$(CXXCOMPILE) -c $<
-.cpp.lo:
-	$(LTCXXCOMPILE) -c $<
-bluecurve.lo bluecurve.o : bluecurve.cpp bluecurve.moc bluecurve.h bits.cpp
-plugin.lo plugin.o : plugin.cpp bluecurve.h
-all-am: $(LTLIBRARIES)
-all-redirect: all-am
-bluecurve.moc: bluecurve.h
-	moc -o bluecurve.moc bluecurve.h
-$(bluecurve_la_OBJECTS): bluecurve.moc
-.NOEXPORT:
diff --git a/x11-themes/qt-bluecurve-theme/files/pkg-message.in b/x11-themes/qt-bluecurve-theme/files/pkg-message.in
new file mode 100644
index 000000000000..f4ad48bf1db6
--- /dev/null
+++ b/x11-themes/qt-bluecurve-theme/files/pkg-message.in
@@ -0,0 +1,7 @@
+===============================================================================
+
+  If you want to use the Bluecurve QT theme, replace your ~/.qt/qtrc file:
+
+    cp -f %%PREFIX%%/etc/settings/qtrc.bluecurve ~/.qt/qtrc
+
+===============================================================================
diff --git a/x11-themes/qt-bluecurve-theme/pkg-descr b/x11-themes/qt-bluecurve-theme/pkg-descr
index ba9f038ea8f2..903bee70277c 100644
--- a/x11-themes/qt-bluecurve-theme/pkg-descr
+++ b/x11-themes/qt-bluecurve-theme/pkg-descr
@@ -1,6 +1,7 @@
-This is a port of the Fedora "Bluecurve" theme for QT/KDE.
-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 QT theme.
 
 - Ryzhyk Eugeney
 rzheka@users.sourceforge.net
diff --git a/x11-themes/qt-bluecurve-theme/pkg-plist b/x11-themes/qt-bluecurve-theme/pkg-plist
index 485c6cf936bb..32bdf57828be 100644
--- a/x11-themes/qt-bluecurve-theme/pkg-plist
+++ b/x11-themes/qt-bluecurve-theme/pkg-plist
@@ -1,2 +1,6 @@
+@unexec if cmp -s %D/etc/settings/qtrc.bluecurve %D/etc/settings/qtrc; then rm -f %D/etc/settings/qtrc; fi
+etc/settings/qtrc.bluecurve
+@exec [ -f %B/qtrc ] || cp %B/qtrc.bluecurve %B/qtrc
 lib/plugins/styles/bluecurve.so
-@dirrm lib/plugins/styles
+@unexec rmdir %D/etc/settings 2>/dev/null || true
+@unexec rmdir %D/lib/plugins/styles 2>/dev/null || true