svn commit: r317690 - in head/x11/libexo: . files

[Olivier Duchateau]

Author: olivierd
Date: Wed May  8 15:53:18 2013
New Revision: 317690
URL: http://svnweb.freebsd.org/changeset/ports/317690

Log:
  - Finish to convert USES
  - Replace post-patch target by patch ( configure script)

Modified:
  head/x11/libexo/Makefile
  head/x11/libexo/files/patch-configure   (contents, props changed)
  head/x11/libexo/pkg-plist

Modified: head/x11/libexo/Makefile
==============================================================================
--- head/x11/libexo/Makefile	Wed May  8 15:49:02 2013	(r317689)
+++ head/x11/libexo/Makefile	Wed May  8 15:53:18 2013	(r317690)
@@ -4,7 +4,7 @@
 
 PORTNAME=	libexo
 PORTVERSION=	0.10.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/xfce/exo/${PORTVERSION:R}
@@ -24,14 +24,12 @@ GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack glib20 gtk20 intltool intlhack desktopfileutils
+USE_GNOME=	glib20 gtk20 intltool intlhack
 USE_LDCONFIG=	yes
 USE_PERL5=	yes
 USE_XFCE=	configenv libmenu libutil
 USE_XORG=	x11
-USES=		pkgconfig
-
-CONFIGURE_ARGS+=--disable-gtk-doc-html
+USES=		desktop-file-utils pathfix pkgconfig
 
 OPTIONS_DEFINE=	DOCS NLS
 
@@ -56,12 +54,4 @@ CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-post-patch:
-.if empty(PORT_OPTIONS:MNLS)
-	@${REINPLACE_CMD} -e 's|	po||' ${WRKSRC}/Makefile.in
-.endif
-
-post-install:
-	@-update-desktop-database
-
 .include <bsd.port.mk>

Modified: head/x11/libexo/files/patch-configure
==============================================================================
--- head/x11/libexo/files/patch-configure	Wed May  8 15:49:02 2013	(r317689)
+++ head/x11/libexo/files/patch-configure	Wed May  8 15:53:18 2013	(r317690)
@@ -1,6 +1,6 @@
---- configure.orig	2010-01-14 17:33:27.000000000 +0100
-+++ configure	2010-01-14 17:35:47.000000000 +0100
-@@ -746,6 +746,9 @@
+--- ./configure.orig	2012-12-27 12:50:36.000000000 +0000
++++ ./configure	2013-05-05 20:55:42.000000000 +0000
+@@ -633,6 +633,9 @@
  #endif
  #ifdef HAVE_UNISTD_H
  # include <unistd.h>
@@ -10,3 +10,12 @@
  #endif"
  
  ac_header_list=
+@@ -13802,7 +13805,7 @@
+ 
+     fi
+   fi
+-     USE_NLS=yes
++#     USE_NLS=yes
+ 
+ 
+     gt_cv_have_gettext=no

Modified: head/x11/libexo/pkg-plist
==============================================================================
--- head/x11/libexo/pkg-plist	Wed May  8 15:49:02 2013	(r317689)
+++ head/x11/libexo/pkg-plist	Wed May  8 15:53:18 2013	(r317690)
@@ -207,5 +207,3 @@ share/xfce4/helpers/xterm.desktop
 @dirrm include/exo-1
 @dirrmtry etc/xdg/xfce4
 @dirrmtry etc/xdg
- at exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
- at unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true