Update to 1.5.4

* Change to 1.5 branch. New implementation.

9 files changed, 128 insertions, 36 deletions

diff --git a/math/eukleides/MESSAGE b/math/eukleides/MESSAGE
new file mode 100644
index 00000000000..2d029479baa
--- /dev/null
+++ b/math/eukleides/MESSAGE
@@ -0,0 +1,6 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2013/06/10 12:24:29 ryoon Exp $
+
+euktoesp, euktopdf, and euktotex require LaTeX.
+You should install your favorite LaTeX.
+===========================================================================
diff --git a/math/eukleides/Makefile b/math/eukleides/Makefile
index 1c47a38d4de..ed3c9de005b 100644
--- a/math/eukleides/Makefile
+++ b/math/eukleides/Makefile
@@ -1,28 +1,43 @@
-# $NetBSD: Makefile,v 1.19 2012/09/11 23:04:18 asau Exp $
+# $NetBSD: Makefile,v 1.20 2013/06/10 12:24:29 ryoon Exp $
 
-DISTNAME=	eukleides.1.0.3
-PKGNAME=	eukleides-1.0.3
+DISTNAME=	eukleides-1.5.4
 CATEGORIES=	math
-MASTER_SITES=	http://www.eukleides.org/download/
+MASTER_SITES=	http://www.eukleides.org/files/
+EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	tsadowski@gmx.net
+MAINTAINER=	ryoon@NetBSD.org
 HOMEPAGE=	http://www.eukleides.org/
 COMMENT=	Euclidean geometry drawing language
+LICENSE=	gnu-gpl-v3
 
-MAKE_JOBS_SAFE=	no
+DEPENDS+=	getopt-[0-9]*:../../misc/getopt
 
-DEPENDS+=	pstoedit>=3.31:../../graphics/pstoedit
-
-BUILD_TARGET=	eukleides
-USE_TOOLS+=	bash:run bison gmake makeinfo lex
+USE_TOOLS+=	bash:run gmake lex makeinfo yacc
 INFO_FILES=	yes
 
