From amdmi3@amdmi3.ru  Mon Jan 20 14:00:55 2014
Return-Path: <amdmi3@amdmi3.ru>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id 87BCD17C;
	Mon, 20 Jan 2014 14:00:55 +0000 (UTC)
Received: from smtpout6.timeweb.ru (smtpout6.timeweb.ru [92.53.117.39])
	(using TLSv1 with cipher AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 3FDA5126B;
	Mon, 20 Jan 2014 14:00:55 +0000 (UTC)
Received: from [213.148.20.85] (helo=hive.panopticon)
	by smtp.timeweb.ru with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)
	(Exim 4.76)
	(envelope-from <amdmi3@amdmi3.ru>)
	id 1W5FPI-0002up-Oh; Mon, 20 Jan 2014 18:00:52 +0400
Received: from hades.panopticon (hades.panopticon [192.168.0.32])
	by hive.panopticon (Postfix) with ESMTP id 70988E70;
	Mon, 20 Jan 2014 18:00:52 +0400 (MSK)
Received: by hades.panopticon (Postfix, from userid 1000)
	id 6C6C091BB; Mon, 20 Jan 2014 18:00:52 +0400 (MSK)
Message-Id: <20140120140052.6C6C091BB@hades.panopticon>
Date: Mon, 20 Jan 2014 18:00:52 +0400 (MSK)
From: Dmitry Marakasov <amdmi3@amdmi3.ru>
To: FreeBSD-gnats-submit@freebsd.org
Cc: gnome@FreeBSD.org
Subject: [PATCH] x11/gnome-menus: disable g-ir-scanner cache, support staging
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         185917
>Category:       ports
>Synopsis:       [PATCH] x11/gnome-menus: disable g-ir-scanner cache, support staging
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    gnome
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 20 14:10:03 UTC 2014
>Closed-Date:    Mon May 12 02:39:57 UTC 2014
>Last-Modified:  Mon May 12 02:40:00 UTC 2014
>Originator:     Dmitry Marakasov
>Release:        FreeBSD 10.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD hades.panopticon 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260807: Fri Jan 17 13:14:28 MSK
>Description:
- Disable g-ir-scanner cache to not pollute /root/.cache on build
- Support staging
- Convert USE_GMAKE to USES

Port maintainer (gnome@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99_11 (mode: change, diff: SVN)
>How-To-Repeat:
>Fix:

--- gnome-menus-2.30.5.patch begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 340395)
+++ Makefile	(working copy)
@@ -15,16 +15,15 @@
 BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
 
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack glib20 ltverhack
-USES=		pkgconfig gettext
+USES=		pkgconfig gettext gmake
 USE_AUTOTOOLS=	libtool
 USE_PYTHON=	2
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+MAKE_ENV=	GI_SCANNER_DISABLE_CACHE=yes
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|applications.menu||' \
 		${WRKSRC}/layout/Makefile.in
@@ -42,8 +41,8 @@
 
 post-install:
 	@${INSTALL_DATA} ${WRKSRC}/layout/applications.menu \
-		${PREFIX}/etc/xdg/menus/gnome-applications.menu
+		${STAGEDIR}${PREFIX}/etc/xdg/menus/gnome-applications.menu
 	@${INSTALL_DATA} ${WRKSRC}/KDE.directory \
-		${PREFIX}/share/desktop-directories
+		${STAGEDIR}${PREFIX}/share/desktop-directories
 
 .include <bsd.port.mk>
--- gnome-menus-2.30.5.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->gnome 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Jan 20 14:10:30 UTC 2014 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

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

From: Dmitry Marakasov <amdmi3@amdmi3.ru>
To: bug-followup@FreeBSD.org
Cc: gnome@FreeBSD.org
Subject: Re: ports/185917: [PATCH] x11/gnome-menus: disable g-ir-scanner
 cache, support staging
