Index: head/math/eukleides/Makefile
===================================================================
--- head/math/eukleides/Makefile	(revision 548253)
+++ head/math/eukleides/Makefile	(revision 548254)
@@ -1,58 +1,62 @@
 # Created by: ijliao
 # $FreeBSD$
 
 PORTNAME=	eukleides
 PORTVERSION=	1.5.4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	math
 MASTER_SITES=	http://www.eukleides.org/files/
 
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	Euclidean geometry drawing language
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	pstoedit:graphics/pstoedit \
 		getopt>=0:misc/getopt
 
-USE_TEX=	latex
 USES=		bison gettext iconv gmake readline:port tar:bzip2
+USE_TEX=	latex
 INSTALL_TARGET=	install PREFIX=${STAGEDIR}${PREFIX}
 
+# Fix build with clang11
+CFLAGS+=	-fcommon
+
 PORTDOCS=	de.pdf fr.pdf
 PORTEXAMPLES=	greenwich.euk sundial.euk vonkoch.euk
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 DOCS_USES=	makeinfo
 DOCS_USE=	TEX=pdftex:build
 DOCS_INFO=	eukleides
 
 post-patch:
 	@${GREP} -lR "#!/bin/bash" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
 		's|#!/bin/bash|#!/bin/sh|g'
 	@${GREP} -lR "ginstall-info" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
 		's|ginstall-info|install-info|g'
 	@${EGREP} -lR "%%[[:alpha:]]+%%" ${WRKSRC} |${XARGS} ${REINPLACE_CMD} \
 		 -e "s|%%PREFIX%%|${PREFIX}|g" \
 		 -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
 		 -e "s|%%EXAMPLESDIR%%|\$${PREFIX}/${EXAMPLESDIR_REL}|g" \
-		 -e "s|%%DOCSDIR%%|\$${PREFIX}/${DOCSDIR_REL}|g"
+		 -e "s|%%DOCSDIR%%|\$${PREFIX}/${DOCSDIR_REL}|g" \
+		 -e "s|%%CFLAGS%%|${CFLAGS}|g"
 	@${GREP} -lFR "gcc" ${WRKSRC} |${XARGS} ${REINPLACE_CMD} \
 		-e "s|gcc|${CC}|g"
 
 post-patch-DOCS-off:
 	@${REINPLACE_CMD} -e '/^install:/ s/install_doc//g' \
 		 -e '/^all:/ s/doc//g' ${WRKSRC}/Makefile
 
 post-patch-EXAMPLES-off:
 	@${REINPLACE_CMD} -e 's/install_exm$$//g' ${WRKSRC}/Makefile
 
 pre-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 
 post-install:
 	@${RM} ${STAGEDIR}${PREFIX}/bin/*.bak*
 
 .include <bsd.port.mk>
Index: head/math/eukleides/files/patch-bash_euktoeps
===================================================================
--- head/math/eukleides/files/patch-bash_euktoeps	(revision 548253)
+++ head/math/eukleides/files/patch-bash_euktoeps	(revision 548254)
@@ -1,11 +1,11 @@
---- bash/euktoeps.orig
+--- bash/euktoeps.orig	2010-04-27 06:31:00 UTC
 +++ bash/euktoeps
-@@ -31,7 +31,7 @@
+@@ -31,7 +31,7 @@ USAGE
  exit $1
  }
  
 -args=$(getopt -o i:l::#:d:vh --long include:,locale::,interactive:,data:,version,help \
 +args=$(%%LOCALBASE%%/bin/getopt -o i:l::#:d:vh --long include:,locale::,interactive:,data:,version,help \
         -n 'Euktoeps' -- "$@")
  
  if [ $? -ne 0 ]
Index: head/math/eukleides/files/patch-build_Makefile
===================================================================
--- head/math/eukleides/files/patch-build_Makefile	(revision 548253)
+++ head/math/eukleides/files/patch-build_Makefile	(revision 548254)
@@ -1,17 +1,18 @@
---- build/Makefile.orig
+--- build/Makefile.orig	2010-04-27 06:31:00 UTC
 +++ build/Makefile
-@@ -12,12 +12,12 @@
+@@ -12,12 +12,12 @@ LFLAGS = -8
  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)
+-CFLAGS = -Wall -D__$(BINARY)__ $(IFLAGS) $(MOFLAGS)
 -LDFLAGS = -lncurses -lreadline -lm
++CFLAGS = -Wall -D__$(BINARY)__ $(IFLAGS) $(MOFLAGS) %%CFLAGS%%
 +LDFLAGS = -lncurses -lreadline -lm "-L%%LOCALBASE%%/lib" -lintl
  VPATH = $(COMMON_DIR):$(MAIN_DIR):$(BUILD_DIR)
  
  $(BINARY):
Index: head/math/eukleides/files/patch-doc_eukleides.texi
===================================================================
--- head/math/eukleides/files/patch-doc_eukleides.texi	(revision 548253)
+++ head/math/eukleides/files/patch-doc_eukleides.texi	(revision 548254)
@@ -1,17 +1,17 @@
---- doc/eukleides.texi.orig
+--- doc/eukleides.texi.orig	2010-04-27 06:31:00 UTC
 +++ doc/eukleides.texi
 @@ -6,12 +6,14 @@
  
  % ------------------------------------------------------------------------------
  
 +@iftex
  \def\LaTeX{L\kern-.34em\raise.49ex\hbox{\sevenrm A}\kern-.18em\TeX}
  \def\mdeg{$^\circ$}
  \font\degfont=cmtt8
  \def\deg{\raise.7ex\hbox{\degfont o}}
  \def\exm#1{\noindent{\textit Example:}\quad{\texttt #1}}
  \def\exmp{\noindent{\textit Example:}}
 +@end iftex
  
  % ------------------------------------------------------------------------------
  
Index: head/math/eukleides/files/patch-man_Makefile
===================================================================
--- head/math/eukleides/files/patch-man_Makefile	(revision 548253)
+++ head/math/eukleides/files/patch-man_Makefile	(revision 548254)
@@ -1,17 +1,16 @@
---- man/Makefile.orig
+--- man/Makefile.orig	2010-04-27 06:31:00 UTC
 +++ man/Makefile
-@@ -3,13 +3,10 @@
+@@ -3,12 +3,9 @@
  
  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)