Update to 1.5.4

* Change to 1.5 branch. New implementation.

5 files changed, 71 insertions, 12 deletions

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)
+