1 files changed, 11 insertions, 55 deletions

diff --git a/math/gnuplot/Makefile b/math/gnuplot/Makefile
index ecc794d4431f..7c4ca65ca6cb 100644
--- a/math/gnuplot/Makefile
+++ b/math/gnuplot/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnuplot
-PORTVERSION=	4.0.0
-PORTREVISION=	6
+PORTVERSION=	4.2.0
 CATEGORIES=	math graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -19,39 +18,18 @@ GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--without-tutorial \
 		--without-linux-vga \
-		--with-lasergnu
+		--with-lasergnu \
+		--without-lisp-files \
+		--with-readline=gnu
+
+BUILD_DEPENDS+=latex:${PORTSDIR}/print/teTeX-base
 
 OPTIONS=	GD		"Enable GD support"		on \
-		HISTOGRAMS	"Enable stacked histograms"	off \
-		PDF		"Enable PDF support"		on \
-		PNG		"Enable PNG support"		on \
-		READLINE	"Enable readline support"	on
+		PDF		"Enable PDF support"		on
 
 MAN1=		gnuplot.1 lasergnu.1
 INFO=		gnuplot
 
-.if exists(${PREFIX}/bin/emacs) || exists(${PREFIX}/bin/xemacs)
-USE_EMACS=	yes
-EMACS_PORT_NAME=	emacs21
-EMACS_NO_BUILD_DEPENDS=	yes
-EMACS_NO_RUN_DEPENDS=	yes
-CONFIGURE_ARGS+=	--with-lisp-files
-.else
-PLIST_SUB+=		EMACS_SITE_LISPDIR="@comment "
-CONFIGURE_ARGS+=	--without-lisp-files
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if !defined(WITHOUT_READLINE)
-.if ${OSVERSION} < 500018
-LIB_DEPENDS+=		readline.5:${PORTSDIR}/devel/readline
-CONFIGURE_ARGS+=	--with-readline="${LOCALBASE}"
-.else
-CONFIGURE_ARGS+=	--with-readline=gnu
-.endif
-.endif
-
 .if !defined(WITHOUT_X11)
 USE_XLIB=		yes
 PLIST_SUB+=		X11=""
@@ -74,25 +52,6 @@ LIB_DEPENDS+=		pdf.8:${PORTSDIR}/print/pdflib
 CONFIGURE_ARGS+=	--with-pdf=${LOCALBASE}
 .endif
 
-.if defined(WITHOUT_PNG)
-CONFIGURE_ARGS+=	--without-png
-.else
-LIB_DEPENDS+=		png.5:${PORTSDIR}/graphics/png
-CONFIGURE_ARGS+=	--with-png=${LOCALBASE}
-.endif
-
-.if defined(WITH_HISTOGRAMS)
-PATCH_SITES=		http://www.bmsc.washington.edu/people/merritt/gnuplot/
-PATCHFILES=		datastrings_4.0.patch histograms_4.0.patch
-PATCH_DIST_STRIP=	-p1
-USE_AUTOTOOLS=		autoconf:259
-CONFIGURE_ARGS+=	--enable-datastrings \
-			--enable-histograms
-PLIST_SUB+=		HISTOGRAMS=""
-.else
-PLIST_SUB+=		HISTOGRAMS="@comment "
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|)/@PACKAGE@/@PKG_MAJOR@|)|g' ${WRKSRC}/src/Makefile.in
@@ -100,22 +59,19 @@ post-patch:
 
 .if !defined(NOPORTDOCS)
 post-build:
-	@cd ${WRKSRC}/docs && ${MAKE} groff html
+	@cd ${WRKSRC}/docs && ${MAKE} groff
 .endif
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/src/lasergnu ${PREFIX}/bin
-.if exists(${PREFIX}/bin/emacs) || exists(${PREFIX}/bin/xemacs)
-	${INSTALL_DATA} ${WRKSRC}/lisp/gnuplot*.el ${PREFIX}/${EMACS_SITE_LISPDIR}
-.endif
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${EXAMPLESDIR}
 	cd ${WRKSRC}/demo && ${FIND} . \
 		| ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
 	@${MKDIR} ${DOCSDIR}/psdoc
-	cd ${WRKSRC}/docs && ${INSTALL_DATA} gnuplot.txt gnuplot.html \
-		gnuplot.dvi gnuplot.ps ${DOCSDIR}
+	cd ${WRKSRC}/docs && ${INSTALL_DATA} gnuplot.txt gnuplot.dvi \
+		gnuplot.ps ${DOCSDIR}
 	cd ${WRKSRC}/docs/psdoc && ${INSTALL_DATA} README ps_* ${DOCSDIR}/psdoc
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>