3 files changed, 34 insertions, 14 deletions

diff --git a/math/gnuplot+/Makefile b/math/gnuplot+/Makefile
index 1d2868d911ce..d076ef18a44d 100644
--- a/math/gnuplot+/Makefile
+++ b/math/gnuplot+/Makefile
@@ -6,19 +6,29 @@
 # $FreeBSD$
 #
 
-DISTNAME=	gnuplot37+-1.1.8
-CATEGORIES=	japanese math graphics
-MASTER_SITES=	ftp://ftp.ipc.chiba-u.ac.jp/pub/pub.yamaga/gnuplot+/3.7base/
-DISTFILES=	gnuplot-3.7.tar.gz gnuplot3.7+1.1.8.patch.tar.gz
+DISTNAME=	gnuplot37+-1.1.9
+CATEGORIES=	math japanese graphics
+MASTER_SITES=	ftp://ftp.ipc.chiba-u.ac.jp/pub/pub.yamaga/gnuplot+/3.7base/ \
+		ftp://ftp.ipc.chiba-u.ac.jp/pub/pub.yamaga/gnuplot+/3.7base/3.7.0+1.1.9/ \
+		ftp://ftp.hipecs.hokudai.ac.jp/pub/GNU/jp/pub.yamaga/gnuplot+/3.7base/ \
+		ftp://ftp.tohoku.ac.jp/mirror/gnuplot+/3.7base/ \
+		ftp://ftp.win.ne.jp/pub/graphics/gnuplot/gnuplot+/3.7base/ \
+		ftp://ftp.rc.tutrp.tut.ac.jp/pub/mirror/gnuplot+/3.7base/
+DISTFILES=	gnuplot-3.7.tar.gz gnuplot3.7+1.1.9.patch.tar.gz \
+		gnuplot3.7+1.1.9.configure.gd.patch \
+		gnuplot3.7+1.1.9.configure.gd2.patch
 
 MAINTAINER=	nakaji@tutrp.tut.ac.jp
 
 LIB_DEPENDS=    png.3:${PORTSDIR}/graphics/png \
 		VFlib2.24:${PORTSDIR}/japanese/vflib
+.if defined(USE_JP)
+BUILD_DEPENDS=	${LOCALBASE}/lib/libgd.a:${PORTSDIR}/japanese/gd \
+		${LOCALBASE}/lib/libttf.a:${PORTSDIR}/print/freetype
+.else
 BUILD_DEPENDS=	${LOCALBASE}/lib/libgd.a:${PORTSDIR}/graphics/gd \
 		${LOCALBASE}/lib/libttf.a:${PORTSDIR}/print/freetype
-
-BROKEN=		gd upgrade
+.endif
 
 EXTRACT_ONLY=	gnuplot-3.7.tar.gz
 
@@ -45,15 +55,23 @@ GP_DOCS=	${WRKSRC}/Copyright.plus \
 		${WRKSRC}/INSTALL.win.plus \
 		${WRKSRC}/README-J.plus \
 		${WRKSRC}/README.plus \
-		${WRKSRC}/gp+/plus-asc.dvi \
-		${WRKSRC}/gp+/plus-ntt.dvi \
+		${WRKSRC}/gp+/plus.dvi \
+		${WRKSRC}/gp+/plus.pdf \
+		${WRKSRC}/gp+/plus.ps \
 		${WRKSRC}/gp+/plus.tex
 
+pre-fetch:
+	@echo "*********************************************************"
+	@echo "If you want handle Japanese TrueType font, define USE_JP."
+	@echo "*********************************************************"
+
 post-extract:
-	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/gnuplot3.7+1.1.8.patch.tar.gz ${EXTRACT_AFTER_ARGS} -C ${WRKSRC}
+	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/gnuplot3.7+1.1.9.patch.tar.gz ${EXTRACT_AFTER_ARGS} -C ${WRKSRC}
 
 pre-patch:
-	cd ${WRKSRC}; ${PATCH} --quiet -E -p0 < ${WRKSRC}/gnuplot3.7+1.1.patch
+	${PATCH} ${PATCH_ARGS} < ${WRKSRC}/gnuplot3.7+1.1.patch
+	${PATCH} ${PATCH_ARGS} < ${DISTDIR}/gnuplot3.7+1.1.9.configure.gd.patch
+	${PATCH} ${PATCH_ARGS} < ${DISTDIR}/gnuplot3.7+1.1.9.configure.gd2.patch
 
 post-patch:
 	cd ${WRKSRC}; ${TOUCH} aclocal.m4
@@ -64,7 +82,6 @@ pre-build:
 
 post-build:
 	cd ${WRKSRC}/docs; ${GMAKE} info
-	cd ${WRKSRC}/docs; ${PATCH} --quiet -E -p1 < ${FILESDIR}/gnuplot.info.diff
 
 post-install:
 	@test -d ${PREFIX}/share/doc/gnuplot+ || ${MKDIR} ${PREFIX}/share/doc/gnuplot+
diff --git a/math/gnuplot+/distinfo b/math/gnuplot+/distinfo
index 0a88ca500a6d..96fe6853ed9b 100644
--- a/math/gnuplot+/distinfo
+++ b/math/gnuplot+/distinfo
@@ -1,2 +1,4 @@
 MD5 (gnuplot-3.7.tar.gz) = 18bbd384a991e7b20dbd2c29c239e90d
-MD5 (gnuplot3.7+1.1.8.patch.tar.gz) = f88b3dea62ec73048fb75481ae132b9d
+MD5 (gnuplot3.7+1.1.9.patch.tar.gz) = 0d9a5e8b6687c176dfc1e65cefecd9b8
+MD5 (gnuplot3.7+1.1.9.configure.gd.patch) = 5672b26aa80d8e917a3aaf019d0d1a5f
+MD5 (gnuplot3.7+1.1.9.configure.gd2.patch) = c8d594aeadaff30a2b1fcc9e642d3aae
diff --git a/math/gnuplot+/pkg-plist b/math/gnuplot+/pkg-plist
index 6824683bdc80..cfba9af5c71b 100644
--- a/math/gnuplot+/pkg-plist
+++ b/math/gnuplot+/pkg-plist
@@ -13,7 +13,8 @@ share/doc/gnuplot+/INSTALL.unx.plus
 share/doc/gnuplot+/INSTALL.win.plus
 share/doc/gnuplot+/README-J.plus
 share/doc/gnuplot+/README.plus
-share/doc/gnuplot+/plus-asc.dvi
-share/doc/gnuplot+/plus-ntt.dvi
+share/doc/gnuplot+/plus.dvi
+share/doc/gnuplot+/plus.pdf
+share/doc/gnuplot+/plus.ps
 share/doc/gnuplot+/plus.tex
 @dirrm share/doc/gnuplot+