Update to version 3.0.0

PR:		23882
Submitted by:	Andy Newman <atrn@zeta.org.au> MAINTAINER

5 files changed, 83 insertions, 75 deletions

diff --git a/lang/ici/Makefile b/lang/ici/Makefile
index c840c3652c67..d4b12c504625 100644
--- a/lang/ici/Makefile
+++ b/lang/ici/Makefile
@@ -6,46 +6,47 @@
 #
 
 PORTNAME=	ici
-PORTVERSION=	2.1.4
+PORTVERSION=	3.0.0
 CATEGORIES=	lang
-MASTER_SITES=	ftp://ftp.research.canon.com.au/pub/misc/ici/ \
-		ftp://ftp.ntua.gr/pub/lang/ici/ \
-		http://www.zeta.org.au/~atrn/ici/distfiles/
+MASTER_SITES=	http://www.zeta.org.au/~atrn/ici/distfiles/
 
 MAINTAINER=	atrn@zeta.org.au
 
 MAKEFILE=	Makefile.bsd
-MAN1=		ici.1
+MAN1=		ici3.1
 MANCOMPRESSED=	yes
 
-ICIHDRS=	alloc.h array.h buf.h catch.h conf-bsd.h exec.h file.h float.h \
-	forall.h func.h fwd.h int.h mark.h mem.h null.h object.h op.h \
-	parse.h pc.h primes.h ptr.h re.h set.h skt.h src.h str.h struct.h \
-	trace.h win.h wrap.h
+ICIHDRS=	alloc.h array.h buf.h catch.h cfunc.h conf-bsd.h exec.h file.h \
+	float.h forall.h func.h fwd.h ici.h int.h mark.h mem.h method.h \
+	null.h object.h op.h parse.h pc.h primes.h ptr.h re.h set.h skt.h \
+	src.h str.h struct.h trace.h win.h wrap.h
 
 ICIPCREHDRS=	pcre/internal.h pcre/pcre.h
 
 ICIDOCS=	doc/ici-a4.ps doc/ici-ltr.ps doc/ici.txt doc/ici.pdf
 
 do-install:
