4 files changed, 117 insertions, 0 deletions
diff --git a/staging/unison/PKGBUILD b/staging/unison/PKGBUILD
new file mode 100644
index 000000000..83c4cc1c5
--- /dev/null
+++ b/staging/unison/PKGBUILD
@@ -0,0 +1,51 @@
+# $Id: PKGBUILD 147256 2012-01-25 05:10:29Z eric $
+#Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+
+pkgname=unison
+pkgver=2.40.63
+pkgrel=3
+pkgdesc="Unison is a file-synchronization tool"
+arch=(i686 x86_64)
+license=('GPL2')
+url="http://www.cis.upenn.edu/~bcpierce/unison"
+depends=('glibc')
+makedepends=('ocaml' 'lablgtk2' 'imagemagick')
+optdepends=('gtk2: for gtk2 support')
+source=(http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/$pkgname-$pkgver.tar.gz
+        $pkgname.desktop)
+md5sums=('3281207850cf6f0a17fe73f371893bd3'
+         '2daecba7705455a8e4b769e48b059872')
+options=(!makeflags)
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  CFLAGS=""
+  make clean
+  make mkProjectInfo 
+  make UISTYLE=text DEBUGGING=false THREADS=true 
+  mv unison unison-text
+ 
+ # clean the builddir and rebuild with gtk support
+  # broken at the moment!
+  # make clean
+  # make mkProjectInfo
+  # make UISTYLE=gtk DEBUGGING=false THREADS=true
+  # install -Dm755 unison "$pkgdir"/usr/bin/unison-gtk
+ # clean the builddir and rebuild with gtk2 support
+  make clean
+  make mkProjectInfo
+  make UISTYLE=gtk2 DEBUGGING=false THREADS=true
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  install -Dm755 unison-text "$pkgdir"/usr/bin/unison
+  install -Dm755 unison "$pkgdir"/usr/bin/unison-gtk2
+ # install a .desktop file; create a compliant icon from ico file and install the png
+  install -Dm644 ../$pkgname.desktop "$pkgdir"/usr/share/applications/$pkgname.desktop
+  convert win32rc/U.ico unison.png
+  install -Dm644 ${pkgname}-1.png  "$pkgdir"/usr/share/pixmaps/$pkgname.png
+ # make symlink for .desktop file
+  cd "$pkgdir"/usr/bin
+  ln -s unison-gtk2 unison-x11
+}
diff --git a/staging/unison/unison-ssh-ocaml.patch b/staging/unison/unison-ssh-ocaml.patch
new file mode 100644
index 000000000..1b9c66c7f
--- /dev/null
+++ b/staging/unison/unison-ssh-ocaml.patch
@@ -0,0 +1,25 @@
+Index: src/terminal.ml
+===================================================================
+--- src/terminal.ml	(révision 463)
++++ src/terminal.ml	(copie de travail)
+@@ -191,7 +191,6 @@
+             exit 127
+           end
+       | childPid ->
+-          Unix.close slaveFd;
+           (Some masterFd, childPid)
+       end
+ 
+Index: src/update.mli
+===================================================================
+--- src/update.mli	(révision 463)
++++ src/update.mli	(copie de travail)
+@@ -1,7 +1,7 @@
+ (* Unison file synchronizer: src/update.mli *)
+ (* Copyright 1999-2009, Benjamin C. Pierce (see COPYING for details) *)
+ 
+-module NameMap : Map.S with type key = Name.t
++module NameMap : MyMap.S with type key = Name.t
+ 
+ type archive =
+     ArchiveDir of Props.t * archive NameMap.t
diff --git a/staging/unison/unison.desktop b/staging/unison/unison.desktop
new file mode 100644
index 000000000..3a7e1d762
--- /dev/null
+++ b/staging/unison/unison.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=unison
+Name[de]=unison
+Comment=File synchronisation tool for X11
+Comment[de]=Datei Abgleicher und Synchronisierer
+TryExec=unison-x11
+Exec=unison-x11
+Terminal=false
+Type=Application
+Categories=GTK;Application;Network;
+Icon=unison.png
+StartupNotify=true
diff --git a/staging/unison/unison.install b/staging/unison/unison.install
new file mode 100644
index 000000000..a3790ab7d
--- /dev/null
+++ b/staging/unison/unison.install
@@ -0,0 +1,28 @@
+# arg 1:  the new package version
+post_install() {
+  echo "NOTE:"
+  echo "  For gtk1 frontend please add 'gtk' package."
+  echo "  For gtk2 frontend please add 'gtk2' package."
+  echo "  Default X11 frontend is set to gtk2. "
+  echo ""
+  echo "  If you want to default to gtk1 unison:" 
+  echo "  'rm /usr/bin/unison-x11'"
+  echo "  'ln -s /usr/bin/unison-gtk /usr/bin/unison-x11'"
+  echo ""
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_upgrade() {
+ post_install $1
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}