From owner-svn-ports-head@FreeBSD.ORG Wed Feb 19 21:45:52 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 244FD465; Wed, 19 Feb 2014 21:45:52 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0DFF117E0; Wed, 19 Feb 2014 21:45:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1JLjpBb081747; Wed, 19 Feb 2014 21:45:51 GMT (envelope-from rm@svn.freebsd.org) Received: (from rm@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1JLjpA4081745; Wed, 19 Feb 2014 21:45:51 GMT (envelope-from rm@svn.freebsd.org) Message-Id: <201402192145.s1JLjpA4081745@svn.freebsd.org> From: Ruslan Makhmatkhanov Date: Wed, 19 Feb 2014 21:45:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r345154 - head/net-im/gajim X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 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: Wed, 19 Feb 2014 21:45:52 -0000 Author: rm Date: Wed Feb 19 21:45:51 2014 New Revision: 345154 URL: http://svnweb.freebsd.org/changeset/ports/345154 QAT: https://qat.redports.org/buildarchive/r345154/ Log: General clean-up: - convert USE_DOS2UNIX to USES equivalent - support staging - utilize options helpers - fix portlint warnings - install docs into staging area unconditionally Modified: head/net-im/gajim/Makefile head/net-im/gajim/pkg-plist Modified: head/net-im/gajim/Makefile ============================================================================== --- head/net-im/gajim/Makefile Wed Feb 19 21:40:52 2014 (r345153) +++ head/net-im/gajim/Makefile Wed Feb 19 21:45:51 2014 (r345154) @@ -18,13 +18,12 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}open GNU_CONFIGURE= yes INSTALLS_ICONS= yes -USES= gmake pathfix +USES= dos2unix gmake pathfix USE_BZIP2= yes -USE_DOS2UNIX= src/plugins/plugins_i18n.py +DOS2UNIX_FILES= src/plugins/plugins_i18n.py USE_GNOME= pygtk2 USE_PYTHON= 2 USE_XORG= x11 xext xscrnsaver -MAN1= gajim.1 gajim-remote.1 gajim-history-manager.1 CONFIGURE_ENV+= PYTHON=${PYTHON_CMD} LDFLAGS+= -L${LOCALBASE}/lib @@ -32,54 +31,30 @@ CFLAGS+= -I${LOCALBASE}/include OPTIONS_DEFINE= AVAHI CRYPTO DBUS DOCS GUPNP KEYRING NLS SPELL OPTIONS_DEFAULT=DBUS NLS SPELL +OPTIONS_SUB= yes CRYPTO_DESC= End to end encryption support KEYRING_DESC= Gnome Keyring support SPELL_DESC= Spell checking support +AVAHI_RUN_DEPENDS= avahi-discover:${PORTSDIR}/net/py-avahi +CRYPTO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>0:${PORTSDIR}/security/py-pycrypto +DBUS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.82.2:${PORTSDIR}/devel/py-dbus +GUPNP_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gupnp/__init__.py:${PORTSDIR}/net/gupnp-igd +KEYRING_USE= GNOME=pygnomedesktop +NLS_USES= gettext +SPELL_LIB_DEPENDS= libgtkspell.so:${PORTSDIR}/textproc/gtkspell + PORTDOCS= AUTHORS ChangeLog README.html -OPTIONS_SUB= yes -NLS_USES= gettext -NO_STAGE= yes .include .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src-common_resolver.py .endif -.if ! ${PORT_OPTIONS:MNLS} -CONFIGURE_ARGS+= --disable-nls -.endif - -.if ${PORT_OPTIONS:MAVAHI} -RUN_DEPENDS+= avahi-discover:${PORTSDIR}/net/py-avahi -.endif - -.if ${PORT_OPTIONS:MDBUS} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dbus>=0.82.2:${PORTSDIR}/devel/py-dbus -.endif - -.if ${PORT_OPTIONS:MGUPNP} -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/gupnp/__init__.py:${PORTSDIR}/net/gupnp-igd -.endif - -.if ${PORT_OPTIONS:MCRYPTO} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pycrypto>0:${PORTSDIR}/security/py-pycrypto -.endif - -.if ${PORT_OPTIONS:MKEYRING} -USE_GNOME+= pygnomedesktop -.endif - -.if ${PORT_OPTIONS:MSPELL} -LIB_DEPENDS= gtkspell:${PORTSDIR}/textproc/gtkspell -.endif - post-install: -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} pre-build: ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/src Modified: head/net-im/gajim/pkg-plist ============================================================================== --- head/net-im/gajim/pkg-plist Wed Feb 19 21:40:52 2014 (r345153) +++ head/net-im/gajim/pkg-plist Wed Feb 19 21:45:51 2014 (r345154) @@ -1306,6 +1306,9 @@ share/applications/gajim.desktop %%DATADIR%%/src/vcard.pyo share/icons/hicolor/64x64/apps/gajim.png share/icons/hicolor/scalable/apps/gajim.svg +man/man1/gajim.1.gz +man/man1/gajim-remote.1.gz +man/man1/gajim-history-manager.1.gz %%NLS%%share/locale/be/LC_MESSAGES/gajim.mo %%NLS%%share/locale/be@latin/LC_MESSAGES/gajim.mo %%NLS%%share/locale/bg/LC_MESSAGES/gajim.mo