svn commit: r317687 - in head/x11-wm/xfce4-panel: . files

[Olivier Duchateau]

Author: olivierd
Date: Wed May  8 15:42:11 2013
New Revision: 317687
URL: http://svnweb.freebsd.org/changeset/ports/317687

Log:
  - Update to 4.10.1
  - Finish to convert USES
  - Replace post-patch target by patch (configure script)
  - Remove unneeded patches
  - Remove desktopfileutils, because MimeType entry is not present in desktop
  file

Added:
  head/x11-wm/xfce4-panel/files/patch-configure   (contents, props changed)
Deleted:
  head/x11-wm/xfce4-panel/files/patch-libxfce4panel__xfce-panel-convenience.c
  head/x11-wm/xfce4-panel/files/patch-plugins__actions__actions.c
Modified:
  head/x11-wm/xfce4-panel/Makefile
  head/x11-wm/xfce4-panel/distinfo   (contents, props changed)
  head/x11-wm/xfce4-panel/pkg-plist   (contents, props changed)

Modified: head/x11-wm/xfce4-panel/Makefile
==============================================================================
--- head/x11-wm/xfce4-panel/Makefile	Wed May  8 15:40:14 2013	(r317686)
+++ head/x11-wm/xfce4-panel/Makefile	Wed May  8 15:42:11 2013	(r317687)
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	xfce4-panel
-PORTVERSION=	4.10.0
-PORTREVISION=	6
+PORTVERSION=	4.10.1
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR=	src/xfce/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce at FreeBSD.org
@@ -15,19 +15,18 @@ LIB_DEPENDS=	wnck-1:${PORTSDIR}/x11-tool
 		cairo:${PORTSDIR}/graphics/cairo \
 		dbus-glib-1:${PORTSDIR}/devel/dbus-glib
 
-USES=	pathfix pkgconfig
+USES=	desktop-file-utils pathfix pkgconfig
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	glib20 gtk20 intltool intlhack desktopfileutils
+USE_GNOME=	glib20 gtk20 intltool intlhack
 USE_LDCONFIG=	yes
 USE_PERL5=	yes
 USE_XFCE=	configenv garcon libexo libmenu libutil xfconf
 USE_XORG=	x11 sm
 
-CONFIGURE_ARGS+=--enable-gio-unix \
-		--disable-gtk-doc-html
+CONFIGURE_ARGS+=--enable-gio-unix
 
 OPTIONS_DEFINE=		NLS DOCS
 
@@ -50,13 +49,4 @@ CONFIGURE_ARGS+=--without-html-dir
 PLIST_SUB+=	APIDOCS="@comment "
 .endif
 
-post-patch:
-.if empty(PORT_OPTIONS:MNLS)
-	@${REINPLACE_CMD} -e 's|	icons \\|	icons|' \
-	    -e 's|	po||' ${WRKSRC}/Makefile.in
-.endif
-
-post-install:
-	@-update-desktop-database
-
 .include <bsd.port.mk>

Modified: head/x11-wm/xfce4-panel/distinfo
==============================================================================
--- head/x11-wm/xfce4-panel/distinfo	Wed May  8 15:40:14 2013	(r317686)
+++ head/x11-wm/xfce4-panel/distinfo	Wed May  8 15:42:11 2013	(r317687)
@@ -1,2 +1,2 @@
-SHA256 (xfce4/xfce4-panel-4.10.0.tar.bz2) = 3321f998af2bbd14ba68654a8881774f6ea2ec4f1a3544598e7f47d3ed0009b9
-SIZE (xfce4/xfce4-panel-4.10.0.tar.bz2) = 1036257
+SHA256 (xfce4/xfce4-panel-4.10.1.tar.bz2) = 573052ed1b65e247415f92df120c8a78f9e4152c2636d38c923f82e32b8475d6
+SIZE (xfce4/xfce4-panel-4.10.1.tar.bz2) = 1061090

Added: head/x11-wm/xfce4-panel/files/patch-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-wm/xfce4-panel/files/patch-configure	Wed May  8 15:42:11 2013	(r317687)
@@ -0,0 +1,11 @@
+--- ./configure.orig	2013-05-05 15:47:13.000000000 +0000
++++ ./configure	2013-05-05 21:39:20.000000000 +0000
+@@ -13517,7 +13517,7 @@
+ 
+     fi
+   fi
+-     USE_NLS=yes
++#     USE_NLS=yes
+ 
+ 
+     gt_cv_have_gettext=no

Modified: head/x11-wm/xfce4-panel/pkg-plist
==============================================================================
--- head/x11-wm/xfce4-panel/pkg-plist	Wed May  8 15:40:14 2013	(r317686)
+++ head/x11-wm/xfce4-panel/pkg-plist	Wed May  8 15:42:11 2013	(r317687)
@@ -138,6 +138,7 @@ share/icons/hicolor/scalable/apps/xfce4-
 %%NLS%%share/locale/si/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/sq/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/ta/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/te/LC_MESSAGES/xfce4-panel.mo
@@ -199,5 +200,3 @@ share/xfce4/panel/plugins/windowmenu.des
 @dirrmtry etc/xdg/xfce4/panel
 @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