[153795] trunk/dports/net/unison

[khindenburg at macports.org]

Revision: 153795
          https://trac.macports.org/changeset/153795
Author:   khindenburg at macports.org
Date:     2016-10-11 07:21:18 -0700 (Tue, 11 Oct 2016)
Log Message:
-----------
unison:
  Add +symlink variant - enabled by default
  Add note about using +x11 variant (which does work)

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

Modified: trunk/dports/net/unison/Portfile
===================================================================
--- trunk/dports/net/unison/Portfile	2016-10-11 13:15:35 UTC (rev 153794)
+++ trunk/dports/net/unison/Portfile	2016-10-11 14:21:18 UTC (rev 153795)
@@ -5,6 +5,7 @@
 
 name                unison
 version             2.48.4
+revision            1
 categories          net
 maintainers         nomaintainer
 license             GPL-3
@@ -19,6 +20,8 @@
 master_sites        ${homepage}download/releases/${name}-${version}/
 platforms           darwin openbsd
 
+set branch          [join [lrange [split ${version} .] 0 1] .]
+
 checksums           rmd160  d5a1d66caffc02832c446f375a16319779fc5e0b \
                     sha256  30aa53cd671d673580104f04be3cf81ac1e20a2e8baaf7274498739d59e99de8
 
@@ -36,6 +39,14 @@
 
 destroot.args       PREFIX=${prefix} UISTYLE=text NATIVE=true THREADS=true
 
+default_variants    +symlink
+
+variant symlink description {Create symlink to versioned binary} {
+    post-destroot {
+        ln -s ${prefix}/bin/${name}-${branch} ${destroot}${prefix}/bin/${name}
+    }
+}
+
 variant x11 conflicts aqua {
     patchfiles-append       patch-Makefile.OCaml.diff
 
@@ -46,6 +57,11 @@
 
     destroot.args-replace   UISTYLE=text \
                             UISTYLE=gtk2
+
+    notes-prepend "
+You may need to run this from an xterm for it to work: \
+unison -ui graphic
+"
 }
 
 variant aqua description {Build Aqua front-end} conflicts x11 {

Modified: trunk/dports/net/unison/files/patch-Makefile.diff
===================================================================
--- trunk/dports/net/unison/files/patch-Makefile.diff	2016-10-11 13:15:35 UTC (rev 153794)
+++ trunk/dports/net/unison/files/patch-Makefile.diff	2016-10-11 14:21:18 UTC (rev 153795)
@@ -1,6 +1,6 @@
---- Makefile.orig	Thu Jul 18 11:37:09 2013
-+++ Makefile	Fri Jan  9 15:24:42 2015
-@@ -78,7 +78,7 @@ include Makefile.OCaml
+--- Makefile	2016-10-10 10:04:26.000000000 -0400
++++ Makefile	2016-10-10 10:04:58.000000000 -0400
+@@ -78,7 +78,7 @@
  ######################################################################
  # Installation
  
@@ -9,14 +9,12 @@
  
  # This has two names because on OSX the file INSTALL shadows the target 'install'!
  install: doinstall
-@@ -90,9 +90,8 @@ text: 
+@@ -90,8 +90,6 @@
  	$(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.macports.org/pipermail/macports-changes/attachments/20161011/8feefc83/attachment-0002.html>