6 files changed, 36 insertions, 54 deletions

diff --git a/textproc/cl-ppcre-clisp/Makefile b/textproc/cl-ppcre-clisp/Makefile
index 749f93b0d1b6..728a5a6e6278 100644
--- a/textproc/cl-ppcre-clisp/Makefile
+++ b/textproc/cl-ppcre-clisp/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	cl-ppcre
-PORTVERSION=	0.5.4
-PORTREVISION=	4
+PORTVERSION=	2.0.3
 CATEGORIES=	textproc lisp
 DISTFILES=	# none
 
diff --git a/textproc/cl-ppcre-sbcl/Makefile b/textproc/cl-ppcre-sbcl/Makefile
index 6ecd35d8958f..676b210fb82f 100644
--- a/textproc/cl-ppcre-sbcl/Makefile
+++ b/textproc/cl-ppcre-sbcl/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	cl-ppcre
-PORTVERSION=	0.5.4
-PORTREVISION=	2
+PORTVERSION=	2.0.3
 CATEGORIES=	textproc lisp
 DISTFILES=	# none
 
diff --git a/textproc/cl-ppcre/Makefile b/textproc/cl-ppcre/Makefile
index 92cee86eb4f3..ac00fbc7a58c 100644
--- a/textproc/cl-ppcre/Makefile
+++ b/textproc/cl-ppcre/Makefile
@@ -5,11 +5,9 @@
 # $FreeBSD$
 
 PORTNAME=	cl-ppcre
-PORTVERSION=	0.5.4
-PORTREVISION=	1
+PORTVERSION=	2.0.3
 CATEGORIES=	textproc lisp
-MASTER_SITES=	http://weitz.de/files/
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	LOCAL/olgeni
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Portable Perl-Compatible Regular Expression for Common Lisp
@@ -21,34 +19,37 @@ USE_ASDF=	yes
 do-install:
 	@${MKDIR} ${ASDF_PATHNAME}
 	@${INSTALL_DATA} ${WRKSRC}/api.lisp ${ASDF_PATHNAME}
+	@${INSTALL_DATA} ${WRKSRC}/charmap.lisp ${ASDF_PATHNAME}
+	@${INSTALL_DATA} ${WRKSRC}/charset.lisp ${ASDF_PATHNAME}
+	@${INSTALL_DATA} ${WRKSRC}/chartest.lisp ${ASDF_PATHNAME}
 	@${INSTALL_DATA} ${WRKSRC}/closures.lisp ${ASDF_PATHNAME}
 	@${INSTALL_DATA} ${WRKSRC}/convert.lisp ${ASDF_PATHNAME}
+	@${INSTALL_DATA} ${WRKSRC}/errors.lisp ${ASDF_PATHNAME}
 	@${INSTALL_DATA} ${WRKSRC}/lexer.lisp ${ASDF_PATHNAME}
-	@${INSTALL_DATA} ${WRKSRC}/load.lisp ${ASDF_PATHNAME}
 	@${INSTALL_DATA} ${WRKSRC}/optimize.lisp ${ASDF_PATHNAME}
 	@${INSTALL_DATA} ${WRKSRC}/packages.lisp ${ASDF_PATHNAME}
 	@${INSTALL_DATA} ${WRKSRC}/parser.lisp ${ASDF_PATHNAME}
+	@${INSTALL_DATA} ${WRKSRC}/regex-class-util.lisp ${ASDF_PATHNAME}
 	@${INSTALL_DATA} ${WRKSRC}/regex-class.lisp ${ASDF_PATHNAME}
 	@${INSTALL_DATA} ${WRKSRC}/repetition-closures.lisp ${ASDF_PATHNAME}
 	@${INSTALL_DATA} ${WRKSRC}/scanner.lisp ${ASDF_PATHNAME}
 	@${INSTALL_DATA} ${WRKSRC}/specials.lisp ${ASDF_PATHNAME}
 	@${INSTALL_DATA} ${WRKSRC}/util.lisp ${ASDF_PATHNAME}
 	@${INSTALL_DATA} ${WRKSRC}/cl-ppcre.asd ${ASDF_PATHNAME}
