svn commit: r385482 - in head/x11-wm/plank: . files

[Olivier Duchateau]

Author: olivierd
Date: Tue May  5 19:00:05 2015
New Revision: 385482
URL: https://svnweb.freebsd.org/changeset/ports/385482

Log:
  Update to 0.9.1

Added:
  head/x11-wm/plank/files/patch-config.h.in   (contents, props changed)
  head/x11-wm/plank/files/patch-configure   (contents, props changed)
  head/x11-wm/plank/files/patch-vapi_config.vapi   (contents, props changed)
Deleted:
  head/x11-wm/plank/files/patch-data__Makefile.in
Modified:
  head/x11-wm/plank/Makefile
  head/x11-wm/plank/distinfo
  head/x11-wm/plank/files/patch-lib_Widgets_PreferencesWindow.vala
  head/x11-wm/plank/pkg-plist

Modified: head/x11-wm/plank/Makefile
==============================================================================
--- head/x11-wm/plank/Makefile	Tue May  5 18:47:37 2015	(r385481)
+++ head/x11-wm/plank/Makefile	Tue May  5 19:00:05 2015	(r385482)
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	plank
-PORTVERSION=	0.9.0
+PORTVERSION=	0.9.1
 CATEGORIES=	x11-wm
-MASTER_SITES=	https://launchpadlibrarian.net/202964163/ \
+MASTER_SITES=	https://launchpadlibrarian.net/205431962/ \
 	https://launchpad.net/${PORTNAME}/1.0/${PORTVERSION}/+download/
 
 MAINTAINER=	olivierd at FreeBSD.org
@@ -25,6 +25,7 @@ CFLAGS+=	-Wno-return-type
 USE_GNOME=	glib20 gtk30 gdkpixbuf2 intlhack libxml2 libwnck3
 USE_XORG=	x11 xfixes xi
 INSTALLS_ICONS=	yes
+INSTALL_TARGET=	install-strip
 OPTIONS_SUB=	yes
 
 OPTIONS_DEFINE=	NLS DBUSMENU
@@ -42,8 +43,4 @@ NLS_CONFIGURE_ENABLE=	nls
 DBUSMENU_LIB_DEPENDS=		libdbusmenu-gtk3.so:${PORTSDIR}/devel/libdbusmenu
 DBUSMENU_CONFIGURE_ENABLE=	dbusmenu
 
-post-patch:
-	${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \
-		${WRKSRC}/lib/Widgets/PreferencesWindow.vala
-
 .include <bsd.port.mk>

Modified: head/x11-wm/plank/distinfo
==============================================================================
--- head/x11-wm/plank/distinfo	Tue May  5 18:47:37 2015	(r385481)
+++ head/x11-wm/plank/distinfo	Tue May  5 19:00:05 2015	(r385482)
@@ -1,2 +1,2 @@
-SHA256 (plank-0.9.0.tar.xz) = 3a878a393a1e274d44ee88e80e879d30132af1cb1e76c4274dde16666a01a0d4
-SIZE (plank-0.9.0.tar.xz) = 898700
+SHA256 (plank-0.9.1.tar.xz) = 884cd57a0fcc78cf82cf01072dedc46c34b6f766871d5f773b68ee498fded9a2
+SIZE (plank-0.9.1.tar.xz) = 904056

Added: head/x11-wm/plank/files/patch-config.h.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-wm/plank/files/patch-config.h.in	Tue May  5 19:00:05 2015	(r385482)
@@ -0,0 +1,10 @@
+--- config.h.in.orig	2015-05-02 15:04:04 UTC
++++ config.h.in
+@@ -1,5 +1,7 @@
+ /* config.h.in.  Generated from configure.ac by autoheader.  */
+ 
++#undef INSTALL_PREFIX
++
+ /* Define the gettext package to be used */
+ #undef GETTEXT_PACKAGE
+ 

Added: head/x11-wm/plank/files/patch-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-wm/plank/files/patch-configure	Tue May  5 19:00:05 2015	(r385482)
@@ -0,0 +1,20 @@
+--- configure.orig	2015-05-02 15:04:03 UTC
++++ configure
+@@ -797,6 +797,7 @@ PLANK_MICRO_VERSION
+ PLANK_MINOR_VERSION
+ PLANK_MAJOR_VERSION
+ PLANK_MAJOR_MINOR_VERSION
++INSTALL_PREFIX
+ LT_AGE
+ LT_REVISION
+ LT_CURRENT
+@@ -2330,6 +2331,9 @@ cat >>confdefs.h <<_ACEOF
+ #define PACKAGE_URL "$PACKAGE_URL"
+ _ACEOF
+ 
++cat >>confdefs.h <<_ACEOF
++#define INSTALL_PREFIX "${prefix}"
++_ACEOF
+ 
+ # Let the site file select an alternate cache file if it wants to.
+ # Prefer an explicitly selected file to automatically selected ones.

Modified: head/x11-wm/plank/files/patch-lib_Widgets_PreferencesWindow.vala
==============================================================================
--- head/x11-wm/plank/files/patch-lib_Widgets_PreferencesWindow.vala	Tue May  5 18:47:37 2015	(r385481)
+++ head/x11-wm/plank/files/patch-lib_Widgets_PreferencesWindow.vala	Tue May  5 19:00:05 2015	(r385482)
@@ -5,10 +5,10 @@
  		construct
  		{
 +			GLib.Intl.setlocale (LocaleCategory.ALL, "");
-+			string langpack_dir = GLib.Path.build_filename ("%%PREFIX%%", "share", "locale");
-+			GLib.Intl.bindtextdomain ("plank", langpack_dir);
-+			GLib.Intl.bind_textdomain_codeset ("plank", "UTF-8");
-+			GLib.Intl.textdomain ("plank");
++			string langpack_dir = GLib.Path.build_filename (Build.INSTALL_PREFIX, "share", "locale");
++			GLib.Intl.bindtextdomain (Build.GETTEXT_PACKAGE, langpack_dir);
++			GLib.Intl.bind_textdomain_codeset (Build.GETTEXT_PACKAGE, "UTF-8");
++			GLib.Intl.textdomain (Build.GETTEXT_PACKAGE);
 +			
  			skip_pager_hint = true;
  			skip_taskbar_hint = true;

Added: head/x11-wm/plank/files/patch-vapi_config.vapi
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-wm/plank/files/patch-vapi_config.vapi	Tue May  5 19:00:05 2015	(r385482)
@@ -0,0 +1,11 @@
+--- vapi/config.vapi.orig	2015-04-27 13:44:43 UTC
++++ vapi/config.vapi
+@@ -32,6 +32,8 @@ namespace Build
+ 	public const string VERSION;
+ 	public const string VERSION_INFO;
+ 
++	public const string INSTALL_PREFIX;
++
+ 	public const uint VERSION_MAJOR;
+ 	public const uint VERSION_MINOR;
+ 	public const uint VERSION_MICRO;

Modified: head/x11-wm/plank/pkg-plist
==============================================================================
--- head/x11-wm/plank/pkg-plist	Tue May  5 18:47:37 2015	(r385481)
+++ head/x11-wm/plank/pkg-plist	Tue May  5 19:00:05 2015	(r385482)
@@ -5,6 +5,7 @@ lib/libplank.so.0
 lib/libplank.so.0.0.0
 libdata/pkgconfig/plank.pc
 man/man1/plank.1.gz
+share/appdata/plank.appdata.xml
 share/applications/plank.desktop
 share/icons/hicolor/128x128/apps/plank.svg
 share/icons/hicolor/16x16/apps/plank.svg