- Add dependency for devel/stlport on 4-stable

  (to build math/GiNaC properly)
- Utilize INFO

PR:		57834
Submitted by:	Ports Fury

3 files changed, 52 insertions, 37 deletions

diff --git a/math/cln/Makefile b/math/cln/Makefile
index 899ae2d6da32..f0ea10b34199 100644
--- a/math/cln/Makefile
+++ b/math/cln/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	cln
 PORTVERSION=	1.1.5
+PORTREVISION=	1
 CATEGORIES=	math devel
 MASTER_SITES=	ftp://ftp.ilog.fr/pub/Users/haible/gnu/ \
 		ftp://ftp.santafe.edu/pub/gnu/ \
@@ -18,20 +19,31 @@ COMMENT=	Class Library for Numbers
 
 LIB_DEPENDS=	gmp.6:${PORTSDIR}/math/libgmp4
 
-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_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--infodir=${PREFIX}/info --mandir=${PREFIX}/man \
 		--with-gmp
-MAKE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+MAKE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 INSTALLS_SHLIB=	yes
 
 MAN1=		cln-config.1
+INFO=		cln
+
+STRIP=		# none
+
+CPPFLAGS=	-I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500035
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
+RUN_DEPENDS+=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
+CPPFLAGS+=	-I${LOCALBASE}/include/stlport ${PTHREAD_CFLAGS}
+LDFLAGS+=	-lstlport_gcc ${PTHREAD_LIBS}
+.endif
 
 post-install:
 .if !defined(NOPORTDOCS)
@@ -41,4 +53,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR}/html
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/math/cln/files/patch-doc::Makefile.in b/math/cln/files/patch-doc::Makefile.in
index 06f1840192b6..e69463a161e2 100644
--- a/math/cln/files/patch-doc::Makefile.in
+++ b/math/cln/files/patch-doc::Makefile.in
@@ -1,6 +1,6 @@
 --- 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 @@
++++ doc/Makefile.in	Thu Oct  9 22:51:12 2003
+@@ -81,14 +81,11 @@
  
  install : all installdirs force
  	$(INSTALL_DATA) $(srcdir)/$(PACKAGE).info $(DESTDIR)$(infodir)/$(PACKAGE).info
@@ -10,3 +10,9 @@
  
  installdirs : force
  	$(MKDIR) $(DESTDIR)$(datadir)
+ 	$(MKDIR) $(DESTDIR)$(infodir)
+-	$(MKDIR) $(DESTDIR)$(htmldir)
+-	$(MKDIR) $(DESTDIR)$(dvidir)
+ 
+ uninstall : force
+ 	$(RM) $(DESTDIR)$(infodir)/$(PACKAGE).info
diff --git a/math/cln/pkg-plist b/math/cln/pkg-plist
index 3b766a33293c..33b0c0b7ae12 100644
--- a/math/cln/pkg-plist
+++ b/math/cln/pkg-plist
@@ -77,35 +77,32 @@ include/cln/univpoly_modint.h
 include/cln/univpoly_rational.h
 include/cln/univpoly_real.h
 include/cln/version.h
-@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.so
 lib/libcln.so.2
 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
+%%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%%@dirrm %%DOCSDIR%%
 @dirrm include/cln