Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 30 Aug 2013 03:51:10 +0000 (UTC)
From:      Ruslan Makhmatkhanov <rm@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r325659 - in head/net-im/gajim: . files
Message-ID:  <201308300351.r7U3pAVQ024883@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rm
Date: Fri Aug 30 03:51:10 2013
New Revision: 325659
URL: http://svnweb.freebsd.org/changeset/ports/325659

Log:
  - restore "Created by:" that was removed in looming times
  - correct download url to avoid redirects
  - replace USE_GMAKE with USES equivalent
  - replace patch-file with `pathfix`
  - add avahi and gnugp support as options
  - let user install some port documentation as option
  - simplify option NLS handling
  - package contents should not change, so no PORTREVISION bump
  
  PR:		180760
  Submitted by:	nemysis

Deleted:
  head/net-im/gajim/files/patch-po-Makefile.in.in
Modified:
  head/net-im/gajim/Makefile

Modified: head/net-im/gajim/Makefile
==============================================================================
--- head/net-im/gajim/Makefile	Fri Aug 30 03:37:22 2013	(r325658)
+++ head/net-im/gajim/Makefile	Fri Aug 30 03:51:10 2013	(r325659)
@@ -1,9 +1,10 @@
+# Created by: Vsevolod Stakhov <vsevolod@highsecure.ru>
 # $FreeBSD$
 
 PORTNAME=	gajim
 PORTVERSION=	0.15.4
 CATEGORIES=	net-im
-MASTER_SITES=	http://www.gajim.org/downloads/0.15/
+MASTER_SITES=	http://gajim.org/downloads/0.15/
 
 MAINTAINER=	rm@FreeBSD.org
 COMMENT=	Jabber client based on a plugin system
@@ -14,12 +15,11 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}open
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3 \
 		${PYTHON_PKGNAMEPREFIX}asn1>=0:${PORTSDIR}/devel/py-asn1
 
-FETCH_ARGS=	-Fpr
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
+USES=		gmake pathfix
 USE_BZIP2=	yes
 USE_DOS2UNIX=	src/plugins/plugins_i18n.py
-USE_GMAKE=	yes
 USE_GNOME=	pygtk2
 USE_PYTHON=	-2.7
 USE_XORG=	x11 xext xscrnsaver
@@ -29,26 +29,34 @@ CONFIGURE_ENV+=	PYTHON=${PYTHON_CMD}
 LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS+=	-I${LOCALBASE}/include
 
-OPTIONS_DEFINE=	CRYPTO DBUS KEYRING NLS SPELL
+OPTIONS_DEFINE=	AVAHI CRYPTO DBUS DOCS GUPNP 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
 
+PORTDOCS=	AUTHORS ChangeLog README.html
+OPTIONS_SUB=	yes
+NLS_USES=	gettext
+
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
+.if ! ${PORT_OPTIONS:MNLS}
 CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
+.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
@@ -61,6 +69,12 @@ USE_GNOME+=	pygnomedesktop
 LIB_DEPENDS=	gtkspell:${PORTSDIR}/textproc/gtkspell
 .endif
 
+post-install:
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+.endif
+
 pre-build:
 	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/src
 	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/src



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