CVS commit: pkgsrc/devel/ocaml-yojson

["Jaap Boender" <jaapb%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Sat Jul 15 10:13:59 UTC 2017

Modified Files:
        pkgsrc/devel/ocaml-yojson: Makefile PLIST distinfo
Added Files:
        pkgsrc/devel/ocaml-yojson/patches: patch-Makefile

Log Message:
Updated package to install ydump if warranted


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/ocaml-yojson/Makefile \
    pkgsrc/devel/ocaml-yojson/PLIST pkgsrc/devel/ocaml-yojson/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/ocaml-yojson/patches/patch-Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/ocaml-yojson/Makefile
diff -u pkgsrc/devel/ocaml-yojson/Makefile:1.1 pkgsrc/devel/ocaml-yojson/Makefile:1.2
--- pkgsrc/devel/ocaml-yojson/Makefile:1.1      Tue Jul 11 11:29:56 2017
+++ pkgsrc/devel/ocaml-yojson/Makefile  Sat Jul 15 10:13:59 2017
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2017/07/11 11:29:56 jaapb Exp $
+# $NetBSD: Makefile,v 1.2 2017/07/15 10:13:59 jaapb Exp $
 
 GITHUB_PROJECT=        yojson
 GITHUB_TAG=    v${PKGVERSION_NOREV}
 DISTNAME=      ${GITHUB_PROJECT}-1.3.3
 PKGNAME=       ocaml-${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=mjambon/}
 
@@ -16,6 +17,7 @@ MAKE_JOBS_SAFE=       no
 USE_TOOLS+=    gmake
 BUILD_TARGET=  META all
 OCAML_USE_FINDLIB=     yes
+INSTALLATION_DIRS+=    bin
 
 .include "../../mk/ocaml.mk"
 
Index: pkgsrc/devel/ocaml-yojson/PLIST
diff -u pkgsrc/devel/ocaml-yojson/PLIST:1.1 pkgsrc/devel/ocaml-yojson/PLIST:1.2
--- pkgsrc/devel/ocaml-yojson/PLIST:1.1 Tue Jul 11 11:29:56 2017
+++ pkgsrc/devel/ocaml-yojson/PLIST     Sat Jul 15 10:13:59 2017
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2017/07/11 11:29:56 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.2 2017/07/15 10:13:59 jaapb Exp $
+${PLIST.ocaml-opt}bin/ydump
 ${OCAML_SITELIB}/yojson/META
 ${OCAML_SITELIB}/yojson/common.mli
 ${OCAML_SITELIB}/yojson/pretty.mli
Index: pkgsrc/devel/ocaml-yojson/distinfo
diff -u pkgsrc/devel/ocaml-yojson/distinfo:1.1 pkgsrc/devel/ocaml-yojson/distinfo:1.2
--- pkgsrc/devel/ocaml-yojson/distinfo:1.1      Tue Jul 11 11:29:56 2017
+++ pkgsrc/devel/ocaml-yojson/distinfo  Sat Jul 15 10:13:59 2017
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1 2017/07/11 11:29:56 jaapb Exp $
+$NetBSD: distinfo,v 1.2 2017/07/15 10:13:59 jaapb Exp $
 
 SHA1 (yojson-1.3.3.tar.gz) = 7b8cb2fff4142ac9aed0be5d3cdb32cc00fdd703
 RMD160 (yojson-1.3.3.tar.gz) = 3dda76543700b860deee42ab144e783c504f5eb0
 SHA512 (yojson-1.3.3.tar.gz) = 78d88d470bb64360d020ebc70d9faaa7abca6476fd20d0224e188b44d147c42cea8723adff0845e5444d684b2d0e186154cca288cb236de94a83a44229fcb426
 Size (yojson-1.3.3.tar.gz) = 26940 bytes
+SHA1 (patch-Makefile) = 5bd051290078ddbcf98b2024d3e2fda06de0dd23

Added files:

Index: pkgsrc/devel/ocaml-yojson/patches/patch-Makefile
diff -u /dev/null pkgsrc/devel/ocaml-yojson/patches/patch-Makefile:1.1
--- /dev/null   Sat Jul 15 10:13:59 2017
+++ pkgsrc/devel/ocaml-yojson/patches/patch-Makefile    Sat Jul 15 10:13:59 2017
@@ -0,0 +1,14 @@
+$NetBSD: patch-Makefile,v 1.1 2017/07/15 10:13:59 jaapb Exp $
+
+Install ydump properly
+--- Makefile.orig      2016-10-26 23:44:34.000000000 +0000
++++ Makefile
+@@ -30,7 +30,7 @@ META: META.in Makefile
+       sed -e 's:@@VERSION@@:$(VERSION):' META.in > META
+ 
+ install: META install-lib
+-      test ! -f ydump$(EXE) || cp ydump $(BINDIR)/
++      test ! -f ydump$(EXE) || $(BSD_INSTALL_PROGRAM) ydump $(DESTDIR)$(BINDIR)/
+ 
+ install-lib:
+       ocamlfind install yojson META \