pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

swift: Remove swift, used for updating chat/swift.



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Tue Mar 1 14:25:54 2016 +0100
Changeset:	57b6b554da7f459ec3f2f9209bbef88038bcdee2

Modified Files:
	Makefile
Removed 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: Remove swift, used for updating chat/swift.

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

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

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

diffs:
diff --git a/Makefile b/Makefile
index 3877409..e4f57f6 100644
--- a/Makefile
+++ b/Makefile
@@ -3898,7 +3898,6 @@ 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
deleted file mode 100644
index c0d839b..0000000
--- a/swift/DESCR
+++ /dev/null
@@ -1,18 +0,0 @@
-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
deleted file mode 100644
index 461c885..0000000
--- a/swift/Makefile
+++ /dev/null
@@ -1,55 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2015/04/25 14:20:28 tnn Exp $
-
-DISTNAME=	swift-3.0
-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.
-
-MAKE_ENV+=		qt5=1
-
-do-configure:
-	cd ${WRKSRC} ; \
-	${ECHO} "qt=\"${QTDIR}\"" > config.py ;\
-	${ECHO} "qt5=1" >> 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/qt5-qtbase/buildlink3.mk"
-.include "../../x11/qt5-qtmultimedia/buildlink3.mk"
-.include "../../x11/qt5-qttools/buildlink3.mk"
-.include "../../x11/qt5-qtwebkit/buildlink3.mk"
-.include "../../x11/qt5-qtx11extras/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/swift/PLIST b/swift/PLIST
deleted file mode 100644
index ce5a79a..0000000
--- a/swift/PLIST
+++ /dev/null
@@ -1,28 +0,0 @@
-@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
deleted file mode 100644
index 63372ea..0000000
--- a/swift/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD$
-
-SHA1 (swift-3.0.tar.gz) = 2bafacd9cfffea1044bc8ff6b3547c771aa5547c
-RMD160 (swift-3.0.tar.gz) = 7b25e3655855f18446e0fb5053f37f490f68bda3
-SHA512 (swift-3.0.tar.gz) = 3d635e9a904a48a8553e153627242e44fad5d57c48152d3c698cdf73363bdc1c566a13692c7fb2d70f0f6b773f7ff9c2cd717687501940e3b8a30b6bebc44f63
-Size (swift-3.0.tar.gz) = 11084214 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
deleted file mode 100644
index b775da8..0000000
--- a/swift/patches/patch-BuildTools_SCons_SConscript.boot
+++ /dev/null
@@ -1,19 +0,0 @@
-$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
deleted file mode 100644
index c7c878a..0000000
--- a/swift/patches/patch-BuildTools_SCons_SConstruct
+++ /dev/null
@@ -1,15 +0,0 @@
-$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"],


Home | Main Index | Thread Index | Old Index