From owner-freebsd-gnome@FreeBSD.ORG  Tue Jan 28 23:09:28 2014
Return-Path: <owner-freebsd-gnome@FreeBSD.ORG>
Delivered-To: gnome@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C4428740;
 Tue, 28 Jan 2014 23:09:28 +0000 (UTC)
Received: from smtpout3.timeweb.ru (smtpout3.timeweb.ru [92.53.117.25])
 (using TLSv1 with cipher AES256-SHA (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7A17E139D;
 Tue, 28 Jan 2014 23:09:28 +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 1W8HmY-0002hR-3l; Wed, 29 Jan 2014 03:09:26 +0400
Received: from hades.panopticon (hades.panopticon [192.168.0.32])
 by hive.panopticon (Postfix) with ESMTP id BBF87358;
 Wed, 29 Jan 2014 03:09:25 +0400 (MSK)
Received: by hades.panopticon (Postfix, from userid 1000)
 id 9783B2AA7; Wed, 29 Jan 2014 03:09:25 +0400 (MSK)
Date: Wed, 29 Jan 2014 03:09:25 +0400
From: Dmitry Marakasov <amdmi3@amdmi3.ru>
To: bug-followup@FreeBSD.org
Subject: Re: ports/185917: [PATCH] x11/gnome-menus: disable g-ir-scanner
 cache, support staging
Message-ID: <20140128230925.GK52820@hades.panopticon>
References: <20140120140052.6C6C091BB@hades.panopticon>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
In-Reply-To: <20140120140052.6C6C091BB@hades.panopticon>
User-Agent: Mutt/1.5.22 (2013-10-16)
Cc: gnome@FreeBSD.org
X-BeenThere: freebsd-gnome@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: GNOME for FreeBSD -- porting and maintaining
 <freebsd-gnome.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-gnome>,
 <mailto:freebsd-gnome-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-gnome/>
List-Post: <mailto:freebsd-gnome@freebsd.org>
List-Help: <mailto:freebsd-gnome-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gnome>,
 <mailto:freebsd-gnome-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Jan 2014 23:09:28 -0000

* 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