svn commit: r357760 - in head: . devel devel/ecgi devel/ecgi/files

John Marino marino at FreeBSD.org
Sat Jun 14 10:11:04 UTC 2014 

Author: marino
Date: Sat Jun 14 10:11:01 2014
New Revision: 357760
URL: http://svnweb.freebsd.org/changeset/ports/357760
QAT: https://qat.redports.org/buildarchive/r357760/

Log:
  Resurrect devel/ecgi with stage support
  
  The port had been essentially unmaintained since 2006 and was removed
  three years ago.  It needs some TLC to bring it up to modern standards.
  Pass maintainership to submitter.
  
  PR:		189010
  Submitted by:	Chris Hutchinson
  Add'l fixes by:	marino

Added:
  head/devel/ecgi/
     - copied from r246566, head/devel/ecgi/
  head/devel/ecgi/files/patch-html2h_Makefile   (contents, props changed)
  head/devel/ecgi/files/patch-html2h_html2h.c   (contents, props changed)
  head/devel/ecgi/files/patch-src_ecgitk.c   (contents, props changed)
Deleted:
  head/devel/ecgi/files/patch-html2h::Makefile
  head/devel/ecgi/files/patch-html2h::html2h.c
  head/devel/ecgi/files/patch-src::ecgitk.c
Modified:
  head/MOVED
  head/devel/Makefile
  head/devel/ecgi/Makefile   (contents, props changed)
  head/devel/ecgi/distinfo   (contents, props changed)
  head/devel/ecgi/files/patch-Makefile   (contents, props changed)
  head/devel/ecgi/pkg-descr   (contents, props changed)

Modified: head/MOVED
==============================================================================
--- head/MOVED	Sat Jun 14 10:10:13 2014	(r357759)
+++ head/MOVED	Sat Jun 14 10:11:01 2014	(r357760)
@@ -2058,7 +2058,6 @@ devel/c2man||2011-05-02|Has expired: Ups
 devel/c_parser||2011-05-02|Has expired: Upstream disappeared and distfile is no longer available
 devel/cdoc||2011-05-02|Has expired: Upstream disappeared and distfile is no longer available
 devel/diffconvert||2011-05-02|Has expired: Upstream disappeared and distfile is no longer available
-devel/ecgi||2011-05-02|Has expired: Upstream disappeared and distfile is no longer available
 devel/error||2011-05-02|Has expired: Upstream disappeared and distfile is no longer available
 devel/excalibur-configuration||2011-05-02|Has expired: Upstream disappeared and distfile is no longer available
 devel/freelibiberty||2011-05-02|Has expired: Upstream disappeared and distfile is no longer available

Modified: head/devel/Makefile
==============================================================================
--- head/devel/Makefile	Sat Jun 14 10:10:13 2014	(r357759)
+++ head/devel/Makefile	Sat Jun 14 10:11:01 2014	(r357760)
@@ -389,6 +389,7 @@
     SUBDIR += eblob
     SUBDIR += ebnf2yacc
     SUBDIR += ecb
+    SUBDIR += ecgi
     SUBDIR += eclipse-eclemma
     SUBDIR += ecore
     SUBDIR += ecore-file

Modified: head/devel/ecgi/Makefile
==============================================================================
--- head/devel/ecgi/Makefile	Thu Dec 24 22:38:39 2009	(r246566)
+++ head/devel/ecgi/Makefile	Sat Jun 14 10:11:01 2014	(r357760)
@@ -1,42 +1,40 @@
-# New ports collection makefile for:   ecgi
-# Date created:        13 February 2001
-# Whom:                George Reid <greid at ukug.uk.freebsd.org>
-#
+# Created by: George Reid <greid at ukug.uk.freebsd.org>
 # $FreeBSD$
-#
 
 PORTNAME=	ecgi
 PORTVERSION=	0.6.2
 PORTREVISION=	2
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_DEBIAN}
-MASTER_SITE_SUBDIR=	pool/main/libe/libecgi
-DISTNAME=	lib${PORTNAME}_${PORTVERSION}.orig
+MASTER_SITES=	http://bsdforge.com/projects/source/devel/ecgi/
 
-MAINTAINER=	ports at FreeBSD.org
-COMMENT=	A library for the creation of CGI-based Web applications
+MAINTAINER=	portmaster at bsdforge.com
+COMMENT=	Library for the creation of CGI-based Web applications
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
-USE_GMAKE=	yes
-USE_LDCONFIG=	yes
+LICENSE=	BSD3CLAUSE
 
