Install texinfo files (GNU info) into ${PREFIX}/share/info

After a discussion on the mailing list on moving manpages to
${PREFIX}/share/man for consistency with base where it is
installed in usr/share/man, it appeared the same should happen
to GNU info files which were installed under share in base and
not in ports.

Now texinfo is not in base on any of the supported version of FreeBSD
it is possible to proceed to this move and it is easier to do than
the manpage change.

Other benefit than consistency are less patching: all build tools but
cmake are expecting info files to be under share/info and cmake (patched here)
was having an exception for BSD so the patch makes FreeBSD case less
specific for them

Bump revision of all impacted ports

PR:		232907
exp-run by:	antoine
Differential Revision:	https://reviews.freebsd.org/D17816

33 files changed, 146 insertions, 159 deletions

diff --git a/math/GiNaC/Makefile b/math/GiNaC/Makefile
index 3f1f0437beb0..e741ccaddc29 100644
--- a/math/GiNaC/Makefile
+++ b/math/GiNaC/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	GiNaC
 PORTVERSION=	1.7.2
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftpthep.physik.uni-mainz.de/pub/GiNaC/ \
 		http://www.ginac.de/
diff --git a/math/R/Makefile b/math/R/Makefile
index 1b481adf2e8a..d4ee61ae2499 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	R
 DISTVERSION=	3.5.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math lang
 MASTER_SITES=	CRAN/src/base/R-${PORTVERSION:C|\..*||}
 
diff --git a/math/algae/Makefile b/math/algae/Makefile
index bafddedf1b4d..179a70f61af2 100644
--- a/math/algae/Makefile
+++ b/math/algae/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	algae
 PORTVERSION=	4.3.6
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	math
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
diff --git a/math/algae/files/patch-Makefile.in b/math/algae/files/patch-Makefile.in
index 97d14af895aa..bbf7d884017a 100644
--- a/math/algae/files/patch-Makefile.in
+++ b/math/algae/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig
+--- Makefile.in.orig	2003-12-06 21:39:23 UTC
 +++ Makefile.in
-@@ -78,12 +78,12 @@
+@@ -78,7 +78,7 @@ datadir = $(prefix)/share
  libdir = $(prefix)/lib
  
  # Directory in which to install the man page.
@@ -9,13 +9,7 @@
  # The manpage extension
  manext = 1
  
- # Directory in which to install the Info files.
--infodir = $(datadir)/info
-+infodir = $(prefix)/info
- 
- # Directory in which to install the algae tools.
- tooldir = $(datadir)/algae/$(VERSION_NUMBER)/tools
-@@ -150,19 +150,19 @@
+@@ -150,19 +150,19 @@ configure: configure.in
  # Compile the source code.
  
  source: @BLAS@ @LAPACK@
@@ -40,7 +34,7 @@
  .PHONY: xlapack
  
  check: source
-@@ -180,13 +180,13 @@
+@@ -180,13 +180,13 @@ algae.A: rc0
  # Run test cases.
  
  check:
@@ -56,7 +50,7 @@
  .PHONY: times
  
  # <<<< This section is deleted in the "binary" distribution.
-@@ -194,11 +194,11 @@
+@@ -194,11 +194,11 @@ times:
  # Make documentation.
  
  info:
@@ -70,7 +64,7 @@
  .PHONY: dvi
  
  # ========================== Distribution =========================
-@@ -211,9 +211,7 @@
+@@ -211,9 +211,7 @@ dist:	distdir
  	  ln $$file $(distdir) > /dev/null 2>&1 || cp $$file $(distdir); \
  	done
  	for dir in $(SUBDIRS); do \
@@ -81,7 +75,7 @@
  	done
  	mv $(distdir) algae-$(VERSION_NUMBER)
  	tar chf algae-$(VERSION_NUMBER).tar algae-$(VERSION_NUMBER)
-@@ -230,9 +228,7 @@
+@@ -230,9 +228,7 @@ binaries: bindistdir
  	done
  	awk '/<<[<]</,/>>[>]>/ {next} {print}' Makefile > $(distdir)/Makefile
  	for dir in $(BINSUBDIRS); do \
