ports/180760: [PATCH] net-im/gajim: Add missing Features, docs

Tue Jul 23 11:50:01 UTC 2013

>Number:         180760
>Category:       ports
>Synopsis:       [PATCH] net-im/gajim: Add missing Features, docs
>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:   Tue Jul 23 11:50:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     nemysis
>Release:        FreeBSD 9.1-RELEASE-p10 amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.1-RELEASE-p10 FreeBSD 9.1-RELEASE-p10 #0: Fri Jun 28 19:52:22 UTC 2013
>Description:

- Bump portrevision
- Trim Makefile header
- Trim master sites, remove not needed hack for download
- Add dependencies for x11-toolkits/py-sexy, net/gupnp-igd
- Trim dependency for python (from README.html python2.5 or higher)
- USES gmake pathfix
- Add DOCS and AVAHI Option
- Trim default Options, add KEYRING, remove default NLS
- Add docs
- Trim NLS
- Use pathfix instead of simple patches
- Remove files/patch-po-Makefile.in.in

Port maintainer (rm at FreeBSD.org) is cc'd.

Generated and tested manually, tested with port test and with RedPorts, sent with FreeBSD Port Tools 0.99_8 (mode: change, diff: ports)
>How-To-Repeat:

Build log

https://redports.org/buildarchive/20130723013701-56131/


Please look Gajim / Help / Features

KEYRING is needed for Password encryption


Before have adjusted Gajim PC-BSD PBI and added missing Features

Bonjour / Zeroconf, Automatic status, UPnP-IGD

http://forums.pcbsd.org/showthread.php?t=20236

https://github.com/pcbsd/pbi/tree/master/modules/net-im/gajim


net/py-avahi, needed for Bonjour / Zeroconf

Can't be builded, because this have not add to default Options

../../py-compile: Missing argument to --destdir.

But older pkgng py27-avahi-0.6.29_5 works.


I use Gajim each day from GNU/Linux days to today, i can maintain this Port when
maintainer approve.

>Fix:

--- gajim-0.15.4_1.patch begins here ---
diff -ruN /usr/ports/net-im/gajim/Makefile ./Makefile
--- /usr/ports/net-im/gajim/Makefile	2013-06-02 18:56:31.000000000 +0200
+++ ./Makefile	2013-07-23 13:09:05.000000000 +0200
@@ -1,9 +1,11 @@
+# Created by: Vsevolod Stakhov <vsevolod at highsecure.ru>
 # $FreeBSD: head/net-im/gajim/Makefile 319394 2013-05-29 22:28:28Z rm $
 
 PORTNAME=	gajim
 PORTVERSION=	0.15.4
+PORTREVISION=	1
 CATEGORIES=	net-im
-MASTER_SITES=	http://www.gajim.org/downloads/0.15/
+MASTER_SITES=	http://gajim.org/downloads/0.15/
 
 MAINTAINER=	rm at FreeBSD.org
 COMMENT=	Jabber client based on a plugin system
@@ -12,37 +14,44 @@
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openssl>=0:${PORTSDIR}/security/py-openssl \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}asn1>=0:${PORTSDIR}/devel/py-asn1
+		${PYTHON_PKGNAMEPREFIX}asn1>=0:${PORTSDIR}/devel/py-asn1 \
+		${PYTHON_PKGNAMEPREFIX}sexy>=0:${PORTSDIR}/x11-toolkits/py-sexy
+LIB_DEPENDS=	gupnp-igd:${PORTSDIR}/net/gupnp-igd
 
-FETCH_ARGS=	-Fpr
-GNU_CONFIGURE=	yes
-INSTALLS_ICONS=	yes
 USE_BZIP2=	yes
-USE_DOS2UNIX=	src/plugins/plugins_i18n.py
-USE_GMAKE=	yes
+USES=		gmake pathfix
 USE_GNOME=	pygtk2
-USE_PYTHON=	-2.7
+USE_PYTHON=	yes
 USE_XORG=	x11 xext xscrnsaver
+GNU_CONFIGURE=	yes
+USE_DOS2UNIX=	src/plugins/plugins_i18n.py
+INSTALLS_ICONS=	yes
 MAN1=		gajim.1 gajim-remote.1 gajim-history-manager.1
 
 CONFIGURE_ENV+=	PYTHON=${PYTHON_CMD}
 LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS+=	-I${LOCALBASE}/include
 
-OPTIONS_DEFINE=	CRYPTO DBUS KEYRING NLS SPELL
-OPTIONS_DEFAULT=DBUS NLS SPELL
+OPTIONS_DEFINE=	DOCS NLS AVAHI CRYPTO DBUS KEYRING SPELL
+OPTIONS_DEFAULT=DBUS KEYRING 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}
@@ -65,4 +74,10 @@
 	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/src
 	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/src
 
+post-install:
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+.endif
+
 .include <bsd.port.mk>
diff -ruN /usr/ports/net-im/gajim/files/patch-po-Makefile.in.in ./files/patch-po-Makefile.in.in
--- /usr/ports/net-im/gajim/files/patch-po-Makefile.in.in	2013-06-02 18:56:31.000000000 +0200
+++ ./files/patch-po-Makefile.in.in	1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
---- po/Makefile.in.in.orig	2011-10-15 04:47:18.000000000 +0400
-+++ po/Makefile.in.in	2012-03-20 19:15:22.000000000 +0400
-@@ -34,7 +34,7 @@
- datarootdir = @datarootdir@
- libdir = @libdir@
- DATADIRNAME = @DATADIRNAME@
--itlocaledir = $(prefix)/$(DATADIRNAME)/locale
-+itlocaledir = @localedir@
- subdir = po
- install_sh = @install_sh@
- # Automake >= 1.8 provides @mkdir_p at .
--- gajim-0.15.4_1.patch ends here ---

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