3 files changed, 87 insertions, 43 deletions

diff --git a/lang/sketchy/Makefile b/lang/sketchy/Makefile
index ebd97cab58e1..6a43064077f1 100644
--- a/lang/sketchy/Makefile
+++ b/lang/sketchy/Makefile
@@ -6,13 +6,15 @@
 #
 
 PORTNAME=	sketchy
-PORTVERSION=	20061023
+PORTVERSION=	20061108
 CATEGORIES=	lang devel lisp scheme
 MASTER_SITES=	http://www.t3x.org/files/
 
 MAINTAINER=	nmh@t3x.org
 COMMENT=	An interpreter for purely applicative Scheme
 
+CONFLICTS=	p5-PAR-0.*
+
 USE_LDCONFIG=	yes
 MAKE_ENV+=	BINOWN=${BINOWN} \
 		BINGRP=${BINGRP}
diff --git a/lang/sketchy/distinfo b/lang/sketchy/distinfo
index 3ea22fa2ad2e..efd5d11ba46c 100644
--- a/lang/sketchy/distinfo
+++ b/lang/sketchy/distinfo
@@ -1,3 +1,3 @@
-MD5 (sketchy-20061023.tar.gz) = dcefff1e4d05af466ac36fc39020b49e
-SIZE (sketchy-20061023.tar.gz) = 170657
-SHA256 (sketchy-20061023.tar.gz) = f38a6e2875e5083eda24c69493aaa902222f0142db32a89a901575519687498c
+MD5 (sketchy-20061108.tar.gz) = 86a5f3200f0c3656b7d64efa4661bd5e
+SIZE (sketchy-20061108.tar.gz) = 182229
+SHA256 (sketchy-20061108.tar.gz) = 4da6ed06b4a51a0172c9029c4147ddb44ea1f75cb9dd171299aab4b715d8df5b
diff --git a/lang/sketchy/pkg-plist b/lang/sketchy/pkg-plist
index 0a7264b6deae..bdfd333a4124 100644
--- a/lang/sketchy/pkg-plist
+++ b/lang/sketchy/pkg-plist
@@ -1,10 +1,45 @@
+bin/pp
 bin/sk
 bin/sketchy
 include/sketchy.h
 lib/libsketchy.a
 lib/libsketchy.so
-lib/libsketchy.so.22
+lib/libsketchy.so.24
 %%DATADIR%%/LICENSE
+%%DATADIR%%/ext/assp.scm
+%%DATADIR%%/ext/count.scm
+%%DATADIR%%/ext/depth.scm
+%%DATADIR%%/ext/exists.scm
+%%DATADIR%%/ext/explode.scm
+%%DATADIR%%/ext/factorial.scm
+%%DATADIR%%/ext/filter.scm
+%%DATADIR%%/ext/forall.scm
+%%DATADIR%%/ext/headp.scm
+%%DATADIR%%/ext/id.scm
+%%DATADIR%%/ext/implode.scm
+%%DATADIR%%/ext/intersection.scm
+%%DATADIR%%/ext/iota.scm
+%%DATADIR%%/ext/last.scm
+%%DATADIR%%/ext/map-cdr.scm
+%%DATADIR%%/ext/memp.scm
+%%DATADIR%%/ext/not-equalp.scm
+%%DATADIR%%/ext/orderedp.scm
+%%DATADIR%%/ext/pair.scm
+%%DATADIR%%/ext/permute.scm
+%%DATADIR%%/ext/product.scm
+%%DATADIR%%/ext/qsort.scm
+%%DATADIR%%/ext/read-line.scm
+%%DATADIR%%/ext/remove.scm
+%%DATADIR%%/ext/remp.scm
+%%DATADIR%%/ext/remq.scm
+%%DATADIR%%/ext/remv.scm
+%%DATADIR%%/ext/replace.scm
+%%DATADIR%%/ext/sketchy-ext.scm
+%%DATADIR%%/ext/substitute.scm
+%%DATADIR%%/ext/sum.scm
+%%DATADIR%%/ext/tailp.scm
+%%DATADIR%%/ext/union.scm
+%%DATADIR%%/ext/unique.scm
 %%DATADIR%%/lib/abs.scm
 %%DATADIR%%/lib/append.scm
 %%DATADIR%%/lib/assoc.scm
