Mon Jun 10 12:24:29 2013 UTC ()
Update to 1.5.4

* Change to 1.5 branch. New implementation.


(ryoon)
diff -r0 -r1.1 pkgsrc/math/eukleides/MESSAGE
diff -r1.19 -r1.20 pkgsrc/math/eukleides/Makefile
diff -r1.6 -r1.7 pkgsrc/math/eukleides/PLIST
diff -r1.7 -r1.8 pkgsrc/math/eukleides/distinfo
diff -r0 -r1.1 pkgsrc/math/eukleides/patches/patch-Makefile
diff -r0 -r1.1 pkgsrc/math/eukleides/patches/patch-bash_euktoeps
diff -r0 -r1.1 pkgsrc/math/eukleides/patches/patch-doc_Makefile
diff -r0 -r1.1 pkgsrc/math/eukleides/patches/patch-man_Makefile
diff -r1.5 -r0 pkgsrc/math/eukleides/patches/patch-aa
File Added: pkgsrc/math/eukleides/MESSAGE
===========================================================================
$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.
===========================================================================
cvs diff -r1.19 -r1.20 pkgsrc/math/eukleides/Makefile (expand / switch to unified diff)

--- pkgsrc/math/eukleides/Makefile 2012/09/11 23:04:18 1.19
+++ pkgsrc/math/eukleides/Makefile 2013/06/10 12:24:29 1.20
@@ -1,28 +1,43 @@ @@ -1,28 +1,43 @@
1# $NetBSD: Makefile,v 1.19 2012/09/11 23:04:18 asau Exp $ 1# $NetBSD: Makefile,v 1.20 2013/06/10 12:24:29 ryoon Exp $
2 2
3DISTNAME= eukleides.1.0.3 3DISTNAME= eukleides-1.5.4
4PKGNAME= eukleides-1.0.3 
5CATEGORIES= math 4CATEGORIES= math
6MASTER_SITES= http://www.eukleides.org/download/ 5MASTER_SITES= http://www.eukleides.org/files/
 6EXTRACT_SUFX= .tar.bz2
7 7
8MAINTAINER= tsadowski@gmx.net 8MAINTAINER= ryoon@NetBSD.org
9HOMEPAGE= http://www.eukleides.org/ 9HOMEPAGE= http://www.eukleides.org/
10COMMENT= Euclidean geometry drawing language 10COMMENT= Euclidean geometry drawing language
 11LICENSE= gnu-gpl-v3
