} ${WRKSRC}/doc/ecgitut.txt ${STAGEDIR}${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/TUTORIAL.md ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/ecgi/distinfo b/devel/ecgi/distinfo
index 823ebd9b2c92..2066531bfc75 100644
--- a/devel/ecgi/distinfo
+++ b/devel/ecgi/distinfo
@@ -1,2 +1,3 @@
-SHA256 (ecgi-0.6.3.tar.xz) = 154f6b13f7023d4eccf87c93f081b794784d6e2c26ea9027c22922ced47c54fd
-SIZE (ecgi-0.6.3.tar.xz) = 162116
+TIMESTAMP = 1777016164
+SHA256 (Sven-Dawitz-ecgi-v0.6.4_GH0.tar.gz) = e951c761782e1f813beeeecfa4493e494ad1349cbaf8138ca9b23de109168f94
+SIZE (Sven-Dawitz-ecgi-v0.6.4_GH0.tar.gz) = 43700
diff --git a/devel/ecgi/files/patch-Makefile b/devel/ecgi/files/patch-Makefile
deleted file mode 100644
index 8966f66e0e89..000000000000
--- a/devel/ecgi/files/patch-Makefile
+++ /dev/null
@@ -1,75 +0,0 @@
---- Makefile.orig	2014-04-26 01:07:05.381866626 -0700
-+++ Makefile	2014-04-26 01:19:01.457333201 -0700
-@@ -1,14 +1,14 @@
- SHAREDOPT = -shared
--LIBDIR = /usr/lib
--INCDIR = /usr/include
-+LIBDIR = $(PREFIX)/usr/lib
-+INCDIR = $(PREFIX)/include
- AR = ar
--CC = gcc
-+CC?= gcc
- INCS =  -Iinclude/ -I.
--FLAGS = -Wall
-+CFLAGS += -Wall
-
- all: obj/ecgi.o obj/ecgitk.o libecgi.a
--	make -C html2h/
--	make libecgi.so
-+	$(MAKE) -C html2h/
-+	$(MAKE) libecgi.so
-
- shared: libecgi.so
- 	cp libecgi.so /usr/lib
-@@ -18,33 +18,42 @@
- 	ar rs libecgi.a obj/ecgi.o obj/memfile.o obj/ecgitk.o
- 	printf "\n\n***congratulations - compilation worked***\n***       run 'make install' now       ***\n\n"
-
--libecgi.so: obj/ecgi.o obj/ecgitk.o
--	gcc $(SHAREDOPT) obj/ecgi.o obj/memfile.o obj/ecgitk.o -o libecgi.so
-+libecgi.so: obj/ecgi.So obj/ecgitk.So obj/memfile.So
-+	$(CC) $(SHAREDOPT) obj/ecgi.So obj/memfile.So obj/ecgitk.So -o libecgi.so
-
- install:
- 	cp libecgi.a $(LIBDIR)
- 	cp ecgi.h $(INCDIR)
- 	cp include/memfile.h $(INCDIR)
- 	cp ecgitk.h $(INCDIR)
--	make -C html2h/ install
-+	$(MAKE) -C html2h/ install
- 	cp libecgi.so $(LIBDIR)
-
- tests:	all
--	$(CC) tests/test.c -o tests/test.cgi $(INCS) $(FLAGS) libecgi.a
--	$(CC) tests/testload.c -o tests/testload libecgi.a $(INCS) $(FLAGS)
-+	$(CC) tests/test.c -o tests/test.cgi $(INCS) $(CFLAGS) libecgi.a
-+	$(CC) tests/testload.c -o tests/testload libecgi.a $(INCS) $(CFLAGS)
-
- obj/ecgi.o: src/ecgi.c ecgi.h obj/memfile.o
--	$(CC) -c src/ecgi.c $(INCS) $(FLAGS) -o obj/ecgi.o
-+	$(CC) -c src/ecgi.c $(INCS) $(CFLAGS) -o obj/ecgi.o
-
- obj/memfile.o:  src/memfile.c include/memfile.h
--	$(CC) -o obj/memfile.o -c src/memfile.c $(INCS) $(FLAGS)
-+	$(CC) -o obj/memfile.o -c src/memfile.c $(INCS) $(CFLAGS)
-
- obj/ecgitk.o: src/ecgitk.c ecgitk.h
--	$(CC) -c src/ecgitk.c $(INCS) $(FLAGS) -o obj/ecgitk.o
-+	$(CC) -c src/ecgitk.c $(INCS) $(CFLAGS) -o obj/ecgitk.o
-+
-+obj/ecgi.So: src/ecgi.c ecgi.h obj/memfile.o
-+	$(CC) -c src/ecgi.c $(INCS) $(CFLAGS) -fPIC -o obj/ecgi.So
-+
-+obj/memfile.So:  src/memfile.c include/memfile.h
-+	$(CC) -o obj/memfile.So -c src/memfile.c -fPIC $(INCS) $(CFLAGS)
-+
-+obj/ecgitk.So: src/ecgitk.c ecgitk.h
-+	$(CC) -c src/ecgitk.c $(INCS) $(CFLAGS) -fPIC -o obj/ecgitk.So
-
- clean:
- 	rm -f obj/* *.a *.so -f tests/test.cgi tests/testload
--	make -C html2h/ clean
-+	$(MAKE) -C html2h/ clean
-
- zip: clean
- 	rm -f ../ecgi-0.6.2.zip
diff --git a/devel/ecgi/files/patch-html2h_Makefile b/devel/ecgi/files/patch-html2h_Makefile
deleted file mode 100644
index 9633da73e99d..000000000000
--- a/devel/ecgi/files/patch-html2h_Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
---- html2h/Makefile.orig	2014-04-26 01:31:51.028376169 -0700
-+++ html2h/Makefile	2014-04-26 01:38:06.265403221 -0700
-@@ -1,11 +1,11 @@
--CC = gcc
-+CC?= gcc
- INCS =  -I../include/ -I.
--FLAGS = -Wall
-+CFLAGS += -Wall
- 
- all: html2h
- 
- html2h: html2h.c html2h.h
--	$(CC) html2h.c -o html2h $(INCS) $(FLAGS) ../obj/memfile.o
-+	$(CC) html2h.c -o html2h $(INCS) $(CFLAGS) ../obj/memfile.o
- 
- install: all
- 	cp html2h /usr/bin
diff --git a/devel/ecgi/files/patch-html2h_html2h.c b/devel/ecgi/files/patch-html2h_html2h.c
deleted file mode 100644
index 77ae70df2c42..000000000000
--- a/devel/ecgi/files/patch-html2h_html2h.c
+++ /dev/null
@@ -1,31 +0,0 @@
---- html2h/html2h.c.orig	2014-11-24 13:09:14.000000000 -0800
-+++ html2h/html2h.c	2014-11-24 13:25:12.000000000 -0800
-@@ -6,15 +6,10 @@
- 
- void usage()
- {
--	printf("
--html2h v0.1
--usage:
--	html2h input.html [output.h]
--
--	if output is not set, input.h will be generated and overwritten!
--
--	debug messages are written to stderr!
--
-+	printf("html2h v0.1\nusage:\n \
-++	html2h input.html [output.h]\n\n \
-++	if output is not set, input.h will be generated and overwritten!\n\n \
-++	debug messages are written to stderr!\n\n \
- ");
- 
- 	exit(0);
-@@ -415,4 +410,6 @@
- {
- 	fprintf(stderr, "%s%s\n", msg, comment);
- 	exit(1);
--}
-\ No newline at end of file
-+
-+}
-+
diff --git a/devel/ecgi/files/patch-src_ecgitk.c b/devel/ecgi/files/patch-src_ecgitk.c
deleted file mode 100644
index 26ce96bb3332..000000000000
--- a/devel/ecgi/files/patch-src_ecgitk.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/ecgitk.c.orig	2014-11-24 13:35:51.000000000 -0800
-+++ src/ecgitk.c	2014-11-24 13:36:16.000000000 -0800
-@@ -23,7 +23,7 @@
- {
- 	char buf[4096];
- 	int used;
--	va_list *ap;
-+	va_list ap;
- 
- 	va_start(ap, (void*)format);
- 	used=vsnprintf(buf, 4095, format, ap);