- Update MASTER_SITES

- Add WWW: line
- Enable GTK2 support by default

PR:		144431
Submitted by:	Ports Fury

4 files changed, 86 insertions, 86 deletions

diff --git a/x11-themes/gtk-qnxtheme/Makefile b/x11-themes/gtk-qnxtheme/Makefile
index 095eae51eba9..05ea62cb9974 100644
--- a/x11-themes/gtk-qnxtheme/Makefile
+++ b/x11-themes/gtk-qnxtheme/Makefile
@@ -7,50 +7,47 @@
 
 PORTNAME=	gtk-qnxtheme
 PORTVERSION=	0.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-themes
-MASTER_SITES=	${MASTER_SITE_THEMES}
-MASTER_SITE_SUBDIR=	qnxtheme
-DISTNAME=	qnxtheme-default-${PORTVERSION}
+MASTER_SITES=	http://www.gnome-look.org/CONTENT/content-files/
+DISTNAME=	3414-qnxtheme-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	QNX-inspired theme for GTK1 and GTK2
 
-WANT_GNOME=	yes
+OPTIONS=	GTK2     "Build the GTK2 theme as well"     on
+
+NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/QNX
 
-OPTIONS+=	GTK2	"Build the GTK2 theme as well." off
+WANT_GNOME=	yes
 
-.include	<bsd.port.pre.mk>
+.include <bsd.port.pre.mk>
 
-.if defined(WITH_GTK2)
+.if defined(WITHOUT_GTK2)
+PLIST_SUB+=	GTK2="@comment "
+.else
 USE_GNOME=	gtk20
 PLIST_SUB+=	GTK2=""
-.else
-PLIST_SUB+=	GTK2="@comment "
 .endif
 
-# XXX - port build fails unless I create dummy file if OPTIONS aren't yet set
-post-extract:
-	@${ECHO_CMD} "all:" > ${WRKSRC}/Makefile
+post-patch:
+.for file in gtk/gtkrc gtk-2.0/gtkrc
+	@${REINPLACE_CMD} -i "" -e \
+		's|/usr/share|${LOCALBASE}/share|g ; \
+		 s|themes/QNX|themes/qnxtheme|g' ${WRKSRC}/QNX/${file}
+.endfor
 
 do-install:
