6 files changed, 65 insertions, 60 deletions

diff --git a/math/cln/Makefile b/math/cln/Makefile
index 371c16567e68..78a88fa1e91b 100644
--- a/math/cln/Makefile
+++ b/math/cln/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	cln
-PORTVERSION=	1.1.4
-PORTREVISION=	1
+PORTVERSION=	1.1.5
 CATEGORIES=	math devel
 MASTER_SITES=	ftp://ftp.ilog.fr/pub/Users/haible/gnu/ \
 		ftp://ftp.santafe.edu/pub/gnu/ \
@@ -18,19 +17,27 @@ MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	gmp.6:${PORTSDIR}/math/libgmp4
 
-USE_LIBTOOL=	yes
-CFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--datadir=${PREFIX}/share/cln --infodir=${PREFIX}/info \
-		--mandir=${PREFIX}/man --with-gmp
+STRIP=		# none
 
 USE_GMAKE=	yes
+USE_LIBTOOL=	yes
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--infodir=${PREFIX}/info --mandir=${PREFIX}/man \
+		--with-gmp
+MAKE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 INSTALLS_SHLIB=	yes
 
 MAN1=		cln-config.1
 
-pre-build:
-	@(cd ${WRKSRC} ; ${LN} -sf ${LOCALBASE}/bin/libtool .)
+post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}/dvi
+	${INSTALL_DATA} ${WRKSRC}/doc/*.dvi ${DOCSDIR}/dvi
+	@${MKDIR} ${DOCSDIR}/html
+	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR}/html
+.endif
 
 .include <bsd.port.mk>
diff --git a/math/cln/distinfo b/math/cln/distinfo
index b3a34814b887..f414f274171c 100644
--- a/math/cln/distinfo
+++ b/math/cln/distinfo
@@ -1 +1 @@
-MD5 (cln-1.1.4.tar.gz) = 680494c770199af77f0df9beceaf2fa9
+MD5 (cln-1.1.5.tar.gz) = 55d9e26806bfe9023c09caf2d7e7e91b
diff --git a/math/cln/files/patch-Makefile.in b/math/cln/files/patch-Makefile.in
deleted file mode 100644
index 810ee06887db..000000000000
--- a/math/cln/files/patch-Makefile.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- Makefile.in.orig	Sun Feb 11 16:52:48 2001
-+++ Makefile.in	Sun Feb 11 17:03:58 2001
-@@ -33,14 +33,13 @@
- 
- install : installdirs force
- 	cd @subdir@; $(MAKE) install
--	$(INSTALL_PROGRAM) cln-config $(DESTDIR)$(bindir)/cln-config
-+	$(INSTALL) cln-config $(DESTDIR)$(bindir)/cln-config
- 	$(INSTALL_DATA) cln-config.1 $(DESTDIR)$(mandir)/man1/cln-config.1
--	$(INSTALL_DATA) cln.m4 $(DESTDIR)$(datadir)/aclocal/cln.m4
-+	$(INSTALL_DATA) cln.m4 $(DESTDIR)$(prefix)/share/aclocal/cln.m4
- 
- installdirs : force
- 	cd @subdir@; $(MAKE) installdirs
- 	$(MKDIR) $(DESTDIR)$(mandir)/man1
--	$(MKDIR) $(DESTDIR)$(datadir)/aclocal
- 	$(MKDIR) $(DESTDIR)$(bindir)
- 
- uninstall : force
diff --git a/math/cln/files/patch-configure b/math/cln/files/patch-configure
new file mode 100644
index 000000000000..77cca27e61df
--- /dev/null
+++ b/math/cln/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Tue May 28 22:55:47 2002
++++ configure	Tue Jul 30 06:40:57 2002
+@@ -6933,6 +6933,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/math/cln/files/patch-doc::Makefile.in b/math/cln/files/patch-doc::Makefile.in
index bc3557228651..06f1840192b6 100644
--- a/math/cln/files/patch-doc::Makefile.in
+++ b/math/cln/files/patch-doc::Makefile.in
@@ -1,10 +1,12 @@
---- doc/Makefile.in.orig	Sun Feb 11 17:11:56 2001
-+++ doc/Makefile.in	Sun Feb 11 17:24:01 2001
-@@ -81,6 +81,7 @@
+--- doc/Makefile.in.orig	Wed Dec  6 00:38:27 2000
++++ doc/Makefile.in	Wed Jul 31 01:21:51 2002
+@@ -81,8 +81,7 @@
  
  install : all installdirs force
  	$(INSTALL_DATA) $(srcdir)/$(PACKAGE).info $(DESTDIR)$(infodir)/$(PACKAGE).info
-+	install-info $(srcdir)/$(PACKAGE).info $(DESTDIR)$(infodir)/dir
- 	$(INSTALL_DATA) $(srcdir)/$(PACKAGE)_*.html $(DESTDIR)$(htmldir)
- 	$(INSTALL_DATA) $(srcdir)/$(PACKAGE).dvi $(DESTDIR)$(dvidir)/$(PACKAGE).dvi
+-	$(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
  
+ installdirs : force
+ 	$(MKDIR) $(DESTDIR)$(datadir)
diff --git a/math/cln/pkg-plist b/math/cln/pkg-plist
index aa492510ef1c..3b766a33293c 100644
--- a/math/cln/pkg-plist
+++ b/math/cln/pkg-plist
@@ -1,8 +1,4 @@
 bin/cln-config
-share/aclocal/cln.m4
-@unexec install-info --delete %D/info/cln.info %D/info/dir
-info/cln.info
-@exec install-info %D/info/cln.info %D/info/dir
 include/cln/GV.h
 include/cln/GV_complex.h
 include/cln/GV_integer.h
@@ -81,26 +77,35 @@ include/cln/univpoly_modint.h
 include/cln/univpoly_rational.h
 include/cln/univpoly_real.h
 include/cln/version.h
-@dirrm include/cln
+@unexec install-info --delete %D/info/cln.info %D/info/dir
+info/cln.info
+@exec install-info %D/info/cln.info %D/info/dir
 lib/libcln.a
-lib/libcln.la
 lib/libcln.so
 lib/libcln.so.2
-share/cln/html/cln_1.html
-share/cln/html/cln_10.html
-share/cln/html/cln_11.html
-share/cln/html/cln_12.html
-share/cln/html/cln_13.html
-share/cln/html/cln_2.html
-share/cln/html/cln_3.html
-share/cln/html/cln_4.html
-share/cln/html/cln_5.html
-share/cln/html/cln_6.html
-share/cln/html/cln_7.html
-share/cln/html/cln_8.html
-share/cln/html/cln_9.html
-share/cln/html/cln_toc.html
-share/cln/dvi/cln.dvi
-@dirrm share/cln/html
-@dirrm share/cln/dvi
-@dirrm share/cln
+share/aclocal/cln.m4
+%%PORTDOCS%%share/doc/cln/dvi/cln.dvi
+%%PORTDOCS%%share/doc/cln/html/cln.html
+%%PORTDOCS%%share/doc/cln/html/cln_1.html
+%%PORTDOCS%%share/doc/cln/html/cln_10.html
+%%PORTDOCS%%share/doc/cln/html/cln_11.html
+%%PORTDOCS%%share/doc/cln/html/cln_12.html
+%%PORTDOCS%%share/doc/cln/html/cln_13.html
+%%PORTDOCS%%share/doc/cln/html/cln_14.html
+%%PORTDOCS%%share/doc/cln/html/cln_15.html
+%%PORTDOCS%%share/doc/cln/html/cln_16.html
+%%PORTDOCS%%share/doc/cln/html/cln_2.html
+%%PORTDOCS%%share/doc/cln/html/cln_3.html
+%%PORTDOCS%%share/doc/cln/html/cln_4.html
+%%PORTDOCS%%share/doc/cln/html/cln_5.html
+%%PORTDOCS%%share/doc/cln/html/cln_6.html
+%%PORTDOCS%%share/doc/cln/html/cln_7.html
+%%PORTDOCS%%share/doc/cln/html/cln_8.html
+%%PORTDOCS%%share/doc/cln/html/cln_9.html
+%%PORTDOCS%%share/doc/cln/html/cln_abt.html
+%%PORTDOCS%%share/doc/cln/html/cln_ovr.html
+%%PORTDOCS%%share/doc/cln/html/cln_toc.html
+%%PORTDOCS%%@dirrm share/doc/cln/html
+%%PORTDOCS%%@dirrm share/doc/cln/dvi
+%%PORTDOCS%%@dirrm share/doc/cln
+@dirrm include/cln