pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang/pict Roll existing patches into a patchkit; add m...
details: https://anonhg.NetBSD.org/pkgsrc/rev/e461215a7d80
branches: trunk
changeset: 377391:e461215a7d80
user: dholland <dholland%pkgsrc.org@localhost>
date: Fri Mar 16 08:26:28 2018 +0000
description:
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.
diffstat:
lang/pict/Makefile | 16 +++-
lang/pict/distinfo | 28 +------
lang/pict/patches/patch-ab | 39 -----------
lang/pict/patches/patch-ac | 31 ---------
lang/pict/patches/patch-ad | 28 --------
lang/pict/patches/patch-ae | 15 ----
lang/pict/patches/patch-af | 17 -----
lang/pict/patches/patch-ba | 15 ----
lang/pict/patches/patch-bb | 29 --------
lang/pict/patches/patch-bc | 15 ----
lang/pict/patches/patch-bd | 21 ------
lang/pict/patches/patch-ya | 109 --------------------------------
lang/pict/patches/patch-yb | 33 ---------
lang/pict/patches/patch-yc | 152 ---------------------------------------------
lang/pict/patches/patch-yd | 49 --------------
lang/pict/patches/patch-ye | 42 ------------
lang/pict/patches/patch-yf | 15 ----
lang/pict/patches/patch-yg | 15 ----
lang/pict/patches/patch-yh | 58 -----------------
lang/pict/patches/patch-yi | 24 -------
lang/pict/patches/patch-yj | 48 --------------
lang/pict/patches/patch-yk | 15 ----
lang/pict/patches/patch-yl | 15 ----
lang/pict/patches/patch-ym | 15 ----
24 files changed, 17 insertions(+), 827 deletions(-)
diffs (truncated from 966 to 300 lines):
diff -r e1fa77624925 -r e461215a7d80 lang/pict/Makefile
--- a/lang/pict/Makefile Fri Mar 16 08:03:02 2018 +0000
+++ b/lang/pict/Makefile Fri Mar 16 08:26:28 2018 +0000
@@ -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 @@
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"
diff -r e1fa77624925 -r e461215a7d80 lang/pict/distinfo
--- a/lang/pict/distinfo Fri Mar 16 08:03:02 2018 +0000
+++ b/lang/pict/distinfo Fri Mar 16 08:26:28 2018 +0000
@@ -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
diff -r e1fa77624925 -r e461215a7d80 lang/pict/patches/patch-ab
--- a/lang/pict/patches/patch-ab Fri Mar 16 08:03:02 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2009/10/28 06:13:40 dholland Exp $
-
-DESTDIR support.
-
---- Makefile.orig 2009-10-23 23:31:41.000000000 -0400
-+++ Makefile 2009-10-23 23:32:35.000000000 -0400
-@@ -38,7 +38,7 @@ all::
- @$(MAKE) -C Runtime all
- @$(MAKE) -C Lib all
-
--install:: $(INSTALLDIR) $(INSTALLLIB)
-+install:: $(DESTDIR)$(INSTALLDIR) $(DESTDIR)$(INSTALLLIB)
- @$(MAKE) -C Config all
- @$(MAKE) -C Tools install
- @$(MAKE) -C Pict install
-@@ -50,6 +50,7 @@ test:: all
-
- show:
- @echo "SRCDIR " = $(SRCDIR)
-+ @echo "DESTDIR " = $(DESTDIR)
- @echo "INSTALLDIR " = $(INSTALLDIR)
- @echo "INSTALLLIB " = $(INSTALLLIB)
- @echo "GCC " = $(GCC)
-@@ -103,11 +104,11 @@ clean::
- @$(MAKE) -C Html clean
- endif
-
--$(INSTALLDIR):
-- mkdir -p $(INSTALLDIR)
-+$(DESTDIR)$(INSTALLDIR):
-+ mkdir -p $(DESTDIR)$(INSTALLDIR)
-
--$(INSTALLLIB):
-- mkdir -p $(INSTALLLIB)
-+$(DESTDIR)$(INSTALLLIB):
-+ mkdir -p $(DESTDIR)$(INSTALLLIB)
-
- ifeq ($(PICTDEVEL),yes)
- all:: ANNOUNCE
diff -r e1fa77624925 -r e461215a7d80 lang/pict/patches/patch-ac
--- a/lang/pict/patches/patch-ac Fri Mar 16 08:03:02 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2009/10/28 06:13:40 dholland Exp $
-
-DESTDIR support.
-
---- Lib/Makefile~ 1998-03-22 18:27:04.000000000 -0500
-+++ Lib/Makefile 2009-10-23 23:35:22.000000000 -0400
-@@ -9,15 +9,15 @@ include $(SRCDIR)/PiRules
- PIFLAGS += -reset lib
-
- install:: $(TARGETS)
-- mkdir -p $(INSTALLLIB)/Contrib $(INSTALLLIB)/Posix
-- mkdir -p $(INSTALLLIB)/Picture $(INSTALLLIB)/Std
-- mkdir -p $(INSTALLLIB)/X11
-- cp *.px *.px.o $(INSTALLLIB)
-- cp Contrib/*.px Contrib/*.px.o $(INSTALLLIB)/Contrib
-- cp Posix/*.px Posix/*.px.o $(INSTALLLIB)/Posix
-- cp Picture/*.px Picture/*.px.o $(INSTALLLIB)/Picture
-- cp Std/*.px Std/*.px.o $(INSTALLLIB)/Std
-- cp X11/*.px X11/*.px.o $(INSTALLLIB)/X11
-+ mkdir -p $(DESTDIR)$(INSTALLLIB)/Contrib $(DESTDIR)$(INSTALLLIB)/Posix
-+ mkdir -p $(DESTDIR)$(INSTALLLIB)/Picture $(DESTDIR)$(INSTALLLIB)/Std
-+ mkdir -p $(DESTDIR)$(INSTALLLIB)/X11
-+ cp *.px *.px.o $(DESTDIR)$(INSTALLLIB)
-+ cp Contrib/*.px Contrib/*.px.o $(DESTDIR)$(INSTALLLIB)/Contrib
-+ cp Posix/*.px Posix/*.px.o $(DESTDIR)$(INSTALLLIB)/Posix
-+ cp Picture/*.px Picture/*.px.o $(DESTDIR)$(INSTALLLIB)/Picture
-+ cp Std/*.px Std/*.px.o $(DESTDIR)$(INSTALLLIB)/Std
-+ cp X11/*.px X11/*.px.o $(DESTDIR)$(INSTALLLIB)/X11
-
- ifneq ($(wildcard *.src),)
-
diff -r e1fa77624925 -r e461215a7d80 lang/pict/patches/patch-ad
--- a/lang/pict/patches/patch-ad Fri Mar 16 08:03:02 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2009/10/28 06:13:40 dholland Exp $
-
-DESTDIR support.
-
---- Pict/Makefile~ 1998-03-22 18:27:14.000000000 -0500
-+++ Pict/Makefile 2009-10-23 23:36:18.000000000 -0400
-@@ -6,7 +6,7 @@ PIFLAGS += -reset lib
-
- all:: pict
-
--$(INSTALLDIR)/% : % Makefile ../SiteSpecific
-+$(DESTDIR)$(INSTALLDIR)/% : % Makefile ../SiteSpecific
- @echo Generating $@
- @rm -f $@
- @echo '#!/bin/sh' >$@
-@@ -27,9 +27,9 @@ $(INSTALLDIR)/% : % Makefile ../SiteSpec
- @echo exec $(INSTALLLIB)/$< $$'*' >>$@
- @chmod 755 $@
-
--install:: all $(INSTALLDIR)/pict
-- cp -f pict $(INSTALLLIB)
-- chmod 755 $(INSTALLLIB)/pict
-+install:: all $(DESTDIR)$(INSTALLDIR)/pict
-+ cp -f pict $(DESTDIR)$(INSTALLLIB)
-+ chmod 755 $(DESTDIR)$(INSTALLLIB)/pict
-
- ifneq ($(wildcard *.ml),)
-
diff -r e1fa77624925 -r e461215a7d80 lang/pict/patches/patch-ae
--- a/lang/pict/patches/patch-ae Fri Mar 16 08:03:02 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2009/10/28 06:13:40 dholland Exp $
-
-DESTDIR support.
-
---- Runtime/Makefile~ 1998-03-22 18:27:18.000000000 -0500
-+++ Runtime/Makefile 2009-10-23 23:36:37.000000000 -0400
-@@ -4,7 +4,7 @@ include ../SiteSpecific
- all:: pictLib.a pictLibG.a pictLibP.a pict.h
-
- install: all
-- cp -f *.a pict.h $(INSTALLLIB)
-+ cp -f *.a pict.h $(DESTDIR)$(INSTALLLIB)
-
- ifneq ($(wildcard *.c),)
-
diff -r e1fa77624925 -r e461215a7d80 lang/pict/patches/patch-af
--- a/lang/pict/patches/patch-af Fri Mar 16 08:03:02 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2009/10/28 06:13:40 dholland Exp $
-
-DESTDIR support.
-
---- Tools/Makefile~ 1998-03-22 18:27:46.000000000 -0500
-+++ Tools/Makefile 2009-10-23 23:36:58.000000000 -0400
-@@ -3,8 +3,8 @@ TARGETS = src2tex src2pi
- include ../SiteSpecific
-
- install:: all
-- cp -f src2tex src2pi $(INSTALLLIB)
-- chmod 755 $(INSTALLLIB)/src2tex $(INSTALLLIB)/src2pi
-+ cp -f src2tex src2pi $(DESTDIR)$(INSTALLLIB)
-+ chmod 755 $(DESTDIR)$(INSTALLLIB)/src2tex $(DESTDIR)$(INSTALLLIB)/src2pi
- tags::
- etags *.mll
-
diff -r e1fa77624925 -r e461215a7d80 lang/pict/patches/patch-ba
--- a/lang/pict/patches/patch-ba Fri Mar 16 08:03:02 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-ba,v 1.1 2011/09/05 00:15:37 dholland Exp $
-
-fix void main.
-
---- Config/bytecopy.c~ 1998-03-22 23:26:53.000000000 +0000
-+++ Config/bytecopy.c
-@@ -3,7 +3,7 @@
-
- char buffer[27];
-
--void main (void)
-+int main (void)
- {
- COPY(buffer,"abcdefghijklmnopqrstuvwxyz",27);
- if (strcmp(buffer,"abcdefghijklmnopqrstuvwxyz") != 0) exit(1);
diff -r e1fa77624925 -r e461215a7d80 lang/pict/patches/patch-bb
--- a/lang/pict/patches/patch-bb Fri Mar 16 08:03:02 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-$NetBSD: patch-bb,v 1.2 2012/12/20 22:07:57 joerg Exp $
-
-fix void main.
-
---- Config/autoconf.orig 1998-03-22 23:26:53.000000000 +0000
-+++ Config/autoconf
-@@ -6,7 +6,7 @@ touch Config test.h config.h config.outp
- # Test for broken include files (SunOS)
-
- echo "#include <stdio.h>" > test.c
--echo "void main() { fprintf(stderr,\"hello\"); }" >> test.c
-+echo "int main() { fprintf(stderr,\"hello\"); return 0; }" >> test.c
- if gcc -Wall -c test.c 2>config.output; then
- if grep -q implicit config.output; then
- echo "Some function prototypes seem to be missing"
-@@ -173,11 +173,11 @@ if sh ./runtest x11.c; then
- echo "Successfully linked sample X11 program"
- echo "X11EXTRA = $X11EXTRA" >>Config
- else
-- libs="-idirafter $X11INCLUDE -R$X11LIB -L$X11LIB -lX11 $X11EXTRA"
-+ libs="-idirafter $X11INCLUDE -Wl,-R$X11LIB -L$X11LIB -lX11 $X11EXTRA"
- export libs
- if sh ./runtest x11.c; then
- echo "Successfully linked sample X11 program by using -R$X11LIB"
-- echo "X11EXTRA = -R$X11LIB $X11EXTRA" >>Config
-+ echo "X11EXTRA = -Wl,-R$X11LIB $X11EXTRA" >>Config
- else
- echo "Failed to link sample X11 program"
- exit 1
diff -r e1fa77624925 -r e461215a7d80 lang/pict/patches/patch-bc
--- a/lang/pict/patches/patch-bc Fri Mar 16 08:03:02 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-bc,v 1.1 2011/09/05 00:15:37 dholland Exp $
-
-fix void main.
-
---- Examples/Tests/persona.c~ 1998-03-22 23:27:02.000000000 +0000
-+++ Examples/Tests/persona.c
-@@ -13,7 +13,7 @@
- #include <pwd.h>
- #include <grp.h>
-
--void main ()
-+int main ()
- {
- int n;
- gid_t *g;
diff -r e1fa77624925 -r e461215a7d80 lang/pict/patches/patch-bd
Home |
Main Index |
Thread Index |
Old Index