swift: chat/swift updated to 3.0beta2

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: swift: chat/swift updated to 3.0beta2
From: Thomas Klausner <wiz%NetBSD.org@localhost>
Date: Wed, 10 Feb 2016 13:07:07 +0000
Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Wed Feb 10 14:07:07 2016 +0100
Changeset:	e586fd9b5970560407b89fac4f1213279a0f59ef

Modified Files:
	Makefile
Added Files:
	swift/DESCR
	swift/Makefile
	swift/PLIST
	swift/distinfo
	swift/patches/patch-BuildTools_SCons_SConscript.boot
	swift/patches/patch-BuildTools_SCons_SConstruct

Log Message:
swift: chat/swift updated to 3.0beta2

Works fine, but beta version, so not proper for pkgsrc itself.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e586fd9b5970560407b89fac4f1213279a0f59ef

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                                           |  6 +++
 swift/DESCR                                        | 18 ++++++++
 swift/Makefile                                     | 50 ++++++++++++++++++++++
 swift/PLIST                                        | 28 ++++++++++++
 swift/distinfo                                     |  8 ++++
 .../patches/patch-BuildTools_SCons_SConscript.boot | 19 ++++++++
 swift/patches/patch-BuildTools_SCons_SConstruct    | 15 +++++++
 7 files changed, 144 insertions(+)

diffs:
diff --git a/Makefile b/Makefile
index 8fc999b..700bc2b 100644
--- a/Makefile
+++ b/Makefile
@@ -767,6 +767,7 @@ SUBDIR+=	fsharp
 SUBDIR+=	fslsfonts
 SUBDIR+=	fstobdf
 SUBDIR+=	fswatch
+SUBDIR+=	fswebcam
 SUBDIR+=	ftgl
 SUBDIR+=	ftpd-tls
 SUBDIR+=	ftpsesame
@@ -887,6 +888,7 @@ SUBDIR+=	gnome-core
 SUBDIR+=	gnome-do
 SUBDIR+=	gnome-jabber
 SUBDIR+=	gnome-js-common
+SUBDIR+=	gnome-keyring
 SUBDIR+=	gnome-keyring-sharp
 SUBDIR+=	gnome-librest
 SUBDIR+=	gnome-main-menu
@@ -1908,6 +1910,7 @@ SUBDIR+=	multisync-opie
 SUBDIR+=	multisync-palm
 SUBDIR+=	multisync-syncml
 SUBDIR+=	multisync-syncml-moto
+SUBDIR+=	multitail
 SUBDIR+=	mumble
 SUBDIR+=	munge
 SUBDIR+=	munin-common
@@ -2011,6 +2014,7 @@ SUBDIR+=	nodm
 SUBDIR+=	noip
 SUBDIR+=	noiptun
 SUBDIR+=	nomadio
+SUBDIR+=	nongnu-libunwind-git
 SUBDIR+=	noor
 SUBDIR+=	nos-tun
 SUBDIR+=	nostromo
@@ -2217,6 +2221,7 @@ SUBDIR+=	p5-Encode-compat
 SUBDIR+=	p5-Exception-Base
 SUBDIR+=	p5-Exception-Class-TryCatch
 SUBDIR+=	p5-Exporter-Tidy
+SUBDIR+=	p5-FCGI-Daemon
 SUBDIR+=	p5-File-Map
 SUBDIR+=	p5-Frontier-RPC
 SUBDIR+=	p5-GPS-Garmin
@@ -3842,6 +3847,7 @@ SUBDIR+=	swami
 SUBDIR+=	swarp
 SUBDIR+=	swfmill
 SUBDIR+=	swftools
+SUBDIR+=	swift
 SUBDIR+=	swift-git
 SUBDIR+=	swisseph
 SUBDIR+=	sxemacs
