[100034] trunk/dports/net/unison

[ecronin at macports.org]

Revision: 100034
          https://trac.macports.org/changeset/100034
Author:   ecronin at macports.org
Date:     2012-11-24 14:40:08 -0800 (Sat, 24 Nov 2012)
Log Message:
-----------
unison: update to 2.40.102

* Fixes incompatibility with ocaml3/non-macports versions of unison (#35116,#35407)
* Fixes X11 with ocaml4 (#36360)

Modified Paths:
--------------
    trunk/dports/net/unison/Portfile

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

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

Modified: trunk/dports/net/unison/Portfile
===================================================================
--- trunk/dports/net/unison/Portfile	2012-11-24 22:39:53 UTC (rev 100033)
+++ trunk/dports/net/unison/Portfile	2012-11-24 22:40:08 UTC (rev 100034)
@@ -4,7 +4,7 @@
 PortSystem        1.0
 
 name              unison
-version           2.40.65
+version           2.40.102
 categories        net
 maintainers       nomaintainer
 license           GPL-3
@@ -18,11 +18,10 @@
 homepage          http://www.cis.upenn.edu/~bcpierce/unison/
 master_sites      ${homepage}download/releases/${name}-${version}/
 platforms         darwin openbsd
-checksums         rmd160 29a3525f3904a5b55ff0ffd6544bc3fa90324076 \
-                  sha256 2c75e4e6ee1d48caf305e934b68ea960cae41d90c4fe2e8f09e0287ad753d810
+checksums         rmd160 0231fd41895bde97ad4ae15bdc4994f9c9e27ad6 \
+                  sha256 3d4a92f02b6998f156cb714d202d0358dd2846efbdce9de30e2c666d77c1e854
 
-patchfiles          patch-Makefile \
-                    patch-uimacnew-uimacnew.xcodeproj-project.pbxproj.diff
+patchfiles          patch-Makefile.diff
 
 use_configure   no
 
@@ -32,6 +31,8 @@
 destroot.args   PREFIX=${prefix} UISTYLE=text NATIVE=true THREADS=true
 
 variant x11 conflicts aqua {
+    patchfiles-append       patch-Makefile.OCaml.diff
+
     depends_lib-append      port:lablgtk2
 
     build.args-delete       UISTYLE=text
@@ -42,6 +43,8 @@
 }
 
 variant aqua description {Build Aqua front-end} conflicts x11 {
+    patchfiles-append       patch-uimacnew-uimacnew.xcodeproj-project.pbxproj.diff
+
     build.args-delete       UISTYLE=text
     build.args-append       UISTYLE=macnew
     destroot {

Deleted: trunk/dports/net/unison/files/patch-Makefile
===================================================================
--- trunk/dports/net/unison/files/patch-Makefile	2012-11-24 22:39:53 UTC (rev 100033)
+++ trunk/dports/net/unison/files/patch-Makefile	2012-11-24 22:40:08 UTC (rev 100034)
@@ -1,22 +0,0 @@
---- Makefile.orig	2011-04-16 22:35:38.000000000 +0200
-+++ Makefile	2011-04-26 17:53:52.000000000 +0200
-@@ -80,7 +80,7 @@
- ######################################################################
- # Installation
- 
--INSTALLDIR = $(HOME)/bin/
-+INSTALLDIR = $(DESTDIR)$(PREFIX)/bin/
- 
- # This has two names because on OSX the file INSTALL shadows the target 'install'!
- install: doinstall
-@@ -92,9 +92,8 @@
- 	$(MAKE) -C .. text
- 
- doinstall: $(NAME)$(EXEC_EXT)
--	-mv $(INSTALLDIR)/$(NAME)$(EXEC_EXT) /tmp/$(NAME)-$(shell echo $$$$)
--	cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)
- 	cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)$(NAME)-$(MAJORVERSION)$(EXEC_EXT)
-+	cd $(INSTALLDIR) && ln -s $(NAME)-$(MAJORVERSION)$(EXEC_EXT) $(NAME)
- 
- 
- ######################################################################

Added: trunk/dports/net/unison/files/patch-Makefile.OCaml.diff
===================================================================
--- trunk/dports/net/unison/files/patch-Makefile.OCaml.diff	                        (rev 0)
+++ trunk/dports/net/unison/files/patch-Makefile.OCaml.diff	2012-11-24 22:40:08 UTC (rev 100034)
@@ -0,0 +1,11 @@
+--- Makefile.OCaml.orig	2011-04-16 22:35:38.000000000 +0200
++++ Makefile.OCaml	2012-09-26 17:51:36.000000000 +0200
+@@ -292,7 +292,7 @@
+ 
+ # Gtk2 GUI
+ ifeq ($(UISTYLE), gtk2)
+-  CAMLFLAGS+=-I +lablgtk2
++  CAMLFLAGS+=-I +site-lib/lablgtk2
+   OCAMLOBJS+=pixmaps.cmo uigtk2.cmo linkgtk2.cmo
+   OCAMLLIBS+=lablgtk.cma
+ endif

Copied: trunk/dports/net/unison/files/patch-Makefile.diff (from rev 100033, trunk/dports/net/unison/files/patch-Makefile)
===================================================================
--- trunk/dports/net/unison/files/patch-Makefile.diff	                        (rev 0)
+++ trunk/dports/net/unison/files/patch-Makefile.diff	2012-11-24 22:40:08 UTC (rev 100034)
@@ -0,0 +1,22 @@
+--- Makefile.orig	2011-04-16 22:35:38.000000000 +0200
++++ Makefile	2011-04-26 17:53:52.000000000 +0200
+@@ -80,7 +80,7 @@
+ ######################################################################
+ # Installation
+ 
+-INSTALLDIR = $(HOME)/bin/
++INSTALLDIR = $(DESTDIR)$(PREFIX)/bin/
+ 
+ # This has two names because on OSX the file INSTALL shadows the target 'install'!
+ install: doinstall
+@@ -92,9 +92,8 @@
+ 	$(MAKE) -C .. text
+ 
+ doinstall: $(NAME)$(EXEC_EXT)
+-	-mv $(INSTALLDIR)/$(NAME)$(EXEC_EXT) /tmp/$(NAME)-$(shell echo $$$$)
+-	cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)
+ 	cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)$(NAME)-$(MAJORVERSION)$(EXEC_EXT)
++	cd $(INSTALLDIR) && ln -s $(NAME)-$(MAJORVERSION)$(EXEC_EXT) $(NAME)
+ 
+ 
+ ######################################################################
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121124/91eb099b/attachment.html>