upgrade to 2.30

pass maintainership

PR:		46843
Submitted by:	Henrik Motakef <henrik.motakef@web.de> (new maintainer)

5 files changed, 44 insertions, 34 deletions

diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile
index 708081419ade..91cd58632213 100644
--- a/lang/clisp/Makefile
+++ b/lang/clisp/Makefile
@@ -6,17 +6,19 @@
 #
 
 PORTNAME=	clisp
-PORTVERSION=	2.28
+PORTVERSION=	2.30
 CATEGORIES=	lang
 MASTER_SITES=	ftp://cvs2.cons.org/pub/lisp/clisp/source/${PORTVERSION}/ \
 		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	jabrown@caida.org
+MAINTAINER=	henrik.motakef@web.de
+
+LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv \
+		intl.4:${PORTSDIR}/devel/gettext
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GCC=	2.95
 
 # In clisp-2.28, the build dies in the "regexp" module: the build target
 # invokes a configure script, which encounters a different CC variable than
@@ -53,7 +55,7 @@ DATA_PATHS=${PREFIX}/lib/clisp ${PREFIX}/share/doc/clisp \
 	${PREFIX}/share/locale/nl/LC_MESSAGES/clisp.mo \
 	${PREFIX}/share/locale/nl/LC_MESSAGES/clisplow.mo
 PROG_PATHS=${PREFIX}/bin/clisp
-MAN_PATHS=${PREFIX}/man/man1/clisp.1 ${PREFIX}/man/man3/clreadline.3
+MAN_PATHS=${PREFIX}/man/man1/clisp.1
 
 # The source doesn't include a top-level Makefile, so we'll fake one.
 post-extract:
@@ -75,6 +77,5 @@ post-install:
 	${CHMOD} -R ugo+rX,ugo-w ${MAN_PATHS}
 
 MAN1=	clisp.1
-MAN3=	clreadline.3
 
 .include <bsd.port.mk>
diff --git a/lang/clisp/distinfo b/lang/clisp/distinfo
index 3cebababd9b8..2436d8c51f11 100644
--- a/lang/clisp/distinfo
+++ b/lang/clisp/distinfo
@@ -1 +1 @@
-MD5 (clisp-2.28.tar.bz2) = 21d311ee262f4e0c54c35d65f16884e5
+MD5 (clisp-2.30.tar.bz2) = 29e80e430c6098c78dbd2e56334aaa90
diff --git a/lang/clisp/files/patch-aa b/lang/clisp/files/patch-aa
index bcb97acb4290..36cbda81535a 100644
--- a/lang/clisp/files/patch-aa
+++ b/lang/clisp/files/patch-aa
@@ -1,9 +1,9 @@
---- src/makemake.in.orig	Sun Mar  3 18:21:26 2002
-+++ src/makemake.in	Mon Jun 24 22:23:12 2002
-@@ -1663,7 +1663,15 @@
- echol "htmldir = \$(exec_prefix)${NEXT_}share${NEXT_}html"
- echol "dvidir  = \$(exec_prefix)${NEXT_}share${NEXT_}dvi"
- echol "docdir  = \$(exec_prefix)${NEXT_}share${NEXT_}doc"
+--- src/makemake.in.orig	Sun Jan  5 22:37:32 2003
++++ src/makemake.in	Sun Jan  5 22:39:09 2003
+@@ -1658,7 +1658,15 @@
+ echol "htmldir = \$(prefix)${NEXT_}share${NEXT_}html"
+ echol "dvidir  = \$(prefix)${NEXT_}share${NEXT_}dvi"
+ echol "docdir  = \$(prefix)${NEXT_}share${NEXT_}doc"
 +fsstnd=freebsd
  case "$fsstnd" in
 +  freebsd)
