1 files changed, 59 insertions, 70 deletions

diff --git a/math/freemat/Makefile b/math/freemat/Makefile
index 0da11ac5d34b..c23a927cc528 100644
--- a/math/freemat/Makefile
+++ b/math/freemat/Makefile
@@ -5,109 +5,98 @@
 # $FreeBSD$
 #
 
-PORTNAME=		freemat
-PORTVERSION=		1.10	# Note: FreeMat 2.0 is waiting for QT4.
-PORTREVISION=		3
+PORTNAME=		FreeMat
+PORTVERSION=		3.0
 CATEGORIES=		math science
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITE_SUBDIR=	${PORTNAME:L}
 .ifdef WITH_MPI
 PKGNAMESUFFIX=		-mpi
 .endif
-DISTNAME=		FreeMat-${PORTVERSION}-1
 
 MAINTAINER=		ports@FreeBSD.org
 COMMENT=		An environment for rapid engineering and scientific processing
 
-LIB_DEPENDS=		f2c.2:${PORTSDIR}/lang/f2c		\
-			gsl.9:${PORTSDIR}/math/gsl		\
-			jpeg.9:${PORTSDIR}/graphics/jpeg	\
-			lapack.4:${PORTSDIR}/math/lapack	\
-			png.5:${PORTSDIR}/graphics/png		\
-			tiff.4:${PORTSDIR}/graphics/tiff	\
-			arpack.1:${PORTSDIR}/math/arpack
-BUILD_DEPENDS=		${LOCALBASE}/lib/libumfpack.a:${PORTSDIR}/math/umfpack
+LIB_DEPENDS=		lapack.4:${PORTSDIR}/math/lapack
+BUILD_DEPENDS=		pkg-config:${PORTSDIR}/devel/pkg-config
 
-.include <bsd.port.pre.mk>
-
-WANT_FORTRAN=	yes #dummy but future use
-BUILD_DEPENDS+=	gfortran42:${PORTSDIR}/lang/gcc42
-FC=		gfortran42
-F77=		gfortran42
-FFLAGS+=	-O2
-
-.if exists(${LOCALBASE}/lib/libatlas_r.so) && !defined(WITH_BLAS)
-WITH_ATLAS=	yes
-.endif
-.if defined(WITH_ATLAS)
-LIB_DEPENDS+=	atlas.2:${PORTSDIR}/math/atlas
-BLAS=		-lf77blas -latlas
-.else
-LIB_DEPENDS+=   blas.2:${PORTSDIR}/math/blas
-BLAS=           -lblas
+.ifdef WITH_MPI
+IGNORE=			no MPI support at the moment
 .endif
 
+WANT_FORTRAN=		yes #dummy but future use
+BUILD_DEPENDS+=		gfortran42:${PORTSDIR}/lang/gcc42
+FC=			gfortran42
+F77=			gfortran42
+FFLAGS+=		-O2
+
 USE_GL=			yes
+USE_QT_VER=		4
+USE_GMAKE=		yes
+QT_COMPONENTS=		gui network opengl moc rcc uic
 GNU_CONFIGURE=		yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=		--with-blas="${BLAS}"
