...
 
Commits (4)
# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
PortGroup github 1.0
github.setup bcpierce00 unison 2.51.2 v
revision 3
categories net
maintainers nomaintainer
license GPL-3
description Unison File Synchronizer
long_description 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.
homepage http://www.cis.upenn.edu/~bcpierce/unison/
platforms darwin
checksums rmd160 24050d73c3d38389816828dd8ce77b4de7c80639 \
sha256 8e071e862fef675ea034f0c3e4b881d392be0889db4f04ad894cc5a931891e3d \
size 1400793
# from ocaml port
supported_archs i386 x86_64
universal_variant no
depends_build port:ocaml
installs_libs no
use_parallel_build no
patchfiles-append patch-Makefile.OCaml.diff \
patch-target.diff \
patch-Makefile.diff \
patch-check-cltool.diff \
patch-ocaml-compat-1.diff \
patch-ocaml-compat-2.diff \
patch-ocaml-compat-3.diff
# see https://github.com/bcpierce00/unison/commit/2e7ea9481c6c3ff2ec513c39f73cfe15c0763c06
patchfiles-append patch-lablgtk.diff
post-patch {
reinplace "s|__MACPORTS_PREFIX__|${prefix}|g" ${worksrcpath}/src/uimac14/MyController.m
set deployment_version [join [split ${macosx_deployment_target} .] ""]0
reinplace "s|__MACPORTS_DEPLOYMENT_VERSION__|${deployment_version}|g" ${worksrcpath}/src/uimac14/English.lproj/MainMenu.xib
}
# see https://trac.macports.org/ticket/57234
if {[vercmp ${xcodeversion} 10.0] >= 0} {
build.env-append XCODEFLAGS=-UseNewBuildSystem=NO
}
build.env-append CC=${configure.cc}
destroot.env-append PREFIX=${prefix}
build.args UISTYLE=text THREADS=true
destroot.args UISTYLE=text THREADS=true
use_configure no
variant gtk description {Build GTK front-end} conflicts aqua {
depends_lib-append port:lablgtk2
build.args-replace UISTYLE=text \
UISTYLE=gtk2
destroot.args-replace UISTYLE=text \
UISTYLE=gtk2
}
# see https://trac.macports.org/ticket/56785
if {${os.major} >= 17} {
variant aqua description {Build Aqua front-end} conflicts gtk {
build.args-replace UISTYLE=text \
UISTYLE=mac14
destroot.args-replace UISTYLE=text \
UISTYLE=mac14
destroot {
copy ${worksrcpath}/src/uimac14/build/Default/Unison.app ${destroot}${applications_dir}
ln -s ${applications_dir}/Unison.app/Contents/MacOS/cltool ${destroot}${prefix}/bin/unison
}
}
}
if {![variant_isset gtk] && !([variant_exists aqua] && [variant_isset aqua])} {
default_variants +gtk
}
notes "
Unison has always suggested using the same version across machines accessing the\
the same files. If you want to keep the previous version, you can reactivate\
the previous version; see:
https://trac.macports.org/wiki/howto/InstallingOlderPort
"
--- src/Makefile.OCaml.orig 2018-01-27 13:12:13.000000000 -0800
+++ src/Makefile.OCaml 2018-06-04 07:05:54.000000000 -0700
@@ -180,7 +180,7 @@
buildexecutable:: $(NAME)$(EXEC_EXT)
endif
-MINOSXVERSION=10.5
+MINOSXVERSION=$(MACOSX_DEPLOYMENT_TARGET)
# XCODEFLAGS=-sdk macosx$(MINOSXVERSION)
ifeq ($(OSARCH),osx)
CAMLFLAGS+=-ccopt -mmacosx-version-min=$(MINOSXVERSION)
@@ -194,9 +194,9 @@
# sed -e's/@@VERSION@@/$(VERSION)/' $(UIMACDIR)/Info.plist.template > $(UIMACDIR)/Info.plist
(cd $(UIMACDIR); xcodebuild $(XCODEFLAGS) 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; \
+ $(CC) -mmacosx-version-min=$(MINOSXVERSION) $(UIMACDIR)/cltool.c -o $(UIMACDIR)/build/Default/Unison.app/Contents/MacOS/cltool -framework Carbon; \
else \
- gcc -mmacosx-version-min=$(MINOSXVERSION) $(UIMACDIR)/cltool.c -o $(UIMACDIR)/build/Unison.app/Contents/MacOS/cltool -framework Carbon; \
+ $(CC) -mmacosx-version-min=$(MINOSXVERSION) $(UIMACDIR)/cltool.c -o $(UIMACDIR)/build/Unison.app/Contents/MacOS/cltool -framework Carbon; \
fi
# OCaml objects for the bytecode version
--- src/Makefile.orig 2018-01-27 14:12:13.000000000 -0700
+++ src/Makefile 2018-06-06 22:50:53.000000000 -0700
@@ -68,7 +68,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
@@ -86,9 +86,7 @@
echo "makefile variable NAME not bound"; \
exit 1 \
; fi
- -mv $(INSTALLDIR)/$(NAME)$(EXEC_EXT) /tmp/$(NAME)-$(shell echo $$$$)
cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)
- cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)$(NAME)-$(MAJORVERSION)$(EXEC_EXT)
######################################################################
# Demo
--- src/uimac14/MyController.m.orig 2018-01-27 14:12:13.000000000 -0700
+++ src/uimac14/MyController.m 2018-06-06 23:29:07.000000000 -0700
@@ -186,7 +186,7 @@
(![[NSFileManager defaultManager]
/* BCP 6/2016: Changed from /usr/bin/unison for El Capitan, per
suggestion from Alan Shutko */
- fileExistsAtPath:@"/usr/local/bin/unison"]) )
+ fileExistsAtPath:@"__MACPORTS_PREFIX__/bin/unison"]) )
[self raiseCltoolWindow:nil];
}
From 2e7ea9481c6c3ff2ec513c39f73cfe15c0763c06 Mon Sep 17 00:00:00 2001
From: daviddavid <geiger.david68210@gmail.com>
Date: Mon, 26 Feb 2018 13:36:36 +0100
Subject: [PATCH] Fix for lablgtk >= 2.18.6
---
src/uigtk2.ml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/uigtk2.ml b/src/uigtk2.ml
index 2ba6d792..04c4da4a 100644
--- src/uigtk2.ml
+++ src/uigtk2.ml
@@ -89,12 +89,12 @@ let fontItalic = lazy (Pango.Font.from_string "italic")
(* This does not work with the current version of Lablgtk, due to a bug
let icon =
GdkPixbuf.from_data ~width:48 ~height:48 ~has_alpha:true
- (Gpointer.region_of_string Pixmaps.icon_data)
+ (Gpointer.region_of_bytes Pixmaps.icon_data)
*)
let icon =
let p = GdkPixbuf.create ~width:48 ~height:48 ~has_alpha:true () in
Gpointer.blit
- (Gpointer.region_of_string Pixmaps.icon_data) (GdkPixbuf.get_pixels p);
+ (Gpointer.region_of_bytes Pixmaps.icon_data) (GdkPixbuf.get_pixels p);
p
let leftPtrWatch =
--- src/system/system_generic.ml.orig
+++ src/system/system_generic.ml
@@ -47,7 +47,7 @@ let open_out_gen = open_out_gen
let chmod = Unix.chmod
let chown = Unix.chown
let utimes = Unix.utimes
-let link = Unix.link
+let link s d = Unix.link s d
let openfile = Unix.openfile
let opendir f =
let h = Unix.opendir f in
--- src/recon.ml.orig
+++ src/recon.ml
@@ -662,8 +662,8 @@ let rec reconcile
(* Sorts the paths so that they will be displayed in order *)
let sortPaths pathUpdatesList =
- Sort.list
- (fun (p1, _) (p2, _) -> Path.compare p1 p2 <= 0)
+ List.sort
+ Path.compare
pathUpdatesList
let rec enterPath p1 p2 t =
--- src/files.ml.orig
+++ src/files.ml
@@ -734,7 +734,7 @@ let get_files_in_directory dir =
with End_of_file ->
dirh.System.closedir ()
end;
- Sort.list (<) !files
+ List.sort String.compare !files
let ls dir pattern =
Util.convertUnixErrorsToTransient
--- src/uimac14/uimacnew.xcodeproj/project.pbxproj.orig 2018-01-27 13:12:13.000000000 -0800
+++ src/uimac14/uimacnew.xcodeproj/project.pbxproj 2018-06-04 07:12:16.000000000 -0700
@@ -742,7 +742,6 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
LIBRARY_SEARCH_PATHS = "";
- MACOSX_DEPLOYMENT_TARGET = 10.6;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = edu.upenn.cis.Unison;
SDKROOT = macosx;
@@ -773,7 +772,6 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
LIBRARY_SEARCH_PATHS = "";
- MACOSX_DEPLOYMENT_TARGET = 10.6;
PRODUCT_BUNDLE_IDENTIFIER = edu.upenn.cis.Unison;
SDKROOT = macosx;
USER_HEADER_SEARCH_PATHS = $OCAMLLIBDIR;
@@ -803,7 +801,6 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
LIBRARY_SEARCH_PATHS = "";
- MACOSX_DEPLOYMENT_TARGET = 10.6;
PRODUCT_BUNDLE_IDENTIFIER = edu.upenn.cis.Unison;
SDKROOT = macosx;
USER_HEADER_SEARCH_PATHS = $OCAMLLIBDIR;
--- src/uimac14/English.lproj/MainMenu.xib.orig 2018-01-27 14:12:13.000000000 -0700
+++ src/uimac14/English.lproj/MainMenu.xib 2018-11-17 11:35:31.000000000 -0700
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5056" systemVersion="13E28" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
<dependencies>
- <deployment version="1050" defaultVersion="1090" identifier="macosx"/>
+ <deployment version="__MACPORTS_DEPLOYMENT_VERSION__" defaultVersion="__MACPORTS_DEPLOYMENT_VERSION__" identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5056"/>
</dependencies>
<objects>
......@@ -18,9 +18,9 @@ master_sites pypi:[string index ${python.rootname} 0]/${python.rootname}
distname ${python.rootname}-${version}
use_zip yes
checksums rmd160 dc4cf7f44fc5dba26b4139a59cef168ec068bd32 \
sha256 76d277fb1a2fedc5181a7c738f058ebff8646bde5fb477cb53a43712166c4952 \
size 62456
checksums rmd160 b301eff7789de7d218fb3c585aa43e445e13f200 \
sha256 958a366736749fc5f6f575e3a8fdd0054b2b4119f2c3e11441124126d4d109fb \
size 69797
python.versions 37
......
......@@ -18,9 +18,9 @@ master_sites pypi:[string index ${python.rootname} 0]/${python.rootname}
distname ${python.rootname}-${version}
use_zip yes
checksums rmd160 b651d2563ad108f24816b244ed6c4c759a7eeaa3 \
sha256 9fee18e9a27ad06aa097c9ecc0b47198555e85829fa5d63d17de65918d83694c \
size 54773
checksums rmd160 2674c80a232273fcbfc4c17f074ccc21fcec619d \
sha256 0a6c876434f1a51bfbf1c4cea3f7167329f4ea86c12ba8ce8123d8f4b9896221 \
size 60560
python.versions 37
......
......@@ -3,7 +3,7 @@
PortSystem 1.0
PortGroup github 1.0
github.setup helm helm 2.14.2 v
github.setup helm helm 2.16.1 v
categories sysutils
platforms darwin
supported_archs x86_64
......@@ -20,9 +20,9 @@ distfiles helm-v${version}-darwin-amd64.tar.gz
dist_subdir ${name}/${version}
worksrcdir darwin-amd64
checksums rmd160 002bdedc70c51fd03ba76fbbe31c3e509ee0c11e \
sha256 9469da75bb357bc325c985dead224480bbacc7aa8aecff74089dff97e64655d0 \
size 27862805
checksums rmd160 af40b610401e437038cf1d2cd0de11b760f41e8d \
sha256 34fc397ec4a992a451d130a962944315ca782242bbd05a8d732a2e74ca2b9153 \
size 26560041
use_configure no
......