pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net/unison Updated net/unison to latest version, 2.48.15.
details: https://anonhg.NetBSD.org/pkgsrc/rev/e61b3705a9a3
branches: trunk
changeset: 371522:e61b3705a9a3
user: jaapb <jaapb%pkgsrc.org@localhost>
date: Tue Nov 14 13:03:35 2017 +0000
description:
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.
diffstat:
net/unison/Makefile | 29 +++++++-------
net/unison/distinfo | 18 +++++---
net/unison/patches/patch-Makefile.OCaml | 43 ----------------------
net/unison/patches/patch-aa | 41 --------------------
net/unison/patches/patch-src_Makefile | 41 ++++++++++++++++++++
net/unison/patches/patch-src_Makefile.OCaml | 43 ++++++++++++++++++++++
net/unison/patches/patch-src_fs.ml | 14 +++++++
net/unison/patches/patch-src_mkProjectInfo.ml | 14 +++++++
net/unison/patches/patch-src_system_system_intf.ml | 14 +++++++
net/unison/patches/patch-src_uigtk2.ml | 14 +++++++
10 files changed, 166 insertions(+), 105 deletions(-)
diffs (truncated from 337 to 300 lines):
diff -r 723d93abd0f2 -r e61b3705a9a3 net/unison/Makefile
--- a/net/unison/Makefile Tue Nov 14 12:54:35 2017 +0000
+++ b/net/unison/Makefile Tue Nov 14 13:03:35 2017 +0000
@@ -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_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+= 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"
diff -r 723d93abd0f2 -r e61b3705a9a3 net/unison/distinfo
--- a/net/unison/distinfo Tue Nov 14 12:54:35 2017 +0000
+++ b/net/unison/distinfo Tue Nov 14 13:03:35 2017 +0000
@@ -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
diff -r 723d93abd0f2 -r e61b3705a9a3 net/unison/patches/patch-Makefile.OCaml
--- a/net/unison/patches/patch-Makefile.OCaml Tue Nov 14 12:54:35 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-$NetBSD: patch-Makefile.OCaml,v 1.5 2015/01/06 12:58:37 wiz Exp $
-
-Correct lablgtk paths for 2.16, and use ocamlopt.opt for compilation
-
---- Makefile.OCaml.orig 2014-09-28 16:48:05.000000000 +0000
-+++ 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
diff -r 723d93abd0f2 -r e61b3705a9a3 net/unison/patches/patch-aa
--- a/net/unison/patches/patch-aa Tue Nov 14 12:54:35 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-$NetBSD: patch-aa,v 1.11 2012/09/14 19:14:53 jaapb Exp $
-
-Correct installation procedure
---- Makefile.orig 2011-04-16 20:35:38.000000000 +0000
-+++ 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
-@@ -80,7 +80,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
-@@ -92,9 +92,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)
-
-
- ######################################################################
-@@ -350,7 +348,6 @@ tags:
- $(ETAGS) *.mli */*.mli *.ml */*.ml */*.m *.c */*.c *.txt \
- ; fi
-
--all:: TAGS
-
- TAGS:
- $(MAKE) tags
diff -r 723d93abd0f2 -r e61b3705a9a3 net/unison/patches/patch-src_Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/unison/patches/patch-src_Makefile Tue Nov 14 13:03:35 2017 +0000
@@ -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
diff -r 723d93abd0f2 -r e61b3705a9a3 net/unison/patches/patch-src_Makefile.OCaml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/unison/patches/patch-src_Makefile.OCaml Tue Nov 14 13:03:35 2017 +0000
@@ -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
diff -r 723d93abd0f2 -r e61b3705a9a3 net/unison/patches/patch-src_fs.ml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/unison/patches/patch-src_fs.ml Tue Nov 14 13:03:35 2017 +0000
@@ -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)
+
diff -r 723d93abd0f2 -r e61b3705a9a3 net/unison/patches/patch-src_mkProjectInfo.ml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/unison/patches/patch-src_mkProjectInfo.ml Tue Nov 14 13:03:35 2017 +0000
@@ -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 =
Home |
Main Index |
Thread Index |
Old Index