2 files changed, 13 insertions, 35 deletions

diff --git a/print/pstotext/Makefile b/print/pstotext/Makefile
index 905eb2796a6f..1accc3b18c51 100644
--- a/print/pstotext/Makefile
+++ b/print/pstotext/Makefile
@@ -1,21 +1,15 @@
-# New ports collection makefile for:	pstotext
-# Date created:		December 6, 1999
-# Whom:			Oliver Breuninger <ob@seicom.NET>
-#
+# Created by: Oliver Breuninger <ob@seicom.NET>
 # $FreeBSD$
-#
 
 PORTNAME=	pstotext
 PORTVERSION=	1.9
 PORTREVISION=	3
 CATEGORIES=	print
-MASTER_SITES=	http://mirror.cs.wisc.edu/pub/mirrors/ghost/contrib/
+MASTER_SITES=	${MASTER_SITE_TEX_CTAN}
+MASTER_SITE_SUBDIR=	support/ghostscript/contrib
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A PostScript to Text converter
-
-DEPRECATED=	No more public distfiles
-EXPIRATION_DATE=	2012-10-20
+COMMENT=	PostScript to Text converter
 
 USE_GHOSTSCRIPT_RUN=	yes
 
@@ -23,6 +17,8 @@ MAN1=		pstotext.1
 PLIST_FILES=	bin/pstotext
 PORTDOCS=	copyright
 
+.include <bsd.port.options.mk>
+
 post-patch:
 	${REINPLACE_CMD} -e 's;%%LOCALBASE%%;${LOCALBASE};g' ${WRKSRC}/main.c
 	${REINPLACE_CMD} -e 's;%%PREFIX%%;${PREFIX};g' ${WRKSRC}/pstotext.1
@@ -30,8 +26,8 @@ post-patch:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/pstotext ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/pstotext.1 ${MAN1PREFIX}/man/man1
-.ifndef(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/pstotext.txt ${DOCSDIR}/copyright
 .endif
 
diff --git a/print/pstotext/pkg-descr b/print/pstotext/pkg-descr
index af301508f9e6..4fa07c0ef112 100644
--- a/print/pstotext/pkg-descr
+++ b/print/pstotext/pkg-descr
@@ -1,23 +1,5 @@
-pstotext reads one or more PostScript or PDF files, and writes to standard 
-output a representation of the plain text that would be displayed if the 
-PostScript file were printed. As is described in the DETAILS section below, 
-this representation is only an approximation. Nevertheless, it is often 
-useful for information retrieval (e.g., running grep(1) or building a
-full-text index) or to recover the text from a PostScript file whose source 
-you have lost.
-       
-pstotext calls Ghostscript, and requires Aladdin Ghostscript version 3.51 or 
-newer. Ghostscript must be invokable on the current search path as gs. 
-Alternatively, you can use the -gs option to specify the command (pathname 
-and options) to run Ghostscript. For example, on Windows you might use -gs 
-"c:\gs\gswin32c.exe -Ic:\gs;c:\gs\fonts".
-       
-pstotext reads and processes its command line from left to right, ignoring 
-the case of options. When it encounters a pathname, it opens the file and 
-expects to find a PostScript job or PDF document to process. The option - 
-means to read and process a PostScript job from standard input. If no - or 
-pathname arguments are encountered, pstotext reads a PostScript job from 
-standard input. (PDF documents require random access, hence cannot be read 
-from standard input.) You can use the -output option to specify an output file
-(remember to invoke it before the input file); otherwise pstotext writes to
-standard output.
+pstotext extracts ASCII text from PostScript and PDF files.  It
+uses Ghostscript, but does a more careful job with kerned characters
+and nonstandard font encodings than Ghostscript's ps2ascii utility.
+
+WWW: http://pages.cs.wisc.edu/~ghost/doc/pstotext.htm