- Update to version 0.9.2.2

PR:		ports/63879
Submitted by:	Ports Fury

4 files changed, 23 insertions, 66 deletions

diff --git a/math/eukleides/Makefile b/math/eukleides/Makefile
index 2730fa317d11..82df689bfb71 100644
--- a/math/eukleides/Makefile
+++ b/math/eukleides/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	eukleides
-PORTVERSION=	0.9.2.1
-PORTREVISION=	1
+PORTVERSION=	0.9.2.2
 CATEGORIES=	math
 MASTER_SITES=	http://perso.wanadoo.fr/obrecht/download/
 DISTNAME=	${PORTNAME}.${PORTVERSION:R}rev${PORTVERSION:E}
@@ -19,12 +18,28 @@ COMMENT=	A Euclidean geometry drawing language
 RUN_DEPENDS=	pstoedit:${PORTSDIR}/graphics/pstoedit \
 		epstopdf:${PORTSDIR}/print/teTeX
 
-WRKSRC=		${WRKDIR}/${PORTNAME}.${PORTVERSION:R}
-
 USE_BISON=	yes
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
+MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS} -c"
+ALL_TARGET=	eukleides info
+
+MAN1=		eukleides.1
+MLINKS=		eukleides.1 euk2eps.1 \
+		eukleides.1 euk2edit.1
+INFO=		eukleides
+PLIST_FILES=	bin/euk2edit bin/euk2eps bin/eukleides
+
+post-patch:
+	${GREP} -lR "#!/bin/bash" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
+		's|#!/bin/bash|#!/bin/sh|g'
 
-MAN1=	eukleides.1
-MLINKS=	eukleides.1 euk2eps.1 eukleides.1 euk2edit.1
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/eukleides ${PREFIX}/bin/eukleides
+	${INSTALL_SCRIPT} ${WRKSRC}/euk2edit ${PREFIX}/bin/euk2edit
+	${INSTALL_SCRIPT} ${WRKSRC}/euk2eps ${PREFIX}/bin/euk2eps
+	${INSTALL_MAN} ${WRKSRC}/eukleides.man ${MANPREFIX}/man/man1/eukleides.1
+	${INSTALL_DATA} ${WRKSRC}/eukleides.info ${PREFIX}/info/eukleides.info
+	@install-info ${PREFIX}/info/eukleides.info ${PREFIX}/info/dir
 
 .include <bsd.port.mk>
diff --git a/math/eukleides/distinfo b/math/eukleides/distinfo
index 572131f72216..40fc0482899d 100644
--- a/math/eukleides/distinfo
+++ b/math/eukleides/distinfo
@@ -1,2 +1,2 @@
-MD5 (eukleides.0.9.2rev1.tar.gz) = 241018c6eabfcb653962eed750936d0e
-SIZE (eukleides.0.9.2rev1.tar.gz) = 46114
+MD5 (eukleides.0.9.2rev2.tar.gz) = d2284b3fcdd4dae8c864c39a29176ac1
+SIZE (eukleides.0.9.2rev2.tar.gz) = 46260
diff --git a/math/eukleides/files/patch-Makefile b/math/eukleides/files/patch-Makefile
deleted file mode 100644
index ab2080b21f8b..000000000000
--- a/math/eukleides/files/patch-Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
---- Makefile.orig	Tue Nov 12 06:25:09 2002
-+++ Makefile	Sat Dec 14 08:42:59 2002
-@@ -1,18 +1,20 @@
- # Eukleides 0.9.2 makefile
- # Copyright (c) Christian Obrecht 2000-2002
- 
--CC = gcc
--CFLAGS = -c -O2
-+CC ?= gcc
-+CFLAGS += -c
- OBJECTS = lex.yy.o parser.tab.o main.o geometry.o drawing.o
- LEX = flex
- YACC = bison -d
--PREFIX = /usr/local/
--BIN = $(PREFIX)bin/
--MAN = $(PREFIX)man/man1/
--INFO = $(PREFIX)info/
-+PREFIX ?= /usr/local/
-+BIN = $(PREFIX)/bin/
-+MAN = $(PREFIX)/man/man1/
-+INFO = $(PREFIX)/info/
- PAPER = --texinfo=@afourpaper
- DOC = eukleides.info eukleides.dvi eukleides.ps
- 
-+all : eukleides info
-+
- eukleides : $(OBJECTS)
- 	$(CC) -o $@ -lm $(OBJECTS)
- 
-@@ -42,15 +44,13 @@
- book : dvi
- 	dvips -f eukleides.dvi > eukleides.ps
- 
--install : eukleides man info
--	strip eukleides ; \
--	cp -f eukleides $(BIN)eukleides ; \
--	chmod +x euk2eps ; \
--	cp -f euk2eps $(BIN)euk2eps ; \
--	chmod +x euk2edit ; \
--	cp -f euk2edit $(BIN)euk2edit ; \
--	install-info eukleides.info $(INFO)dir ; \
--	cp -f eukleides.info $(INFO)eukleides.info
-+install : eukleides info
-+	${BSD_INSTALL_PROGRAM} eukleides $(BIN)eukleides
-+	${BSD_INSTALL_SCRIPT} euk2eps $(BIN)euk2eps
-+	${BSD_INSTALL_SCRIPT} euk2edit $(BIN)euk2edit
-+	${BSD_INSTALL_MAN} eukleides.man $(MAN)eukleides.1
-+	${BSD_INSTALL_DATA} eukleides.info $(INFO)eukleides.info
-+	install-info eukleides.info $(INFO)dir
- 
- uninstall :
- 	rm -f $(BIN)eukleides ; \
diff --git a/math/eukleides/pkg-plist b/math/eukleides/pkg-plist
deleted file mode 100644
index 89d0d8ec7345..000000000000
--- a/math/eukleides/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-bin/eukleides
-bin/euk2eps
-bin/euk2edit
-@unexec install-info --delete %D/info/eukleides.info %D/info/dir
-info/eukleides.info
-@exec install-info %D/info/eukleides.info %D/info/dir