Update to 3.1.1 and unbreak

Submitted by:	kris and linimon

math/mupad/Makefile

@@ -6,18 +6,18 @@
 #
 
 PORTNAME=	mupad
-PORTVERSION=	2.5.3
+PORTVERSION=	3.1.1
-PORTREVISION=	2
 CATEGORIES=	math linux
 MASTER_SITES=	ftp://ftp.mupad.de/MuPAD/distrib/unix/
-DISTNAME=	mupad_linux_scilab_253
+DISTNAME=	MuPADscilab-${PORTVERSION}-0.i386
-EXTRACT_SUFX=	.tgz
+EXTRACT_SUFX=   .rpm
 DIST_SUBDIR=	mupad
 
 MAINTAINER=	maho@FreeBSD.org
 COMMENT=	A sophisticated computer algebra system
 
-BROKEN=		Size mismatch
+EXTRACT_DEPENDS=	rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
+
 NO_CDROM=	"unsure to sell for profit"
 
 USE_LINUX?=		yes
@@ -26,39 +26,40 @@ ONLY_FOR_ARCHS=		i386
 INSTALLS_SHLIB=		yes
 NO_FILTER_SHLIBS=	yes
 NO_WRKSUBDIR=		yes
-NO_BUILD=		yes
 
 MAN1=		mmg.1 mmgd.1 mupad.1 xmupad.1
+MANCOMPRESSED=	yes
+EXTRACT_CMD=    rpm2cpio.pl
+EXTRACT_BEFORE_ARGS=
+EXTRACT_AFTER_ARGS=     | ${CPIO} -id --quiet
+USE_REINPLACE=	yes
+MUPADBASEDIR=MuPAD
+
+do-build:
+	@${MV} ${WRKSRC}/usr/local/MuPADscilab-${PORTVERSION}/linux ${WRKSRC}/usr/local/MuPADscilab-${PORTVERSION}/freebsd
+.for d in manual mmg mupad mxdvi vcam xmupad xvc2jvx
+	@${REINPLACE_CMD}  -e 's:%%PREFIX%%:${PREFIX}:g' \
+		${WRKSRC}/usr/local/bin/${d}
+.endfor
+	${RM} -rf ${WRKSRC}/usr/local/MuPADscilab-${PORTVERSION}/share/doc/man
 
 do-install:
-	@${MKDIR} ${PREFIX}/mupad/freebsd
-	@${MKDIR} ${PREFIX}/mupad/share
-	@${MKDIR} ${PREFIX}/mupad/packages
 	@${FIND} ${WRKSRC} -name "*.orig" | ${XARGS} ${RM}
-	@${RM} -rf ${WRKSRC}/packages/scilab/linux
+	@${MKDIR} ${PREFIX}/${MUPADBASEDIR}
-	@${RM} -rf ${WRKSRC}/linux/lib/libXpm.so*
+.for d in manual mmg mupad mxdvi vcam xmupad xvc2jvx
-	@${RM} -rf ${WRKSRC}/packages/scilab/linux
+	@${INSTALL_SCRIPT} ${WRKSRC}/usr/local/bin/${d} ${PREFIX}/bin
-	@${RM} -rf ${WRKSRC}/packages/scilab/solaris
-	@${TAR} cf - -C ${WRKSRC}/linux . | ${TAR} xf - -C ${PREFIX}/mupad/freebsd
-	@${TAR} --exclude doc --exclude man1 --exclude mann -cf - -C ${WRKSRC}/share . | ${TAR} xf - -C ${PREFIX}/mupad/share
-	@${TAR} -cf - -C ${WRKSRC}/packages --exclude CVS . | ${TAR} xf - -C ${PREFIX}/mupad/packages
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/mupad
-	@${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/mupad
-	@${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/mupad
-.for d in mmg mupad mxdvi mxmupad mxvcam
-	@${BRANDELF} -t Linux ${PREFIX}/mupad/freebsd/bin/$d
 .endfor
-
+	@${TAR} cf - -C ${WRKSRC}/usr/local/MuPADscilab-${PORTVERSION} . | ${TAR} xf - -C ${PREFIX}/${MUPADBASEDIR}
-.for d in ${MAN1}
+	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/${MUPADBASEDIR}
-	@${INSTALL_MAN} ${WRKSRC}/share/doc/man/man1/$d ${PREFIX}/man/man1
+.for d in mmg mupad mxdvi mxmupad xvc2jvx
+	@${BRANDELF} -t Linux ${PREFIX}/${MUPADBASEDIR}/freebsd/bin/${d}
 .endfor
-
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/mupad/share/doc
+.for d in ${MAN1}
-	@${TAR} cf - -C ${WRKSRC}/share/doc --exclude man1 --exclude mann . | ${TAR} xf - -C ${PREFIX}/mupad/share/doc
+	@${INSTALL_MAN} ${WRKSRC}/usr/share/man/man1/${d}.gz ${PREFIX}/man/man1
+.endfor
+	@${MKDIR} ${DOCSDIR}
+	@${TAR} cf - -C ${WRKSRC}/usr/share/doc/MuPADscilab-${PORTVERSION} . | ${TAR} xf - -C ${DOCSDIR}
 .endif
 
-post-install:
-	@${SED} -e 's,/usr/local,${PREFIX},g' ${PKGMESSAGE}
-
 .include <bsd.port.mk>

math/mupad/distinfo

@@ -1,2 +1,2 @@
-MD5 (mupad/mupad_linux_scilab_253.tgz) = e8bc07a7dc8ff2976594af7d8ef3eb5a
+MD5 (mupad/MuPADscilab-3.1.1-0.i386.rpm) = fb9d280119a47ba2f3bfe1b979a1a64e
-SIZE (mupad/mupad_linux_scilab_253.tgz) = 30723090
+SIZE (mupad/MuPADscilab-3.1.1-0.i386.rpm) = 61574644

math/mupad/files/patch-sysinfo

@@ -1,5 +1,5 @@
---- share/bin/sysinfo.org	Sat May 25 18:26:02 2002
+--- usr/local/MuPADscilab-3.1.1/share/bin/sysinfo~	Sun Mar 20 00:09:57 2005
-+++ share/bin/sysinfo	Sat May 25 18:27:15 2002
++++ usr/local/MuPADscilab-3.1.1/share/bin/sysinfo	Sun Mar 20 00:17:03 2005
 @@ -10,7 +10,9 @@
  
  PATH=/bin:/usr/bin:/usr/ucb:/usr/bsd
@@ -9,5 +9,5 @@
 +echo $ARCH
 +exit
  
- if [ -x /usr/bin/hostinfo ] ; then
+ if test -x /usr/bin/hostinfo ; then
-     if [ "`hostinfo | grep NeXT`" != "" ] ; then
+     if test "`hostinfo | grep NeXT`" != "" ; then

math/mupad/pkg-message

@@ -1,9 +1,10 @@
-To use this software you must accept license agreement "LICENSE"
+The installation has a memory limit of 10 MB.
-which found at /usr/local/mupad/.
+To remove this limit, you will need to enter a registration key,
+which is for free for non-commercial users.
+Commercial users should contact SciFace software or their local distributor.
+http://www.mupad.org/muptan.html
+--
+Fixed single-user licenses for the following versions of MuPAD
+are available free of charge:
+http://research.mupad.de/licenses.html
 
-Excutables are in /usr/local/mupad/share/bin/, you can add it to your $PATH.
-
-Free Personal Licenses is available at
-http://www.sciface.com/personal.shtml
-http://www.sciface.com/mupad_download/
-Specify the MuPAD version as `MuPAD for Linux/PC 2.5'