6 files changed, 54 insertions, 59 deletions

diff --git a/math/cln/Makefile b/math/cln/Makefile
index c0fa76c5775f..e8e28188e3db 100644
--- a/math/cln/Makefile
+++ b/math/cln/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	cln
-PORTVERSION=	1.1.13
+PORTVERSION=	1.2.2
 CATEGORIES=	math devel
 MASTER_SITES=	http://www.ginac.de/CLN/ \
 		http://www.mirrors.wiretapped.net/security/cryptography/libraries/math/cln/ \
@@ -29,7 +29,6 @@ CONFIGURE_ARGS=	--with-gmp
 MAKE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 USE_LDCONFIG=	yes
 
-MAN1=		cln-config.1
 INFO=		cln
 
 STRIP=		# none
@@ -52,9 +51,11 @@ BROKEN=		Does not compile when older version is installed. Please pkg_delete old
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}/dvi
-	${INSTALL_DATA} ${WRKSRC}/doc/*.dvi ${DOCSDIR}/dvi
+	${INSTALL_DATA} ${WRKSRC}/doc/*.dvi ${DOCSDIR}/dvi/
 	@${MKDIR} ${DOCSDIR}/html
-	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR}/html
+	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR}/html/
+	@${MKDIR} ${DOCSDIR}/html/cln
+	${INSTALL_DATA} ${WRKSRC}/doc/cln/*.html ${DOCSDIR}/html/cln/
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/math/cln/distinfo b/math/cln/distinfo
index 2f991857a6ca..dfe8031573e9 100644
--- a/math/cln/distinfo
+++ b/math/cln/distinfo
@@ -1,3 +1,3 @@
-MD5 (cln-1.1.13.tar.bz2) = 1f3d227360003b389bba14c8a5c3695a
-SHA256 (cln-1.1.13.tar.bz2) = fb570c0ac44aef1ffe251fdf2a9b40448c95aa21398b492566203dd982b18c03
-SIZE (cln-1.1.13.tar.bz2) = 1708927
+MD5 (cln-1.2.2.tar.bz2) = 6b479281fec86314b4c7a9357bd83ef8
+SHA256 (cln-1.2.2.tar.bz2) = 3de70896cb9eaa7d4cb957890adb88cd7d7a9ce84c0e2a87cd18afde017392e5
+SIZE (cln-1.2.2.tar.bz2) = 1742427
diff --git a/math/cln/files/patch-Makefile.in b/math/cln/files/patch-Makefile.in
new file mode 100644
index 000000000000..ea21158152cf
--- /dev/null
+++ b/math/cln/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	2007-09-19 08:01:07.000000000 +0800
++++ Makefile.in	2002-01-05 01:38:21.000000000 +0800
+@@ -10,7 +10,7 @@
+ bindir = @bindir@
+ datarootdir = @datarootdir@
+ datadir = @datadir@
+-libdir = @libdir@
++libdir = ${local_prefix}/libdata
+ includedir = @includedir@
+ mandir = @mandir@
+ DESTDIR =
diff --git a/math/cln/files/patch-autoconf-ltmain.sh b/math/cln/files/patch-autoconf-ltmain.sh
deleted file mode 100644
index 5a3713d2b831..000000000000
--- a/math/cln/files/patch-autoconf-ltmain.sh
+++ /dev/null
@@ -1,15 +0,0 @@
---- autoconf/ltmain.sh.orig	Tue Sep  7 04:46:35 2004
-+++ autoconf/ltmain.sh	Sat Jun  4 16:54:55 2005
-@@ -5547,10 +5547,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false ; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/math/cln/files/patch-doc::Makefile.in b/math/cln/files/patch-doc::Makefile.in
index bd741f01b58a..4e5d02514070 100644
--- a/math/cln/files/patch-doc::Makefile.in
+++ b/math/cln/files/patch-doc::Makefile.in
@@ -1,18 +1,17 @@
---- doc/Makefile.in.orig	Mon Feb 14 15:24:29 2005
-+++ doc/Makefile.in	Mon Feb 14 15:25:14 2005
-@@ -86,14 +86,11 @@
- 	  echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$(PACKAGE).info";\
- 	  install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$(PACKAGE).info || :;\
+--- doc/Makefile.in.orig	2002-01-05 01:39:59.000000000 +0800
++++ doc/Makefile.in	2002-01-05 01:47:24.000000000 +0800
+@@ -80,14 +80,10 @@
+ 	  echo " install-info --info-dir=${DESTDIR}${infodir} ${DESTDIR}${infodir}/${PACKAGE}.info";\
+ 	  install-info --info-dir=${DESTDIR}${infodir} ${DESTDIR}${infodir}/${PACKAGE}.info || :;\
  	else : ; fi
--	$(INSTALL_DATA) $(srcdir)/$(PACKAGE)_*.html $(DESTDIR)$(htmldir)
--	$(INSTALL_DATA) $(srcdir)/$(PACKAGE).dvi $(DESTDIR)$(dvidir)/$(PACKAGE).dvi
-+	install-info $(DESTDIR)$(infodir)/$(PACKAGE).info $(DESTDIR)$(infodir)/dir
+-	${INSTALL_DATA} ${srcdir}/${PACKAGE}/${PACKAGE}*.html ${DESTDIR}${htmldir}
+-	${INSTALL_DATA} ${srcdir}/${PACKAGE}.dvi ${DESTDIR}${dvidir}/${PACKAGE}.dvi
  
  installdirs : force
- 	$(MKDIR) $(DESTDIR)$(datadir)
- 	$(MKDIR) $(DESTDIR)$(infodir)
--	$(MKDIR) $(DESTDIR)$(htmldir)
--	$(MKDIR) $(DESTDIR)$(dvidir)
+ 	${MKDIR} ${DESTDIR}${datadir}
+ 	${MKDIR} ${DESTDIR}${infodir}
+-	${MKDIR} ${DESTDIR}${htmldir}
+-	${MKDIR} ${DESTDIR}${dvidir}
  
  uninstall : force
  	@if (install-info --version && \
diff --git a/math/cln/pkg-plist b/math/cln/pkg-plist
index e688eea0547c..cb00fe9e042d 100644
--- a/math/cln/pkg-plist
+++ b/math/cln/pkg-plist
@@ -1,4 +1,3 @@
-bin/cln-config
 include/cln/GV.h
 include/cln/GV_complex.h
 include/cln/GV_integer.h
@@ -14,7 +13,6 @@ include/cln/SV_rational.h
 include/cln/SV_real.h
 include/cln/SV_ringelt.h
 include/cln/V.h
-include/cln/abort.h
 include/cln/cln.h
 include/cln/complex.h
 include/cln/complex_class.h
@@ -25,6 +23,7 @@ include/cln/config.h
 include/cln/dfloat.h
 include/cln/dfloat_class.h
 include/cln/dfloat_io.h
+include/cln/exception.h
 include/cln/ffloat.h
 include/cln/ffloat_class.h
 include/cln/ffloat_io.h
@@ -80,31 +79,31 @@ include/cln/version.h
 lib/libcln.a
 lib/libcln.la
 lib/libcln.so
-lib/libcln.so.4
+lib/libcln.so.5
 libdata/pkgconfig/cln.pc
-share/aclocal/cln.m4
 %%PORTDOCS%%%%DOCSDIR%%/dvi/cln.dvi
 %%PORTDOCS%%%%DOCSDIR%%/html/cln.html
-%%PORTDOCS%%%%DOCSDIR%%/html/cln_1.html
-%%PORTDOCS%%%%DOCSDIR%%/html/cln_10.html
-%%PORTDOCS%%%%DOCSDIR%%/html/cln_11.html
-%%PORTDOCS%%%%DOCSDIR%%/html/cln_12.html
-%%PORTDOCS%%%%DOCSDIR%%/html/cln_13.html
-%%PORTDOCS%%%%DOCSDIR%%/html/cln_14.html
-%%PORTDOCS%%%%DOCSDIR%%/html/cln_15.html
-%%PORTDOCS%%%%DOCSDIR%%/html/cln_16.html
-%%PORTDOCS%%%%DOCSDIR%%/html/cln_2.html
-%%PORTDOCS%%%%DOCSDIR%%/html/cln_3.html
-%%PORTDOCS%%%%DOCSDIR%%/html/cln_4.html
-%%PORTDOCS%%%%DOCSDIR%%/html/cln_5.html
-%%PORTDOCS%%%%DOCSDIR%%/html/cln_6.html
-%%PORTDOCS%%%%DOCSDIR%%/html/cln_7.html
-%%PORTDOCS%%%%DOCSDIR%%/html/cln_8.html
-%%PORTDOCS%%%%DOCSDIR%%/html/cln_9.html
-%%PORTDOCS%%%%DOCSDIR%%/html/cln_abt.html
-%%PORTDOCS%%%%DOCSDIR%%/html/cln_ovr.html
-%%PORTDOCS%%%%DOCSDIR%%/html/cln_toc.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/dvi
+%%PORTDOCS%%%%DOCSDIR%%/html/cln/cln.html
+%%PORTDOCS%%%%DOCSDIR%%/html/cln/cln_1.html
+%%PORTDOCS%%%%DOCSDIR%%/html/cln/cln_10.html
+%%PORTDOCS%%%%DOCSDIR%%/html/cln/cln_11.html
+%%PORTDOCS%%%%DOCSDIR%%/html/cln/cln_12.html
+%%PORTDOCS%%%%DOCSDIR%%/html/cln/cln_13.html
+%%PORTDOCS%%%%DOCSDIR%%/html/cln/cln_14.html
+%%PORTDOCS%%%%DOCSDIR%%/html/cln/cln_15.html
+%%PORTDOCS%%%%DOCSDIR%%/html/cln/cln_16.html
+%%PORTDOCS%%%%DOCSDIR%%/html/cln/cln_2.html
+%%PORTDOCS%%%%DOCSDIR%%/html/cln/cln_3.html
+%%PORTDOCS%%%%DOCSDIR%%/html/cln/cln_4.html
+%%PORTDOCS%%%%DOCSDIR%%/html/cln/cln_5.html
+%%PORTDOCS%%%%DOCSDIR%%/html/cln/cln_6.html
+%%PORTDOCS%%%%DOCSDIR%%/html/cln/cln_7.html
+%%PORTDOCS%%%%DOCSDIR%%/html/cln/cln_8.html
+%%PORTDOCS%%%%DOCSDIR%%/html/cln/cln_9.html
+%%PORTDOCS%%%%DOCSDIR%%/html/cln/cln_abt.html
+%%PORTDOCS%%%%DOCSDIR%%/html/cln/cln_fot.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/cln/
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/dvi/
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm include/cln