@@ -26,6 +61,7 @@ lib/libsketchy.so.22
 %%DATADIR%%/lib/caaaar.scm
 %%DATADIR%%/lib/caaar.scm
 %%DATADIR%%/lib/caar.scm
+%%DATADIR%%/lib/case.scm
 %%DATADIR%%/lib/ceqp.scm
 %%DATADIR%%/lib/cgep.scm
 %%DATADIR%%/lib/cgtp.scm
@@ -38,10 +74,11 @@ lib/libsketchy.so.22
 %%DATADIR%%/lib/eqvp.scm
 %%DATADIR%%/lib/evenp.scm
 %%DATADIR%%/lib/expt.scm
+%%DATADIR%%/lib/fold-left.scm
+%%DATADIR%%/lib/fold-right.scm
 %%DATADIR%%/lib/gcd.scm
 %%DATADIR%%/lib/greater.scm
 %%DATADIR%%/lib/gteq.scm
-%%DATADIR%%/lib/id.scm
 %%DATADIR%%/lib/if.scm
 %%DATADIR%%/lib/integer.scm
 %%DATADIR%%/lib/integerp.scm
@@ -54,6 +91,7 @@ lib/libsketchy.so.22
 %%DATADIR%%/lib/list.scm
 %%DATADIR%%/lib/listp.scm
 %%DATADIR%%/lib/lteq.scm
+%%DATADIR%%/lib/map-car.scm
 %%DATADIR%%/lib/map.scm
 %%DATADIR%%/lib/max.scm
 %%DATADIR%%/lib/member.scm
@@ -87,10 +125,9 @@ lib/libsketchy.so.22
 %%DATADIR%%/lib/oddp.scm
 %%DATADIR%%/lib/plus.scm
 %%DATADIR%%/lib/positivep.scm
+%%DATADIR%%/lib/pred-iter.scm
 %%DATADIR%%/lib/pred.scm
 %%DATADIR%%/lib/quotient.scm
-%%DATADIR%%/lib/reduce.scm
-%%DATADIR%%/lib/reduce-r.scm
 %%DATADIR%%/lib/remainder.scm
 %%DATADIR%%/lib/reverse.scm
 %%DATADIR%%/lib/s-append.scm
@@ -116,53 +153,25 @@ lib/libsketchy.so.22
 %%DATADIR%%/lib/zerop.scm
 %%DATADIR%%/sketchy.image
 %%DATADIR%%/src/amk.scm
-%%DATADIR%%/src/anyp.scm
 %%DATADIR%%/src/bottles.scm
 %%DATADIR%%/src/bubblesort.scm
-%%DATADIR%%/src/count.scm
 %%DATADIR%%/src/date.scm
-%%DATADIR%%/src/depth.scm
 %%DATADIR%%/src/draw-tree.scm
 %%DATADIR%%/src/evaluate.scm
-%%DATADIR%%/src/everyp.scm
-%%DATADIR%%/src/explode.scm
-%%DATADIR%%/src/fact.scm
 %%DATADIR%%/src/factors.scm
-%%DATADIR%%/src/filter.scm
 %%DATADIR%%/src/gen-bottles.scm
 %%DATADIR%%/src/hanoi.scm
-%%DATADIR%%/src/headp.scm
 %%DATADIR%%/src/hyper.scm
-%%DATADIR%%/src/implode.scm
 %%DATADIR%%/src/infix.scm
 %%DATADIR%%/src/insert.scm
-%%DATADIR%%/src/intersection.scm
-%%DATADIR%%/src/iota.scm
 %%DATADIR%%/src/isort.scm
-%%DATADIR%%/src/last.scm
 %%DATADIR%%/src/lvrename.scm
-%%DATADIR%%/src/maplist.scm
-%%DATADIR%%/src/not-equalp.scm
-%%DATADIR%%/src/orderedp.scm
-%%DATADIR%%/src/pair.scm
-%%DATADIR%%/src/permute.scm
+%%DATADIR%%/src/pp.scm
 %%DATADIR%%/src/prefix.scm
