8 files changed, 47 insertions, 60 deletions

diff --git a/math/Makefile b/math/Makefile
index 67d0c35778d9..4af6facd9c01 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -244,7 +244,7 @@
     SUBDIR += mate-calc
     SUBDIR += mathomatic
     SUBDIR += matio
-    SUBDIR += matlab-R2012a-installer
+    SUBDIR += matlab-installer
     SUBDIR += matrix
     SUBDIR += maxima
     SUBDIR += mbasecalc
diff --git a/math/matlab-R2012a-installer/Makefile b/math/matlab-R2012a-installer/Makefile
deleted file mode 100644
index 776724e11dd3..000000000000
--- a/math/matlab-R2012a-installer/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# Created by: Jason Bacon
-# $FreeBSD$
-
-PORTNAME=	matlab-R2012a-installer
-PORTVERSION=	0.1
-CATEGORIES=	math science java
-MASTER_SITES=	http://acadix.biz/Ports/distfiles/ \
-		http://personalpages.tds.net/~jwbacon/Ports/distfiles/
-
-MAINTAINER=	jwbacon@tds.net
-COMMENT=	Mathworks(r) Matlab installation tool
-
-USE_LINUX=	yes
-USE_LINUX_APPS=	ncurses-base
-USE_JAVA=	yes
-JAVA_VERSION=	1.6+
-JAVA_OS=	linux
-JAVA_RUN=	yes
-
-NO_BUILD=	yes
-SUB_FILES=	pkg-message
-PLIST_FILES=	bin/${PORTNAME}
-
-NO_STAGE=	yes
-do-install:
-	${MKDIR} ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-
-post-install:
-	@${CAT} ${WRKDIR}/pkg-message
-
-.include <bsd.port.mk>
diff --git a/math/matlab-R2012a-installer/distinfo b/math/matlab-R2012a-installer/distinfo
deleted file mode 100644
index 394d80bf21fb..000000000000
--- a/math/matlab-R2012a-installer/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (matlab-R2012a-installer-0.1.tar.gz) = 047888d53f5d2cce32598e45072693aa225cb1472b9196e521f541a3b73ba749
-SIZE (matlab-R2012a-installer-0.1.tar.gz) = 4706
diff --git a/math/matlab-R2012a-installer/files/pkg-message.in b/math/matlab-R2012a-installer/files/pkg-message.in
deleted file mode 100644
index 84d08525aee0..000000000000
--- a/math/matlab-R2012a-installer/files/pkg-message.in
+++ /dev/null
@@ -1,20 +0,0 @@
-====================================================================
-If you did not allow the Matlab installer to create symbolic links 
-to the Matlab binaries, users will need %%PREFIX%%/matlab/bin 
-in their PATH to run matlab.
-
-If you want to run matlab without the graphical desktop, you will need
-a terminfo database installed in
-
-	/compat/linux/usr/share/terminfo
-
-To install Matlab (r), have your license.dat file and installation
-media ready, and run
-
-	matlab-R2012a-installer
-
-as root.
-
-NOTE: The root user must have the ability to run X11 applications,
-as Matlab R2012a does not have a text-based installer.
-====================================================================
diff --git a/math/matlab-R2012a-installer/pkg-descr b/math/matlab-R2012a-installer/pkg-descr
deleted file mode 100644
index d0a4c37dfa2f..000000000000
--- a/math/matlab-R2012a-installer/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-This port installs the prerequisites for Mathworks (r) Matlab R2012a for Linux
-and an installer script matlab-2012a-installer, which automates the somewhat
-tricky process of installing Linux Matlab.
-
-It requires installation media and a license file from Mathworks, Inc.
diff --git a/math/matlab-installer/Makefile b/math/matlab-installer/Makefile
new file mode 100644
index 000000000000..0e239ee6f2d0
--- /dev/null
+++ b/math/matlab-installer/Makefile
@@ -0,0 +1,36 @@
+# Created by: Jason Bacon <jwbacon@tds.net>
+# $FreeBSD$
+
+PORTNAME=	matlab-installer
+PORTVERSION=	0.2
+CATEGORIES=	math science java
+MASTER_SITES=	http://acadix.biz/Ports/distfiles/ \
+		http://personalpages.tds.net/~jwbacon/Ports/distfiles/
+
+MAINTAINER=	jwbacon@tds.net
+COMMENT=	Easy installation of Linux Matlab(r) on FreeBSD
+
+LICENSE=	BSD
+
+# Move devtools depend to USE_LINUX_APPS when possible
+RUN_DEPENDS=	mount_cd9660_image:${PORTSDIR}/sysutils/diskimage-tools \
+		auto-ask:${PORTSDIR}/sysutils/auto-admin
+#		webbrowser:${PORTSDIR}/www/webbrowser \
+#		${LINUXBASE}/usr/bin/gfortran:${PORTSDIR}/devel/linux-f10-devtools
+
+USE_XZ=		yes
+USE_LINUX=	yes
+USE_LINUX_APPS=	ncurses-base dri
+USE_JAVA=	yes
+JAVA_VERSION=	1.6+
+JAVA_OS=	linux
+JAVA_RUN=	yes
+
+NO_BUILD=	yes
+PLIST_FILES=	bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
+
+do-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/matlab-installer.1 ${STAGEDIR}${PREFIX}/man/man1
+
+.include <bsd.port.mk>
diff --git a/math/matlab-installer/distinfo b/math/matlab-installer/distinfo
new file mode 100644
index 000000000000..8b92b7fc2eb5
--- /dev/null
+++ b/math/matlab-installer/distinfo
@@ -0,0 +1,2 @@
+SHA256 (matlab-installer-0.2.tar.xz) = 461e694d6140000cb40350daa126ae0e8c9a1e3ee0defee8c84643460bf977b6
+SIZE (matlab-installer-0.2.tar.xz) = 6668
diff --git a/math/matlab-installer/pkg-descr b/math/matlab-installer/pkg-descr
new file mode 100644
index 000000000000..7c751d2ae6e9
--- /dev/null
+++ b/math/matlab-installer/pkg-descr
@@ -0,0 +1,8 @@
+This port installs the prerequisites for Mathworks (r) Matlab for Linux
+and an installer script (matlab-installer), which automates the somewhat
+tricky process of installing Linux Matlab.
+
+Installing Matlab requires Matlab installation media and a license file and
+installation key from Mathworks, Inc.
+
+WWW: http://acadix.biz/matlab-installer.php