Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 4 Feb 2011 21:53:41 GMT
From:      Olivier Duchateau <duchateau.olivier@gmail.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/154516: [UPDATE] net-im/pino to 0.2.11, now runs with vala 0.10.x
Message-ID:  <201102042153.p14LrfmG060131@red.freebsd.org>
Resent-Message-ID: <201102042200.p14M0LIm081205@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         154516
>Category:       ports
>Synopsis:       [UPDATE] net-im/pino to 0.2.11, now runs with vala 0.10.x
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Feb 04 22:00:20 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Olivier Duchateau
>Release:        FreeBSD 8.1-RELEASE
>Organization:
>Environment:
FreeBSD bornem.errements.net 8.1-RELEASE FreeBSD 8.1-RELEASE #0: Mon Jul 19 02:55:53 UTC 2010     root@almeida.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC  i386
>Description:

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -urN /usr/ports/net-im/pino/Makefile pino/Makefile
--- /usr/ports/net-im/pino/Makefile	2010-11-20 16:36:50.000000000 +0100
+++ pino/Makefile	2011-02-04 22:38:56.000000000 +0100
@@ -6,15 +6,14 @@
 #
 
 PORTNAME=	pino
-PORTVERSION=	0.2.8
-PORTREVISION=	1
+PORTVERSION=	0.2.11
 CATEGORIES=	net-im
 MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A simple and fast Twitter and Identi.ca client
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/valac:${PORTSDIR}/lang/vala
+BUILD_DEPENDS=	valac:${PORTSDIR}/lang/vala
 LIB_DEPENDS=	gee.2:${PORTSDIR}/devel/libgee \
 		gtkspell.0:${PORTSDIR}/textproc/gtkspell \
 		notify.1:${PORTSDIR}/devel/libnotify \
@@ -22,26 +21,38 @@
 		unique-1.0.2:${PORTSDIR}/x11-toolkits/unique \
 		webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2
 
-BROKEN=		Doesn't build with vala-0.10
+LICENSE=	LGPL3
+
+WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION:S/11/10/}
 
 PROJECTHOST=	pino-twitter
-USE_GNOME=	gnomehack intltool libxml2 gtk20 glib20
+USE_GNOME=	gnomehack desktopfileutils intltool intlhack libxml2 gtk20 \
+		glib20 pkgconfig
 USE_GETTEXT=	yes
 USE_PYTHON_BUILD=	yes
 USE_BZIP2=	yes
 INSTALLS_ICONS=	yes
 
+CONFIGURE_ARGS+=	--prefix=${PREFIX} \
+		--disable-ubuntuicons
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|/usr|${PREFIX}|g' \
+	@${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' \
 		${WRKSRC}/indicator/pino
+	@${REINPLACE_CMD} -e 's|%%PORTVERSION%%|${PORTVERSION}|' \
+		${WRKSRC}/wscript
 
 do-configure:
-	@cd ${WRKSRC} && ./waf configure --prefix="${PREFIX}"
+	@cd ${WRKSRC} && ${SETENV} ${PYTHON_CMD} waf configure \
+		${CONFIGURE_ARGS} && ${TRUE}
 
 do-build:
-	@cd ${WRKSRC} && ./waf build
+	@cd ${WRKSRC} && ${SETENV} ${PYTHON_CMD} waf build && ${TRUE} 
 
 do-install:
-	@cd ${WRKSRC} && ./waf install
+	@cd ${WRKSRC} && ${SETENV} ${PYTHON_CMD} waf install && ${TRUE}
+
+post-install:
+	@-update-desktop-database
 
 .include <bsd.port.mk>