@@ -92,7 +86,7 @@
  	done
  	mv $(distdir) algae-$(VERSION_NUMBER)
  	tar chf algae-$(VERSION_NUMBER)-@host@.tar algae-$(VERSION_NUMBER)
-@@ -249,8 +245,8 @@
+@@ -249,8 +245,8 @@ web:
  	for file in $(WEBDISTFILES); do \
  	  ln $$file $(distdir) > /dev/null 2>&1 || cp $$file $(distdir); \
  	done
@@ -103,7 +97,7 @@
  	rm -rf $(distdir)
  	gzip algae-web-$(VERSION_NUMBER).tar
  .PHONY: web
-@@ -278,7 +274,7 @@
+@@ -278,7 +274,7 @@ maintainer-clean::
  	@echo "it deletes files that may require special tools to rebuild."
  
  clean mostlyclean distclean maintainer-clean::
@@ -112,7 +106,7 @@
  
  clean mostlyclean distclean maintainer-clean::
  	rm -f a.out core conft* algae-*.tar algae-*.tar.gz
-@@ -294,15 +290,12 @@
+@@ -294,15 +290,12 @@ install: all
  # >>>> End of deleted section.
  
  install: algae.A installdirs
@@ -134,7 +128,7 @@
  	  manext=$(manext) infodir=$(infodir) htmldir=$(htmldir) install
  .PHONY:	install
  
-@@ -310,17 +303,17 @@
+@@ -310,17 +303,17 @@ install: algae.A installdirs
  # if necessary.
  
  installdirs: mkinstalldirs
diff --git a/math/asymptote/Makefile b/math/asymptote/Makefile
index 1fd04f5c97bd..13488e07feab 100644
--- a/math/asymptote/Makefile
+++ b/math/asymptote/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	asymptote
 PORTVERSION=	2.44
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}.src
diff --git a/math/asymptote/pkg-plist b/math/asymptote/pkg-plist
index 55209735b220..3f387297fbd9 100644
--- a/math/asymptote/pkg-plist
+++ b/math/asymptote/pkg-plist
@@ -1,87 +1,87 @@
 bin/asy
 bin/xasy
