Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/net
In directory sc8-pr-cvs17:/tmp/cvs-serv23708/main/finkinfo/net
Added Files:
unison.info unison.patch
Log Message:
Stabilize Unison
--- NEW FILE: unison.patch ---
diff -aruN unison.orig/unison-2.10.2/Makefile.OCaml
unison/unison-2.10.2/Makefile.OCaml
--- unison.orig/unison-2.10.2/Makefile.OCaml 2004-09-06 12:15:46.000000000
-0700
+++ unison/unison-2.10.2/Makefile.OCaml 2005-09-18 13:03:25.000000000 -0700
@@ -25,7 +25,7 @@
ifeq (${OSCOMP},cygwingnuc) # Define this if compiling with Cygwin GNU C
OSARCH=win32gnuc
- ETAGS=c:/emacs/bin/etags
+ ETAGS=/bin/etags
buildexecutable:: win32rc/unison.res.lib
else
# Win32 system
@@ -58,9 +58,7 @@
# The OCaml lib dir is used by all versions
# It is extracted from 'ocamlc -v' and Windows '\' separators are turned
# to Unix '/' separators, and extraneous control-M's are deleted.
-# Unfortunately there is a literal control-M buried in this, I'd rather
-# get rid of it...
-OCAMLLIBDIR=$(shell ocamlc -v | tail -1 | sed -e 's/.* //g' | sed -e
's/\\/\//g' | sed -e 's/
//g')
[...1092 lines suppressed...]
- Filename.concat dirString n
- | `Unix ->
- Filename.concat (safeGetenv "HOME") n
+ if osType = `Unix || isCygwin then
+ Filename.concat (safeGetenv "HOME") n
+ else if osType = `Win32 then
+ let dirString =
+ try Unix.getenv "USERPROFILE" (* Windows NT/2K *)
+ with Not_found ->
+ try Unix.getenv "HOME" (* Windows 9x with Cygwin HOME set *)
+ with Not_found ->
+ try Unix.getenv "UNISON" (* Use UNISON dir if none of
+ the above are set *)
+ with Not_found -> "c:/" (* Default *) in
+ Filename.concat dirString n
+ else
+ assert false (* osType can't be anything else *)
(*****************************************************************************)
(* "Upcall" for building pathnames in the .unison dir *)
--- NEW FILE: unison.info ---
Info2: <<
Package: unison%type_pkg[uitype]
Version: 2.13.16
Revision: 1004
Type: uitype (. -nox -aqua)
Description: File synchronization tool
DescDetail: <<
Unison is a file-synchronization tool for Unix and Windows. It allows two
replicas of a collection of files and directories to be stored on different
hosts (or different disks on the same host), modified separately, and then
brought up to date by propagating the changes in each replica to the other.
Unison shares a number of features with tools such as configuration
management packages (CVS, PRCS, etc.) distributed filesystems (Coda, etc.)
uni-directional mirroring utilities (rsync, etc.) and other synchronizers
(Intellisync, Reconcile, etc).
This package includes multiple versions of Unison: 2.9.1, 2.10.2 and 2.13.16.
The Aqua interface is only available for 2.13.16.
Note: All variants can be installed simultaneously. This package uses the
update-alternatives system so that the command 'unison' automatically uses
the best-available UI for the highest-available version. Other versions
can be run using 'unison-[version]' or 'unison-[version]-[uitype]. Type
'ls %p/bin/unison*' and 'man update-alternatives' for more information.
<<
DescPackaging: <<
Unison requires the versions used on client and server to match (major and
minor for versions up to 2.12, major only for 2.13+). Most OS
distributions provide only one version -- 2.9.1, 2.10.2 or 2.13. This
package is interoperable with all such distributions.
<<
License: GPL
Source:
http://www.cis.upenn.edu/~bcpierce/unison/download/stable/unison-2.9.1/src.tar.gz
SourceRename: unison-2.9.1.tar.gz
Source-MD5: d8084fa87c13671de21ec1b701a4606c
Source2:
http://www.cis.upenn.edu/~bcpierce/unison/download/stable/unison-2.9.1/unison-manual.html
Source2Rename: unison-2.9.1-manual.html
Source2-MD5: 9fc2f7e967b3ddf24abd2c5170d8d7eb
Source3:
http://www.cis.upenn.edu/~bcpierce/unison/download/stable/unison-2.10.2/unison-2.10.2.tar.gz
Source3-MD5: a93cf03d4221ab6bab8b758b0325a9d5
Source4:
http://www.cis.upenn.edu/~bcpierce/unison/download/stable/unison-2.10.2/unison-2.10.2-manual.html
Source4-MD5: 32327d9239b7abe688cecd6ceaa3dd47
Source5:
http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-2.13.16.tar.gz
Source5-MD5: a79bf5f4ebf2a1eaf15b1ac97f827374
Source6:
http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-2.13.16-manual.html
Source6-MD5: 2b39e52ec3893a112b28b7b0a294d941
Maintainer: Ben Willmore <[EMAIL PROTECTED]>
Homepage: http://www.cis.upenn.edu/~bcpierce/unison/
DocFiles: <<
COPYING CONTRIB README ROADMAP.txt
BUGS.txt:BUGS-2.9.1.txt INSTALL:INSTALL-2.9.1 NEWS:NEWS-2.9.1
TODO.txt:TODO-2.9.1.txt
../unison-2.9.1-manual.html
../unison-2.10.2/BUGS.txt:BUGS-2.10.2.txt
../unison-2.10.2/INSTALL:INSTALL-2.10.2
../unison-2.10.2/NEWS:NEWS-2.10.2 ../unison-2.10.2/TODO.txt:TODO-2.10.2.txt
../unison-2.10.2-manual.html
../unison-2.13.16/BUGS.txt:BUGS-2.13.16.txt
../unison-2.13.16/INSTALL:INSTALL-2.13.16
../unison-2.13.16/NEWS:NEWS-2.13.16 ../unison-2.13.16/TODO.txt:TODO-2.13.16.txt
../unison-2.13.16-manual.html
<<
BuildDepends: <<
ocaml (>=3.08),
(%type_raw[uitype] = .) lablgtk (>= 1.2.7-1002),
(%type_raw[uitype] = .) gtk+,
(%type_raw[uitype] = .) glib,
(%type_raw[uitype] = .) lablgtk2,
(%type_raw[uitype] = .) x11-dev,
(%type_raw[uitype] = .) gtk+2-dev,
(%type_raw[uitype] = .) glib2-dev (>= 2.6.6-1111),
(%type_raw[uitype] = .) atk1,
(%type_raw[uitype] = .) pango1-xft2-dev,
(%type_raw[uitype] = .) libgettext3-dev
<<
Depends: <<
(%type_raw[uitype] = .) gtk+-shlibs,
(%type_raw[uitype] = .) glib-shlibs,
(%type_raw[uitype] = .) x11-shlibs,
(%type_raw[uitype] = .) gtk+2-shlibs,
(%type_raw[uitype] = .) glib2-shlibs (>= 2.6.6-1111),
(%type_raw[uitype] = .) atk1-shlibs,
(%type_raw[uitype] = .) pango1-xft2-shlibs,
(%type_raw[uitype] = .) libgettext3-shlibs,
(%type_raw[uitype] = .) libiconv,
(%type_raw[uitype] = '-aqua') macosx
<<
PatchScript: <<
#!/bin/bash -ev
cd ..
patch -p1 <%a/%{ni}.patch
<<
CompileScript: <<
#!/bin/bash -ev
cd ..
dirs=`ls | grep -v manual`
for dir in $dirs; do
cd $dir
maj=`expr "$dir" : "unison-2.\([0-9]*\)"`
if [ "%type_raw[uitype]" == "-nox" ]; then
make UISTYLE=text THREADS=true
elif [ "%type_raw[uitype]" == "." ]; then
if [ `expr "$maj" \< 10` == 1 ]; then
make UISTYLE=gtk THREADS=true
else
make UISTYLE=gtk2 THREADS=true
fi
elif [ "%type_raw[uitype]" == "-aqua" ]; then
if [ `expr "$maj" \> 12` == 1 ]; then
make UISTYLE=mac THREADS=true
fi
fi
cd ..
done
<<
InstallScript: <<
#!/bin/bash -ev
mkdir -p %i/bin
cd ..
dirs=`ls | grep -v manual`
for dir in $dirs; do
cd $dir
maj=`expr "$dir" : "unison-2.\([0-9]*\)"`
if [ `expr "$maj" \< 13` == 1 ]; then
ver=`expr "$dir" : "unison-\(2.[0-9.]*\)"`
else
ver=`expr "$dir" : "unison-\(2.[0-9]*\)"`
fi
if [ "%type_raw[uitype]" == "-nox" ]; then
install -m0755 unison %i/bin/unison-$ver-nox
elif [ "%type_raw[uitype]" == "." ]; then
install -m0755 unison %i/bin/unison-$ver-x11
elif [ "%type_raw[uitype]" == "-aqua" ]; then
if [ `expr "$maj" \> 12` == 1 ]; then
mkdir -p %i/Applications
cp -pR uimac/build/Unison.app %i/Applications/Unison-$ver.app || \
cp -pR uimac/build/Default/Unison.app %i/Applications/Unison-$ver.app
echo \#\!/bin/sh > %i/bin/unison-$ver-aqua
echo %p/Applications/Unison-$ver.app/Contents/MacOS/Unison \$* \
>> %i/bin/unison-$ver-aqua
chmod a+x %i/bin/unison-$ver-aqua
fi
fi
cd ..
done
<<
PostInstScript: <<
for dir in unison-2.9.1 unison-2.10.2 unison-2.13.16; do
maj=`expr "$dir" : "unison-2.\([0-9]*\)"`
pri=`echo $dir | sed -e 's/unison-//g' | sed -e 's/\./ /g' | xargs printf
%%02d`
if [ `expr "$maj" \< 13` == 1 ]; then
ver=`expr "$dir" : "unison-\(2.[0-9.]*\)"`
else
ver=`expr "$dir" : "unison-\(2.[0-9]*\)"`
fi
if [ "%type_raw[uitype]" == "-nox" ]; then
update-alternatives --install %p/bin/unison-${ver} unison-${ver}
%p/bin/unison-${ver}-nox ${pri}2
update-alternatives --install %p/bin/unison unison
%p/bin/unison-${ver}-nox ${pri}2
elif [ "%type_raw[uitype]" == "." ]; then
update-alternatives --install %p/bin/unison-${ver} unison-${ver}
%p/bin/unison-${ver}-x11 ${pri}4
update-alternatives --install %p/bin/unison unison
%p/bin/unison-${ver}-x11 ${pri}4
elif [ "%type_raw[uitype]" == "-aqua" ]; then
if [ `expr "$maj" \> 12` == 1 ]; then
update-alternatives --install %p/bin/unison-${ver} unison-${ver}
%p/bin/unison-${ver}-aqua ${pri}6
update-alternatives --install %p/bin/unison unison
%p/bin/unison-${ver}-aqua ${pri}6
[ -e /Applications/Fink ] || install -d -m 0755 /Applications/Fink
/bin/ln -sfn %p/Applications/Unison-2.13.app
/Applications/Fink/Unison-2.13.app
fi
fi
done
<<
Prermscript: <<
if [ $1 != "upgrade" ]; then
for dir in unison-2.9.1 unison-2.10.2 unison-2.13.16; do
maj=`expr "$dir" : "unison-2.\([0-9]*\)"`
if [ `expr "$maj" \< 13` == 1 ]; then
ver=`expr "$dir" : "unison-\(2.[0-9.]*\)"`
else
ver=`expr "$dir" : "unison-\(2.[0-9]*\)"`
fi
if [ "%type_raw[uitype]" == "-nox" ]; then
update-alternatives --remove unison-${ver} %p/bin/unison-${ver}-nox
update-alternatives --remove unison %p/bin/unison-${ver}-nox
elif [ "%type_raw[uitype]" == "." ]; then
update-alternatives --remove unison-${ver} %p/bin/unison-${ver}-x11
update-alternatives --remove unison %p/bin/unison-${ver}-x11
elif [ "%type_raw[uitype]" == "-aqua" ]; then
if [ `expr "$maj" \> 12` == 1 ]; then
update-alternatives --remove unison-${ver} %p/bin/unison-${ver}-aqua
update-alternatives --remove unison %p/bin/unison-${ver}-aqua
rm -f /Applications/Fink/Unison-2.13.app
fi
fi
done
fi
<<
<<
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