diff -urN /usr/ports/net-im/pino/distinfo pino/distinfo
--- /usr/ports/net-im/pino/distinfo	2010-05-09 15:19:52.000000000 +0200
+++ pino/distinfo	2011-02-03 22:46:29.000000000 +0100
@@ -1,3 +1,2 @@
-MD5 (pino-0.2.8.tar.bz2) = 6b7ef6e9b491d67bd698e1a582206d4b
-SHA256 (pino-0.2.8.tar.bz2) = 9f2795a2d6a999a3f5b32eadec0db73a2273af12c22f9183ce20962edbc6ff6e
-SIZE (pino-0.2.8.tar.bz2) = 205613
+SHA256 (pino-0.2.11.tar.bz2) = 9a1e5d8c3c2811ddfd1110af7f3b298466eee723d208ef7dd22b6040000ca5e6
+SIZE (pino-0.2.11.tar.bz2) = 227086
diff -urN /usr/ports/net-im/pino/files/patch-pino.desktop pino/files/patch-pino.desktop
--- /usr/ports/net-im/pino/files/patch-pino.desktop	1970-01-01 01:00:00.000000000 +0100
+++ pino/files/patch-pino.desktop	2011-02-03 22:46:29.000000000 +0100
@@ -0,0 +1,17 @@
+--- pino.desktop.orig	2010-07-03 12:46:02.000000000 +0200
++++ pino.desktop	2011-02-03 21:55:54.000000000 +0100
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Exec=pino
+ Name=Pino - Twitter and Identi.ca client
++Name[fr]=Pino - client pour Twitter et Identi.ca 
+ Name[ua]=Pino - клієнт для Twitter і Identi.ca
+ Name[ru]=Pino - клиент для Twitter и Identi.ca
+ Icon=pino
+@@ -12,5 +13,6 @@
+ GenericName=Twitter Client
+ GenericName[ua]=Pino
+ GenericName[ru]=Pino
++GenericName[fr]=Pino
+ Terminal=false
+ StartupNotify=true
diff -urN /usr/ports/net-im/pino/files/patch-src_account_action.vala pino/files/patch-src_account_action.vala
--- /usr/ports/net-im/pino/files/patch-src_account_action.vala	1970-01-01 01:00:00.000000000 +0100
+++ pino/files/patch-src_account_action.vala	2011-02-03 22:46:29.000000000 +0100
@@ -0,0 +1,19 @@
+--- src/account_action.vala.orig	2010-05-14 12:38:02.000000000 +0200
++++ src/account_action.vala	2011-02-03 21:31:03.000000000 +0100
+@@ -19,6 +19,7 @@
+  * 	troorl <troorl@gmail.com>
+  */
+ 
++using GLib;
+ using Gtk;
+ using Gee;
+ using Auth;
+@@ -38,7 +39,7 @@
+ 	weak Thread thread_1;
+ 	
+ 	public AccountAction() {
+-		name = "AccountAct";
++		GLib.Object (name: "AccountAct");
+ 		label = _("Accounts");
+ 		tooltip = null;
+ 		stock_id = null;
diff -urN /usr/ports/net-im/pino/files/patch-src_gtk_style.vala pino/files/patch-src_gtk_style.vala
--- /usr/ports/net-im/pino/files/patch-src_gtk_style.vala	1970-01-01 01:00:00.000000000 +0100
+++ pino/files/patch-src_gtk_style.vala	2011-02-03 22:46:29.000000000 +0100
@@ -0,0 +1,11 @@
+--- src/gtk_style.vala.orig	2010-05-14 12:38:02.000000000 +0200
++++ src/gtk_style.vala	2011-02-03 20:40:29.000000000 +0100
+@@ -41,7 +41,7 @@
+ 		fg_color = rgb_to_hex(style.fg[Gtk.StateType.NORMAL]);
+ 		sl_color = rgb_to_hex(style.bg[Gtk.StateType.SELECTED]);
+ 		
+-		Value v = new Value(typeof(Gdk.Color));// = null;
++		Value v = Value(typeof(Gdk.Color));// = null;
+ 		style.get_style_property(typeof(Gtk.Widget), "link-color", v);
+ 		lk_color = rgb_to_hex((Gdk.Color) v);
+ 		
diff -urN /usr/ports/net-im/pino/files/patch-src_more_window.vala pino/files/patch-src_more_window.vala
--- /usr/ports/net-im/pino/files/patch-src_more_window.vala	1970-01-01 01:00:00.000000000 +0100
+++ pino/files/patch-src_more_window.vala	2011-02-03 22:46:29.000000000 +0100
@@ -0,0 +1,11 @@
+--- src/more_window.vala.orig	2010-05-14 12:38:02.000000000 +0200
++++ src/more_window.vala	2011-02-03 19:59:07.000000000 +0100
+@@ -28,7 +28,7 @@
+ 	public signal void moar_event();
+ 	
+ 	public MoreWindow() {
+-		type = WindowType.POPUP;
++		GLib.Object (type: WindowType.POPUP);
+ 		
+ 		//set_position(WindowPosition.MOUSE);
+ 		
diff -urN /usr/ports/net-im/pino/files/patch-src_popups.vala pino/files/patch-src_popups.vala
--- /usr/ports/net-im/pino/files/patch-src_popups.vala	1970-01-01 01:00:00.000000000 +0100
+++ pino/files/patch-src_popups.vala	2011-02-03 22:46:29.000000000 +0100
@@ -0,0 +1,11 @@
+--- src/popups.vala.orig	2010-05-14 12:38:02.000000000 +0200
++++ src/popups.vala	2011-02-03 21:02:59.000000000 +0100
+@@ -68,6 +68,8 @@
+ 	}
+ 	
+ 	private void show_popup(Status status, bool direct = false) {
++		if(login.up() == status.user_screen_name.up())
++			return;
+ 		string head = status.user_screen_name;
+ 		if(prefs.fullNames)
+ 			head = status.user_name;
diff -urN /usr/ports/net-im/pino/files/patch-src_re_tweet.vala pino/files/patch-src_re_tweet.vala
--- /usr/ports/net-im/pino/files/patch-src_re_tweet.vala	1970-01-01 01:00:00.000000000 +0100
+++ pino/files/patch-src_re_tweet.vala	2011-02-03 22:46:29.000000000 +0100
@@ -0,0 +1,20 @@
+--- src/re_tweet.vala.orig	2010-05-14 13:09:20.000000000 +0200
++++ src/re_tweet.vala	2011-02-03 20:24:11.000000000 +0100
+@@ -30,7 +30,7 @@
+ 	
+ 	private static enum State { NEW, REPLY, DIRECT_REPLY, RETWEET }
+ 	
+-	private State state;
++	private new State state;
+ 	
+ 	private RestAPIRe api;
+ 	
+@@ -56,7 +56,7 @@
+ 	
+ 	private DmEntry direct_entry;
+ 	private ToolButton close_btn;
+-	private Window parent;
++	private new Window parent;
+ 	private Prefs prefs;
+ 	private UrlShort url_short;
+ 	private string reply_id = "";
diff -urN /usr/ports/net-im/pino/files/patch-wscript pino/files/patch-wscript
--- /usr/ports/net-im/pino/files/patch-wscript	1970-01-01 01:00:00.000000000 +0100
+++ pino/files/patch-wscript	2011-02-03 22:46:29.000000000 +0100
@@ -0,0 +1,211 @@
+--- wscript.orig	2010-05-26 12:23:51.000000000 +0200
++++ wscript	2011-02-03 22:01:25.000000000 +0100
+@@ -1,8 +1,11 @@
+ #!/usr/bin/env python
+ 
+-import intltool
++import os
++import re
+ 
+-VERSION = "0.2.10"
++import Options 
++
++VERSION = "%%PORTVERSION%%"
+ VERSION_MAJOR_MINOR =  ".".join(VERSION.split(".")[0:2])
+ APPNAME = "pino"
+ 
+@@ -12,12 +15,33 @@
+ def set_options(opt):
+ 	opt.tool_options('compiler_cc')
+ 	opt.tool_options('gnu_dirs')
+-	opt.add_option('--ubuntuicons', action = 'store_true', default = False,
+-		help = 'Install icons for Ubuntu mono themes')
+-	opt.add_option('--debug', action = 'store_true', default = False,
+-		help = 'Enable debug messages')
++	opt.parser.remove_option('--oldincludedir')
++	opt.parser.remove_option('--htmldir')
++	opt.parser.remove_option('--dvidir')
++	opt.parser.remove_option('--psdir')
++	opt.parser.remove_option('--pdfdir')
++	# Optional options
++	opt.add_option('--enable-ubuntuicons', action='store_true', default=False,
++		help = 'Install Ubuntu icons theme', 
++		dest='enable_ubuntuicons')
++	opt.add_option('--disable-ubuntuicons', action='store_true', default=True,
++		help='Does not install Ubuntu icons theme',
++		dest='disable_ubuntuicons')
++	opt.add_option('--enable-libindicate', action='store_true', default=False,
++		help='Enable libindicate support [default=no]',
++		dest='enable_libindicate')
++	opt.add_option('--enable-debug', action='store_true', default=False,
++		help='Enable debug messages',
++		dest='enable_debug')
+ 
+ def configure(conf):
++	conf.define('DATADIR', os.path.join(conf.env['PREFIX'], 'share'))
++	conf.define('DOCDIR', os.path.join(conf.env['DATADIR'], 'doc', APPNAME))
++	conf.define('LOCALEDIR', os.path.join(conf.env['DATADIR'], 'locale'))
++
++	_icons_dir = os.path.join(conf.env['DATADIR'], 'icons/hicolor')
++	_app_dir = os.path.join(conf.env['DATADIR'], APPNAME) 
++	
+ 	conf.check_tool('compiler_cc vala gnu_dirs intltool')
+ 	conf.check_cfg(package='glib-2.0', uselib_store='GLIB',
+ 		atleast_version='2.14.0', mandatory=True, args='--cflags --libs')
+@@ -43,8 +67,10 @@
+ 		atleast_version='1.0', mandatory=True, args='--cflags --libs')
+ 	conf.check_cfg(package='gtkspell-2.0', uselib_store='GTKSPELL',
+ 		atleast_version='2.0', mandatory=True, args='--cflags --libs')
+-	conf.check_cfg(package='indicate', uselib_store='LIBINDICATE',
+-		atleast_version='0.3', mandatory=False, args='--cflags --libs')
++	# Check only if libindicate is enabled
++	if Options.options.enable_libindicate:
++		conf.check_cfg(package='indicate', uselib_store='LIBINDICATE',
++			atleast_version='0.3', mandatory=False, args='--cflags --libs')
+ 
+ 	conf.env.append_value('CCFLAGS', '-std=c99')
+ 	
+@@ -54,34 +80,35 @@
+ 	conf.define('PACKAGE_VERSION', APPNAME + '-' + VERSION)
+ 
+ 	conf.define('APP_VERSION', VERSION)
+-	conf.define('DESKTOP_FILE_PATH', conf.env.PREFIX + '/share/applications/pino.desktop')
+-	conf.define('APP_PATH', conf.env.PREFIX + '/bin/pino')
+-	conf.define('LOGO_PATH', conf.env.PREFIX + '/share/icons/hicolor/scalable/apps/pino.svg')
+-	conf.define('LOGO_FRESH_PATH', conf.env.PREFIX + '/share/icons/hicolor/scalable/apps/pino_fresh.svg')
+-	conf.define('MENTIONS_PATH', conf.env.PREFIX + '/share/pino/icons/mentions.svg')
+-	conf.define('MENTIONS_FRESH_PATH', conf.env.PREFIX + '/share/pino/icons/mentions_fresh.svg')
+-	conf.define('TIMELINE_PATH', conf.env.PREFIX + '/share/pino/icons/timeline.svg')
+-	conf.define('TIMELINE_FRESH_PATH', conf.env.PREFIX + '/share/pino/icons/timeline_fresh.svg')
+-	conf.define('DIRECT_PATH', conf.env.PREFIX + '/share/pino/icons/direct.svg')
+-	conf.define('DIRECT_FRESH_PATH', conf.env.PREFIX + '/share/pino/icons/direct_fresh.svg')
+-	conf.define('PROGRESS_PATH', conf.env.PREFIX + '/share/pino/icons/progress.gif')
+-	conf.define('DIRECT_REPLY_PATH', conf.env.PREFIX + '/share/pino/icons/direct_reply.png')
+-	conf.define('FAVORITE_PATH', conf.env.PREFIX + '/share/pino/icons/favorite.png')
+-	conf.define('FAVORITE_NO_PATH', conf.env.PREFIX + '/share/pino/icons/favorite_no.png')
+-	#conf.define('FAVORITE_MENU_PATH', conf.env.PREFIX + '/share/pino/icons/favorite_menu.svg')
+-	conf.define('REPLY_PATH', conf.env.PREFIX + '/share/pino/icons/reply.png')
+-	conf.define('RETWEET_PATH', conf.env.PREFIX + '/share/pino/icons/re_tweet.png')
+-	conf.define('DELETE_PATH', conf.env.PREFIX + '/share/pino/icons/delete_status.png')
+-	conf.define('USERPIC_PATH', conf.env.PREFIX + '/share/pino/icons/userpic.svg')
+-	conf.define('TEMPLATES_PATH', conf.env.PREFIX + '/share/pino/templates')
++	conf.define('DESKTOP_FILE_PATH', 
++		conf.env['DATADIR'] + '/applications/' + APPNAME + '.desktop')
++	conf.define('APP_PATH', conf.env['PREFIX'] + '/bin/' + APPNAME)
++	conf.define('LOGO_PATH', _icons_dir + '/scalable/apps/pino.svg')
++	conf.define('LOGO_FRESH_PATH', _icons_dir + '/scalable/apps/pino_fresh.svg')
++	conf.define('MENTIONS_PATH', _app_dir + '/icons/mentions.svg')
++	conf.define('MENTIONS_FRESH_PATH', _app_dir + '/icons/mentions_fresh.svg')
++	conf.define('TIMELINE_PATH', _app_dir + '/icons/timeline.svg')
++	conf.define('TIMELINE_FRESH_PATH', _app_dir + '/icons/timeline_fresh.svg')
++	conf.define('DIRECT_PATH', _app_dir + '/icons/direct.svg')
++	conf.define('DIRECT_FRESH_PATH', _app_dir + '/icons/direct_fresh.svg')
++	conf.define('PROGRESS_PATH', _app_dir + '/icons/progress.gif')
++	conf.define('DIRECT_REPLY_PATH', _app_dir + '/icons/direct_reply.png')
++	conf.define('FAVORITE_PATH', _app_dir + '/icons/favorite.png')
++	conf.define('FAVORITE_NO_PATH', _app_dir + '/icons/favorite_no.png')
++	conf.define('REPLY_PATH', _app_dir + '/icons/reply.png')
++	conf.define('RETWEET_PATH', _app_dir + '/icons/re_tweet.png')
++	conf.define('DELETE_PATH', _app_dir + '/icons/delete_status.png')
++	conf.define('USERPIC_PATH', _app_dir + '/icons/userpic.svg')
++	conf.define('TEMPLATES_PATH', _app_dir + '/templates')
+ 	conf.define('VERSION_MAJOR_MINOR', VERSION_MAJOR_MINOR)
+-	conf.define('LOCALE_DIR', conf.env.PREFIX + '/share/locale/')
++	conf.define('LOCALE_DIR', conf.env['LOCALEDIR'])
+ 	conf.define('GETTEXT_PACKAGE', APPNAME)
+ 	conf.define('APPNAME', APPNAME)
+ 
+-	import Options
+-	conf.env.UBUNTUICONS = Options.options.ubuntuicons
+-	conf.env.DEBUG = Options.options.debug
++	if Options.options.enable_ubuntuicons:
++		conf.define('UBUNTUICONS', 1)
++	if Options.options.enable_debug:
++		conf.define('DEBUG', 1)
+ 	conf.define('CONS_KEY', 'k6R1A0PPkmpRcThEdPF1Q')
+ 	conf.define('CONS_SEC', 'TKneXwqslxkbaR3RQGcvvvGU4Qk01qh8HAhRIMN74')
+ 	
+@@ -89,7 +116,6 @@
+ 	f = open('AUTHORS', 'r')
+ 	data = f.read()
+ 	f.close()
+-	import re
+ 	data = re.sub(r'\n', r'\\n', data)
+ 	conf.define('AUTHORS', data)
+ 	#end
+@@ -99,7 +125,6 @@
+ 
+ def init_defs(prefix):
+ 	"""
+-	import re
+ 	data = re.sub(r'string PREFIX = \"(.*)\";', 'string PREFIX = "' + prefix + '";', data)
+ 	
+ 	f = open('src/defs.vala', 'w')
+@@ -113,34 +138,41 @@
+ 	bld.add_subdirs('templates')
+ 	bld.add_subdirs('po')
+ 	
+-	bld.install_files('${PREFIX}/share/icons/hicolor/scalable/apps', 'img/pino.svg')
+-	bld.install_files('${PREFIX}/share/icons/hicolor/scalable/apps', 'img/pino_fresh.svg')
+-	bld.install_files('${PREFIX}/share/pino/icons', 'img/mentions.svg')
+-	bld.install_files('${PREFIX}/share/pino/icons', 'img/mentions_fresh.svg')
+-	bld.install_files('${PREFIX}/share/pino/icons', 'img/timeline.svg')
+-	bld.install_files('${PREFIX}/share/pino/icons', 'img/timeline_fresh.svg')
+-	bld.install_files('${PREFIX}/share/pino/icons', 'img/direct.svg')
+-	bld.install_files('${PREFIX}/share/pino/icons', 'img/direct_fresh.svg')
+-	bld.install_files('${PREFIX}/share/pino/icons', 'img/progress.gif')
+-	bld.install_files('${PREFIX}/share/pino/icons', 'img/direct_reply.png')
+-	bld.install_files('${PREFIX}/share/pino/icons', 'img/favorite.png')
+-	bld.install_files('${PREFIX}/share/pino/icons', 'img/favorite_no.png')
+-	#bld.install_files('${PREFIX}/share/pino/icons', 'img/favorite_menu.svg')
+-	bld.install_files('${PREFIX}/share/pino/icons', 'img/reply.png')
+-	bld.install_files('${PREFIX}/share/pino/icons', 'img/re_tweet.png')
+-	bld.install_files('${PREFIX}/share/pino/icons', 'img/delete_status.png')
+-	bld.install_files('${PREFIX}/share/pino/icons', 'img/userpic.svg')
+-	bld.install_files('${PREFIX}/share/applications', 'pino.desktop')
+-	bld.install_files('${PREFIX}/share/doc/pino', 'COPYING README AUTHORS INSTALL')
+-	bld.install_files('${PREFIX}/share/indicators/messages/applications', 'indicator/pino')
++	bld.install_files('${DATADIR}/icons/hicolor/scalable/apps', 'img/pino.svg')
++	bld.install_files('${DATADIR}/icons/hicolor/scalable/apps', 'img/pino_fresh.svg')
++
++	bld.install_files('${DATADIR}/pino/icons', 'img/mentions.svg')
++	bld.install_files('${DATADIR}/pino/icons', 'img/mentions_fresh.svg')
++	bld.install_files('${DATADIR}/pino/icons', 'img/timeline.svg')
++	bld.install_files('${DATADIR}/pino/icons', 'img/timeline_fresh.svg')
++	bld.install_files('${DATADIR}/pino/icons', 'img/direct.svg')
++	bld.install_files('${DATADIR}/pino/icons', 'img/direct_fresh.svg')
++	bld.install_files('${DATADIR}/pino/icons', 'img/progress.gif')
++	bld.install_files('${DATADIR}/pino/icons', 'img/direct_reply.png')
++	bld.install_files('${DATADIR}/pino/icons', 'img/favorite.png')
++	bld.install_files('${DATADIR}/pino/icons', 'img/favorite_no.png')
++	bld.install_files('${DATADIR}/pino/icons', 'img/reply.png')
++	bld.install_files('${DATADIR}/pino/icons', 'img/re_tweet.png')
++	bld.install_files('${DATADIR}/pino/icons', 'img/delete_status.png')
++	bld.install_files('${DATADIR}/pino/icons', 'img/userpic.svg')
++
++	bld.install_files('${DATADIR}/applications', APPNAME + '.desktop') 
++
++	bld.install_files('${DOCDIR}/', \
++		'COPYING README AUTHORS INSTALL')
++
++	bld.install_files('${DATADIR}/indicators/messages/applications', \
++		'indicator/pino')
+ 
+ 	if bld.env['UBUNTUICONS']:
+-		bld.install_files('${PREFIX}/share/icons/ubuntu-mono-dark/apps/22', 'img/ubuntu-mono-dark/pino-tray-icon.svg')
+-		bld.install_files('${PREFIX}/share/icons/ubuntu-mono-dark/apps/22', 'img/ubuntu-mono-dark/pino-tray-icon-fresh.svg')
+-		bld.install_files('${PREFIX}/share/icons/ubuntu-mono-light/apps/22', 'img/ubuntu-mono-light/pino-tray-icon.svg')
+-		bld.install_files('${PREFIX}/share/icons/ubuntu-mono-light/apps/22', 'img/ubuntu-mono-light/pino-tray-icon-fresh.svg')
+-	#import subprocess
+-	#subprocess.Popen(['desktop-file-install', '--rebuild-mime-info-cache', bld.env.PREFIX + '/share/applications/pino.desktop'], stdout=subprocess.PIPE)
++		bld.install_files('${DATADIR}/icons/ubuntu-mono-dark/apps/22x22', \
++			'img/ubuntu-mono-dark/pino-tray-icon.svg')
++		bld.install_files('${DATADIR}/icons/ubuntu-mono-dark/apps/22x22', \
++			'img/ubuntu-mono-dark/pino-tray-icon-fresh.svg')
++		bld.install_files('${DATADIR}/icons/ubuntu-mono-light/apps/22x22', \
++			'img/ubuntu-mono-light/pino-tray-icon.svg')
++		bld.install_files('${DATADIR}/icons/ubuntu-mono-light/apps/22x22', \
++			'img/ubuntu-mono-light/pino-tray-icon-fresh.svg')
+ 
+ def shutdown(bld):
+ 	"""
diff -urN /usr/ports/net-im/pino/pkg-plist pino/pkg-plist
--- /usr/ports/net-im/pino/pkg-plist	2010-05-09 15:19:52.000000000 +0200
+++ pino/pkg-plist	2011-02-03 22:46:29.000000000 +0100
@@ -8,60 +8,71 @@
 share/icons/hicolor/scalable/apps/pino_fresh.svg
 share/indicators/messages/applications/pino
 share/locale/ar/LC_MESSAGES/pino.mo
+share/locale/bn_IN/LC_MESSAGES/pino.mo
+share/locale/ca/LC_MESSAGES/pino.mo
 share/locale/cs/LC_MESSAGES/pino.mo
 share/locale/de/LC_MESSAGES/pino.mo
+share/locale/el/LC_MESSAGES/pino.mo
+share/locale/en_GB/LC_MESSAGES/pino.mo
 share/locale/es/LC_MESSAGES/pino.mo
 share/locale/fa/LC_MESSAGES/pino.mo
 share/locale/fr/LC_MESSAGES/pino.mo
 share/locale/gl/LC_MESSAGES/pino.mo
 share/locale/hu/LC_MESSAGES/pino.mo
+share/locale/id/LC_MESSAGES/pino.mo
 share/locale/it/LC_MESSAGES/pino.mo
+share/locale/ja/LC_MESSAGES/pino.mo
+share/locale/ka/LC_MESSAGES/pino.mo
 share/locale/ko_KR/LC_MESSAGES/pino.mo
 share/locale/lv/LC_MESSAGES/pino.mo
+share/locale/mk/LC_MESSAGES/pino.mo
+share/locale/ml/LC_MESSAGES/pino.mo
+share/locale/nb/LC_MESSAGES/pino.mo
 share/locale/nl/LC_MESSAGES/pino.mo
+share/locale/pa/LC_MESSAGES/pino.mo
 share/locale/pl/LC_MESSAGES/pino.mo
 share/locale/pt/LC_MESSAGES/pino.mo
 share/locale/pt_BR/LC_MESSAGES/pino.mo
+share/locale/ro/LC_MESSAGES/pino.mo
 share/locale/ru/LC_MESSAGES/pino.mo
+share/locale/sq/LC_MESSAGES/pino.mo
 share/locale/sr/LC_MESSAGES/pino.mo
 share/locale/sv/LC_MESSAGES/pino.mo
+share/locale/te/LC_MESSAGES/pino.mo
 share/locale/th/LC_MESSAGES/pino.mo
+share/locale/tr/LC_MESSAGES/pino.mo
 share/locale/uk/LC_MESSAGES/pino.mo
 share/locale/zh_CN/LC_MESSAGES/pino.mo
-share/locale/bn_IN/LC_MESSAGES/pino.mo
-share/locale/en_GB/LC_MESSAGES/pino.mo
-share/locale/mk/LC_MESSAGES/pino.mo
-share/locale/ml/LC_MESSAGES/pino.mo
-share/locale/pa/LC_MESSAGES/pino.mo
-share/locale/te/LC_MESSAGES/pino.mo
-share/locale/tr/LC_MESSAGES/pino.mo
-share/locale/ja/LC_MESSAGES/pino.mo
-share/locale/ro/LC_MESSAGES/pino.mo
-%%DATADIR%%/icons/delete_status.png
-%%DATADIR%%/icons/direct.svg
-%%DATADIR%%/icons/direct_fresh.svg
-%%DATADIR%%/icons/direct_reply.png
-%%DATADIR%%/icons/favorite.png
-%%DATADIR%%/icons/favorite_no.png
-%%DATADIR%%/icons/mentions.svg
-%%DATADIR%%/icons/mentions_fresh.svg
-%%DATADIR%%/icons/progress.gif
-%%DATADIR%%/icons/re_tweet.png
-%%DATADIR%%/icons/reply.png
-%%DATADIR%%/icons/timeline.svg
-%%DATADIR%%/icons/timeline_fresh.svg
-%%DATADIR%%/icons/userpic.svg
-%%DATADIR%%/templates/main.tpl
-%%DATADIR%%/templates/status.tpl
-%%DATADIR%%/templates/status_direct.tpl
-%%DATADIR%%/templates/status_me.tpl
-@dirrm %%DATADIR%%/templates
-@dirrm %%DATADIR%%/icons
-@dirrm %%DATADIR%%
-@dirrm %%DOCSDIR%%
+share/pino/icons/delete_status.png
+share/pino/icons/direct.svg
+share/pino/icons/direct_fresh.svg
+share/pino/icons/direct_reply.png
+share/pino/icons/favorite.png
+share/pino/icons/favorite_no.png
+share/pino/icons/mentions.svg
+share/pino/icons/mentions_fresh.svg
+share/pino/icons/progress.gif
+share/pino/icons/re_tweet.png
+share/pino/icons/reply.png
+share/pino/icons/timeline.svg
+share/pino/icons/timeline_fresh.svg
+share/pino/icons/userpic.svg
+share/pino/templates/main.tpl
+share/pino/templates/status.tpl
+share/pino/templates/status_direct.tpl
+share/pino/templates/status_me.tpl
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrm share/pino/templates
+@dirrm share/pino/icons
+@dirrm share/pino
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
 @dirrmtry share/locale/ko_KR/LC_MESSAGES
 @dirrmtry share/locale/ko_KR
-@dirrmtry share/indicators/messages/applications
-@dirrmtry share/indicators/messages
-@dirrmtry share/indicators
-@dirrmtry share/applications
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrm share/indicators/messages/applications
+@dirrm share/indicators/messages
+@dirrm share/indicators
+@dirrm %%DOCSDIR%%


>Release-Note:
>Audit-Trail:
>Unformatted:



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