Menu
▾
▴
[cvs] dists/10.4/stable/main/finkinfo/utils libzbar-py.info, NONE, 1.1 libzbar-py.patch, NONE, 1.1 libzbar0-gtk.info, NONE, 1.1 libzbar0-gtk.patch, NONE, 1.1 libzebrabar-py.info, NONE, 1.1 libzebrabar-py.patch, NONE, 1.1 libzebrabar-py25.info, NONE, 1.1 libzebrabar-py25.patch, NONE, 1.1 libzebrabar0-gtk.info, NONE, 1.1 libzebrabar0-gtk.patch, NONE, 1.1 libzebrabar3.info, NONE, 1.1 libzebrabar3.patch, NONE, 1.1 mgdiff.info, NONE, 1.1 rdiffweb.info, NONE, 1.1 scmxx.info, NONE, 1.1 scmxx.patch, NONE, 1.1 smartpm.info, NONE, 1.1 smartpm.patch, NONE, 1.1 ttyrec.info, NONE, 1.1 whichman.info, NONE, 1.1 wview.info, NONE, 1.1 wview.patch, NONE, 1.1 zbar.info, NONE, 1.1 zbar.patch, NONE, 1.1 zzuf.info, NONE, 1.1
Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/utils
In directory vz-cvs-3.sog:/tmp/cvs-serv6110
Added Files:
libzbar-py.info libzbar-py.patch libzbar0-gtk.info
libzbar0-gtk.patch libzebrabar-py.info libzebrabar-py.patch
libzebrabar-py25.info libzebrabar-py25.patch
libzebrabar0-gtk.info libzebrabar0-gtk.patch libzebrabar3.info
libzebrabar3.patch mgdiff.info rdiffweb.info scmxx.info
scmxx.patch smartpm.info smartpm.patch ttyrec.info
whichman.info wview.info wview.patch zbar.info zbar.patch
zzuf.info
Log Message:
to stable
--- NEW FILE: smartpm.patch ---
=== modified file 'Makefile'
--- Makefile 2009-06-29 16:53:20 +0000
+++ Makefile 2009-09-28 18:17:36 +0000
@@ -5,7 +5,7 @@
DESTDIR=/
PYTHON?=python
-prefix=/usr
+prefix=@PREFIX@
bindir=$(prefix)/bin
all:
=== modified file 'smart/channels/deb_sys.py'
--- smart/channels/deb_sys.py 2004-12-02 21:35:17 +0000
+++ smart/channels/deb_sys.py 2009-09-29 06:22:37 +0000
@@ -32,7 +32,7 @@
def fetch(self, fetcher, progress):
path = os.path.join(sysconf.get("deb-root", "/"),
- "var/lib/dpkg/status")
+ "@PREFIX@/var/lib/dpkg/status")
digest = os.path.getmtime(path)
if digest == self._digest:
return True
=== modified file 'smart/const.py'
--- smart/const.py 2009-03-04 22:08:02 +0000
+++ smart/const.py 2009-09-28 18:17:12 +0000
@@ -64,9 +64,9 @@
BLOCKSIZE = 16384
-DISTROFILE = "/usr/lib/smart/distro.py"
-PLUGINSDIR = "/usr/lib/smart/plugins/"
-DATADIR = "/var/lib/smart/"
+DISTROFILE = "@PREFIX@/lib/smart/distro.py"
+PLUGINSDIR = "@PREFIX@/lib/smart/plugins/"
+DATADIR = "@PREFIX@/var/lib/smart/"
USERDATADIR = "~/.smart/"
CONFFILE = "config"
=== modified file 'smart/plugins/aptchannelsync.py'
--- smart/plugins/aptchannelsync.py 2008-12-12 07:17:44 +0000
+++ smart/plugins/aptchannelsync.py 2009-09-28 18:20:34 +0000
@@ -35,13 +35,13 @@
from smart import *
-APT_SOURCES_DIR = "/etc/apt/sources.list.d/"
-APT_SOURCES = "/etc/apt/sources.list"
+APT_SOURCES_DIR = "@PREFIX@/etc/apt/sources.list.d/"
+APT_SOURCES = "@PREFIX@/etc/apt/sources.list"
def _loadSourcesList(filename):
- keyring_path = sysconf.get("sync-apt-keyring", "/etc/apt/trusted.gpg")
+ keyring_path = sysconf.get("sync-apt-keyring", "@PREFIX@/etc/apt/trusted.gpg")
if not os.path.isfile(keyring_path):
keyring_path = None
=== modified file 'smart/plugins/channelsync.py'
--- smart/plugins/channelsync.py 2007-10-08 01:54:50 +0000
+++ smart/plugins/channelsync.py 2009-09-28 18:18:46 +0000
@@ -23,7 +23,7 @@
from smart import *
import os
-CHANNELSDIR = "/etc/smart/channels/"
+CHANNELSDIR = "@PREFIX@/etc/smart/channels/"
def syncChannels(channelsdir, force=None):
=== modified file 'smart/plugins/detectsys.py'
--- smart/plugins/detectsys.py 2009-09-28 16:40:58 +0000
+++ smart/plugins/detectsys.py 2009-09-29 06:23:04 +0000
@@ -28,7 +28,7 @@
rpm = None
def detectRPMSystem():
- dir = os.path.join(sysconf.get("rpm-root", "/"), "var/lib/rpm")
+ dir = os.path.join(sysconf.get("rpm-root", "/"), "@PREFIX@/var/lib/rpm")
if os.path.isdir(dir):
if not rpm:
iface.debug("detectRPMSystem: rpm-python not available")
@@ -43,7 +43,7 @@
})
def detectDEBSystem():
- dir = os.path.join(sysconf.get("deb-root", "/"), "var/lib/dpkg")
+ dir = os.path.join(sysconf.get("deb-root", "/"), "@PREFIX@/var/lib/dpkg")
if os.path.isdir(dir):
for alias in sysconf.keys("channels"):
if sysconf.get(("channels", alias, "type")) == "deb-sys":
=== modified file 'smart/backends/deb/base.py'
--- smart/backends/deb/base.py 2009-03-04 19:35:56 +0000
+++ smart/backends/deb/base.py 2009-09-28 21:59:42 +0000
@@ -33,7 +33,7 @@
__all__ = ["DebPackage", "DebProvides", "DebNameProvides", "DebPreRequires",
"DebRequires", "DebUpgrades", "DebConflicts", "DebBreaks",
- "DebOrRequires", "DebOrPreRequires", "DEBARCH"]
+ "DebOrRequires", "DebOrPreRequires", "DEBARCH", "system_provides"]
def getArchitecture():
arch = sysconf.get("deb-arch")
@@ -176,6 +176,54 @@
class DebConflicts(DebDepends,Conflicts): __slots__ = ()
class DebBreaks(DebDepends,Conflicts): __slots__ = ()
+class NullSystemProvides(object):
+
+ def matches(self, requires):
+ return False
+
+class FinkVirtualPkgs(object):
+
+ def __init__(self, path):
+ self._provides = {}
+
+ pkgs = []
+ info = {}
+
+ output = os.popen(path).readlines()
+ for line in output:
+ line = string.rstrip(line)
+ keyval = string.split(line, ':', 1)
+ if len(keyval) > 1:
+ val = string.lstrip(keyval[1])
+ info[keyval[0]] = val
+ else:
+ pkgs.append(info)
+ info = {}
+
+ for info in pkgs:
+ if info["Status"].endswith("not-installed"):
+ continue
+ name = info["Package"]
+ version = info["Version"]
+ self._provides.setdefault(name, DebNameProvides(name, version))
+ provides = string.split(info.get("provides", ""), ', ')
+ for provide in provides:
+ if provide:
+ self._provides.setdefault(provide, DebProvides(provide, None))
+
+ def matches(self, requires):
+ for name in requires.getMatchNames():
+ if name in self._provides:
+ prv = self._provides.get(name)
+ if requires.matches(prv):
+ return True
+ return False
+
+system_provides = NullSystemProvides()
+fink = sysconf.get("fink-virtual-pkgs", "@PREFIX@/bin/fink-virtual-pkgs")
+if os.path.exists(fink):
+ system_provides = FinkVirtualPkgs(fink)
+
def enablePsyco(psyco):
psyco.bind(DebPackage.coexists)
psyco.bind(DebPackage.matches)
=== modified file 'smart/backends/deb/loader.py'
--- smart/backends/deb/loader.py 2008-08-12 00:42:38 +0000
+++ smart/backends/deb/loader.py 2009-09-28 21:24:58 +0000
@@ -86,6 +86,13 @@
return decode(description.split("\n", 1)[0])
return u""
+ def getReferenceURLs(self):
+ description = self._dict.get("description")
+ for line in description.splitlines():
+ if line.startswith("Web site:"):
+ return [line[9:].strip()]
+ return []
+
def getGroup(self):
return decode(self._loader.getSection(self._package))
@@ -192,6 +199,13 @@
n, r, v = relation
cnfargs.append((Brk, n, r, v))
+ newargs = []
+ for args in reqargs:
+ req = args[0](*args[1:])
+ if not system_provides.matches(req):
+ newargs.append(args)
+ reqargs = newargs
+
pkg = self.buildPackage((Pkg, name, version),
prvargs, reqargs, upgargs, cnfargs)
pkg.loaders[self] = offset
=== added file 'tests/data/aptdeb/fink-virtual-pkgs'
--- tests/data/aptdeb/fink-virtual-pkgs 1970-01-01 00:00:00 +0000
+++ tests/data/aptdeb/fink-virtual-pkgs 2009-09-28 18:25:35 +0000
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+cat <<__EOF__
+Package: darwin
+Status: install ok installed
+Version: 8.11.1-1
+description: [virtual package representing the kernel]
+homepage: http://www.finkproject.org/faq/usage-general.php#virtpackage
+provides: kernel
+
+Package: macosx
+Status: install ok installed
+Version: 10.4.11-1
+homepage: http://www.finkproject.org/faq/usage-general.php#virtpackage
+description: [virtual package representing the system]
+
+__EOF__
=== added file 'tests/fink.txt'
--- tests/fink.txt 1970-01-01 00:00:00 +0000
+++ tests/fink.txt 2009-09-28 18:27:00 +0000
@@ -0,0 +1,17 @@
+
+Set up the system provides.
+
+ >>> from tests import *
+ >>> from smart.backends.deb.base import FinkVirtualPkgs, DebRequires
+ >>> localpath = "%s/aptdeb/fink-virtual-pkgs" % TESTDATADIR
+ >>> pkgs = FinkVirtualPkgs(localpath)
+
+Check for virtual package.
+
+ >>> depends = DebRequires("macosx", None, None)
+ >>> pkgs.matches(depends)
+ True
+ >>> depends = DebRequires("darwin", ">=" , "8-1")
+ >>> pkgs.matches(depends)
+ True
+
--- NEW FILE: scmxx.info ---
Package: scmxx
Version: 0.6.3.6
Revision: 2
Maintainer: Fabian Jakobs <fab...@we...>
Depends: libiconv
BuildDepends: fink (>= 0.24.12), libiconv-dev
Replaces:
ConfigureParams: --mandir=%i/share/man --with-device=/dev/tty.IrDA-IrCOMMch-b
Source: http://ma2geo.mathematik.uni-karlsruhe.de/~hendrik/scmxx/download/scmxx-%v.tar.bz2
Source-MD5: 5d70a0996e678cd8cf6f644669770884
PatchFile: %n.patch
PatchFile-MD5: 393a5ca445f6965873eca0259a17f833
PatchScript: cp %{PatchFile} LICENSE
Description: Exchange data with Siemens mobile phones
DescDetail: <<
SCMxx is a console program that allows you to exchange certain types
of data with mobile phones made by Siemens. Some of the data types
that can be exchanged are logos, ring tones, vCalendars, phonebook
entries, and SMS messages. It works with the S25, S35i, M35i and C35i,
SL45, S45 and ME45 and probably others.
You need a serial connection (either cable or infrared) to your mobile
phone in order to use SCMxx.
It basically uses the AT command set published by Siemens (with some
other, additional resources).
<<
DocFiles: LICENSE README AUTHORS BUGS CHANGELOG INSTALL TODO docs/* examples/*
Homepage: http://www.hendrik-sattler.de/scmxx/
License: GPL
--- NEW FILE: libzbar-py.patch ---
diff -Nurd -x'*~' zbar-0.10.orig/Makefile.in zbar-0.10/Makefile.in
--- zbar-0.10.orig/Makefile.in 2009-10-23 14:17:25.000000000 -0400
+++ zbar-0.10/Makefile.in 2010-09-02 01:11:14.000000000 -0400
@@ -414,7 +414,7 @@
@HAVE_MAGICK_TRUE@zbarimg_zbarimg_DEPENDENCIES = \
@HAVE_MAGICK_TRUE@ $(am__DEPENDENCIES_1) zbar/libzbar.la \
@HAVE_MAGICK_TRUE@ $(am__append_32)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/_include
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -656,7 +656,7 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-AM_CPPFLAGS = -I$(srcdir)/include
+AM_CPPFLAGS =
AM_CFLAGS = -Wall -Wno-parentheses
AM_CXXFLAGS = $(AM_CFLAGS)
ACLOCAL_AMFLAGS = -I config
--- NEW FILE: rdiffweb.info ---
Package: rdiffweb
Version: 0.3.5
Revision: 1001
Description: Web interface to rdiff-backup repositories
License: GPL
# Dependencies:
Depends: python25, cherrypy-py25 (>= 2.1.0-1), librsync-shlibs (>= 0.9.7-1002), mysql-python-py25, rdiff-backup (>= 1.1.9)
# Unpack Phase:
Source: http://www.rdiffweb.org/releases/%n-%v.tar.gz
Source-MD5: cb4fe0b67eb4a4b08c1732934758d852
SourceDirectory: rdiffWeb-%v
# Patch Phase
PatchScript: <<
perl -pi -e 's|/etc|%p/etc|g' setup.py rdiff-web-config init/rdiff-web rdiffWeb/rdw_config.py
perl -pi -e 's|/usr/bin|%p/bin|g;' -e 's|/var/run|%p/var/run|g' init/rdiff-web
<<
# Compile Phase:
CompileScript: %p/bin/python2.5 setup.py build
# Install Phase:
InstallScript: <<
%p/bin/python2.5 setup.py install --root=%d
touch %i/etc/rdiffweb/rdw.conf
echo "Please consult the package usage notes via 'fink desc %n'." > README.fink
<<
DocFiles: COPYING PKG-INFO README.fink
ConfFiles: %p/etc/rdiffweb/rdw.conf
DescDetail: <<
rdiffWeb is a web interface for browsing and restoring from
rdiff-backup repositories. It is written in Python and is distributed
under the GPL license.
<<
DescUsage: <<
Run the %p/bin/rdiff-web-config script with root privileges to help
generate the %p/etc/rdiffweb/rdw.conf configuration file. You may
then execute the %p/etc/init.d/rdiff-web script with root privileges
to start the %p/bin/rdiff-web http daemon on the default port, 8080.
Consult the rdiffWeb home page for further documentation.
<<
DescPackaging: <<
Patches files to save rdw.conf in %p/etc/rdiffweb rather than
/etc/rdiffweb
<<
Maintainer: Ojas Parekh <fi...@pa...>
Homepage: http://www.rdiffweb.org/
--- NEW FILE: libzebrabar-py.info ---
Info2: <<
Package: libzebrabar-py%type_pkg[python]
Version: 0.5
Revision: 2
Source: mirror:sourceforge:zbar/zebra-%v.tar.bz2
Source-MD5: 7e5cfba8d06fe46c4310efe67fb7a4a7
Type: python (2.6)
BuildDepends: <<
atk1 (>= 1.26.0-1),
cairo (>= 1.8-1),
expat1,
fink (>= 0.24.12-1),
fontconfig2-dev (>= 2.4.1-1),
freetype219 (>= 2.3.8-2),
glib2-dev (>= 2.20.0-1),
glitz,
libzebrabar3 (>= 0.5-4),
libzebrabar0-gtk (>= 0.5-1),
libgettext3-dev,
libiconv-dev,
libpng3,
pango1-xft2-ft219-dev (>= 1.24.0-1),
pixman (>= 0.16.0-1),
pkgconfig,
python%type_pkg[python],
pygtk2-gtk-py%type_pkg[python]-dev (>= 2.15.2-1),
pygobject2-py%type_pkg[python]-dev (>= 2.18.0-1),
x11-dev,
xft2-dev,
xmlto
<<
Depends: <<
atk1-shlibs (>= 1.26.0-1),
cairo-shlibs (>= 1.8-1),
expat1-shlibs,
fontconfig2-shlibs (>= 2.4.1-1),
freetype219-shlibs (>= 2.3.8-2),
glib2-shlibs (>= 2.14.0-1),
glitz-shlibs,
libzebrabar3-shlibs (>= 0.5-4),
libzebrabar0-gtk-shlibs (>= 0.5-1),
libgettext3-shlibs,
libiconv,
libpng3-shlibs,
pango1-xft2-ft219-shlibs (>= 1.24.0-1),
pixman-shlibs (>= 0.16.0-1),
python%type_pkg[python],
pygtk2-gtk-py%type_pkg[python] (>= 2.15.2-1),
pygobject2-py%type_pkg[python] (>= 2.18.0-1),
x11-shlibs
<<
PatchFile: %{ni}.patch
PatchFile-MD5: 426b5f36e77f320e1831800dad7bb278
PatchScript: <<
%{default_script}
mkdir -p _include/zebra
ln -s ../include/config.h _include
perl -pi -e 's,zebra/libzebra.la,,g' Makefile.in
perl -pi -e 's,zebra.pc,,g' Makefile.in
perl -pi -e 's,gtk/libzebragtk.la,,g' Makefile.in
perl -pi -e 's,zebra-gtk.pc,,g' Makefile.in
<<
ConfigureParams: --disable-dependency-tracking --disable-video --without-imagemagick --without-npapi --with-gtk --with-python --without-qt --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib
CompileScript: <<
#!/bin/sh -ex
# special stuff for gtk
export PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:%p/lib/pkgconfig:$PKG_CONFIG_PATH"
# gather flags for installed zebra & zebra-gtk
ZEBRA_CFLAGS=`%p/bin/pkg-config --cflags zebra-gtk`
ZEBRA_LIBS=`%p/bin/pkg-config --libs zebra-gtk`
CPPFLAGS="$CPPFLAGS $ZEBRA_CFLAGS"
LDFLAGS="$LDFLAGS $ZEBRA_LIBS"
# special stuff for python
export PYTHON=%p/bin/python%type_raw[python]
export PYTHON_CONFIG=%p/bin/python%type_raw[python]-config
./configure %c
make
<<
InstallScript: <<
make install DESTDIR=%d include_HEADERS= zinclude_HEADERS=
rm -rf %i/share/doc/zebra
rmdir %i/bin %i/include/zebra %i/include %i/lib/pkgconfig
rm -rf %i/share/man
<<
DocFiles: COPYING.LIB ChangeLog HACKING NEWS README TODO
DescPackaging: <<
Hack makefiles and autoconf config.h locations to use
installed zebra instead of building locally.
Need to enable gtk in order to enable pygtk, but then hack to
use installed zebra-gtk instead of building locally.
Redo doc files manually so they go where we want and include
the files oriented towards users not installers.
This is just the python module; removing the should-be-empty
without -f makes sure we didn't accidentally build any
front-end programs or install any extraneous headers.
Claims to allow pthon>=2.3.5, but uses pythonX.X-config, which
is only available for python>=2.5. See:
http://sourceforge.net/tracker/index.php?func=detail&aid=2052663&group_id=189236&atid=928515
<<
DescPort: <<
zebrapygtkmodule and zebrapygtk can't both define
__PyGObject_API. See:
http://sourceforge.net/tracker/index.php?func=detail&aid=2052681&group_id=189236&atid=928515
<<
Description: Python-gtk bindings for zebra barcode library
Homepage: http://zbar.sourceforge.net/
License: LGPL
Maintainer: Daniel Macks <dm...@ne...>
<<
--- NEW FILE: libzebrabar3.info ---
Package: libzebrabar3
Version: 0.5
Revision: 4
Source: mirror:sourceforge:zbar/zebra-%v.tar.bz2
Source-MD5: 7e5cfba8d06fe46c4310efe67fb7a4a7
BuildDepends: <<
fink (>= 0.24.12-1),
pkgconfig,
x11-dev,
xmlto
<<
Depends: %n-shlibs (= %v-%r)
BuildDependsOnly: true
PatchFile: %n.patch
PatchFile-MD5: 5d2064e155d3f62b76e015843095c31e
ConfigureParams: --disable-dependency-tracking --disable-video --without-imagemagick --without-npapi --without-gtk --without-python --without-qt --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib
InstallScript: <<
make install DESTDIR=%d
rm -rf %i/share/doc/zebra
rmdir %i/bin
rm -rf %i/share/man
<<
DocFiles: COPYING.LIB ChangeLog HACKING NEWS README TODO
SplitOff: <<
Package: %N-shlibs
Files: lib/libzebra.3.*
Depends: x11-shlibs
Shlibs: %p/lib/libzebra.3.dylib 6.0.0 %n (>= 0.5-1)
DocFiles: COPYING.LIB ChangeLog HACKING NEWS README TODO
<<
DescPackaging: <<
Redo doc files manually so they go where we want and include
the files oriented towards users not installers.
This is just the basic lib; removing the should-be-empty bin
dir without -f makes sure we didn't accidentally build any
front-end programs. Nuke headers of other libs.
Nuke the manpages of the programs that aren't installed.
<<
Description: Multiformat barcode scanning/decoding library
Homepage: http://zbar.sourceforge.net/
License: LGPL
Maintainer: Daniel Macks <dm...@ne...>
--- NEW FILE: libzebrabar-py.patch ---
diff -Nurd -x'*~' zebra-0.5.orig/Makefile.in zebra-0.5/Makefile.in
--- zebra-0.5.orig/Makefile.in 2008-07-24 20:11:36.000000000 -0400
+++ zebra-0.5/Makefile.in 2008-08-13 23:41:58.000000000 -0400
@@ -274,7 +274,7 @@
zebraimg_zebraimg_OBJECTS = $(am_zebraimg_zebraimg_OBJECTS)
@HAVE_MAGICK_TRUE@zebraimg_zebraimg_DEPENDENCIES = \
@HAVE_MAGICK_TRUE@ $(am__DEPENDENCIES_1) zebra/libzebra.la
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/_include
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -492,7 +492,7 @@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-AM_CPPFLAGS = -I$(srcdir)/include
+AM_CPPFLAGS =
AM_CFLAGS = -Wall
AM_CXXFLAGS = $(AM_CFLAGS)
ACLOCAL_AMFLAGS = -I config
diff -Nurd -x'*~' zebra-0.5.orig/configure zebra-0.5/configure
--- zebra-0.5.orig/configure 2008-07-24 20:11:34.000000000 -0400
+++ zebra-0.5/configure 2008-08-15 01:52:42.000000000 -0400
@@ -19093,7 +19093,7 @@
fi
if test "x$PYTHON_LIBS" = "x"; then
- PYTHON_LIBS=`$PYTHON_CONFIG --libs`
+ PYTHON_LIBS=`$PYTHON_CONFIG --ldflags`
fi
diff -Nurd -x'*~' zebra-0.5.orig/pygtk/zebrapygtkmodule.c zebra-0.5/pygtk/zebrapygtkmodule.c
--- zebra-0.5.orig/pygtk/zebrapygtkmodule.c 2008-07-24 20:10:12.000000000 -0400
+++ zebra-0.5/pygtk/zebrapygtkmodule.c 2008-08-15 02:01:12.000000000 -0400
@@ -21,6 +21,7 @@
* http://sourceforge.net/projects/zebra
*------------------------------------------------------------------------*/
+#define NO_IMPORT_PYGOBJECT
#include <pygobject.h>
void zebrapygtk_register_classes(PyObject*);
--- NEW FILE: scmxx.patch ---
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
License is intended to guarantee your freedom to share and change free
software--to make sure the software is free for all its users. This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
the GNU Library General Public License instead.) You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
this service if you wish), that you receive source code or can get it
if you want it, that you can change the software or use pieces of it
in new free programs; and that you know you can do these things.
To protect your rights, we need to make restrictions that forbid
anyone to deny you these rights or to ask you to surrender the rights.
These restrictions translate to certain responsibilities for you if you
distribute copies of the software, or if you modify it.
For example, if you distribute copies of such a program, whether
gratis or for a fee, you must give the recipients all the rights that
you have. You must make sure that they, too, receive or can get the
source code. And you must show them these terms so they know their
rights.
We protect your rights with two steps: (1) copyright the software, and
(2) offer you this license which gives you legal permission to copy,
distribute and/or modify the software.
Also, for each author's protection and ours, we want to make certain
that everyone understands that there is no warranty for this free
software. If the software is modified by someone else and passed on, we
want its recipients to know that what they have is not the original, so
that any problems introduced by others will not reflect on the original
authors' reputations.
Finally, any free program is threatened constantly by software
patents. We wish to avoid the danger that redistributors of a free
program will individually obtain patent licenses, in effect making the
program proprietary. To prevent this, we have made it clear that any
patent must be licensed for everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and
modification follow.
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains
a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License. The "Program", below,
refers to any such program or work, and a "work based on the Program"
means either the Program or any derivative work under copyright law:
that is to say, a work containing the Program or a portion of it,
either verbatim or with modifications and/or translated into another
language. (Hereinafter, translation is included without limitation in
the term "modification".) Each licensee is addressed as "you".
Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope. The act of
running the Program is not restricted, and the output from the Program
is covered only if its contents constitute a work based on the
Program (independent of having been made by running the Program).
Whether that is true depends on what the Program does.
1. You may copy and distribute verbatim copies of the Program's
source code as you receive it, in any medium, provided that you
conspicuously and appropriately publish on each copy an appropriate
copyright notice and disclaimer of warranty; keep intact all the
notices that refer to this License and to the absence of any warranty;
and give any other recipients of the Program a copy of this License
along with the Program.
You may charge a fee for the physical act of transferring a copy, and
you may at your option offer warranty protection in exchange for a fee.
2. You may modify your copy or copies of the Program or any portion
of it, thus forming a work based on the Program, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:
a) You must cause the modified files to carry prominent notices
stating that you changed the files and the date of any change.
b) You must cause any work that you distribute or publish, that in
whole or in part contains or is derived from the Program or any
part thereof, to be licensed as a whole at no charge to all third
parties under the terms of this License.
c) If the modified program normally reads commands interactively
when run, you must cause it, when started running for such
interactive use in the most ordinary way, to print or display an
announcement including an appropriate copyright notice and a
notice that there is no warranty (or else, saying that you provide
a warranty) and that users may redistribute the program under
these conditions, and telling the user how to view a copy of this
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works. But when you
distribute the same sections as part of a whole which is a work based
on the Program, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote it.
Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Program.
In addition, mere aggregation of another work not based on the Program
with the Program (or with a work based on the Program) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.
3. You may copy and distribute the Program (or a work based on it,
under Section 2) in object code or executable form under the terms of
Sections 1 and 2 above provided that you also do one of the following:
a) Accompany it with the complete corresponding machine-readable
source code, which must be distributed under the terms of Sections
1 and 2 above on a medium customarily used for software interchange; or,
b) Accompany it with a written offer, valid for at least three
years, to give any third party, for a charge no more than your
cost of physically performing source distribution, a complete
machine-readable copy of the corresponding source code, to be
distributed under the terms of Sections 1 and 2 above on a medium
customarily used for software interchange; or,
c) Accompany it with the information you received as to the offer
to distribute corresponding source code. (This alternative is
allowed only for noncommercial distribution and only if you
received the program in object code or executable form with such
an offer, in accord with Subsection b above.)
The source code for a work means the preferred form of the work for
making modifications to it. For an executable work, complete source
code means all the source code for all modules it contains, plus any
associated interface definition files, plus the scripts used to
control compilation and installation of the executable. However, as a
special exception, the source code distributed need not include
anything that is normally distributed (in either source or binary
form) with the major components (compiler, kernel, and so on) of the
operating system on which the executable runs, unless that component
itself accompanies the executable.
If distribution of executable or object code is made by offering
access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.
4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
void, and will automatically terminate your rights under this License.
However, parties who have received copies, or rights, from you under
this License will not have their licenses terminated so long as such
parties remain in full compliance.
5. You are not required to accept this License, since you have not
signed it. However, nothing else grants you permission to modify or
distribute the Program or its derivative works. These actions are
prohibited by law if you do not accept this License. Therefore, by
modifying or distributing the Program (or any work based on the
Program), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Program or works based on it.
6. Each time you redistribute the Program (or any work based on the
Program), the recipient automatically receives a license from the
original licensor to copy, distribute or modify the Program subject to
these terms and conditions. You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties to
this License.
7. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Program at all. For example, if a patent
license would not permit royalty-free redistribution of the Program by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Program.
If any portion of this section is held invalid or unenforceable under
any particular circumstance, the balance of the section is intended to
apply and the section as a whole is intended to apply in other
circumstances.
It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system, which is
implemented by public license practices. Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
may add an explicit geographical distribution limitation excluding
those countries, so that distribution is permitted only in or among
countries not thus excluded. In such case, this License incorporates
the limitation as if written in the body of this License.
9. The Free Software Foundation may publish revised and/or new versions
of the General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the Program
specifies a version number of this License which applies to it and "any
later version", you have the option of following the terms and conditions
either of that version or of any later version published by the Free
Software Foundation. If the Program does not specify a version number of
this License, you may choose any version ever published by the Free Software
Foundation.
10. If you wish to incorporate parts of the Program into other free
programs whose distribution conditions are different, write to the author
to ask for permission. For software which is copyrighted by the Free
Software Foundation, write to the Free Software Foundation; we sometimes
make exceptions for this. Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
NO WARRANTY
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
REPAIR OR CORRECTION.
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, the commands you use may
be called something other than `show w' and `show c'; they could even be
mouse-clicks or menu items--whatever suits your program.
You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the program, if
necessary. Here is a sample; alter the names:
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
`Gnomovision' (which makes passes at compilers) written by James Hacker.
<signature of Ty Coon>, 1 April 1989
Ty Coon, President of Vice
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library. If this is what you want to do, use the GNU Library General
Public License instead of this License.
--- NEW FILE: zbar.info ---
Package: zbar
Version: 0.10
Revision: 1
Source: mirror:sourceforge:zbar/zbar-%v.tar.bz2
Source-MD5: 0fd61eb590ac1bab62a77913c8b086a5
BuildDepends: <<
fink (>= 0.24.12-1),
fink-package-precedence,
imagemagick2-dev,
libjpeg8,
libzbar0 (>= %v-1),
pkgconfig,
xmlto
<<
Depends: <<
imagemagick2-shlibs,
imagemagick,
libjpeg8-shlibs,
libzbar0-shlibs (>= %v-1)
<<
GCC: 4.0
PatchFile: %n.patch
PatchFile-MD5: 0ff640affb0a73f306bb2577eaaab4ae
PatchScript: <<
%{default_script}
mkdir -p _include/zbar
ln -s ../include/config.h _include
perl -pi -e 's,zbar/libzbar.la,,g' Makefile.in
perl -pi -e 's,zbar.pc,,g' Makefile.in
<<
ConfigureParams: --enable-dependency-tracking --disable-video --with-imagemagick --without-npapi --without-gtk --without-python --without-qt
CompileScript: <<
#!/bin/sh -ex
# gather flags for installed zbar
ZBAR_CFLAGS=`%p/bin/pkg-config --cflags zbar`
ZBAR_LIBS=`%p/bin/pkg-config --libs zbar`
CPPFLAGS="$CPPFLAGS $ZBAR_CFLAGS"
LDFLAGS="$LDFLAGS $ZBAR_LIBS"
./configure %c
make
fink-package-precedence .
<<
InstallScript: <<
make install DESTDIR=%d include_HEADERS= zinclude_HEADERS=
rm -rf %i/share/doc/zbar
rmdir %i/share/zbar
install examples/upcrpc.py %i/bin/upcrpc
<<
DocFiles: COPYING ChangeLog HACKING NEWS README TODO
DescPackaging: <<
Hack makefiles and autoconf config.h locations to use
installed zebra instead of building locally.
Redo doc files manually so they go where we want and include
the files oriented towards users not installers.
This is just the zbarimg program.
<<
DescUsage: <<
'zbarimg' is the main graphics-file decoding program.
'upcrpc' does UPC-code lookups from http://dev.upcdatabase.com
<<
Description: Barcode decoding program
Homepage: http://zbar.sourceforge.net/
License: LGPL
Maintainer: Daniel Macks <dm...@ne...>
--- NEW FILE: wview.patch ---
diff -uNbwr wview-3.4.0/Makefile.in wview-3.4.0-new/Makefile.in
--- wview-3.4.0/Makefile.in 2007-12-16 23:41:55.000000000 -0500
+++ wview-3.4.0-new/Makefile.in 2007-12-19 13:51:58.000000000 -0500
@@ -191,8 +191,8 @@
SUBDIRS = stations $(am__append_1) $(am__append_2) htmlgenerator \
alarms cwop ftp ssh procmon wviewconfig utilities \
$(am__append_3)
-WV_CONFIG_DIR = /etc/wview
-WV_RUN_DIR = /var/wview
+WV_CONFIG_DIR = $(sysconfdir)/wview
+WV_RUN_DIR = $(localstatedir)/wview
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -628,19 +628,17 @@
# this target installs the default environment in the default places
install-env: install
- mkdir -p $(WV_CONFIG_DIR)
- mkdir -p $(WV_RUN_DIR)
- mkdir -p $(WV_RUN_DIR)/noaa
- mkdir -p $(WV_RUN_DIR)/alarms
- mkdir -p $(WV_RUN_DIR)/archive
- mkdir -p $(WV_RUN_DIR)/img
- cp -rf $(WV_RUN_DIR)/img $(WV_RUN_DIR)/img-old
- cp -rf $(top_srcdir)/bin/img $(WV_RUN_DIR)
- cp -rf $(WV_CONFIG_DIR) $(WV_CONFIG_DIR)-old
- cp -rf $(top_srcdir)/examples/html/classic/*.* $(WV_CONFIG_DIR)/html
- cp -rf $(top_srcdir)/examples/alarms $(WV_CONFIG_DIR)
- cp -rf $(top_srcdir)/examples/conf/*.* $(WV_CONFIG_DIR)
- chmod +x $(WV_CONFIG_DIR)/post-generate.sh
+ install -d $(DESTDIR)$(WV_CONFIG_DIR)
+ install -d $(DESTDIR)$(WV_CONFIG_DIR)/html
+ install -c -m 644 $(top_srcdir)/examples/html/classic/* $(DESTDIR)$(WV_CONFIG_DIR)/html/
+ install -c -m 755 $(top_srcdir)/examples/alarms/* $(DESTDIR)$(WV_CONFIG_DIR)/
+ install -c -m 644 $(top_srcdir)/examples/conf/* $(DESTDIR)$(WV_CONFIG_DIR)/
+ install -c -m 755 $(top_srcdir)/examples/conf/*.sh $(DESTDIR)$(WV_CONFIG_DIR)/
+ install -d $(DESTDIR)$(WV_RUN_DIR)/noaa
+ install -d $(DESTDIR)$(WV_RUN_DIR)/alarms
+ install -d $(DESTDIR)$(WV_RUN_DIR)/archive
+ install -d $(DESTDIR)$(WV_RUN_DIR)/img
+ install -c -m 644 $(top_srcdir)/bin/img/* $(DESTDIR)$(WV_RUN_DIR)/img
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff -uNbwr wview-3.4.0/wviewconfig/wviewconfig.sh wview-3.4.0-new/wviewconfig/wviewconfig.sh
--- wview-3.4.0/wviewconfig/wviewconfig.sh 2007-12-12 19:22:28.000000000 -0500
+++ wview-3.4.0-new/wviewconfig/wviewconfig.sh 2007-12-19 14:48:23.000000000 -0500
@@ -23,10 +23,15 @@
################################################################################
################################# M A C R O S ################################
################################################################################
-WVIEWD_PID=/var/wview/wviewd.pid
+WVIEW_DATA_DIR=/var/wview
+WVIEWD_PID=$WVIEW_DATA_DIR/wviewd.pid
WVIEW_CONF_DIR=/etc/wview
STATION_TYPE=VantagePro
-
+if [ -x "/bin/echo" ]; then
+ NONEWLINE_ECHO="/bin/echo -n"
+else
+ NONEWLINE_ECHO="echo -n"
+fi
################################################################################
####################### D E F I N E F U N C T I O N S #######################
@@ -139,7 +144,7 @@
STATION_RAIN_STORM_IDLE_STOP=12
fi
if [ "" = "$ARCHIVE_PATH" ]; then
- ARCHIVE_PATH=/var/wview/archive
+ ARCHIVE_PATH=$WVIEW_DATA_DIR/archive
fi
if [ "" = "$POLL_INTERVAL" ]; then
POLL_INTERVAL=15000
@@ -186,7 +191,7 @@
STATION_STATE=changeME
fi
if [ "" = "$IMAGE_PATH" ]; then
- IMAGE_PATH=/var/wview/img
+ IMAGE_PATH=$WVIEW_DATA_DIR/img
fi
if [ "" = "$HTML_PATH" ]; then
HTML_PATH=$WVIEW_CONF_DIR/html
@@ -347,7 +352,7 @@
mv $WVIEW_CONF_DIR/wview.conf $WVIEW_CONF_DIR/wview.conf.old
fi
echo ""
- echo -n "Writing $WVIEW_CONF_DIR/wview.conf: "
+ $NONEWLINE_ECHO "Writing $WVIEW_CONF_DIR/wview.conf: "
mkdir -p $WVIEW_CONF_DIR
echo "#@" > $WVIEW_CONF_DIR/wview.conf
@@ -453,7 +458,7 @@
echo "STATION_LONGITUDE=$STATION_LONGITUDE" >> $WVIEW_CONF_DIR/wview.conf
echo "" >> $WVIEW_CONF_DIR/wview.conf
- echo "# DO NOT CHANGE this once you have archive records stored in /var/wview/archive!" >> $WVIEW_CONF_DIR/wview.conf
+ echo "# DO NOT CHANGE this once you have archive records stored in $WVIEW_DATA_DIR/archive!" >> $WVIEW_CONF_DIR/wview.conf
echo "# This effects many things (CWOP/Wunderground update interval, etc.) so choose carefully..." >> $WVIEW_CONF_DIR/wview.conf
echo "# Weather data archive interval (minutes, one of 5, 10, 15, 30):" >> $WVIEW_CONF_DIR/wview.conf
echo "STATION_ARCHIVE_INTERVAL=$STATION_ARCHIVE_INTERVAL" >> $WVIEW_CONF_DIR/wview.conf
@@ -520,11 +525,11 @@
echo ""
echo "################################################################################"
echo ""
- echo -n "pausing 3 seconds "
+ $NONEWLINE_ECHO "pausing 3 seconds "
sleep 1
- echo -n "."
+ $NONEWLINE_ECHO "."
sleep 1
- echo -n "."
+ $NONEWLINE_ECHO "."
sleep 1
echo "."
echo ""
@@ -539,7 +544,7 @@
echo "Generic refers to stations without location or archive interval parameter storage -"
echo "in this case you must enter location and archive interval now..."
echo "What weather station do you have (one of VantagePro, Generic):"
- echo -n "($STATION_TYPE): "
+ $NONEWLINE_ECHO "($STATION_TYPE): "
read INVAL
if [ "" != "$INVAL" ]; then
STATION_TYPE=$INVAL
@@ -562,7 +567,7 @@
echo "-------------------------------------------------------------"
echo "--Note-- USB is considered serial (/dev/ttyUSBx, /dev/tty.SLAB_USBtoUART, etc.)"
echo "Physical Interface the weather station is connected to (one of serial or ethernet)"
- echo -n "($STATION_INTERFACE): "
+ $NONEWLINE_ECHO "($STATION_INTERFACE): "
read INVAL
if [ "" != "$INVAL" ]; then
STATION_INTERFACE=$INVAL
@@ -573,7 +578,7 @@
echo ""
echo "-------------------------------------------------------------"
echo "Serial port (device) the weather station is connected to (/dev/ttyS0, /dev/cuaa0, /dev/ttyUSBx, /dev/tty.SLAB_USBtoUART, etc.)"
- echo -n "($STATION_DEV): "
+ $NONEWLINE_ECHO "($STATION_DEV): "
read INVAL
if [ "" != "$INVAL" ]; then
STATION_DEV=$INVAL
@@ -582,7 +587,7 @@
echo ""
echo "-------------------------------------------------------------"
echo "Hostname or IP address the weather station is connected to (i.e. xyplex1 or 10.11.12.13)"
- echo -n "($STATION_HOST): "
+ $NONEWLINE_ECHO "($STATION_HOST): "
read INVAL
if [ "" != "$INVAL" ]; then
STATION_HOST=$INVAL
@@ -592,7 +597,7 @@
echo "-------------------------------------------------------------"
echo "--Note-- This is dependent upon the terminal server used - consult your terminal server documentation"
echo "TCP port the weather station is connected to on $STATION_HOST (i.e. 2101)"
- echo -n "($STATION_PORT): "
+ $NONEWLINE_ECHO "($STATION_PORT): "
read INVAL
if [ "" != "$INVAL" ]; then
STATION_PORT=$INVAL
@@ -605,7 +610,7 @@
echo ""
echo "-------------------------------------------------------------"
echo "Station Rain Season Start Month (1 - 12):"
- echo -n "($STATION_RAIN_SEASON_START): "
+ $NONEWLINE_ECHO "($STATION_RAIN_SEASON_START): "
read INVAL
if [ "" != "$INVAL" ]; then
STATION_RAIN_SEASON_START=$INVAL
@@ -614,7 +619,7 @@
echo ""
echo "-------------------------------------------------------------"
echo "Station rain storm start trigger (rainfall rate in inches/hour):"
- echo -n "($STATION_RAIN_STORM_TRIGGER_START): "
+ $NONEWLINE_ECHO "($STATION_RAIN_STORM_TRIGGER_START): "
read INVAL
if [ "" != "$INVAL" ]; then
STATION_RAIN_STORM_TRIGGER_START=$INVAL
@@ -623,7 +628,7 @@
echo ""
echo "-------------------------------------------------------------"
echo "Station rain storm stop time (hours without any rainfall which will end the storm):"
- echo -n "($STATION_RAIN_STORM_IDLE_STOP): "
+ $NONEWLINE_ECHO "($STATION_RAIN_STORM_IDLE_STOP): "
read INVAL
if [ "" != "$INVAL" ]; then
STATION_RAIN_STORM_IDLE_STOP=$INVAL
@@ -633,7 +638,7 @@
echo "-------------------------------------------------------------"
echo "--Note-- Under normal circumstances, the default selection should be used"
echo "Where to store archive files (*.wlk) - this must be local to the wview server"
- echo -n "($ARCHIVE_PATH): "
+ $NONEWLINE_ECHO "($ARCHIVE_PATH): "
read INVAL
if [ "" != "$INVAL" ]; then
ARCHIVE_PATH=$INVAL
@@ -643,7 +648,7 @@
echo "-------------------------------------------------------------"
echo "--Note-- This value must be one of 10000, 15000 or 30000 (milliseconds)"
echo "How often should wviewd poll the weather station for current conditions (milliseconds)?"
- echo -n "($POLL_INTERVAL): "
+ $NONEWLINE_ECHO "($POLL_INTERVAL): "
read INVAL
if [ "" != "$INVAL" ]; then
POLL_INTERVAL=$INVAL
@@ -653,7 +658,7 @@
echo "-------------------------------------------------------------"
echo "--Note-- This value must be >= 15000 (milliseconds)"
echo "How often should wviewd provide current conditions data to clients such as wvalarmd (milliseconds)?"
- echo -n "($PUSH_INTERVAL): "
+ $NONEWLINE_ECHO "($PUSH_INTERVAL): "
read INVAL
if [ "" != "$INVAL" ]; then
PUSH_INTERVAL=$INVAL
@@ -674,7 +679,7 @@
echo "01000000 - wvhttpd"
echo "11111111 - All On"
echo "Verbose diagnostic log messages per-daemon bitmask (8 characters, 0 or 1 only):"
- echo -n "($VERBOSE_MSGS): "
+ $NONEWLINE_ECHO "($VERBOSE_MSGS): "
read INVAL
if [ "" != "$INVAL" ]; then
VERBOSE_MSGS=$INVAL
@@ -687,7 +692,7 @@
echo "--Note-- enabling this can occasionally cause serial IF problems -"
echo "--Note-- if you are having WAKEUP console errors, try disabling this"
echo "Should wview generate RX check data (populate rxCheck.png chart) (0 or 1)?"
- echo -n "($DO_RXCHECK): "
+ $NONEWLINE_ECHO "($DO_RXCHECK): "
read INVAL
if [ "" != "$INVAL" ]; then
DO_RXCHECK=$INVAL
@@ -699,7 +704,7 @@
echo ""
echo "-------------------------------------------------------------"
echo "Weather station elevation (feet above sea level)?"
- echo -n "($STATION_ELEVATION): "
+ $NONEWLINE_ECHO "($STATION_ELEVATION): "
read INVAL
if [ "" = "$INVAL" ]; then
if [ "changeME" = "$STATION_ELEVATION" ]; then
@@ -715,7 +720,7 @@
echo "--Note-- This is given in decimal degrees NORTH (-90.00 to 90.00) -"
echo "--Note-- Examples: -46.31 (46.31 degrees SOUTH), 33.4 (33.4 degrees NORTH)"
echo "Weather station latitude?"
- echo -n "($STATION_LATITUDE): "
+ $NONEWLINE_ECHO "($STATION_LATITUDE): "
read INVAL
if [ "" = "$INVAL" ]; then
if [ "changeME" = "$STATION_LATITUDE" ]; then
@@ -731,7 +736,7 @@
echo "--Note-- This is given in decimal degrees EAST (-179.99 to 180.00) -"
echo "--Note-- Examples: -96.9 (96.9 degrees WEST), 112.71 (112.71 degrees EAST)"
echo "Weather station longitude?"
- echo -n "($STATION_LONGITUDE): "
+ $NONEWLINE_ECHO "($STATION_LONGITUDE): "
read INVAL
if [ "" = "$INVAL" ]; then
if [ "changeME" = "$STATION_LONGITUDE" ]; then
@@ -744,14 +749,14 @@
echo ""
echo "-------------------------------------------------------------"
- echo "--Note-- DO NOT CHANGE this once you have archive records stored in /var/wview/archive"
+ echo "--Note-- DO NOT CHANGE this once you have archive records stored in $WVIEW_DATA_DIR/archive"
echo "--Note-- unless you delete all *.wlk files first!"
echo "--Note-- This effects many things (CWOP/Wunderground update interval, etc.) so"
echo "--Note-- choose it carefully and be prepared to stay with your choice!"
echo "--Note-- If unsure what all this affects, CTRL-C to exit this script and do"
echo "--Note-- a search for 'archive interval' in the wview User Manual..."
echo "Weather data archive interval (minutes, one of 5, 10, 15, 30)?"
- echo -n "($STATION_ARCHIVE_INTERVAL): "
+ $NONEWLINE_ECHO "($STATION_ARCHIVE_INTERVAL): "
read INVAL
if [ "" != "$INVAL" ]; then
STATION_ARCHIVE_INTERVAL=$INVAL
@@ -762,7 +767,7 @@
echo "-------------------------------------------------------------"
echo "--Note-- currently only MySQL and PostgreSQL are supported"
echo "Should wviewd store archive data in a relational database (0 or 1)?"
- echo -n "($SQLDB_ENABLE): "
+ $NONEWLINE_ECHO "($SQLDB_ENABLE): "
read INVAL
if [ "" != "$INVAL" ]; then
SQLDB_ENABLE=$INVAL
@@ -773,7 +778,7 @@
echo "-------------------------------------------------------------"
echo "--Note-- Do not enable unless you have installed extra sensors or have a VP Plus"
echo "Should wviewd store extended sensor archive data in the database (0 or 1)?"
- echo -n "($SQLDB_EXTENDED_INFO): "
+ $NONEWLINE_ECHO "($SQLDB_EXTENDED_INFO): "
read INVAL
if [ "" != "$INVAL" ]; then
SQLDB_EXTENDED_INFO=$INVAL
@@ -782,7 +787,7 @@
echo ""
echo "-------------------------------------------------------------"
echo "Should wviewd store metric (international) archive data in the database (0 or 1)?"
- echo -n "($SQLDB_STORE_METRIC): "
+ $NONEWLINE_ECHO "($SQLDB_STORE_METRIC): "
read INVAL
if [ "" != "$INVAL" ]; then
SQLDB_STORE_METRIC=$INVAL
@@ -791,7 +796,7 @@
echo ""
echo "-------------------------------------------------------------"
echo "Hostname or IP address of the database server:"
- echo -n "($SQLDB_HOST): "
+ $NONEWLINE_ECHO "($SQLDB_HOST): "
read INVAL
if [ "" = "$INVAL" ]; then
if [ "changeME" = "$SQLDB_HOST" ]; then
@@ -805,7 +810,7 @@
echo ""
echo "-------------------------------------------------------------"
echo "Username of the database server:"
- echo -n "($SQLDB_USERNAME): "
+ $NONEWLINE_ECHO "($SQLDB_USERNAME): "
read INVAL
if [ "" = "$INVAL" ]; then
if [ "changeME" = "$SQLDB_USERNAME" ]; then
@@ -819,7 +824,7 @@
echo ""
echo "-------------------------------------------------------------"
echo "Password for $SQLDB_USERNAME on the database server:"
- echo -n "($SQLDB_PASSWORD): "
+ $NONEWLINE_ECHO "($SQLDB_PASSWORD): "
read INVAL
if [ "" = "$INVAL" ]; then
if [ "changeME" = "$SQLDB_PASSWORD" ]; then
@@ -833,7 +838,7 @@
echo ""
echo "-------------------------------------------------------------"
echo "Database name for weather records on the database server:"
- echo -n "($SQLDB_DB_NAME): "
+ $NONEWLINE_ECHO "($SQLDB_DB_NAME): "
read INVAL
if [ "" = "$INVAL" ]; then
if [ "changeME" = "$SQLDB_DB_NAME" ]; then
@@ -847,7 +852,7 @@
echo ""
echo "-------------------------------------------------------------"
echo "Table name for weather records on the database server:"
- echo -n "($SQLDB_TABLE_NAME): "
+ $NONEWLINE_ECHO "($SQLDB_TABLE_NAME): "
read INVAL
if [ "" = "$INVAL" ]; then
if [ "changeME" = "$SQLDB_TABLE_NAME" ]; then
@@ -867,7 +872,7 @@
echo ""
echo "-------------------------------------------------------------"
echo "Station Name (no spaces):"
- echo -n "($STATION_NAME): "
+ $NONEWLINE_ECHO "($STATION_NAME): "
read INVAL
if [ "" = "$INVAL" ]; then
if [ "changeME" = "$STATION_NAME" ]; then
@@ -881,7 +886,7 @@
echo ""
echo "-------------------------------------------------------------"
echo "Station City (no spaces):"
- echo -n "($STATION_CITY): "
+ $NONEWLINE_ECHO "($STATION_CITY): "
read INVAL
if [ "" = "$INVAL" ]; then
if [ "changeME" = "$STATION_CITY" ]; then
@@ -895,7 +900,7 @@
echo ""
echo "-------------------------------------------------------------"
echo "Station State (no spaces):"
- echo -n "($STATION_STATE): "
+ $NONEWLINE_ECHO "($STATION_STATE): "
read INVAL
if [ "" = "$INVAL" ]; then
if [ "changeME" = "$STATION_STATE" ]; then
@@ -913,7 +918,7 @@
echo "--Note-- your site to a remote web server (such as your ISP), please use the "
echo "--Note-- default selection."
echo "Where to store generated web site graphics and HTML files:"
- echo -n "($IMAGE_PATH): "
+ $NONEWLINE_ECHO "($IMAGE_PATH): "
read INVAL
if [ "" != "$INVAL" ]; then
IMAGE_PATH=$INVAL
@@ -923,7 +928,7 @@
echo "-------------------------------------------------------------"
echo "--Note-- Normal installs should use the default selection"
echo "Where to find HTML template files for web site generation:"
- echo -n "($HTML_PATH): "
+ $NONEWLINE_ECHO "($HTML_PATH): "
read INVAL
if [ "" != "$INVAL" ]; then
HTML_PATH=$INVAL
@@ -932,7 +937,7 @@
echo ""
echo "-------------------------------------------------------------"
echo "Generation start offset (0-4) in minutes past the 5-minute mark:"
- echo -n "($START_OFFSET): "
+ $NONEWLINE_ECHO "($START_OFFSET): "
read INVAL
if [ "" != "$INVAL" ]; then
START_OFFSET=$INVAL
@@ -941,7 +946,7 @@
echo ""
echo "-------------------------------------------------------------"
echo "Generation interval (refresh interval for your site data) (minutes):"
- echo -n "($GENERATE_INTERVAL): "
+ $NONEWLINE_ECHO "($GENERATE_INTERVAL): "
read INVAL
if [ "" != "$INVAL" ]; then
GENERATE_INTERVAL=$INVAL
@@ -950,7 +955,7 @@
echo ""
echo "-------------------------------------------------------------"
echo "Enable metric conversion/units?"
- echo -n "($METRIC_UNITS): "
+ $NONEWLINE_ECHO "($METRIC_UNITS): "
read INVAL
if [ "" != "$INVAL" ]; then
METRIC_UNITS=$INVAL
@@ -960,7 +965,7 @@
echo ""
echo "-------------------------------------------------------------"
echo "Use mm for rain instead of cm?"
- echo -n "($METRIC_USE_RAIN_MM): "
+ $NONEWLINE_ECHO "($METRIC_USE_RAIN_MM): "
read INVAL
if [ "" != "$INVAL" ]; then
METRIC_USE_RAIN_MM=$INVAL
@@ -970,7 +975,7 @@
echo ""
echo "-------------------------------------------------------------"
echo "Store/process VP Plus extended sensor values for site generation?"
- echo -n "($EXTENDED_DATA): "
+ $NONEWLINE_ECHO "($EXTENDED_DATA): "
read INVAL
if [ "" != "$INVAL" ]; then
EXTENDED_DATA=$INVAL
@@ -981,7 +986,7 @@
echo "--Note-- Each file contains one day's worth of archive records in ASCII format"
echo "--Note-- Special Values: -1 disables archive browser file generation and 0 keeps all files"
echo "How many archive record browser files to keep (days):"
- echo -n "($ARCHIVE_BROWSER_FILES_TO_KEEP): "
+ $NONEWLINE_ECHO "($ARCHIVE_BROWSER_FILES_TO_KEEP): "
read INVAL
if [ "" != "$INVAL" ]; then
ARCHIVE_BROWSER_FILES_TO_KEEP=$INVAL
@@ -990,7 +995,7 @@
echo ""
echo "-------------------------------------------------------------"
echo "Moon Phase increasing text (no spaces):"
- echo -n "($MPHASE_INCREASE): "
+ $NONEWLINE_ECHO "($MPHASE_INCREASE): "
read INVAL
if [ "" != "$INVAL" ]; then
MPHASE_INCREASE=$INVAL
@@ -999,7 +1004,7 @@
echo ""
echo "-------------------------------------------------------------"
echo "Moon Phase decreasing text (no spaces):"
- echo -n "($MPHASE_DECREASE): "
+ $NONEWLINE_ECHO "($MPHASE_DECREASE): "
read INVAL
if [ "" != "$INVAL" ]; then
MPHASE_DECREASE=$INVAL
@@ -1008,7 +1013,7 @@
echo ""
echo "-------------------------------------------------------------"
echo "Moon Phase full text (no spaces):"
- echo -n "($MPHASE_FULL): "
+ $NONEWLINE_ECHO "($MPHASE_FULL): "
read INVAL
if [ "" != "$INVAL" ]; then
MPHASE_FULL=$INVAL
@@ -1017,7 +1022,7 @@
echo ""
echo "-------------------------------------------------------------"
echo "Local Radar URL (no spaces):"
- echo -n "($LOCAL_RADAR_URL): "
+ $NONEWLINE_ECHO "($LOCAL_RADAR_URL): "
read INVAL
if [ "" != "$INVAL" ]; then
LOCAL_RADAR_URL=$INVAL
@@ -1026,7 +1031,7 @@
echo ""
echo "-------------------------------------------------------------"
echo "Local Forecast URL (no spaces):"
- echo -n "($LOCAL_FORECAST_URL): "
+ $NONEWLINE_ECHO "($LOCAL_FORECAST_URL): "
read INVAL
if [ "" != "$INVAL" ]; then
LOCAL_FORECAST_URL=$INVAL
@@ -1037,7 +1042,7 @@
echo "--Note-- see 'man strftime' for allowable formats "
echo "--Note-- underscores will be replaced by spaces in output "
echo "Date format (no spaces): "
- echo -n "($DATE_FORMAT): "
+ $NONEWLINE_ECHO "($DATE_FORMAT): "
read INVAL
if [ "" != "$INVAL" ]; then
DATE_FORMAT=$INVAL
@@ -1053,7 +1058,7 @@
mv $WVIEW_CONF_DIR/htmlgen.conf $WVIEW_CONF_DIR/htm...
[truncated message content] |