-%%DATADIR%%/src/product.scm
 %%DATADIR%%/src/prolog.scm
-%%DATADIR%%/src/qsort.scm
 %%DATADIR%%/src/queens.scm
-%%DATADIR%%/src/read-line.scm
-%%DATADIR%%/src/remove.scm
 %%DATADIR%%/src/scmtocps.scm
-%%DATADIR%%/src/sketchy-ext.scm
-%%DATADIR%%/src/some.scm
-%%DATADIR%%/src/sublist.scm
-%%DATADIR%%/src/subst.scm
-%%DATADIR%%/src/sum.scm
-%%DATADIR%%/src/tailp.scm
 %%DATADIR%%/src/tree.scm
-%%DATADIR%%/src/union.scm
-%%DATADIR%%/src/unique.scm
 %%DATADIR%%/src/unlet.scm
 %%DATADIR%%/src/unsort.scm
 %%DATADIR%%/src/vqueens.scm
@@ -171,6 +180,7 @@ lib/libsketchy.so.22
 %%DOCSDIR%%/library/abs.html
 %%DOCSDIR%%/library/append.html
 %%DOCSDIR%%/library/assoc.html
+%%DOCSDIR%%/library/assp.html
 %%DOCSDIR%%/library/assq.html
 %%DOCSDIR%%/library/assv.html
 %%DOCSDIR%%/library/booleanp.html
@@ -189,26 +199,41 @@ lib/libsketchy.so.22
 %%DOCSDIR%%/library/caaaar.html
 %%DOCSDIR%%/library/caaar.html
 %%DOCSDIR%%/library/caar.html
+%%DOCSDIR%%/library/case.html
 %%DOCSDIR%%/library/ceqp.html
 %%DOCSDIR%%/library/cgep.html
 %%DOCSDIR%%/library/cgtp.html
 %%DOCSDIR%%/library/clep.html
 %%DOCSDIR%%/library/cltp.html
+%%DOCSDIR%%/library/count.html
+%%DOCSDIR%%/library/depth.html
 %%DOCSDIR%%/library/digits.html
 %%DOCSDIR%%/library/divide.html
 %%DOCSDIR%%/library/equal.html
 %%DOCSDIR%%/library/equalp.html
 %%DOCSDIR%%/library/eqvp.html
 %%DOCSDIR%%/library/evenp.html
+%%DOCSDIR%%/library/exists.html
+%%DOCSDIR%%/library/explode.html
 %%DOCSDIR%%/library/expt.html
+%%DOCSDIR%%/library/factorial.html
+%%DOCSDIR%%/library/filter.html
+%%DOCSDIR%%/library/fold-left.html
+%%DOCSDIR%%/library/fold-right.html
+%%DOCSDIR%%/library/forall.html
 %%DOCSDIR%%/library/gcd.html
 %%DOCSDIR%%/library/greater.html
 %%DOCSDIR%%/library/gteq.html
+%%DOCSDIR%%/library/headp.html
 %%DOCSDIR%%/library/id.html
 %%DOCSDIR%%/library/if.html
+%%DOCSDIR%%/library/implode.html
 %%DOCSDIR%%/library/index.html
 %%DOCSDIR%%/library/integer.html
 %%DOCSDIR%%/library/integerp.html
+%%DOCSDIR%%/library/intersection.html
+%%DOCSDIR%%/library/iota.html
+%%DOCSDIR%%/library/last.html
 %%DOCSDIR%%/library/lcm.html
 %%DOCSDIR%%/library/length.html
 %%DOCSDIR%%/library/less.html
@@ -218,9 +243,12 @@ lib/libsketchy.so.22
 %%DOCSDIR%%/library/list.html
 %%DOCSDIR%%/library/listp.html
 %%DOCSDIR%%/library/lteq.html
+%%DOCSDIR%%/library/map-car.html
+%%DOCSDIR%%/library/map-cdr.html
 %%DOCSDIR%%/library/map.html
 %%DOCSDIR%%/library/max.html
 %%DOCSDIR%%/library/member.html
