Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 17 Jun 2013 08:16:03 +0000 (UTC)
From:      Koop Mast <kwm@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r321088 - head/x11-fm/nautilus
Message-ID:  <201306170816.r5H8G33v091977@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kwm
Date: Mon Jun 17 08:16:03 2013
New Revision: 321088
URL: http://svnweb.freebsd.org/changeset/ports/321088

Log:
  Fix build with glib 2.36.
  Convert to USES=desktop-file-utils and shared-mime-info.

Modified:
  head/x11-fm/nautilus/Makefile
  head/x11-fm/nautilus/pkg-plist

Modified: head/x11-fm/nautilus/Makefile
==============================================================================
--- head/x11-fm/nautilus/Makefile	Mon Jun 17 06:59:01 2013	(r321087)
+++ head/x11-fm/nautilus/Makefile	Mon Jun 17 08:16:03 2013	(r321088)
@@ -4,7 +4,7 @@
 
 PORTNAME=	nautilus
 PORTVERSION=	2.32.2.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -23,8 +23,9 @@ INSTALLS_ICONS=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USES=		gettext
+USES=		desktop-file-utils shared-mime-info
 USE_GNOME=	gnomeprefix gnomehack intlhack gnomedesktop \
-		librsvg2 desktopfileutils ltverhack gvfs ltasneededhack
+		librsvg2 ltverhack gvfs ltasneededhack
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ENV=	LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -liconv" \
@@ -43,9 +44,10 @@ post-patch:
 		${WRKSRC}/eel/eel-*.[ch] \
 		${WRKSRC}/libnautilus-private/*.[ch] \
 		${WRKSRC}/src/nautilus-zoom-control.c
+	@${REINPLACE_CMD} -e 's|-DG_DISABLE_DEPRECATED||g' \
+		${WRKSRC}/configure ${WRKSRC}/eel/Makefile.in
 
 post-install:
 	@${MKDIR} ${PREFIX}/lib/nautilus/extensions-2.0
-	@-update-desktop-database
 
 .include <bsd.port.mk>

Modified: head/x11-fm/nautilus/pkg-plist
==============================================================================
--- head/x11-fm/nautilus/pkg-plist	Mon Jun 17 06:59:01 2013	(r321087)
+++ head/x11-fm/nautilus/pkg-plist	Mon Jun 17 08:16:03 2013	(r321088)
@@ -238,10 +238,6 @@ share/pixmaps/nautilus/thumbnail_frame.p
 @dirrmtry lib/nautilus
 @dirrm include/nautilus/libnautilus-extension
 @dirrm include/nautilus
-@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
-@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @dirrm share/doc/libnautilus-extension
 @dirrmtry share/locale/zu/LC_MESSAGES
 @dirrmtry share/locale/zu



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306170816.r5H8G33v091977>