(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);