3 files changed, 32 insertions, 32 deletions

diff --git a/math/gnuplot+/Makefile b/math/gnuplot+/Makefile
index c5fe4b90517c..58508397d246 100644
--- a/math/gnuplot+/Makefile
+++ b/math/gnuplot+/Makefile
@@ -6,28 +6,21 @@
 #
 
 PORTNAME=	gnuplot371+
-PORTVERSION=	1.1.9
+PORTVERSION=	1.2.0
 CATEGORIES=	math japanese graphics
-MASTER_SITES=	ftp://ftp.ipc.chiba-u.ac.jp/pub/pub.yamaga/gnuplot+/3.7base/ \
+MASTER_SITES=	http://www.h2.dion.ne.jp/~yamaga/gnuplot/ \
 		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.1.tar.gz gnuplot3.7.1+1.1.9.patch.tar.gz \
-		gnuplot3.7.1+1.1.9.bugfix
+DISTFILES=	gnuplot-3.7.1.tar.gz gnuplot3.7.1+${PORTVERSION}.patch.tar.gz
 EXTRACT_ONLY=	gnuplot-3.7.1.tar.gz
 
-MAINTAINER=	nakaji@tutrp.tut.ac.jp
+MAINTAINER=	nakaji@jp.freebsd.org
 
 LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png \
 		VFlib2.24:${PORTSDIR}/japanese/vflib
-.if defined(WITH_JP)
-BUILD_DEPENDS=	${LOCALBASE}/lib/libgd.a:${PORTSDIR}/japanese/gd \
-		${LOCALBASE}/lib/libttf.a:${PORTSDIR}/print/freetype
-.else
-LIB_DEPENDS=	gd.1:${PORTSDIR}/graphics/gd
 BUILD_DEPENDS=	${LOCALBASE}/lib/libttf.a:${PORTSDIR}/print/freetype
-.endif
 
 USE_XLIB=	yes
 USE_GMAKE=	yes
@@ -57,19 +50,11 @@ GP_DOCS=	${WRKSRC}/Copyright.plus \
 		${WRKSRC}/gp+/plus.ps \
 		${WRKSRC}/gp+/plus.tex
 
-pre-fetch:
-.ifndef WITH_JP
-	@echo "**********************************************************"
-	@echo "If you want handle Japanese TrueType font, define WITH_JP."
-	@echo "**********************************************************"
-.endif
-
 post-extract:
-	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/gnuplot3.7.1+1.1.9.patch.tar.gz ${EXTRACT_AFTER_ARGS} -C ${WRKSRC}
+	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/gnuplot3.7.1+${PORTVERSION}.patch.tar.gz ${EXTRACT_AFTER_ARGS} -C ${WRKSRC}
 
 pre-patch:
-	${PATCH} ${PATCH_ARGS} < ${WRKSRC}/gnuplot3.7+1.1.patch
-	${PATCH} ${PATCH_ARGS} < ${DISTDIR}/gnuplot3.7.1+1.1.9.bugfix
+	${PATCH} ${PATCH_ARGS} < ${WRKSRC}/gnuplot3.7+1.2.patch
 
 post-patch:
 	cd ${WRKSRC}; ${TOUCH} aclocal.m4
diff --git a/math/gnuplot+/distinfo b/math/gnuplot+/distinfo
index d043fc2b595d..f3ecff1fa90d 100644
--- a/math/gnuplot+/distinfo
+++ b/math/gnuplot+/distinfo
@@ -1,3 +1,2 @@
 MD5 (gnuplot-3.7.1.tar.gz) = 30798b4c14ea734969a86ee41a9c1dca
-MD5 (gnuplot3.7.1+1.1.9.patch.tar.gz) = 9835e591e4529c08b0a589d63b486a9e
-MD5 (gnuplot3.7.1+1.1.9.bugfix) = a5c624d3bc1e76c739ff73fa030a7530
+MD5 (gnuplot3.7.1+1.2.0.patch.tar.gz) = 317e49998d71603389032bef1171789d
diff --git a/math/gnuplot+/pkg-message b/math/gnuplot+/pkg-message
index 587953ae602f..b5ba2e197f1d 100644
--- a/math/gnuplot+/pkg-message
+++ b/math/gnuplot+/pkg-message
@@ -1,9 +1,25 @@
-*************************************************************************
-* Notices								*
-*									*
-* The author does not want these patches to be used by ones who misuse	*
-* a word Hacker for a cracker and crackers who call themselves Hackers.	*
-*									*
-* If you use these patches against the above, please make contact with	*
-* Yamaga (yamaga@ipc.chiba-u.ac.jp).					*
-*************************************************************************
+************************************************************************
+* Wishes from The Author
+*
+* The author wishes many people to use a word `Hacker' and a `Cracker'
+* correctly. This is just a WISH, not obligation, of course.
+*
+* The thought is based on
+*
+*     RFC (Request For Comments) 1983 "Internet Users' Glossary",
+*
+* from which the sections about Hacker and Cracker are quoted below.
+*
+*  cracker
+*     A cracker is an individual who attempts to access computer systems
+*     without authorization.  These individuals are often malicious, as
+*     opposed to hackers, and have many means at their disposal for
+*     breaking into a system.  See also: hacker, Computer Emergency
+*     Response Team, Trojan Horse, virus, worm.
+*
+*  hacker
+*     A person who delights in having an intimate understanding of the
+*     internal workings of a system, computers and computer networks in
+*     particular.  The term is often misused in a pejorative context,
+*     where "cracker" would be the correct term.  See also: cracker.
+************************************************************************