Update of /cvsroot/fink/experimental/monipol/finkinfo In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv25224
Modified Files: unison213.info unison227.info Added Files: unison232.info unison232.patch Log Message: Fix ppc; new upstream version with SDK games --- NEW FILE: unison232.info --- Info2: << Package: unison232%type_pkg[uitype] Version: 2.32.52 Revision: 1 Type: uitype (. -nox -aqua) Architecture: i386, powerpc, (%type_raw[uitype] = .) x86_64, (%type_raw[uitype] = -nox) x86_64 Description: File synchronization tool License: GPL Homepage: http://www.cis.upenn.edu/~bcpierce/unison Maintainer: Monic Polynomial <moni...@users.sourceforge.net> Source: http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-%v.tar.gz Source-MD5: 0701f095c1721776a0454b94607eda48 Source2: http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-%v-manual.html Source2-MD5: 68379a1c5a5ab3d068726badc7d1135c PatchFile: unison232.patch PatchFile-MD5: 0d09b47d3ced91aa32b11bc4b47b6a58 PatchScript: << #!/bin/bash -ev if [ "%m" = "powerpc" ] then sed -e 's/@ARCH@/ppc/' < %{PatchFile} | patch -p1 else sed -e 's/@ARCH@/%m/' < %{PatchFile} | patch -p1 fi << BuildDepends: << fink (>= 0.24.12), ocaml (>= 3.11.1-3), (%type_raw[uitype] = .) atk1 (>= 1.26.0-2), (%type_raw[uitype] = .) cairo (>= 1.8.8-2), (%type_raw[uitype] = .) fontconfig2-dev (>= 2.4.1-108), (%type_raw[uitype] = .) freetype219 (>= 2.3.8-3), (%type_raw[uitype] = .) glib2-dev (>= 2.20.5-1), (%type_raw[uitype] = .) gtk+2-dev (>= 2.16.6-2), (%type_raw[uitype] = .) lablgtk2 (>= 2.12.0-3), (%type_raw[uitype] = .) libgettext8-dev (>= 0.17-19), (%type_raw[uitype] = .) pango1-xft2-ft219-dev (>= 1.24.5-3), (%type_raw[uitype] = .) x11-dev << Depends: << (%type_raw[uitype] = .) atk1-shlibs (>= 1.26.0-2), (%type_raw[uitype] = .) cairo-shlibs (>= 1.8.8-2), (%type_raw[uitype] = .) fontconfig2-shlibs (>= 2.4.1-108), (%type_raw[uitype] = .) freetype219-shlibs (>= 2.3.8-3), (%type_raw[uitype] = .) glib2-shlibs (>= 2.20.5-1), (%type_raw[uitype] = .) gtk+2-shlibs (>= 2.16.6-2), (%type_raw[uitype] = .) libgettext8-shlibs (>= 0.17-19), (%type_raw[uitype] = .) pango1-xft2-ft219-shlibs (>= 1.24.5-3), (%type_raw[uitype] = .) x11-shlibs << CompileScript: << #!/bin/bash -ev case "%type_raw[uitype]" in "-nox") UISTYLE=text;; "-aqua") UISTYLE=macnew;; ".") UISTYLE=gtk2;; esac make UISTYLE=$UISTYLE THREADS=true << InstallScript: << #!/bin/bash -ev VERSION=2.32 /usr/bin/install -d %i/bin case "%type_raw[uitype]" in "-nox") /usr/bin/install -m 0755 unison %i/bin/unison-${VERSION}-nox;; ".") /usr/bin/install -m 0755 unison %i/bin/unison-${VERSION}-x11;; "-aqua") /usr/bin/install -d %i/Applications cp -pR uimacnew/build/Default/Unison.app %i/Applications/Unison-${VERSION}.app echo "#!/bin/bash" > %i/bin/unison-${VERSION}-aqua echo "exec %p/Applications/Unison-${VERSION}.app/Contents/MacOS/Unison $*" >> %i/bin/unison-${VERSION}-aqua chmod a+x %i/bin/unison-${VERSION}-aqua ;; esac << PostInstScript: << VERSION=2.32 case "%type_raw[uitype]" in "-nox") SUFFIX=nox; PRIORITY=2322;; ".") SUFFIX=x11; PRIORITY=2324;; "-aqua") SUFFIX=aqua; PRIORITY=2326;; esac update-alternatives --install \ %p/bin/unison-${VERSION} unison-${VERSION} %p/bin/unison-${VERSION}-${SUFFIX} ${PRIORITY} update-alternatives --install \ %p/bin/unison unison %p/bin/unison-${VERSION}-${SUFFIX} ${PRIORITY} #[ -e /Applications/Fink ] || install -d -m 0755 /Applications/Fink #/bin/ln -sfn %p/Applications/Unison-$ver.app /Applications/Fink/Unison-$ver.app << PreRmScript: << if [ $1 != "upgrade" ]; then VERSION=2.32 case "%type_raw[uitype]" in "-nox") SUFFIX=nox;; ".") SUFFIX=x11;; "-aqua") SUFFIX=aqua;; esac update-alternatives --remove unison-${VERSION} %p/bin/unison-${VERSION}-${SUFFIX} update-alternatives --remove unison %p/bin/unison-${VERSION}-${SUFFIX} # rm -f /Applications/Fink/Unison-$ver.app fi << DocFiles: << COPYING CONTRIB README ROADMAP.txt BUGS.txt INSTALL NEWS TODO.txt ../unison-2.32.52-manual.html:manual.html << 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). Note: All Unison 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 (major and minor) used on client and server to match. Most OS distributions provide only one version, so the set of Unison packages in Fink have been explicitly designed to coexist. The priority assigned to each alternative for update-alternatives follows the pattern $ver$uitype where $ver is the major-minor version and $uitype is 2 for -nox, 4 for -x11, and 6 for -aqua. Unfortunately AppBundles doesn't support conditionals, so the following doesn't work: AppBundles: (%type_raw[uitype] = -aqua) uimacnew/build/Unison.app:Unison-2.32.app << DescPort: << caml/config.h defines a uint64 type and so does Cocoa's Security framework, resulting in type declaration conflicts that prevent unison232-aqua from building on x86_64. See http://caml.inria.fr/mantis/view.php?id=4877 The Xcode project in this Unison version sets the base SDK to 10.4, but unison-blob.o contains references to the $UNIX2003 variants of POSIX symbols. The patch forces xcodebuild to use the Mac OS version on the host machine as the base SDK. << << --- NEW FILE: unison232.patch --- diff -Nurd unison-2.32.52.ori/Makefile.OCaml unison-2.32.52/Makefile.OCaml --- unison-2.32.52.ori/Makefile.OCaml 2009-06-18 06:29:40.000000000 -0300 +++ unison-2.32.52/Makefile.OCaml 2010-01-22 04:13:15.000000000 -0200 @@ -162,7 +162,7 @@ # builds in build/Default/, and earlier versions use build/ macexecutable: $(NAME)-blob.o # sed -e's/@@VERSION@@/$(VERSION)/' $(UIMACDIR)/Info.plist.template > $(UIMACDIR)/Info.plist - (cd $(UIMACDIR); xcodebuild OCAMLLIBDIR="$(OCAMLLIBDIR)" SYMROOT=build) + (cd $(UIMACDIR); xcodebuild -sdk macosx`sw_vers -productVersion | cut -d. -f1,2` arc...@arch@ OCAMLLIBDIR="$(OCAMLLIBDIR)" SYMROOT=build) if [ -e $(UIMACDIR)/build/Default ]; then \ gcc -mmacosx-version-min=$(MINOSXVERSION) $(UIMACDIR)/cltool.c -o $(UIMACDIR)/build/Default/Unison.app/Contents/MacOS/cltool -framework Carbon; \ else \ Index: unison213.info =================================================================== RCS file: /cvsroot/fink/experimental/monipol/finkinfo/unison213.info,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- unison213.info 22 Jan 2010 03:44:47 -0000 1.1 +++ unison213.info 22 Jan 2010 07:55:04 -0000 1.2 @@ -10,7 +10,6 @@ Maintainer: Monic Polynomial <moni...@users.sourceforge.net> Source: http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-%v.tar.gz - Source-MD5: a79bf5f4ebf2a1eaf15b1ac97f827374 Source2: http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-%v-manual.html @@ -22,9 +21,9 @@ #!/bin/bash -ev if [ "%m" = "powerpc" ] then - sed 's/@ARCH@/powerpc/' < %{PatchFile} | patch -p1 + sed 's/@ARCH@/ppc/' < %{PatchFile} | patch -p1 else - sed 's/@ARCH@/%m/' < %{PatchFile} | patch -p1 + sed 's/@ARCH@/%m/' < %{PatchFile} | patch -p1 fi << Index: unison227.info =================================================================== RCS file: /cvsroot/fink/experimental/monipol/finkinfo/unison227.info,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- unison227.info 22 Jan 2010 05:26:37 -0000 1.1 +++ unison227.info 22 Jan 2010 07:55:04 -0000 1.2 @@ -21,9 +21,9 @@ #!/bin/bash -ev if [ "%m" = "powerpc" ] then - sed 's/@ARCH@/powerpc/' < %{PatchFile} | patch -p1 + sed 's/@ARCH@/ppc/' < %{PatchFile} | patch -p1 else - sed 's/@ARCH@/%m/' < %{PatchFile} | patch -p1 + sed 's/@ARCH@/%m/' < %{PatchFile} | patch -p1 fi << ------------------------------------------------------------------------------ Throughout its 18-year history, RSA Conference consistently attracts the world's best and brightest in the field, creating opportunities for Conference attendees to learn about information security's most important issues through interactions with peers, luminaries and emerging and established companies. http://p.sf.net/sfu/rsaconf-dev2dev _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs