[33293] trunk/dports/net/unison

[eridius at macports.org]

Revision: 33293
          http://trac.macosforge.org/projects/macports/changeset/33293
Author:   eridius at macports.org
Date:     2008-01-22 15:48:11 -0800 (Tue, 22 Jan 2008)

Log Message:
-----------
Update unison to 2.27.57

Modified Paths:
--------------
    trunk/dports/net/unison/Portfile
    trunk/dports/net/unison/files/patch-Makefile

Removed Paths:
-------------
    trunk/dports/net/unison/files/patch-Makefile.OCaml

Modified: trunk/dports/net/unison/Portfile
===================================================================
--- trunk/dports/net/unison/Portfile	2008-01-22 22:00:34 UTC (rev 33292)
+++ trunk/dports/net/unison/Portfile	2008-01-22 23:48:11 UTC (rev 33293)
@@ -2,7 +2,7 @@
 
 PortSystem        1.0
 name              unison
-version           2.13.16
+version           2.27.57
 categories        net
 maintainers       eridius at macports.org
 description       Unison File Synchronizer
@@ -15,7 +15,8 @@
 homepage          http://www.cis.upenn.edu/~bcpierce/unison/
 master_sites      ${homepage}/download/releases/stable/
 platforms         darwin openbsd
-checksums         md5 a79bf5f4ebf2a1eaf15b1ac97f827374
+checksums         md5 4ba0a3e4bf4b4ad0c063f86391371f78 \
+                  sha1 9892680d8bd3e3c50031451cc6e77eb5431768ea
 patchfiles        patch-Makefile
 
 use_configure	no
@@ -36,15 +37,12 @@
 }
 
 variant aqua {
-	if { ${xcodeversion} == "2.1" } {
-		patchfiles-append patch-Makefile.OCaml
-	}
 	build.args-delete		UISTYLE=text
-	build.args-append		UISTYLE=mac
+	build.args-append		UISTYLE=macnew
 	destroot {
 		xinstall -d -m 0755 ${destroot}/Applications/MacPorts
-		system "cd ${worksrcpath}/uimac/build && mv Default/* . || true"
-		file copy ${worksrcpath}/uimac/build/Unison.app \
+		system "cd ${worksrcpath}/uimacnew/build && mv Default/* . || true"
+		file copy ${worksrcpath}/uimacnew/build/Unison.app \
 			${destroot}/Applications/MacPorts/
 	}
 }

Modified: trunk/dports/net/unison/files/patch-Makefile
===================================================================
--- trunk/dports/net/unison/files/patch-Makefile	2008-01-22 22:00:34 UTC (rev 33292)
+++ trunk/dports/net/unison/files/patch-Makefile	2008-01-22 23:48:11 UTC (rev 33293)
@@ -1,6 +1,6 @@
---- Makefile~	2005-08-13 22:26:11.000000000 -0700
-+++ Makefile	2005-08-13 22:29:12.000000000 -0700
-@@ -68,15 +68,14 @@
+--- Makefile.old	2008-01-22 18:32:08.000000000 -0500
++++ Makefile	2008-01-22 18:34:41.000000000 -0500
+@@ -68,7 +68,7 @@
  ######################################################################
  # Installation
  
@@ -9,6 +9,8 @@
  
  # This has two names because on OSX the file INSTALL shadows the target 'install'!
  install: doinstall
+@@ -80,9 +80,8 @@
+ 	make -C .. text
  
  doinstall: $(NAME)$(EXEC_EXT)
 -	-mv $(INSTALLDIR)/$(NAME)$(EXEC_EXT) /tmp/$(NAME)-$(shell echo $$$$)

Deleted: trunk/dports/net/unison/files/patch-Makefile.OCaml
===================================================================
--- trunk/dports/net/unison/files/patch-Makefile.OCaml	2008-01-22 22:00:34 UTC (rev 33292)
+++ trunk/dports/net/unison/files/patch-Makefile.OCaml	2008-01-22 23:48:11 UTC (rev 33293)
@@ -1,11 +0,0 @@
---- Makefile.OCaml~	2005-06-27 10:38:25.000000000 -0700
-+++ Makefile.OCaml	2005-08-13 22:22:10.000000000 -0700
-@@ -143,7 +143,7 @@
- # NOTE: the OCAMLLIBDIR is not getting passed correctly?
- macexecutable: $(NAME)-blob.o
- 	(cd uimac; xcodebuild OCAMLLIBDIR="$(OCAMLLIBDIR)")
--	gcc uimac/cltool.c -o uimac/build/Unison.app/Contents/MacOS/cltool -framework Carbon
-+	gcc uimac/cltool.c -o uimac/build/Default/Unison.app/Contents/MacOS/cltool -framework Carbon
- 
- # OCaml objects for the bytecode version
- # File extensions will be substituted for the native code version

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080122/d6ea771b/attachment.html