-	cd ${WRKSRC} && ${MAKE} -f ${MAKEFILE} libici.a
-	${INSTALL_PROGRAM} ${WRKSRC}/ici ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/libici.a ${PREFIX}/lib
-	${INSTALL_MAN} ${WRKSRC}/ici.1.gz ${PREFIX}/man/man1
-	${MKDIR} ${PREFIX}/lib/ici
-	${INSTALL_DATA} ${WRKSRC}/ici_init.ici ${PREFIX}/lib/ici
-	${MKDIR} ${PREFIX}/include/ici
-	${MKDIR} ${PREFIX}/include/ici/pcre
+	cd ${WRKSRC} && ${MAKE} -f ${MAKEFILE} libici3.a
+	${INSTALL_PROGRAM} ${WRKSRC}/ici3 ${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/libici3.a ${PREFIX}/lib
+	${INSTALL_MAN} ${WRKSRC}/ici3.1.gz ${PREFIX}/man/man1
+	${MKDIR} ${PREFIX}/lib/ici3
+	${INSTALL_DATA} ${WRKSRC}/ici3core.ici ${PREFIX}/lib/ici3
+	${INSTALL_DATA} ${WRKSRC}/ici3core1.ici ${PREFIX}/lib/ici3
+	${INSTALL_DATA} ${WRKSRC}/ici3core2.ici ${PREFIX}/lib/ici3
+	${INSTALL_DATA} ${WRKSRC}/ici3core3.ici ${PREFIX}/lib/ici3
+	${MKDIR} ${PREFIX}/include/ici3
+	${MKDIR} ${PREFIX}/include/ici3/pcre
 .for f in ${ICIHDRS}
-	${INSTALL_DATA} ${WRKSRC}/$f ${PREFIX}/include/ici
+	${INSTALL_DATA} ${WRKSRC}/$f ${PREFIX}/include/ici3
 .endfor
 .for f in ${ICIPCREHDRS}
-	${INSTALL_DATA} ${WRKSRC}/$f ${PREFIX}/include/ici/pcre
+	${INSTALL_DATA} ${WRKSRC}/$f ${PREFIX}/include/ici3/pcre
 .endfor
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/ici
+	${MKDIR} ${PREFIX}/share/doc/ici3
 .for f in ${ICIDOCS}
-	${INSTALL_DATA} ${WRKSRC}/$f ${PREFIX}/share/doc/ici
+	${INSTALL_DATA} ${WRKSRC}/$f ${PREFIX}/share/doc/ici3
 .endfor
 .endif
 
diff --git a/lang/ici/distinfo b/lang/ici/distinfo
index 0208784f42a8..c7e8d5e69ebf 100644
--- a/lang/ici/distinfo
+++ b/lang/ici/distinfo
@@ -1 +1 @@
-MD5 (ici-2.1.4.tar.gz) = c57de374a6362e579c0255b70588ef53
+MD5 (ici-3.0.0.tar.gz) = ddec037a668c25404b280028f84e26ef
diff --git a/lang/ici/pkg-comment b/lang/ici/pkg-comment
index 1973a77f78c6..b37528821289 100644
--- a/lang/ici/pkg-comment
+++ b/lang/ici/pkg-comment
@@ -1 +1 @@
-A dynamic interpretive language with C's control flow and expressions
+An interpretive language with C's overall feel combined with high level data types
diff --git a/lang/ici/pkg-descr b/lang/ici/pkg-descr
index 4d609ed7b9c6..c24ff7ec7a91 100644
--- a/lang/ici/pkg-descr
+++ b/lang/ici/pkg-descr
@@ -1,13 +1,14 @@
-ICI is a C-like, high level language originally developed by Tim
-Long and placed into the public domain. ICI marries C's expression
-syntax, control structures and overall feel, with a dynamic, garbage
-collected, object-based, data model.
+ICI is a C-like, high level language originally developed by Tim Long
+and placed into the public domain. ICI marries C's expression syntax,
+control structures and overall feel, with a dynamic, garbage
+collected, object-based, data model. Version introduces a cleaner
+class system for OO programming and refines the language.
 
-ICI is typically used as a scripting-like language in the fashion
-of Perl, Python, TCL and other such languages.  ICI can be called
-from C and the language itself can be extended allowing applications
-to provide domain specific functions, types and operators for use
-in their ICI programs. Embedding in an application also allows the
+ICI is typically used as a scripting-like language in the fashion of
+Perl, Python, TCL and other such languages.  ICI can be called from C
+and the language itself can be extended allowing applications to
+provide domain specific functions, types and operators for use in
+their ICI programs. Embedding in an application also allows the
 application to make use of ICI's efficient object system which
 provides many useful facilities.
 
diff --git a/lang/ici/pkg-plist b/lang/ici/pkg-plist
index b074bdbae1c9..ddb2aa67cb1d 100644
--- a/lang/ici/pkg-plist
+++ b/lang/ici/pkg-plist
@@ -1,43 +1,49 @@
-bin/ici
-include/ici/pcre/internal.h
-include/ici/pcre/pcre.h
-include/ici/alloc.h
-include/ici/array.h
-include/ici/buf.h
-include/ici/catch.h
-include/ici/conf-bsd.h
-include/ici/exec.h
-include/ici/file.h
-include/ici/float.h
-include/ici/forall.h
-include/ici/func.h
-include/ici/fwd.h
-include/ici/int.h
-include/ici/mark.h
-include/ici/mem.h
-include/ici/null.h
-include/ici/object.h
-include/ici/op.h
-include/ici/parse.h
-include/ici/pc.h
-include/ici/primes.h
-include/ici/ptr.h
-include/ici/re.h
-include/ici/set.h
-include/ici/skt.h
-include/ici/src.h
-include/ici/str.h
-include/ici/struct.h
-include/ici/trace.h
-include/ici/win.h
-include/ici/wrap.h
-lib/ici/ici_init.ici
-lib/libici.a
-share/doc/ici/ici-a4.ps
-share/doc/ici/ici-ltr.ps
-share/doc/ici/ici.txt
-share/doc/ici/ici.pdf
-@dirrm include/ici/pcre
-@dirrm include/ici
-@unexec rmdir %D/share/doc/ici 2>/dev/null || true
-@unexec rmdir %D/lib/ici 2>/dev/null || true
+bin/ici3
+include/ici3/pcre/internal.h
+include/ici3/pcre/pcre.h
+include/ici3/alloc.h
+include/ici3/array.h
+include/ici3/buf.h
+include/ici3/catch.h
+include/ici3/cfunc.h
+include/ici3/conf-bsd.h
+include/ici3/exec.h
+include/ici3/file.h
+include/ici3/float.h
+include/ici3/forall.h
+include/ici3/func.h
+include/ici3/fwd.h
+include/ici3/ici.h
+include/ici3/int.h
+include/ici3/mark.h
+include/ici3/mem.h
+include/ici3/method.h
+include/ici3/null.h
+include/ici3/object.h
+include/ici3/op.h
+include/ici3/parse.h
+include/ici3/pc.h
+include/ici3/primes.h
+include/ici3/ptr.h
+include/ici3/re.h
+include/ici3/set.h
+include/ici3/skt.h
+include/ici3/src.h
+include/ici3/str.h
+include/ici3/struct.h
+include/ici3/trace.h
+include/ici3/win.h
+include/ici3/wrap.h
+lib/ici3/ici3core.ici
+lib/ici3/ici3core1.ici
+lib/ici3/ici3core2.ici
+lib/ici3/ici3core3.ici
+lib/libici3.a
+share/doc/ici3/ici-a4.ps
+share/doc/ici3/ici-ltr.ps
+share/doc/ici3/ici.txt
+share/doc/ici3/ici.pdf
+@dirrm include/ici3/pcre
+@dirrm include/ici3
+@unexec rmdir %D/share/doc/ici3 2>/dev/null || true
+@unexec rmdir %D/lib/ici3 2>/dev/null || true