From owner-svn-ports-all@FreeBSD.ORG  Tue Jul  2 05:45:59 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 8BE49432;
 Tue,  2 Jul 2013 05:45:59 +0000 (UTC)
 (envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 65547175D;
 Tue,  2 Jul 2013 05:45:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r625jwTn009455;
 Tue, 2 Jul 2013 05:45:58 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r625jwYu009454;
 Tue, 2 Jul 2013 05:45:58 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201307020545.r625jwYu009454@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Tue, 2 Jul 2013 05:45:58 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r322155 - head/editors/libreoffice
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Jul 2013 05:45:59 -0000

Author: jkim
Date: Tue Jul  2 05:45:58 2013
New Revision: 322155
URL: http://svnweb.freebsd.org/changeset/ports/322155

Log:
  - Revive the option to support GTK+ 3.x.
  - Switch to USES=desktop-file-utils.
  - Fix plist when both GTK2 and GTK3 are enabled.
  
  Submitted by:	kwm

Modified:
  head/editors/libreoffice/Makefile

Modified: head/editors/libreoffice/Makefile
==============================================================================
--- head/editors/libreoffice/Makefile	Tue Jul  2 04:21:05 2013	(r322154)
+++ head/editors/libreoffice/Makefile	Tue Jul  2 05:45:58 2013	(r322155)
@@ -108,7 +108,6 @@ CONFIGURE_ARGS+=	--disable-dependency-tr
 CONFIGURE_ARGS+=	--disable-epm \
 			--disable-gnome-vfs \
 			--disable-gstreamer \
-			--disable-gtk3 \
 			--disable-kde \
 			--disable-kdeab \
 			--disable-linkoo \
@@ -178,9 +177,9 @@ MAN1=	libreoffice.1 \
 
 MANCOMPRESSED=	yes
 
-OPTIONS_DEFINE=	CUPS DEBUG GNOME GTK2 JAVA KDE4 MMEDIA PGSQL SDK SYSTRAY \
-		TEST WEBDAV
-OPTIONS_DEFAULT=CUPS GTK2
+OPTIONS_DEFINE=	CUPS DEBUG GNOME GTK2 GTK3 JAVA KDE4 MMEDIA PGSQL SDK \
+		SYSTRAY TEST WEBDAV
+OPTIONS_DEFAULT=CUPS GTK3
 
 JAVA_DESC=	Add java support (XML Filters, macros)
 MMEDIA_DESC=	Enable multimedia backend for impress
@@ -219,14 +218,25 @@ CONFIGURE_ARGS+=	--disable-dbus --disabl
 			--disable-lockdown
 .endif
 
-.if ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MGNOME}
-USE_GNOME+=	gtk20 desktopfileutils
-INSTALLS_ICONS=	yes
+.if ${PORT_OPTIONS:MGNOME} || ${PORT_OPTIONS:MGTK2}
+USE_GNOME+=	gtk20
 CONFIGURE_ARGS+=	--enable-gtk
 .else
 CONFIGURE_ARGS+=	--disable-gtk
 .endif
 
+.if ${PORT_OPTIONS:MGTK3}
+USE_GNOME+=	gtk30
+CONFIGURE_ARGS+=	--enable-gtk3
+.else
+CONFIGURE_ARGS+=	--disable-gtk3
+.endif
+
+.if ${PORT_OPTIONS:MGNOME} || ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MGTK3}
+USES+=		desktop-file-utils
+INSTALLS_ICONS=	yes
+.endif
+
 .if ${PORT_OPTIONS:MJAVA}
 # XXX jni.h from GNU classpath causes ABI conflicts.
 CONFLICTS_BUILD=	classpath-[0-9]*
@@ -398,11 +408,6 @@ post-install:
 	    \( -type f -o -type l \) -print >> ${PLISTF}
 .endfor
 
-.if ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MGNOME}
-	@${ECHO_CMD} "@exec ${LOCALBASE}/bin/update-desktop-database >/dev/null || ${TRUE}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec ${LOCALBASE}/bin/update-desktop-database >/dev/null || ${TRUE}" >> ${TMPPLIST}
-.endif
-
 .if ${PORT_OPTIONS:MSDK}
 .for subdir in include share share/doc share/idl
 	@cd ${LODESTDIR}/${PREFIX} && ${FIND} -H -s ${subdir}/libreoffice \
@@ -424,8 +429,4 @@ post-install:
 	@${INSTALL_SCRIPT} ${LODESTDIR}/etc/bash_completion.d/libreoffice.sh \
 	    ${PREFIX}/etc/bash_completion.d
 
-.if ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MGNOME}
-	@${LOCALBASE}/bin/update-desktop-database 2>/dev/null || ${TRUE}
-.endif
-
 .include <bsd.port.post.mk>