Date: Wed, 29 Jan 2014 03:09:25 +0400

 * Dmitry Marakasov (amdmi3@amdmi3.ru) wrote:
 
 Updated patch, which makes use of USE_GNOME=introspection to take 
 care of environement for g-ir-scanner automatically.
 
 --- gnome-menus.patch begins here ---
 Index: Makefile
 ===================================================================
 --- Makefile	(revision 341493)
 +++ Makefile	(working copy)
 @@ -12,12 +12,10 @@
  MAINTAINER=	gnome@FreeBSD.org
  COMMENT=	Implementation of the FreeDesktop Desktop Menu Spec
  
 -BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
 -
  USE_BZIP2=	yes
 -USE_GMAKE=	yes
 -USE_GNOME=	gnomeprefix gnomehack intlhack glib20 ltverhack
 -USES=		pkgconfig gettext
 +USE_GNOME=	gnomeprefix gnomehack intlhack glib20 ltverhack \
 +		introspection:build
 +USES=		pkgconfig gettext gmake
  USE_AUTOTOOLS=	libtool
  USE_PYTHON=	2
  USE_LDCONFIG=	yes
 @@ -24,7 +22,6 @@
  CPPFLAGS+=	-I${LOCALBASE}/include
  LDFLAGS+=	-L${LOCALBASE}/lib
  
 -NO_STAGE=	yes
  post-patch:
  	@${REINPLACE_CMD} -e 's|applications.menu||' \
  		${WRKSRC}/layout/Makefile.in
 @@ -42,8 +39,8 @@
  
  post-install:
  	@${INSTALL_DATA} ${WRKSRC}/layout/applications.menu \
 -		${PREFIX}/etc/xdg/menus/gnome-applications.menu
 +		${STAGEDIR}${PREFIX}/etc/xdg/menus/gnome-applications.menu
  	@${INSTALL_DATA} ${WRKSRC}/KDE.directory \
 -		${PREFIX}/share/desktop-directories
 +		${STAGEDIR}${PREFIX}/share/desktop-directories
  
  .include <bsd.port.mk>
 --- gnome-menus.patch ends here ---
 
 -- 
 Dmitry Marakasov   .   55B5 0596 FF1E 8D84 5F56  9510 D35A 80DD F9D2 F77D
 amdmi3@amdmi3.ru  ..:  jabber: amdmi3@jabber.ru    http://www.amdmi3.ru
State-Changed-From-To: open->closed 
State-Changed-By: amdmi3 
State-Changed-When: Mon May 12 02:39:57 UTC 2014 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/185917: commit references a PR
Date: Mon, 12 May 2014 02:39:50 +0000 (UTC)

 Author: amdmi3
 Date: Mon May 12 02:39:47 2014
 New Revision: 353766
 URL: http://svnweb.freebsd.org/changeset/ports/353766
 QAT: https://qat.redports.org/buildarchive/r353766/
 
 Log:
   - Remove redundant dependency
   - Don't remove mtree directories
   
   PR:		185917
   Submitted by:	amdmi3
   Approved by:	maintainer timeout
 
 Modified:
   head/x11/gnome-menus/Makefile
   head/x11/gnome-menus/pkg-plist
 
 Modified: head/x11/gnome-menus/Makefile
 ==============================================================================
 --- head/x11/gnome-menus/Makefile	Mon May 12 02:05:26 2014	(r353765)
 +++ head/x11/gnome-menus/Makefile	Mon May 12 02:39:47 2014	(r353766)
 @@ -12,8 +12,6 @@ DIST_SUBDIR=	gnome2
  MAINTAINER=	gnome@FreeBSD.org
  COMMENT=	Implementation of the FreeDesktop Desktop Menu Spec
  
 -BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
 -
  USE_BZIP2=	yes
  USE_GNOME=	gnomeprefix intlhack glib20 ltverhack introspection:build
  USES=		pkgconfig gettext gmake pathfix
 
 Modified: head/x11/gnome-menus/pkg-plist
 ==============================================================================
 --- head/x11/gnome-menus/pkg-plist	Mon May 12 02:05:26 2014	(r353765)
 +++ head/x11/gnome-menus/pkg-plist	Mon May 12 02:39:47 2014	(r353766)
 @@ -138,8 +138,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-men
  @dirrm share/gnome-menus
  @dirrmtry share/desktop-directories
  @dirrm include/gnome-menus
 -@dirrmtry share/gir-1.0
 -@dirrmtry lib/girepository-1.0
  @dirrmtry etc/xdg/menus
  @dirrmtry share/locale/zh_HK/LC_MESSAGES
  @dirrmtry share/locale/zh_HK
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
