Update Algol 68 Genie compiler to 2.1.1

- Distribution now uses GNU configure, which simplifies things
- Docs and examples are no longer included
- Remove unneeded local patches
- Remove check for FreeBSD <= 6.x

Feature safe:	yes

4 files changed, 16 insertions, 94 deletions

diff --git a/lang/algol68g/Makefile b/lang/algol68g/Makefile
index 6565a00d13a6..a42d49ea25c0 100644
--- a/lang/algol68g/Makefile
+++ b/lang/algol68g/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	algol68g
-PORTVERSION=	2.0.3
+PORTVERSION=	2.1.1
 CATEGORIES=	lang
 MASTER_SITES=	http://www.xs4all.nl/~jmvdveer/
-DISTFILES=	${PORTNAME}-${PORTVERSION}.tgz
-EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}.tgz
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Alogol 68 Genie compiler
@@ -20,46 +19,29 @@ LIB_DEPENDS=	gsl.15:${PORTSDIR}/math/gsl
 OPTIONS=	PLOT "GNU plot support" On \
 		PGSQL "Postgresql support" On
 
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	-O -macosx -threads
-CONFIGURE_ENV+=	LOCALBASE=${LOCALBASE}
-MAKEFILE=	makefile
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=--enable-compiler
 
 MAN1=		a68g.1
-PLIST_FILES=	bin/a68g include/a68g.h
+PLIST_DIRS=	include/algol68g
+PLIST_FILES=	bin/a68g include/algol68g/a68g.h include/algol68g/a68g-config.h
 
 .include <bsd.port.options.mk>
 
 .ifdef WITH_PLOT
 LIB_DEPENDS+=	plot.4:${PORTSDIR}/graphics/plotutils
+.else
+CONFIGURE_ARGS+=--disable-plotutils
 .endif
 
 .ifdef WITH_PGSQL
 USE_PGSQL=	yes
+.else
+CONFIGURE_ARGS+=--disable-postgresql
 .endif
 
