diff options
Diffstat (limited to 'www/fcgi')
-rw-r--r-- | www/fcgi/Makefile | 32 | ||||
-rw-r--r-- | www/fcgi/distinfo | 2 | ||||
-rw-r--r-- | www/fcgi/files/patch-aa | 45 | ||||
-rw-r--r-- | www/fcgi/files/patch-ab | 64 | ||||
-rw-r--r-- | www/fcgi/pkg-plist | 55 |
5 files changed, 55 insertions, 143 deletions
diff --git a/www/fcgi/Makefile b/www/fcgi/Makefile index 8238acb11938..1af70fed78d9 100644 --- a/www/fcgi/Makefile +++ b/www/fcgi/Makefile @@ -5,31 +5,35 @@ # $FreeBSD$ # -PORTNAME= fcgi-devkit -PORTVERSION= 2.2.0 +PORTNAME= fcgi +PORTVERSION= 2.2.2 CATEGORIES= www MASTER_SITES= http://www.fastcgi.com/dist/ -DISTNAME= devkit_2.2.0 +PKGNAMESUFFIX= -devkit MAINTAINER= kbyanc@posi.net +USE_PERL5= yes +GNU_CONFIGURE= yes + MAN1= cgi-fcgi.1 MAN3= FCGI_Accept.3 FCGI_Finish.3 FCGI_SetExitStatus.3 \ FCGI_StartFilterData.3 -USE_PERL5= yes -GNU_CONFIGURE= yes - -.if !defined(NOPORTDOCS) post-install: - ${MKDIR} ${PREFIX}/share/doc/${PORTNAME} +.for y in ${MAN1} + @${INSTALL_MAN} ${WRKSRC}/doc/${y} ${MANPREFIX}/man/man1 +.endfor +.for x in ${MAN3} + @${INSTALL_MAN} ${WRKSRC}/doc/${x} ${MANPREFIX}/man/man3 +.endfor +.if !defined(NOPORTDOCS) + @${MKDIR} ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/doc/*.htm* ${WRKSRC}/doc/*.gif \ + ${DOCSDIR} .for i in fastcgi-prog-guide fastcgi-whitepaper - ${MKDIR} ${PREFIX}/share/doc/${PORTNAME}/$i - cd ${WRKSRC}/doc/$i && \ - ${INSTALL_DATA} * ${PREFIX}/share/doc/${PORTNAME}/$i - @if [ -f ${PREFIX}/share/doc/${PORTNAME}/$i/Makefile ]; then \ - ${RM} ${PREFIX}/share/doc/${PORTNAME}/$i/Makefile; \ - fi + @${MKDIR} ${DOCSDIR}/${i} + @${INSTALL_DATA} ${WRKSRC}/doc/${i}/* ${DOCSDIR}/$i .endfor .endif diff --git a/www/fcgi/distinfo b/www/fcgi/distinfo index 863344487565..38522b12c9ac 100644 --- a/www/fcgi/distinfo +++ b/www/fcgi/distinfo @@ -1 +1 @@ -MD5 (devkit_2.2.0.tar.gz) = eb73624d7dcb3a3f2fca3f86f09a518c +MD5 (fcgi-2.2.2.tar.gz) = cb50d01e8fd1d82d1cbfd32bd0cb9d96 diff --git a/www/fcgi/files/patch-aa b/www/fcgi/files/patch-aa deleted file mode 100644 index c091e0a15447..000000000000 --- a/www/fcgi/files/patch-aa +++ /dev/null @@ -1,45 +0,0 @@ ---- Makefile.in.orig Tue Sep 16 08:36:24 1997 -+++ Makefile.in Sun May 28 17:48:01 2000 -@@ -14,8 +14,7 @@ - prefix = @prefix@ - common_prefix = @common_prefix@ - CVS_TAG = @CVS_TAG@ --EXPORT_DIR = $(prefix)/build --PROTO_DIR = ../proto -+EXPORT_DIR = $(prefix)/fcgi-devkit - BIN_DIR = $(exec_prefix)/bin - LIB_DIR = $(prefix)/lib - LINC_DIR = $(prefix)/include -@@ -39,9 +38,8 @@ - all: - (cd libfcgi; make all) - (cd cgi-fcgi; make all) -- (cd examples; make all) - --export: -+install: all - @ for i in $(TARGET_DIRS); \ - do \ - if test ! -d $$i; then \ -@@ -64,14 +62,6 @@ - $(INSTALL_DATA) doc/FCGI_Finish.3 $(MAN3_DIR) - $(INSTALL_DATA) doc/FCGI_SetExitStatus.3 $(MAN3_DIR) - $(INSTALL_DATA) doc/FCGI_StartFilterData.3 $(MAN3_DIR) -- rm -rf $(PROTO_DIR) -- for i in $(LINKS); do if test ! -r $$i; then rm -f $$i; fi; done; -- cp -R . $(PROTO_DIR) -- (cd $(PROTO_DIR); make clean) -- find $(PROTO_DIR) -name CVS -exec rm -rf {} \; -- rm -rf $(EXPORT_DIR) -- cp -R $(PROTO_DIR) $(EXPORT_DIR) -- rm -rf $(PROTO_DIR) - - reconfig: clean - uname -rs >config.uname -@@ -83,6 +73,5 @@ - rm -f config.cache config.log config.status config.uname - (cd libfcgi; make clean) - (cd cgi-fcgi; make clean) -- (cd examples; make clean) - - # ---------------------------------------------------------------------------- diff --git a/www/fcgi/files/patch-ab b/www/fcgi/files/patch-ab deleted file mode 100644 index 24e017a24c9e..000000000000 --- a/www/fcgi/files/patch-ab +++ /dev/null @@ -1,64 +0,0 @@ ---- libfcgi/os_unix.c.orig Wed Aug 2 05:36:43 2000 -+++ libfcgi/os_unix.c Sun Aug 20 14:32:35 2000 -@@ -404,9 +404,13 @@ - */ - int OS_Read(int fd, char * buf, size_t len) - { -- return(read(fd, buf, len)); -+ int result; -+ do { -+ result = read(fd, buf, len); -+ } while((result == -1) && (errno == EINTR)); -+ return(result); - } -- -+ - /* - *-------------------------------------------------------------- - * -@@ -425,10 +429,13 @@ - */ - int OS_Write(int fd, char * buf, size_t len) - { -- return(write(fd, buf, len)); -+ int result; -+ do { -+ result = write(fd, buf, len); -+ } while((result == -1) && (errno == EINTR)); -+ return(result); - } - -- - /* - *---------------------------------------------------------------------- - * -@@ -753,8 +760,10 @@ - * any work to do. - */ - if(numRdPosted == 0 && numWrPosted == 0) { -- selectStatus = select((maxFd+1), &readFdSetCpy, &writeFdSetCpy, -- NULL, tmo); -+ do { -+ selectStatus = select((maxFd+1), &readFdSetCpy, &writeFdSetCpy, -+ NULL, tmo); -+ } while ((selectStatus == -1) && (errno == EINTR)); - if(selectStatus < 0) { - exit(errno); - } -@@ -1020,11 +1029,15 @@ - { - struct timeval tval = { READABLE_UNIX_FD_DROP_DEAD_TIMEVAL }; - fd_set read_fds; -+ int result; - - FD_ZERO(&read_fds); - FD_SET(fd, &read_fds); - -- return select(fd + 1, &read_fds, NULL, NULL, &tval) >= 0 && FD_ISSET(fd, &read_fds); -+ do { -+ result = select(fd + 1, &read_fds, NULL, NULL, &tval); -+ } while((result == -1) && (errno == EINTR)); -+ return result >= 0 && FD_ISSET(fd, &read_fds); - } - - /* diff --git a/www/fcgi/pkg-plist b/www/fcgi/pkg-plist index c6f5b98e0717..d50ac9f2d37d 100644 --- a/www/fcgi/pkg-plist +++ b/www/fcgi/pkg-plist @@ -3,24 +3,41 @@ include/fastcgi.h include/fcgi_config.h include/fcgi_stdio.h include/fcgiapp.h -include/fcgiappmisc.h include/fcgimisc.h +include/fcgio.h +include/fcgios.h +lib/libfcgi++.a +lib/libfcgi++.la +lib/libfcgi++.so +lib/libfcgi++.so.0 lib/libfcgi.a -share/doc/fcgi-devkit/fastcgi-prog-guide/ap_guida.htm -share/doc/fcgi-devkit/fastcgi-prog-guide/ap_guide.htm -share/doc/fcgi-devkit/fastcgi-prog-guide/apaman.htm -share/doc/fcgi-devkit/fastcgi-prog-guide/ch1inta1.gif -share/doc/fcgi-devkit/fastcgi-prog-guide/ch1intra.gif -share/doc/fcgi-devkit/fastcgi-prog-guide/ch1intro.htm -share/doc/fcgi-devkit/fastcgi-prog-guide/ch2c.htm -share/doc/fcgi-devkit/fastcgi-prog-guide/ch3perl.htm -share/doc/fcgi-devkit/fastcgi-prog-guide/ch4tcl.htm -share/doc/fcgi-devkit/fastcgi-prog-guide/cover.htm -share/doc/fcgi-devkit/fastcgi-prog-guide/covera.gif -share/doc/fcgi-devkit/fastcgi-whitepaper/fastcgi.htm -share/doc/fcgi-devkit/fastcgi-whitepaper/img00001.gif -share/doc/fcgi-devkit/fastcgi-whitepaper/img00002.gif -share/doc/fcgi-devkit/fastcgi-whitepaper/img00003.gif -@dirrm share/doc/fcgi-devkit/fastcgi-prog-guide -@dirrm share/doc/fcgi-devkit/fastcgi-whitepaper -@dirrm share/doc/fcgi-devkit +lib/libfcgi.la +lib/libfcgi.so +lib/libfcgi.so.0 +%%PORTDOCS%%share/doc/fcgi/fastcgi-prog-guide/ap_guida.htm +%%PORTDOCS%%share/doc/fcgi/fastcgi-prog-guide/ap_guide.htm +%%PORTDOCS%%share/doc/fcgi/fastcgi-prog-guide/apaman.htm +%%PORTDOCS%%share/doc/fcgi/fastcgi-prog-guide/ch1inta1.gif +%%PORTDOCS%%share/doc/fcgi/fastcgi-prog-guide/ch1intra.gif +%%PORTDOCS%%share/doc/fcgi/fastcgi-prog-guide/ch1intro.htm +%%PORTDOCS%%share/doc/fcgi/fastcgi-prog-guide/ch2c.htm +%%PORTDOCS%%share/doc/fcgi/fastcgi-prog-guide/ch3perl.htm +%%PORTDOCS%%share/doc/fcgi/fastcgi-prog-guide/ch4tcl.htm +%%PORTDOCS%%share/doc/fcgi/fastcgi-prog-guide/cover.htm +%%PORTDOCS%%share/doc/fcgi/fastcgi-prog-guide/covera.gif +%%PORTDOCS%%share/doc/fcgi/fastcgi-whitepaper/fastcgi.htm +%%PORTDOCS%%share/doc/fcgi/fastcgi-whitepaper/img00001.gif +%%PORTDOCS%%share/doc/fcgi/fastcgi-whitepaper/img00002.gif +%%PORTDOCS%%share/doc/fcgi/fastcgi-whitepaper/img00003.gif +%%PORTDOCS%%share/doc/fcgi/fcgi-devel-kit.htm +%%PORTDOCS%%share/doc/fcgi/fcgi-java.htm +%%PORTDOCS%%share/doc/fcgi/fcgi-perf.htm +%%PORTDOCS%%share/doc/fcgi/fcgi-perl.htm +%%PORTDOCS%%share/doc/fcgi/fcgi-spec.html +%%PORTDOCS%%share/doc/fcgi/fcgi-tcl.htm +%%PORTDOCS%%share/doc/fcgi/omi-logo.gif +%%PORTDOCS%%share/doc/fcgi/overview.html +%%PORTDOCS%%share/doc/fcgi/www5-api-workshop.html +%%PORTDOCS%%@dirrm share/doc/fcgi/fastcgi-prog-guide +%%PORTDOCS%%@dirrm share/doc/fcgi/fastcgi-whitepaper +%%PORTDOCS%%@dirrm share/doc/fcgi |