Bug 185917 - [PATCH] x11/gnome-menus: disable g-ir-scanner cache, support staging
Summary: [PATCH] x11/gnome-menus: disable g-ir-scanner cache, support staging
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: freebsd-gnome (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-01-20 14:10 UTC by Dmitry Marakasov
Modified: 2014-05-12 03:40 UTC (History)
1 user (show)

See Also:


Attachments
gnome-menus-2.30.5.patch (1021 bytes, patch)
2014-01-20 14:10 UTC, Dmitry Marakasov
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Dmitry Marakasov 2014-01-20 14:10:03 UTC
- 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)
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2014-01-20 14:10:30 UTC
Responsible Changed
From-To: freebsd-ports-bugs->gnome

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 Dmitry Marakasov 2014-01-28 23:09:25 UTC
* 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
Comment 3 dfilter service freebsd_committer freebsd_triage 2014-05-12 03:39:50 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"
Comment 4 Dmitry Marakasov freebsd_committer freebsd_triage 2014-05-12 03:39:57 UTC
State Changed
From-To: open->closed

Committed. Thanks!