-info/asymptote/Bode.png
-info/asymptote/CAD1.png
-info/asymptote/CDlabel.png
-info/asymptote/GaussianSurface.png
-info/asymptote/HermiteSpline.png
-info/asymptote/Hobbycontrol.png
-info/asymptote/Hobbydir.png
-info/asymptote/asymptote.info
-info/asymptote/axis3.png
-info/asymptote/bezier.png
-info/asymptote/bezier2.png
-info/asymptote/beziercurve.png
-info/asymptote/bigdiagonal.png
-info/asymptote/binarytreetest.png
-info/asymptote/brokenaxis.png
-info/asymptote/colons.png
-info/asymptote/colors.png
-info/asymptote/cube.png
-info/asymptote/cylinderskeleton.png
-info/asymptote/datagraph.png
-info/asymptote/diagonal.png
-info/asymptote/diatom.png
-info/asymptote/dots.png
-info/asymptote/eetomumu.png
-info/asymptote/elliptic.png
-info/asymptote/errorbars.png
-info/asymptote/exp.png
-info/asymptote/filegraph.png
-info/asymptote/flow.png
-info/asymptote/flowchartdemo.png
-info/asymptote/generalaxis.png
-info/asymptote/generalaxis3.png
-info/asymptote/graphmarkers.png
-info/asymptote/grid3xyz.png
-info/asymptote/hatch.png
-info/asymptote/helix.png
-info/asymptote/histogram.png
-info/asymptote/icon.png
-info/asymptote/image.png
-info/asymptote/imagecontour.png
-info/asymptote/irregularcontour.png
-info/asymptote/join.png
-info/asymptote/join3.png
-info/asymptote/knots.png
-info/asymptote/labelsquare.png
-info/asymptote/latexusage.png
-info/asymptote/leastsquares.png
-info/asymptote/legend.png
-info/asymptote/lineargraph.png
-info/asymptote/lineargraph0.png
-info/asymptote/linetype.png
-info/asymptote/log2graph.png
-info/asymptote/loggraph.png
-info/asymptote/loggrid.png
-info/asymptote/logimage.png
-info/asymptote/logo.png
-info/asymptote/logticks.png
-info/asymptote/makepen.png
-info/asymptote/markers1.png
-info/asymptote/markers2.png
-info/asymptote/mexicanhat.png
-info/asymptote/monthaxis.png
-info/asymptote/multicontour.png
-info/asymptote/onecontour.png
-info/asymptote/parametricgraph.png
-info/asymptote/penfunctionimage.png
-info/asymptote/penimage.png
-info/asymptote/planes.png
-info/asymptote/quartercircle.png
-info/asymptote/saddle.png
-info/asymptote/scaledgraph.png
-info/asymptote/secondaryaxis.png
-info/asymptote/shadedtiling.png
-info/asymptote/slopefield1.png
-info/asymptote/square.png
-info/asymptote/subpictures.png
-info/asymptote/superpath.png
-info/asymptote/tile.png
-info/asymptote/triangulate.png
-info/asymptote/unitcircle3.png
-info/asymptote/vectorfield.png
-info/asymptote/westnile.png
+share/info/asymptote/Bode.png
+share/info/asymptote/CAD1.png
+share/info/asymptote/CDlabel.png
+share/info/asymptote/GaussianSurface.png
+share/info/asymptote/HermiteSpline.png
+share/info/asymptote/Hobbycontrol.png
+share/info/asymptote/Hobbydir.png
+share/info/asymptote/asymptote.info
+share/info/asymptote/axis3.png
+share/info/asymptote/bezier.png
+share/info/asymptote/bezier2.png
+share/info/asymptote/beziercurve.png
+share/info/asymptote/bigdiagonal.png
+share/info/asymptote/binarytreetest.png
+share/info/asymptote/brokenaxis.png
+share/info/asymptote/colons.png
+share/info/asymptote/colors.png
+share/info/asymptote/cube.png
+share/info/asymptote/cylinderskeleton.png
+share/info/asymptote/datagraph.png
+share/info/asymptote/diagonal.png
+share/info/asymptote/diatom.png
+share/info/asymptote/dots.png
+share/info/asymptote/eetomumu.png
+share/info/asymptote/elliptic.png
+share/info/asymptote/errorbars.png
+share/info/asymptote/exp.png
+share/info/asymptote/filegraph.png
+share/info/asymptote/flow.png
+share/info/asymptote/flowchartdemo.png
+share/info/asymptote/generalaxis.png
+share/info/asymptote/generalaxis3.png
+share/info/asymptote/graphmarkers.png
+share/info/asymptote/grid3xyz.png
+share/info/asymptote/hatch.png
+share/info/asymptote/helix.png
+share/info/asymptote/histogram.png
+share/info/asymptote/icon.png
+share/info/asymptote/image.png
+share/info/asymptote/imagecontour.png
+share/info/asymptote/irregularcontour.png
+share/info/asymptote/join.png
+share/info/asymptote/join3.png
+share/info/asymptote/knots.png
+share/info/asymptote/labelsquare.png
+share/info/asymptote/latexusage.png
+share/info/asymptote/leastsquares.png
+share/info/asymptote/legend.png
+share/info/asymptote/lineargraph.png
+share/info/asymptote/lineargraph0.png
+share/info/asymptote/linetype.png
+share/info/asymptote/log2graph.png
+share/info/asymptote/loggraph.png
+share/info/asymptote/loggrid.png
+share/info/asymptote/logimage.png
+share/info/asymptote/logo.png
+share/info/asymptote/logticks.png
+share/info/asymptote/makepen.png
+share/info/asymptote/markers1.png
+share/info/asymptote/markers2.png
+share/info/asymptote/mexicanhat.png
+share/info/asymptote/monthaxis.png
+share/info/asymptote/multicontour.png
+share/info/asymptote/onecontour.png
+share/info/asymptote/parametricgraph.png
+share/info/asymptote/penfunctionimage.png
+share/info/asymptote/penimage.png
+share/info/asymptote/planes.png
+share/info/asymptote/quartercircle.png
+share/info/asymptote/saddle.png
+share/info/asymptote/scaledgraph.png
+share/info/asymptote/secondaryaxis.png
+share/info/asymptote/shadedtiling.png
+share/info/asymptote/slopefield1.png
+share/info/asymptote/square.png
+share/info/asymptote/subpictures.png
+share/info/asymptote/superpath.png
+share/info/asymptote/tile.png
+share/info/asymptote/triangulate.png
+share/info/asymptote/unitcircle3.png
+share/info/asymptote/vectorfield.png
+share/info/asymptote/westnile.png
 man/man1/asy.1.gz
 man/man1/xasy.1x.gz
 %%DATADIR%%/CAD.asy
