aboutsummaryrefslogtreecommitdiff
path: root/math
diff options
context:
space:
mode:
authorMartin Wilke <miwi@FreeBSD.org>2008-04-19 17:56:05 +0000
committerMartin Wilke <miwi@FreeBSD.org>2008-04-19 17:56:05 +0000
commit3e4ed01146cfe2bdca465bd0e4d199341f62a0b6 (patch)
treed573ea09b2bf6be67cb497df199932da9e2707c4 /math
parent40049f4af2200d0dcf33596508688623fc75f764 (diff)
downloadports-3e4ed01146cfe2bdca465bd0e4d199341f62a0b6.tar.gz
ports-3e4ed01146cfe2bdca465bd0e4d199341f62a0b6.zip
Notes
Diffstat (limited to 'math')
-rw-r--r--math/abs/files/patch-aa4
-rw-r--r--math/apc/Makefile4
-rw-r--r--math/apc/files/patch-aa25
-rw-r--r--math/bamg/Makefile4
-rw-r--r--math/bamg/files/patch-FLAG.linux6
-rw-r--r--math/biggles/Makefile7
-rw-r--r--math/blitz++/Makefile2
-rw-r--r--math/blocksolve95/Makefile3
-rw-r--r--math/blocksolve95/files/patch-bmake::freebsd::freebsd.site2
-rw-r--r--math/calctool/Makefile6
-rw-r--r--math/calctool/files/patch-ab8
-rw-r--r--math/cgal/Makefile2
-rw-r--r--math/dislin/Makefile3
-rw-r--r--math/emc2/Makefile4
-rw-r--r--math/emc2/files/patch-Makefile4
-rw-r--r--math/femlab/Makefile8
-rw-r--r--math/femlab/files/patch-aa2
-rw-r--r--math/fftw3/Makefile2
-rw-r--r--math/freefem++/Makefile4
-rw-r--r--math/freefem/Makefile4
-rw-r--r--math/freemat/Makefile2
-rw-r--r--math/fung-calc/Makefile2
-rw-r--r--math/gcalctool/Makefile2
-rw-r--r--math/geg/Makefile2
-rw-r--r--math/gnumeric/Makefile2
-rw-r--r--math/gnuplot+/Makefile3
-rw-r--r--math/goblin/Makefile9
-rw-r--r--math/grace/Makefile2
-rw-r--r--math/grpn/Makefile3
-rw-r--r--math/grpn/files/patch-aa4
-rw-r--r--math/kaskade/Makefile4
-rw-r--r--math/ldouble/Makefile2
-rw-r--r--math/lensnns/files/patch-Makefile2
-rw-r--r--math/lensnns/files/patch-Src-Makefile4
-rw-r--r--math/libmath++/Makefile2
-rw-r--r--math/linux-relview/Makefile2
-rw-r--r--math/lp_solve/Makefile2
-rw-r--r--math/matrix/Makefile2
-rw-r--r--math/maxima/Makefile5
-rw-r--r--math/mbasecalc/Makefile4
-rw-r--r--math/ngraph/files/patch-aa4
-rw-r--r--math/octave-forge/Makefile7
-rw-r--r--math/oleo/Makefile4
-rw-r--r--math/petsc/Makefile7
-rw-r--r--math/plplot/Makefile7
-rw-r--r--math/py-matplotlib/Makefile5
-rw-r--r--math/qscanplot/Makefile4
-rw-r--r--math/reed-solomon/Makefile2
-rw-r--r--math/scigraphica/Makefile5
-rw-r--r--math/scilab/Makefile7
-rw-r--r--math/snns/Makefile7
-rw-r--r--math/surf/Makefile6
-rw-r--r--math/topaz/Makefile4
-rw-r--r--math/topaz/files/patch-aa4
-rw-r--r--math/triangle/Makefile4
-rw-r--r--math/triangle/files/patch-makefile2
-rw-r--r--math/ump/Makefile11
-rw-r--r--math/ump/files/patch-Makefile4
-rw-r--r--math/vtk/Makefile2
-rw-r--r--math/wingz/Makefile2
-rw-r--r--math/wingz3/Makefile10
-rw-r--r--math/wmcalc/Makefile5
-rw-r--r--math/wmcalc/files/patch-aa4
-rw-r--r--math/xgfe/Makefile3
-rw-r--r--math/xgfe/files/patch-aa4
-rw-r--r--math/xgobi/Makefile5
-rw-r--r--math/xldlas/Makefile4
-rw-r--r--math/xldlas/files/patch-aa10
-rw-r--r--math/xlispstat/Makefile4
-rw-r--r--math/xppaut/Makefile5
-rw-r--r--math/xppaut/files/patch-Makefile4
-rw-r--r--math/xspread/Makefile7
-rw-r--r--math/yacas/Makefile6
73 files changed, 160 insertions, 173 deletions
diff --git a/math/abs/files/patch-aa b/math/abs/files/patch-aa
index acecf1c110ea..e588e35237b8 100644
--- a/math/abs/files/patch-aa
+++ b/math/abs/files/patch-aa
@@ -17,7 +17,7 @@
#for hp LIBS = -L /lib/X11 -L /usr/X11R6/lib -L /usr/contrib/X11R6/lib -lXaw -lX11 -lm -lXt -lXmu -lXext
#for netBSD LIBS = -L /usr/lib -L /usr/X11R6/lib -lXaw -lX11 -lm -lXt -lXmu -lXext
-LIBS = -L /lib/X11 -L /usr/X11R6/lib -L /usr/contrib/X11R6/lib -lXaw -lX11 -lm -lXt -lXmu -lXext
-+LIBS = -L${X11BASE}/lib -lXaw -lX11 -lm -lXt -lXmu -lXext -lXpm
++LIBS = -L${LOCALBASE}/lib -lXaw -lX11 -lm -lXt -lXmu -lXext -lXpm
#for hp DEFINE = -D_HPUX_SOURCE
-#for AIX DEFINE = -D_AIX_SOURCE
@@ -29,7 +29,7 @@
#for hp IncludeDir = /usr/contrib/X11R6/include
#for net-BSD IncludeDir = /usr/X11R6/include
-IncludeDir = .
-+IncludeDir = ${X11BASE}/include
++IncludeDir = ${LOCALBASE}/include
#for hp Ccompiler = c89
-Ccompiler = cc
diff --git a/math/apc/Makefile b/math/apc/Makefile
index ee7b8b1378d1..6b8cf58ff4a4 100644
--- a/math/apc/Makefile
+++ b/math/apc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= apc
PORTVERSION= 1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= arved
@@ -17,7 +17,7 @@ COMMENT= An xforms based Auto Payment Calculator
LIB_DEPENDS= forms.1:${PORTSDIR}/x11-toolkits/xforms
-USE_X_PREFIX= yes
+USE_XORG= x11 xpm
MAN1= apc.1
MANCOMPRESSED= yes
PLIST_FILES= bin/apc
diff --git a/math/apc/files/patch-aa b/math/apc/files/patch-aa
index 9d55486bc273..b5315b810a3d 100644
--- a/math/apc/files/patch-aa
+++ b/math/apc/files/patch-aa
@@ -1,16 +1,21 @@
---- Makefile.orig Mon Oct 13 15:25:38 1997
-+++ Makefile Tue Jul 2 01:04:00 2002
-@@ -1,8 +1,11 @@
+--- ./Makefile.orig 1997-10-13 21:25:38.000000000 +0200
++++ ./Makefile 2008-04-13 18:59:23.000000000 +0200
+@@ -1,10 +1,13 @@
# New Makefile for apc (13 October 1997)
#
-CFLAGS+=-DOS=\"$(OSTYPE)\" -I${X11BASE}/include
-+.if exists(${X11BASE}/include/X11/forms.h)
-+XFORMSINC=-I${X11BASE}/include/X11
-+.endif
-+CFLAGS+=-DOS=\"$(OSTYPE)\" -I${X11BASE}/include ${XFORMSINC}
- LDFLAGS+=-L${X11BASE}/lib
+-LDFLAGS+=-L${X11BASE}/lib
-LDADD+=-lxforms -lX11 -lm
+-BINDIR=${X11BASE}/bin
+-MANDIR=${X11BASE}/man/man
++.if exists(${LOCALBASE}/include/X11/forms.h)
++XFORMSINC=-I${LOCALBASE}/include/X11
++.endif
++CFLAGS+=-DOS=\"$(OSTYPE)\" -I${LOCALBASE}/include ${XFORMSINC}
++LDFLAGS+=-L${LOCALBASE}/lib
+LDADD+=-lforms -lX11 -lm -lXpm
- BINDIR=${X11BASE}/bin
- MANDIR=${X11BASE}/man/man
++BINDIR=${LOCALBASE}/bin
++MANDIR=${LOCALBASE}/man/man
PROG= apc
+ SRCS= about.c apc.c calculate.c main.c mathfun.c setfns.c
+
diff --git a/math/bamg/Makefile b/math/bamg/Makefile
index f7ad0f3b04ea..7d365225d68e 100644
--- a/math/bamg/Makefile
+++ b/math/bamg/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bamg
PORTVERSION= 0.68
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= math science
MASTER_SITES= http://pauillac.inria.fr/cdrom/ftp/bamg/ \
http://www-rocq1.inria.fr/gamma/cdrom/ftp/bamg/ \
@@ -24,7 +24,7 @@ RESTRICTED= No resale, contact author for commercial usage
WRKSRC= ${WRKDIR}/${PORTNAME}
-USE_XLIB= yes
+USE_XORG= x11
USE_GMAKE= yes
ALL_TARGET= world
diff --git a/math/bamg/files/patch-FLAG.linux b/math/bamg/files/patch-FLAG.linux
index c16f16cf4122..fa2fd9f2a58c 100644
--- a/math/bamg/files/patch-FLAG.linux
+++ b/math/bamg/files/patch-FLAG.linux
@@ -10,12 +10,12 @@
+O = $(longlong)
+G =
+CXXFLAGS+= $(O)
-+CXXGRAPHIC = $(CXXFLAGS) -I$(X11BASE)/include -DDRAWING -DDEBUG
++CXXGRAPHIC = $(CXXFLAGS) -I$(LOCALBASE)/include -DDRAWING -DDEBUG
CXXLINKFLAG =
-X11LIB = -L/usr/lib/X11R6 -L/usr/X11R6/lib -lX11
-X11INCLUDE= -I/usr/include/X11R6
-+X11LIB = -L$(X11BASE)/lib -lX11
-+X11INCLUDE= -I$(X11BASE)/include
++X11LIB = -L$(LOCALBASE)/lib -lX11
++X11INCLUDE= -I$(LOCALBASE)/include
STDLIB =
-F77FLAGS =
-F77 = f77
diff --git a/math/biggles/Makefile b/math/biggles/Makefile
index 946ecbc0e58d..2a4cfaf60eda 100644
--- a/math/biggles/Makefile
+++ b/math/biggles/Makefile
@@ -10,8 +10,7 @@ PORTNAME= biggles
PORTVERSION= 1.6.4
PORTREVISION= 1
CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= python2-${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
@@ -26,7 +25,7 @@ PYDISTUTILS_PKGNAME= python2-biggles
USE_LDCONFIG= yes
post-patch:
- @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/make.inc
- @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/setup.py
+ @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/make.inc
+ @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/setup.py
.include <bsd.port.mk>
diff --git a/math/blitz++/Makefile b/math/blitz++/Makefile
index 13b743dee5b9..5864cb28e896 100644
--- a/math/blitz++/Makefile
+++ b/math/blitz++/Makefile
@@ -33,7 +33,7 @@ MAKE_ARGS+= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
DOCSDIR= ${PREFIX}/share/doc/blitz
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
post-patch:
@${REINPLACE_CMD} -e 's|g++|\$${CXX}|g ; \
diff --git a/math/blocksolve95/Makefile b/math/blocksolve95/Makefile
index a98832e9eb3d..2dfe8d80a2e8 100644
--- a/math/blocksolve95/Makefile
+++ b/math/blocksolve95/Makefile
@@ -7,7 +7,7 @@
PORTNAME= blocksolve95
PORTVERSION= 3.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= math parallel
MASTER_SITES= ftp://info.mcs.anl.gov/pub/BlockSolve95/ \
ftp://ftp.irisa.fr/pub/mirrors/BlockSolve95/
@@ -22,7 +22,6 @@ BUILD_DEPENDS= ${MPIDIR}/lib/libmpich.a:${PORTSDIR}/net/mpich2
LIB_DEPENDS= f2c.2:${PORTSDIR}/lang/f2c
RUN_DEPENDS= ${MPIDIR}/bin/mpirun:${PORTSDIR}/net/mpich2
-USE_XLIB= yes
USE_GMAKE= yes
MAKEFILE= makefile
MAKE_ARGS= GMAKE=${GMAKE} PETSC_ARCH=${PETSC_ARCH} BOPT=${BOPT} \
diff --git a/math/blocksolve95/files/patch-bmake::freebsd::freebsd.site b/math/blocksolve95/files/patch-bmake::freebsd::freebsd.site
index e93294ca5546..bab70597d456 100644
--- a/math/blocksolve95/files/patch-bmake::freebsd::freebsd.site
+++ b/math/blocksolve95/files/patch-bmake::freebsd::freebsd.site
@@ -12,7 +12,7 @@
# Location of X-windows software
#
-X11_INCLUDE =
-+X11_INCLUDE = -I$(X11BASE)/include
++X11_INCLUDE = -I$(LOCALBASE)/include
X11_LIB = -lX11
#
# Location of MPI (Message Passing Interface) software
diff --git a/math/calctool/Makefile b/math/calctool/Makefile
index 5a7d86d90516..072c30586723 100644
--- a/math/calctool/Makefile
+++ b/math/calctool/Makefile
@@ -7,7 +7,7 @@
PORTNAME= calctool
PORTVERSION= 2.4.13
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= nsayer
@@ -27,7 +27,7 @@ MAN1= calctool.1
.include <bsd.port.pre.mk>
.if !defined(WITHOUT_X11)
-USE_XLIB= yes
+USE_XORG= x11
BINARIES+= xcalctool
PLIST_SUB+= X11=""
.else
@@ -57,7 +57,7 @@ FPIC= -fpic
post-patch:
@${REINPLACE_CMD} -e "s#%%FPIC%%#${FPIC}#g" \
- -e "s#%%X11BASE%%#${X11BASE}#g" \
+ -e "s#%%LOCALBASE%%#${LOCALBASE}#g" \
-e "s#%%BINARIES%%#${BINARIES}#g" \
-e "s#%%DATADIR%%#${DATADIR}#g" \
${WRKSRC}/Makefile
diff --git a/math/calctool/files/patch-ab b/math/calctool/files/patch-ab
index d7b779985d83..5c8e17fe46e6 100644
--- a/math/calctool/files/patch-ab
+++ b/math/calctool/files/patch-ab
@@ -34,16 +34,16 @@
#
-#X11INCDIR = -I$(OPENWINHOME)/include
-#X11LIBDIR = -L$(OPENWINHOME)/lib
-+X11INCDIR = -I%%X11BASE%%/include
-+X11LIBDIR = -L%%X11BASE%%/lib
++X11INCDIR = -I%%LOCALBASE%%/include
++X11LIBDIR = -L%%LOCALBASE%%/lib
#-------------------------------------------------------------------------
# If you are compiling the XView version, then the following two lines
# should be uncommented.
#
-XVIEWINCDIR = -I$(OPENWINHOME)/include
-XVIEWLIBDIR = -L$(OPENWINHOME)/lib
-+XVIEWINCDIR = -I%%X11BASE%%/include
-+XVIEWLIBDIR = -L%%X11BASE%%/lib
++XVIEWINCDIR = -I%%LOCALBASE%%/include
++XVIEWLIBDIR = -L%%LOCALBASE%%/lib
#
#=========================================================================
#
diff --git a/math/cgal/Makefile b/math/cgal/Makefile
index 510847e45abb..9e9020b68541 100644
--- a/math/cgal/Makefile
+++ b/math/cgal/Makefile
@@ -18,7 +18,7 @@ COMMENT= A computational geometry library
BUILD_DEPENDS= ${LOCALBASE}/include/boost/tuple/tuple.hpp:${PORTSDIR}/devel/boost
RUN_DEPENDS= ${LOCALBASE}/include/boost/tuple/tuple.hpp:${PORTSDIR}/devel/boost
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
SHLIB_VERSION= 0
HAS_CONFIGURE= yes
diff --git a/math/dislin/Makefile b/math/dislin/Makefile
index 75cb70342ccf..487ad75c7658 100644
--- a/math/dislin/Makefile
+++ b/math/dislin/Makefile
@@ -7,6 +7,7 @@
PORTNAME= dislin
PORTVERSION= 9.2
+PORTREVISION= 1
CATEGORIES= math
MASTER_SITES= ftp://ftp.gwdg.de/pub/grafik/dislin/unix/
DISTNAME= ${PORTNAME}-${PORTVERSION}.fbsd${BINVER}
@@ -18,7 +19,7 @@ LIB_DEPENDS= f2c.2:${PORTSDIR}/lang/f2c
RESTRICTED= free for non-commercial use.
ONLY_FOR_ARCHS= i386
-USE_XLIB= yes
+USE_XORG= x11
NO_BUILD= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/math/emc2/Makefile b/math/emc2/Makefile
index e806989712ce..5252a0f64f77 100644
--- a/math/emc2/Makefile
+++ b/math/emc2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= emc2
PORTVERSION= 2.15
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= math science
MASTER_SITES= http://www-c.inria.fr/gamma/cdrom/ftp/emc2/ \
http://www-rocq1.inria.fr/gamma/cdrom/ftp/emc2/
@@ -24,7 +24,7 @@ RESTRICTED= No resale, contact author for commercial usage
WRKSRC= ${WRKDIR}/${PORTNAME}
-USE_XLIB= yes
+USE_XORG= x11
USE_GMAKE= yes
ALL_TARGET= ${PORTNAME}
diff --git a/math/emc2/files/patch-Makefile b/math/emc2/files/patch-Makefile
index fd7cd9adc9e8..2dd8634f9b0b 100644
--- a/math/emc2/files/patch-Makefile
+++ b/math/emc2/files/patch-Makefile
@@ -8,8 +8,8 @@
-X11INCLUDEDIR=/usr/include/X11R6
-X11LIBDIR=/usr/lib/X11R6
+BIN=$(PREFIX)/bin
-+X11INCLUDEDIR=$(X11BASE)/include
-+X11LIBDIR=$(X11BASE)/lib
++X11INCLUDEDIR=$(LOCALBASE)/include
++X11LIBDIR=$(LOCALBASE)/lib
X11LIB= -L$(X11LIBDIR) -lX11
MATHLIB= -lm
diff --git a/math/femlab/Makefile b/math/femlab/Makefile
index 7f3090b46640..c8453c9eaa33 100644
--- a/math/femlab/Makefile
+++ b/math/femlab/Makefile
@@ -7,7 +7,7 @@
PORTNAME= femlab
PORTVERSION= 1.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= math science
# mastersite disappeared in April 2000
MASTER_SITES= # ftp://ftp.md.chalmers.se/pub/Femlab/
@@ -16,16 +16,16 @@ DISTFILES= femlab-2d-v${PORTVERSION}.tar.gz
MAINTAINER= ports@FreeBSD.org
COMMENT= Interactive program for solving partial differential equations in 2D
-BUILD_DEPENDS= ${X11BASE}/lib/libsx.a:${PORTSDIR}/x11/libsx \
- xmkmf:${X_IMAKE_PORT}
+BUILD_DEPENDS= ${LOCALBASE}/lib/libsx.a:${PORTSDIR}/x11/libsx \
+ imake:${PORTSDIR}/devel/imake
+USE_XORG= xaw
WANT_FORTRAN= yes #dummy but future use
BUILD_DEPENDS+= gfortran42:${PORTSDIR}/lang/gcc42
FC= gfortran42
F77= gfortran42
MAKE_ENV+= FC="${FC}" F77="${F77}" FFLAGS="${FFLAGS}"
-USE_X_PREFIX= yes
FEMLAB_HOME= ${PREFIX}/lib/X11/femlab
diff --git a/math/femlab/files/patch-aa b/math/femlab/files/patch-aa
index 589c3cc5e3c7..70c091be4b34 100644
--- a/math/femlab/files/patch-aa
+++ b/math/femlab/files/patch-aa
@@ -11,7 +11,7 @@
# Change next line to the location of the libsx library
#
-EXTRA_LOAD_FLAGS = -L/users/math/martenl/projects/lib
-+EXTRA_LOAD_FLAGS = -L$(X11BASE)
++EXTRA_LOAD_FLAGS = -L$(LOCALBASE)
LOCAL_LIBRARIES = -lfreq -lsx -lm XawClientLibs
DEPLIBS = XawClientDepLibs
diff --git a/math/fftw3/Makefile b/math/fftw3/Makefile
index a74071d83a30..7823e5e12634 100644
--- a/math/fftw3/Makefile
+++ b/math/fftw3/Makefile
@@ -24,7 +24,7 @@ FFTW3_SUFX=
GNU_CONFIGURE= yes
USE_GNOME= gnomehack gnometarget pkgconfig
USE_PERL5_BUILD=yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-shared --enable-threads
CONFIGURE_ENV= CPPLAGS="${PTHREAD_CFLAGS}" \
diff --git a/math/freefem++/Makefile b/math/freefem++/Makefile
index 5327388f5a51..1dcda777b06b 100644
--- a/math/freefem++/Makefile
+++ b/math/freefem++/Makefile
@@ -44,7 +44,7 @@ CONFIGURE_ARGS= --disable-download \
--with-umfpack="-lumfpack" \
--with-arpack="${ARPACK}"
CONFIGURE_ENV= CPPFLAGS="${MPICFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/suitesparse/include ${PTHREAD_CFLAGS}" \
- LDFLAGS="${MPILDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" \
+ LDFLAGS="${MPILDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
FC=${FC} F77=${F77} FCFLAGS=${FCFLAGS}
DOC_TARGET= freefem++doc.pdf
@@ -95,7 +95,7 @@ CONFIGURE_ARGS+= --without-mpi
pre-configure:
${REINPLACE_CMD} -e "s|-lpthread|${PTHREAD_LIBS}|g" \
- -e "s|/usr/X11R6|${X11BASE}|g" \
+ -e "s|/usr/X11R6|${LOCALBASE}|g" \
${WRKSRC}/${CONFIGURE_SCRIPT}
${REINPLACE_CMD} -e "s|mpicc|${LOCALBASE}/mpich2/bin/mpicxx|" \
${WRKSRC}/src/mpi/Makefile.in
diff --git a/math/freefem/Makefile b/math/freefem/Makefile
index 0d9fbe574121..d06d10bfce90 100644
--- a/math/freefem/Makefile
+++ b/math/freefem/Makefile
@@ -7,14 +7,14 @@
PORTNAME= freefem
PORTVERSION= 3.5.8
+PORTREVISION= 1
CATEGORIES= math science
MASTER_SITES= SF/kfem
MAINTAINER= ports@FreeBSD.org
COMMENT= A language for the Finite Element Method
-USE_XORG= ice sm x11
-USE_XLIB= yes
+USE_XORG= ice sm x11 xt
USE_GNOME= gnometarget
USE_AUTOTOOLS= libtool:15
USE_LDCONFIG= yes
diff --git a/math/freemat/Makefile b/math/freemat/Makefile
index 2ddc13b2e5b6..0ddd2ff438d3 100644
--- a/math/freemat/Makefile
+++ b/math/freemat/Makefile
@@ -35,7 +35,7 @@ QT_COMPONENTS= gui network opengl moc rcc uic xml svg
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --with-blas="${BLAS}" --without-llvm
-CPPFLAGS= ${CXXFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include ${AMDINC}
+CPPFLAGS= ${CXXFLAGS} -I${LOCALBASE}/include ${AMDINC}
CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
FC="${FC}" F77="${F77}" FFLAGS="${FFLAGS}"
diff --git a/math/fung-calc/Makefile b/math/fung-calc/Makefile
index 5097ec6d97b7..938fbf467638 100644
--- a/math/fung-calc/Makefile
+++ b/math/fung-calc/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut
USE_KDELIBS_VER=3
USE_GL= yes
USE_GMAKE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile
index 4bd7223231ff..9e82b9c4c533 100644
--- a/math/gcalctool/Makefile
+++ b/math/gcalctool/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gcalctool
PORTVERSION= 5.22.1
+PORTREVISION= 1
PORTEPOCH= 2
CATEGORIES= math gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
@@ -21,7 +22,6 @@ USE_BZIP2= yes
USE_BISON= build
INSTALLS_OMF= yes
USE_GETTEXT= yes
-USE_XLIB= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomeprefix gnomehack intlhack gconf2 gnomedocutils libglade2
diff --git a/math/geg/Makefile b/math/geg/Makefile
index 3b5cb73b46a3..565d4d804372 100644
--- a/math/geg/Makefile
+++ b/math/geg/Makefile
@@ -26,6 +26,6 @@ MAN1= geg.1
PLIST_FILES= bin/geg
pre-configure:
- @cd ${WRKSRC}; ${ACLOCAL} -I ${LOCALBASE}/share/aclocal -I ${X11BASE}/share/aclocal
+ @cd ${WRKSRC}; ${ACLOCAL} -I ${LOCALBASE}/share/aclocal
.include <bsd.port.mk>
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 0785e8642d3f..fa505b7b44a8 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -9,6 +9,7 @@
PORTNAME= gnumeric
PORTVERSION= 1.8.2
CATEGORIES= math gnome
+PORTREVISION= 1
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= gnome2
@@ -21,7 +22,6 @@ LIB_DEPENDS= goffice-0.6.6:${PORTSDIR}/devel/goffice \
USE_BZIP2= yes
USE_GETTEXT= yes
-USE_XLIB= yes
USE_PERL5= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix intlhack gnomehack gnomehier \
diff --git a/math/gnuplot+/Makefile b/math/gnuplot+/Makefile
index 2b6c3680eb3c..9c74b291411a 100644
--- a/math/gnuplot+/Makefile
+++ b/math/gnuplot+/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnuplot371+
PORTVERSION= 1.2.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= math japanese graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://www.yama-ga.com/gnuplot/:patch \
@@ -23,6 +23,7 @@ COMMENT= A command-driven interactive function plotting program
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
VFlib2.24:${PORTSDIR}/japanese/vflib
+USE_XORG= x11
USE_FREETYPE= yes
USE_GMAKE= yes
USE_AUTOTOOLS= autoconf:213
diff --git a/math/goblin/Makefile b/math/goblin/Makefile
index 3857c72f81ad..d7301ac1ff6c 100644
--- a/math/goblin/Makefile
+++ b/math/goblin/Makefile
@@ -8,7 +8,7 @@
PORTNAME= goblin
PORTVERSION= 2.6.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= misc
MASTER_SITES= http://www.math.uni-augsburg.de/~fremuth/goblin.docs/ \
${MASTER_SITE_LOCAL}
@@ -23,6 +23,7 @@ LIB_DEPENDS= tk83.1:${PORTSDIR}/x11-toolkits/tk83
CONFLICTS= ImageMagick-[0-9]* display-*
+USE_XORG= x11
USE_GMAKE= yes
USE_GCC= 3.2
MAKE_ARGS= CC="${CC}" CCFLAGS="${CFLAGS}" \
@@ -32,9 +33,9 @@ MAKE_ARGS= CC="${CC}" CCFLAGS="${CFLAGS}" \
ALL_TARGET= all goblin.a glpk.a
PLIST_SUB+= VERSION=${PORTVERSION:R}
-CFLAGS+= -I${LOCALBASE}/include/tcl8.3 -I${LOCALBASE}/include/tk8.3 \
- -I${X11BASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}
+CFLAGS+= -I${LOCALBASE}/include/tcl8.3 -I${LOCALBASE}/include/ \
+ ${PTHREAD_CFLAGS}
+LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
WISH= ${LOCALBASE}/bin/wish8.3
diff --git a/math/grace/Makefile b/math/grace/Makefile
index 23f026e13757..e484c889f530 100644
--- a/math/grace/Makefile
+++ b/math/grace/Makefile
@@ -36,7 +36,7 @@ USE_GMAKE= YES
USE_MOTIF= YES
GNU_CONFIGURE= YES
CONFIGURE_ARGS= \
- --with-extra-incpath=${X11BASE}/include/X11:${LOCALBASE}/include \
+ --with-extra-incpath=${LOCALBASE}/include/X11:${LOCALBASE}/include \
--with-extra-ldpath=${LOCALBASE}/lib --without-bundled_xbae \
--enable-grace-home=${DATADIR}
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/math/grpn/Makefile b/math/grpn/Makefile
index 85d6535a503f..1ef82445089c 100644
--- a/math/grpn/Makefile
+++ b/math/grpn/Makefile
@@ -7,14 +7,13 @@
PORTNAME= grpn
PORTVERSION= 1.1.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= math
MASTER_SITES= http://lashwhip.com/grpn/
MAINTAINER= ports@FreeBSD.org
COMMENT= GTK+-based reverse polish notation (RPN) calculator
-USE_X_PREFIX= yes
USE_GNOME= gtk12
ALL_TARGET=
diff --git a/math/grpn/files/patch-aa b/math/grpn/files/patch-aa
index 443851e9a51d..4c2a2a4836e0 100644
--- a/math/grpn/files/patch-aa
+++ b/math/grpn/files/patch-aa
@@ -14,10 +14,10 @@
-CFLAGS = -g -O2 -I/usr/X11/include `$(GTK_DIR)gtk-config --cflags` -DGTK_VER_1_1
-+CFLAGS+= -I${X11BASE}/include -I${PREFIX}/include `${GTK_CONFIG} --cflags` -DGTK_VER_1_1
++CFLAGS+= -I${LOCALBASE}/include -I${PREFIX}/include `${GTK_CONFIG} --cflags` -DGTK_VER_1_1
-DFLAGS = -L/usr/X11/lib
-+DFLAGS = -L${X11BASE}/lib -L${PREFIX}/lib
++DFLAGS = -L${LOCALBASE}/lib -L${PREFIX}/lib
# end of user configurable section
diff --git a/math/kaskade/Makefile b/math/kaskade/Makefile
index eccf795d8240..3f1deb77700e 100644
--- a/math/kaskade/Makefile
+++ b/math/kaskade/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kaskade
PORTVERSION= 3.2.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= math science
MASTER_SITES= ftp://ftp.zib.de/pub/kaskade/3.x/
DISTNAME= ${PORTVERSION}
@@ -19,7 +19,7 @@ USE_FORTRAN= yes
FORTRANLIBS= -lgfortranbegin -lgfortran
GCCLIBDIR= -L`${CAT} ${WRKSRC}/LIBDIR` -L`${CAT} ${WRKSRC}/LIBDIR`/../../..
-USE_X_PREFIX= yes
+USE_XORG= x11
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/math/ldouble/Makefile b/math/ldouble/Makefile
index 5d86eba5fcff..a5824dc461b2 100644
--- a/math/ldouble/Makefile
+++ b/math/ldouble/Makefile
@@ -19,7 +19,7 @@ COMMENT= Long double math precision functions
NO_WRKSUBDIR= yes
MAKEFILE= makefile
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
ONLY_FOR_ARCHS= i386 sparc64
PLIST_FILES= lib/libml.a \
diff --git a/math/lensnns/files/patch-Makefile b/math/lensnns/files/patch-Makefile
index fada5cea3cda..c7b208b710d8 100644
--- a/math/lensnns/files/patch-Makefile
+++ b/math/lensnns/files/patch-Makefile
@@ -5,7 +5,7 @@
#MACHINE = INTEL
MAKE = /usr/bin/make
-SYSLIB = -export-dynamic -ldl -L/usr/X11R6/lib
-+SYSLIB = -export-dynamic -ldl -L${X11BASE}/lib
++SYSLIB = -export-dynamic -ldl -L${LOCALBASE}/lib
# Windows 95/98/NT using Cygwin:
ifeq ($(HOSTTYPE),i686)
diff --git a/math/lensnns/files/patch-Src-Makefile b/math/lensnns/files/patch-Src-Makefile
index 695a2feedcb8..a0319e632dc9 100644
--- a/math/lensnns/files/patch-Src-Makefile
+++ b/math/lensnns/files/patch-Src-Makefile
@@ -9,8 +9,8 @@
+ TCLVER= 8.3
+ TCLDIR= /usr/local/include
+ BINDIR= $(TOP)/Bin/$(HOSTTYPE)
-+ INCL= -I$(TCLDIR)/tcl$(TCLVER)/generic -I$(TCLDIR)/tk$(TCLVER)/generic -I${X11BASE}/include
-+ LIBS= -L$(BINDIR) -L/usr/local/lib -L${X11BASE}/lib -ltk83 -ltcl83 -lm -lX11 $(SYSLIB)
++ INCL= -I$(TCLDIR)/tcl$(TCLVER)/generic -I$(TCLDIR)/tk$(TCLVER)/generic -I${LOCALBASE}/include
++ LIBS= -L$(BINDIR) -L/usr/local/lib -L${LOCALBASE}/lib -ltk83 -ltcl83 -lm -lX11 $(SYSLIB)
+else
O= ../Obj/$(HOSTTYPE)
TCLVER= 8.3.4
diff --git a/math/libmath++/Makefile b/math/libmath++/Makefile
index cc43e90615ef..54d76377c2f7 100644
--- a/math/libmath++/Makefile
+++ b/math/libmath++/Makefile
@@ -17,6 +17,6 @@ USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
USE_AUTOTOOLS= libtool:15
GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
.include <bsd.port.mk>
diff --git a/math/linux-relview/Makefile b/math/linux-relview/Makefile
index 9e085dc287b8..d2f7985ab96e 100644
--- a/math/linux-relview/Makefile
+++ b/math/linux-relview/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux
ONLY_FOR_ARCHS= i386
USE_LINUX= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
NO_WRKSUBDIR= yes
EXTRACT_AFTER_ARGS= > ${DISTNAME}
diff --git a/math/lp_solve/Makefile b/math/lp_solve/Makefile
index 277b376a1191..837c9f895a47 100644
--- a/math/lp_solve/Makefile
+++ b/math/lp_solve/Makefile
@@ -17,7 +17,7 @@ COMMENT= Linear Programming Solver
PORTMAJOR_VER= 5.5
WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTMAJOR_VER}
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
.if ${MACHINE_ARCH} == "sparc64"
PICFLAG?= -fPIC
diff --git a/math/matrix/Makefile b/math/matrix/Makefile
index 62ccd7bc37b3..877b99b21ddf 100644
--- a/math/matrix/Makefile
+++ b/math/matrix/Makefile
@@ -17,7 +17,7 @@ COMMENT= C++ library to manipulate matrices and vectors
WRKSRC= ${WRKDIR}/matrix
USE_ZIP= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
PLIST_SUB= LIBVERSION=1
.include <bsd.port.pre.mk>
diff --git a/math/maxima/Makefile b/math/maxima/Makefile
index b30fc544b23b..425aa3ac8c2a 100644
--- a/math/maxima/Makefile
+++ b/math/maxima/Makefile
@@ -7,9 +7,9 @@
PORTNAME= maxima
PORTVERSION= 5.14.0
+PORTREVISION= 1
CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= sf@slappy.org
COMMENT= Symbolic mathematics program
@@ -20,7 +20,6 @@ RUN_DEPENDS= ${LOCALBASE}/bin/${LISPPORT} \
${LOCALBASE}/bin/gnuplot:${PORTSDIR}/math/gnuplot \
${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
-USE_XLIB= yes
USE_GMAKE= yes
USE_AUTOTOOLS= automake:19 autoconf:261
CONFIGURE_ARGS+= --prefix=${PREFIX} \
diff --git a/math/mbasecalc/Makefile b/math/mbasecalc/Makefile
index 9979c57d4ee4..51da41129fc8 100644
--- a/math/mbasecalc/Makefile
+++ b/math/mbasecalc/Makefile
@@ -17,8 +17,8 @@ COMMENT= Simple calculator program inspired by basecalc
LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk
-MAKE_ARGS= INCLUDES="-I${X11BASE}/include -I." \
- LIBS="-L${X11BASE}/lib -lfltk -lX11"
+MAKE_ARGS= INCLUDES="-I${LOCALBASE}/include -I." \
+ LIBS="-L${LOCALBASE}/lib -lfltk -lX11"
PLIST_FILES= bin/mbasecalc
diff --git a/math/ngraph/files/patch-aa b/math/ngraph/files/patch-aa
index 7287ee407600..4361c08c1e31 100644
--- a/math/ngraph/files/patch-aa
+++ b/math/ngraph/files/patch-aa
@@ -65,9 +65,9 @@
+STRIP = strip
+DEFS = -DJAPANESE
+PLATFORM = '"for X11 [FreeBSD+Motif2.1]"'
-+X11INCLUDE = -I${X11BASE}/include -I/usr/dt/include
++X11INCLUDE = -I${LOCALBASE}/include -I/usr/dt/include
+STATICLINK =
-+X11LIB = ${MOTIFLIB} -lm -L${X11BASE}/lib -lXext -lXt -lXp -lX11 -lICE -lSM
++X11LIB = ${MOTIFLIB} -lm -L${LOCALBASE}/lib -lXext -lXt -lXp -lX11 -lICE -lSM
#
###############################################################################
diff --git a/math/octave-forge/Makefile b/math/octave-forge/Makefile
index d0dfaac79fa8..1dbaa224fcea 100644
--- a/math/octave-forge/Makefile
+++ b/math/octave-forge/Makefile
@@ -9,8 +9,7 @@ PORTNAME= octave-forge
PORTVERSION= 2006.03.17
PORTREVISION= 2
CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= octave
+MASTER_SITES= SF/octave
MAINTAINER= maho@FreeBSD.org
COMMENT= Many additional features to math/octave
@@ -29,9 +28,7 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
ALL_TARGET= # empty
CONFIGURE_ARGS= --with-cc=${CC} \
- --with-cxx=${CXX} \
- --x-libraries=${X11BASE}/lib \
- --x-includes=${X11BASE}/include
+ --with-cxx=${CXX}
USE_FORTRAN= yes
diff --git a/math/oleo/Makefile b/math/oleo/Makefile
index 5cb73200f7bb..8f7da879dcd6 100644
--- a/math/oleo/Makefile
+++ b/math/oleo/Makefile
@@ -18,8 +18,8 @@ COMMENT= The GNU spreadsheet for X11 and terminals
USE_PERL5_BUILD= yes
USE_BISON= build
USE_AUTOTOOLS= autoconf:213
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
- LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LIBS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --with-x --without-xlt --without-SciPlot
INFO= oleo
diff --git a/math/petsc/Makefile b/math/petsc/Makefile
index 28e3c93dab52..012e9326d47e 100644
--- a/math/petsc/Makefile
+++ b/math/petsc/Makefile
@@ -7,6 +7,7 @@
PORTNAME= petsc
DISTVERSION= 2.3.3-p0
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= math parallel
MASTER_SITES= ftp://ftp.mcs.anl.gov/pub/petsc/release-snapshots/
@@ -38,9 +39,9 @@ SUB_LIST= PETSC_ARCH=${TARGET} PETSC_DIR=${PREFIX}/${PFX}
PKGMESSAGE= ${WRKDIR}/pkg-message
.if !defined(WITHOUT_X11)
-USE_XLIB= yes
-CONFIGURE_ARGS+= --with-x-include=${X11BASE}/include \
- --with-x-lib=${X11BASE}/lib/libX11.so
+USE_XORG= x11
+CONFIGURE_ARGS+= --with-x-include=${LOCALBASE}/include \
+ --with-x-lib=${LOCALBASE}/lib/libX11.so
.endif
USE_FORTRAN= yes
diff --git a/math/plplot/Makefile b/math/plplot/Makefile
index 593b59a1404e..ea89ead65797 100644
--- a/math/plplot/Makefile
+++ b/math/plplot/Makefile
@@ -7,10 +7,9 @@
PORTNAME= plplot
PORTVERSION= 5.6.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A scientific plotting package
@@ -45,7 +44,7 @@ PKGNAMESUFFIX= -nox11
CONFIGURE_ARGS+= --without-x
PLIST_SUB+= X11="@comment "
.else
-USE_XLIB= yes
+USE_XORG= x11
LIB_DEPENDS+= LASi.0:${PORTSDIR}/devel/lasi
PLIST_SUB+= X11=""
.endif
diff --git a/math/py-matplotlib/Makefile b/math/py-matplotlib/Makefile
index fd39a67214c6..49bdd7a02f00 100644
--- a/math/py-matplotlib/Makefile
+++ b/math/py-matplotlib/Makefile
@@ -10,8 +10,7 @@ PORTNAME= matplotlib
PORTVERSION= 0.90.0
PORTREVISION= 1
CATEGORIES= math python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= mainland@apeiron.net
@@ -35,7 +34,7 @@ USE_PYDISTUTILS= yes
USE_GNOME= gtk20 pygtk2
USE_TCL_RUN= yes
USE_TK_RUN= yes
-CFLAGS+= -I${X11BASE}/include
+CFLAGS+= -I${LOCALBASE}/include
EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME}
diff --git a/math/qscanplot/Makefile b/math/qscanplot/Makefile
index 01ac5d7a7617..d1ba41be4f3c 100644
--- a/math/qscanplot/Makefile
+++ b/math/qscanplot/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qscanplot
PORTVERSION= 0.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= math
# per distfile survey, mastersite disappeared in March 2003
MASTER_SITES= # http://www.gae.ucm.es/~gonzalez/qscanplot/
@@ -17,7 +17,7 @@ COMMENT= A program to extract data from scanned plots, graphs and figures
BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake
-USE_X_PREFIX= yes
+USE_XORG= x11 xext xinerama
USE_QT_VER= 3
USE_PERL5_BUILD=yes
USE_GMAKE= yes
diff --git a/math/reed-solomon/Makefile b/math/reed-solomon/Makefile
index 8a7ba130acef..a6d16f0d9f6a 100644
--- a/math/reed-solomon/Makefile
+++ b/math/reed-solomon/Makefile
@@ -15,7 +15,7 @@ COMMENT= A Reed-Solomon CODEC library
GNU_CONFIGURE= yes
USE_GMAKE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
MAKEFILE= makefile
MAN3= rs.3
diff --git a/math/scigraphica/Makefile b/math/scigraphica/Makefile
index 9d8c69aad7cf..90a7ca5e9632 100644
--- a/math/scigraphica/Makefile
+++ b/math/scigraphica/Makefile
@@ -7,10 +7,10 @@
PORTNAME= scigraphica
PORTVERSION= 0.8.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= math gnome
MASTER_SITES= http://scigraphica.sourceforge.net/src/ \
- ${MASTER_SITE_SOURCEFORGE} \
+ SF \
http://magnet.fsu.edu/~feiguin/scigraphica/src/
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -22,7 +22,6 @@ LIB_DEPENDS= gtkextra.17:${PORTSDIR}/x11-toolkits/gtkextra
RUN_DEPENDS= ${PYNUMERIC} \
${PYTHON_SITELIBDIR}/gtk-1.2/_gtkmodule.so:${PORTSDIR}/x11-toolkits/py-gtk
-USE_X_PREFIX= yes
USE_PERL5_BUILD=yes
USE_GMAKE= yes
USE_GNOME= yes
diff --git a/math/scilab/Makefile b/math/scilab/Makefile
index 9f6b1523236c..525ba223036e 100644
--- a/math/scilab/Makefile
+++ b/math/scilab/Makefile
@@ -7,7 +7,7 @@
PORTNAME= scilab
PORTVERSION= 4.1.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= math cad parallel
MASTER_SITES= http://www.scilab.org/download/${PORTVERSION}/
EXTRACT_SUFX= -src.tar.gz
@@ -20,6 +20,7 @@ BUILD_DEPENDS= wish8.4:${PORTSDIR}/x11-toolkits/tk84 \
xsltproc:${PORTSDIR}/textproc/libxslt
RUN_DEPENDS+= wish8.4:${PORTSDIR}/x11-toolkits/tk84
+USE_XORG= x11
GNU_CONFIGURE= yes
USE_GETTEXT= yes
WANT_GNOME= yes
@@ -31,12 +32,10 @@ CONFIGURE_ARGS= --with-tk \
--with-tcl-library=${LOCALBASE}/lib \
--with-tcl-include=${LOCALBASE}/include/tcl8.4 \
--with-xaw3d \
- --x-include=${X11BASE}/include \
- --x-libraries=${X11BASE}/lib \
--without-java \
--without-ocaml
-CONFIGURE_ENV+= X11BASE=${X11BASE} F77=${F77} FFLAGS="${FFLAGS}"
+CONFIGURE_ENV+= F77=${F77} FFLAGS="${FFLAGS}"
OPTIONS= GTK2 "Use Gtk+2 interface" off \
PVM "Use PVM" off
diff --git a/math/snns/Makefile b/math/snns/Makefile
index a34fd691320e..f7e2e64d8f8e 100644
--- a/math/snns/Makefile
+++ b/math/snns/Makefile
@@ -7,7 +7,7 @@
PORTNAME= snns
PORTVERSION= 4.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math
MASTER_SITES= http://www-ra.informatik.uni-tuebingen.de/downloads/SNNS/ \
ftp://ftp.informatik.uni-stuttgart.de/pub/SNNS/
@@ -17,10 +17,9 @@ DISTNAME= SNNSv${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Fully featured neural network simulator
-USE_XLIB= yes
+USE_XORG= x11 xaw xt
HAS_CONFIGURE= yes
-CONFIGURE_ARGS= --prefix=${PREFIX}/snns --enable-global \
- --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include
+CONFIGURE_ARGS= --prefix=${PREFIX}/snns --enable-global
post-configure:
@(${SED} -e "s#%prefix%#${PREFIX}#g" < ${FILESDIR}/snns > ${WRKSRC}/snns)
diff --git a/math/surf/Makefile b/math/surf/Makefile
index 269b8826579d..f727f12394c0 100644
--- a/math/surf/Makefile
+++ b/math/surf/Makefile
@@ -8,11 +8,11 @@
PORTNAME= surf
PORTVERSION= 1.0.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
+USE_XORG= x11 xmu
MAINTAINER= ports@FreeBSD.org
COMMENT= Visualize some real algebraic geometry
diff --git a/math/topaz/Makefile b/math/topaz/Makefile
index daa99ffcabe0..e13b8fe1c85c 100644
--- a/math/topaz/Makefile
+++ b/math/topaz/Makefile
@@ -7,7 +7,7 @@
PORTNAME= topaz
PORTVERSION= 3.40
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math
MASTER_SITES= http://hp.vector.co.jp/authors/VA007663/topaz/bin/
DISTNAME= ${PORTNAME}-${PORTVERSION:S/./_/}-src
@@ -17,7 +17,7 @@ COMMENT= A command driven graph plotting system for scientists and engineers
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_XLIB= yes
+USE_XORG= x11
MAKEFILE= Makefile.freebsd
post-install:
diff --git a/math/topaz/files/patch-aa b/math/topaz/files/patch-aa
index 22c9908eec2e..d80194621d21 100644
--- a/math/topaz/files/patch-aa
+++ b/math/topaz/files/patch-aa
@@ -13,11 +13,11 @@
# for FreeBSD
-CFLAGS= -I/usr/local/include -I/usr/local/include/ncurses -I/usr/X11R6/include -O2 -Wall -DTOPAZLINUX -DTOPAZ_NCURSES -DTOPAZ_EUC
-TOPAZLIB= -L/usr/local/lib -lm -lncurses -lgnugetopt -lreadline -lhistory
-+CXXFLAGS+= -I${LOCALBASE}/include/ncurses -I${X11BASE}/include -DTOPAZLINUX -DTOPAZ_NCURSES -DTOPAZ_EUC
++CXXFLAGS+= -I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include -DTOPAZLINUX -DTOPAZ_NCURSES -DTOPAZ_EUC
+TOPAZLIB= -lm -lncurses -lreadline -lhistory
PSLIB= -lm
-VIEWLIB= -lm -L/usr/X11R6/lib -lX11
-+VIEWLIB= -lm -L${X11BASE}/lib -lX11
++VIEWLIB= -lm -L${LOCALBASE}/lib -lX11
# obj
OBJ=topaz.o plobj.o graph.o axis.o frame.o frame2.o valbuff.o script.o funcs.o\
diff --git a/math/triangle/Makefile b/math/triangle/Makefile
index b02cee8cd8b0..269ecd6a2ade 100644
--- a/math/triangle/Makefile
+++ b/math/triangle/Makefile
@@ -7,7 +7,7 @@
PORTNAME= triangle
PORTVERSION= 1.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math
MASTER_SITES= http://cm.bell-labs.com/netlib/voronoi/
DISTNAME= ${PORTNAME}
@@ -20,7 +20,7 @@ NO_CDROM= "Triangle must not be sold for profit"
NO_WRKSUBDIR= yes
USE_ZIP= yes
-USE_XLIB= yes
+USE_XORG= x11
MAKEFILE= makefile
PLIST_FILES= bin/triangle bin/showme
diff --git a/math/triangle/files/patch-makefile b/math/triangle/files/patch-makefile
index abd4ddd335d2..c20ae2a85670 100644
--- a/math/triangle/files/patch-makefile
+++ b/math/triangle/files/patch-makefile
@@ -14,7 +14,7 @@
# CSWITCHES = -O -DNO_TIMER -DLINUX -I/usr/X11R6/include -L/usr/X11R6/lib
-CSWITCHES = -O -DLINUX -I/usr/X11R6/include -L/usr/X11R6/lib
-+CSWITCHES = ${CFLAGS} -I${X11BASE}/include -L${X11BASE}/lib
++CSWITCHES = ${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib
# TRILIBDEFS is a list of definitions used to compile an object code version
# of Triangle (triangle.o) to be called by another program. The file
diff --git a/math/ump/Makefile b/math/ump/Makefile
index 60c147c11f2d..b6019971cc28 100644
--- a/math/ump/Makefile
+++ b/math/ump/Makefile
@@ -7,10 +7,9 @@
PORTNAME= ump
PORTVERSION= 0.8.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= u-m-p
+MASTER_SITES= SF/u-m-p
MAINTAINER= nivit@FreeBSD.org
COMMENT= A graphical, easy to use math program
@@ -21,14 +20,12 @@ LATEST_LINK= math-ump
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gtk20
-USE_GL= yes
-USE_X_PREFIX= yes
+USE_GL= glu
ALL_TARGET= ${PORTNAME}
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-MAKE_ENV+= CXX="${CXX}" CC="${CC}" DATADIR="${DATADIR}" \
- X11BASE="${X11BASE}"
+MAKE_ENV+= CXX="${CXX}" CC="${CC}" DATADIR="${DATADIR}"
FIND_DIRS= -type d
FIND_DATA= -type f
diff --git a/math/ump/files/patch-Makefile b/math/ump/files/patch-Makefile
index 7bda4aeff1fd..8ebe30a21800 100644
--- a/math/ump/files/patch-Makefile
+++ b/math/ump/files/patch-Makefile
@@ -20,7 +20,7 @@
FLAGS += -DPLOT_3D
## You might have to change this path
-GL_LIB = -lGL -lGLU -L/usr/X11/lib
-+GL_LIB = -lGL -lGLU -L$(X11BASE)/lib
++GL_LIB = -lGL -lGLU -L$(LOCALBASE)/lib
## The next path will be required on some Mac-systems to compile
##FLAGS += -I/usr/X11/include/GL
@@ -42,7 +42,7 @@
+FLAGS += -DDONT_HAVE_LOG2
+## X11 includes
-+FLAGS += -I$(X11BASE)/include
++FLAGS += -I$(LOCALBASE)/include
## If you'd like to compile with debuging info avaliable
##FLAGS += -ggdb
diff --git a/math/vtk/Makefile b/math/vtk/Makefile
index e7ec8ecbb6c5..785e5a027e6c 100644
--- a/math/vtk/Makefile
+++ b/math/vtk/Makefile
@@ -56,7 +56,7 @@ BUILD_DEPENDS+= ${VTKDATAROOT}/VTKData.readme:${PORTSDIR}/math/vtk-data
USE_GMAKE= yes
USE_GL= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
CMAKE?= ${LOCALBASE}/bin/cmake
CXXFLAGS+= -Wno-deprecated
diff --git a/math/wingz/Makefile b/math/wingz/Makefile
index 9355b4379f39..87501eb9460b 100644
--- a/math/wingz/Makefile
+++ b/math/wingz/Makefile
@@ -18,7 +18,7 @@ COMMENT= A Commercial Spreadsheet
ONLY_FOR_ARCHS= i386
USE_LINUX= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
NO_WRKSUBDIR= yes
diff --git a/math/wingz3/Makefile b/math/wingz3/Makefile
index 83ab6bd6144c..f0903da1ca8b 100644
--- a/math/wingz3/Makefile
+++ b/math/wingz3/Makefile
@@ -20,17 +20,17 @@ NO_PACKAGE= "nothing to build. commercial software"
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
NO_BUILD= yes
# XXX: this is missing "${BRANDELF} -t Linux <executables>"
do-install:
- ${TAR} -xzp -C ${X11BASE} -f ${DISTDIR}/${DISTFILES}
- ${SED} 's%_X11BASE_%${X11BASE}%' \
+ ${TAR} -xzp -C ${LOCALBASE} -f ${DISTDIR}/${DISTFILES}
+ ${SED} 's%_LOCALBASE_%${LOCALBASE}%' \
< ${FILESDIR}/Wingz3 \
- > ${X11BASE}/bin/Wingz3
- ${CHMOD} 755 ${X11BASE}/bin/Wingz3
+ > ${LOCALBASE}/bin/Wingz3
+ ${CHMOD} 755 ${LOCALBASE}/bin/Wingz3
.include <bsd.port.mk>
diff --git a/math/wmcalc/Makefile b/math/wmcalc/Makefile
index bdd780a1e6dd..4548fd7e1cb7 100644
--- a/math/wmcalc/Makefile
+++ b/math/wmcalc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wmcalc
PORTVERSION= 0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math windowmaker
MASTER_SITES= http://members.cox.net/ehf_dockapps/wmcalc/ \
${MASTER_SITE_LOCAL}
@@ -18,8 +18,7 @@ COMMENT= Simple dockable calculator
ALL_TARGET= clean wmcalc
PLIST_FILES= bin/wmcalc
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/wmcalc ${PREFIX}/bin
diff --git a/math/wmcalc/files/patch-aa b/math/wmcalc/files/patch-aa
index 81c8b6c074ae..115d5bd45601 100644
--- a/math/wmcalc/files/patch-aa
+++ b/math/wmcalc/files/patch-aa
@@ -3,8 +3,8 @@
@@ -1,15 +1,15 @@
-INCLUDES =-I/usr/X11R6/include/X11 -I/usr/local/include -I/usr/include/X11R6/X11
-LIBINC =-L/usr/X11R6/lib -L/usr/include/lib
-+INCLUDES =-I${X11BASE}/include -I${X11BASE}/include/X11
-+LIBINC =-L${X11BASE}/lib
++INCLUDES =-I${LOCALBASE}/include -I${LOCALBASE}/include/X11
++LIBINC =-L${LOCALBASE}/lib
LIBS = -lX11 -lXpm -lXext -lm
TARGET = wmcalc
diff --git a/math/xgfe/Makefile b/math/xgfe/Makefile
index 3d059a3d727d..74976a48d6be 100644
--- a/math/xgfe/Makefile
+++ b/math/xgfe/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xgfe
PORTVERSION= 2.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_TEX_CTAN}
MASTER_SITE_SUBDIR= graphics/gnuplot/contrib
@@ -18,7 +18,6 @@ COMMENT= An X11 front-end for Gnuplot
RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot
USE_QT_VER= 3
-USE_X_PREFIX= yes
MAKE_ENV+= DOCSDIR=$(DOCSDIR) PTHREAD_CFLAGS="$(PTHREAD_CFLAGS)" \
PTHREAD_LIBS="$(PTHREAD_LIBS)" QT_PREFIX="${QT_PREFIX}"
diff --git a/math/xgfe/files/patch-aa b/math/xgfe/files/patch-aa
index 41d270410049..fa5c9eabf804 100644
--- a/math/xgfe/files/patch-aa
+++ b/math/xgfe/files/patch-aa
@@ -11,12 +11,12 @@
+#CC = gcc
+CXXFLAGS += ${PTHREAD_CFLAGS}
+QTDIR = $(QT_PREFIX)
-+INCPATH = -I$(X11BASE)/include
++INCPATH = -I$(LOCALBASE)/include
+LINK = $(CXX)
LFLAGS =
-LIBS = -L$(QTDIR)/lib -lqt -L/usr/X11R6/lib -lX11
-MOC = moc
-+LIBS = -L$(X11BASE)/lib -lqt-mt -lX11 ${PTHREAD_LIBS}
++LIBS = -L$(LOCALBASE)/lib -lqt-mt -lX11 ${PTHREAD_LIBS}
+MOC = ${QTDIR}/bin/moc
####### Files
diff --git a/math/xgobi/Makefile b/math/xgobi/Makefile
index 6aa3456a6bec..42431c07e60a 100644
--- a/math/xgobi/Makefile
+++ b/math/xgobi/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xgobi
PORTVERSION= 2002.06.20
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math graphics
MASTER_SITES= http://public.research.att.com/~stat/xgobi/
DISTNAME= xgobi
@@ -23,8 +23,7 @@ CONFIGURE_WRKSRC= ${PATCH_WRKSRC}
BUILD_WRKSRC= ${PATCH_WRKSRC}
USE_IMAKE= true
-USE_XPM= yes
-USE_XORG= xbitmaps
+USE_XORG= xbitmaps xpm
XFREE86_HTML_MAN= no
MANCOMPRESSED= no
diff --git a/math/xldlas/Makefile b/math/xldlas/Makefile
index 119c5bfbf179..04090b5967f2 100644
--- a/math/xldlas/Makefile
+++ b/math/xldlas/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xldlas
PORTVERSION= 0.85
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= apps/graphics/visualization
@@ -20,8 +20,6 @@ LIB_DEPENDS= forms.1:${PORTSDIR}/x11-toolkits/xforms
WRKSRC= ${WRKDIR}/xldlas
-USE_X_PREFIX= yes
-
MAN1= xldlas.1
do-install:
diff --git a/math/xldlas/files/patch-aa b/math/xldlas/files/patch-aa
index a8cc4e74a7cf..6dacb936d663 100644
--- a/math/xldlas/files/patch-aa
+++ b/math/xldlas/files/patch-aa
@@ -9,14 +9,14 @@
-COMMONLIBS = -L/usr/X11R6/lib/ -lX11 -lm
-SHAREDLIBS = -lforms
-STATICLIBS = -lXpm /usr/X11R6/lib/libforms.a
-+.if exists(${X11BASE}/include/X11/forms.h)
-+XFORMSINC = -I${X11BASE}/include/X11
++.if exists(${LOCALBASE}/include/X11/forms.h)
++XFORMSINC = -I${LOCALBASE}/include/X11
+.endif
-+CCFLAG = $(CFLAGS) -DXFORMS86 -DPREFIX=\"$(PREFIX)\" -I$(X11BASE)/include ${XFORMSINC}
++CCFLAG = $(CFLAGS) -DXFORMS86 -DPREFIX=\"$(PREFIX)\" -I$(LOCALBASE)/include ${XFORMSINC}
+#CC = gcc
-+COMMONLIBS = -L$(X11BASE)/lib/ -lX11 -lm
++COMMONLIBS = -L$(LOCALBASE)/lib/ -lX11 -lm
+SHAREDLIBS = -lforms -lXpm
-+STATICLIBS = $(X11BASE)/lib/libxforms.a -lXpm
++STATICLIBS = $(LOCALBASE)/lib/libxforms.a -lXpm
ECHO = echo
RM = rm
RMOPTS = -f
diff --git a/math/xlispstat/Makefile b/math/xlispstat/Makefile
index fa73408fe558..48845653b0f9 100644
--- a/math/xlispstat/Makefile
+++ b/math/xlispstat/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xlispstat
PORTVERSION= 3.52.20
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math lang lisp
MASTER_SITES= ftp://ftp.stat.umn.edu/pub/xlispstat/current/ \
http://lib.stat.cmu.edu/xlispstat/Src/current/ \
@@ -19,9 +19,9 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/./-/g}
MAINTAINER= ports@FreeBSD.org
COMMENT= A statistics/X11 based lisp interpreter
-USE_XLIB= yes
GNU_CONFIGURE= yes
ALL_TARGET= ${PORTNAME}
+USE_XORG= x11
post-patch:
@${REINPLACE_CMD} '/^static double fmax/d' ${WRKSRC}/lowess.c
diff --git a/math/xppaut/Makefile b/math/xppaut/Makefile
index 6756fffb1db1..0603bfd82ff0 100644
--- a/math/xppaut/Makefile
+++ b/math/xppaut/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xppaut
PORTVERSION= 5.96
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math graphics
MASTER_SITES= http://www.math.pitt.edu/~bard/bardware/
DISTNAME= ${PORTNAME}${PORTVERSION}
@@ -16,8 +16,7 @@ MAINTAINER= stephen@math.missouri.edu
COMMENT= Graphical tool for solving differential equations, etc
MAN1= xppaut.1
-USE_X_PREFIX= yes
-USE_XORG= xbitmaps
+USE_XORG= xbitmaps x11 xproto
MAKE_ARGS= CC="${CC}"
WRKSRC= ${WRKDIR}
diff --git a/math/xppaut/files/patch-Makefile b/math/xppaut/files/patch-Makefile
index 9493e113c9fe..b3ca7e041938 100644
--- a/math/xppaut/files/patch-Makefile
+++ b/math/xppaut/files/patch-Makefile
@@ -17,11 +17,11 @@
# Standard Linux distributions #
##################################
-CFLAGS= -g -O -DAUTO -DCVODE_YES -DHAVEDLL -DMYSTR=$(VERSION) -I/usr/X11R6/include
-+CFLAGS= -DAUTO -DCVODE_YES -DHAVEDLL -DMYSTR=$(VERSION) -I$(X11BASE)/include
++CFLAGS= -DAUTO -DCVODE_YES -DHAVEDLL -DMYSTR=$(VERSION) -I$(LOCALBASE)/include
#CFLAGS= -g -O -DAUTO -DCVODE_YES -DHAVEDLL -DMYSTR=$(VERSION) -I/usr/X11R6/include
-LDFLAGS= -L/usr/X11R6/lib
-LIBS= -lX11 -lm -ldl
-+LDFLAGS= -L$(X11BASE)/lib
++LDFLAGS= -L$(LOCALBASE)/lib
+LIBS= -lX11 -lm
# NOTE: Recent (RedHat 8) versions of GCC seem to no longer have
# the integer errno, so compile with the -DNOERRNO option as well
diff --git a/math/xspread/Makefile b/math/xspread/Makefile
index 1bb0f2fc9e78..2461dd361ba3 100644
--- a/math/xspread/Makefile
+++ b/math/xspread/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xspread
PORTVERSION= 3.1.1c
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math
MASTER_SITES= # disappeared
DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
@@ -17,10 +17,9 @@ COMMENT= A spreadsheet program for X and terminals
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}.orig
-USE_XLIB= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \
- LIBS="-L${X11BASE}/lib"
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LIBS="-L${LOCALBASE}/lib"
MAN1= xspread.1 pxspread.1
diff --git a/math/yacas/Makefile b/math/yacas/Makefile
index 5d760d0a6a74..fe6263c8c94b 100644
--- a/math/yacas/Makefile
+++ b/math/yacas/Makefile
@@ -23,7 +23,7 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
OPTIONS= X11 "Build with X11 features" off \
GMP "Use libgmp for arbitrary precision arithmetic" off
@@ -51,8 +51,8 @@ PLIST_SUB+= GMP="@comment " NOGMP=""
USE_GL= yes
CONFIGURE_ARGS+= --with-x
PLIST_SUB+= X11=""
-CPPFLAGS+= -I${X11BASE}/include
-LDFLAGS+= -L${X11BASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.else
CONFIGURE_ARGS+= --without-x
PLIST_SUB+= X11="@comment "