From owner-svn-ports-head@FreeBSD.ORG Sun Sep 2 05:29:19 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4FA95106564A; Sun, 2 Sep 2012 05:29:19 +0000 (UTC) (envelope-from rm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 39D9A8FC15; Sun, 2 Sep 2012 05:29:19 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q825TIuc045245; Sun, 2 Sep 2012 05:29:18 GMT (envelope-from rm@svn.freebsd.org) Received: (from rm@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q825TIfv045239; Sun, 2 Sep 2012 05:29:18 GMT (envelope-from rm@svn.freebsd.org) Message-Id: <201209020529.q825TIfv045239@svn.freebsd.org> From: Ruslan Mahmatkhanov Date: Sun, 2 Sep 2012 05:29:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r303531 - in head/net-im/gajim: . files X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Sep 2012 05:29:19 -0000 Author: rm Date: Sun Sep 2 05:29:18 2012 New Revision: 303531 URL: http://svn.freebsd.org/changeset/ports/303531 Log: - update to 0.15.1 - convert to optionsNG - remove Makefile header - fix portlint warning (invoking DOS2UNIX where appropriate) - tab -> space in pkg-descr:WWW Changelog: http://hg.gajim.org/gajim/file/gajim-0.15.1/ChangeLog Modified: head/net-im/gajim/Makefile head/net-im/gajim/distinfo head/net-im/gajim/files/patch-src-plugins_plugins_i18n.py head/net-im/gajim/pkg-descr head/net-im/gajim/pkg-plist Modified: head/net-im/gajim/Makefile ============================================================================== --- head/net-im/gajim/Makefile Sun Sep 2 05:15:16 2012 (r303530) +++ head/net-im/gajim/Makefile Sun Sep 2 05:29:18 2012 (r303531) @@ -1,13 +1,7 @@ -# New ports collection makefile for: gajim -# Date created: Sun Nov 26 16:36:07 MSK 2006 -# Whom: Denis Shaposhnikov -# # $FreeBSD$ -# PORTNAME= gajim -PORTVERSION= 0.15 -PORTREVISION= 2 +PORTVERSION= 0.15.1 CATEGORIES= net-im MASTER_SITES= http://www.gajim.org/downloads/0.15/ @@ -26,6 +20,7 @@ FETCH_ARGS= -Fpr GNU_CONFIGURE= yes INSTALLS_ICONS= yes USE_BZIP2= yes +USE_DOS2UNIX= src/plugins/plugins_i18n.py USE_GMAKE= yes USE_GNOME= pygtk2 USE_PYTHON= -2.7 @@ -35,15 +30,15 @@ CONFIGURE_ENV+= PYTHON=${PYTHON_CMD} LDFLAGS+= -L${LOCALBASE}/lib CFLAGS+= -I${LOCALBASE}/include -OPTIONS= CRYPTO "End to end encryption support" Off \ - DBUS "Adds support for D-Bus (Desktop Bus)" On \ - KEYRING "Gnome Keyring support" Off \ - NLS "Native Language Support via gettext utilities" On \ - SPELL "Spell checking support" On +OPTIONS_DEFINE= CRYPTO DBUS KEYRING NLS SPELL +OPTIONS_DEFAULT=DBUS NLS SPELL +CRYPTO_DESC= End to end encryption support +KEYRING_DESC= Gnome Keyring support +SPELL_DESC= Spell checking support .include -.if !defined(WITHOUT_NLS) +.if ${PORT_OPTIONS:MNLS} USE_GETTEXT= yes PLIST_SUB+= NLS="" .else @@ -51,20 +46,20 @@ CONFIGURE_ARGS+= --disable-nls PLIST_SUB+= NLS="@comment " .endif -.if !defined(WITHOUT_DBUS) +.if ${PORT_OPTIONS:MDBUS} RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dbus>=0.82.2:${PORTSDIR}/devel/py-dbus .endif -.if defined(WITH_CRYPTO) -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pycrypto>=0:${PORTSDIR}/security/py-pycrypto +.if ${PORT_OPTIONS:MCRYPTO} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pycrypto>0:${PORTSDIR}/security/py-pycrypto .endif -.if defined(WITH_KEYRING) +.if ${PORT_OPTIONS:MKEYRING} USE_GNOME+= pygnomedesktop .endif -.if defined(WITH_SPELL) -LIB_DEPENDS= gtkspell.0:${PORTSDIR}/textproc/gtkspell +.if ${PORT_OPTIONS:MSPELL} +LIB_DEPENDS= gtkspell:${PORTSDIR}/textproc/gtkspell .endif MAN1= gajim.1 gajim-remote.1 gajim-history-manager.1 Modified: head/net-im/gajim/distinfo ============================================================================== --- head/net-im/gajim/distinfo Sun Sep 2 05:15:16 2012 (r303530) +++ head/net-im/gajim/distinfo Sun Sep 2 05:29:18 2012 (r303531) @@ -1,2 +1,2 @@ -SHA256 (gajim-0.15.tar.bz2) = 1a999aa4ca64a8d048babfc6aa590171191966c342fa7091fc9035b9fc6de8d8 -SIZE (gajim-0.15.tar.bz2) = 4332305 +SHA256 (gajim-0.15.1.tar.bz2) = 530e2fd6b2fb14b0582c8333cd59c751940037fd4c28c59ae643a4ddf0c31f92 +SIZE (gajim-0.15.1.tar.bz2) = 4473442 Modified: head/net-im/gajim/files/patch-src-plugins_plugins_i18n.py ============================================================================== --- head/net-im/gajim/files/patch-src-plugins_plugins_i18n.py Sun Sep 2 05:15:16 2012 (r303530) +++ head/net-im/gajim/files/patch-src-plugins_plugins_i18n.py Sun Sep 2 05:29:18 2012 (r303531) @@ -1,10 +1,10 @@ --- src/plugins/plugins_i18n.py.orig 2012-03-18 15:26:00.000000000 +0400 +++ src/plugins/plugins_i18n.py 2012-03-21 08:21:52.000000000 +0400 @@ -29,7 +29,6 @@ - - if os.name != 'nt': - locale.setlocale(locale.LC_ALL, '') -- locale.bindtextdomain(APP, plugins_locale_dir) - gettext.bindtextdomain(APP, plugins_locale_dir) - gettext.textdomain(APP) - + + if os.name != 'nt': + locale.setlocale(locale.LC_ALL, '') +- locale.bindtextdomain(APP, plugins_locale_dir) + gettext.bindtextdomain(APP, plugins_locale_dir) + gettext.textdomain(APP) + Modified: head/net-im/gajim/pkg-descr ============================================================================== --- head/net-im/gajim/pkg-descr Sun Sep 2 05:15:16 2012 (r303530) +++ head/net-im/gajim/pkg-descr Sun Sep 2 05:29:18 2012 (r303531) @@ -20,4 +20,4 @@ FEATURES: * Other features via plugins * Gajim is available in 25 languages -WWW: http://www.gajim.org/ +WWW: http://www.gajim.org/ Modified: head/net-im/gajim/pkg-plist ============================================================================== --- head/net-im/gajim/pkg-plist Sun Sep 2 05:15:16 2012 (r303530) +++ head/net-im/gajim/pkg-plist Sun Sep 2 05:29:18 2012 (r303531) @@ -837,6 +837,8 @@ share/applications/gajim.desktop %%DATADIR%%/icons/hicolor/16x16/status/audio-mic-volume-low.png %%DATADIR%%/icons/hicolor/16x16/status/audio-mic-volume-medium.png %%DATADIR%%/icons/hicolor/16x16/status/audio-mic-volume-muted.png +%%DATADIR%%/icons/hicolor/32x32/actions/gajim-security_high.png +%%DATADIR%%/icons/hicolor/32x32/actions/gajim-security_low.png %%DATADIR%%/icons/hicolor/32x32/categories/gajim-agent-aim.png %%DATADIR%%/icons/hicolor/32x32/categories/gajim-agent-bytestreams.png %%DATADIR%%/icons/hicolor/32x32/categories/gajim-agent-conference.png @@ -868,8 +870,6 @@ share/applications/gajim.desktop %%DATADIR%%/icons/hicolor/48x48/actions/gajim-gc_invitation.png %%DATADIR%%/icons/hicolor/48x48/actions/gajim-new_email_recv.png %%DATADIR%%/icons/hicolor/48x48/actions/gajim-priv_msg_recv.png -%%DATADIR%%/icons/hicolor/48x48/actions/gajim-security_high.png -%%DATADIR%%/icons/hicolor/48x48/actions/gajim-security_low.png %%DATADIR%%/icons/hicolor/48x48/actions/gajim-single_msg_recv.png %%DATADIR%%/icons/hicolor/48x48/actions/gajim-subscription_request.png %%DATADIR%%/icons/hicolor/48x48/actions/gajim-unsubscribed.png @@ -879,6 +879,7 @@ share/applications/gajim.desktop %%DATADIR%%/plugins/plugin_installer/__init__.py %%DATADIR%%/plugins/plugin_installer/config_dialog.ui %%DATADIR%%/plugins/plugin_installer/manifest.ini +%%DATADIR%%/plugins/plugin_installer/plugin_installer.png %%DATADIR%%/plugins/plugin_installer/plugin_installer.py %%DATADIR%%/src/adhoc_commands.py %%DATADIR%%/src/adhoc_commands.pyc @@ -1319,7 +1320,9 @@ share/icons/hicolor/scalable/apps/gajim. %%NLS%%share/locale/eu/LC_MESSAGES/gajim.mo %%NLS%%share/locale/fr/LC_MESSAGES/gajim.mo %%NLS%%share/locale/gl/LC_MESSAGES/gajim.mo +%%NLS%%share/locale/he/LC_MESSAGES/gajim.mo %%NLS%%share/locale/hr/LC_MESSAGES/gajim.mo +%%NLS%%share/locale/hu/LC_MESSAGES/gajim.mo %%NLS%%share/locale/it/LC_MESSAGES/gajim.mo %%NLS%%share/locale/ja/LC_MESSAGES/gajim.mo %%NLS%%share/locale/kk/LC_MESSAGES/gajim.mo @@ -1335,10 +1338,10 @@ share/icons/hicolor/scalable/apps/gajim. %%NLS%%share/locale/sr/LC_MESSAGES/gajim.mo %%NLS%%share/locale/sr@Latn/LC_MESSAGES/gajim.mo %%NLS%%share/locale/sv/LC_MESSAGES/gajim.mo +%%NLS%%share/locale/tr/LC_MESSAGES/gajim.mo %%NLS%%share/locale/uk/LC_MESSAGES/gajim.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/gajim.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/gajim.mo -@dirrmtry share/applications %%NLS%%@dirrmtry share/locale/kk/LC_MESSAGES %%NLS%%@dirrmtry share/locale/kk %%NLS%%@dirrmtry share/locale/be@latin/LC_MESSAGES @@ -1360,6 +1363,7 @@ share/icons/hicolor/scalable/apps/gajim. @dirrm %%DATADIR%%/icons/hicolor/48x48/actions @dirrm %%DATADIR%%/icons/hicolor/48x48 @dirrm %%DATADIR%%/icons/hicolor/32x32/categories +@dirrm %%DATADIR%%/icons/hicolor/32x32/actions @dirrm %%DATADIR%%/icons/hicolor/32x32 @dirrm %%DATADIR%%/icons/hicolor/16x16/status @dirrm %%DATADIR%%/icons/hicolor/16x16/actions @@ -1466,3 +1470,4 @@ share/icons/hicolor/scalable/apps/gajim. @dirrm %%DATADIR%%/data/activities @dirrm %%DATADIR%%/data @dirrm %%DATADIR%% +@dirrmtry share/applications