Imported spectrum from local development.

spectrum is a XMPP transport using libpurple as a basis.

It provides transports/gateways to a large number of libpurple supported
IM systems, including AOL, Facebook, ICQ, IRC, Yahoo and MSN.

4 files changed, 136 insertions, 0 deletions

diff --git a/chat/spectrum/patches/patch-CMakeLists.txt b/chat/spectrum/patches/patch-CMakeLists.txt
new file mode 100644
index 00000000000..b74faa467a1
--- /dev/null
+++ b/chat/spectrum/patches/patch-CMakeLists.txt
@@ -0,0 +1,22 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1.1.1 2011/02/07 06:31:22 schnoebe Exp $
+
+#
+# change man path to be configurable to PKGSRC standards.
+#
+
+--- CMakeLists.txt.orig	2010-07-13 17:38:39.000000000 +0000
++++ CMakeLists.txt
+@@ -395,11 +398,11 @@ INSTALL(FILES
+ 
+ INSTALL(FILES
+     ${CMAKE_CURRENT_SOURCE_DIR}/man/spectrumctl.8
+-	DESTINATION share/man/man8
++	DESTINATION @PKGMANDIR@/man8
+     )
+ INSTALL(FILES
+     ${CMAKE_CURRENT_SOURCE_DIR}/man/spectrum.cfg.5
+-	DESTINATION share/man/man5
++	DESTINATION @PKGMANDIR@/man5
+     )
+ 
+ endif (NOT WITHOUT_SPECTRUMCTL)
diff --git a/chat/spectrum/patches/patch-man_spectrumctl.8 b/chat/spectrum/patches/patch-man_spectrumctl.8
new file mode 100644
index 00000000000..039e8ca3bcd
--- /dev/null
+++ b/chat/spectrum/patches/patch-man_spectrumctl.8
@@ -0,0 +1,55 @@
+$NetBSD: patch-man_spectrumctl.8,v 1.1.1.1 2011/02/07 06:31:22 schnoebe Exp $
+
+Change out the /etc/spectrum path for easy substitution
+Change out the spectrum username for easy substitution.
+
+--- man/spectrumctl.8.orig	2010-08-12 15:18:20.000000000 +0000
++++ man/spectrumctl.8
+@@ -23,7 +23,7 @@ with more complex administration tasks. 
+ explanation.
+ .SH ACTIONS
+ .sp
+-By default, spectrumctl acts on all transports defined in \fI/etc/spectrum/\fR.
++By default, spectrumctl acts on all transports defined in \fI@ETC_SPECTRUM@\fR.
+ You can use a different directory with the \fI--config-dir\fR option. If you
+ just want to act on a single file, you can use the \fI--config\fR option. Unless
+ you use \fI--config\fR, spectrumctl will silently ignore files where the
+@@ -101,7 +101,7 @@ Only act on transport configured in FILE
+ .RE
+ \fB\-d\fR \fIDIR\fR, \fB\-\-config\-dir\fR=\fIDIR\fR
+ .RS 4
+-Act on all transports configured in DIR (default: \fI/etc/spectrum\fR)
++Act on all transports configured in DIR (default: \fI@ETC_SPECTRUM@\fR)
+ .sp
+ .RE
+ \fB\-q\fR, \fB\-\-quiet\fR
+@@ -146,9 +146,9 @@ Options for action "\fBstart\fR":
+ .RS 4
+ \fB\-\-su\fR=\fISU\fR
+ .RS 4
+-Start spectrum as this user (default: \fIspectrum\fR). Overrides the SPECTRUM_USER environment variable.
++Start spectrum as this user (default: \fI@SPECTRUM_USER@\fR). Overrides the SPECTRUM_USER environment variable.
+ If neither \fI\-\-su\fR nor the environment variable \fBSPECTRUM_USER\fR is specified, the user defaults to 
+-\fIspectrum\fR.
++\fI@SPECTRUM_USER@\fR.
+ .RE
+ .sp
+ \fB\-\-no-daemon\fR
+@@ -168,7 +168,7 @@ multiple administration tasks at once. Y
+ commands only available within the shell. 
+ .sp
+ The prompt of the spectrumctl shell represents the transports that commands will
+-act upon. If the shell acts upon all config-files defined in \fI/etc/spectrum\fR,
++act upon. If the shell acts upon all config-files defined in \fI@ETC_SPECTRUM@\fR,
+ the prompt will show \fB<all transports>\fR and the JID of the current transport
+ otherwise.
+ .sp
+@@ -198,7 +198,7 @@ Path where the spectrum binary is locate
+ The user with which spectrum is started. Overridden by the --su command line
+ option. 
+ If neither --su nor SPECTRUM_USER is specified, the user defaults to 
+-\fIspectrum\fR.
++\fI@SPECTRUM_USER@\fR.
+ .RE
+ .SH AUTHORS
+ Copyright \(co 2009\-2010 by Spectrum engineers:
diff --git a/chat/spectrum/patches/patch-spectrumctl_spectrum_env.py b/chat/spectrum/patches/patch-spectrumctl_spectrum_env.py
new file mode 100644
index 00000000000..e40021f2e32
--- /dev/null
+++ b/chat/spectrum/patches/patch-spectrumctl_spectrum_env.py
@@ -0,0 +1,17 @@
+$NetBSD: patch-spectrumctl_spectrum_env.py,v 1.1.1.1 2011/02/07 06:31:22 schnoebe Exp $
+
+#
+# allow the spectrum user to be substituted in.
+#
+
+--- spectrumctl/spectrum/env.py.orig	2010-07-13 17:38:39.000000000 +0000
++++ spectrumctl/spectrum/env.py
+@@ -18,7 +18,7 @@ def get_uid():
+ 		username = os.environ['SPECTRUM_USER']
+ 	except KeyError:
+ 		# otherwise we default to spectrum:
+-		username = 'spectrum'
++		username = '@SPECTRUM_USER@'
+ 	try:
+ 		return pwd.getpwnam( username ).pw_uid
+ 	except KeyError:
diff --git a/chat/spectrum/patches/patch-spectrumctl_spectrumctl.py b/chat/spectrum/patches/patch-spectrumctl_spectrumctl.py
new file mode 100644
index 00000000000..29bc7a46186
--- /dev/null
+++ b/chat/spectrum/patches/patch-spectrumctl_spectrumctl.py
@@ -0,0 +1,42 @@
+$NetBSD: patch-spectrumctl_spectrumctl.py,v 1.1.1.1 2011/02/07 06:31:22 schnoebe Exp $
+
+Modify to allow the path to the spectrum directory to be substituted in.
+Modify to allow the name of the spectrum user to be substituted in.
+
+--- spectrumctl/spectrumctl.py.orig	2010-08-12 15:18:20.000000000 +0000
++++ spectrumctl/spectrumctl.py
+@@ -3,7 +3,7 @@
+ #
+ # spectrumctl can be used to control your spectrum-instances. Valid actions are
+ # start, stop, restart and reload. By default, spectrumctl acts on all instances
+-# defined in /etc/spectrum/
++# defined in @ETC_SPECTRUM@
+ #
+ # Copyright (C) 2009, 2010 Mathias Ertl
+ #
+@@ -29,12 +29,12 @@ from optparse import *
+ cmds = [ x.name for x in doc.cmds ]
+ description='''spectrumctl can be used to control your spectrum-instances.
+ Valid actions are %s and %s. By default, spectrumctl acts on all transports
+-defined in /etc/spectrum/.'''%( ', '.join( cmds[:-1] ), cmds[-1]  )
++defined in @ETC_SPECTRUM@.'''%( ', '.join( cmds[:-1] ), cmds[-1]  )
+ 
+ parser = OptionParser( usage='Usage: %prog [options] action', version='0.2', description=description)
+ parser.add_option( '-c', '--config', metavar='FILE',
+ 	help = 'Only act on transport configured in FILE (ignored for list)' )
+-parser.add_option( '-d', '--config-dir', metavar='DIR', default='/etc/spectrum',
++parser.add_option( '-d', '--config-dir', metavar='DIR', default='@ETC_SPECTRUM@',
+ 	help = 'Act on all transports configured in DIR (default: %default)' )
+ parser.add_option( '-q', '--quiet', action='store_true', default=False,
+ 	help = 'Do not print any output' )
+@@ -51,8 +51,8 @@ parser.add_option_group( list_group )
+ start_group = OptionGroup( parser, 'Options for action "start"' )
+ start_group.add_option( '--su', # NOTE: the default is set by 
+ 	# spectrum.get_uid(). We need this so we can distinguish between
+-	# actually setting --su=spectrum and setting nothing at all.
+-	help = 'Start spectrum as this user (default: spectrum)' )
++	# actually setting --su=@SPECTRUM_USER@ and setting nothing at all.
++	help = 'Start spectrum as this user (default: @SPECTRUM_USER@)' )
+ start_group.add_option( '--no-daemon', action='store_true', default=False,
+ 	help = 'Do not start spectrum in daemon mode' )
+ start_group.add_option( '--debug', action='store_true', default=False,