diff --git a/lang/clisp/files/patch-clisp-link.in b/lang/clisp/files/patch-clisp-link.in
new file mode 100644
index 000000000000..a71a7248a461
--- /dev/null
+++ b/lang/clisp/files/patch-clisp-link.in
@@ -0,0 +1,20 @@
+--- src/clisp-link.in.orig	Sun Jan  5 18:38:36 2003
++++ src/clisp-link.in	Sun Jan  5 18:39:24 2003
+@@ -282,7 +282,7 @@
+     verbose "$destinationdir"/${LISPRUN} -B "$installbasedir" -M "$lispinitdir"/lispinit.mem -norc -q -i $to_load -x "(saveinitmem \"$destinationdir/lispinit.mem\")"
+     # Generate new makevars
+     LIBS=`echo $LIBS | sed s/','/'\\,'/g`
+-    sed -e "s,^LIBS=.*\$,LIBS='${LIBS}'," -e "s,^FILES=.*\$,FILES='${FILES}'," < "$sourcedir"/makevars > "$destinationdir"/makevars
++    sed -e "s;^LIBS=.*\$;LIBS='${LIBS}';" -e "s;^FILES=.*\$;FILES='${FILES}';" < "$sourcedir"/makevars > "$destinationdir"/makevars
+     # Done.
+     trap '' 1 2 15
+     ;;
+@@ -421,7 +421,7 @@
+       fi
+       # Generate new makevars
+       LIBS=`echo $LIBS | sed s/','/'\\,'/g`
+-      sed -e "s,^LIBS=.*\$,LIBS='${LIBS}'," -e "s,^FILES=.*\$,FILES='${FILES}'," < "$sourcedir"/makevars > "$destinationdir"/makevars
++      sed -e "s;^LIBS=.*\$;LIBS='${LIBS}';" -e "s;^FILES=.*\$;FILES='${FILES}';" < "$sourcedir"/makevars > "$destinationdir"/makevars
+     fi
+     # Done.
+     trap '' 1 2 15
diff --git a/lang/clisp/pkg-plist b/lang/clisp/pkg-plist
index 6faad03f002f..3e4b5c14734a 100644
--- a/lang/clisp/pkg-plist
+++ b/lang/clisp/pkg-plist
@@ -1,11 +1,8 @@
 bin/clisp
 lib/clisp/base/libavcall.a
 lib/clisp/base/libcallback.a
-lib/clisp/base/libiconv.a
-lib/clisp/base/libintl.a
+lib/clisp/base/libcharset.a
 lib/clisp/base/libnoreadline.a
-lib/clisp/base/libreadline.a
-lib/clisp/base/libsigsegv.a
 lib/clisp/base/lisp.a
 lib/clisp/base/lisp.run
 lib/clisp/base/lispinit.mem
@@ -17,11 +14,8 @@ lib/clisp/data/UnicodeData.txt
 lib/clisp/data/clhs.txt
 lib/clisp/full/libavcall.a
 lib/clisp/full/libcallback.a
-lib/clisp/full/libiconv.a
-lib/clisp/full/libintl.a
 lib/clisp/full/libnoreadline.a
-lib/clisp/full/libreadline.a
-lib/clisp/full/libsigsegv.a
+lib/clisp/full/libcharset.a
 lib/clisp/full/lisp.a
 lib/clisp/full/lisp.run
 lib/clisp/full/lispinit.mem
@@ -44,19 +38,15 @@ share/doc/clisp/README
 share/doc/clisp/README.de
 share/doc/clisp/README.es
 share/doc/clisp/SUMMARY
-share/doc/clisp/doc/CLOS-guide.txt
-share/doc/clisp/doc/LISP-tutorial.txt
-share/doc/clisp/doc/clisp.1
-share/doc/clisp/doc/clisp.dvi
-share/doc/clisp/doc/clisp.html
-share/doc/clisp/doc/clisp.png
-share/doc/clisp/doc/clreadline.3
-share/doc/clisp/doc/clreadline.dvi
-share/doc/clisp/doc/clreadline.html
-share/doc/clisp/doc/editors.txt
-share/doc/clisp/doc/impnotes.css
-share/doc/clisp/doc/impnotes.html
-share/doc/clisp/doc/readline.dvi
+share/doc/clisp/CLOS-guide.txt
+share/doc/clisp/LISP-tutorial.txt
+share/doc/clisp/clisp.1
+share/doc/clisp/clisp.dvi
+share/doc/clisp/clisp.html
+share/doc/clisp/clisp.png
+share/doc/clisp/editors.txt
+share/doc/clisp/impnotes.css
+share/doc/clisp/impnotes.html
 share/locale/de/LC_MESSAGES/clisp.mo
 share/locale/de/LC_MESSAGES/clisplow.mo
 share/locale/en/LC_MESSAGES/clisp.mo
@@ -67,7 +57,6 @@ share/locale/fr/LC_MESSAGES/clisp.mo
 share/locale/fr/LC_MESSAGES/clisplow.mo
 share/locale/nl/LC_MESSAGES/clisp.mo
 share/locale/nl/LC_MESSAGES/clisplow.mo
-@dirrm share/doc/clisp/doc
 @dirrm share/doc/clisp
 @dirrm lib/clisp/base
 @dirrm lib/clisp/data