11 12
12MAKE_JOBS_SAFE= no 13DEPENDS+= getopt-[0-9]*:../../misc/getopt
13 14
14DEPENDS+= pstoedit>=3.31:../../graphics/pstoedit 15USE_TOOLS+= bash:run gmake lex makeinfo yacc
15 
16BUILD_TARGET= eukleides 
17USE_TOOLS+= bash:run bison gmake makeinfo lex 
18INFO_FILES= yes 16INFO_FILES= yes
19 17
20REPLACE_BASH= euk2edit euk2eps 18REPLACE_BASH= bash/*
 19
 20BUILDLINK_TRANSFORM+= l:ncurses:curses
 21
 22FIND_PREFIX:= GETOPTDIR=getopt
 23.include "../../mk/find-prefix.mk"
 24
 25SUBST_CLASSES+= getopt
 26SUBST_STAGE.getopt= pre-configure
 27SUBST_MESSAGE.getopt= Replacing getopt.
 28SUBST_FILES.getopt= bash/euktoeps
 29SUBST_SED.getopt+= -e 's,@GETOPT@,${GETOPTDIR}/bin/getopt,'
21 30
22INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} \ 31INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} \
23 PREFIX=${DESTDIR}${PREFIX} \ 32 PREFIX=${DESTDIR}${PREFIX} \
24 BINPATH=${DESTDIR}${PREFIX}/bin \ 33 BIN_DIR=${DESTDIR}${PREFIX}/bin \
25 INFODIR=${DESTDIR}${PREFIX}/${PKGINFODIR} \ 34 INFO_DIR=${DESTDIR}${PREFIX}/${PKGINFODIR} \
26 MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 35 DOC_DIR=${DESTDIR}${PREFIX}/share/eukleides \
 36 MAN_DIR=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 37
 38pre-install:
 39 ${FIND} ${WRKSRC} -type f -name '*.orig' -exec ${RM} -f {} \;
27 40
 41.include "../../mk/curses.buildlink3.mk"
 42.include "../../devel/readline/buildlink3.mk"
28.include "../../mk/bsd.pkg.mk" 43.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/math/eukleides/PLIST (expand / switch to unified diff)

--- pkgsrc/math/eukleides/PLIST 2006/04/05 23:01:15 1.6
+++ pkgsrc/math/eukleides/PLIST 2013/06/10 12:24:29 1.7
@@ -1,8 +1,17 @@ @@ -1,8 +1,17 @@
1@comment $NetBSD: PLIST,v 1.6 2006/04/05 23:01:15 jlam Exp $ 1@comment $NetBSD: PLIST,v 1.7 2013/06/10 12:24:29 ryoon Exp $
2bin/euk2edit 
3bin/euk2eps 
4bin/eukleides 2bin/eukleides
 3bin/euktoeps
 4bin/euktopdf
 5bin/euktopst
 6bin/euktotex
5info/eukleides.info 7info/eukleides.info
6man/man1/euk2edit.1 
7man/man1/euk2eps.1 
8man/man1/eukleides.1 8man/man1/eukleides.1
 9man/man1/euktoeps.1
 10man/man1/euktopdf.1
 11man/man1/euktopst.1
 12man/man1/euktotex.1
 13share/eukleides/examples/greenwich.euk
 14share/eukleides/examples/sundial.euk
 15share/eukleides/examples/vonkoch.euk
 16share/texmf/tex/latex/eukleides/eukleides.sty
 17share/texmf/tex/latex/eukleides/eukleides.tex
cvs diff -r1.7 -r1.8 pkgsrc/math/eukleides/distinfo (expand / switch to unified diff)

--- pkgsrc/math/eukleides/distinfo 2008/12/19 14:04:07 1.7
+++ pkgsrc/math/eukleides/distinfo 2013/06/10 12:24:29 1.8
@@ -1,6 +1,9 @@ @@ -1,6 +1,9 @@
1$NetBSD: distinfo,v 1.7 2008/12/19 14:04:07 joerg Exp $ 1$NetBSD: distinfo,v 1.8 2013/06/10 12:24:29 ryoon Exp $
2 2
3SHA1 (eukleides.1.0.3.tar.gz) = c3fd66c133a11d4b3ee2680c565f50e0a9b8b0c3 3SHA1 (eukleides-1.5.4.tar.bz2) = a608ccde9ec412cf9337c71afab613d9fd986427
4RMD160 (eukleides.1.0.3.tar.gz) = 72988952e526b44eae5ac5d1d0543ccb896881b0 4RMD160 (eukleides-1.5.4.tar.bz2) = 63da73f7147f57f48046071564b9865145cda09e
5Size (eukleides.1.0.3.tar.gz) = 50923 bytes 5Size (eukleides-1.5.4.tar.bz2) = 77410 bytes
6SHA1 (patch-aa) = a41d01866d8dd1d200bedacc82644d6009581227 6SHA1 (patch-Makefile) = 5fee73d0f18d399a3268140addb328b62e4669d8
 7SHA1 (patch-bash_euktoeps) = 64e5fe59779197e2f03afd88823d53168f7bfa9a
 8SHA1 (patch-doc_Makefile) = bee61472eb0d70ceb32fa9429e34dae2f6fece4d
 9SHA1 (patch-man_Makefile) = b9224f78d60382bf921d29a25f10dbc596e5754f
File Added: pkgsrc/math/eukleides/patches/patch-Makefile
$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:
File Added: pkgsrc/math/eukleides/patches/patch-bash_euktoeps
$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 ]
File Added: pkgsrc/math/eukleides/patches/patch-doc_Makefile
$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
File Added: pkgsrc/math/eukleides/patches/patch-man_Makefile
$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)
File Deleted: pkgsrc/math/eukleides/patches/Attic/patch-aa