-REPLACE_BASH=	euk2edit euk2eps
+REPLACE_BASH=	bash/*
+
+BUILDLINK_TRANSFORM+=	l:ncurses:curses
+
+FIND_PREFIX:=		GETOPTDIR=getopt
+.include "../../mk/find-prefix.mk"
+
+SUBST_CLASSES+=		getopt
+SUBST_STAGE.getopt=	pre-configure
+SUBST_MESSAGE.getopt=	Replacing getopt.
+SUBST_FILES.getopt=	bash/euktoeps
+SUBST_SED.getopt+=	-e 's,@GETOPT@,${GETOPTDIR}/bin/getopt,'
 
 INSTALL_MAKE_FLAGS=	${MAKE_FLAGS}					\
 			PREFIX=${DESTDIR}${PREFIX}			\
-			BINPATH=${DESTDIR}${PREFIX}/bin			\
-			INFODIR=${DESTDIR}${PREFIX}/${PKGINFODIR}	\
-			MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+			BIN_DIR=${DESTDIR}${PREFIX}/bin			\
+			INFO_DIR=${DESTDIR}${PREFIX}/${PKGINFODIR}	\
+			DOC_DIR=${DESTDIR}${PREFIX}/share/eukleides	\
+			MAN_DIR=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+
+pre-install:
+	${FIND} ${WRKSRC} -type f -name '*.orig' -exec ${RM} -f {} \;
 
+.include "../../mk/curses.buildlink3.mk"
+.include "../../devel/readline/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/eukleides/PLIST b/math/eukleides/PLIST
index b94cb124699..cdbfea5923d 100644
--- a/math/eukleides/PLIST
+++ b/math/eukleides/PLIST
@@ -1,8 +1,17 @@
-@comment $NetBSD: PLIST,v 1.6 2006/04/05 23:01:15 jlam Exp $
-bin/euk2edit
-bin/euk2eps
+@comment $NetBSD: PLIST,v 1.7 2013/06/10 12:24:29 ryoon Exp $
 bin/eukleides
+bin/euktoeps
+bin/euktopdf
+bin/euktopst
+bin/euktotex
 info/eukleides.info
-man/man1/euk2edit.1
-man/man1/euk2eps.1
 man/man1/eukleides.1
+man/man1/euktoeps.1
+man/man1/euktopdf.1
+man/man1/euktopst.1
+man/man1/euktotex.1
+share/eukleides/examples/greenwich.euk
+share/eukleides/examples/sundial.euk
+share/eukleides/examples/vonkoch.euk
+share/texmf/tex/latex/eukleides/eukleides.sty
+share/texmf/tex/latex/eukleides/eukleides.tex
diff --git a/math/eukleides/distinfo b/math/eukleides/distinfo
index aa9cb6aa802..a4429d9d7c9 100644
--- a/math/eukleides/distinfo
+++ b/math/eukleides/distinfo
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.7 2008/12/19 14:04:07 joerg Exp $
+$NetBSD: distinfo,v 1.8 2013/06/10 12:24:29 ryoon Exp $
 
-SHA1 (eukleides.1.0.3.tar.gz) = c3fd66c133a11d4b3ee2680c565f50e0a9b8b0c3
-RMD160 (eukleides.1.0.3.tar.gz) = 72988952e526b44eae5ac5d1d0543ccb896881b0
-Size (eukleides.1.0.3.tar.gz) = 50923 bytes
-SHA1 (patch-aa) = a41d01866d8dd1d200bedacc82644d6009581227
+SHA1 (eukleides-1.5.4.tar.bz2) = a608ccde9ec412cf9337c71afab613d9fd986427
+RMD160 (eukleides-1.5.4.tar.bz2) = 63da73f7147f57f48046071564b9865145cda09e
+Size (eukleides-1.5.4.tar.bz2) = 77410 bytes
+SHA1 (patch-Makefile) = 5fee73d0f18d399a3268140addb328b62e4669d8
+SHA1 (patch-bash_euktoeps) = 64e5fe59779197e2f03afd88823d53168f7bfa9a
+SHA1 (patch-doc_Makefile) = bee61472eb0d70ceb32fa9429e34dae2f6fece4d
+SHA1 (patch-man_Makefile) = b9224f78d60382bf921d29a25f10dbc596e5754f
diff --git a/math/eukleides/patches/patch-Makefile b/math/eukleides/patches/patch-Makefile
new file mode 100644
index 00000000000..20f80e94bb9
--- /dev/null
+++ b/math/eukleides/patches/patch-Makefile
@@ -0,0 +1,14 @@
+$NetBSD: patch-Makefile,v 1.1 2013/06/10 12:24:29 ryoon Exp $
+
+* Create installation target, bin/, directory.
+
+--- Makefile.orig	2010-04-27 06:31:00.000000000 +0000
++++ Makefile
+@@ -41,6 +41,7 @@ install: $(INSTALL_BINARIES) install_scr
+          install_man install_exm
+ 
+ $(INSTALL_BINARIES):
++	${BSD_INSTALL_PROGRAM_DIR} ${BIN_DIR}
+ 	@export BINARY=$(basename $@) && $(MAKEC) build install
+ 
+ install_scr:
diff --git a/math/eukleides/patches/patch-aa b/math/eukleides/patches/patch-aa
deleted file mode 100644
index 6236f71d0ba..00000000000
--- a/math/eukleides/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2008/12/19 14:04:08 joerg Exp $
-
---- parser.y.orig	2008-12-19 14:31:22.000000000 +0100
-+++ parser.y
-@@ -24,6 +24,7 @@
- #include "types.h"
- #include "geometry.h"
- #include "drawing.h"
-+#include "parser.tab.h"
- 
- int yylex(void);
- int warning(char *);
diff --git a/math/eukleides/patches/patch-bash_euktoeps b/math/eukleides/patches/patch-bash_euktoeps
new file mode 100644
index 00000000000..d3219b5beda
--- /dev/null
+++ b/math/eukleides/patches/patch-bash_euktoeps
@@ -0,0 +1,13 @@
+$NetBSD: patch-bash_euktoeps,v 1.1 2013/06/10 12:24:29 ryoon Exp $
+
+--- bash/euktoeps.orig	2010-04-27 06:31:00.000000000 +0000
++++ bash/euktoeps
+@@ -31,7 +31,7 @@ USAGE
+ exit $1
+ }
+ 
+-args=$(getopt -o i:l::#:d:vh --long include:,locale::,interactive:,data:,version,help \
++args=$(@GETOPT@ -o i:l::#:d:vh --long include:,locale::,interactive:,data:,version,help \
+        -n 'Euktoeps' -- "$@")
+ 
+ if [ $? -ne 0 ]
diff --git a/math/eukleides/patches/patch-doc_Makefile b/math/eukleides/patches/patch-doc_Makefile
new file mode 100644
index 00000000000..728c641ce74
--- /dev/null
+++ b/math/eukleides/patches/patch-doc_Makefile
@@ -0,0 +1,29 @@
+$NetBSD: patch-doc_Makefile,v 1.1 2013/06/10 12:24:29 ryoon Exp $
+
+* Use install-info command, instead of ginstall-info.
+* Install plain (un-gzipped) info file.
+
+--- doc/Makefile.orig	2010-04-27 06:31:00.000000000 +0000
++++ doc/Makefile
+@@ -47,10 +47,10 @@ INST_TARG := $(addprefix install_, $(DOC
+ 
+ install: $(INST_TARG)
+ 
+-install_info: eukleides.info.gz
++install_info: eukleides.info
+ 	@echo "    Installing info pages"
+ 	@install -d $(INFO_DIR)
+-	@ginstall-info --quiet $< $(INFO_DIR)/dir
++	@install-info --quiet $< $(INFO_DIR)/dir
+ 	@install -m 0644 $< $(INFO_DIR)
+ 
+ install_pdf: pdf
+@@ -78,7 +78,7 @@ install_nosplit: html
+ uninstall:
+ 	@$(RM) -r $(DOC_DIR)
+ ifneq ($(findstring info,$(DOC)),)
+-	@ginstall-info --quiet --remove eukleides $(INFO_DIR)/dir
++	@install-info --quiet --remove eukleides $(INFO_DIR)/dir
+ 	@$(RM) $(INFO_DIR)/eukleides.info.gz
+ endif
+ 
diff --git a/math/eukleides/patches/patch-man_Makefile b/math/eukleides/patches/patch-man_Makefile
new file mode 100644
index 00000000000..24112c2517b
--- /dev/null
+++ b/math/eukleides/patches/patch-man_Makefile
@@ -0,0 +1,15 @@
+$NetBSD: patch-man_Makefile,v 1.1 2013/06/10 12:24:29 ryoon Exp $
+
+* Install plain (not-gzipped) man pages.
+
+--- man/Makefile.orig	2010-04-27 06:31:00.000000000 +0000
++++ man/Makefile
+@@ -3,7 +3,7 @@
+ 
+ include ../Config
+ 
+-MAN_PAGES := $(addsuffix .gz, $(wildcard *.1))
++MAN_PAGES := $(wildcard *.1)
+ 
+ man: $(MAN_PAGES)
+