ports/145771: Update Port: math/eukleides to v. 1.5.3
Ashish SHUKLA
wahjava at gmail.com
Sat Apr 17 07:50:01 UTC 2010
>Number: 145771
>Category: ports
>Synopsis: Update Port: math/eukleides to v. 1.5.3
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Apr 17 07:50:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Ashish SHUKLA
>Release: FreeBSD 8.0-RELEASE-p2 amd64
>Organization:
N/A
>Environment:
System: FreeBSD chateau.d.if 8.0-RELEASE-p2 FreeBSD 8.0-RELEASE-p2 #3: Tue Mar 2 01:06:00 IST 2010 root at chateau.d.if:/usr/obj/usr/src/sys/CHATEAU amd64
>Description:
I want to adopt this port. So, please refer to the attached diff file while also updates the port to the latest version.
Thanks
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/math/eukleides/Makefile eukleides/Makefile
--- /usr/ports/math/eukleides/Makefile 2010-03-28 12:09:21.000000000 +0530
+++ eukleides/Makefile 2010-04-17 12:39:23.000000000 +0530
@@ -7,41 +7,53 @@
#
PORTNAME= eukleides
-PORTVERSION= 1.0.3
-PORTREVISION= 5
+PORTVERSION= 1.5.3
CATEGORIES= math
-MASTER_SITES= http://www.eukleides.org/download/
-DISTNAME= ${PORTNAME}.${PORTVERSION}
+MASTER_SITES= http://www.eukleides.org/files/
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER= wahjava at gmail.com
COMMENT= A Euclidean geometry drawing language
+LIB_DEPENDS= readline.6:${PORTSDIR}/devel/readline
RUN_DEPENDS= pstoedit:${PORTSDIR}/graphics/pstoedit \
epstopdf:${PORTSDIR}/print/teTeX-base
+USE_BZIP2= yes
USE_BISON= build
USE_GMAKE= yes
-MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} -c"
-ALL_TARGET= eukleides info
+USE_GETTEXT= yes
+USE_ICONV= yes
-MAN1= eukleides.1
-MLINKS= eukleides.1 euk2eps.1 \
- eukleides.1 euk2edit.1
+MAN1= eukleides.1 euktoeps.1 euktopdf.1 euktopst.1 euktotex.1
+PORTEXAMPLES= greenwich.euk sundial.euk vonkoch.euk
+
+.ifndef NOPORTDOCS
+BUILD_DEPENDS= pdflatex:${PORTSDIR}/print/teTeX-base
+PORTDOCS= de.pdf fr.pdf
INFO= eukleides
+.endif
post-patch:
${GREP} -lR "#!/bin/bash" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
's|#!/bin/bash|#!/bin/sh|g'
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/eukleides ${PREFIX}/bin
- ${INSTALL_SCRIPT} ${WRKSRC}/euk2edit ${PREFIX}/bin
- ${INSTALL_SCRIPT} ${WRKSRC}/euk2eps ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/eukleides.1 ${MANPREFIX}/man/man1
- ${INSTALL_DATA} ${WRKSRC}/eukleides.info ${PREFIX}/${INFO_PATH}
-.if !defined(NOPORTDOCS)
- @${MKDIR} ${EXAMPLESDIR}
- ${INSTALL_DATA} ${WRKSRC}/samples/*.euk ${EXAMPLESDIR}
+ ${GREP} -lR "ginstall-info" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
+ 's|ginstall-info|install-info|g'
+ ${GREP} -lR "%%[[:alpha:]]\+%%" ${WRKSRC} |${XARGS} ${REINPLACE_CMD} \
+ -e "s|%%PREFIX%%|${PREFIX}|g" \
+ -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
+ -e "s|%%EXAMPLESDIR%%|${EXAMPLESDIR}|g" \
+ -e "s|%%DOCSDIR%%|${DOCSDIR}|g"
+.ifdef NOPORTDOCS
+ ${REINPLACE_CMD} -e '/^install:/ s/install_doc//g' \
+ -e '/^all:/ s/doc//g' ${WRKSRC}/Makefile
.endif
+pre-install:
+ ${MKDIR} ${EXAMPLESDIR}
+
+post-install:
+ for i in euktoeps euktopdf euktotex; do \
+ ${RM} ${PREFIX}/bin/$${i}.bak; \
+ done
+
.include <bsd.port.mk>
diff -urN /usr/ports/math/eukleides/distinfo eukleides/distinfo
--- /usr/ports/math/eukleides/distinfo 2005-11-23 06:52:54.000000000 +0530
+++ eukleides/distinfo 2010-04-17 09:54:49.000000000 +0530
@@ -1,3 +1,3 @@
-MD5 (eukleides.1.0.3.tar.gz) = a0ab145109bd3804d9550b3bf3306c05
-SHA256 (eukleides.1.0.3.tar.gz) = 13d1f959c3c352939d763db96f0aac6be286825919cc156c3c702624a0e53fb0
-SIZE (eukleides.1.0.3.tar.gz) = 50915
+MD5 (eukleides-1.5.3.tar.bz2) = 5bcc9c18b3565100010456079937f01a
+SHA256 (eukleides-1.5.3.tar.bz2) = a9c2f08497d3cb48832fb332784fb4f53a0b1e38f98ce44031773873d97ac32c
+SIZE (eukleides-1.5.3.tar.bz2) = 77439
diff -urN /usr/ports/math/eukleides/files/patch-Config eukleides/files/patch-Config
--- /usr/ports/math/eukleides/files/patch-Config 1970-01-01 05:30:00.000000000 +0530
+++ eukleides/files/patch-Config 2010-04-17 12:36:31.000000000 +0530
@@ -0,0 +1,35 @@
+
+$FreeBSD$
+
+--- Config.orig
++++ Config
+@@ -2,13 +2,13 @@
+ # Copyright (c) Christian Obrecht 2004-2010
+
+ # Installation prefix
+-PREFIX=/usr/local
++PREFIX=%%PREFIX%%
+
+ BINARIES = eukleides euktopst
+
+ # Localized keywords
+ # Uncomment to enable this feature.
+-# LOCALES = de fr
++LOCALES = de fr
+
+ # Documentation
+ # Alternative targets are 'pdf' and 'html'.
+@@ -27,9 +27,9 @@
+ BIN_DIR = $(PREFIX)/bin
+ SHARE_DIR = $(PREFIX)/share
+ MO_DIR = $(SHARE_DIR)/locale
+-DOC_DIR = $(SHARE_DIR)/doc/eukleides
+-EXM_DIR = $(DOC_DIR)/examples
+-MAN_DIR = $(SHARE_DIR)/man/man1
+-INFO_DIR = $(SHARE_DIR)/info
++DOC_DIR = %%DOCSDIR%%
++EXM_DIR = %%EXAMPLESDIR%%
++MAN_DIR = $(PREFIX)/man/man1
++INFO_DIR = $(PREFIX)/info
+ TEX_DIR = $(SHARE_DIR)/texmf/tex/latex/eukleides
+
diff -urN /usr/ports/math/eukleides/files/patch-build_Makefile eukleides/files/patch-build_Makefile
--- /usr/ports/math/eukleides/files/patch-build_Makefile 1970-01-01 05:30:00.000000000 +0530
+++ eukleides/files/patch-build_Makefile 2010-04-17 12:07:43.000000000 +0530
@@ -0,0 +1,20 @@
+
+$FreeBSD$
+
+--- build/Makefile.orig
++++ build/Makefile
+@@ -12,12 +12,12 @@
+ YACC = bison
+ YFLAGS = -d
+ CC = gcc
+-IFLAGS = -I$(COMMON_DIR) -I$(MAIN_DIR) -I$(BUILD_DIR)
++IFLAGS = -I$(COMMON_DIR) -I$(MAIN_DIR) -I$(BUILD_DIR) "-I%%LOCALBASE%%/include"
+ ifneq ($(strip $(LOCALES)),)
+ MOFLAGS = -DMO_DIR=\"$(MO_DIR)\"
+ endif
+ CFLAGS = -Wall -D__$(BINARY)__ $(IFLAGS) $(MOFLAGS)
+-LDFLAGS = -lncurses -lreadline -lm
++LDFLAGS = -lncurses -lreadline -lm "-L%%LOCALBASE%%/lib" -lintl
+ VPATH = $(COMMON_DIR):$(MAIN_DIR):$(BUILD_DIR)
+
+ $(BINARY):
diff -urN /usr/ports/math/eukleides/files/patch-build_Makefile~ eukleides/files/patch-build_Makefile~
--- /usr/ports/math/eukleides/files/patch-build_Makefile~ 1970-01-01 05:30:00.000000000 +0530
+++ eukleides/files/patch-build_Makefile~ 2010-04-17 11:36:55.000000000 +0530
@@ -0,0 +1,20 @@
+
+$FreeBSD$
+
+--- build/Makefile.orig
++++ build/Makefile
+@@ -12,12 +12,12 @@
+ YACC = bison
+ YFLAGS = -d
+ CC = gcc
+-IFLAGS = -I$(COMMON_DIR) -I$(MAIN_DIR) -I$(BUILD_DIR)
++IFLAGS = -I$(COMMON_DIR) -I$(MAIN_DIR) -I$(BUILD_DIR) "-I%%LOCALBASE%%/../include" "-I%%LOCALBASE%%/include"
+ ifneq ($(strip $(LOCALES)),)
+ MOFLAGS = -DMO_DIR=\"$(MO_DIR)\"
+ endif
+ CFLAGS = -Wall -D__$(BINARY)__ $(IFLAGS) $(MOFLAGS)
+-LDFLAGS = -lncurses -lreadline -lm
++LDFLAGS = -lncurses -lreadline -lm "-L%%LOCALBASE%%/lib" -lintl
+ VPATH = $(COMMON_DIR):$(MAIN_DIR):$(BUILD_DIR)
+
+ $(BINARY):
diff -urN /usr/ports/math/eukleides/files/patch-man_Makefile eukleides/files/patch-man_Makefile
--- /usr/ports/math/eukleides/files/patch-man_Makefile 1970-01-01 05:30:00.000000000 +0530
+++ eukleides/files/patch-man_Makefile 2010-04-17 11:05:49.000000000 +0530
@@ -0,0 +1,20 @@
+
+$FreeBSD$
+
+--- man/Makefile.orig
++++ man/Makefile
+@@ -3,13 +3,10 @@
+
+ include ../Config
+
+-MAN_PAGES := $(addsuffix .gz, $(wildcard *.1))
++MAN_PAGES := $(wildcard *.1)
+
+ man: $(MAN_PAGES)
+
+-%.1.gz: %.1
+- @gzip -c $< > $@
+-
+ install: $(MAN_PAGES)
+ @install -d $(MAN_DIR)
+ @install -m 0644 $^ $(MAN_DIR)
diff -urN /usr/ports/math/eukleides/files/patch-parser.y eukleides/files/patch-parser.y
--- /usr/ports/math/eukleides/files/patch-parser.y 2009-03-13 23:10:03.000000000 +0530
+++ eukleides/files/patch-parser.y 1970-01-01 05:30:00.000000000 +0530
@@ -1,21 +0,0 @@
---- parser.y.orig 2009-03-13 18:38:32.000000000 +0100
-+++ parser.y 2009-03-13 18:38:19.000000000 +0100
-@@ -29,7 +29,6 @@
- int warning(char *);
- int yyerror(char *);
-
--int drawing_style = FULL;
- symrec* tracevar;
- double tracestep, tracebegin;
- int tracestyle, traceind = -1;
-@@ -93,6 +92,10 @@
- %type <flag> drawing_flag segment_marking_flag angle_marking_flag color_flag
- %type <string> ident
-
-+%{
-+int drawing_style = FULL;
-+%}
-+
- %%
-
- input:
diff -urN /usr/ports/math/eukleides/pkg-plist eukleides/pkg-plist
--- /usr/ports/math/eukleides/pkg-plist 2005-03-04 15:45:57.000000000 +0530
+++ eukleides/pkg-plist 2010-04-17 12:12:54.000000000 +0530
@@ -1,24 +1,13 @@
-bin/euk2edit
-bin/euk2eps
bin/eukleides
-%%PORTDOCS%%%%EXAMPLESDIR%%/abdul_al_wafa.euk
-%%PORTDOCS%%%%EXAMPLESDIR%%/agnesi.euk
-%%PORTDOCS%%%%EXAMPLESDIR%%/angles.euk
-%%PORTDOCS%%%%EXAMPLESDIR%%/archimedes.euk
-%%PORTDOCS%%%%EXAMPLESDIR%%/bisectors.euk
-%%PORTDOCS%%%%EXAMPLESDIR%%/gravity_center.euk
-%%PORTDOCS%%%%EXAMPLESDIR%%/inequality.euk
-%%PORTDOCS%%%%EXAMPLESDIR%%/intercept.euk
-%%PORTDOCS%%%%EXAMPLESDIR%%/intersection.euk
-%%PORTDOCS%%%%EXAMPLESDIR%%/lines_and_circles.euk
-%%PORTDOCS%%%%EXAMPLESDIR%%/locus.euk
-%%PORTDOCS%%%%EXAMPLESDIR%%/morley.euk
-%%PORTDOCS%%%%EXAMPLESDIR%%/orthocenter.euk
-%%PORTDOCS%%%%EXAMPLESDIR%%/parallelogram.euk
-%%PORTDOCS%%%%EXAMPLESDIR%%/pascal.euk
-%%PORTDOCS%%%%EXAMPLESDIR%%/perdigal.euk
-%%PORTDOCS%%%%EXAMPLESDIR%%/pstexample.euk
-%%PORTDOCS%%%%EXAMPLESDIR%%/quadrilateral.euk
-%%PORTDOCS%%%%EXAMPLESDIR%%/similar.euk
-%%PORTDOCS%%%%EXAMPLESDIR%%/vecten.euk
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+bin/euktoeps
+bin/euktopdf
+bin/euktopst
+bin/euktotex
+share/locale/de/LC_MESSAGES/eukleides.mo
+share/locale/fr/LC_MESSAGES/eukleides.mo
+share/texmf/tex/latex/eukleides/eukleides.sty
+share/texmf/tex/latex/eukleides/eukleides.tex
+ at dirrm share/texmf/tex/latex/eukleides
+ at dirrmtry share/texmf/tex/latex
+ at dirrmtry share/texmf/tex
+ at dirrmtry share/texmf
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list