CVS commit: pkgsrc/lang/pict

["David A. Holland" <dholland%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dholland
Date:           Fri Mar 16 08:26:29 UTC 2018

Modified Files:
        pkgsrc/lang/pict: Makefile distinfo
Removed Files:
        pkgsrc/lang/pict/patches: patch-ab patch-ac patch-ad patch-ae patch-af
            patch-ba patch-bb patch-bc patch-bd patch-ya patch-yb patch-yc
            patch-yd patch-ye patch-yf patch-yg patch-yh patch-yi patch-yj
            patch-yk patch-yl patch-ym

Log Message:
Roll existing patches into a patchkit; add more to fix build with
ocaml 4.06 and also fix up some other build warnings that have
appeared. PKGREVISION -> 13.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/lang/pict/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/pict/distinfo
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/lang/pict/patches/patch-ab \
    pkgsrc/lang/pict/patches/patch-ac pkgsrc/lang/pict/patches/patch-ad \
    pkgsrc/lang/pict/patches/patch-ae pkgsrc/lang/pict/patches/patch-af \
    pkgsrc/lang/pict/patches/patch-ya pkgsrc/lang/pict/patches/patch-yb \
    pkgsrc/lang/pict/patches/patch-yc pkgsrc/lang/pict/patches/patch-yd \
    pkgsrc/lang/pict/patches/patch-ye pkgsrc/lang/pict/patches/patch-yf \
    pkgsrc/lang/pict/patches/patch-yg pkgsrc/lang/pict/patches/patch-yh \
    pkgsrc/lang/pict/patches/patch-yi pkgsrc/lang/pict/patches/patch-yj \
    pkgsrc/lang/pict/patches/patch-yk pkgsrc/lang/pict/patches/patch-yl \
    pkgsrc/lang/pict/patches/patch-ym
cvs rdiff -u -r1.1 -r0 pkgsrc/lang/pict/patches/patch-ba \
    pkgsrc/lang/pict/patches/patch-bc pkgsrc/lang/pict/patches/patch-bd
cvs rdiff -u -r1.2 -r0 pkgsrc/lang/pict/patches/patch-bb

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

Modified files:

Index: pkgsrc/lang/pict/Makefile
diff -u pkgsrc/lang/pict/Makefile:1.16 pkgsrc/lang/pict/Makefile:1.17
--- pkgsrc/lang/pict/Makefile:1.16      Wed Jan 10 16:53:11 2018
+++ pkgsrc/lang/pict/Makefile   Fri Mar 16 08:26:28 2018
@@ -1,14 +1,17 @@
-# $NetBSD: Makefile,v 1.16 2018/01/10 16:53:11 jaapb Exp $
+# $NetBSD: Makefile,v 1.17 2018/03/16 08:26:28 dholland Exp $
 
 DISTNAME=      pict-4.1
-PKGREVISION=   12
+PKGREVISION=   13
 CATEGORIES=    lang
 MASTER_SITES=  http://www.cis.upenn.edu/~bcpierce/papers/pict/pict-4.1/
 
+PATCH_SITES=   http://www.NetBSD.org/~dholland/patchkits/pict/
+PATCHFILES=    pict-jumbo-patch-20180316.gz
+PATCH_DIST_STRIP= -p1
+
 MAINTAINER=    dholland%NetBSD.org@localhost
 HOMEPAGE=      http://www.cis.upenn.edu/~bcpierce/papers/pict/Html/Pict.html
 COMMENT=       Concurrent language based on Milner's pi calculus
-
 LICENSE=       gnu-gpl-v2
 
 MAKE_JOBS_SAFE=                no
@@ -21,9 +24,14 @@ MAKE_ENV+=           X11INCLUDE=${X11BASE}/includ
 
 TEST_TARGET=   test
 
+.include "../../mk/ocaml.mk"
+
+.if !empty(OCAML_USE_OPT_COMPILER:Myes)
+MAKE_ENV+=             OCAMLOPT=yes
+.endif
+
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/Doc/*.ps ${DESTDIR}${PREFIX}/share/doc/pict/
 
-.include "../../lang/ocaml/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/lang/pict/distinfo
diff -u pkgsrc/lang/pict/distinfo:1.4 pkgsrc/lang/pict/distinfo:1.5
--- pkgsrc/lang/pict/distinfo:1.4       Tue Nov  3 22:50:41 2015
+++ pkgsrc/lang/pict/distinfo   Fri Mar 16 08:26:28 2018
@@ -1,29 +1,11 @@
-$NetBSD: distinfo,v 1.4 2015/11/03 22:50:41 agc Exp $
+$NetBSD: distinfo,v 1.5 2018/03/16 08:26:28 dholland Exp $
 
 SHA1 (pict-4.1.tar.gz) = e3d3341d4dc54ed015b0d89eab6760ee7f14c5cd
 RMD160 (pict-4.1.tar.gz) = aea1df3530387c592a1c5eb9e8f464e242109f86
 SHA512 (pict-4.1.tar.gz) = a1d3e74ecbdd664c29f840fb17f49599f3b27975d0f062e708ad1164ac5a2d6398e815bea1db9ac3f50f25e4e492e744554325077bf0239fc799c9af92f2b71d
 Size (pict-4.1.tar.gz) = 1062078 bytes
+SHA1 (pict-jumbo-patch-20180316.gz) = c8777191a5f1ed598f24321fff7e71d4fd13e29f
+RMD160 (pict-jumbo-patch-20180316.gz) = 64ed708666b6d2a377c59537fee2d28cc7e94f68
+SHA512 (pict-jumbo-patch-20180316.gz) = f79caef5ceee50fa905ef8d90a67d8337977dcc6780cd38ed5b5032573383f3098ec86c4558affeddfebc48878f60829ef5aca293ff2026ee498b6831fddc709
+Size (pict-jumbo-patch-20180316.gz) = 12499 bytes
 SHA1 (patch-aa) = 3b7a643d157414683018448a20d9dea8b22ec8f8
-SHA1 (patch-ab) = 95faebd4a9f85d308844f16f0e589a827e8a0fae
-SHA1 (patch-ac) = e6e93f42efc49d6d3a37335b4a40ec5694b2e0d4
-SHA1 (patch-ad) = 5867631186c5973b76d81704306fb142e479b72d
-SHA1 (patch-ae) = 5eaf7be65894e22a7200e8075dfb988722220765
-SHA1 (patch-af) = 38a20d8bf945b3a3662d4c4ebc0d7158eac607ec
-SHA1 (patch-ba) = b7dc6e6b43935e2c87e636cd43ebd9fb9c53c762
-SHA1 (patch-bb) = 172d1f9bf91783c139537a497a622fd1ebd43ad6
-SHA1 (patch-bc) = 81f178d7e48f21afb5fbc1c21f4de839307568c1
-SHA1 (patch-bd) = d1784b7d180c26625205d68aa0143d7796a80c2f
-SHA1 (patch-ya) = d7513a4431ede203217bb39feb42b62c2f9784b0
-SHA1 (patch-yb) = 19c3a5d892f253a450f10ce468b8238653543ee5
-SHA1 (patch-yc) = abc0298eedeb0d459ce067567f96c759df025eb1
-SHA1 (patch-yd) = 4fac383dc8c8fd862f9f3a3ee49585cf51ce87d5
-SHA1 (patch-ye) = e247389fcf286b7121b20f51a4e5d75c3ab7cd47
-SHA1 (patch-yf) = 46c5e4471e647dfa980b6ae11d92f4a6ae7cb163
-SHA1 (patch-yg) = 9874fcadf01644e18667ef048d7045d9b5be9c59
-SHA1 (patch-yh) = dbf12f2a43d740e8f429065bb098654be992c4cc
-SHA1 (patch-yi) = 4cb6d8232c2b9d33478bf4a26bc3b8a705fb15ce
-SHA1 (patch-yj) = ebc56cc20e194238ee18c7b7f35957214d4b7282
-SHA1 (patch-yk) = fd95429fc9670913adce03d23c39a043c40fad3c
-SHA1 (patch-yl) = 65e69f2e8c0e10ab7618532dec14248cb45f85b5
-SHA1 (patch-ym) = f43515051bf75358006e64022b51e7b3eb146ab2