pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/net/unison
Module Name: pkgsrc
Committed By: jaapb
Date: Tue Nov 14 13:03:35 UTC 2017
Modified Files:
pkgsrc/net/unison: Makefile distinfo
Added Files:
pkgsrc/net/unison/patches: patch-src_Makefile patch-src_Makefile.OCaml
patch-src_fs.ml patch-src_mkProjectInfo.ml
patch-src_system_system_intf.ml patch-src_uigtk2.ml
Removed Files:
pkgsrc/net/unison/patches: patch-Makefile.OCaml patch-aa
Log Message:
Updated net/unison to latest version, 2.48.15.
I can't find a good changelog, but upstream changes seem to be fairly
minor.
A lot of local patches have been added to ensure compatibility with the
latest version of OCaml and lablgtk, and I have cleaned up the package
Makefile a little.
To generate a diff of this commit:
cvs rdiff -u -r1.111 -r1.112 pkgsrc/net/unison/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/net/unison/distinfo
cvs rdiff -u -r1.5 -r0 pkgsrc/net/unison/patches/patch-Makefile.OCaml
cvs rdiff -u -r1.11 -r0 pkgsrc/net/unison/patches/patch-aa
cvs rdiff -u -r0 -r1.1 pkgsrc/net/unison/patches/patch-src_Makefile \
pkgsrc/net/unison/patches/patch-src_Makefile.OCaml \
pkgsrc/net/unison/patches/patch-src_fs.ml \
pkgsrc/net/unison/patches/patch-src_mkProjectInfo.ml \
pkgsrc/net/unison/patches/patch-src_system_system_intf.ml \
pkgsrc/net/unison/patches/patch-src_uigtk2.ml
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/net/unison/Makefile
diff -u pkgsrc/net/unison/Makefile:1.111 pkgsrc/net/unison/Makefile:1.112
--- pkgsrc/net/unison/Makefile:1.111 Mon Sep 18 09:53:32 2017
+++ pkgsrc/net/unison/Makefile Tue Nov 14 13:03:35 2017
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.111 2017/09/18 09:53:32 maya Exp $
+# $NetBSD: Makefile,v 1.112 2017/11/14 13:03:35 jaapb Exp $
-DISTNAME= unison-2.48.4
-PKGREVISION= 9
+DISTNAME= unison-2.48.15
CATEGORIES= net
-MASTER_SITES= http://www.seas.upenn.edu/~bcpierce/unison/download/releases/stable/
+MASTER_SITES= ${MASTER_SITE_GITHUB:=bcpierce00/}
MAINTAINER= tonio%NetBSD.org@localhost
HOMEPAGE= http://www.cis.upenn.edu/~bcpierce/unison/
@@ -22,15 +21,17 @@ BUILDLINK_ABI_DEPENDS.ocaml+= ocaml>=3.1
BUILDLINK_API_DEPENDS.ocaml-lablgtk+= ocaml-lablgtk>=2.16.0
# docs: unison-manual.pdf/html/ps/dvi
-WRKSRC= ${WRKDIR}/src
+#WRKSRC= ${WRKDIR}/src
USE_TOOLS+= gmake
-MAKE_FLAGS+= CFLAGS=""
+MAKE_FLAGS+= CFLAGS="" -C src
MAKE_ENV+= HOME=${WRKDIR:Q}
.include "options.mk"
.include "../../mk/bsd.prefs.mk"
-.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH}=="arm") || (${MACHINE_ARCH} == "x86_64")
+.include "../../mk/ocaml.mk"
+
+.if (${OCAML_USE_OPT_COMPILER} == "true")
MAKE_FLAGS+= NATIVE=true
.else
MAKE_FLAGS+= NATIVE=false
@@ -48,13 +49,13 @@ INSTALLATION_DIRS= bin
INSTALLATION_DIRS+= share/doc/unison
post-install:
- ${INSTALL_MAN} ${WRKSRC}/BUGS.txt ${DESTDIR}${PREFIX}/share/doc/unison
- ${INSTALL_MAN} ${WRKSRC}/CONTRIB ${DESTDIR}${PREFIX}/share/doc/unison
- ${INSTALL_MAN} ${WRKSRC}/COPYING ${DESTDIR}${PREFIX}/share/doc/unison
- ${INSTALL_MAN} ${WRKSRC}/NEWS ${DESTDIR}${PREFIX}/share/doc/unison
- ${INSTALL_MAN} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/unison
- ${INSTALL_MAN} ${WRKSRC}/ROADMAP.txt ${DESTDIR}${PREFIX}/share/doc/unison
- ${INSTALL_MAN} ${WRKSRC}/TODO.txt ${DESTDIR}${PREFIX}/share/doc/unison
+ ${INSTALL_MAN} ${WRKSRC}/src/BUGS.txt ${DESTDIR}${PREFIX}/share/doc/unison
+ ${INSTALL_MAN} ${WRKSRC}/src/CONTRIB ${DESTDIR}${PREFIX}/share/doc/unison
+ ${INSTALL_MAN} ${WRKSRC}/src/COPYING ${DESTDIR}${PREFIX}/share/doc/unison
+ ${INSTALL_MAN} ${WRKSRC}/src/NEWS ${DESTDIR}${PREFIX}/share/doc/unison
+ ${INSTALL_MAN} ${WRKSRC}/src/README ${DESTDIR}${PREFIX}/share/doc/unison
+ ${INSTALL_MAN} ${WRKSRC}/src/ROADMAP.txt ${DESTDIR}${PREFIX}/share/doc/unison
+ ${INSTALL_MAN} ${WRKSRC}/src/TODO.txt ${DESTDIR}${PREFIX}/share/doc/unison
.include "../../lang/ocaml/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/net/unison/distinfo
diff -u pkgsrc/net/unison/distinfo:1.27 pkgsrc/net/unison/distinfo:1.28
--- pkgsrc/net/unison/distinfo:1.27 Sun Jun 12 14:30:05 2016
+++ pkgsrc/net/unison/distinfo Tue Nov 14 13:03:35 2017
@@ -1,8 +1,12 @@
-$NetBSD: distinfo,v 1.27 2016/06/12 14:30:05 wiz Exp $
+$NetBSD: distinfo,v 1.28 2017/11/14 13:03:35 jaapb Exp $
-SHA1 (unison-2.48.4.tar.gz) = baeff0e3a942c710ce551cca118b891feca137c5
-RMD160 (unison-2.48.4.tar.gz) = d5a1d66caffc02832c446f375a16319779fc5e0b
-SHA512 (unison-2.48.4.tar.gz) = c8e7bd2b14edae31e7d08154cdc2dce8173546b6163b9e5f4f2b1c8255792a7645d8449da88d7acfcbf498746481d24d0a3936978969920530a15a16bcbc6024
-Size (unison-2.48.4.tar.gz) = 1200861 bytes
-SHA1 (patch-Makefile.OCaml) = 2c39a20eb731d3f787d5c938b539ceb3276d5d47
-SHA1 (patch-aa) = dd1a001fb7071cd9141615b42a692e6d1d812081
+SHA1 (unison-2.48.15.tar.gz) = 7a22715321fdd4808d12f9122df9314a45283a18
+RMD160 (unison-2.48.15.tar.gz) = aa98f4fb12e4363c8a51e1969fa829cab7e96869
+SHA512 (unison-2.48.15.tar.gz) = 2614b7291f9d9eb1cb5380560e4883849c6bba449d31e5bc704395291978d41e43208cfff701708a5ae9c9a6a220a8ceb06496fd1e2ab1915bf2f5c36349739f
+Size (unison-2.48.15.tar.gz) = 1912444 bytes
+SHA1 (patch-src_Makefile) = 19cf0b79995c7848bc02d220267be4f3a3e4b59b
+SHA1 (patch-src_Makefile.OCaml) = 3c2168ebffa1b5479577d64113cf5d8c6f9b906e
+SHA1 (patch-src_fs.ml) = 1d02f83d245466c0aad45a3261bba8149ed3db56
+SHA1 (patch-src_mkProjectInfo.ml) = a1908748dbe4c1db0e2b012e73fe46c6bca30348
+SHA1 (patch-src_system_system_intf.ml) = 89b8598b364bee489b356f9cb3cb297d981b526e
+SHA1 (patch-src_uigtk2.ml) = a9ef837e0289ba2d209a21df3102ed0267a52f9d
Added files:
Index: pkgsrc/net/unison/patches/patch-src_Makefile
diff -u /dev/null pkgsrc/net/unison/patches/patch-src_Makefile:1.1
--- /dev/null Tue Nov 14 13:03:35 2017
+++ pkgsrc/net/unison/patches/patch-src_Makefile Tue Nov 14 13:03:35 2017
@@ -0,0 +1,41 @@
+$NetBSD: patch-src_Makefile,v 1.1 2017/11/14 13:03:35 jaapb Exp $
+
+Correct installation procedure
+--- src/Makefile.orig 2015-10-05 18:14:23.000000000 +0000
++++ src/Makefile
+@@ -49,7 +49,7 @@ all:: INSTALL
+
+ INSTALL: $(NAME)$(EXEC_EXT)
+ # file isn't made for OS X, so check that it's there first
+- (if [ -f $(NAME) ]; then ./$(NAME) -doc install > INSTALLATION; fi)
++## (if [ -f $(NAME) ]; then ./$(NAME) -doc install > INSTALLATION; fi)
+
+ ########################################################################
+ ## Miscellaneous developer-only switches
+@@ -78,7 +78,7 @@ include Makefile.OCaml
+ ######################################################################
+ # Installation
+
+-INSTALLDIR = $(HOME)/bin/
++INSTALLDIR = ${DESTDIR}$(PREFIX)/bin/
+
+ # This has two names because on OSX the file INSTALL shadows the target 'install'!
+ install: doinstall
+@@ -90,9 +90,7 @@ text:
+ $(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)
+
+
+ ######################################################################
+@@ -348,7 +346,6 @@ tags:
+ $(ETAGS) *.mli */*.mli *.ml */*.ml */*.m *.c */*.c *.txt \
+ ; fi
+
+-all:: TAGS
+
+ TAGS:
+ $(MAKE) tags
Index: pkgsrc/net/unison/patches/patch-src_Makefile.OCaml
diff -u /dev/null pkgsrc/net/unison/patches/patch-src_Makefile.OCaml:1.1
--- /dev/null Tue Nov 14 13:03:35 2017
+++ pkgsrc/net/unison/patches/patch-src_Makefile.OCaml Tue Nov 14 13:03:35 2017
@@ -0,0 +1,43 @@
+$NetBSD: patch-src_Makefile.OCaml,v 1.1 2017/11/14 13:03:35 jaapb Exp $
+
+Correct lablgtk paths for 2.16, and use ocamlopt.opt for compilation
+
+--- src/Makefile.OCaml.orig 2015-10-05 18:14:23.000000000 +0000
++++ src/Makefile.OCaml
+@@ -75,8 +75,8 @@ OCAMLLIBDIR=$(shell ocamlc -v | tail -1
+ #
+ # This should be set to an appropriate value automatically, depending
+ # on whether the lablgtk library is available
+-LABLGTKLIB=$(OCAMLLIBDIR)/lablgtk
+-LABLGTK2LIB=$(OCAMLLIBDIR)/lablgtk2
++LABLGTKLIB=$(OCAMLLIBDIR)/site-lib/lablgtk
++LABLGTK2LIB=$(OCAMLLIBDIR)/site-lib/lablgtk2
+ ##BCP [3/2007]: Removed temporarily, since the OSX UI is not working well
+ ## at the moment and we don't want to confuse people by building it by default
+ ifeq ($(OSARCH),osx)
+@@ -292,14 +292,14 @@ endif
+
+ # Gtk GUI
+ ifeq ($(UISTYLE), gtk)
+- CAMLFLAGS+=-I +lablgtk
++ CAMLFLAGS+=-I $(OCAMLLIBDIR)/site-lib/lablgtk
+ OCAMLOBJS+=pixmaps.cmo uigtk.cmo linkgtk.cmo
+ OCAMLLIBS+=lablgtk.cma
+ endif
+
+ # Gtk2 GUI
+ ifeq ($(UISTYLE), gtk2)
+- CAMLFLAGS+=-I +lablgtk2
++ CAMLFLAGS+=-I $(OCAMLLIBDIR)/site-lib/lablgtk2
+ OCAMLOBJS+=pixmaps.cmo uigtk2.cmo linkgtk2.cmo
+ OCAMLLIBS+=lablgtk.cma
+ endif
+@@ -384,7 +384,7 @@ ifeq ($(PROFILING), true)
+ else
+ OCAMLC=$(EXEC_PREFIX)ocamlc
+ endif
+-OCAMLOPT=$(EXEC_PREFIX)ocamlopt
++OCAMLOPT=$(EXEC_PREFIX)ocamlopt.opt
+
+ ifeq ($(NATIVE), true)
+ ## Set up for native code compilation
Index: pkgsrc/net/unison/patches/patch-src_fs.ml
diff -u /dev/null pkgsrc/net/unison/patches/patch-src_fs.ml:1.1
--- /dev/null Tue Nov 14 13:03:35 2017
+++ pkgsrc/net/unison/patches/patch-src_fs.ml Tue Nov 14 13:03:35 2017
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_fs.ml,v 1.1 2017/11/14 13:03:35 jaapb Exp $
+
+System symlink definition has changed
+--- src/fs.ml.orig 2015-10-05 18:14:23.000000000 +0000
++++ src/fs.ml
+@@ -21,7 +21,7 @@ type fspath = Fspath.t
+ type dir_handle = System.dir_handle
+ = { readdir : unit -> string; closedir : unit -> unit }
+
+-let symlink l f = System.symlink l (Fspath.toString f)
++let symlink ?to_dir l f = System.symlink l (Fspath.toString f)
+
+ let readlink f = System.readlink (Fspath.toString f)
+
Index: pkgsrc/net/unison/patches/patch-src_mkProjectInfo.ml
diff -u /dev/null pkgsrc/net/unison/patches/patch-src_mkProjectInfo.ml:1.1
--- /dev/null Tue Nov 14 13:03:35 2017
+++ pkgsrc/net/unison/patches/patch-src_mkProjectInfo.ml Tue Nov 14 13:03:35 2017
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_mkProjectInfo.ml,v 1.1 2017/11/14 13:03:35 jaapb Exp $
+
+Add revision string for correct version detection
+--- src/mkProjectInfo.ml.orig 2015-10-05 18:14:23.000000000 +0000
++++ src/mkProjectInfo.ml
+@@ -42,7 +42,7 @@ let pointVersionOrigin = 533 (* Revision
+ (* ---------------------------------------------------------------------- *)
+ (* You shouldn't need to edit below. *)
+
+-let revisionString = "$Rev$";;
++let revisionString = "$Rev: 548$";;
+
+ let pointVersion =
+ Scanf.sscanf revisionString "$Rev: %d " (fun x -> x) - pointVersionOrigin;;
Index: pkgsrc/net/unison/patches/patch-src_system_system_intf.ml
diff -u /dev/null pkgsrc/net/unison/patches/patch-src_system_system_intf.ml:1.1
--- /dev/null Tue Nov 14 13:03:35 2017
+++ pkgsrc/net/unison/patches/patch-src_system_system_intf.ml Tue Nov 14 13:03:35 2017
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_system_system_intf.ml,v 1.1 2017/11/14 13:03:35 jaapb Exp $
+
+System symlink definition has changed
+--- src/system/system_intf.ml.orig 2015-10-05 18:14:23.000000000 +0000
++++ src/system/system_intf.ml
+@@ -20,7 +20,7 @@ module type Core = sig
+ type fspath
+ type dir_handle = { readdir : unit -> string; closedir : unit -> unit }
+
+-val symlink : string -> fspath -> unit
++val symlink : ?to_dir:bool -> string -> fspath -> unit
+ val readlink : fspath -> string
+ val chown : fspath -> int -> int -> unit
+ val chmod : fspath -> int -> unit
Index: pkgsrc/net/unison/patches/patch-src_uigtk2.ml
diff -u /dev/null pkgsrc/net/unison/patches/patch-src_uigtk2.ml:1.1
--- /dev/null Tue Nov 14 13:03:35 2017
+++ pkgsrc/net/unison/patches/patch-src_uigtk2.ml Tue Nov 14 13:03:35 2017
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_uigtk2.ml,v 1.1 2017/11/14 13:03:35 jaapb Exp $
+
+Lablgtk now has safe_string
+--- src/uigtk2.ml.orig 2015-10-05 18:14:23.000000000 +0000
++++ src/uigtk2.ml
+@@ -94,7 +94,7 @@ let icon =
+ 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 =
Home |
Main Index |
Thread Index |
Old Index