-post-install:
-	@:
-.ifndef NOPORTEXAMPLES
-	@${MKDIR} ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/demo/* ${EXAMPLESDIR}
-.endif
-.ifndef NOPORTDOCS
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${DISTDIR}/${PORTDOCS} ${DOCSDIR}
-
-PORTDOCS=	a68g-doc.pdf
-DISTFILES+=	${PORTDOCS}
-.endif
-
-.ifndef NOPORTEXAMPLES
-PORTEXAMPLES=	*
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000
-BROKEN=		does not build on 6.X
-.endif
+post-patch:
+	# Skip broken check, assume our $CC works
+	@${REINPLACE_CMD} -e 's/"xgcc"/"x${CC}"/' ${WRKSRC}/configure
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/lang/algol68g/distinfo b/lang/algol68g/distinfo
index b0be050b7258..78130b2d5dda 100644
--- a/lang/algol68g/distinfo
+++ b/lang/algol68g/distinfo
@@ -1,4 +1,4 @@
-SHA256 (algol68g-2.0.3.tgz) = 9a11fc89f9ce143b15b99502718e8268f6637226ac700ec0dd0ca24e3ad2c2dd
-SIZE (algol68g-2.0.3.tgz) = 370886
+SHA256 (algol68g-2.1.1.tgz) = 05a735dc457f1ea35d9f106a9bd65123dcfd13bd44b98ecac82b098ef3d6175c
+SIZE (algol68g-2.1.1.tgz) = 479416
 SHA256 (a68g-doc.pdf) = 064b6761207d937aa704d245fc871a072f5a33ea23a346cb136ec8b2078ea321
 SIZE (a68g-doc.pdf) = 2997138
diff --git a/lang/algol68g/files/patch-configure b/lang/algol68g/files/patch-configure
deleted file mode 100644
index 9af715d6569e..000000000000
--- a/lang/algol68g/files/patch-configure
+++ /dev/null
@@ -1,45 +0,0 @@
---- configure.orig	2010-11-11 21:19:08.000000000 +0100
-+++ configure	2010-11-12 13:00:29.000000000 +0100
-@@ -47,7 +47,7 @@ A68G_DOC="./doc"
- A68G_HTML_TEMPLATES="$A68G_DOC/html"
- A68G_LATEX_TEMPLATES="$A68G_DOC/latex"
- A68G_SOURCE="./source"
--SQL_DIR=$USR_LOC/pgsql
-+SQL_DIR=$USR_LOC
- UPLOAD_DIR="upload-$VERSION_NUMBER"
- BUILD_FILE="$A68G_SOURCE/$MAKEFILE"
- CONFIG_FILE="$A68G_SOURCE/config.h"
-@@ -700,14 +700,8 @@ then
- 	printf "checking for POSIX threads ... "
- 	if [ -f $USR_INC/pthread.h ]
- 	then
--		if [ -f $USR_LIB/libpthread.so -o -f $USR_LIB/libpthread.a -o -f $USR_LIB/libpthread.dylib ]
--		then
--			echo "yes"
--			echo "POSIX_THREADS_LIBS=-lpthread" 1>>$BUILD_FILE
-+			echo "POSIX_THREADS_LIBS=-pthread" 1>>$BUILD_FILE
- 			echo "POSIX_THREADS_FLAG=-DENABLE_PAR_CLAUSE" 1>>$BUILD_FILE
--		else
--			echo "no"
--		fi
- 	else
- 		echo "no"
- 	fi
-@@ -962,7 +956,7 @@ FLAGS=$(CPPFLAGS) $(STD_CFLAGS) $(POSIX_
- all:    a68g
- a68g:   $(CS)
- 	@echo "LINK a68g"
--	@$(CC) $(CS) -Wl,--export-dynamic $(CFLAGS) $(STD_LD_FLAGS) $(POSIX_THREADS_LIBS) $(PLOTUTILS_LIBS) $(GSL_LIBS) $(CURSES_LIBS) $(SQL_LIBS) $(READLINE_LIBS) -lm -ldl $(LD_FLAGS) -o a68g
-+	@$(CC) $(CS) -Wl,--export-dynamic $(CFLAGS) $(STD_LD_FLAGS) $(POSIX_THREADS_LIBS) $(PLOTUTILS_LIBS) $(GSL_LIBS) $(CURSES_LIBS) $(SQL_LIBS) $(READLINE_LIBS) -lm $(LD_FLAGS) -o a68g
- $(CS): $(HS)
- .c.o:
- 	@echo "CC $<"
-@@ -980,7 +974,7 @@ FLAGS=$(CPPFLAGS) $(STD_CFLAGS) $(POSIX_
- all:    a68g
- a68g:   $(CS)
- 	@echo "building a68g ..."
--	@$(CC) $(CS) -Wl $(CFLAGS) $(STD_LD_FLAGS) $(POSIX_THREADS_LIBS) $(PLOTUTILS_LIBS) $(GSL_LIBS) $(CURSES_LIBS) $(SQL_LIBS) $(READLINE_LIBS) -lm -ldl $(LD_FLAGS) -o a68g
-+	@$(CC) $(CS) -Wl $(CFLAGS) $(STD_LD_FLAGS) $(POSIX_THREADS_LIBS) $(PLOTUTILS_LIBS) $(GSL_LIBS) $(CURSES_LIBS) $(SQL_LIBS) $(READLINE_LIBS) -lm $(LD_FLAGS) -o a68g
- $(CS): $(HS)
- .c.o:
- 	@echo "compiling $<"
diff --git a/lang/algol68g/files/patch-source_algol68g.h b/lang/algol68g/files/patch-source_algol68g.h
deleted file mode 100644
index f8e95dec9dbd..000000000000
--- a/lang/algol68g/files/patch-source_algol68g.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- source/algol68g.h.orig	2010-09-09 10:16:58.000000000 +0200
-+++ source/algol68g.h	2010-09-09 09:58:41.000000000 +0200
-@@ -65,12 +65,6 @@ typedef unsigned STATUS_MASK;
- #endif
- #endif
- 
--#if defined ENABLE_MACOSX
--#define __off_t off_t
--#define __pid_t pid_t
--#define __mode_t mode_t
--#endif
--
- #if defined ENABLE_POSTGRESQL
- #include <libpq-fe.h>
- #endif