+USES=		gmake tar:xz
+PORTDOCS=	*
 HEADER_FILES=	ecgi.h ecgitk.h include/memfile.h
 
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
+
 pre-patch:
 	@${REINPLACE_CMD} -e 's,<malloc.h>,<stdlib.h>,' ${WRKSRC}/src/memfile.c
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/libecgi.a ${PREFIX}/lib
-	${INSTALL_PROGRAM} ${WRKSRC}/libecgi.so ${PREFIX}/lib
-	${INSTALL_PROGRAM} ${WRKSRC}/html2h/html2h ${PREFIX}/bin
-	@${MKDIR} ${PREFIX}/include/ecgi
+	${INSTALL_DATA} ${WRKSRC}/libecgi.a ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_PROGRAM} ${WRKSRC}/libecgi.so ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_PROGRAM} ${WRKSRC}/html2h/html2h ${STAGEDIR}${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}${PREFIX}/include/ecgi
 .for file in ${HEADER_FILES}
-	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/include/ecgi
+	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${PREFIX}/include/ecgi
 .endfor
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/ecgitut.txt ${DOCSDIR}
+
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/ecgitut.txt ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>

Modified: head/devel/ecgi/distinfo
==============================================================================
--- head/devel/ecgi/distinfo	Thu Dec 24 22:38:39 2009	(r246566)
+++ head/devel/ecgi/distinfo	Sat Jun 14 10:11:01 2014	(r357760)
@@ -1,3 +1,2 @@
-MD5 (libecgi_0.6.2.orig.tar.gz) = 1d2b17b1e0540b34f704ffedb9d154e5
-SHA256 (libecgi_0.6.2.orig.tar.gz) = ee481ac0aa30106b03d285200b810dc3e1b44b7c399505de6b85c04ec85220a9
-SIZE (libecgi_0.6.2.orig.tar.gz) = 265252
+SHA256 (ecgi-0.6.2.tar.xz) = e8d8f00a9209c2ef87e100d35c15bc0e54c3f778e34c9551703f66c88d29e331
+SIZE (ecgi-0.6.2.tar.xz) = 163836

Modified: head/devel/ecgi/files/patch-Makefile
==============================================================================
--- head/devel/ecgi/files/patch-Makefile	Thu Dec 24 22:38:39 2009	(r246566)
+++ head/devel/ecgi/files/patch-Makefile	Sat Jun 14 10:11:01 2014	(r357760)
@@ -1,5 +1,5 @@
---- Makefile.orig	Tue Feb 13 14:02:11 2001
-+++ Makefile	Mon Mar 22 13:47:28 2004
+--- 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
@@ -12,24 +12,24 @@
  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)
@@ -38,21 +38,21 @@
 -	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
@@ -65,11 +65,11 @@
 +
 +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

Added: head/devel/ecgi/files/patch-html2h_Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/ecgi/files/patch-html2h_Makefile	Sat Jun 14 10:11:01 2014	(r357760)
@@ -0,0 +1,17 @@
+--- 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

Added: head/devel/ecgi/files/patch-html2h_html2h.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/ecgi/files/patch-html2h_html2h.c	Sat Jun 14 10:11:01 2014	(r357760)
@@ -0,0 +1,29 @@
+--- html2h/html2h.c.orig	2014-04-26 08:44:43.000000000 +0000
++++ html2h/html2h.c
+@@ -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,4 @@ void pexit(char *msg, const char *commen
+ {
+ 	fprintf(stderr, "%s%s\n", msg, comment);
+ 	exit(1);
+-}
+\ No newline at end of file
++}

Added: head/devel/ecgi/files/patch-src_ecgitk.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/ecgi/files/patch-src_ecgitk.c	Sat Jun 14 10:11:01 2014	(r357760)
@@ -0,0 +1,11 @@
+--- src/ecgitk.c.orig	2014-04-26 08:53:43.000000000 +0000
++++ src/ecgitk.c
+@@ -23,7 +23,7 @@ int ctkRedirect(const char *format, ...)
+ {
+ 	char buf[4096];
+ 	int used;
+-	va_list *ap;
++	va_list ap;
+ 	
+ 	va_start(ap, (void*)format);
+ 	used=vsnprintf(buf, 4095, format, ap);

Modified: head/devel/ecgi/pkg-descr
==============================================================================
--- head/devel/ecgi/pkg-descr	Thu Dec 24 22:38:39 2009	(r246566)
+++ head/devel/ecgi/pkg-descr	Sat Jun 14 10:11:01 2014	(r357760)
@@ -1,7 +1,7 @@
 ecgi (easy CGI Libary) is an ANSI C library for the creation of
 CGI-based Web applications. It transparently supports the CGI methods
 GET and POST and also multipart/form-data file uploads. The user
-interface is designed as easy as possible and maintains full
+interface is designed to be as easy as possible and maintains full
 compatibility to cgic 0.5.
 
 It also contains a library independent introduction to CGI programming

More information about the svn-ports-head mailing list