diff --git a/math/cln/Makefile b/math/cln/Makefile
index 27a60ade53e4..69aabef4bb15 100644
--- a/math/cln/Makefile
+++ b/math/cln/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	cln
 PORTVERSION=	1.3.4
+PORTREVISION=	1
 CATEGORIES=	math devel
 MASTER_SITES=	http://www.ginac.de/CLN/ \
 		http://www.mirrors.wiretapped.net/security/cryptography/libraries/math/cln/ \
diff --git a/math/dynare/Makefile b/math/dynare/Makefile
index 3549834b77a7..04d478342b5c 100644
--- a/math/dynare/Makefile
+++ b/math/dynare/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	dynare
 DISTVERSION=	4.5.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	http://www.dynare.org/release/source/
 
diff --git a/math/ess/Makefile b/math/ess/Makefile
index 0200c6bc35b8..ca2aaf08ff86 100644
--- a/math/ess/Makefile
+++ b/math/ess/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ess
 DISTVERSION=	17.11
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 MASTER_SITES=	http://ess.r-project.org/downloads/ess/ \
 		http://stat.ethz.ch/ESS/downloads/ess/
@@ -30,8 +30,8 @@ post-patch:
 	@${REINPLACE_CMD} -e \
 		's|^DESTDIR|#DESTDIR| ; \
 		 s|^PREFIX|#PREFIX| ; \
-		 s|=$$(PREFIX)|=$$(DESTDIR)$$(PREFIX)| ; \
-		 s|share/info|${INFO_PATH}|' ${WRKSRC}/Makeconf
+		 s|=$$(PREFIX)|=$$(DESTDIR)$$(PREFIX)|' \
+		 ${WRKSRC}/Makeconf
 	@${REINPLACE_CMD} -e \
 		'/^PDFs/s|=.*|=|' ${WRKSRC}/doc/Makefile
 
diff --git a/math/eukleides/files/patch-Config b/math/eukleides/files/patch-Config
index 7a048a5c7bf9..f472ca658f6b 100644
--- a/math/eukleides/files/patch-Config
+++ b/math/eukleides/files/patch-Config
@@ -1,13 +1,6 @@
---- Config.orig
+--- Config.orig	2010-04-27 06:31:00 UTC
 +++ Config
-@@ -2,13 +2,13 @@
- # Copyright (c) Christian Obrecht 2004-2010
- 
- # Installation prefix
--PREFIX=/usr/local
-+PREFIX=%%PREFIX%%
- 
- BINARIES = eukleides euktopst
+@@ -8,7 +8,7 @@ BINARIES = eukleides euktopst
  
  # Localized keywords
  # Uncomment to enable this feature.
@@ -16,7 +9,7 @@
  
  # Documentation
  # Alternative targets are 'pdf' and 'html'.
-@@ -27,9 +27,9 @@
+@@ -27,9 +27,9 @@ PAPER = A4
  BIN_DIR = $(PREFIX)/bin
  SHARE_DIR = $(PREFIX)/share
  MO_DIR = $(SHARE_DIR)/locale