-	@${INSTALL_DATA} ${WRKSRC}/cl-ppcre.system ${ASDF_PATHNAME}
 	@${LN} -sf ${ASDF_PATHNAME}/*.asd ${ASDF_REGISTRY}
-	@${LN} -sf ${ASDF_PATHNAME}/*.system ${ASDF_REGISTRY}
+# cl-ppcre-test depends on flexi-streams
+	@${MKDIR} ${ASDF_PATHNAME}/test
+	@${INSTALL_DATA} ${WRKSRC}/test/packages.lisp ${ASDF_PATHNAME}/test
+	@${INSTALL_DATA} ${WRKSRC}/test/perl-tests.lisp ${ASDF_PATHNAME}/test
+	@${INSTALL_DATA} ${WRKSRC}/test/perltest.pl ${ASDF_PATHNAME}/test
+	@${INSTALL_DATA} ${WRKSRC}/test/perltestdata ${ASDF_PATHNAME}/test
+	@${INSTALL_DATA} ${WRKSRC}/test/perltestinput ${ASDF_PATHNAME}/test
+	@${INSTALL_DATA} ${WRKSRC}/test/simple ${ASDF_PATHNAME}/test
+	@${INSTALL_DATA} ${WRKSRC}/test/tests.lisp ${ASDF_PATHNAME}/test
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-	@${MKDIR} ${DOCSDIR}/doc
-	@${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}/doc/
-	@${MKDIR} ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/cl-ppcre-test.* ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/perltest.pl ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/ppcre-tests.lisp ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/testdata ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/testinput ${EXAMPLESDIR}
+	@${INSTALL_DATA} ${WRKSRC}/doc/index.html ${DOCSDIR}
 .endif
 
 .include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk"
diff --git a/textproc/cl-ppcre/distinfo b/textproc/cl-ppcre/distinfo
index 6ac28912b1d0..d0c462d21960 100644
--- a/textproc/cl-ppcre/distinfo
+++ b/textproc/cl-ppcre/distinfo
@@ -1,3 +1,3 @@
-MD5 (cl-ppcre-0.5.4.tgz) = 4d1f50859604ab77ff2b52aec6199ce0
-SHA256 (cl-ppcre-0.5.4.tgz) = 942f9bf7d601f17c690ca243f41eb435190f741c80d6c123b8598a253e58d0bf
-SIZE (cl-ppcre-0.5.4.tgz) = 195886
+MD5 (cl-ppcre-2.0.3.tar.gz) = bd5648fd3c8b6f89eea43f5b82b99aa1
+SHA256 (cl-ppcre-2.0.3.tar.gz) = a59e2f2f58297d8f802e2652a68a40176cb0174be9c5b681ef1187e8430133c3
+SIZE (cl-ppcre-2.0.3.tar.gz) = 157665
diff --git a/textproc/cl-ppcre/files/patch-util.lisp b/textproc/cl-ppcre/files/patch-util.lisp
deleted file mode 100644
index abc7bb843b6b..000000000000
--- a/textproc/cl-ppcre/files/patch-util.lisp
+++ /dev/null
@@ -1,17 +0,0 @@
---- util.lisp.orig	Fri May 16 23:16:22 2003
-+++ util.lisp	Fri May 16 23:16:42 2003
-@@ -155,10 +155,10 @@
-   (loop with min1 and min2 and min3
-         and max1 and max2 and max3
-         ;; loop through all characters in HASH, sorted by CHAR<
--        for chr in (sort (loop for chr being the hash-keys of hash
--                               collect (if downcasep
--                                         (char-downcase chr)
--                                         chr))
-+        for chr in (sort (the list (loop for chr being the hash-keys of hash
-+					 collect (if downcasep
-+						     (char-downcase chr)
-+						     chr)))
-                          #'char<)
-         for code = (char-code chr)
-         ;; MIN1, MAX1, etc. are _exclusive_
diff --git a/textproc/cl-ppcre/pkg-plist b/textproc/cl-ppcre/pkg-plist
index d0fdb8ebd96f..987232c24730 100644
--- a/textproc/cl-ppcre/pkg-plist
+++ b/textproc/cl-ppcre/pkg-plist
@@ -1,31 +1,31 @@
 lib/common-lisp/cl-ppcre/api.lisp
+lib/common-lisp/cl-ppcre/charmap.lisp
+lib/common-lisp/cl-ppcre/charset.lisp
+lib/common-lisp/cl-ppcre/chartest.lisp
 lib/common-lisp/cl-ppcre/closures.lisp
 lib/common-lisp/cl-ppcre/convert.lisp
+lib/common-lisp/cl-ppcre/errors.lisp
 lib/common-lisp/cl-ppcre/lexer.lisp
-lib/common-lisp/cl-ppcre/load.lisp
 lib/common-lisp/cl-ppcre/optimize.lisp
 lib/common-lisp/cl-ppcre/packages.lisp
 lib/common-lisp/cl-ppcre/parser.lisp
+lib/common-lisp/cl-ppcre/regex-class-util.lisp
 lib/common-lisp/cl-ppcre/regex-class.lisp
 lib/common-lisp/cl-ppcre/repetition-closures.lisp
 lib/common-lisp/cl-ppcre/scanner.lisp
 lib/common-lisp/cl-ppcre/specials.lisp
 lib/common-lisp/cl-ppcre/util.lisp
 lib/common-lisp/cl-ppcre/cl-ppcre.asd
-lib/common-lisp/cl-ppcre/cl-ppcre.system
 lib/common-lisp/system-registry/cl-ppcre.asd
-lib/common-lisp/system-registry/cl-ppcre.system
+lib/common-lisp/cl-ppcre/test/packages.lisp
+lib/common-lisp/cl-ppcre/test/perl-tests.lisp
+lib/common-lisp/cl-ppcre/test/perltest.pl
+lib/common-lisp/cl-ppcre/test/perltestdata
+lib/common-lisp/cl-ppcre/test/perltestinput
+lib/common-lisp/cl-ppcre/test/simple
+lib/common-lisp/cl-ppcre/test/tests.lisp
+@dirrm lib/common-lisp/cl-ppcre/test
 @dirrm lib/common-lisp/cl-ppcre
 %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/doc/index.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/benchmarks.2002-12-22.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/doc
+%%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%%%EXAMPLESDIR%%/cl-ppcre-test.system
-%%PORTDOCS%%%%EXAMPLESDIR%%/cl-ppcre-test.asd
-%%PORTDOCS%%%%EXAMPLESDIR%%/ppcre-tests.lisp
-%%PORTDOCS%%%%EXAMPLESDIR%%/perltest.pl
-%%PORTDOCS%%%%EXAMPLESDIR%%/testdata
-%%PORTDOCS%%%%EXAMPLESDIR%%/testinput
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%