diff --git a/swift/DESCR b/swift/DESCR
new file mode 100644
index 0000000..c0d839b
--- /dev/null
+++ b/swift/DESCR
@@ -0,0 +1,18 @@
+Swift is trying to plug a hole in the XMPP client landscape, and has
+these aims:
+
+    * Wide platform availability.
+    * Doing the "Right Thing" for the user, without configuration.
+    * Doing the "Right Thing" with standards-compliance.
+    * Targeting the end-users, not the system administrators.
+    * Being an XMPP client - not multi-protocol.
+    * Concentrating on the most frequently performed tasks.
+    * Never interrupt the user with something that doesn't need attention.
+
+Features of interest
+
+    * Easy status setting.
+    * Easy room joining and bookmarking.
+    * XEP-0258 Labelling for secure environments.
+    * Stream compression for bandwidth-saving.
+    * Support for the new SCRAM authentication mechanism.
diff --git a/swift/Makefile b/swift/Makefile
new file mode 100644
index 0000000..a52bed1
--- /dev/null
+++ b/swift/Makefile
@@ -0,0 +1,50 @@
+# $NetBSD: Makefile,v 1.8 2015/04/25 14:20:28 tnn Exp $
+
+DISTNAME=	swift-3.0beta2
+CATEGORIES=	chat
+MASTER_SITES=	http://swift.im/downloads/releases/${DISTNAME}/
+
+MAINTAINER=	eric%cirr.com@localhost
+HOMEPAGE=	http://swift.im/
+COMMENT=	Swift XMPP Client
+LICENSE=	gnu-gpl-v3
+
+DEPENDS+=	scons>=1.3:../../devel/scons
+
+USE_LANGUAGES=	c c++
+USE_TOOLS+=	pkg-config
+
+INSTALLATION_DIRS=	${PKGMANDIR}/man1
+
+SUBST_CLASSES+=		path
+SUBST_STAGE.path=	pre-configure
+SUBST_SED.path+=	-e "s,/usr/local/share/,${PREFIX}/share/,"
+SUBST_FILES.path+=	SwifTools/Application/UnixApplicationPathProvider.cpp
+SUBST_MESSAGE.path=	Fixing path to support files.
+
+do-configure:
+	cd ${WRKSRC} ; \
+	${ECHO} "qt=\"${QTDIR}\"" > config.py ;\
+	${ECHO} "linkflags=\"-L${PREFIX}/lib -Wl,-R${QTDIR}/lib -Wl,-R${X11BASE}/lib -Wl,-R${BUILDLINK_DIR}/lib\"" >> config.py ; \
+	${ECHO} "allow_warnings=\"true\"" >> config.py ;
+
+do-build:
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/scons Swift
+
+do-install:
+	cd ${WRKSRC} && \
+	${SETENV} ${MAKE_ENV} ${PREFIX}/bin/scons \
+	    SWIFT_INSTALLDIR=${DESTDIR}/${PREFIX} ${DESTDIR}/${PREFIX}
+	${INSTALL_DATA} ${WRKSRC}/Swift/Packaging/Debian/debian/swift-im.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+
+.include "../../lang/python/application.mk"
+.include "../../devel/boost-libs/buildlink3.mk"
+.include "../../devel/libidn/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../x11/qt4-libs/buildlink3.mk"
+.include "../../x11/qt4-qdbus/buildlink3.mk"
+.include "../../x11/qt4-tools/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/swift/PLIST b/swift/PLIST
new file mode 100644
index 0000000..ce5a79a
--- /dev/null
+++ b/swift/PLIST
@@ -0,0 +1,28 @@
+@comment $NetBSD$
+bin/swift-im
+bin/swift-open-uri
+man/man1/swift-im.1
+share/applications/swift.desktop
+share/icons/hicolor/128x128/apps/swift.png
+share/icons/hicolor/16x16/apps/swift.png
+share/icons/hicolor/22x22/apps/swift.png
+share/icons/hicolor/24x24/apps/swift.png
+share/icons/hicolor/32x32/apps/swift.xpm
+share/icons/hicolor/64x64/apps/swift.png
+share/icons/hicolor/scalable/apps/swift.svg
+share/pixmaps/swift.xpm
+share/swift/sounds/message-received.wav
+share/swift/translations/swift_ca.qm
+share/swift/translations/swift_cs.qm
+share/swift/translations/swift_de.qm
+share/swift/translations/swift_en.qm
+share/swift/translations/swift_es.qm
+share/swift/translations/swift_fr.qm
+share/swift/translations/swift_gl.qm
+share/swift/translations/swift_he.qm
+share/swift/translations/swift_hu.qm
+share/swift/translations/swift_nl.qm
+share/swift/translations/swift_pl.qm
+share/swift/translations/swift_ru.qm
+share/swift/translations/swift_sk.qm
+share/swift/translations/swift_sv.qm
diff --git a/swift/distinfo b/swift/distinfo
new file mode 100644
index 0000000..8f19cb6
--- /dev/null
+++ b/swift/distinfo
@@ -0,0 +1,8 @@
+$NetBSD$
+
+SHA1 (swift-3.0beta2.tar.gz) = 5ae9c9017342a9cd21c6b059de4798b0952b61f1
+RMD160 (swift-3.0beta2.tar.gz) = 57da974519a6b056dccd31e3348e4d6478b9b3d7
+SHA512 (swift-3.0beta2.tar.gz) = 47b1c49fa1d40267b1c85f8cf188c2c222c3c913c06a2339a97296c4b32e07c1fe69d1431ad7d38c2b93e0625a8b8f1c9f981d1ba57d7f78c3c9cfe8ddc09902
+Size (swift-3.0beta2.tar.gz) = 10596501 bytes
+SHA1 (patch-BuildTools_SCons_SConscript.boot) = f134f01b73e6862171c432c76088947d616c6d3d
+SHA1 (patch-BuildTools_SCons_SConstruct) = a2d68e60a41ea74ad753b17f97c7887cbd458c46
diff --git a/swift/patches/patch-BuildTools_SCons_SConscript.boot b/swift/patches/patch-BuildTools_SCons_SConscript.boot
new file mode 100644
index 0000000..b775da8
--- /dev/null
+++ b/swift/patches/patch-BuildTools_SCons_SConscript.boot
@@ -0,0 +1,19 @@
+$NetBSD: patch-BuildTools_SCons_SConscript.boot,v 1.1 2014/12/12 10:50:49 joerg Exp $
+
+Don't strip environment so pkgsrc settings survive.
+
+--- BuildTools/SCons/SConscript.boot.orig	2015-07-22 14:04:23.000000000 +0000
++++ BuildTools/SCons/SConscript.boot
+@@ -106,11 +106,7 @@ vars.Add(BoolVariable("install_git_hooks
+ # Set up default build & configure environment
+ ################################################################################
+ 
+-env_ENV = {
+-	'PATH' : os.environ['PATH'],
+-	'LD_LIBRARY_PATH' : os.environ.get("LD_LIBRARY_PATH", ""),
+-	'TERM' : os.environ.get("TERM", ""),
+-}
++env_ENV = os.environ
+ 
+ if "MSVC_VERSION" in ARGUMENTS :
+ 	env = Environment(ENV = env_ENV, variables = vars, MSVC_VERSION = ARGUMENTS["MSVC_VERSION"], platform = ARGUMENTS.get("PLATFORM", None))
diff --git a/swift/patches/patch-BuildTools_SCons_SConstruct b/swift/patches/patch-BuildTools_SCons_SConstruct
new file mode 100644
index 0000000..c7c878a
--- /dev/null
+++ b/swift/patches/patch-BuildTools_SCons_SConstruct
@@ -0,0 +1,15 @@
+$NetBSD: patch-BuildTools_SCons_SConstruct,v 1.1 2014/12/12 10:50:49 joerg Exp $
+
+Don't strip environment so pkgsrc settings survive.
+
+--- BuildTools/SCons/SConstruct.orig	2014-12-11 23:38:09.000000000 +0000
++++ BuildTools/SCons/SConstruct
+@@ -194,7 +194,7 @@ if env["PLATFORM"] != "win32" and env["P
+ 	gconf_env = conf_env.Clone()
+ 	conf = Configure(gconf_env, custom_tests = {"CheckPKG": CheckPKG})
+ 	if conf.CheckPKG("gconf-2.0") :
+-		gconf_bare_env = Environment()
++		gconf_bare_env = Environment(ENV=os.environ)
+ 		gconf_bare_env.ParseConfig('pkg-config --cflags gconf-2.0 gobject-2.0 --libs gconf-2.0 gobject-2.0')
+ 		gconf_flags = {
+ 				"LIBS": gconf_bare_env["LIBS"],
Prev by Date: swift: update to 3.0rc2. Switch to qt5.
Next by Date: coreclr-git: Remove patches merged upstream
Previous by Thread: swift: update to 3.0rc2. Switch to qt5.
Next by Thread: coreclr-git: Remove patches merged upstream
Indexes:
Home | Main Index | Thread Index | Old Index