-	@${REINPLACE_CMD} -e 's@/usr@${LOCALBASE}@g' ${WRKSRC}/gtk/gtkrc
-	@${REINPLACE_CMD} -e 's@QNX@qnxtheme@g' ${WRKSRC}/gtk/gtkrc
-	@${RM} -f ${WRKSRC}/gtk/gtkrc.bak
-	@${MKDIR} ${LOCALBASE}/share/themes/qnxtheme/gtk
-	@for i in ${WRKSRC}/gtk/*; do \
-		${INSTALL_DATA} $$i ${LOCALBASE}/share/themes/qnxtheme/gtk; \
-	done
-.if defined(WITH_GTK2)
-	@${REINPLACE_CMD} -e 's@/usr@${LOCALBASE}@g' ${WRKSRC}/gtk-2.0/gtkrc
-	@${REINPLACE_CMD} -e 's@QNX@qnxtheme@g' ${WRKSRC}/gtk-2.0/gtkrc
-	@${RM} -f ${WRKSRC}/gtk-2.0/gtkrc.bak
-	@${MKDIR} ${LOCALBASE}/share/themes/qnxtheme/gtk-2.0
-	@for i in ${WRKSRC}/gtk-2.0/*; do \
-		 ${INSTALL_DATA} $$i ${LOCALBASE}/share/themes/qnxtheme/gtk-2.0; \
-	done
+	@${MKDIR} ${PREFIX}/share/themes/qnxtheme
+	${INSTALL_DATA} ${WRKSRC}/QNX/README ${PREFIX}/share/themes/qnxtheme
+	@${MKDIR} ${PREFIX}/share/themes/qnxtheme/gtk
+	@(cd ${WRKSRC}/QNX/gtk \
+		&& ${COPYTREE_SHARE} . ${PREFIX}/share/themes/qnxtheme/gtk)
+.if !defined(WITHOUT_GTK2)
+	@${MKDIR} ${PREFIX}/share/themes/qnxtheme/gtk-2.0
+	@(cd ${WRKSRC}/QNX/gtk-2.0 \
+		&& ${COPYTREE_SHARE} . ${PREFIX}/share/themes/qnxtheme/gtk-2.0)
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/x11-themes/gtk-qnxtheme/distinfo b/x11-themes/gtk-qnxtheme/distinfo
index 8c0f8d7c7be4..e6bea911e4c3 100644
--- a/x11-themes/gtk-qnxtheme/distinfo
+++ b/x11-themes/gtk-qnxtheme/distinfo
@@ -1,3 +1,3 @@
-MD5 (qnxtheme-default-0.1.tar.gz) = e863ef52fb4a836f4c4c49bec9992d2f
-SHA256 (qnxtheme-default-0.1.tar.gz) = 0ae3d6ea53bfcb43887b0c1f8295dccbe77a85ce7af3f85302962a638e7163a8
-SIZE (qnxtheme-default-0.1.tar.gz) = 13470
+MD5 (3414-qnxtheme-0.1.tar.gz) = e863ef52fb4a836f4c4c49bec9992d2f
+SHA256 (3414-qnxtheme-0.1.tar.gz) = 0ae3d6ea53bfcb43887b0c1f8295dccbe77a85ce7af3f85302962a638e7163a8
+SIZE (3414-qnxtheme-0.1.tar.gz) = 13470
diff --git a/x11-themes/gtk-qnxtheme/pkg-descr b/x11-themes/gtk-qnxtheme/pkg-descr
index f42a043ec119..407e1c1e5592 100644
--- a/x11-themes/gtk-qnxtheme/pkg-descr
+++ b/x11-themes/gtk-qnxtheme/pkg-descr
@@ -1 +1,3 @@
 qnxtheme is a QNX-inspired theme for GTK1 and GTK2.
+
+WWW: http://www.gnome-look.org/content/show.php?content=3414
diff --git a/x11-themes/gtk-qnxtheme/pkg-plist b/x11-themes/gtk-qnxtheme/pkg-plist
index 8a1ddff05bc3..aa6ab162233b 100644
--- a/x11-themes/gtk-qnxtheme/pkg-plist
+++ b/x11-themes/gtk-qnxtheme/pkg-plist
@@ -1,77 +1,78 @@
-share/themes/qnxtheme/gtk/plus.png
-share/themes/qnxtheme/gtk/vbuttonbarpressed.png
-share/themes/qnxtheme/gtk/listheader.png
-share/themes/qnxtheme/gtk/listheaderpressed.png
+share/themes/qnxtheme/README
+share/themes/qnxtheme/gtk/arrow_down.png
 share/themes/qnxtheme/gtk/arrow_down2.png
-share/themes/qnxtheme/gtk/blank.png
+share/themes/qnxtheme/gtk/arrow_left.png
+share/themes/qnxtheme/gtk/arrow_left2.png
+share/themes/qnxtheme/gtk/arrow_right.png
 share/themes/qnxtheme/gtk/arrow_right2.png
+share/themes/qnxtheme/gtk/arrow_up.png
+share/themes/qnxtheme/gtk/arrow_up2.png
+share/themes/qnxtheme/gtk/blank.png
+share/themes/qnxtheme/gtk/button.png
+share/themes/qnxtheme/gtk/buttonpressed.png
+share/themes/qnxtheme/gtk/checkfalse.png
+share/themes/qnxtheme/gtk/checktrue.png
 share/themes/qnxtheme/gtk/gtkrc
+share/themes/qnxtheme/gtk/hbuttonbar.png
+share/themes/qnxtheme/gtk/hbuttonbarpressed.png
+share/themes/qnxtheme/gtk/hline.png
+share/themes/qnxtheme/gtk/listheader.png
+share/themes/qnxtheme/gtk/listheaderpressed.png
 share/themes/qnxtheme/gtk/mcheck1.png
 share/themes/qnxtheme/gtk/mcheck2.png
-share/themes/qnxtheme/gtk/arrow_right.png
-share/themes/qnxtheme/gtk/toolbutton.png
-share/themes/qnxtheme/gtk/arrow_left2.png
-share/themes/qnxtheme/gtk/toolbuttonpressed.png
-share/themes/qnxtheme/gtk/arrow_down.png
-share/themes/qnxtheme/gtk/trough.png
+share/themes/qnxtheme/gtk/menubar.png
+share/themes/qnxtheme/gtk/menuitem.png
+share/themes/qnxtheme/gtk/minus.png
 share/themes/qnxtheme/gtk/mradio1.png
 share/themes/qnxtheme/gtk/mradio2.png
-share/themes/qnxtheme/gtk/checkfalse.png
-share/themes/qnxtheme/gtk/menuitem.png
-share/themes/qnxtheme/gtk/arrow_left.png
-share/themes/qnxtheme/gtk/button.png
+share/themes/qnxtheme/gtk/plus.png
 share/themes/qnxtheme/gtk/progressbar.png
-share/themes/qnxtheme/gtk/menubar.png
-share/themes/qnxtheme/gtk/minus.png
-share/themes/qnxtheme/gtk/arrow_up.png
-share/themes/qnxtheme/gtk/hline.png
-share/themes/qnxtheme/gtk/buttonpressed.png
-share/themes/qnxtheme/gtk/hbuttonbar.png
-share/themes/qnxtheme/gtk/scrollbar.png
-share/themes/qnxtheme/gtk/radiotrue.png
 share/themes/qnxtheme/gtk/radiofalse.png
-share/themes/qnxtheme/gtk/checktrue.png
-share/themes/qnxtheme/gtk/arrow_up2.png
-share/themes/qnxtheme/gtk/hbuttonbarpressed.png
+share/themes/qnxtheme/gtk/radiotrue.png
+share/themes/qnxtheme/gtk/scrollbar.png
+share/themes/qnxtheme/gtk/toolbutton.png
+share/themes/qnxtheme/gtk/toolbuttonpressed.png
+share/themes/qnxtheme/gtk/trough.png
 share/themes/qnxtheme/gtk/vbuttonbar.png
-%%GTK2%%share/themes/qnxtheme/gtk-2.0/plus.png
-%%GTK2%%share/themes/qnxtheme/gtk-2.0/vbuttonbarpressed.png
-%%GTK2%%share/themes/qnxtheme/gtk-2.0/listheader.png
-%%GTK2%%share/themes/qnxtheme/gtk-2.0/listheaderpressed.png
+share/themes/qnxtheme/gtk/vbuttonbarpressed.png
+%%GTK2%%share/themes/qnxtheme/gtk-2.0/arrow_down.png
 %%GTK2%%share/themes/qnxtheme/gtk-2.0/arrow_down2.png
-%%GTK2%%share/themes/qnxtheme/gtk-2.0/blank.png
+%%GTK2%%share/themes/qnxtheme/gtk-2.0/arrow_left.png
+%%GTK2%%share/themes/qnxtheme/gtk-2.0/arrow_left2.png
+%%GTK2%%share/themes/qnxtheme/gtk-2.0/arrow_right.png
 %%GTK2%%share/themes/qnxtheme/gtk-2.0/arrow_right2.png
+%%GTK2%%share/themes/qnxtheme/gtk-2.0/arrow_up.png
+%%GTK2%%share/themes/qnxtheme/gtk-2.0/arrow_up2.png
+%%GTK2%%share/themes/qnxtheme/gtk-2.0/blank.png
+%%GTK2%%share/themes/qnxtheme/gtk-2.0/button.png
+%%GTK2%%share/themes/qnxtheme/gtk-2.0/buttonbar.png
+%%GTK2%%share/themes/qnxtheme/gtk-2.0/buttonbarpressed.png
+%%GTK2%%share/themes/qnxtheme/gtk-2.0/buttonpressed.png
+%%GTK2%%share/themes/qnxtheme/gtk-2.0/checkfalse.png
+%%GTK2%%share/themes/qnxtheme/gtk-2.0/checktrue.png
 %%GTK2%%share/themes/qnxtheme/gtk-2.0/gtkrc
+%%GTK2%%share/themes/qnxtheme/gtk-2.0/hbuttonbar.png
+%%GTK2%%share/themes/qnxtheme/gtk-2.0/hbuttonbarpressed.png
+%%GTK2%%share/themes/qnxtheme/gtk-2.0/hline.png
+%%GTK2%%share/themes/qnxtheme/gtk-2.0/listheader.png
+%%GTK2%%share/themes/qnxtheme/gtk-2.0/listheaderpressed.png
 %%GTK2%%share/themes/qnxtheme/gtk-2.0/mcheck1.png
 %%GTK2%%share/themes/qnxtheme/gtk-2.0/mcheck2.png
-%%GTK2%%share/themes/qnxtheme/gtk-2.0/arrow_right.png
-%%GTK2%%share/themes/qnxtheme/gtk-2.0/toolbutton.png
-%%GTK2%%share/themes/qnxtheme/gtk-2.0/arrow_left2.png
-%%GTK2%%share/themes/qnxtheme/gtk-2.0/toolbuttonpressed.png
-%%GTK2%%share/themes/qnxtheme/gtk-2.0/arrow_down.png
-%%GTK2%%share/themes/qnxtheme/gtk-2.0/trough.png
+%%GTK2%%share/themes/qnxtheme/gtk-2.0/menubar.png
+%%GTK2%%share/themes/qnxtheme/gtk-2.0/menuitem.png
+%%GTK2%%share/themes/qnxtheme/gtk-2.0/minus.png
 %%GTK2%%share/themes/qnxtheme/gtk-2.0/mradio1.png
 %%GTK2%%share/themes/qnxtheme/gtk-2.0/mradio2.png
-%%GTK2%%share/themes/qnxtheme/gtk-2.0/checkfalse.png
-%%GTK2%%share/themes/qnxtheme/gtk-2.0/menuitem.png
-%%GTK2%%share/themes/qnxtheme/gtk-2.0/arrow_left.png
-%%GTK2%%share/themes/qnxtheme/gtk-2.0/buttonbarpressed.png
-%%GTK2%%share/themes/qnxtheme/gtk-2.0/button.png
+%%GTK2%%share/themes/qnxtheme/gtk-2.0/plus.png
 %%GTK2%%share/themes/qnxtheme/gtk-2.0/progressbar.png
-%%GTK2%%share/themes/qnxtheme/gtk-2.0/menubar.png
-%%GTK2%%share/themes/qnxtheme/gtk-2.0/minus.png
-%%GTK2%%share/themes/qnxtheme/gtk-2.0/arrow_up.png
-%%GTK2%%share/themes/qnxtheme/gtk-2.0/hline.png
-%%GTK2%%share/themes/qnxtheme/gtk-2.0/buttonpressed.png
-%%GTK2%%share/themes/qnxtheme/gtk-2.0/hbuttonbar.png
-%%GTK2%%share/themes/qnxtheme/gtk-2.0/scrollbar.png
-%%GTK2%%share/themes/qnxtheme/gtk-2.0/radiotrue.png
-%%GTK2%%share/themes/qnxtheme/gtk-2.0/buttonbar.png
 %%GTK2%%share/themes/qnxtheme/gtk-2.0/radiofalse.png
-%%GTK2%%share/themes/qnxtheme/gtk-2.0/checktrue.png
-%%GTK2%%share/themes/qnxtheme/gtk-2.0/arrow_up2.png
-%%GTK2%%share/themes/qnxtheme/gtk-2.0/hbuttonbarpressed.png
+%%GTK2%%share/themes/qnxtheme/gtk-2.0/radiotrue.png
+%%GTK2%%share/themes/qnxtheme/gtk-2.0/scrollbar.png
+%%GTK2%%share/themes/qnxtheme/gtk-2.0/toolbutton.png
+%%GTK2%%share/themes/qnxtheme/gtk-2.0/toolbuttonpressed.png
+%%GTK2%%share/themes/qnxtheme/gtk-2.0/trough.png
 %%GTK2%%share/themes/qnxtheme/gtk-2.0/vbuttonbar.png
+%%GTK2%%share/themes/qnxtheme/gtk-2.0/vbuttonbarpressed.png
 %%GTK2%%@dirrm share/themes/qnxtheme/gtk-2.0
 @dirrm share/themes/qnxtheme/gtk
 @dirrm share/themes/qnxtheme