Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/10.4-EOL/sci
In directory
vz-cvs-3.sog:/tmp/cvs-serv32609/10.4/unstable/main/finkinfo/10.4-EOL/sci
Modified Files:
xtide.info xtide.patch
Log Message:
Time and xtide wait for no man.
Index: xtide.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/10.4-EOL/sci/xtide.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xtide.info 22 Jul 2011 13:42:08 -0000 1.2
+++ xtide.info 13 Sep 2011 14:01:48 -0000 1.3
@@ -1,6 +1,7 @@
Package: xtide
Version: 2.11
-Revision: 3
+Revision: 4
+
Description: Tide and current prediction software
DescDetail: <<
XTide is a package that provides tide and current predictions in a wide
@@ -33,12 +34,37 @@
that are using obsolete data.
Much longer deviations indicate a problem.
<<
+DescUsage: <<
+The xttpd daemon must be run as nobody. You can do this via
+
+sudo -u nobody xttpd <port number>
+
+replacing <port number> by the port you want to use.
+You can also set it up to run at bootup via
+
+daemonic enable xttpd
+
+To change the default port and/or the website feedback address, edit
+/Library/StartupItems//Library/StartupItems/daemonic-xttpd/daemonic-xttpd
+as a superuser, and alter the command after "#run the daemon" appropriately,
+e.g. change
+
+ "/sw/sbin/xttpd 8000"
+
+to
+
+ "env [email protected] /sw/sbin/xttpd MYPORT"
+<<
DescPackaging: <<
- Use SetCXXFlags to make the package build against Fink's libpng rather
than
- X11's.
-
- The package won't build against libpng15 currently.
+ 2.11-4: Now patched to look for %p/etc/xtide.conf. Set up a default
+ version of that which points to the right places.
+
+ xttpd now built as nobody (the real nobody, not fink's
+ "nobody special") and must be run as nobody. It can be
+ run at startup via daemonic
+ The package won't build against libpng15 currently.
+
2.11-2: Dispense with the wrapper script. Set HFILE_PATH in _this_
package.
Also set WVS_DIR here, too.
@@ -47,39 +73,73 @@
any user setting and whether xtide-harmonics-us and
xtide-harmonics-non-us are
installed.
<<
+
License: Public Domain
Homepage: http://www.flaterco.com/xtide/
Maintainer: Alexander Hansen <[email protected]>
-Source: ftp://ftp.flaterco.com/xtide/%n-%v.tar.bz2
+Source: ftp://ftp.flaterco.com/%n/%n-%v.tar.bz2
Source-MD5: 1d85890bb13b3345154e0f68831b7ebd
+PatchFile: %n.patch
+PatchFile-MD5: 253d4b883cfd88b082ee5e7c85a6eafc
+PatchScript: sed -e 's|@FINKPREFIX@|%p|' %{PatchFile} | patch -p1
+
BuildDepends: fink (>= 0.24.12), fink-package-precedence, libpng14, libtcd,
x11-dev
Depends: <<
- libpng14-shlibs, libtcd-shlibs, x11, x11-shlibs,
- xtide-harmonics-us (>= 20101230-2) |
xtide-harmonics-non-us (>= 20101230-2)
+ daemonic, libpng14-shlibs, libtcd-shlibs, x11, x11-shlibs,
+ xtide-harmonics-us (>= 20110410-1) | xtide-harmonics-non-us (>=
20110410-1)
<<
Recommends: xtide-coastline (>= 20110414-2)
GCC: 4.0
+SetCXXFlags: -L%p/lib
+
ConfigureParams: <<
- --with-x --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib
+ --with-x --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib \
+ --with-xttpd-user=nobody --with-xttpd-group=nobody
<<
-SetCXXFlags: -L%p/lib
-
CompileScript: <<
%{default_script}
fink-package-precedence .
<<
InstallScript: <<
- #!/bin/sh -ev
- make install DESTDIR=%d
+#!/bin/sh -ev
+make install DESTDIR=%d
+mkdir %i/etc
+echo
"%p/share/%n/harmonics-dwf-20110410-free.tcd:%p/share/%n/harmonics-dwf-20110410-nonfree.tcd"
\
+ > %i/etc/%n.conf
+echo "%p/share/%n-coastline" >> %i/etc/%n.conf
<<
-RuntimeVars: <<
- HFILE_PATH: %p/share/%n
- WVS_DIR: %p/share/%n-coastline
+
+ConfFiles: %p/etc/%n.conf
+
+DaemonicName: xttpd
+DaemonicFile: <<
+ <service>
+ <description>XTTPD daemon</description>
+ <message>XTide web server</message>
+ <startmessage>Starting XTTPD</startmessage>
+ <stopmessage>Stopping XTTPD</stopmessage>
+ <restartmessage>Restarting XTTPD</restartmessage>
+ <daemon name="xttpd">
+ <executable background="no">/usr/bin/sudo</executable>
+ <parameters>-u nobody %p/sbin/xttpd 8000</parameters>
+ </daemon>
+ </service>
<<
-DocFiles: AUTHORS COPYING NEWS README CONFIGURE-HELP
+
+PostInstScript: <<
+ daemonic install xttpd
+<<
+PreRmScript: <<
+ if [ $1 != "upgrade" ]; then
+ daemonic remove xttpd
+ fi
+<<
+
+DocFiles: AUTHORS COPYING NEWS README
+
Index: xtide.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/10.4-EOL/sci/xtide.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xtide.patch 11 Jul 2011 04:05:48 -0000 1.1
+++ xtide.patch 13 Sep 2011 14:01:49 -0000 1.2
@@ -1,9 +1,48 @@
-diff -Naur xtide-2.11/xtide_program_wrapper
xtide-2.11.patched//xtide_program_wrapper
---- xtide-2.11/xtide_program_wrapper 1969-12-31 19:00:00.000000000 -0500
-+++ xtide-2.11.patched//xtide_program_wrapper 2011-03-24 13:52:49.000000000
-0400
-@@ -0,0 +1,5 @@
-+#!/bin/bash
-+. PREFIX/bin/init.sh
-+export HFILE_PATH="$HFILE_PATH_US:$HFILE_PATH_NON_US:$HFILE_PATH"
-+executable=${0##*/}
-+exec -a "$executable" "$executable.bin" "$@"
+diff -Nurd xtide-2.11/Global.cc xtide-2.11.patched/Global.cc
+--- xtide-2.11/Global.cc 2009-12-22 18:56:58.000000000 -0500
++++ xtide-2.11.patched/Global.cc 2011-09-12 20:38:28.000000000 -0400
+@@ -203,7 +203,7 @@
+ #ifdef UseLocalFiles
+ static const char confFile[] = "xtide.conf";
+ #else
+- static const char confFile[] = "/etc/xtide.conf";
++ static const char confFile[] = "@FINKPREFIX@/etc/xtide.conf";
+ #endif
+ static bool firstCall (true);
+ static SafeVector<Dstr> xtideConfLines (2U);
+diff -Nurd xtide-2.11/tide.1 xtide-2.11.patched/tide.1
+--- xtide-2.11/tide.1 2009-09-11 08:16:29.000000000 -0400
++++ xtide-2.11.patched/tide.1 2011-09-12 21:27:26.000000000 -0400
+@@ -59,7 +59,7 @@
+ .BR http://www.flaterco.com/xtide/ .
+ .SH CONFIGURATION
+ Unless a configuration file
+-.B /etc/xtide.conf
++.B @FINKPREFIX@/etc/xtide.conf
+ is supplied, you must set the environment variable
+ .B HFILE_PATH
+ to point to the harmonics
+diff -Nurd xtide-2.11/xtide.1 xtide-2.11.patched/xtide.1
+--- xtide-2.11/xtide.1 2009-09-11 08:16:29.000000000 -0400
++++ xtide-2.11.patched/xtide.1 2011-09-12 21:27:47.000000000 -0400
+@@ -68,7 +68,7 @@
+ .BR http://www.flaterco.com/xtide/ .
+ .SH CONFIGURATION
+ Unless a configuration file
+-.B /etc/xtide.conf
++.B @FINKPREFIX@/etc/xtide.conf
+ is supplied, you must set the environment variable
+ .B HFILE_PATH
+ to point to the harmonics
+diff -Nurd xtide-2.11/xttpd.8 xtide-2.11.patched/xttpd.8
+--- xtide-2.11/xttpd.8 2008-01-18 18:12:37.000000000 -0500
++++ xtide-2.11.patched/xttpd.8 2011-09-12 21:28:01.000000000 -0400
+@@ -87,7 +87,7 @@
+ .BR http://www.flaterco.com/xtide/ .
+ .SH CONFIGURATION
+ Unless a configuration file
+-.B /etc/xtide.conf
++.B @FINKPREFIX@/etc/xtide.conf
+ is supplied, you must set the environment variable
+ .B HFILE_PATH
+ to point to the harmonics
------------------------------------------------------------------------------
BlackBerry® DevCon Americas, Oct. 18-20, San Francisco, CA
Learn about the latest advances in developing for the
BlackBerry® mobile platform with sessions, labs & more.
See new tools and technologies. Register for BlackBerry® DevCon today!
http://p.sf.net/sfu/rim-devcon-copy1
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