+%%DOCSDIR%%/library/memp.html
 %%DOCSDIR%%/library/memq.html
 %%DOCSDIR%%/library/memv.html
 %%DOCSDIR%%/library/min.html
@@ -241,6 +269,7 @@ lib/libsketchy.so.22
 %%DOCSDIR%%/library/nminus.html
 %%DOCSDIR%%/library/non-negativep.html
 %%DOCSDIR%%/library/normalize.html
+%%DOCSDIR%%/library/not-equalp.html
 %%DOCSDIR%%/library/not.html
 %%DOCSDIR%%/library/nplus.html
 %%DOCSDIR%%/library/nquotient.html
@@ -249,13 +278,23 @@ lib/libsketchy.so.22
 %%DOCSDIR%%/library/nullp.html
 %%DOCSDIR%%/library/numtostr.html
 %%DOCSDIR%%/library/oddp.html
+%%DOCSDIR%%/library/orderedp.html
+%%DOCSDIR%%/library/pair.html
+%%DOCSDIR%%/library/permute.html
 %%DOCSDIR%%/library/plus.html
 %%DOCSDIR%%/library/positivep.html
+%%DOCSDIR%%/library/pred-iter.html
 %%DOCSDIR%%/library/pred.html
+%%DOCSDIR%%/library/product.html
+%%DOCSDIR%%/library/qsort.html
 %%DOCSDIR%%/library/quotient.html
-%%DOCSDIR%%/library/reduce.html
-%%DOCSDIR%%/library/reduce-r.html
+%%DOCSDIR%%/library/read-line.html
 %%DOCSDIR%%/library/remainder.html
+%%DOCSDIR%%/library/remove.html
+%%DOCSDIR%%/library/remp.html
+%%DOCSDIR%%/library/remq.html
+%%DOCSDIR%%/library/remv.html
+%%DOCSDIR%%/library/replace.html
 %%DOCSDIR%%/library/reverse.html
 %%DOCSDIR%%/library/s-append.html
 %%DOCSDIR%%/library/s-cieqp.html
@@ -273,25 +312,27 @@ lib/libsketchy.so.22
 %%DOCSDIR%%/library/sqrt.html
 %%DOCSDIR%%/library/string.html
 %%DOCSDIR%%/library/strtonum.html
+%%DOCSDIR%%/library/substitute.html
 %%DOCSDIR%%/library/substring.html
 %%DOCSDIR%%/library/succ.html
+%%DOCSDIR%%/library/sum.html
+%%DOCSDIR%%/library/tailp.html
 %%DOCSDIR%%/library/times.html
+%%DOCSDIR%%/library/union.html
+%%DOCSDIR%%/library/unique.html
 %%DOCSDIR%%/library/zerop.html
 %%DOCSDIR%%/license.html
 %%DOCSDIR%%/ndx2.html
 %%DOCSDIR%%/prog/amk.html
 %%DOCSDIR%%/prog/bottles.html
 %%DOCSDIR%%/prog/draw-tree.html
-%%DOCSDIR%%/prog/fact.html
 %%DOCSDIR%%/prog/factors.html
 %%DOCSDIR%%/prog/hyper.html
 %%DOCSDIR%%/prog/infix.html
-%%DOCSDIR%%/prog/permute.html
+%%DOCSDIR%%/prog/pp.html
 %%DOCSDIR%%/prog/prefix.html
 %%DOCSDIR%%/prog/prolog.html
-%%DOCSDIR%%/prog/qsort.html
 %%DOCSDIR%%/prog/queens.html
-%%DOCSDIR%%/prog/read-line.html
 %%DOCSDIR%%/prog/scmtocps.html
 %%DOCSDIR%%/prog/zebra.html
 %%DOCSDIR%%/progs.html
@@ -308,6 +349,7 @@ lib/libsketchy.so.22
 %%DOCSDIR%%/sk11.html
 %%DOCSDIR%%/toc2-x.html
 %%DOCSDIR%%/toc2.html
+@dirrm %%DATADIR%%/ext
 @dirrm %%DATADIR%%/lib
 @dirrm %%DATADIR%%/src
 @dirrm %%DATADIR%%