diff options
| author | wiz <wiz@pkgsrc.org> | 2018-04-30 12:22:31 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2018-04-30 12:22:31 +0000 |
| commit | 9f9810ef2b3c74d3448b6f74a03b4bb175b059e4 (patch) | |
| tree | 02f90bf19a809358b1cfe2788d520176a8ff7d06 /net | |
| parent | 7a0b6b1c5d2250e2083755b00b9e0148569345e6 (diff) | |
| download | pkgsrc-9f9810ef2b3c74d3448b6f74a03b4bb175b059e4.tar.gz | |
unison2.51: remove unneeded patch.
ok jaapb@
Diffstat (limited to 'net')
| -rw-r--r-- | net/unison2.51/distinfo | 3 | ||||
| -rw-r--r-- | net/unison2.51/patches/patch-src_Makefile.OCaml | 44 |
2 files changed, 1 insertions, 46 deletions
diff --git a/net/unison2.51/distinfo b/net/unison2.51/distinfo index 9a3016b4993..2c9950e0097 100644 --- a/net/unison2.51/distinfo +++ b/net/unison2.51/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.3 2018/04/30 10:23:49 wiz Exp $ +$NetBSD: distinfo,v 1.4 2018/04/30 12:22:31 wiz Exp $ SHA1 (unison-2.51.2.tar.gz) = 63e3b526254ab6356a3fabf74be533982c2962c2 RMD160 (unison-2.51.2.tar.gz) = d73c88be2a5c3c677939f4adede4c0f772ecff33 SHA512 (unison-2.51.2.tar.gz) = 4ec4a1603ce5e561084dcd59621a0cc72c1ea40e3e23e36408c436c51bde3eb82774f671aba85c016f87982417800e8a27b978be59c92aa62ce9e4be1a072011 Size (unison-2.51.2.tar.gz) = 1398790 bytes SHA1 (patch-src_Makefile) = 3172ed284bea2d21ccb475439c53ce65a45b79f6 -SHA1 (patch-src_Makefile.OCaml) = df9c889fc892e66f48c769e72cbb1cea8da525fc SHA1 (patch-src_uigtk2.ml) = 87a9c1e678f4056c0a32bfb3c3b7320652a171a2 diff --git a/net/unison2.51/patches/patch-src_Makefile.OCaml b/net/unison2.51/patches/patch-src_Makefile.OCaml deleted file mode 100644 index 9d0d54d1c70..00000000000 --- a/net/unison2.51/patches/patch-src_Makefile.OCaml +++ /dev/null @@ -1,44 +0,0 @@ -$NetBSD: patch-src_Makefile.OCaml,v 1.2 2018/04/30 10:21:02 wiz Exp $ - -Correct lablgtk paths for 2.16, and use ocamlopt.opt for compilation - ---- src/Makefile.OCaml.orig 2018-01-27 21:12:13.000000000 +0000 -+++ src/Makefile.OCaml -@@ -73,8 +73,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) -@@ -272,7 +272,7 @@ 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 -@@ -282,7 +282,7 @@ OCAMLFIND := $(shell command -v ocamlfin - - ifeq ($(UISTYLE), gtk2) - ifndef OCAMLFIND -- CAMLFLAGS+=-I +lablgtk2 -+ CAMLFLAGS+=-I $(OCAMLLIBDIR)/site-lib/lablgtk2 - else - CAMLFLAGS+=$(shell $(OCAMLFIND) query -i-format lablgtk2 ) - endif -@@ -370,7 +370,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 |