5 files changed, 27 insertions, 59 deletions

diff --git a/www/mimetex/Makefile b/www/mimetex/Makefile
index ef8a1b63e884..55addfbe01e2 100644
--- a/www/mimetex/Makefile
+++ b/www/mimetex/Makefile
@@ -1,15 +1,11 @@
-# New ports collection makefile for:	mimetex
-# Date created:		2006-02-03
-# Whom:			Nicola Vitale	<nivit@email.it>
-#
+# Created by: Nicola Vitale <nivit@email.it>
 # $FreeBSD$
-#
 
 PORTNAME=	mimetex
-PORTVERSION=	20080906.1.70
-PORTREVISION=	4
+PORTVERSION=	20120331.1.74
+PORTREVISION=	0
 CATEGORIES=	www math
-MASTER_SITES=	http://nivi.interfree.it/distfiles/${DIST_SUBDIR}/ \
+MASTER_SITES=	LOCAL/nivit/${PORTNAME}/${PORTVERSION}/ \
 		http://www.forkosh.com/
 DISTNAME=	${PORTNAME}
 DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
@@ -17,38 +13,28 @@ DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A CGI script that lets you embed LaTeX math in your HTML pages
 
+LICENSE=	GPLv3
+
 NO_WRKSUBDIR=	yes
-USE_APACHE=	22+
 USE_ZIP=	yes
 
-.include <bsd.port.pre.mk>
-
-FETCH_ARGS=	-rR	# see PR bin/76134
-LN_OPTS=	-sf
-
-CGI_BIN=	${WWWDIR}/cgi-bin
-CGI_PRG=	${PORTNAME}.cgi
-WWW_DIR=	${WWWDIR}/data
-
-PLIST_DIRSTRY+=	www/cgi-bin www/data
-
-PLIST_SUB=	CGI_BIN="${CGI_BIN:S,^${PREFIX}/,,}" \
-		WWW_DIR="${WWW_DIR:S,^${PREFIX}/,,}"
+OPTIONS_DEFINE=	ANTIALIASING DOCS STATIC
+OPTIONS_DEFAULT=	ANTIALIASING
+DESC_ANTIALIASING=	Use image format with anti-aliasing
+DESC_STATIC=	Possible use of mimetex on another machine
 
 PORTDOCS=	${PORTNAME}.html
 
-SUB_FILES=	pkg-message
-SUB_LIST=	PORTDOCS=${PORTDOCS} WWW_DIR=${WWW_DIR}
-
+.include <bsd.port.options.mk>
 # usefull if you run mimetex on another machine
-.if defined(WITH_STATIC)
+.if ${PORT_OPTIONS:MSTATIC}
 STATIC_MIMETEX=	-static
 .endif
 # anti-aliasing no/yes
-.if defined(WITHOUT_ANTIALIASING)
-IMAGES_TYPE=	-DGIF
-.else
+.if ${PORT_OPTIONS:MANTIALIASING}
 IMAGES_TYPE=	-DAA
+.else
+IMAGES_TYPE=	-DGIF
 .endif
 # other options (see mimetex.c or online documentation)
 # example: make install USER_OPTIONS='-DCACHEPATH=\"/tmp\" -DDISPLAYSIZE=10'
@@ -56,19 +42,13 @@ USER_OPTIONS?=
 
 do-build:
 	cd ${WRKDIR};\
-	${CC} ${CFLAGS} ${STATIC_MIMETEX} ${IMAGES_TYPE} ${USER_OPTIONS} mimetex.c gifsave.c -lm -o ${CGI_PRG}
-
+	${CC} ${CFLAGS} ${STATIC_MIMETEX} ${IMAGES_TYPE} ${USER_OPTIONS} mimetex.c gifsave.c -lm -o mimetex.cgi
 do-install:
-	${MKDIR} ${CGI_BIN}
-	${INSTALL_PROGRAM} ${WRKSRC}/${CGI_PRG} ${CGI_BIN}/${CGI_PRG}
-.if !defined(NOPORTDOCS)
+	${MKDIR} ${WWWDIR}/cgi-bin
+	${INSTALL_PROGRAM} ${WRKSRC}/mimetex.cgi ${WWWDIR}/cgi-bin/mimetex.cgi
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${DOCSDIR}
-	${MKDIR} ${WWW_DIR}
-	${LN} ${LN_OPTS} ${DOCSDIR}/${PORTDOCS} ${WWW_DIR}/index.html
-
-post-install:
-	${CAT} ${PKGMESSAGE}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/mimetex/distinfo b/www/mimetex/distinfo
index 3bf6cc82463b..ccde93a3036d 100644
--- a/www/mimetex/distinfo
+++ b/www/mimetex/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mimetex/20080906.1.70/mimetex.zip) = 7c3965baee916612124225f4482d2de81f5abd7cdf819d4f3806081615bb6841
-SIZE (mimetex/20080906.1.70/mimetex.zip) = 729841
+SHA256 (mimetex/20120331.1.74/mimetex.zip) = 02add4dabe2ef473460a93432240ef682bd831e3222758648a7b40dfbdd8fb53
+SIZE (mimetex/20120331.1.74/mimetex.zip) = 1190831
diff --git a/www/mimetex/files/pkg-message.in b/www/mimetex/files/pkg-message.in
deleted file mode 100644
index ad7fc2c5d671..000000000000
--- a/www/mimetex/files/pkg-message.in
+++ /dev/null
@@ -1,9 +0,0 @@
-
-*********************************************************
-
-  See online documentation at 
-    %%DOCSDIR%%/%%PORTDOCS%%
-  or
-    %%WWW_DIR%%/index.html
-
-*********************************************************
diff --git a/www/mimetex/pkg-descr b/www/mimetex/pkg-descr
index 1a46254984b9..9cb31f9bed15 100644
--- a/www/mimetex/pkg-descr
+++ b/www/mimetex/pkg-descr
@@ -1,4 +1,4 @@
-MimeTeX, licensed under the gpl, lets you easily embed LaTeX math in
+MimeTeX, licensed under the GPL, lets you easily embed LaTeX math in
 your html pages.  It parses a LaTeX math expression and immediately
 emits the corresponding gif image, rather than the usual TeX dvi.
 And mimeTeX is an entirely separate little program that doesn't
@@ -7,5 +7,4 @@ your site's cgi-bin/ directory, with no other dependencies.
 It's easy to use. Just place an html <img> tag in your document
 wherever you want to see the corresponding LaTeX expression.
 
-Author:	John Forkosh
-WWW:	http://www.forkosh.com/mimetex.html
+WWW: http://www.forkosh.com/mimetex.html
diff --git a/www/mimetex/pkg-plist b/www/mimetex/pkg-plist
index 155953d95dbe..d0d9663e6ae6 100644
--- a/www/mimetex/pkg-plist
+++ b/www/mimetex/pkg-plist
@@ -1,6 +1,4 @@
 @comment $FreeBSD$
-%%PORTDOCS%%%%WWW_DIR%%/index.html
-%%CGI_BIN%%/mimetex.cgi
-@dirrm %%CGI_BIN%%
-%%PORTDOCS%%@dirrm %%WWW_DIR%%
-%%PORTDOCS%%@dirrm %%WWWDIR%%
+%%WWWDIR%%/cgi-bin/mimetex.cgi
+@dirrm %%WWWDIR%%/cgi-bin
+@dirrm %%WWWDIR%%