-CONFIGURE_ENV=		CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include ${THRDFLG}"	\
-			LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${THRDLIB}" \
+CPPFLAGS=		${CXXFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include ${AMDINC}
+CONFIGURE_ENV=		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"		\
 			FC="${FC}" F77="${F77}" FFLAGS="${FFLAGS}"
 
 SLAVEDIRS=	math/freemat-mpi
-.if !defined(WITHOUT_XFT)
-CONFIGURE_ARGS+=	--enable-xft	# Set by default since FLTK depends on it.
+
+DATADIR+=	${PREFIX}/share/${PORTNAME}-${PORTVERSION}
+
+.if !defined(WITHOUT_FFTW)
+LIB_DEPENDS+=	fftw3.4:${PORTSDIR}/math/fftw3		\
+		fftw3f.4:${PORTSDIR}/math/fftw3-float
 .endif
 
-.if defined(WITHOUT_THREADS)
-LIB_DEPENDS+=		fltk.1:${PORTSDIR}/x11-toolkits/fltk
-THRDFLG=
-THRDLIB=
-.else
-LIB_DEPENDS+=		fltk.1:${PORTSDIR}/x11-toolkits/fltk-threads
-CONFIGURE_ARGS+=	--enable-threads
-THRDFLG=		${PTHREAD_CFLAGS}
-THRDLIB=		${PTHREAD_LIBS}
+.if !defined(WITHOUT_ARPACK)
+LIB_DEPENDS+=	arpack.1:${PORTSDIR}/math/arpack
+.endif
+
+.if !defined(WITHOUT_AVCALL)
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libavcall.a:${PORTSDIR}/devel/ffcall
 .endif
 
-WRKSRC=		${WRKDIR}/FreeMat-${PORTVERSION}
-SUB_FILES=	pkg-message
-DATADIR=	${PREFIX}/share/FreeMat
+.include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500000
-BROKEN=	Does not compile with gcc-2.95
+.if exists(${LOCALBASE}/lib/libatlas_r.so) && !defined(WITH_BLAS)
+WITH_ATLAS=	yes
+.endif
+.if defined(WITH_ATLAS)
+LIB_DEPENDS+=	atlas.2:${PORTSDIR}/math/atlas
+BLAS=		-lf77blas -latlas
+LAPACK=		-lalapack
+.else
+LIB_DEPENDS+=	blas.2:${PORTSDIR}/math/blas	\
+		lapack.4:${PORTSDIR}/math/lapack
+BLAS=		-lblas
+LAPACK=		-llapack
 .endif
 
-.if defined(WITH_MPI)
-IGNORE=	does not work with lam-7
-BUILD_DEPENDS+=	mpiCC:${PORTSDIR}/net/lam
-RUN_DEPENDS+=	lamboot:${PORTSDIR}/net/lam
-CONFIGURE_ARGS+=--with-mpi=yes
+.if !defined(WITHOUT_UMFPACK)
+. if exists(${LOCALBASE}/include/AMD/amd.h)
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libamd.a:${PORTSDIR}/math/umfpack
+AMDINC=		-I${LOCALBASE}/include/AMD
+. else
+LIB_DEPENDS+=	amd.1:${PORTSDIR}/math/suitesparse
+AMDINC=		-I${LOCALBASE}/include/suitesparse
+. endif
 .endif
 
 pre-everything::
+.if !defined(WITH_ATLAS)
 	@${ECHO_MSG} '**********************************************************'
 	@${ECHO_MSG} '* You can define the following variables:                *'
-	@${ECHO_MSG} '* - WITH_BLAS:       to avoid atlas;                     *'
-	@${ECHO_MSG} '* - WITH_MPI:        to build the MPI executable;        *'
-	@${ECHO_MSG} '* - WITHOUT_XFT:     to turn off Xft support;            *'
-	@${ECHO_MSG} '* - WITHOUT_THREADS: to disable multi-threading support. *'
+	@${ECHO_MSG} '* - WITH_ATLAS:       to link with atlas                 *'
+	@${ECHO_MSG} '* - WITHOUT_FFTW      remove FFTW support                *'
+	@${ECHO_MSG} '* - WITHOUT_ARPACK    remove Arpack support              *'
+	@${ECHO_MSG} '* - WITHOUT_AVCALL    remove FFCALL support              *'
+	@${ECHO_MSG} '* - WITHOUT_UMFPACK   remove UMFPACK support             *'
 	@${ECHO_MSG} '**********************************************************'
+.endif
 
 pre-configure:
-.if defined(NOPORTDOCS)
-	${REINPLACE_CMD} -e 's|SUBDIRS = mdc html|SUBDIRS = mdc|' ${WRKSRC}/help/Makefile.in
-.endif
-	${FIND} ${WRKSRC} -name Makefile.in -exec ${REINPLACE_CMD}				\
-	-e 's|-I@top_srcdir@/libs/libFLTK|-I${X11BASE}/include|;				\
-	s|$$(JPEGLIB) @top_builddir@/libs/libFLTK/libFLTK.a||;					\
-	s|@top_builddir@/libs/libFLTK/libFLTK.a|`fltk-config --use-images --ldflags`|;		\
-	s|-I@top_srcdir@/libs/libUMFPACK/UMFPACK/Include|-I${LOCALBASE}/include/UMFPACK|;	\
-	s|@top_builddir@/libs/libUMFPACK/UMFPACK/libUMFPACKdi.a|${LOCALBASE}/lib/libumfpack.a|;	\
-	s|@top_builddir@/libs/libUMFPACK/UMFPACK/libUMFPACKzi.a||;				\
-	s|@top_builddir@/libs/libUMFPACK/AMD/libAMD.a|${LOCALBASE}/lib/libamd.a|;		\
-	s|@top_builddir@/libs/libARPACK/libARPACK.a|${LOCALBASE}/lib/libarpack.a|;		\
-	s|-L/sw/lib ||'	{} \;
+	${REINPLACE_CMD} -e 's| == x| = x|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
 
 .include <bsd.port.post.mk>