@@ -24,9 +17,9 @@
 -EXM_DIR = $(DOC_DIR)/examples
 -MAN_DIR = $(SHARE_DIR)/man/man1
 -INFO_DIR = $(SHARE_DIR)/info
-+DOC_DIR = %%DOCSDIR%%
-+EXM_DIR = %%EXAMPLESDIR%%
++DOC_DIR = ${PREFIX}/share/doc/eukleides
++EXM_DIR = ${PREFIX}/share/examples/eukleides
 +MAN_DIR = $(PREFIX)/man/man1
-+INFO_DIR = $(PREFIX)/info
++INFO_DIR = $(PREFIX)/share/info
  TEX_DIR = $(SHARE_DIR)/texmf/tex/latex/eukleides
  
diff --git a/math/fftw/Makefile b/math/fftw/Makefile
index d612add98b5c..e9139a15cbd6 100644
--- a/math/fftw/Makefile
+++ b/math/fftw/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	fftw
 PORTVERSION=	2.1.5
-PORTREVISION?=	17
+PORTREVISION?=	18
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.fftw.org/pub/fftw/		\
 		ftp://ftp.fftw.org/pub/fftw/old/	\
diff --git a/math/fftw3/Makefile b/math/fftw3/Makefile
index 1e915a5d9561..0e8e6cd939c8 100644
--- a/math/fftw3/Makefile
+++ b/math/fftw3/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	fftw3
 DISTVERSION=	3.3.8
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	math
 MASTER_SITES=	http://www.fftw.org/ \
 		ftp://ftp.fftw.org/pub/fftw/
diff --git a/math/giacxcas/Makefile b/math/giacxcas/Makefile
index 42f8740489c5..1a057d96c3c5 100644
--- a/math/giacxcas/Makefile
+++ b/math/giacxcas/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	giacxcas
 DISTVERSION=	1.4.9-59
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math
 MASTER_SITES=	http://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/:giac \
 		http://www-fourier.ujf-grenoble.fr/~parisse/giac/freebsd/
diff --git a/math/gmp/Makefile b/math/gmp/Makefile
index 6ba51b83747e..cabcd27b92de 100644
--- a/math/gmp/Makefile
+++ b/math/gmp/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gmp
 PORTVERSION=	6.1.2
+PORTREVISION=	1
 CATEGORIES=	math devel
 MASTER_SITES=	GNU
 
@@ -18,7 +19,7 @@ USES=		libtool makeinfo tar:xz
 HAS_CONFIGURE=	yes
 CONFIGURE_ENV=	MAKEINFO="${MAKEINFO} --no-split"
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
-		--infodir=${PREFIX}/info \
+		--infodir=${PREFIX}/${INFO_PATH} \
 		--mandir=${PREFIX}/man \
 		--enable-cxx
 MAKE_JOBS_UNSAFE=yes
diff --git a/math/gnubc/Makefile b/math/gnubc/Makefile
index 1225a51643a3..1f99448541b9 100644
--- a/math/gnubc/Makefile
+++ b/math/gnubc/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	bc
 DISTVERSION=	1.07.1
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	GNU
 PKGNAMEPREFIX=	gnu
diff --git a/math/gri/Makefile b/math/gri/Makefile
index c64661622148..8f3c0291b0a2 100644
--- a/math/gri/Makefile
+++ b/math/gri/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gri
 PORTVERSION=	2.12.23
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	math
 MASTER_SITES=	SF
 
diff --git a/math/gsl/Makefile b/math/gsl/Makefile
index c69d32188174..7cc00fab520b 100644
--- a/math/gsl/Makefile
+++ b/math/gsl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gsl
 PORTVERSION=	2.5
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	GNU
 
diff --git a/math/jacal/Makefile b/math/jacal/Makefile
index 4303199d49d4..ebe841e14f4d 100644
--- a/math/jacal/Makefile
+++ b/math/jacal/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	jacal
 PORTVERSION=	1c4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	http://groups.csail.mit.edu/mac/ftpdir/scm/
 
