Bug 180760 - [PATCH] net-im/gajim: Add missing Features, docs
Summary: [PATCH] net-im/gajim: Add missing Features, docs
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Ruslan Makhmatkhanov
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-07-23 12:50 UTC by nemysis
Modified: 2013-08-30 05:00 UTC (History)
1 user (show)

See Also:


Attachments
gajim-0.15.4_1.patch (3.07 KB, patch)
2013-07-23 12:50 UTC, nemysis
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description nemysis 2013-07-23 12:50:00 UTC
- 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@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.
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-07-23 12:50:08 UTC
Responsible Changed
From-To: freebsd-ports-bugs->rm

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 R.Mahmatkhanov 2013-08-29 21:00:16 UTC
Hi Rusmir,

sorry for delay. I cherry-picked most of your changes, but some of 
proposed changes were left out:

- USE_PYTHON = yes: gajim is pygtk application, and pygtk itself doesn't 
and will never support python3, so the current value is correct.

- py-sexy dependency: pysexy isn't actually used in gajim's code, but 
mention of it is left in *.po files. I tried to file upstream bug-report 
about this, but their trac is broken atm. Please refer this commit: 
http://permalink.gmane.org/gmane.network.jabber.gajim.scm/1180

- gupnp-igd dependency: it is doubtful that it is needed for every user,
so I added it as an option (TODO: python part of this port should be 
moved into a slave port as it done in linux distros)

- KEYRING option is too heavy to be default dependency: some time ago it 
was already enabled as default - many users complained against this 
change, see ports/166309 for the reason why it was disabled by default.

All other changes are applied and will be committed after my redports run.

Thank you once again!

-- 
Regards,
Ruslan

Tinderboxing kills... the drives.
Comment 3 dfilter service freebsd_committer freebsd_triage 2013-08-30 04:51:18 UTC
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
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 4 Ruslan Makhmatkhanov freebsd_committer freebsd_triage 2013-08-30 04:53:02 UTC
State Changed
From-To: open->closed

Committed, thank you!