Attachment 143758 Details for Bug 189010 – UPDATE superceeds previous attachments

UPDATE superceeds previous attachments

ecgi.shar (text/shar), 7.39 KB, created by Chris Hutchinson on 2014-06-13 21:41:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Hutchinson

Created: 2014-06-13 21:41:01 UTC

Size: 7.39 KB

patch

obsolete

># This is a shell archive.  Save it in a file, remove anything before
># this line, and then unpack it by entering "sh file".  Note, it may
># create directories; files and directories will be owned by you and
># have default permissions.
>#
># This archive contains:
>#
>#	ecgi
>#	ecgi/Makefile
>#	ecgi/pkg-descr
>#	ecgi/pkg-plist
>#	ecgi/files
>#	ecgi/files/patch-Makefile
>#	ecgi/files/patch-html2h_html2h.c
>#	ecgi/files/patch-src_ecgitk.c
>#	ecgi/files/patch-html2h_Makefile
>#	ecgi/distinfo
>#
>echo c - ecgi
>mkdir -p ecgi > /dev/null 2>&1
>echo x - ecgi/Makefile
>sed 's/^X//' >ecgi/Makefile << '1acfcb5e92527dacfead4325897806d6'
>X# Created by: C Hutchinson <portmaster@bsdforge.com>
>X# devel/ecgi/Makefile 2014-04-24 22:32:30
>X#
>X
>XPORTNAME=	ecgi
>XPORTVERSION=	0.6.2
>XPORTREVISION=	2
>XCATEGORIES=	devel
>XMASTER_SITES=	http://bsdforge.com/projects/source/devel/ecgi/
>X
>XMAINTAINER=	portmaster@bsdforge.com
>XCOMMENT=	A library for the creation of CGI-based Web applications
>X
>XWRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
>X
>XUSES+= gmake
>XUSE_LDCONFIG=	yes
>XUSES= tar:xz
>X
>XHEADER_FILES=	ecgi.h ecgitk.h include/memfile.h
>X
>X# FUTURE USE? && reconciling final conditional to match?
>X#OPTIONS_DEFINE=	DOCS
>X#.include <bsd.port.options.mk>
>X
>Xpre-patch:
>X	@${REINPLACE_CMD} -e 's,<malloc.h>,<stdlib.h>,' ${WRKSRC}/src/memfile.c
>X
>Xdo-install:
>X	${INSTALL_DATA} ${WRKSRC}/libecgi.a ${STAGEDIR}${PREFIX}/lib
>X	${INSTALL_PROGRAM} ${WRKSRC}/libecgi.so ${STAGEDIR}${PREFIX}/lib
>X	${INSTALL_PROGRAM} ${WRKSRC}/html2h/html2h ${STAGEDIR}${PREFIX}/bin
>X	@${MKDIR} ${STAGEDIR}${PREFIX}/include/ecgi
>X.for file in ${HEADER_FILES}
>X	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${PREFIX}/include/ecgi
>X.endfor
>X.if !defined(NOPORTDOCS)
>X	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>X	${INSTALL_DATA} ${WRKSRC}/doc/ecgitut.txt ${STAGEDIR}${DOCSDIR}
>X.endif
>X
>X.include <bsd.port.mk>
>1acfcb5e92527dacfead4325897806d6
>echo x - ecgi/pkg-descr
>sed 's/^X//' >ecgi/pkg-descr << '3dea9cba0e3a9326733b5bc785a8f8f9'
>Xecgi (easy CGI Libary) is an ANSI C library for the creation of
>XCGI-based Web applications. It transparently supports the CGI methods
>XGET and POST and also multipart/form-data file uploads. The user
>Xinterface is designed to be as easy as possible and maintains full
>Xcompatibility to cgic 0.5.
>X
>XIt also contains a library independent introduction to CGI programming
>Xwith C, a .html to .h HTML template preprocessor, and fast,
>Xblock-allocating memory files.
>3dea9cba0e3a9326733b5bc785a8f8f9
>echo x - ecgi/pkg-plist
>sed 's/^X//' >ecgi/pkg-plist << '65b7372ac55d41aacddf153c3d80e2b0'
>Xbin/html2h
>Xlib/libecgi.a
>Xlib/libecgi.so
>Xinclude/ecgi/ecgi.h
>Xinclude/ecgi/ecgitk.h
>Xinclude/ecgi/memfile.h
>X%%PORTDOCS%%share/doc/ecgi/ecgitut.txt
>X%%PORTDOCS%%@dirrm share/doc/ecgi
>X@dirrm include/ecgi
>65b7372ac55d41aacddf153c3d80e2b0
>echo c - ecgi/files
>mkdir -p ecgi/files > /dev/null 2>&1
>echo x - ecgi/files/patch-Makefile
>sed 's/^X//' >ecgi/files/patch-Makefile << 'ed2377f4b4353d02db60b422d78aa216'
>X--- Makefile.orig	2014-04-26 01:07:05.381866626 -0700
>X+++ Makefile	2014-04-26 01:19:01.457333201 -0700
>X@@ -1,14 +1,14 @@
>X SHAREDOPT = -shared
>X-LIBDIR = /usr/lib
>X-INCDIR = /usr/include
>X+LIBDIR = $(PREFIX)/usr/lib
>X+INCDIR = $(PREFIX)/include
>X AR = ar
>X-CC = gcc
>X+CC?= gcc
>X INCS =  -Iinclude/ -I.
>X-FLAGS = -Wall
>X+CFLAGS += -Wall
>X
>X all: obj/ecgi.o obj/ecgitk.o libecgi.a
>X-	make -C html2h/
>X-	make libecgi.so
>X+	$(MAKE) -C html2h/
>X+	$(MAKE) libecgi.so
>X
>X shared: libecgi.so
>X 	cp libecgi.so /usr/lib
>X@@ -18,33 +18,42 @@
>X 	ar rs libecgi.a obj/ecgi.o obj/memfile.o obj/ecgitk.o
>X 	printf "\n\n***congratulations - compilation worked***\n***       run 'make install' now       ***\n\n"
>X
>X-libecgi.so: obj/ecgi.o obj/ecgitk.o
>X-	gcc $(SHAREDOPT) obj/ecgi.o obj/memfile.o obj/ecgitk.o -o libecgi.so
>X+libecgi.so: obj/ecgi.So obj/ecgitk.So obj/memfile.So
>X+	$(CC) $(SHAREDOPT) obj/ecgi.So obj/memfile.So obj/ecgitk.So -o libecgi.so
>X
>X install:
>X 	cp libecgi.a $(LIBDIR)
>X 	cp ecgi.h $(INCDIR)
>X 	cp include/memfile.h $(INCDIR)
>X 	cp ecgitk.h $(INCDIR)
>X-	make -C html2h/ install
>X+	$(MAKE) -C html2h/ install
>X 	cp libecgi.so $(LIBDIR)
>X
>X tests:	all
>X-	$(CC) tests/test.c -o tests/test.cgi $(INCS) $(FLAGS) libecgi.a
>X-	$(CC) tests/testload.c -o tests/testload libecgi.a $(INCS) $(FLAGS)
>X+	$(CC) tests/test.c -o tests/test.cgi $(INCS) $(CFLAGS) libecgi.a
>X+	$(CC) tests/testload.c -o tests/testload libecgi.a $(INCS) $(CFLAGS)
>X
>X obj/ecgi.o: src/ecgi.c ecgi.h obj/memfile.o
>X-	$(CC) -c src/ecgi.c $(INCS) $(FLAGS) -o obj/ecgi.o
>X+	$(CC) -c src/ecgi.c $(INCS) $(CFLAGS) -o obj/ecgi.o
>X
>X obj/memfile.o:  src/memfile.c include/memfile.h
>X-	$(CC) -o obj/memfile.o -c src/memfile.c $(INCS) $(FLAGS)
>X+	$(CC) -o obj/memfile.o -c src/memfile.c $(INCS) $(CFLAGS)
>X
>X obj/ecgitk.o: src/ecgitk.c ecgitk.h
>X-	$(CC) -c src/ecgitk.c $(INCS) $(FLAGS) -o obj/ecgitk.o
>X+	$(CC) -c src/ecgitk.c $(INCS) $(CFLAGS) -o obj/ecgitk.o
>X+
>X+obj/ecgi.So: src/ecgi.c ecgi.h obj/memfile.o
>X+	$(CC) -c src/ecgi.c $(INCS) $(CFLAGS) -fPIC -o obj/ecgi.So
>X+
>X+obj/memfile.So:  src/memfile.c include/memfile.h
>X+	$(CC) -o obj/memfile.So -c src/memfile.c -fPIC $(INCS) $(CFLAGS)
>X+
>X+obj/ecgitk.So: src/ecgitk.c ecgitk.h
>X+	$(CC) -c src/ecgitk.c $(INCS) $(CFLAGS) -fPIC -o obj/ecgitk.So
>X
>X clean:
>X 	rm -f obj/* *.a *.so -f tests/test.cgi tests/testload
>X-	make -C html2h/ clean
>X+	$(MAKE) -C html2h/ clean
>X
>X zip: clean
>X 	rm -f ../ecgi-0.6.2.zip
>ed2377f4b4353d02db60b422d78aa216
>echo x - ecgi/files/patch-html2h_html2h.c
>sed 's/^X//' >ecgi/files/patch-html2h_html2h.c << '8b6dc56a8eded85aedfb390626d09e09'
>X--- html2h/html2h.c.orig	2014-04-26 01:44:43.345704767 -0700
>X+++ html2h/html2h.c	2014-04-26 01:48:52.814647608 -0700
>X@@ -6,15 +6,15 @@
>X
>X void usage()
>X {
>X-	printf("
>X-html2h v0.1
>X-usage:
>X-	html2h input.html [output.h]
>X-
>X-	if output is not set, input.h will be generated and overwritten!
>X-
>X-	debug messages are written to stderr!
>X-
>X+	printf("\
>X+html2h v0.1\n\
>X+usage:\n\
>X+	html2h input.html [output.h]\n\
>X+\n\
>X+	if output is not set, input.h will be generated and overwritten!\n\
>X+\n\
>X+	debug messages are written to stderr!\n\
>X+\n\
>X ");
>X
>X 	exit(0);
>X@@ -415,4 +415,4 @@
>X {
>X 	fprintf(stderr, "%s%s\n", msg, comment);
>X 	exit(1);
>X-}
>X\ No newline at end of file
>X+}
>8b6dc56a8eded85aedfb390626d09e09
>echo x - ecgi/files/patch-src_ecgitk.c
>sed 's/^X//' >ecgi/files/patch-src_ecgitk.c << 'a18665caddf4fd4d769392cbc254c663'
>X--- src/ecgitk.c.orig	2014-04-26 01:53:43.059838826 -0700
>X+++ src/ecgitk.c	2014-04-26 01:54:54.331256562 -0700
>X@@ -23,7 +23,7 @@
>X {
>X 	char buf[4096];
>X 	int used;
>X-	va_list *ap;
>X+	va_list ap;
>X
>X 	va_start(ap, (void*)format);
>X 	used=vsnprintf(buf, 4095, format, ap);
>a18665caddf4fd4d769392cbc254c663
>echo x - ecgi/files/patch-html2h_Makefile
>sed 's/^X//' >ecgi/files/patch-html2h_Makefile << '84919d1335fc97fdfbc496192d94ff9c'
>X--- html2h/Makefile.orig	2014-04-26 01:31:51.028376169 -0700
>X+++ html2h/Makefile	2014-04-26 01:38:06.265403221 -0700
>X@@ -1,11 +1,11 @@
>X-CC = gcc
>X+CC?= gcc
>X INCS =  -I../include/ -I.
>X-FLAGS = -Wall
>X+CFLAGS += -Wall
>X 
>X all: html2h
>X 
>X html2h: html2h.c html2h.h
>X-	$(CC) html2h.c -o html2h $(INCS) $(FLAGS) ../obj/memfile.o
>X+	$(CC) html2h.c -o html2h $(INCS) $(CFLAGS) ../obj/memfile.o
>X 
>X install: all
>X 	cp html2h /usr/bin
>84919d1335fc97fdfbc496192d94ff9c
>echo x - ecgi/distinfo
>sed 's/^X//' >ecgi/distinfo << 'e3282be069f2c2ca75f33b0cded3d1a9'
>XSHA256 (ecgi-0.6.2.tar.xz) = e8d8f00a9209c2ef87e100d35c15bc0e54c3f778e34c9551703f66c88d29e331
>XSIZE (ecgi-0.6.2.tar.xz) = 163836
>e3282be069f2c2ca75f33b0cded3d1a9
>exit
>

Actions: View

Attachments on bug 189010: 142049 | 142050 | 142051 | 143758 | 143765