diff --git a/math/jacal/files/patch-configure b/math/jacal/files/patch-configure
index 3798e19720d7..a7545bd0f195 100644
--- a/math/jacal/files/patch-configure
+++ b/math/jacal/files/patch-configure
@@ -1,19 +1,11 @@
---- configure.orig	2012-03-28 02:16:29.000000000 +0600
-+++ configure	2012-03-28 02:17:23.000000000 +0600
-@@ -52,14 +52,14 @@
- bindir='${exec_prefix}bin/'
- sbindir='${exec_prefix}sbin/'
- libexecdir='${exec_prefix}libexec/'
--datarootdir='${prefix}share/'
-+datarootdir='${prefix}'
- datadir='${datarootdir}'
- sysconfdir='${prefix}etc/'
- sharedstatedir='${prefix}com/'
- localstatedir='${prefix}var/'
- includedir='${prefix}include/'
- oldincludedir='/usr/include/'
--docdir='${datarootdir}doc/${PACKAGE_TARNAME}/'
-+docdir='${datarootdir}share/doc/${PACKAGE_TARNAME}/'
- infodir='${datarootdir}info/'
- htmldir='${docdir}'
- dvidir='${docdir}'
+--- configure.orig	2011-10-24 02:30:35 UTC
++++ configure
+@@ -67,7 +67,7 @@ pdfdir='${docdir}'
+ psdir='${docdir}'
+ libdir='${exec_prefix}lib/'
+ localedir='${datarootdir}locale/'
+-mandir='${datarootdir}man/'
++mandir='${prefix}man/'
+ snapdir='${srcdir}'
+ distdir='${srcdir}'
+ 
diff --git a/math/libranlip/Makefile b/math/libranlip/Makefile
index 425728ae3a7a..56b16ce88afa 100644
--- a/math/libranlip/Makefile
+++ b/math/libranlip/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libranlip
 DISTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	LOCAL/bf \
 		http://www.deakin.edu.au/~gleb/
diff --git a/math/maxima/Makefile b/math/maxima/Makefile
index 13e2c7158553..f19fff5cacf3 100644
--- a/math/maxima/Makefile
+++ b/math/maxima/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	maxima
 PORTVERSION=	5.41.0
+PORTREVISION=	1
 CATEGORIES=	math lisp tk
 MASTER_SITES=	SF/maxima/Maxima-source/${PORTVERSION}-source
 
@@ -25,7 +26,9 @@ CONFIGURE_ARGS=	--with-posix-shell=/bin/sh \
 		${LISPSELECT}
 TEST_TARGET=	check
 
-INFO=		maxima imaxima xmaxima
+INFO=		maxima imaxima xmaxima \
+		abs_integrate drawutils \
+		kovacicODE logic
 
 PLIST_SUB=	BINDIR=${BINDIRECTORY}
 PLIST_SUB+=	LISPBIN=${LISPBINARY}
diff --git a/math/maxima/pkg-plist b/math/maxima/pkg-plist
index 74a87b1b6181..b498738d9817 100644
--- a/math/maxima/pkg-plist
+++ b/math/maxima/pkg-plist
@@ -1,11 +1,7 @@
 bin/maxima
 bin/rmaxima
 bin/xmaxima
-info/abs_integrate.info
-info/drawutils.info
-info/kovacicODE.info
-info/logic.info
-info/maxima-index.lisp
+share/info/maxima-index.lisp
 lib/maxima/%%PORTVERSION%%/%%BINDIR%%/%%MAXIMABIN%%
 libexec/maxima/%%PORTVERSION%%/mgnuplot
 man/man1/maxima.1.gz
diff --git a/math/mpc/Makefile b/math/mpc/Makefile
index b4c548edfbc7..aadc2be5c407 100644
--- a/math/mpc/Makefile
+++ b/math/mpc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mpc
 PORTVERSION=	1.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math devel
 MASTER_SITES=	GNU
 
