From tkato432@yahoo.com  Tue Mar  2 18:02:29 2010
Return-Path: <tkato432@yahoo.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7F29F1065676
	for <FreeBSD-gnats-submit@FreeBSD.org>; Tue,  2 Mar 2010 18:02:25 +0000 (UTC)
	(envelope-from tkato432@yahoo.com)
Received: from msa101lp.auone-net.jp (msa101lp.auone-net.jp [222.3.140.164])
	by mx1.freebsd.org (Postfix) with ESMTP id 2700C8FC22
	for <FreeBSD-gnats-submit@FreeBSD.org>; Tue,  2 Mar 2010 18:02:25 +0000 (UTC)
Received: from localhost.localdomain (ZT048079.ppp.dion.ne.jp [59.128.48.79])
	by msa101lp.auone-net.jp (au one net msa) with ESMTP id B450B34034
	for <FreeBSD-gnats-submit@FreeBSD.org>; Wed,  3 Mar 2010 03:02:19 +0900 (JST)
Message-Id: <20100303030039.fce9691a.tkato432@yahoo.com>
Date: Wed, 3 Mar 2010 03:00:39 +0900
From: KATO Tsuguru <tkato432@yahoo.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: Update port: x11-themes/gtk-qnxtheme

>Number:         144431
>Category:       ports
>Synopsis:       Update port: x11-themes/gtk-qnxtheme
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Mar 02 18:10:02 UTC 2010
>Closed-Date:    Mon Mar 08 23:01:39 UTC 2010
>Last-Modified:  Mon Mar  8 23:10:03 UTC 2010
>Originator:     KATO Tsuguru
>Release:        FreeBSD 7.2-RELEASE-p7 i386
>Organization:
>Environment:
>Description:
- Update MASTER_SITES
- Add WWW: line
- Enable GTK2 support by default

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/x11-themes/gtk-qnxtheme/Makefile x11-themes/gtk-qnxtheme/Makefile
--- /usr/ports/x11-themes/gtk-qnxtheme/Makefile	2006-10-15 03:58:03.000000000 +0900
+++ x11-themes/gtk-qnxtheme/Makefile	2010-02-06 18:37:26.000000000 +0900
@@ -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 -urN /usr/ports/x11-themes/gtk-qnxtheme/distinfo x11-themes/gtk-qnxtheme/distinfo
--- /usr/ports/x11-themes/gtk-qnxtheme/distinfo	2006-01-24 13:44:37.000000000 +0900
+++ x11-themes/gtk-qnxtheme/distinfo	2010-02-06 18:23:50.000000000 +0900
@@ -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 -urN /usr/ports/x11-themes/gtk-qnxtheme/pkg-descr x11-themes/gtk-qnxtheme/pkg-descr
--- /usr/ports/x11-themes/gtk-qnxtheme/pkg-descr	2009-12-21 16:01:01.000000000 +0900
+++ x11-themes/gtk-qnxtheme/pkg-descr	2010-02-06 18:19:26.000000000 +0900
@@ -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 -urN /usr/ports/x11-themes/gtk-qnxtheme/pkg-plist x11-themes/gtk-qnxtheme/pkg-plist
--- /usr/ports/x11-themes/gtk-qnxtheme/pkg-plist	2006-01-22 14:25:31.000000000 +0900
+++ x11-themes/gtk-qnxtheme/pkg-plist	2010-02-06 18:36:15.000000000 +0900
@@ -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
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Tue Mar 2 18:10:50 UTC 2010 
Responsible-Changed-Why:  
miwi@ wants his PRs (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=144431 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Mon Mar 8 23:01:39 UTC 2010 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=144431 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/144431: commit references a PR
Date: Mon,  8 Mar 2010 23:02:19 +0000 (UTC)

 miwi        2010-03-08 23:02:06 UTC
 
   FreeBSD ports repository
 
   Modified files:
     x11-themes/gtk-qnxtheme Makefile distinfo pkg-descr pkg-plist 
   Log:
   - Update MASTER_SITES
   - Add WWW: line
   - Enable GTK2 support by default
   
   PR:             144431
   Submitted by:   Ports Fury
   
   Revision  Changes    Path
   1.12      +26 -29    ports/x11-themes/gtk-qnxtheme/Makefile
   1.4       +3 -3      ports/x11-themes/gtk-qnxtheme/distinfo
   1.3       +2 -0      ports/x11-themes/gtk-qnxtheme/pkg-descr
   1.4       +55 -54    ports/x11-themes/gtk-qnxtheme/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