diff --git a/math/mpfr/Makefile b/math/mpfr/Makefile
index 519650ba0236..4ef50fc90167 100644
--- a/math/mpfr/Makefile
+++ b/math/mpfr/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mpfr
 PORTVERSION=	4.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math devel
 MASTER_SITES=	http://www.mpfr.org/mpfr-current/ \
 		GNU
diff --git a/math/mpir/Makefile b/math/mpir/Makefile
index f099d558acab..8653907c6d37 100644
--- a/math/mpir/Makefile
+++ b/math/mpir/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	mpir
 PORTVERSION=	3.0.0
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	http://mpir.org/
 
diff --git a/math/numdiff/Makefile b/math/numdiff/Makefile
index c64d7dd91936..b7b673b83aef 100644
--- a/math/numdiff/Makefile
+++ b/math/numdiff/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	numdiff
 PORTVERSION=	5.9.0
+PORTREVISION=	1
 CATEGORIES=	math textproc
 MASTER_SITES=	SAVANNAH
 
diff --git a/math/octave/Makefile b/math/octave/Makefile
index 878f816623d6..8ebb38fed527 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave
 PORTVERSION=	${OCTAVE_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math java
 MASTER_SITES=	GNU
 
diff --git a/math/oleo/Makefile b/math/oleo/Makefile
index fada2bf2cbe1..0e2d54f59991 100644
--- a/math/oleo/Makefile
+++ b/math/oleo/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	oleo
 PORTVERSION=	1.99.16
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	math
 MASTER_SITES=	GNU
 
diff --git a/math/prng/Makefile b/math/prng/Makefile
index 847dd2ed9daa..b08bf68ee3f6 100644
--- a/math/prng/Makefile
+++ b/math/prng/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	prng
 DISTVERSION=	3.0.2
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	http://statistik.wu-wien.ac.at/software/prng/
 
diff --git a/math/proofgeneral/Makefile b/math/proofgeneral/Makefile
index 293f1fc4dc7e..3810c3873d83 100644
--- a/math/proofgeneral/Makefile
+++ b/math/proofgeneral/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	proofgeneral
 PORTVERSION=	4.1
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	math elisp
 MASTER_SITES=	http://proofgeneral.inf.ed.ac.uk/releases/
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
@@ -28,7 +28,7 @@ NO_ARCH=	yes
 MAKE_ARGS+=	PREFIX="${LOCALBASE}" DEST_PREFIX="${STAGEDIR}${PREFIX}" \
 	MAKE="${MAKE_CMD}" EMACS=emacs EMACS_NAME=emacs \
 	DOCDIR="${STAGEDIR}${DOCSDIR}" MANDIR="${STAGEDIR}${PREFIX}/man/man1" \
-	INFODIR="${STAGEDIR}${PREFIX}/info" \
+	INFODIR="${STAGEDIR}${PREFIX}/${INFO_PATH}" \
 	BINDIR="${STAGEDIR}${PREFIX}/bin" DESKTOP="${STAGEDIR}${PREFIX}/share" \
 	EMACS_SITE_LISPDIR="${EMACS_SITE_LISPDIR}" \
 	ELISPP="${EMACS_SITE_LISPDIR}/ProofGeneral" \
diff --git a/math/pspp/Makefile b/math/pspp/Makefile
index c7a42099027b..cb15b980efe3 100644
--- a/math/pspp/Makefile
+++ b/math/pspp/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pspp
 PORTVERSION=	1.0.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	GNU
 
diff --git a/math/units/Makefile b/math/units/Makefile
index 689ed5baea68..bca33e6ecea6 100644
--- a/math/units/Makefile
+++ b/math/units/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	units
 PORTVERSION=	2.16
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	GNU
 
diff --git a/math/unuran/Makefile b/math/unuran/Makefile
index 4656fcc6541d..be2d16dd8f54 100644
--- a/math/unuran/Makefile
+++ b/math/unuran/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	unuran
 PORTVERSION=	1.8.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	http://statmath.wu-wien.ac.at/unuran/ \
 		LOCAL/bf