Index: head/www/analog/files/patch-aa =================================================================== --- head/www/analog/files/patch-aa (revision 363345) +++ head/www/analog/files/patch-aa (nonexistent) @@ -1,41 +0,0 @@ ---- src/Makefile.orig Sun Dec 19 05:51:30 2004 -+++ src/Makefile Sun Jan 9 12:50:26 2005 -@@ -2,16 +2,23 @@ - # Please read docs/Readme.html, or http://www.analog.cx/ - # This is a general Unix-like Makefile: Makefiles for other OS's can be found - # in the "build" directory. --CC = gcc # which compiler to use: eg cc, acc, gcc. NB Different -+CC ?= gcc # which compiler to use: eg cc, acc, gcc. NB Different - # compilers need different CFLAGS, e.g., -O instead of -O2. - MAKE = make # which "make" to use --CFLAGS = -O2 # options, e.g. for optimisation or ANSI compilation. -+CFLAGS += -I${LOCALBASE}/include -I${LOCALBASE}/include/gd -+#CFLAGS = -O2 # options, e.g. for optimisation or ANSI compilation. - # Some OS's need -D_FILE_OFFSET_BITS=64 to support files > 2MB. - # HP/UX cc needs CFLAGS = -Aa (HP/UX 9) or -Ae (HP/UX 10) - # BeOS needs CFLAGS = -O2 -Wl,-L/boot/home/config/lib - # BS2000/OSD needs CFLAGS = -XLLML -XLLMK - # NeXTSTEP needs CFLAGS = -O2 -pipe -no-precomp - DEFS = # any combination of -DNOPIPES -DNODNS -DNODIRENT -DNOGLOB ... -+DEFS = -DLOGFILE=\"/var/log/httpd-access.log\" \ -+ -DIMAGEDIR=\"/images/\" \ -+ -DDEFAULTCONFIGFILE=\"$(PREFIX)/etc/analog.cfg\" \ -+ -DLANGDIR=\"${PREFIX}/share/analog/lang/\" \ -+ -DCONFIGDIR=\"$(PREFIX)/share/analog/\" \ -+ -DHAVE_ZLIB - # ... -DNOOPEN -DNOFOLLOW -DNOALARM -DNOGRAPHICS -DNOGMTIME ... - # ... -DEBCDIC -DUSE_PLAIN_SETJMP ... - # ... -DHAVE_GD -DHAVE_ZLIB -DHAVE_BZLIB -DHAVE_PCRE ... -@@ -31,6 +38,12 @@ - OS = UNIX # Operating system: UNIX, DOS, WIN32, MAC, OS2, OSX, VMS - # RISCOS, BEOS, NEXTSTEP, MPEIX, BS2000, AS400, OS390 - LIBS = -lm # extra libraries needed; most platforms (but not OS X or BeOS) -+ -+.if !defined(WITHOUT_GD) -+DEFS+= -DHAVE_GD -+LIBS+= -L${LOCALBASE}/lib -lgd -lpng -ljpeg -lz -+.endif -+ - # need -lm LAST - # if you defined HAVE_GD above you also need -lgd -lpng -ljpeg -lz - # if you defined HAVE_ZLIB above you also need -lz Property changes on: head/www/analog/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/analog/files/patch-ab =================================================================== --- head/www/analog/files/patch-ab (revision 363345) +++ head/www/analog/files/patch-ab (nonexistent) @@ -1,54 +0,0 @@ ---- src/tree.c.orig 2004-12-19 08:51:31.000000000 -0500 -+++ src/tree.c 2011-08-01 12:49:29.176805068 -0400 -@@ -769,11 +769,13 @@ - if (((*name = strstr(whole, "Mosaic")) != NULL && (len = 6)) || - ((*name = strstr(whole, "mosaic")) != NULL && (len = 6)) || - ((*name = strstr(whole, "Konqueror")) != NULL && (len = 9)) || -+ ((*name = strstr(whole, "Baiduspider")) != NULL && (len = 11)) || - ((*name = strstr(whole, "Galeon")) != NULL && (len = 6)) || - ((*name = strstr(whole, "Phoenix")) != NULL && (len = 7)) || - ((*name = strstr(whole, "Firebird")) != NULL && (len = 8)) || - ((*name = strstr(whole, "Firefox")) != NULL && (len = 7)) || - ((*name = strstr(whole, "Chimera")) != NULL && (len = 7)) || -+ ((*name = strstr(whole, "Chrome")) != NULL && (len = 6)) || - ((*name = strstr(whole, "Camino")) != NULL && (len = 6)) || - ((*name = strstr(whole, "Safari")) != NULL && (len = 6)) || - ((*name = strstr(whole, "WebTV")) != NULL && (len = 5)) || -@@ -871,7 +873,17 @@ - else - *name = "Windows:Unknown Windows"; - } -- else if (*c >= '6' && *c <= '9') -+ else if (*c == '6') { -+ if (*(c + 1) == '.' && (*(c + 2) == '0')) -+ *name = "Windows:Windows Vista"; -+ else if (*(c + 1) == '.' && (*(c + 2) == '1')) -+ *name = "Windows:Windows 7"; -+ else if (*(c + 1) == '.' && (*(c + 2) == '2')) -+ *name = "Windows:Windows 8"; -+ else -+ *name = "Windows:Unknown Windows"; -+ } -+ else if (*c >= '7' && *c <= '9') - *name = "Windows:Unknown Windows"; - else - *name = "Windows:Windows NT"; -@@ -904,8 +916,16 @@ - *name = "Macintosh"; - else if (strstr(whole, "Linux") != NULL || strstr(whole, "linux") != NULL) - *name = "Unix:Linux"; -- else if (strstr(whole, "BSD") != NULL) -- *name = "Unix:BSD"; -+ else if (strstr(whole, "FreeBSD") != NULL || strstr(whole, "freebsd") != NULL) -+ *name = "Unix:FreeBSD"; -+ else if (strstr(whole, "OpenBSD") != NULL || strstr(whole, "openbsd") != NULL) -+ *name = "Unix:OpenBSD"; -+ else if (strstr(whole, "NetBSD") != NULL || strstr(whole, "netbsd") != NULL) -+ *name = "Unix:NetBSD"; -+ else if (strstr(whole, "BSD/OS") != NULL || strstr(whole, "bsd/os") != NULL) -+ *name = "Unix:BSD/OS"; -+ else if (strstr(whole, "BSD") != NULL || strstr(whole, "bsd") != NULL) -+ *name = "Unix:Unknown BSD"; - else if (strstr(whole, "SunOS") != NULL || strstr(whole, "sunos") != NULL) - *name = "Unix:SunOS"; - else if (strstr(whole, "HP-UX") != NULL || strstr(whole, "HPUX") != NULL || Property changes on: head/www/analog/files/patch-ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/analog/files/patch-ac =================================================================== --- head/www/analog/files/patch-ac (revision 363345) +++ head/www/analog/files/patch-ac (nonexistent) @@ -1,12 +0,0 @@ ---- analog.cfg.orig Sun Mar 23 13:56:53 2003 -+++ analog.cfg Sun May 11 09:25:33 2003 -@@ -10,7 +10,8 @@ - # - # If you need a LOGFORMAT command (most people don't -- try it without first!), - # it must go here, above the LOGFILE commands. --LOGFILE logfile.log -+LOGFORMAT COMBINED -+LOGFILE /var/log/httpd-access.log - # LOGFILE /old/logs/access_log.* - # OUTFILE Report.html - # HOSTNAME "[my organisation]" Property changes on: head/www/analog/files/patch-ac ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/analog/files/patch-analog.cfg =================================================================== --- head/www/analog/files/patch-analog.cfg (nonexistent) +++ head/www/analog/files/patch-analog.cfg (revision 363346) @@ -0,0 +1,12 @@ +--- analog.cfg.orig Sun Mar 23 13:56:53 2003 ++++ analog.cfg Sun May 11 09:25:33 2003 +@@ -10,7 +10,8 @@ + # + # If you need a LOGFORMAT command (most people don't -- try it without first!), + # it must go here, above the LOGFILE commands. +-LOGFILE logfile.log ++LOGFORMAT COMBINED ++LOGFILE /var/log/httpd-access.log + # LOGFILE /old/logs/access_log.* + # OUTFILE Report.html + # HOSTNAME "[my organisation]" Property changes on: head/www/analog/files/patch-analog.cfg ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/analog/files/patch-src__Makefile =================================================================== --- head/www/analog/files/patch-src__Makefile (nonexistent) +++ head/www/analog/files/patch-src__Makefile (revision 363346) @@ -0,0 +1,41 @@ +--- src/Makefile.orig Sun Dec 19 05:51:30 2004 ++++ src/Makefile Sun Jan 9 12:50:26 2005 +@@ -2,16 +2,23 @@ + # Please read docs/Readme.html, or http://www.analog.cx/ + # This is a general Unix-like Makefile: Makefiles for other OS's can be found + # in the "build" directory. +-CC = gcc # which compiler to use: eg cc, acc, gcc. NB Different ++CC ?= gcc # which compiler to use: eg cc, acc, gcc. NB Different + # compilers need different CFLAGS, e.g., -O instead of -O2. + MAKE = make # which "make" to use +-CFLAGS = -O2 # options, e.g. for optimisation or ANSI compilation. ++CFLAGS += -I${LOCALBASE}/include -I${LOCALBASE}/include/gd ++#CFLAGS = -O2 # options, e.g. for optimisation or ANSI compilation. + # Some OS's need -D_FILE_OFFSET_BITS=64 to support files > 2MB. + # HP/UX cc needs CFLAGS = -Aa (HP/UX 9) or -Ae (HP/UX 10) + # BeOS needs CFLAGS = -O2 -Wl,-L/boot/home/config/lib + # BS2000/OSD needs CFLAGS = -XLLML -XLLMK + # NeXTSTEP needs CFLAGS = -O2 -pipe -no-precomp + DEFS = # any combination of -DNOPIPES -DNODNS -DNODIRENT -DNOGLOB ... ++DEFS = -DLOGFILE=\"/var/log/httpd-access.log\" \ ++ -DIMAGEDIR=\"/images/\" \ ++ -DDEFAULTCONFIGFILE=\"$(PREFIX)/etc/analog.cfg\" \ ++ -DLANGDIR=\"${PREFIX}/share/analog/lang/\" \ ++ -DCONFIGDIR=\"$(PREFIX)/share/analog/\" \ ++ -DHAVE_ZLIB + # ... -DNOOPEN -DNOFOLLOW -DNOALARM -DNOGRAPHICS -DNOGMTIME ... + # ... -DEBCDIC -DUSE_PLAIN_SETJMP ... + # ... -DHAVE_GD -DHAVE_ZLIB -DHAVE_BZLIB -DHAVE_PCRE ... +@@ -31,6 +38,12 @@ + OS = UNIX # Operating system: UNIX, DOS, WIN32, MAC, OS2, OSX, VMS + # RISCOS, BEOS, NEXTSTEP, MPEIX, BS2000, AS400, OS390 + LIBS = -lm # extra libraries needed; most platforms (but not OS X or BeOS) ++ ++.if !defined(WITHOUT_GD) ++DEFS+= -DHAVE_GD ++LIBS+= -L${LOCALBASE}/lib -lgd -lpng -ljpeg -lz ++.endif ++ + # need -lm LAST + # if you defined HAVE_GD above you also need -lgd -lpng -ljpeg -lz + # if you defined HAVE_ZLIB above you also need -lz Property changes on: head/www/analog/files/patch-src__Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/analog/files/patch-src__tree.c =================================================================== --- head/www/analog/files/patch-src__tree.c (nonexistent) +++ head/www/analog/files/patch-src__tree.c (revision 363346) @@ -0,0 +1,54 @@ +--- src/tree.c.orig 2004-12-19 08:51:31.000000000 -0500 ++++ src/tree.c 2011-08-01 12:49:29.176805068 -0400 +@@ -769,11 +769,13 @@ + if (((*name = strstr(whole, "Mosaic")) != NULL && (len = 6)) || + ((*name = strstr(whole, "mosaic")) != NULL && (len = 6)) || + ((*name = strstr(whole, "Konqueror")) != NULL && (len = 9)) || ++ ((*name = strstr(whole, "Baiduspider")) != NULL && (len = 11)) || + ((*name = strstr(whole, "Galeon")) != NULL && (len = 6)) || + ((*name = strstr(whole, "Phoenix")) != NULL && (len = 7)) || + ((*name = strstr(whole, "Firebird")) != NULL && (len = 8)) || + ((*name = strstr(whole, "Firefox")) != NULL && (len = 7)) || + ((*name = strstr(whole, "Chimera")) != NULL && (len = 7)) || ++ ((*name = strstr(whole, "Chrome")) != NULL && (len = 6)) || + ((*name = strstr(whole, "Camino")) != NULL && (len = 6)) || + ((*name = strstr(whole, "Safari")) != NULL && (len = 6)) || + ((*name = strstr(whole, "WebTV")) != NULL && (len = 5)) || +@@ -871,7 +873,17 @@ + else + *name = "Windows:Unknown Windows"; + } +- else if (*c >= '6' && *c <= '9') ++ else if (*c == '6') { ++ if (*(c + 1) == '.' && (*(c + 2) == '0')) ++ *name = "Windows:Windows Vista"; ++ else if (*(c + 1) == '.' && (*(c + 2) == '1')) ++ *name = "Windows:Windows 7"; ++ else if (*(c + 1) == '.' && (*(c + 2) == '2')) ++ *name = "Windows:Windows 8"; ++ else ++ *name = "Windows:Unknown Windows"; ++ } ++ else if (*c >= '7' && *c <= '9') + *name = "Windows:Unknown Windows"; + else + *name = "Windows:Windows NT"; +@@ -904,8 +916,16 @@ + *name = "Macintosh"; + else if (strstr(whole, "Linux") != NULL || strstr(whole, "linux") != NULL) + *name = "Unix:Linux"; +- else if (strstr(whole, "BSD") != NULL) +- *name = "Unix:BSD"; ++ else if (strstr(whole, "FreeBSD") != NULL || strstr(whole, "freebsd") != NULL) ++ *name = "Unix:FreeBSD"; ++ else if (strstr(whole, "OpenBSD") != NULL || strstr(whole, "openbsd") != NULL) ++ *name = "Unix:OpenBSD"; ++ else if (strstr(whole, "NetBSD") != NULL || strstr(whole, "netbsd") != NULL) ++ *name = "Unix:NetBSD"; ++ else if (strstr(whole, "BSD/OS") != NULL || strstr(whole, "bsd/os") != NULL) ++ *name = "Unix:BSD/OS"; ++ else if (strstr(whole, "BSD") != NULL || strstr(whole, "bsd") != NULL) ++ *name = "Unix:Unknown BSD"; + else if (strstr(whole, "SunOS") != NULL || strstr(whole, "sunos") != NULL) + *name = "Unix:SunOS"; + else if (strstr(whole, "HP-UX") != NULL || strstr(whole, "HPUX") != NULL || Property changes on: head/www/analog/files/patch-src__tree.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/bkmrkconv/files/patch-aa =================================================================== --- head/www/bkmrkconv/files/patch-aa (revision 363345) +++ head/www/bkmrkconv/files/patch-aa (nonexistent) @@ -1,16 +0,0 @@ ---- bkmrkconv.pl.orig Thu Sep 21 00:21:54 2000 -+++ bkmrkconv.pl Wed Mar 7 05:37:20 2001 -@@ -70,9 +70,10 @@ - - chomp(my $oldcwd = `pwd`); - chdir $outputDir; --my $rootpage = &readFile("src/rootpage.html"); --my $linkspage = &readFile("src/linkspage.html"); --my $contentspage = &readFile("src/contentspage.html") if ($doContents); -+my $shareDir = '%%PREFIX%%/share/bkmrkconv'; -+my $rootpage = &readFile("$shareDir/src/rootpage.html"); -+my $linkspage = &readFile("$shareDir/src/linkspage.html"); -+my $contentspage = &readFile("$shareDir/src/contentspage.html") if ($doContents); - chdir $oldcwd; - - my %root; Property changes on: head/www/bkmrkconv/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/bkmrkconv/files/patch-bkmrkconv.pl =================================================================== --- head/www/bkmrkconv/files/patch-bkmrkconv.pl (nonexistent) +++ head/www/bkmrkconv/files/patch-bkmrkconv.pl (revision 363346) @@ -0,0 +1,16 @@ +--- bkmrkconv.pl.orig Thu Sep 21 00:21:54 2000 ++++ bkmrkconv.pl Wed Mar 7 05:37:20 2001 +@@ -70,9 +70,10 @@ + + chomp(my $oldcwd = `pwd`); + chdir $outputDir; +-my $rootpage = &readFile("src/rootpage.html"); +-my $linkspage = &readFile("src/linkspage.html"); +-my $contentspage = &readFile("src/contentspage.html") if ($doContents); ++my $shareDir = '%%PREFIX%%/share/bkmrkconv'; ++my $rootpage = &readFile("$shareDir/src/rootpage.html"); ++my $linkspage = &readFile("$shareDir/src/linkspage.html"); ++my $contentspage = &readFile("$shareDir/src/contentspage.html") if ($doContents); + chdir $oldcwd; + + my %root; Property changes on: head/www/bkmrkconv/files/patch-bkmrkconv.pl ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/cacheboy16/files/patch-aa =================================================================== --- head/www/cacheboy16/files/patch-aa (revision 363345) +++ head/www/cacheboy16/files/patch-aa (nonexistent) @@ -1,11 +0,0 @@ ---- include/squid_types.h.orig Mon Jul 7 00:45:26 2003 -+++ include/squid_types.h Mon Jul 7 00:48:39 2003 -@@ -66,8 +66,5 @@ - #if HAVE_SYS_TYPES_H - #include - #endif --#if HAVE_SYS_BITYPES_H --#include --#endif - - #endif /* SQUID_TYPES_H */ Property changes on: head/www/cacheboy16/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/cacheboy16/files/patch-include-squid_types.h =================================================================== --- head/www/cacheboy16/files/patch-include-squid_types.h (nonexistent) +++ head/www/cacheboy16/files/patch-include-squid_types.h (revision 363346) @@ -0,0 +1,11 @@ +--- include/squid_types.h.orig Mon Jul 7 00:45:26 2003 ++++ include/squid_types.h Mon Jul 7 00:48:39 2003 +@@ -66,8 +66,5 @@ + #if HAVE_SYS_TYPES_H + #include + #endif +-#if HAVE_SYS_BITYPES_H +-#include +-#endif + + #endif /* SQUID_TYPES_H */ Property changes on: head/www/cacheboy16/files/patch-include-squid_types.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/cgi-lib/files/patch-aa =================================================================== --- head/www/cgi-lib/files/patch-aa (revision 363345) +++ head/www/cgi-lib/files/patch-aa (nonexistent) @@ -1,12 +0,0 @@ ---- makefile.orig Sun Jan 23 20:40:47 2000 -+++ makefile Sun Jan 23 20:41:08 2000 -@@ -24,7 +24,7 @@ - # - - CGI-LIB=cgi-lib.a --CC=gcc --CCFLAGS=-c -+CC?=gcc -+CCFLAGS+=-c - AR=ar - ARFLAGS=rc Property changes on: head/www/cgi-lib/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/cgi-lib/files/patch-ab =================================================================== --- head/www/cgi-lib/files/patch-ab (revision 363345) +++ head/www/cgi-lib/files/patch-ab (nonexistent) @@ -1,13 +0,0 @@ ---- list-lib.c.orig Thu May 18 21:10:28 2000 -+++ list-lib.c Tue Jan 15 18:59:31 2002 -@@ -79,10 +79,6 @@ - - free(List); - -- List->ListHead = NULL; -- List->Count = 0; -- List->MaxEntries = 0; -- - } - - Property changes on: head/www/cgi-lib/files/patch-ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/cgi-lib/files/patch-list-lib.c =================================================================== --- head/www/cgi-lib/files/patch-list-lib.c (nonexistent) +++ head/www/cgi-lib/files/patch-list-lib.c (revision 363346) @@ -0,0 +1,13 @@ +--- list-lib.c.orig Thu May 18 21:10:28 2000 ++++ list-lib.c Tue Jan 15 18:59:31 2002 +@@ -79,10 +79,6 @@ + + free(List); + +- List->ListHead = NULL; +- List->Count = 0; +- List->MaxEntries = 0; +- + } + + Property changes on: head/www/cgi-lib/files/patch-list-lib.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/cgi-lib/files/patch-makefile =================================================================== --- head/www/cgi-lib/files/patch-makefile (nonexistent) +++ head/www/cgi-lib/files/patch-makefile (revision 363346) @@ -0,0 +1,12 @@ +--- makefile.orig Sun Jan 23 20:40:47 2000 ++++ makefile Sun Jan 23 20:41:08 2000 +@@ -24,7 +24,7 @@ + # + + CGI-LIB=cgi-lib.a +-CC=gcc +-CCFLAGS=-c ++CC?=gcc ++CCFLAGS+=-c + AR=ar + ARFLAGS=rc Property changes on: head/www/cgi-lib/files/patch-makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/cgihtml/files/patch-aa =================================================================== --- head/www/cgihtml/files/patch-aa (revision 363345) +++ head/www/cgihtml/files/patch-aa (nonexistent) @@ -1,121 +0,0 @@ -Index: cgi-lib.c -=================================================================== -RCS file: /home/cvs/ringlet/c/contrib/www/cgihtml/cgi-lib.c,v -retrieving revision 1.1.1.1 -retrieving revision 1.6 -diff -u -r1.1.1.1 -r1.6 ---- cgi-lib.c 27 Oct 2003 09:39:04 -0000 1.1.1.1 -+++ cgi-lib.c 27 Oct 2003 12:07:00 -0000 1.6 -@@ -17,6 +17,10 @@ - - #ifdef WINDOWS - #include -+#define mktemp _mktemp -+#define snprintf _snprintf -+#else -+#include - #endif - - #include "cgi-lib.h" -@@ -87,11 +91,11 @@ - - char *get_POST() - { -- unsigned int content_length; -+ size_t content_length; - char *buffer; - - if (CONTENT_LENGTH != NULL) { -- content_length = atoi(CONTENT_LENGTH); -+ content_length = (size_t)strtoull(CONTENT_LENGTH, NULL, 10); - buffer = (char *)malloc(sizeof(char) * content_length + 1); - if (fread(buffer,sizeof(char),content_length,stdin) != content_length) { - /* consistency error. */ -@@ -202,7 +206,7 @@ - - int parse_form_encoded(llist* entries) - { -- long content_length; -+ size_t content_length, fnsize; - entrytype entry; - node* window; - FILE *uploadfile; -@@ -220,7 +224,7 @@ - _fmode = BINARY; /* default all file I/O as binary */ - #endif - if (CONTENT_LENGTH != NULL) -- content_length = atol(CONTENT_LENGTH); -+ content_length = (size_t)strtoull(CONTENT_LENGTH, NULL, 10); - else - return 0; - /* get boundary */ -@@ -241,14 +245,20 @@ - robustness sake. */ - buffer[bytesread] = '\0'; - tempstr = newstr(buffer); -- tempstr += (sizeof(char) * 38); /* 38 is header up to name */ -- entry.name = tempstr; -+ entry.name = strstr(tempstr, "name=\""); -+ if (entry.name == NULL) { -+ free(tempstr); -+ return 0; -+ } -+ entry.name += 6; -+ if (strchr(entry.name, '"') == NULL) { -+ free(tempstr); -+ return 0; -+ } -+ *strchr(entry.name, '"') = '\0'; - entry.value = (char *)malloc(sizeof(char) * BUFSIZ + 1); - buffersize = BUFSIZ; - strcpy(entry.value,""); -- while (*tempstr != '"') -- tempstr++; -- *tempstr = '\0'; - if (strstr(buffer,"filename=\"") != NULL) { - isfile = 1; - tempstr = newstr(buffer); -@@ -258,9 +268,9 @@ - entry.value = (char *) realloc(entry.value, sizeof(char) * - strlen(tempstr)+1); - entry.value = tempstr; -- while (*tempstr != '"') -- tempstr++; -- *tempstr = '\0'; -+ if (strchr(tempstr, '"') == NULL) -+ return 0; -+ *strchr(tempstr, '"') = '\0'; - /* Netscape's Windows browsers handle paths differently from its - UNIX and Mac browsers. It delivers a full path for the uploaded - file (which it shouldn't do), and it uses backslashes rather than -@@ -275,13 +285,12 @@ - } - window = list_insafter(entries,window,entry); - numentries++; -- uploadfname = (char *)malloc(strlen(UPLOADDIR)+strlen(entry.value)+2); --#ifdef WINDOWS -- sprintf(uploadfname,"%s\\%s",UPLOADDIR,entry.value); --#else -- sprintf(uploadfname,"%s/%s",UPLOADDIR,entry.value); --#endif -- if ( (uploadfile = fopen(uploadfname,"w")) == NULL) { -+ fnsize = strlen(UPLOADDIR) + 30; -+ uploadfname = (char *)malloc(fnsize); -+ snprintf(uploadfname,fnsize,"%s/cgihtml-upload-XXXXXX",UPLOADDIR); -+ uploadfname[fnsize - 1] = '\0'; -+ if (mktemp(uploadfname) == NULL || -+ (uploadfile = fopen(uploadfname,"w")) == NULL) { - /* null filename; for now, just don't save info. later, save - to default file */ - isfile = 0; -@@ -529,9 +538,9 @@ - int numcookies = 0; - short NM = 1; - -+ list_create(entries); - if (cookies == NULL) - return 0; -- list_create(entries); - window = entries->head; - len = strlen(cookies); - entry.name = (char *)malloc(sizeof(char) * len + 1); Property changes on: head/www/cgihtml/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/cgihtml/files/patch-cgi-lib.c =================================================================== --- head/www/cgihtml/files/patch-cgi-lib.c (nonexistent) +++ head/www/cgihtml/files/patch-cgi-lib.c (revision 363346) @@ -0,0 +1,121 @@ +Index: cgi-lib.c +=================================================================== +RCS file: /home/cvs/ringlet/c/contrib/www/cgihtml/cgi-lib.c,v +retrieving revision 1.1.1.1 +retrieving revision 1.6 +diff -u -r1.1.1.1 -r1.6 +--- cgi-lib.c 27 Oct 2003 09:39:04 -0000 1.1.1.1 ++++ cgi-lib.c 27 Oct 2003 12:07:00 -0000 1.6 +@@ -17,6 +17,10 @@ + + #ifdef WINDOWS + #include ++#define mktemp _mktemp ++#define snprintf _snprintf ++#else ++#include + #endif + + #include "cgi-lib.h" +@@ -87,11 +91,11 @@ + + char *get_POST() + { +- unsigned int content_length; ++ size_t content_length; + char *buffer; + + if (CONTENT_LENGTH != NULL) { +- content_length = atoi(CONTENT_LENGTH); ++ content_length = (size_t)strtoull(CONTENT_LENGTH, NULL, 10); + buffer = (char *)malloc(sizeof(char) * content_length + 1); + if (fread(buffer,sizeof(char),content_length,stdin) != content_length) { + /* consistency error. */ +@@ -202,7 +206,7 @@ + + int parse_form_encoded(llist* entries) + { +- long content_length; ++ size_t content_length, fnsize; + entrytype entry; + node* window; + FILE *uploadfile; +@@ -220,7 +224,7 @@ + _fmode = BINARY; /* default all file I/O as binary */ + #endif + if (CONTENT_LENGTH != NULL) +- content_length = atol(CONTENT_LENGTH); ++ content_length = (size_t)strtoull(CONTENT_LENGTH, NULL, 10); + else + return 0; + /* get boundary */ +@@ -241,14 +245,20 @@ + robustness sake. */ + buffer[bytesread] = '\0'; + tempstr = newstr(buffer); +- tempstr += (sizeof(char) * 38); /* 38 is header up to name */ +- entry.name = tempstr; ++ entry.name = strstr(tempstr, "name=\""); ++ if (entry.name == NULL) { ++ free(tempstr); ++ return 0; ++ } ++ entry.name += 6; ++ if (strchr(entry.name, '"') == NULL) { ++ free(tempstr); ++ return 0; ++ } ++ *strchr(entry.name, '"') = '\0'; + entry.value = (char *)malloc(sizeof(char) * BUFSIZ + 1); + buffersize = BUFSIZ; + strcpy(entry.value,""); +- while (*tempstr != '"') +- tempstr++; +- *tempstr = '\0'; + if (strstr(buffer,"filename=\"") != NULL) { + isfile = 1; + tempstr = newstr(buffer); +@@ -258,9 +268,9 @@ + entry.value = (char *) realloc(entry.value, sizeof(char) * + strlen(tempstr)+1); + entry.value = tempstr; +- while (*tempstr != '"') +- tempstr++; +- *tempstr = '\0'; ++ if (strchr(tempstr, '"') == NULL) ++ return 0; ++ *strchr(tempstr, '"') = '\0'; + /* Netscape's Windows browsers handle paths differently from its + UNIX and Mac browsers. It delivers a full path for the uploaded + file (which it shouldn't do), and it uses backslashes rather than +@@ -275,13 +285,12 @@ + } + window = list_insafter(entries,window,entry); + numentries++; +- uploadfname = (char *)malloc(strlen(UPLOADDIR)+strlen(entry.value)+2); +-#ifdef WINDOWS +- sprintf(uploadfname,"%s\\%s",UPLOADDIR,entry.value); +-#else +- sprintf(uploadfname,"%s/%s",UPLOADDIR,entry.value); +-#endif +- if ( (uploadfile = fopen(uploadfname,"w")) == NULL) { ++ fnsize = strlen(UPLOADDIR) + 30; ++ uploadfname = (char *)malloc(fnsize); ++ snprintf(uploadfname,fnsize,"%s/cgihtml-upload-XXXXXX",UPLOADDIR); ++ uploadfname[fnsize - 1] = '\0'; ++ if (mktemp(uploadfname) == NULL || ++ (uploadfile = fopen(uploadfname,"w")) == NULL) { + /* null filename; for now, just don't save info. later, save + to default file */ + isfile = 0; +@@ -529,9 +538,9 @@ + int numcookies = 0; + short NM = 1; + ++ list_create(entries); + if (cookies == NULL) + return 0; +- list_create(entries); + window = entries->head; + len = strlen(cookies); + entry.name = (char *)malloc(sizeof(char) * len + 1); Property changes on: head/www/cgihtml/files/patch-cgi-lib.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/demoroniser/files/patch-aa =================================================================== --- head/www/demoroniser/files/patch-aa (revision 363345) +++ head/www/demoroniser/files/patch-aa (nonexistent) @@ -1,8 +0,0 @@ ---- demoroniser.pl.orig Sat Jan 10 22:29:54 1998 -+++ demoroniser.pl Thu Aug 12 18:36:53 1999 -@@ -1,4 +1,4 @@ --#! /bin/perl -+#!/usr/bin/perl - # - # De-moron-ise Text from Microsoft Applications - # Property changes on: head/www/demoroniser/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/demoroniser/files/patch-demoroniser.pl =================================================================== --- head/www/demoroniser/files/patch-demoroniser.pl (nonexistent) +++ head/www/demoroniser/files/patch-demoroniser.pl (revision 363346) @@ -0,0 +1,8 @@ +--- demoroniser.pl.orig Sat Jan 10 22:29:54 1998 ++++ demoroniser.pl Thu Aug 12 18:36:53 1999 +@@ -1,4 +1,4 @@ +-#! /bin/perl ++#!/usr/bin/perl + # + # De-moron-ise Text from Microsoft Applications + # Property changes on: head/www/demoroniser/files/patch-demoroniser.pl ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/jesred/files/patch-aa =================================================================== --- head/www/jesred/files/patch-aa (revision 363345) +++ head/www/jesred/files/patch-aa (nonexistent) @@ -1,46 +0,0 @@ ---- Makefile.orig Sat Jul 25 07:19:50 1998 -+++ Makefile Wed Jan 19 11:53:51 2000 -@@ -2,20 +2,20 @@ - # HINT: If you want to run the program on an UltraSPARC driven machine, - # I recommend to use Sun C-Compiler >= 4.0 or gcc >= 2.8.0 with - # optimization level >= 4 for best performance. --CC=cc -+#CC=cc - --INCLUDE = -I. --LDFLAGS = -+#INCLUDE = -I. -+#LDFLAGS = - - # Compiler Options - --AC_CFLAGS = -xO5 -mr -s -xcrossfile #-g -xsb # SUN cc >= 4.0 -+#AC_CFLAGS = -xO5 -mr -s -xcrossfile #-g -xsb # SUN cc >= 4.0 - #AC_CFLAGS = -O3 -s # SGI cc, AIX cc - #AC_CFLAGS = -O5 -s # GNU cc - - # extra Libraries ( we need this for inet_addr(char *) only ) - --XTRA_LIBS = -lnsl # Solaris 2.x -+#XTRA_LIBS = -lnsl # Solaris 2.x - #XTRA_LIBS = # AIX 4.2, Linux 2.x.x, IRIX 5.x, 6.x - - # if you want to have the option, to enable debug message logging, -@@ -49,7 +49,7 @@ - # If jesred is compiled without -DUSE_ACCEL the ACCEL strings in the - # redirect rules are ignored, if there are some. - # --# DEFS = -DUSE_ACCEL -+DEFS = -DUSE_ACCEL -DDEFAULT_PATH=\"${PREFIX}/etc/jesred\" - - # That's it - no further changes should be necessary ;-) - # =========================================================================== -@@ -66,7 +66,7 @@ - CFILES = $(patsubst %.o,%.c,$(OBJS)) - - PROGS = jesred --CFLAGS = $(AC_CFLAGS) $(INCLUDE) -+CFLAGS += $(AC_CFLAGS) $(INCLUDE) - LIBS = -L. $(XTRA_LIBS) - - .SUFFIXES: .o Property changes on: head/www/jesred/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/jesred/files/patch-ab =================================================================== --- head/www/jesred/files/patch-ab (revision 363345) +++ head/www/jesred/files/patch-ab (nonexistent) @@ -1,11 +0,0 @@ ---- path.h.orig Sat Jul 25 03:03:13 1998 -+++ path.h Mon Nov 8 18:15:30 1999 -@@ -7,6 +7,8 @@ - - /* change this to the path, which contains your jesred.conf */ - -+#ifndef DEFAULT_PATH - #define DEFAULT_PATH "/local/squid/etc" -+#endif - - #endif Property changes on: head/www/jesred/files/patch-ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/jesred/files/patch-Makefile =================================================================== --- head/www/jesred/files/patch-Makefile (nonexistent) +++ head/www/jesred/files/patch-Makefile (revision 363346) @@ -0,0 +1,46 @@ +--- Makefile.orig Sat Jul 25 07:19:50 1998 ++++ Makefile Wed Jan 19 11:53:51 2000 +@@ -2,20 +2,20 @@ + # HINT: If you want to run the program on an UltraSPARC driven machine, + # I recommend to use Sun C-Compiler >= 4.0 or gcc >= 2.8.0 with + # optimization level >= 4 for best performance. +-CC=cc ++#CC=cc + +-INCLUDE = -I. +-LDFLAGS = ++#INCLUDE = -I. ++#LDFLAGS = + + # Compiler Options + +-AC_CFLAGS = -xO5 -mr -s -xcrossfile #-g -xsb # SUN cc >= 4.0 ++#AC_CFLAGS = -xO5 -mr -s -xcrossfile #-g -xsb # SUN cc >= 4.0 + #AC_CFLAGS = -O3 -s # SGI cc, AIX cc + #AC_CFLAGS = -O5 -s # GNU cc + + # extra Libraries ( we need this for inet_addr(char *) only ) + +-XTRA_LIBS = -lnsl # Solaris 2.x ++#XTRA_LIBS = -lnsl # Solaris 2.x + #XTRA_LIBS = # AIX 4.2, Linux 2.x.x, IRIX 5.x, 6.x + + # if you want to have the option, to enable debug message logging, +@@ -49,7 +49,7 @@ + # If jesred is compiled without -DUSE_ACCEL the ACCEL strings in the + # redirect rules are ignored, if there are some. + # +-# DEFS = -DUSE_ACCEL ++DEFS = -DUSE_ACCEL -DDEFAULT_PATH=\"${PREFIX}/etc/jesred\" + + # That's it - no further changes should be necessary ;-) + # =========================================================================== +@@ -66,7 +66,7 @@ + CFILES = $(patsubst %.o,%.c,$(OBJS)) + + PROGS = jesred +-CFLAGS = $(AC_CFLAGS) $(INCLUDE) ++CFLAGS += $(AC_CFLAGS) $(INCLUDE) + LIBS = -L. $(XTRA_LIBS) + + .SUFFIXES: .o Property changes on: head/www/jesred/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/jesred/files/patch-path.h =================================================================== --- head/www/jesred/files/patch-path.h (nonexistent) +++ head/www/jesred/files/patch-path.h (revision 363346) @@ -0,0 +1,11 @@ +--- path.h.orig Sat Jul 25 03:03:13 1998 ++++ path.h Mon Nov 8 18:15:30 1999 +@@ -7,6 +7,8 @@ + + /* change this to the path, which contains your jesred.conf */ + ++#ifndef DEFAULT_PATH + #define DEFAULT_PATH "/local/squid/etc" ++#endif + + #endif Property changes on: head/www/jesred/files/patch-path.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/kannel/files/patch-ad =================================================================== --- head/www/kannel/files/patch-ad (revision 363345) +++ head/www/kannel/files/patch-ad (nonexistent) @@ -1,15 +0,0 @@ ---- debian/kannel.conf.orig Mon Dec 11 14:00:30 2000 -+++ debian/kannel.conf Wed Jan 3 20:11:13 2001 -@@ -13,10 +13,10 @@ - admin-allow-ip = "127.0.0.1" - wapbox-port = 13002 - wdp-interface-name = "*" --log-file = "/var/log/kannel/bearerbox.log" -+log-file = "/var/log/bearerbox.log" - box-deny-ip = "*.*.*.*" - box-allow-ip = "127.0.0.1" - - group = wapbox - bearerbox-host = localhost --log-file = "/var/log/kannel/wapbox.log" -+log-file = "/var/log/wapbox.log" Property changes on: head/www/kannel/files/patch-ad ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/kannel/files/patch-af =================================================================== --- head/www/kannel/files/patch-af (revision 363345) +++ head/www/kannel/files/patch-af (nonexistent) @@ -1,45 +0,0 @@ ---- gwlib/gwthread-pthread.c.orig Thu Aug 12 19:53:30 2004 -+++ gwlib/gwthread-pthread.c Mon Dec 20 00:53:57 2004 -@@ -125,6 +125,11 @@ - static pthread_key_t tsd_key; - - static pthread_mutex_t threadtable_lock; -+/* -+ * Thread creation parameters. -+ */ -+static pthread_attr_t thread_attr; -+#define MIN_THREAD_STACK_SIZE (256 * 1024) - - static void lock(void) - { -@@ -263,6 +268,7 @@ - { - int ret; - int i; -+ size_t stack_size; - - pthread_mutex_init(&threadtable_lock, NULL); - -@@ -275,6 +281,13 @@ - threadtable[i] = NULL; - } - active_threads = 0; -+/* -+ * Make sure that thread stack is large enough. -+ */ -+ pthread_attr_init(&thread_attr); -+ pthread_attr_getstacksize(&thread_attr, &stack_size); -+ if (stack_size < MIN_THREAD_STACK_SIZE) -+ pthread_attr_setstacksize(&thread_attr, MIN_THREAD_STACK_SIZE); - - create_threadinfo_main(); - } -@@ -443,7 +456,7 @@ - return -1; - } - -- ret = pthread_create(&id, NULL, &new_thread, p); -+ ret = pthread_create(&id, &thread_attr, &new_thread, p); - if (ret != 0) { - unlock(); - error(ret, "Could not create new thread."); Property changes on: head/www/kannel/files/patch-af ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/kannel/files/patch-debian__kannel.conf =================================================================== --- head/www/kannel/files/patch-debian__kannel.conf (nonexistent) +++ head/www/kannel/files/patch-debian__kannel.conf (revision 363346) @@ -0,0 +1,15 @@ +--- debian/kannel.conf.orig Mon Dec 11 14:00:30 2000 ++++ debian/kannel.conf Wed Jan 3 20:11:13 2001 +@@ -13,10 +13,10 @@ + admin-allow-ip = "127.0.0.1" + wapbox-port = 13002 + wdp-interface-name = "*" +-log-file = "/var/log/kannel/bearerbox.log" ++log-file = "/var/log/bearerbox.log" + box-deny-ip = "*.*.*.*" + box-allow-ip = "127.0.0.1" + + group = wapbox + bearerbox-host = localhost +-log-file = "/var/log/kannel/wapbox.log" ++log-file = "/var/log/wapbox.log" Property changes on: head/www/kannel/files/patch-debian__kannel.conf ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/kannel/files/patch-gwlib__gwthread-pthread.c =================================================================== --- head/www/kannel/files/patch-gwlib__gwthread-pthread.c (nonexistent) +++ head/www/kannel/files/patch-gwlib__gwthread-pthread.c (revision 363346) @@ -0,0 +1,45 @@ +--- gwlib/gwthread-pthread.c.orig Thu Aug 12 19:53:30 2004 ++++ gwlib/gwthread-pthread.c Mon Dec 20 00:53:57 2004 +@@ -125,6 +125,11 @@ + static pthread_key_t tsd_key; + + static pthread_mutex_t threadtable_lock; ++/* ++ * Thread creation parameters. ++ */ ++static pthread_attr_t thread_attr; ++#define MIN_THREAD_STACK_SIZE (256 * 1024) + + static void lock(void) + { +@@ -263,6 +268,7 @@ + { + int ret; + int i; ++ size_t stack_size; + + pthread_mutex_init(&threadtable_lock, NULL); + +@@ -275,6 +281,13 @@ + threadtable[i] = NULL; + } + active_threads = 0; ++/* ++ * Make sure that thread stack is large enough. ++ */ ++ pthread_attr_init(&thread_attr); ++ pthread_attr_getstacksize(&thread_attr, &stack_size); ++ if (stack_size < MIN_THREAD_STACK_SIZE) ++ pthread_attr_setstacksize(&thread_attr, MIN_THREAD_STACK_SIZE); + + create_threadinfo_main(); + } +@@ -443,7 +456,7 @@ + return -1; + } + +- ret = pthread_create(&id, NULL, &new_thread, p); ++ ret = pthread_create(&id, &thread_attr, &new_thread, p); + if (ret != 0) { + unlock(); + error(ret, "Could not create new thread."); Property changes on: head/www/kannel/files/patch-gwlib__gwthread-pthread.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/libwww/Makefile =================================================================== --- head/www/libwww/Makefile (revision 363345) +++ head/www/libwww/Makefile (revision 363346) @@ -1,31 +1,30 @@ # Created by: torstenb # $FreeBSD$ PORTNAME= libwww PORTVERSION= 5.4.0 PORTREVISION= 4 CATEGORIES= www devel MASTER_SITES= http://www.w3.org/Library/Distribution/ DISTNAME= w3c-${PORTNAME}-${PORTVERSION} -EXTRACT_SUFX= .tgz MAINTAINER= marius@nuenneri.ch COMMENT= The W3C Reference Library USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared --enable-static --with-zlib --with-ssl=${OPENSSLBASE} -USES= perl5 gmake +USES= perl5 gmake tar:tgz USE_PERL5= build USE_LDCONFIG= yes USE_OPENSSL= yes post-patch: @${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \ ${WRKSRC}/configure post-install: ${INSTALL_DATA} ${WRKSRC}/modules/expat/xmlparse/xmlparse.h \ ${STAGEDIR}${PREFIX}/include/w3c-libwww/ .include Index: head/www/libwww/files/patch-aa =================================================================== --- head/www/libwww/files/patch-aa (revision 363345) +++ head/www/libwww/files/patch-aa (nonexistent) @@ -1,11 +0,0 @@ ---- Library/src/HTMIMImp.c.orig Sun Jun 30 22:51:48 2002 -+++ Library/src/HTMIMImp.c Sun Jun 30 22:52:01 2002 -@@ -226,7 +226,7 @@ - int value = deflt; - if (start != NULL) { - start += strlen(needle); -- while isspace(*start) start++; -+ while (isspace(*start)) start++; - if (isdigit(*start)) { - char * end = start + 1; - char save; Property changes on: head/www/libwww/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/libwww/files/patch-Library__src__HTMIMImp.c =================================================================== --- head/www/libwww/files/patch-Library__src__HTMIMImp.c (nonexistent) +++ head/www/libwww/files/patch-Library__src__HTMIMImp.c (revision 363346) @@ -0,0 +1,11 @@ +--- Library/src/HTMIMImp.c.orig Sun Jun 30 22:51:48 2002 ++++ Library/src/HTMIMImp.c Sun Jun 30 22:52:01 2002 +@@ -226,7 +226,7 @@ + int value = deflt; + if (start != NULL) { + start += strlen(needle); +- while isspace(*start) start++; ++ while (isspace(*start)) start++; + if (isdigit(*start)) { + char * end = start + 1; + char save; Property changes on: head/www/libwww/files/patch-Library__src__HTMIMImp.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/links1/files/patch-ab =================================================================== --- head/www/links1/files/patch-ab (revision 363345) +++ head/www/links1/files/patch-ab (nonexistent) @@ -1,15 +0,0 @@ ---- kbd.c.orig 2013-03-12 19:47:22.000000000 +0400 -+++ kbd.c 2013-03-12 19:47:24.000000000 +0400 -@@ -582,10 +582,10 @@ - case 'B': ev.x = KBD_DOWN; break; - case 'C': ev.x = KBD_RIGHT; break; - case 'D': ev.x = KBD_LEFT; break; -- case 'F': -+ case 'F': ev.x = KBD_END; break; - case 'K': - case 'e': ev.x = KBD_END; break; -- case 'H': -+ case 'H': ev.x = KBD_HOME; break; - case 0: ev.x = KBD_HOME; break; - case 'V': - case 'I': ev.x = KBD_PAGE_UP; break; Property changes on: head/www/links1/files/patch-ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/links1/files/patch-kbd.c =================================================================== --- head/www/links1/files/patch-kbd.c (nonexistent) +++ head/www/links1/files/patch-kbd.c (revision 363346) @@ -0,0 +1,15 @@ +--- kbd.c.orig 2013-03-12 19:47:22.000000000 +0400 ++++ kbd.c 2013-03-12 19:47:24.000000000 +0400 +@@ -582,10 +582,10 @@ + case 'B': ev.x = KBD_DOWN; break; + case 'C': ev.x = KBD_RIGHT; break; + case 'D': ev.x = KBD_LEFT; break; +- case 'F': ++ case 'F': ev.x = KBD_END; break; + case 'K': + case 'e': ev.x = KBD_END; break; +- case 'H': ++ case 'H': ev.x = KBD_HOME; break; + case 0: ev.x = KBD_HOME; break; + case 'V': + case 'I': ev.x = KBD_PAGE_UP; break; Property changes on: head/www/links1/files/patch-kbd.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/lusca-head/files/patch-aa =================================================================== --- head/www/lusca-head/files/patch-aa (revision 363345) +++ head/www/lusca-head/files/patch-aa (nonexistent) @@ -1,11 +0,0 @@ ---- include/squid_types.h.orig Mon Jul 7 00:45:26 2003 -+++ include/squid_types.h Mon Jul 7 00:48:39 2003 -@@ -66,8 +66,5 @@ - #if HAVE_SYS_TYPES_H - #include - #endif --#if HAVE_SYS_BITYPES_H --#include --#endif - - #endif /* SQUID_TYPES_H */ Property changes on: head/www/lusca-head/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/lusca-head/files/patch-ab =================================================================== --- head/www/lusca-head/files/patch-ab (revision 363345) +++ head/www/lusca-head/files/patch-ab (nonexistent) @@ -1,20 +0,0 @@ ---- errors/Makefile.in.orig 2009-12-06 09:30:18.000000000 +0000 -+++ errors/Makefile.in 2009-12-06 09:30:24.000000000 +0000 -@@ -236,7 +236,7 @@ - uudecode = @uudecode@ - errordir = $(datadir)/errors - DEFAULT_ERROR_DIR = $(errordir) --INSTALL_LANGUAGES = templates @ERR_LANGUAGES@ -+INSTALL_LANGUAGES = @ERR_LANGUAGES@ - TEMPLATE_LANGUAGES = English - LANGUAGES = \ - Armenian \ -@@ -468,7 +468,7 @@ - fi - - dist-hook: -- @ for lang in $(LANGUAGES) templates; do \ -+ @ for lang in $(LANGUAGES) ; do \ - if test "$$lang" = .; then :; else \ - test -d $(distdir)/$$lang \ - || mkdir $(distdir)/$$lang \ Property changes on: head/www/lusca-head/files/patch-ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/lusca-head/files/patch-errors_Makefile.in =================================================================== --- head/www/lusca-head/files/patch-errors_Makefile.in (nonexistent) +++ head/www/lusca-head/files/patch-errors_Makefile.in (revision 363346) @@ -0,0 +1,20 @@ +--- errors/Makefile.in.orig 2009-12-06 09:30:18.000000000 +0000 ++++ errors/Makefile.in 2009-12-06 09:30:24.000000000 +0000 +@@ -236,7 +236,7 @@ + uudecode = @uudecode@ + errordir = $(datadir)/errors + DEFAULT_ERROR_DIR = $(errordir) +-INSTALL_LANGUAGES = templates @ERR_LANGUAGES@ ++INSTALL_LANGUAGES = @ERR_LANGUAGES@ + TEMPLATE_LANGUAGES = English + LANGUAGES = \ + Armenian \ +@@ -468,7 +468,7 @@ + fi + + dist-hook: +- @ for lang in $(LANGUAGES) templates; do \ ++ @ for lang in $(LANGUAGES) ; do \ + if test "$$lang" = .; then :; else \ + test -d $(distdir)/$$lang \ + || mkdir $(distdir)/$$lang \ Property changes on: head/www/lusca-head/files/patch-errors_Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/lusca-head/files/patch-include-squid_types.h =================================================================== --- head/www/lusca-head/files/patch-include-squid_types.h (nonexistent) +++ head/www/lusca-head/files/patch-include-squid_types.h (revision 363346) @@ -0,0 +1,11 @@ +--- include/squid_types.h.orig Mon Jul 7 00:45:26 2003 ++++ include/squid_types.h Mon Jul 7 00:48:39 2003 +@@ -66,8 +66,5 @@ + #if HAVE_SYS_TYPES_H + #include + #endif +-#if HAVE_SYS_BITYPES_H +-#include +-#endif + + #endif /* SQUID_TYPES_H */ Property changes on: head/www/lusca-head/files/patch-include-squid_types.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/lynx-current/files/patch-aa =================================================================== --- head/www/lynx-current/files/patch-aa (revision 363345) +++ head/www/lynx-current/files/patch-aa (nonexistent) @@ -1,48 +0,0 @@ ---- makefile.in.orig 2009-11-25 13:56:48.000000000 +0300 -+++ makefile.in 2010-03-26 11:13:46.000000000 +0300 -@@ -384,14 +384,10 @@ - if test "$(COMPRESS_PROG)" != "" ; then \ - (cd $(HELPDIR) && $(COMPRESS_PROG) $$files ) \ - fi' -- @echo Updating $(sysconfdir)/lynx.cfg -- @ECHO_CC@$(SHELL) -c \ -- 'if test -f $(SYSCONFDIR)/lynx.cfg ; then \ -- mv $(SYSCONFDIR)/lynx.cfg $(SYSCONFDIR)/lynx.tmp ; \ -- else \ -- cp $(srcdir)/lynx.cfg $(SYSCONFDIR)/lynx.tmp ; \ -- fi' -- @echo Updating $(sysconfdir)/lynx.cfg to point to installed help-files -+ @echo Updating $(sysconfdir)/lynx.cfg.default -+ cp $(srcdir)/lynx.cfg $(SYSCONFDIR)/lynx.tmp -+ rm -f $(SYSCONFDIR)/lynx.cfg.default -+ @echo Updating $(sysconfdir)/lynx.cfg.default to point to installed help-files - @ECHO_CC@sed -e '/^HELPFILE:http/s!^!#!' \ - -e '/^#HELPFILE:file/s!#!!' \ - $(SYSCONFDIR)/lynx.tmp | \ -@@ -399,9 +394,10 @@ - $(SHELL) $(scripts_dir)/cfg_path.sh lynx_doc $(helpdir) | \ - sed -e '/^HELPFILE:file/s!$$!$(COMPRESS_EXT)!' \ - -e '/^HELPFILE:file/s!$(COMPRESS_EXT)$(COMPRESS_EXT)$$!$(COMPRESS_EXT)!' \ -- >$(SYSCONFDIR)/lynx.cfg -- chmod 644 $(SYSCONFDIR)/lynx.cfg -+ >$(SYSCONFDIR)/lynx.cfg.default -+ chmod 644 $(SYSCONFDIR)/lynx.cfg.default - -rm -f $(SYSCONFDIR)/lynx.tmp -+ -[ ! -f $(SYSCONFDIR)/lynx.cfg ] && $(INSTALL_DATA) $(SYSCONFDIR)/lynx.cfg.default $(SYSCONFDIR)/lynx.cfg - - LYHelp.h : help_files.sed $(srcdir)/LYHelp.hin - @echo Creating $@ -@@ -423,10 +419,11 @@ - $(SHELL) -c 'SHELL=$(SHELL) $(SHELL) $(scripts_dir)/cfg_defs.sh $(srcdir)' - - install-cfg : $(SYSCONFDIR) -- @$(SHELL) $(scripts_dir)/install-cfg.sh "$(INSTALL_DATA)" $(srcdir)/lynx.cfg $(SYSCONFDIR)/lynx.cfg -+ @$(SHELL) $(scripts_dir)/install-cfg.sh "$(INSTALL_DATA)" $(srcdir)/lynx.cfg $(SYSCONFDIR)/lynx.cfg.default - - install-lss : $(SYSCONFDIR) -- @$(SHELL) $(scripts_dir)/install-lss.sh "$(INSTALL_DATA)" $(srcdir)/samples/lynx.lss $(SYSCONFDIR)/lynx.lss -+ @$(SHELL) $(scripts_dir)/install-lss.sh "$(INSTALL_DATA)" $(srcdir)/samples/lynx.lss $(SYSCONFDIR)/lynx.lss.default -+ -[ ! -f $(SYSCONFDIR)/lynx.lss ] && $(INSTALL_DATA) $(SYSCONFDIR)/lynx.lss.default $(SYSCONFDIR)/lynx.lss - - uninstall :: - @MSG_DIR_MAKE@ cd $(PO_DIR) && $(MAKE_RECUR) uninstall Property changes on: head/www/lynx-current/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/lynx-current/files/patch-makefile.in =================================================================== --- head/www/lynx-current/files/patch-makefile.in (nonexistent) +++ head/www/lynx-current/files/patch-makefile.in (revision 363346) @@ -0,0 +1,48 @@ +--- makefile.in.orig 2009-11-25 13:56:48.000000000 +0300 ++++ makefile.in 2010-03-26 11:13:46.000000000 +0300 +@@ -384,14 +384,10 @@ + if test "$(COMPRESS_PROG)" != "" ; then \ + (cd $(HELPDIR) && $(COMPRESS_PROG) $$files ) \ + fi' +- @echo Updating $(sysconfdir)/lynx.cfg +- @ECHO_CC@$(SHELL) -c \ +- 'if test -f $(SYSCONFDIR)/lynx.cfg ; then \ +- mv $(SYSCONFDIR)/lynx.cfg $(SYSCONFDIR)/lynx.tmp ; \ +- else \ +- cp $(srcdir)/lynx.cfg $(SYSCONFDIR)/lynx.tmp ; \ +- fi' +- @echo Updating $(sysconfdir)/lynx.cfg to point to installed help-files ++ @echo Updating $(sysconfdir)/lynx.cfg.default ++ cp $(srcdir)/lynx.cfg $(SYSCONFDIR)/lynx.tmp ++ rm -f $(SYSCONFDIR)/lynx.cfg.default ++ @echo Updating $(sysconfdir)/lynx.cfg.default to point to installed help-files + @ECHO_CC@sed -e '/^HELPFILE:http/s!^!#!' \ + -e '/^#HELPFILE:file/s!#!!' \ + $(SYSCONFDIR)/lynx.tmp | \ +@@ -399,9 +394,10 @@ + $(SHELL) $(scripts_dir)/cfg_path.sh lynx_doc $(helpdir) | \ + sed -e '/^HELPFILE:file/s!$$!$(COMPRESS_EXT)!' \ + -e '/^HELPFILE:file/s!$(COMPRESS_EXT)$(COMPRESS_EXT)$$!$(COMPRESS_EXT)!' \ +- >$(SYSCONFDIR)/lynx.cfg +- chmod 644 $(SYSCONFDIR)/lynx.cfg ++ >$(SYSCONFDIR)/lynx.cfg.default ++ chmod 644 $(SYSCONFDIR)/lynx.cfg.default + -rm -f $(SYSCONFDIR)/lynx.tmp ++ -[ ! -f $(SYSCONFDIR)/lynx.cfg ] && $(INSTALL_DATA) $(SYSCONFDIR)/lynx.cfg.default $(SYSCONFDIR)/lynx.cfg + + LYHelp.h : help_files.sed $(srcdir)/LYHelp.hin + @echo Creating $@ +@@ -423,10 +419,11 @@ + $(SHELL) -c 'SHELL=$(SHELL) $(SHELL) $(scripts_dir)/cfg_defs.sh $(srcdir)' + + install-cfg : $(SYSCONFDIR) +- @$(SHELL) $(scripts_dir)/install-cfg.sh "$(INSTALL_DATA)" $(srcdir)/lynx.cfg $(SYSCONFDIR)/lynx.cfg ++ @$(SHELL) $(scripts_dir)/install-cfg.sh "$(INSTALL_DATA)" $(srcdir)/lynx.cfg $(SYSCONFDIR)/lynx.cfg.default + + install-lss : $(SYSCONFDIR) +- @$(SHELL) $(scripts_dir)/install-lss.sh "$(INSTALL_DATA)" $(srcdir)/samples/lynx.lss $(SYSCONFDIR)/lynx.lss ++ @$(SHELL) $(scripts_dir)/install-lss.sh "$(INSTALL_DATA)" $(srcdir)/samples/lynx.lss $(SYSCONFDIR)/lynx.lss.default ++ -[ ! -f $(SYSCONFDIR)/lynx.lss ] && $(INSTALL_DATA) $(SYSCONFDIR)/lynx.lss.default $(SYSCONFDIR)/lynx.lss + + uninstall :: + @MSG_DIR_MAKE@ cd $(PO_DIR) && $(MAKE_RECUR) uninstall Property changes on: head/www/lynx-current/files/patch-makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/mathopd/files/patch-aa =================================================================== --- head/www/mathopd/files/patch-aa (revision 363345) +++ head/www/mathopd/files/patch-aa (nonexistent) @@ -1,65 +0,0 @@ ---- src/Makefile.orig Fri Jul 27 15:30:54 2007 -+++ src/Makefile Fri Jul 27 15:35:04 2007 -@@ -1,54 +1,9 @@ --BIN = mathopd --CC = gcc --CFLAGS = -O -Wall --CPPFLAGS = --LDFLAGS = --LIBS = -lcrypt --PREFIX = /usr/local --SBINDIR = $(PREFIX)/sbin -+PROG= mathopd -+SRCS= -+SRCS= base64.c cgi.c config.c core.c dump.c imap.c log.c main.c \ -+ redirect.c request.c util.c stub.c sendfile.c -+BINDIR?= ${PREFIX}/sbin -+NO_MAN= yes -+LDADD= -lcrypt - --# On Solaris, uncomment the following --# CPPFLAGS = -DHAVE_CRYPT_H --# LIBS = -lsocket -lnsl -lresolv -- --# On Linux, uncomment the following --# CPPFLAGS = -DHAVE_CRYPT_H -- --# For Linux or Solaris: --# To add support for large files (>2GB), uncomment the following. --# You do not need this for 64-bit executables. --# CPPFLAGS += -D_FILE_OFFSET_BITS=64 -- --OBJS = base64.o cgi.o config.o core.o dump.o imap.o log.o main.o \ -- redirect.o request.o util.o stub.o $(EXTRA_OBJS) --DEPENDS = mathopd.h Makefile -- --# Uncomment the following if your system does not support the poll() function --# CPPFLAGS += -DPOLL_EMULATION --# EXTRA_OBJS += poll-emul.o -- --# Uncomment the following if your system does not have the socklen_t type --# CPPFLAGS += -DNEED_SOCKLEN_T -- --# Unomment the following if your system has a working vfork() function --# CPPFLAGS += -DHAVE_VFORK -- --# Currently, sendfile support is available in two flavours: Linux and FreeBSD --# Uncomment one of the following two to enable sendfile() support --# CPPFLAGS += -DLINUX_SENDFILE --# CPPFLAGS += -DFREEBSD_SENDFILE --# If you define any of the SENDFILE conditionals, make sure to uncomment --# the next line as well. --# EXTRA_OBJS += sendfile.o -- --all: $(BIN) --install: $(BIN) -- install -c $(BIN) $(DESTDIR)$(SBINDIR) --$(BIN): $(OBJS) -- $(CC) $(LDFLAGS) -o $(BIN) $(OBJS) $(LIBS) --$(OBJS): $(DEPENDS) --.c.o: -- $(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@ --clean: -- rm -f $(BIN) $(OBJS) --.PHONY: install clean -+.include Property changes on: head/www/mathopd/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/mathopd/files/patch-ab =================================================================== --- head/www/mathopd/files/patch-ab (revision 363345) +++ head/www/mathopd/files/patch-ab (nonexistent) @@ -1,6 +0,0 @@ ---- Makefile.orig Fri Dec 5 00:24:18 2003 -+++ Makefile Fri Dec 5 00:24:44 2003 -@@ -0,0 +1,3 @@ -+SUBDIR= src -+ -+.include Property changes on: head/www/mathopd/files/patch-ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/mathopd/files/patch-Makefile =================================================================== --- head/www/mathopd/files/patch-Makefile (nonexistent) +++ head/www/mathopd/files/patch-Makefile (revision 363346) @@ -0,0 +1,6 @@ +--- Makefile.orig Fri Dec 5 00:24:18 2003 ++++ Makefile Fri Dec 5 00:24:44 2003 +@@ -0,0 +1,3 @@ ++SUBDIR= src ++ ++.include Property changes on: head/www/mathopd/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/mathopd/files/patch-src__Makefile =================================================================== --- head/www/mathopd/files/patch-src__Makefile (nonexistent) +++ head/www/mathopd/files/patch-src__Makefile (revision 363346) @@ -0,0 +1,65 @@ +--- src/Makefile.orig Fri Jul 27 15:30:54 2007 ++++ src/Makefile Fri Jul 27 15:35:04 2007 +@@ -1,54 +1,9 @@ +-BIN = mathopd +-CC = gcc +-CFLAGS = -O -Wall +-CPPFLAGS = +-LDFLAGS = +-LIBS = -lcrypt +-PREFIX = /usr/local +-SBINDIR = $(PREFIX)/sbin ++PROG= mathopd ++SRCS= ++SRCS= base64.c cgi.c config.c core.c dump.c imap.c log.c main.c \ ++ redirect.c request.c util.c stub.c sendfile.c ++BINDIR?= ${PREFIX}/sbin ++NO_MAN= yes ++LDADD= -lcrypt + +-# On Solaris, uncomment the following +-# CPPFLAGS = -DHAVE_CRYPT_H +-# LIBS = -lsocket -lnsl -lresolv +- +-# On Linux, uncomment the following +-# CPPFLAGS = -DHAVE_CRYPT_H +- +-# For Linux or Solaris: +-# To add support for large files (>2GB), uncomment the following. +-# You do not need this for 64-bit executables. +-# CPPFLAGS += -D_FILE_OFFSET_BITS=64 +- +-OBJS = base64.o cgi.o config.o core.o dump.o imap.o log.o main.o \ +- redirect.o request.o util.o stub.o $(EXTRA_OBJS) +-DEPENDS = mathopd.h Makefile +- +-# Uncomment the following if your system does not support the poll() function +-# CPPFLAGS += -DPOLL_EMULATION +-# EXTRA_OBJS += poll-emul.o +- +-# Uncomment the following if your system does not have the socklen_t type +-# CPPFLAGS += -DNEED_SOCKLEN_T +- +-# Unomment the following if your system has a working vfork() function +-# CPPFLAGS += -DHAVE_VFORK +- +-# Currently, sendfile support is available in two flavours: Linux and FreeBSD +-# Uncomment one of the following two to enable sendfile() support +-# CPPFLAGS += -DLINUX_SENDFILE +-# CPPFLAGS += -DFREEBSD_SENDFILE +-# If you define any of the SENDFILE conditionals, make sure to uncomment +-# the next line as well. +-# EXTRA_OBJS += sendfile.o +- +-all: $(BIN) +-install: $(BIN) +- install -c $(BIN) $(DESTDIR)$(SBINDIR) +-$(BIN): $(OBJS) +- $(CC) $(LDFLAGS) -o $(BIN) $(OBJS) $(LIBS) +-$(OBJS): $(DEPENDS) +-.c.o: +- $(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@ +-clean: +- rm -f $(BIN) $(OBJS) +-.PHONY: install clean ++.include Property changes on: head/www/mathopd/files/patch-src__Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/npc/Makefile =================================================================== --- head/www/npc/Makefile (revision 363345) +++ head/www/npc/Makefile (revision 363346) @@ -1,26 +1,25 @@ # Created by: Yasuhiro Fukuma # $FreeBSD$ PORTNAME= npc PORTVERSION= 0.83 CATEGORIES= www MASTER_SITES= http://www2.biglobe.ne.jp/%7Enir/soft/ MAINTAINER= ports@FreeBSD.org COMMENT= An animated web counter WRKSRC= ${WRKDIR}/${DISTNAME}/src MAKE_ARGS= INDEX_DIR="${INDEX_DIR}" INDEX_DIR= ${PREFIX}/etc/npc do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/www/cgi-bin - cd ${WRKSRC}; \ - ${INSTALL_PROGRAM} npc.cgi ${STAGEDIR}${PREFIX}/www/cgi-bin + ${INSTALL_PROGRAM} ${WRKSRC}/npc.cgi ${STAGEDIR}${PREFIX}/www/cgi-bin ${MKDIR} ${STAGEDIR}${PREFIX}/share/examples/npc - cd ${WRKSRC}/../conf; \ - ${INSTALL_DATA} sample1.idx sample2.idx ${STAGEDIR}${PREFIX}/share/examples/npc + (cd ${WRKSRC}/../conf && \ + ${INSTALL_DATA} sample1.idx sample2.idx ${STAGEDIR}${PREFIX}/share/examples/npc) ${MKDIR} ${STAGEDIR}${INDEX_DIR} .include Index: head/www/npc/files/patch-aa =================================================================== --- head/www/npc/files/patch-aa (revision 363345) +++ head/www/npc/files/patch-aa (nonexistent) @@ -1,13 +0,0 @@ ---- Makefile.orig Thu Dec 11 06:15:32 1997 -+++ Makefile Sun Jul 2 20:06:47 2000 -@@ -2,8 +2,8 @@ - # npc.cgi -- Animation counter cgi - # - --CC = gcc --CFLAGS = -O -+CC ?= gcc -+CFLAGS ?= -O - MAKEFILE = Makefile - - INDEX_DIR = /usr/local/etc/httpd/index Property changes on: head/www/npc/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/npc/files/patch-Makefile =================================================================== --- head/www/npc/files/patch-Makefile (nonexistent) +++ head/www/npc/files/patch-Makefile (revision 363346) @@ -0,0 +1,13 @@ +--- Makefile.orig Thu Dec 11 06:15:32 1997 ++++ Makefile Sun Jul 2 20:06:47 2000 +@@ -2,8 +2,8 @@ + # npc.cgi -- Animation counter cgi + # + +-CC = gcc +-CFLAGS = -O ++CC ?= gcc ++CFLAGS ?= -O + MAKEFILE = Makefile + + INDEX_DIR = /usr/local/etc/httpd/index Property changes on: head/www/npc/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/p5-FAQ-OMatic/files/patch-aa =================================================================== --- head/www/p5-FAQ-OMatic/files/patch-aa (revision 363345) +++ head/www/p5-FAQ-OMatic/files/patch-aa (nonexistent) @@ -1,22 +0,0 @@ ---- fom.PL-orig Fri May 30 09:42:46 2003 -+++ fom.PL Fri May 30 09:43:19 2003 -@@ -51,7 +51,8 @@ - close THECGI; - chmod 0755, "fom"; - --print <<"__EOF__"; -+open( F, ">install.notes" ); -+print F <<"__EOF__"; - - If this is a new FAQ-O-Matic, you will need the following - temporary password to complete the installation. (This helps -@@ -68,7 +69,6 @@ - Finally, you may get this error at the end of make install: - /bin/sh: .../user_perl/lib/sun4-solaris/5.00401/perllocal.pod: cannot create - You can ignore it. -- --Press enter to continue. - __EOF__ --my $dummy = ; -+ -+close( F ); Property changes on: head/www/p5-FAQ-OMatic/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/p5-FAQ-OMatic/files/patch-fom.PL =================================================================== --- head/www/p5-FAQ-OMatic/files/patch-fom.PL (nonexistent) +++ head/www/p5-FAQ-OMatic/files/patch-fom.PL (revision 363346) @@ -0,0 +1,22 @@ +--- fom.PL-orig Fri May 30 09:42:46 2003 ++++ fom.PL Fri May 30 09:43:19 2003 +@@ -51,7 +51,8 @@ + close THECGI; + chmod 0755, "fom"; + +-print <<"__EOF__"; ++open( F, ">install.notes" ); ++print F <<"__EOF__"; + + If this is a new FAQ-O-Matic, you will need the following + temporary password to complete the installation. (This helps +@@ -68,7 +69,6 @@ + Finally, you may get this error at the end of make install: + /bin/sh: .../user_perl/lib/sun4-solaris/5.00401/perllocal.pod: cannot create + You can ignore it. +- +-Press enter to continue. + __EOF__ +-my $dummy = ; ++ ++close( F ); Property changes on: head/www/p5-FAQ-OMatic/files/patch-fom.PL ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/polipo/files/patch-aa =================================================================== --- head/www/polipo/files/patch-aa (revision 363345) +++ head/www/polipo/files/patch-aa (nonexistent) @@ -1,86 +0,0 @@ ---- Makefile Tue Jun 29 02:07:35 2004 -+++ Makefile Mon Dec 27 15:35:40 2004 -@@ -2,8 +2,8 @@ - BINDIR = $(PREFIX)/bin - MANDIR = $(PREFIX)/man - INFODIR = $(PREFIX)/info --LOCAL_ROOT = /usr/share/polipo/www --DISK_CACHE_ROOT = /var/cache/polipo -+LOCAL_ROOT = $(PREFIX)/share/polipo/www -+DISK_CACHE_ROOT ?= /var/cache/polipo - - # CDEBUGFLAGS = -O - -@@ -47,7 +47,8 @@ - - DEFINES = $(FILE_DEFINES) $(PLATFORM_DEFINES) - --CFLAGS = $(MD5INCLUDES) $(CDEBUGFLAGS) $(DEFINES) $(EXTRA_DEFINES) -+CFLAGS ?= $(CDEBUGFLAGS) -+CFLAGS += $(MD5INCLUDES) $(DEFINES) $(EXTRA_DEFINES) - - SRCS = util.c event.c io.c chunk.c atom.c object.c log.c diskcache.c main.c \ - config.c local.c http.c client.c server.c auth.c tunnel.c \ ---- config.sample Mon Sep 6 23:31:57 2004 -+++ config.sample Mon Dec 27 15:35:40 2004 -@@ -65,6 +65,11 @@ - - # localDocumentRoot = "" - -+# Access rights for new cache files. -+diskCacheFilePermissions=0640 -+# Access rights for new directories. -+diskCacheDirectoryPermissions=0750 -+ - - ### Domain Name System - ### ****************** ---- forbidden.c Sat Sep 11 00:31:24 2004 -+++ forbidden.c Mon Dec 27 15:35:40 2004 -@@ -158,8 +158,8 @@ - } - - if(forbiddenFile == NULL) { -- if(access("/etc/polipo/forbidden", F_OK) >= 0) -- forbiddenFile = internAtom("/etc/polipo/forbidden"); -+ if(access("/usr/local/etc/polipo/forbidden", F_OK) >= 0) -+ forbiddenFile = internAtom("/usr/local/etc/polipo/forbidden"); - } - - if(have_forbiddenDomains) { ---- main.c Tue Oct 5 23:41:49 2004 -+++ main.c Mon Dec 27 15:35:40 2004 -@@ -106,8 +106,8 @@ - } - - if(configFile == NULL) { -- if(access("/etc/polipo/config", F_OK) >= 0) -- configFile = internAtom("/etc/polipo/config"); -+ if(access("/usr/local/etc/polipo/config", F_OK) >= 0) -+ configFile = internAtom("/usr/local/etc/polipo/config"); - if(configFile && access(configFile->string, F_OK) < 0) { - releaseAtom(configFile); - configFile = NULL; ---- polipo.man Tue Jun 29 02:07:35 2004 -+++ polipo.man Mon Dec 27 15:35:40 2004 -@@ -43,16 +43,16 @@ - Change the value of a configuration variable. - .SH FILES - .TP --.B /etc/polipo/config -+.B /usr/local/etc/polipo/config - The default location of Polipo's configuration file. - .TP --.B /etc/polipo/forbidden -+.B /usr/local/etc/polipo/forbidden - The default location of the list of forbidden URLs. - .TP - .B /var/cache/polipo/ - The default location of the on-disk cache. - .TP --.B /usr/share/polipo/www/ -+.B /usr/local/share/polipo/www/ - The default root of the local web space. - .SH SIGNALS - .TP - Property changes on: head/www/polipo/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/polipo/files/patch-paths =================================================================== --- head/www/polipo/files/patch-paths (nonexistent) +++ head/www/polipo/files/patch-paths (revision 363346) @@ -0,0 +1,86 @@ +--- Makefile Tue Jun 29 02:07:35 2004 ++++ Makefile Mon Dec 27 15:35:40 2004 +@@ -2,8 +2,8 @@ + BINDIR = $(PREFIX)/bin + MANDIR = $(PREFIX)/man + INFODIR = $(PREFIX)/info +-LOCAL_ROOT = /usr/share/polipo/www +-DISK_CACHE_ROOT = /var/cache/polipo ++LOCAL_ROOT = $(PREFIX)/share/polipo/www ++DISK_CACHE_ROOT ?= /var/cache/polipo + + # CDEBUGFLAGS = -O + +@@ -47,7 +47,8 @@ + + DEFINES = $(FILE_DEFINES) $(PLATFORM_DEFINES) + +-CFLAGS = $(MD5INCLUDES) $(CDEBUGFLAGS) $(DEFINES) $(EXTRA_DEFINES) ++CFLAGS ?= $(CDEBUGFLAGS) ++CFLAGS += $(MD5INCLUDES) $(DEFINES) $(EXTRA_DEFINES) + + SRCS = util.c event.c io.c chunk.c atom.c object.c log.c diskcache.c main.c \ + config.c local.c http.c client.c server.c auth.c tunnel.c \ +--- config.sample Mon Sep 6 23:31:57 2004 ++++ config.sample Mon Dec 27 15:35:40 2004 +@@ -65,6 +65,11 @@ + + # localDocumentRoot = "" + ++# Access rights for new cache files. ++diskCacheFilePermissions=0640 ++# Access rights for new directories. ++diskCacheDirectoryPermissions=0750 ++ + + ### Domain Name System + ### ****************** +--- forbidden.c Sat Sep 11 00:31:24 2004 ++++ forbidden.c Mon Dec 27 15:35:40 2004 +@@ -158,8 +158,8 @@ + } + + if(forbiddenFile == NULL) { +- if(access("/etc/polipo/forbidden", F_OK) >= 0) +- forbiddenFile = internAtom("/etc/polipo/forbidden"); ++ if(access("/usr/local/etc/polipo/forbidden", F_OK) >= 0) ++ forbiddenFile = internAtom("/usr/local/etc/polipo/forbidden"); + } + + if(have_forbiddenDomains) { +--- main.c Tue Oct 5 23:41:49 2004 ++++ main.c Mon Dec 27 15:35:40 2004 +@@ -106,8 +106,8 @@ + } + + if(configFile == NULL) { +- if(access("/etc/polipo/config", F_OK) >= 0) +- configFile = internAtom("/etc/polipo/config"); ++ if(access("/usr/local/etc/polipo/config", F_OK) >= 0) ++ configFile = internAtom("/usr/local/etc/polipo/config"); + if(configFile && access(configFile->string, F_OK) < 0) { + releaseAtom(configFile); + configFile = NULL; +--- polipo.man Tue Jun 29 02:07:35 2004 ++++ polipo.man Mon Dec 27 15:35:40 2004 +@@ -43,16 +43,16 @@ + Change the value of a configuration variable. + .SH FILES + .TP +-.B /etc/polipo/config ++.B /usr/local/etc/polipo/config + The default location of Polipo's configuration file. + .TP +-.B /etc/polipo/forbidden ++.B /usr/local/etc/polipo/forbidden + The default location of the list of forbidden URLs. + .TP + .B /var/cache/polipo/ + The default location of the on-disk cache. + .TP +-.B /usr/share/polipo/www/ ++.B /usr/local/share/polipo/www/ + The default root of the local web space. + .SH SIGNALS + .TP + Property changes on: head/www/polipo/files/patch-paths ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/pwebstats/files/patch-aa =================================================================== --- head/www/pwebstats/files/patch-aa (revision 363345) +++ head/www/pwebstats/files/patch-aa (nonexistent) @@ -1,49 +0,0 @@ ---- pwebstats.orig Tue Jul 15 01:35:07 2003 -+++ pwebstats Tue Jul 15 01:35:59 2003 -@@ -414,8 +414,8 @@ - $date_num_size{$num} = &get_width("$image_templates/dates/$num.gif"); - } - -- $num_size{'\''} = &get_width("$image_templates/\'.gif"); -- $date_num_size{'\''} = &get_width("$image_templates/dates/\'.gif"); -+ $num_size{'\''} = &get_width("$image_templates/10.gif"); -+ $date_num_size{'\''} = &get_width("$image_templates/dates/10.gif"); - - foreach $mon ( keys(%months) ) { - $mon_size{$mon} = &get_width("$image_templates/$mon.gif"); -@@ -2264,7 +2264,7 @@ - print "copy 10,214,0,0,24,16,$image_templates/dates/$mon.gif\n"; - ($y1,$y2) = $yea =~ m/^\d\d(.)(.)$/; - $x = 34; -- printf "copy $x,214,0,0,%s,16,$image_templates/dates/'.gif\n", $date_num_size{"'"}; -+ printf "copy $x,214,0,0,%s,16,$image_templates/dates/10.gif\n", $date_num_size{"'"}; - $x += $date_num_size{"'"}; - printf "copy $x,214,0,0,%s,16,$image_templates/dates/$y1.gif\n", $date_num_size{"$y1"}; - $x += $date_num_size{$y1}; -@@ -2276,7 +2276,7 @@ - print "copy 397,214,0,0,24,16,$image_templates/dates/$mon.gif\n"; - ($y1,$y2) = $yea =~ m/^\d\d(.)(.)$/; - $x = 423; -- printf "copy $x,214,0,0,%s,16,$image_templates/dates/'.gif\n", $date_num_size{"'"}; -+ printf "copy $x,214,0,0,%s,16,$image_templates/dates/10101010101010101010.gif\n", $date_num_size{"'"}; - $x += $date_num_size{"'"}; - printf "copy $x,214,0,0,%s,16,$image_templates/dates/$y1.gif\n", $date_num_size{"$y1"}; - $x += $date_num_size{$y1}; -@@ -2456,7 +2456,7 @@ - print "copy 10,214,0,0,24,16,$image_templates/dates/$mon.gif\n"; - ($y1,$y2) = $yea =~ m/^\d\d(.)(.)$/; - $x = 34; -- printf "copy $x,214,0,0,%s,16,$image_templates/dates/'.gif\n", $date_num_size{"'"}; -+ printf "copy $x,214,0,0,%s,16,$image_templates/dates/10.gif\n", $date_num_size{"'"}; - $x += $date_num_size{"'"}; - printf "copy $x,214,0,0,%s,16,$image_templates/dates/$y1.gif\n", $date_num_size{"$y1"}; - $x += $date_num_size{$y1}; -@@ -2468,7 +2468,7 @@ - print "copy 397,214,0,0,24,16,$image_templates/dates/$mon.gif\n"; - ($y1,$y2) = $yea =~ m/^\d\d(.)(.)$/; - $x = 423; -- printf "copy $x,214,0,0,%s,16,$image_templates/dates/'.gif\n", $date_num_size{"'"}; -+ printf "copy $x,214,0,0,%s,16,$image_templates/dates/10.gif\n", $date_num_size{"'"}; - $x += $date_num_size{"'"}; - printf "copy $x,214,0,0,%s,16,$image_templates/dates/$y1.gif\n", $date_num_size{"$y1"}; - $x += $date_num_size{$y1}; Property changes on: head/www/pwebstats/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/pwebstats/files/patch-pwebstats =================================================================== --- head/www/pwebstats/files/patch-pwebstats (nonexistent) +++ head/www/pwebstats/files/patch-pwebstats (revision 363346) @@ -0,0 +1,49 @@ +--- pwebstats.orig Tue Jul 15 01:35:07 2003 ++++ pwebstats Tue Jul 15 01:35:59 2003 +@@ -414,8 +414,8 @@ + $date_num_size{$num} = &get_width("$image_templates/dates/$num.gif"); + } + +- $num_size{'\''} = &get_width("$image_templates/\'.gif"); +- $date_num_size{'\''} = &get_width("$image_templates/dates/\'.gif"); ++ $num_size{'\''} = &get_width("$image_templates/10.gif"); ++ $date_num_size{'\''} = &get_width("$image_templates/dates/10.gif"); + + foreach $mon ( keys(%months) ) { + $mon_size{$mon} = &get_width("$image_templates/$mon.gif"); +@@ -2264,7 +2264,7 @@ + print "copy 10,214,0,0,24,16,$image_templates/dates/$mon.gif\n"; + ($y1,$y2) = $yea =~ m/^\d\d(.)(.)$/; + $x = 34; +- printf "copy $x,214,0,0,%s,16,$image_templates/dates/'.gif\n", $date_num_size{"'"}; ++ printf "copy $x,214,0,0,%s,16,$image_templates/dates/10.gif\n", $date_num_size{"'"}; + $x += $date_num_size{"'"}; + printf "copy $x,214,0,0,%s,16,$image_templates/dates/$y1.gif\n", $date_num_size{"$y1"}; + $x += $date_num_size{$y1}; +@@ -2276,7 +2276,7 @@ + print "copy 397,214,0,0,24,16,$image_templates/dates/$mon.gif\n"; + ($y1,$y2) = $yea =~ m/^\d\d(.)(.)$/; + $x = 423; +- printf "copy $x,214,0,0,%s,16,$image_templates/dates/'.gif\n", $date_num_size{"'"}; ++ printf "copy $x,214,0,0,%s,16,$image_templates/dates/10101010101010101010.gif\n", $date_num_size{"'"}; + $x += $date_num_size{"'"}; + printf "copy $x,214,0,0,%s,16,$image_templates/dates/$y1.gif\n", $date_num_size{"$y1"}; + $x += $date_num_size{$y1}; +@@ -2456,7 +2456,7 @@ + print "copy 10,214,0,0,24,16,$image_templates/dates/$mon.gif\n"; + ($y1,$y2) = $yea =~ m/^\d\d(.)(.)$/; + $x = 34; +- printf "copy $x,214,0,0,%s,16,$image_templates/dates/'.gif\n", $date_num_size{"'"}; ++ printf "copy $x,214,0,0,%s,16,$image_templates/dates/10.gif\n", $date_num_size{"'"}; + $x += $date_num_size{"'"}; + printf "copy $x,214,0,0,%s,16,$image_templates/dates/$y1.gif\n", $date_num_size{"$y1"}; + $x += $date_num_size{$y1}; +@@ -2468,7 +2468,7 @@ + print "copy 397,214,0,0,24,16,$image_templates/dates/$mon.gif\n"; + ($y1,$y2) = $yea =~ m/^\d\d(.)(.)$/; + $x = 423; +- printf "copy $x,214,0,0,%s,16,$image_templates/dates/'.gif\n", $date_num_size{"'"}; ++ printf "copy $x,214,0,0,%s,16,$image_templates/dates/10.gif\n", $date_num_size{"'"}; + $x += $date_num_size{"'"}; + printf "copy $x,214,0,0,%s,16,$image_templates/dates/$y1.gif\n", $date_num_size{"$y1"}; + $x += $date_num_size{$y1}; Property changes on: head/www/pwebstats/files/patch-pwebstats ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/py-HTMLgen/files/patch-aa =================================================================== --- head/www/py-HTMLgen/files/patch-aa (revision 363345) +++ head/www/py-HTMLgen/files/patch-aa (nonexistent) @@ -1,29 +0,0 @@ ---- installp.py.orig 1999-02-03 21:59:11.000000000 -0700 -+++ installp.py 2014-05-29 09:23:31.000000000 -0700 -@@ -14,17 +14,22 @@ - print "Usage: %s [-f] pymodule [npymodule...]" % sys.argv[0] - sys.exit(1) - for opt in opts: -- if opt == '-f': FORCE = 1 -+ if opt[0] == '-f': FORCE = 1 - - v = sys.version[:3] - -+ try: -+ destdir = os.environ['DESTDIR'] -+ except KeyError: -+ destdir = "" -+ - if string.atof(v) >= 1.5: -- sp = "%s/lib/python%s/site-packages" % (sys.prefix, v) -+ sp = "%s%s/lib/python%s/site-packages" % (destdir, sys.prefix, v) - if not os.path.exists(sp): -- os.mkdir(sp) -+ os.makedirs(sp) - else: - print "looks like Python is older than 1.5" -- sp = "%s/lib/python%s" % (sys.prefix, v) -+ sp = "%s%s/lib/python%s" % (destdir, sys.prefix, v) - - if not FORCE: - ans = raw_input("Install Python modules into %s? [y] " % sp) Property changes on: head/www/py-HTMLgen/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/py-HTMLgen/files/patch-installp.py =================================================================== --- head/www/py-HTMLgen/files/patch-installp.py (nonexistent) +++ head/www/py-HTMLgen/files/patch-installp.py (revision 363346) @@ -0,0 +1,29 @@ +--- installp.py.orig 1999-02-03 21:59:11.000000000 -0700 ++++ installp.py 2014-05-29 09:23:31.000000000 -0700 +@@ -14,17 +14,22 @@ + print "Usage: %s [-f] pymodule [npymodule...]" % sys.argv[0] + sys.exit(1) + for opt in opts: +- if opt == '-f': FORCE = 1 ++ if opt[0] == '-f': FORCE = 1 + + v = sys.version[:3] + ++ try: ++ destdir = os.environ['DESTDIR'] ++ except KeyError: ++ destdir = "" ++ + if string.atof(v) >= 1.5: +- sp = "%s/lib/python%s/site-packages" % (sys.prefix, v) ++ sp = "%s%s/lib/python%s/site-packages" % (destdir, sys.prefix, v) + if not os.path.exists(sp): +- os.mkdir(sp) ++ os.makedirs(sp) + else: + print "looks like Python is older than 1.5" +- sp = "%s/lib/python%s" % (sys.prefix, v) ++ sp = "%s%s/lib/python%s" % (destdir, sys.prefix, v) + + if not FORCE: + ans = raw_input("Install Python modules into %s? [y] " % sp) Property changes on: head/www/py-HTMLgen/files/patch-installp.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/reportmagic/files/patch-aa =================================================================== --- head/www/reportmagic/files/patch-aa (revision 363345) +++ head/www/reportmagic/files/patch-aa (nonexistent) @@ -1,34 +0,0 @@ ---- Install.PL.orig 2003-04-02 02:21:00.000000000 -0700 -+++ Install.PL 2014-05-29 11:23:05.000000000 -0700 -@@ -59,13 +59,13 @@ - # example to use the version number in your path. - # Make sure this remains in single quotes. - # --$DEST = '/usr/local/bin/rmagic-$(VERSION)/'; -+$DEST = "$ENV{'DESTDIR'}$ENV{'PREFIX'}/reportmagic/"; - - # - # Where do you want documentation to be installed? - # You can use string concatenation, as in this example, - # to install the docs below the program. --$DOC = $DEST . 'docs/'; -+$DOC = "$ENV{'DESTDIR'}$ENV{'PREFIX'}/share/doc/reportmagic/"; - - - # -@@ -269,7 +269,6 @@ - $DOC = 'docs/' if defined $args{only_modules}; - print "\nInstallation complete.\n"; - print "For help on using Report Magic see $DOC"."index.html.\n"; -- print "You must agree to the license agreement at $DOC"."license.html before using Report Magic.\n"; - } # end if - - -@@ -305,7 +304,6 @@ - chmod( $mode, $dest ); - } else { - print "\t***Error: Can not copy $src to $dest. $!.\n"; -- $rc = 0; - } # end if - } # end if - return $rc; Property changes on: head/www/reportmagic/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/reportmagic/files/patch-Install.PL =================================================================== --- head/www/reportmagic/files/patch-Install.PL (nonexistent) +++ head/www/reportmagic/files/patch-Install.PL (revision 363346) @@ -0,0 +1,34 @@ +--- Install.PL.orig 2003-04-02 02:21:00.000000000 -0700 ++++ Install.PL 2014-05-29 11:23:05.000000000 -0700 +@@ -59,13 +59,13 @@ + # example to use the version number in your path. + # Make sure this remains in single quotes. + # +-$DEST = '/usr/local/bin/rmagic-$(VERSION)/'; ++$DEST = "$ENV{'DESTDIR'}$ENV{'PREFIX'}/reportmagic/"; + + # + # Where do you want documentation to be installed? + # You can use string concatenation, as in this example, + # to install the docs below the program. +-$DOC = $DEST . 'docs/'; ++$DOC = "$ENV{'DESTDIR'}$ENV{'PREFIX'}/share/doc/reportmagic/"; + + + # +@@ -269,7 +269,6 @@ + $DOC = 'docs/' if defined $args{only_modules}; + print "\nInstallation complete.\n"; + print "For help on using Report Magic see $DOC"."index.html.\n"; +- print "You must agree to the license agreement at $DOC"."license.html before using Report Magic.\n"; + } # end if + + +@@ -305,7 +304,6 @@ + chmod( $mode, $dest ); + } else { + print "\t***Error: Can not copy $src to $dest. $!.\n"; +- $rc = 0; + } # end if + } # end if + return $rc; Property changes on: head/www/reportmagic/files/patch-Install.PL ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/smb_auth/files/patch-aa =================================================================== --- head/www/smb_auth/files/patch-aa (revision 363345) +++ head/www/smb_auth/files/patch-aa (nonexistent) @@ -1,33 +0,0 @@ ---- Makefile.orig Thu Jan 13 11:58:13 2000 -+++ Makefile Thu Jan 13 12:07:21 2000 -@@ -5,25 +5,25 @@ - # by using the --prefix option when configuring Samba, you need to change - # SAMBAPREFIX accordingly. - --SAMBAPREFIX=/usr/local/samba -+SAMBAPREFIX=$(LOCALBASE) - - # INSTALLBIN is the directory in which both smb_auth and its helper script - # smb_auth.sh, will be installed. smb_auth uses this value to find its - # helper script, so change this before compiling smb_auth. - --INSTALLBIN=/usr/local/bin -+INSTALLBIN=$(PREFIX)/bin - - # End of configuration section - - OBJECTS = smb_auth.o - SCRIPT = smb_auth.sh - --CC = gcc --CFLAGS = -O2 -Wall \ -+CC ?= gcc -+CFLAGS += -Wall \ - -DSAMBAPREFIX=\"$(SAMBAPREFIX)\" -DHELPERSCRIPT=\"$(INSTALLBIN)/$(SCRIPT)\" - - smb_auth: $(OBJECTS) -- $(CC) -o smb_auth $(OBJECTS) -+ $(CC) $(CFLAGS) -o smb_auth $(OBJECTS) - - install: smb_auth - install smb_auth $(SCRIPT) $(INSTALLBIN) Property changes on: head/www/smb_auth/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/smb_auth/files/patch-Makefile =================================================================== --- head/www/smb_auth/files/patch-Makefile (nonexistent) +++ head/www/smb_auth/files/patch-Makefile (revision 363346) @@ -0,0 +1,33 @@ +--- Makefile.orig Thu Jan 13 11:58:13 2000 ++++ Makefile Thu Jan 13 12:07:21 2000 +@@ -5,25 +5,25 @@ + # by using the --prefix option when configuring Samba, you need to change + # SAMBAPREFIX accordingly. + +-SAMBAPREFIX=/usr/local/samba ++SAMBAPREFIX=$(LOCALBASE) + + # INSTALLBIN is the directory in which both smb_auth and its helper script + # smb_auth.sh, will be installed. smb_auth uses this value to find its + # helper script, so change this before compiling smb_auth. + +-INSTALLBIN=/usr/local/bin ++INSTALLBIN=$(PREFIX)/bin + + # End of configuration section + + OBJECTS = smb_auth.o + SCRIPT = smb_auth.sh + +-CC = gcc +-CFLAGS = -O2 -Wall \ ++CC ?= gcc ++CFLAGS += -Wall \ + -DSAMBAPREFIX=\"$(SAMBAPREFIX)\" -DHELPERSCRIPT=\"$(INSTALLBIN)/$(SCRIPT)\" + + smb_auth: $(OBJECTS) +- $(CC) -o smb_auth $(OBJECTS) ++ $(CC) $(CFLAGS) -o smb_auth $(OBJECTS) + + install: smb_auth + install smb_auth $(SCRIPT) $(INSTALLBIN) Property changes on: head/www/smb_auth/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/squid/files/patch-aa =================================================================== --- head/www/squid/files/patch-aa (revision 363345) +++ head/www/squid/files/patch-aa (nonexistent) @@ -1,11 +0,0 @@ ---- include/squid_types.h.orig Mon Jul 7 00:45:26 2003 -+++ include/squid_types.h Mon Jul 7 00:48:39 2003 -@@ -66,8 +66,5 @@ - #if HAVE_SYS_TYPES_H - #include - #endif --#if HAVE_SYS_BITYPES_H --#include --#endif - - #endif /* SQUID_TYPES_H */ Property changes on: head/www/squid/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/squid/files/patch-include-squid_types.h =================================================================== --- head/www/squid/files/patch-include-squid_types.h (nonexistent) +++ head/www/squid/files/patch-include-squid_types.h (revision 363346) @@ -0,0 +1,11 @@ +--- include/squid_types.h.orig Mon Jul 7 00:45:26 2003 ++++ include/squid_types.h Mon Jul 7 00:48:39 2003 +@@ -66,8 +66,5 @@ + #if HAVE_SYS_TYPES_H + #include + #endif +-#if HAVE_SYS_BITYPES_H +-#include +-#endif + + #endif /* SQUID_TYPES_H */ Property changes on: head/www/squid/files/patch-include-squid_types.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/tclhttpd/files/patch-ab =================================================================== --- head/www/tclhttpd/files/patch-ab (revision 363345) +++ head/www/tclhttpd/files/patch-ab (nonexistent) @@ -1,62 +0,0 @@ ---- Makefile.in.orig 2003-08-11 18:46:57.000000000 +0200 -+++ Makefile.in 2014-02-21 16:44:55.000000000 +0100 -@@ -122,7 +122,7 @@ - limitlibdir = $(libdir)/@LIMIT_PACKAGE@@LIMIT_VERSION@ - pkgincludedir = $(includedir)/@PACKAGE@@VERSION@ - SERVER_ROOT = @SERVER_ROOT@ --htdocsdir = $(SERVER_ROOT)/htdocs -+htdocsdir = $(prefix)/share/@PACKAGE@@VERSION@ - customdir = $(SERVER_ROOT)/custom - - top_builddir = . -@@ -197,7 +197,7 @@ - - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - CONFIGDIR = @CONFIGDIR@ --mkinstalldirs = $(SHELL) $(CONFIGDIR)/mkinstalldirs -+mkinstalldirs = mkdir -p - CONFIG_CLEAN_FILES = - - CPPFLAGS = @CPPFLAGS@ -@@ -220,7 +220,7 @@ - # for the BINARIES that you specified above have already been done. - #======================================================================== - --all: binaries libraries doc -+all: libraries doc - - #======================================================================== - # The binaries target builds executable programs, Windows .dll's, unix -@@ -236,7 +236,7 @@ - - doc: - --install: all install-binaries install-libraries install-doc -+install: all install-libraries install-doc - - install-binaries: binaries install-lib-binaries - -@@ -328,21 +328,18 @@ - $(INSTALL_DATA) $(srcdir)/INSTALL $(DESTDIR)$(htdocsdir)/links/INSTALL.txt - @echo "Copying license.terms into $(DESTDIR)$(htdocsdir)" - $(INSTALL_DATA) $(srcdir)/license.terms $(DESTDIR)$(htdocsdir)/license.terms -- -+ $(INSTALL_DATA) $(srcdir)/doc/httpd.1 $(DESTDIR)$(mandir)/man1/tclhttpd.1 - install-custom: - @echo "Adding custom code in $(DESTDIR)$(customdir)" - $(TCLSH_PROG) `@CYGPATH@ $(srcdir)/bin/CopyDist` `@CYGPATH@ $(srcdir)/custom` `@CYGPATH@ $(DESTDIR)$(customdir)` - - install-doc: install-htdocs -- @echo "Installing man page" -- $(mkinstalldirs) $(DESTDIR)$(mandir)/man1 -- $(INSTALL_DATA) $(srcdir)/doc/httpd.1 $(DESTDIR)$(mandir)/man1/httpd.1 - @echo "Installing README" - $(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(SERVER_ROOT) - $(INSTALL_DATA) $(srcdir)/bin/README_custom $(DESTDIR)$(SERVER_ROOT) - - installdirs: -- $(mkinstalldirs) $(DESTDIR)$(pkglibdir) $(DESTDIR)$(cryptlibdir) $(DESTDIR)$(prefix)/bin $(DESTDIR)$(htdocsdir) $(DESTDIR)$(customdir) -+ $(mkinstalldirs) $(DESTDIR)$(pkglibdir) $(DESTDIR)$(prefix)/bin $(DESTDIR)$(htdocsdir) $(DESTDIR)$(customdir) - - clean: - -test -z "$(BINARIES)" || rm -f $(BINARIES) Property changes on: head/www/tclhttpd/files/patch-ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/tclhttpd/files/patch-ac =================================================================== --- head/www/tclhttpd/files/patch-ac (revision 363345) +++ head/www/tclhttpd/files/patch-ac (nonexistent) @@ -1,7 +0,0 @@ ---- bin/httpd.tcl Wed Jun 14 13:25:50 2000 -+++ bin/httpd.tcl Wed Jun 21 15:59:34 2000 -@@ -130,3 +130,3 @@ - } else { -- set Config(config) [file join $Config(home) tclhttpd.rc] -+ set Config(config) [file join $Config(home) ../etc/tclhttpd.rc] - } Property changes on: head/www/tclhttpd/files/patch-ac ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/tclhttpd/files/patch-ad =================================================================== --- head/www/tclhttpd/files/patch-ad (revision 363345) +++ head/www/tclhttpd/files/patch-ad (nonexistent) @@ -1,21 +0,0 @@ -+++ configure Tue Mar 13 02:10:00 2001 -+++ configure Tue May 1 17:37:36 2001 -@@ -526,17 +526,3 @@ - --ac_aux_dir= --for ac_dir in config $srcdir/config; do -- if test -f $ac_dir/install-sh; then -- ac_aux_dir=$ac_dir -- ac_install_sh="$ac_aux_dir/install-sh -c" -- break -- elif test -f $ac_dir/install.sh; then -- ac_aux_dir=$ac_dir -- ac_install_sh="$ac_aux_dir/install.sh -c" -- break -- fi --done --if test -z "$ac_aux_dir"; then -- { echo "configure: error: can not find install-sh or install.sh in config $srcdir/config" 1>&2; exit 1; } --fi -+ac_aux_dir=`pwd` - ac_config_guess=$ac_aux_dir/config.guess Property changes on: head/www/tclhttpd/files/patch-ad ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/tclhttpd/files/patch-ae =================================================================== --- head/www/tclhttpd/files/patch-ae (revision 363345) +++ head/www/tclhttpd/files/patch-ae (nonexistent) @@ -1,17 +0,0 @@ ---- bin/tclhttpd.rc Mon Sep 25 18:47:35 2000 -+++ bin/tclhttpd.rc Thu Mar 29 15:19:59 2001 -@@ -24,2 +24,4 @@ - foreach d [list \ -+ [file join [Config home] \ -+ ../share/tclhttpd@VER@]] \ - [file join [Config home] ../htdocs] \ -@@ -51,3 +53,3 @@ - --Config uid 50 -+Config uid 65534 ;# BSD's nobody - -@@ -60,3 +62,3 @@ - --Config gid 50 -+Config gid 65534 ;# BSD's nobody group - Property changes on: head/www/tclhttpd/files/patch-ae ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/tclhttpd/files/patch-ah =================================================================== --- head/www/tclhttpd/files/patch-ah (revision 363345) +++ head/www/tclhttpd/files/patch-ah (nonexistent) @@ -1,26 +0,0 @@ -This is needed, because of the way tcllib's pkgIndex.tcl is laid -out. The _children_ of the directory containing tcllib itself are -not searched for packages the first time. So - ``package require '' -will fail the first time :(. This is, probably, a bug in tcllib, -but this is a workaround. -+++ htdocs/cgi-bin/flip.cgi Fri May 5 11:34:19 2000 -@@ -5,4 +5,3 @@ - if {[catch { -- package require ncgi -- package require html -+ package require tcllib - -+++ htdocs/cgi-bin/redirect.cgi Fri May 5 11:34:31 2000 -@@ -5,3 +5,3 @@ - if {[catch { -- package require ncgi -+ package require tcllib - -+++ htdocs/cgi-bin/test.cgi Fri May 5 11:34:47 2000 -@@ -5,4 +5,3 @@ - if {[catch { -- package require ncgi -- package require html -+ package require tcllib - Property changes on: head/www/tclhttpd/files/patch-ah ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/tclhttpd/files/patch-ak =================================================================== --- head/www/tclhttpd/files/patch-ak (revision 363345) +++ head/www/tclhttpd/files/patch-ak (nonexistent) @@ -1,53 +0,0 @@ ---- src/limit.c Thu May 1 19:42:14 2003 -+++ src/limit.c Fri Nov 19 13:21:15 2004 -@@ -9,6 +9,5 @@ - - --static int LimitCmd _ANSI_ARGS_((ClientData clientData, -- Tcl_Interp *interp, int argc, char *argv[])); -+Tcl_ObjCmdProc LimitCmd; - - #undef TCL_STORAGE_CLASS -@@ -29,9 +28,8 @@ - */ - int --LimitCmd(ClientData data, Tcl_Interp *interp, int argc, char *argv[]) -+LimitCmd(ClientData data, Tcl_Interp *interp, int argc, Tcl_Obj *CONST objv[]) - { -- int max; -- char buf[32]; - struct rlimit limit; -+ Tcl_Obj *limObj[2]; - Tcl_ResetResult(interp); - if (getrlimit(RLIMIT_NOFILE, &limit) < 0) { -@@ -40,12 +38,18 @@ - } - if (argc > 1) { -- Tcl_GetInt(interp, argv[1], (int *)&limit.rlim_cur); -+ long rlim_cur; -+ -+ if (Tcl_GetLongFromObj(interp, objv[1], &rlim_cur) != TCL_OK) -+ return TCL_ERROR; -+ limit.rlim_cur = rlim_cur; - if (setrlimit(RLIMIT_NOFILE, &limit) < 0) { -- Tcl_AppendResult(interp, "NOFILE: ", Tcl_PosixError(interp), NULL); -- return TCL_ERROR; -- } -+ Tcl_AppendResult(interp, "NOFILE: ", Tcl_PosixError(interp), NULL); -+ return TCL_ERROR; -+ } - } - /* bad, bad style, direct writing to interp->result */ -- sprintf(interp->result, "%d %d", limit.rlim_cur, limit.rlim_max); -+ limObj[0] = Tcl_NewLongObj((long)limit.rlim_cur); -+ limObj[1] = Tcl_NewLongObj((long)limit.rlim_max); -+ Tcl_SetObjResult(interp, Tcl_NewListObj(2, limObj)); - return TCL_OK; - } -@@ -71,5 +75,5 @@ - #endif - -- Tcl_CreateCommand(interp, "limit", LimitCmd, NULL, NULL); -+ Tcl_CreateObjCommand(interp, "limit", LimitCmd, NULL, NULL); - code = Tcl_PkgProvide(interp, "limit", "1.0"); - if (code != TCL_OK) { Property changes on: head/www/tclhttpd/files/patch-ak ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/tclhttpd/files/patch-Makefile.in =================================================================== --- head/www/tclhttpd/files/patch-Makefile.in (nonexistent) +++ head/www/tclhttpd/files/patch-Makefile.in (revision 363346) @@ -0,0 +1,62 @@ +--- Makefile.in.orig 2003-08-11 18:46:57.000000000 +0200 ++++ Makefile.in 2014-02-21 16:44:55.000000000 +0100 +@@ -122,7 +122,7 @@ + limitlibdir = $(libdir)/@LIMIT_PACKAGE@@LIMIT_VERSION@ + pkgincludedir = $(includedir)/@PACKAGE@@VERSION@ + SERVER_ROOT = @SERVER_ROOT@ +-htdocsdir = $(SERVER_ROOT)/htdocs ++htdocsdir = $(prefix)/share/@PACKAGE@@VERSION@ + customdir = $(SERVER_ROOT)/custom + + top_builddir = . +@@ -197,7 +197,7 @@ + + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + CONFIGDIR = @CONFIGDIR@ +-mkinstalldirs = $(SHELL) $(CONFIGDIR)/mkinstalldirs ++mkinstalldirs = mkdir -p + CONFIG_CLEAN_FILES = + + CPPFLAGS = @CPPFLAGS@ +@@ -220,7 +220,7 @@ + # for the BINARIES that you specified above have already been done. + #======================================================================== + +-all: binaries libraries doc ++all: libraries doc + + #======================================================================== + # The binaries target builds executable programs, Windows .dll's, unix +@@ -236,7 +236,7 @@ + + doc: + +-install: all install-binaries install-libraries install-doc ++install: all install-libraries install-doc + + install-binaries: binaries install-lib-binaries + +@@ -328,21 +328,18 @@ + $(INSTALL_DATA) $(srcdir)/INSTALL $(DESTDIR)$(htdocsdir)/links/INSTALL.txt + @echo "Copying license.terms into $(DESTDIR)$(htdocsdir)" + $(INSTALL_DATA) $(srcdir)/license.terms $(DESTDIR)$(htdocsdir)/license.terms +- ++ $(INSTALL_DATA) $(srcdir)/doc/httpd.1 $(DESTDIR)$(mandir)/man1/tclhttpd.1 + install-custom: + @echo "Adding custom code in $(DESTDIR)$(customdir)" + $(TCLSH_PROG) `@CYGPATH@ $(srcdir)/bin/CopyDist` `@CYGPATH@ $(srcdir)/custom` `@CYGPATH@ $(DESTDIR)$(customdir)` + + install-doc: install-htdocs +- @echo "Installing man page" +- $(mkinstalldirs) $(DESTDIR)$(mandir)/man1 +- $(INSTALL_DATA) $(srcdir)/doc/httpd.1 $(DESTDIR)$(mandir)/man1/httpd.1 + @echo "Installing README" + $(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(SERVER_ROOT) + $(INSTALL_DATA) $(srcdir)/bin/README_custom $(DESTDIR)$(SERVER_ROOT) + + installdirs: +- $(mkinstalldirs) $(DESTDIR)$(pkglibdir) $(DESTDIR)$(cryptlibdir) $(DESTDIR)$(prefix)/bin $(DESTDIR)$(htdocsdir) $(DESTDIR)$(customdir) ++ $(mkinstalldirs) $(DESTDIR)$(pkglibdir) $(DESTDIR)$(prefix)/bin $(DESTDIR)$(htdocsdir) $(DESTDIR)$(customdir) + + clean: + -test -z "$(BINARIES)" || rm -f $(BINARIES) Property changes on: head/www/tclhttpd/files/patch-Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/tclhttpd/files/patch-bin__httpd.tcl =================================================================== --- head/www/tclhttpd/files/patch-bin__httpd.tcl (nonexistent) +++ head/www/tclhttpd/files/patch-bin__httpd.tcl (revision 363346) @@ -0,0 +1,7 @@ +--- bin/httpd.tcl Wed Jun 14 13:25:50 2000 ++++ bin/httpd.tcl Wed Jun 21 15:59:34 2000 +@@ -130,3 +130,3 @@ + } else { +- set Config(config) [file join $Config(home) tclhttpd.rc] ++ set Config(config) [file join $Config(home) ../etc/tclhttpd.rc] + } Property changes on: head/www/tclhttpd/files/patch-bin__httpd.tcl ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/tclhttpd/files/patch-bin__tclhttpd.rc =================================================================== --- head/www/tclhttpd/files/patch-bin__tclhttpd.rc (nonexistent) +++ head/www/tclhttpd/files/patch-bin__tclhttpd.rc (revision 363346) @@ -0,0 +1,17 @@ +--- bin/tclhttpd.rc Mon Sep 25 18:47:35 2000 ++++ bin/tclhttpd.rc Thu Mar 29 15:19:59 2001 +@@ -24,2 +24,4 @@ + foreach d [list \ ++ [file join [Config home] \ ++ ../share/tclhttpd@VER@]] \ + [file join [Config home] ../htdocs] \ +@@ -51,3 +53,3 @@ + +-Config uid 50 ++Config uid 65534 ;# BSD's nobody + +@@ -60,3 +62,3 @@ + +-Config gid 50 ++Config gid 65534 ;# BSD's nobody group + Property changes on: head/www/tclhttpd/files/patch-bin__tclhttpd.rc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/tclhttpd/files/patch-configure =================================================================== --- head/www/tclhttpd/files/patch-configure (nonexistent) +++ head/www/tclhttpd/files/patch-configure (revision 363346) @@ -0,0 +1,21 @@ ++++ configure Tue Mar 13 02:10:00 2001 ++++ configure Tue May 1 17:37:36 2001 +@@ -526,17 +526,3 @@ + +-ac_aux_dir= +-for ac_dir in config $srcdir/config; do +- if test -f $ac_dir/install-sh; then +- ac_aux_dir=$ac_dir +- ac_install_sh="$ac_aux_dir/install-sh -c" +- break +- elif test -f $ac_dir/install.sh; then +- ac_aux_dir=$ac_dir +- ac_install_sh="$ac_aux_dir/install.sh -c" +- break +- fi +-done +-if test -z "$ac_aux_dir"; then +- { echo "configure: error: can not find install-sh or install.sh in config $srcdir/config" 1>&2; exit 1; } +-fi ++ac_aux_dir=`pwd` + ac_config_guess=$ac_aux_dir/config.guess Property changes on: head/www/tclhttpd/files/patch-configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/tclhttpd/files/patch-src__limit.c =================================================================== --- head/www/tclhttpd/files/patch-src__limit.c (nonexistent) +++ head/www/tclhttpd/files/patch-src__limit.c (revision 363346) @@ -0,0 +1,53 @@ +--- src/limit.c Thu May 1 19:42:14 2003 ++++ src/limit.c Fri Nov 19 13:21:15 2004 +@@ -9,6 +9,5 @@ + + +-static int LimitCmd _ANSI_ARGS_((ClientData clientData, +- Tcl_Interp *interp, int argc, char *argv[])); ++Tcl_ObjCmdProc LimitCmd; + + #undef TCL_STORAGE_CLASS +@@ -29,9 +28,8 @@ + */ + int +-LimitCmd(ClientData data, Tcl_Interp *interp, int argc, char *argv[]) ++LimitCmd(ClientData data, Tcl_Interp *interp, int argc, Tcl_Obj *CONST objv[]) + { +- int max; +- char buf[32]; + struct rlimit limit; ++ Tcl_Obj *limObj[2]; + Tcl_ResetResult(interp); + if (getrlimit(RLIMIT_NOFILE, &limit) < 0) { +@@ -40,12 +38,18 @@ + } + if (argc > 1) { +- Tcl_GetInt(interp, argv[1], (int *)&limit.rlim_cur); ++ long rlim_cur; ++ ++ if (Tcl_GetLongFromObj(interp, objv[1], &rlim_cur) != TCL_OK) ++ return TCL_ERROR; ++ limit.rlim_cur = rlim_cur; + if (setrlimit(RLIMIT_NOFILE, &limit) < 0) { +- Tcl_AppendResult(interp, "NOFILE: ", Tcl_PosixError(interp), NULL); +- return TCL_ERROR; +- } ++ Tcl_AppendResult(interp, "NOFILE: ", Tcl_PosixError(interp), NULL); ++ return TCL_ERROR; ++ } + } + /* bad, bad style, direct writing to interp->result */ +- sprintf(interp->result, "%d %d", limit.rlim_cur, limit.rlim_max); ++ limObj[0] = Tcl_NewLongObj((long)limit.rlim_cur); ++ limObj[1] = Tcl_NewLongObj((long)limit.rlim_max); ++ Tcl_SetObjResult(interp, Tcl_NewListObj(2, limObj)); + return TCL_OK; + } +@@ -71,5 +75,5 @@ + #endif + +- Tcl_CreateCommand(interp, "limit", LimitCmd, NULL, NULL); ++ Tcl_CreateObjCommand(interp, "limit", LimitCmd, NULL, NULL); + code = Tcl_PkgProvide(interp, "limit", "1.0"); + if (code != TCL_OK) { Property changes on: head/www/tclhttpd/files/patch-src__limit.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/tclhttpd/files/patch-tcllib =================================================================== --- head/www/tclhttpd/files/patch-tcllib (nonexistent) +++ head/www/tclhttpd/files/patch-tcllib (revision 363346) @@ -0,0 +1,26 @@ +This is needed, because of the way tcllib's pkgIndex.tcl is laid +out. The _children_ of the directory containing tcllib itself are +not searched for packages the first time. So + ``package require '' +will fail the first time :(. This is, probably, a bug in tcllib, +but this is a workaround. ++++ htdocs/cgi-bin/flip.cgi Fri May 5 11:34:19 2000 +@@ -5,4 +5,3 @@ + if {[catch { +- package require ncgi +- package require html ++ package require tcllib + ++++ htdocs/cgi-bin/redirect.cgi Fri May 5 11:34:31 2000 +@@ -5,3 +5,3 @@ + if {[catch { +- package require ncgi ++ package require tcllib + ++++ htdocs/cgi-bin/test.cgi Fri May 5 11:34:47 2000 +@@ -5,4 +5,3 @@ + if {[catch { +- package require ncgi +- package require html ++ package require tcllib + Property changes on: head/www/tclhttpd/files/patch-tcllib ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/thumbnail_index/files/patch-aa =================================================================== --- head/www/thumbnail_index/files/patch-aa (revision 363345) +++ head/www/thumbnail_index/files/patch-aa (nonexistent) @@ -1,10 +0,0 @@ ---- Makefile.org Mon Aug 14 12:53:55 2000 -+++ Makefile Mon Aug 14 12:54:13 2000 -@@ -1,5 +1,5 @@ --BINDIR = /usr/local/bin --MANDIR = /usr/local/man/man1 -+BINDIR = ${PREFIX}/bin -+MANDIR = ${PREFIX}/man/man1 - - all: - Property changes on: head/www/thumbnail_index/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/thumbnail_index/files/patch-ab =================================================================== --- head/www/thumbnail_index/files/patch-ab (revision 363345) +++ head/www/thumbnail_index/files/patch-ab (nonexistent) @@ -1,20 +0,0 @@ ---- thumbnail_index.orig Tue Aug 11 03:51:55 1998 -+++ thumbnail_index Tue Jun 10 13:04:55 2003 -@@ -99,7 +99,7 @@ - subdir=.thumbnails - nindexname=/tmp/tinind.$$ - stamp='This file produced by thumbnail_index - do not edit.' --cwd=`pwd` -+cwd=`/bin/pwd -L` - makefile=/tmp/timake.$$ - infoscript=/tmp/tiinsc.$$ - rm -f $nindexname $makefile $infoscript -@@ -248,7 +248,7 @@ - EOF - ) - fi -- kb=`ls -l "$file" | awk '{print int(($4+1023)/1024)}'` -+ kb=`wc -c < "$file" | awk '{print int(($1+1023)/1024)}'` - echo "
$file
${kb}K
" - fi - ;; Property changes on: head/www/thumbnail_index/files/patch-ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/thumbnail_index/files/patch-Makefile =================================================================== --- head/www/thumbnail_index/files/patch-Makefile (nonexistent) +++ head/www/thumbnail_index/files/patch-Makefile (revision 363346) @@ -0,0 +1,10 @@ +--- Makefile.org Mon Aug 14 12:53:55 2000 ++++ Makefile Mon Aug 14 12:54:13 2000 +@@ -1,5 +1,5 @@ +-BINDIR = /usr/local/bin +-MANDIR = /usr/local/man/man1 ++BINDIR = ${PREFIX}/bin ++MANDIR = ${PREFIX}/man/man1 + + all: + Property changes on: head/www/thumbnail_index/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/thumbnail_index/files/patch-pwd-and-wc =================================================================== --- head/www/thumbnail_index/files/patch-pwd-and-wc (nonexistent) +++ head/www/thumbnail_index/files/patch-pwd-and-wc (revision 363346) @@ -0,0 +1,20 @@ +--- thumbnail_index.orig Tue Aug 11 03:51:55 1998 ++++ thumbnail_index Tue Jun 10 13:04:55 2003 +@@ -99,7 +99,7 @@ + subdir=.thumbnails + nindexname=/tmp/tinind.$$ + stamp='This file produced by thumbnail_index - do not edit.' +-cwd=`pwd` ++cwd=`/bin/pwd -L` + makefile=/tmp/timake.$$ + infoscript=/tmp/tiinsc.$$ + rm -f $nindexname $makefile $infoscript +@@ -248,7 +248,7 @@ + EOF + ) + fi +- kb=`ls -l "$file" | awk '{print int(($4+1023)/1024)}'` ++ kb=`wc -c < "$file" | awk '{print int(($1+1023)/1024)}'` + echo "
$file
${kb}K
" + fi + ;; Property changes on: head/www/thumbnail_index/files/patch-pwd-and-wc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/tidy/Makefile =================================================================== --- head/www/tidy/Makefile (revision 363345) +++ head/www/tidy/Makefile (revision 363346) @@ -1,38 +1,34 @@ # Created by: Abel Chow # $FreeBSD$ PORTNAME= tidy4 PORTVERSION= 20000804 PORTREVISION= 3 CATEGORIES= www MASTER_SITES= http://www.w3.org/People/Raggett/ DISTNAME= tidy4aug00 -EXTRACT_SUFX= .tgz MAINTAINER= dinoex@FreeBSD.org COMMENT= Fixes and tidies up HTML files LICENSE= BSD2CLAUSE LICENSE_FILE= ${FILESDIR}/COPYRIGHT +USES= tar:tgz ALL_TARGET= tidy DOCFILES= Overview.html tidy.gif release-notes.html grid.gif OPTIONS_DEFINE= DOCS -.include - do-configure: ${REINPLACE_CMD} -e 's|tidy|tidy4|' ${WRKSRC}/man_page.txt do-install: ${INSTALL_PROGRAM} ${WRKSRC}/tidy ${STAGEDIR}${PREFIX}/bin/tidy4 ${INSTALL_MAN} ${WRKSRC}/man_page.txt ${STAGEDIR}${PREFIX}/man/man1/tidy4.1 -.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${STAGEDIR}${DOCSDIR} .for docfile in ${DOCFILES} ${INSTALL_MAN} ${WRKSRC}/${docfile} ${STAGEDIR}${DOCSDIR}/ .endfor -.endif .include Index: head/www/tidy/files/patch-aa =================================================================== --- head/www/tidy/files/patch-aa (revision 363345) +++ head/www/tidy/files/patch-aa (nonexistent) @@ -1,19 +0,0 @@ ---- Makefile.orig Thu May 4 20:22:46 2000 -+++ Makefile Thu May 4 20:23:52 2000 -@@ -1,14 +1,8 @@ - # Makefile - for tidy - --CC= gcc -+#CC= gcc - --CFLAGS= -O -- --# Makefile - for tidy -- --CC= gcc -- --CFLAGS= -O -+CFLAGS+= -D__USE_MISC - - OFILES= attrs.o istack.o parser.o tags.o \ - entities.o lexer.o pprint.o clean.o \ Property changes on: head/www/tidy/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/tidy/files/patch-ab =================================================================== --- head/www/tidy/files/patch-ab (revision 363345) +++ head/www/tidy/files/patch-ab (nonexistent) @@ -1,13 +0,0 @@ ---- platform.h.orig Thu Jan 13 07:19:19 2000 -+++ platform.h Mon Mar 27 16:31:20 2000 -@@ -17,9 +17,8 @@ - It enables tidy to find config files named ~/.tidyrc - and ~your/.tidyrc etc if the HTML_TIDY environment - variable is not set. Contributed by Todd Lewis. -- --#define SUPPORT_GETPWNAM - */ -+#define SUPPORT_GETPWNAM - - #include - #include Property changes on: head/www/tidy/files/patch-ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/tidy/files/patch-ac =================================================================== --- head/www/tidy/files/patch-ac (revision 363345) +++ head/www/tidy/files/patch-ac (nonexistent) @@ -1,53 +0,0 @@ ---- config.c.orig Sat Aug 5 01:21:05 2000 -+++ config.c Mon Jul 8 23:07:17 2002 -@@ -94,6 +94,7 @@ - Bool TidyMark = yes; /* add meta element indicating tidied doc */ - Bool Emacs = no; /* if true format error output for GNU Emacs */ - Bool LiteralAttribs = no; /* if true attributes may use newlines */ -+Bool PreserveEntities = no; /* if true don't convert entities to chars */ - - typedef struct _lex PLex; - -@@ -186,6 +187,7 @@ - {"doctype", {(int *)&doctype_str}, ParseDocType}, - {"fix-backslash", {(int *)&FixBackslash}, ParseBool}, - {"gnu-emacs", {(int *)&Emacs}, ParseBool}, -+ {"preserve-entities", {(int *)&PreserveEntities}, ParseBool}, - - /* this must be the final entry */ - {0, 0, 0} -@@ -392,7 +394,8 @@ - home_dir = passwd->pw_dir; - } - -- if (p = realloc(expanded_filename, strlen(filename)+strlen(home_dir)+1)) -+ if (home_dir != NULL && -+ (p = realloc(expanded_filename, strlen(filename)+strlen(home_dir)+1))) - { - strcat(strcpy(expanded_filename = p, home_dir), filename); - return(expanded_filename); -@@ -423,7 +426,10 @@ - /* open the file and parse its contents */ - - if ((fin = fopen(fname, "r")) == null) -- FileError(stderr, fname); -+ { -+ if (FileExists(fname)) /* quiet file open error on */ -+ FileError(stderr, fname); /* non-existent file */ -+ } - else - { - config_text = null; -@@ -533,6 +539,12 @@ - { - QuoteAmpersand = yes; - HideEndTags = no; -+ } -+ -+ /* Avoid &copy; in preserve-entities case */ -+ if (PreserveEntities) -+ { -+ QuoteAmpersand = no; - } - } - Property changes on: head/www/tidy/files/patch-ac ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/tidy/files/patch-ad =================================================================== --- head/www/tidy/files/patch-ad (revision 363345) +++ head/www/tidy/files/patch-ad (nonexistent) @@ -1,27 +0,0 @@ ---- html.h.orig Fri Aug 4 18:21:05 2000 -+++ html.h Sat Jul 20 16:20:55 2002 -@@ -4,6 +4,8 @@ - See tidy.c for the copyright notice. - */ - -+#include -+ - /* indentation modes */ - - #define NO_INDENT 0 -@@ -380,6 +382,7 @@ - - void FatalError(char *msg); - void FileError(FILE *fp, const char *file); -+int FileExists(const char *file); - - Node *GetToken(Lexer *lexer, uint mode); - -@@ -758,6 +761,7 @@ - extern Bool Word2000; - extern Bool Emacs; /* sasdjb 01May00 GNU Emacs error output format */ - extern Bool LiteralAttribs; -+extern Bool PreserveEntities; - - /* Parser methods for tags */ - Property changes on: head/www/tidy/files/patch-ad ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/tidy/files/patch-ae =================================================================== --- head/www/tidy/files/patch-ae (revision 363345) +++ head/www/tidy/files/patch-ae (nonexistent) @@ -1,24 +0,0 @@ ---- lexer.c.orig Fri Aug 4 19:21:05 2000 -+++ lexer.c Thu Nov 15 21:44:03 2001 -@@ -1517,8 +1517,10 @@ - - continue; - } -- else if (c == '&' && mode != IgnoreMarkup) -- ParseEntity(lexer, mode); -+ else if (c == '&' && mode != IgnoreMarkup -+ && !PreserveEntities) { -+ ParseEntity(lexer, mode); -+ } - - /* this is needed to avoid trimming trailing whitespace */ - if (mode == IgnoreWhitespace) -@@ -2624,7 +2626,7 @@ - seen_gt = yes; - } - -- if (c == '&') -+ if (c == '&') /* XXX: possibly need support for PreserveEntities */ - { - AddCharToLexer(lexer, c); - ParseEntity(lexer, null); Property changes on: head/www/tidy/files/patch-ae ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/tidy/files/patch-af =================================================================== --- head/www/tidy/files/patch-af (revision 363345) +++ head/www/tidy/files/patch-af (nonexistent) @@ -1,37 +0,0 @@ ---- localize.c.orig Fri Aug 4 19:21:05 2000 -+++ localize.c Mon Nov 19 14:39:38 2001 -@@ -8,6 +8,9 @@ - to localize HTML tidy. - */ - -+#include -+#include -+ - #include "platform.h" - #include "html.h" - -@@ -50,6 +53,16 @@ - tidy_out(fp, "Can't open \"%s\"\n", file); - } - -+int FileExists(const char *file) -+{ -+ struct stat st; -+ -+ if (stat(file, &st) < 0) -+ return (0); -+ else -+ return (1); -+} -+ - static void ReportTag(Lexer *lexer, Node *tag) - { - if (tag) -@@ -736,6 +749,7 @@ - tidy_out(out, " -xml use this when input is wellformed xml\n"); - tidy_out(out, " -asxml to convert html to wellformed xml\n"); - tidy_out(out, " -slides to burst into slides on h2 elements\n"); -+ tidy_out(out, " -preserve to preserve entities from source file\n"); - tidy_out(out, "\n"); - - tidy_out(out, "Character encodings\n"); Property changes on: head/www/tidy/files/patch-af ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/tidy/files/patch-ag =================================================================== --- head/www/tidy/files/patch-ag (revision 363345) +++ head/www/tidy/files/patch-ag (nonexistent) @@ -1,20 +0,0 @@ ---- man_page.txt.orig Fri Aug 4 19:21:05 2000 -+++ man_page.txt Thu Nov 15 21:54:05 2001 -@@ -12,6 +12,7 @@ - .IR column ] - .RB [ -upper ] - .RB [ -clean ] -+.RB [ -preserve ] - .RB [ -raw - | - .B -ascii -@@ -106,6 +107,9 @@ - .TP - .B -slides - Burst into slides on

elements. -+.TP -+.B -preserve -+Preserve source file entities as is. - .TP - .BR -help ", " -h - List command-line options. Property changes on: head/www/tidy/files/patch-ag ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/tidy/files/patch-ah =================================================================== --- head/www/tidy/files/patch-ah (revision 363345) +++ head/www/tidy/files/patch-ah (nonexistent) @@ -1,11 +0,0 @@ ---- tidy.c.orig Fri Aug 4 19:21:05 2000 -+++ tidy.c Mon Nov 19 14:39:50 2001 -@@ -785,6 +785,8 @@ - Quiet = yes; - else if (strcmp(arg, "slides") == 0) - BurstSlides = yes; -+ else if (strcmp(arg, "preserve") == 0) -+ PreserveEntities = yes; - else if (strcmp(arg, "help") == 0 || - argv[1][1] == '?'|| argv[1][1] == 'h') - { Property changes on: head/www/tidy/files/patch-ah ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/tidy/files/patch-Makefile =================================================================== --- head/www/tidy/files/patch-Makefile (nonexistent) +++ head/www/tidy/files/patch-Makefile (revision 363346) @@ -0,0 +1,19 @@ +--- Makefile.orig Thu May 4 20:22:46 2000 ++++ Makefile Thu May 4 20:23:52 2000 +@@ -1,14 +1,8 @@ + # Makefile - for tidy + +-CC= gcc ++#CC= gcc + +-CFLAGS= -O +- +-# Makefile - for tidy +- +-CC= gcc +- +-CFLAGS= -O ++CFLAGS+= -D__USE_MISC + + OFILES= attrs.o istack.o parser.o tags.o \ + entities.o lexer.o pprint.o clean.o \ Property changes on: head/www/tidy/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/tidy/files/patch-config.c =================================================================== --- head/www/tidy/files/patch-config.c (nonexistent) +++ head/www/tidy/files/patch-config.c (revision 363346) @@ -0,0 +1,53 @@ +--- config.c.orig Sat Aug 5 01:21:05 2000 ++++ config.c Mon Jul 8 23:07:17 2002 +@@ -94,6 +94,7 @@ + Bool TidyMark = yes; /* add meta element indicating tidied doc */ + Bool Emacs = no; /* if true format error output for GNU Emacs */ + Bool LiteralAttribs = no; /* if true attributes may use newlines */ ++Bool PreserveEntities = no; /* if true don't convert entities to chars */ + + typedef struct _lex PLex; + +@@ -186,6 +187,7 @@ + {"doctype", {(int *)&doctype_str}, ParseDocType}, + {"fix-backslash", {(int *)&FixBackslash}, ParseBool}, + {"gnu-emacs", {(int *)&Emacs}, ParseBool}, ++ {"preserve-entities", {(int *)&PreserveEntities}, ParseBool}, + + /* this must be the final entry */ + {0, 0, 0} +@@ -392,7 +394,8 @@ + home_dir = passwd->pw_dir; + } + +- if (p = realloc(expanded_filename, strlen(filename)+strlen(home_dir)+1)) ++ if (home_dir != NULL && ++ (p = realloc(expanded_filename, strlen(filename)+strlen(home_dir)+1))) + { + strcat(strcpy(expanded_filename = p, home_dir), filename); + return(expanded_filename); +@@ -423,7 +426,10 @@ + /* open the file and parse its contents */ + + if ((fin = fopen(fname, "r")) == null) +- FileError(stderr, fname); ++ { ++ if (FileExists(fname)) /* quiet file open error on */ ++ FileError(stderr, fname); /* non-existent file */ ++ } + else + { + config_text = null; +@@ -533,6 +539,12 @@ + { + QuoteAmpersand = yes; + HideEndTags = no; ++ } ++ ++ /* Avoid &copy; in preserve-entities case */ ++ if (PreserveEntities) ++ { ++ QuoteAmpersand = no; + } + } + Property changes on: head/www/tidy/files/patch-config.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/tidy/files/patch-html.h =================================================================== --- head/www/tidy/files/patch-html.h (nonexistent) +++ head/www/tidy/files/patch-html.h (revision 363346) @@ -0,0 +1,27 @@ +--- html.h.orig Fri Aug 4 18:21:05 2000 ++++ html.h Sat Jul 20 16:20:55 2002 +@@ -4,6 +4,8 @@ + See tidy.c for the copyright notice. + */ + ++#include ++ + /* indentation modes */ + + #define NO_INDENT 0 +@@ -380,6 +382,7 @@ + + void FatalError(char *msg); + void FileError(FILE *fp, const char *file); ++int FileExists(const char *file); + + Node *GetToken(Lexer *lexer, uint mode); + +@@ -758,6 +761,7 @@ + extern Bool Word2000; + extern Bool Emacs; /* sasdjb 01May00 GNU Emacs error output format */ + extern Bool LiteralAttribs; ++extern Bool PreserveEntities; + + /* Parser methods for tags */ + Property changes on: head/www/tidy/files/patch-html.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/tidy/files/patch-lexer.c =================================================================== --- head/www/tidy/files/patch-lexer.c (nonexistent) +++ head/www/tidy/files/patch-lexer.c (revision 363346) @@ -0,0 +1,24 @@ +--- lexer.c.orig Fri Aug 4 19:21:05 2000 ++++ lexer.c Thu Nov 15 21:44:03 2001 +@@ -1517,8 +1517,10 @@ + + continue; + } +- else if (c == '&' && mode != IgnoreMarkup) +- ParseEntity(lexer, mode); ++ else if (c == '&' && mode != IgnoreMarkup ++ && !PreserveEntities) { ++ ParseEntity(lexer, mode); ++ } + + /* this is needed to avoid trimming trailing whitespace */ + if (mode == IgnoreWhitespace) +@@ -2624,7 +2626,7 @@ + seen_gt = yes; + } + +- if (c == '&') ++ if (c == '&') /* XXX: possibly need support for PreserveEntities */ + { + AddCharToLexer(lexer, c); + ParseEntity(lexer, null); Property changes on: head/www/tidy/files/patch-lexer.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/tidy/files/patch-localize.c =================================================================== --- head/www/tidy/files/patch-localize.c (nonexistent) +++ head/www/tidy/files/patch-localize.c (revision 363346) @@ -0,0 +1,37 @@ +--- localize.c.orig Fri Aug 4 19:21:05 2000 ++++ localize.c Mon Nov 19 14:39:38 2001 +@@ -8,6 +8,9 @@ + to localize HTML tidy. + */ + ++#include ++#include ++ + #include "platform.h" + #include "html.h" + +@@ -50,6 +53,16 @@ + tidy_out(fp, "Can't open \"%s\"\n", file); + } + ++int FileExists(const char *file) ++{ ++ struct stat st; ++ ++ if (stat(file, &st) < 0) ++ return (0); ++ else ++ return (1); ++} ++ + static void ReportTag(Lexer *lexer, Node *tag) + { + if (tag) +@@ -736,6 +749,7 @@ + tidy_out(out, " -xml use this when input is wellformed xml\n"); + tidy_out(out, " -asxml to convert html to wellformed xml\n"); + tidy_out(out, " -slides to burst into slides on h2 elements\n"); ++ tidy_out(out, " -preserve to preserve entities from source file\n"); + tidy_out(out, "\n"); + + tidy_out(out, "Character encodings\n"); Property changes on: head/www/tidy/files/patch-localize.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/tidy/files/patch-man_page.txt =================================================================== --- head/www/tidy/files/patch-man_page.txt (nonexistent) +++ head/www/tidy/files/patch-man_page.txt (revision 363346) @@ -0,0 +1,20 @@ +--- man_page.txt.orig Fri Aug 4 19:21:05 2000 ++++ man_page.txt Thu Nov 15 21:54:05 2001 +@@ -12,6 +12,7 @@ + .IR column ] + .RB [ -upper ] + .RB [ -clean ] ++.RB [ -preserve ] + .RB [ -raw + | + .B -ascii +@@ -106,6 +107,9 @@ + .TP + .B -slides + Burst into slides on

elements. ++.TP ++.B -preserve ++Preserve source file entities as is. + .TP + .BR -help ", " -h + List command-line options. Property changes on: head/www/tidy/files/patch-man_page.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/tidy/files/patch-platform.h =================================================================== --- head/www/tidy/files/patch-platform.h (nonexistent) +++ head/www/tidy/files/patch-platform.h (revision 363346) @@ -0,0 +1,13 @@ +--- platform.h.orig Thu Jan 13 07:19:19 2000 ++++ platform.h Mon Mar 27 16:31:20 2000 +@@ -17,9 +17,8 @@ + It enables tidy to find config files named ~/.tidyrc + and ~your/.tidyrc etc if the HTML_TIDY environment + variable is not set. Contributed by Todd Lewis. +- +-#define SUPPORT_GETPWNAM + */ ++#define SUPPORT_GETPWNAM + + #include + #include Property changes on: head/www/tidy/files/patch-platform.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/tidy/files/patch-tidy.c =================================================================== --- head/www/tidy/files/patch-tidy.c (nonexistent) +++ head/www/tidy/files/patch-tidy.c (revision 363346) @@ -0,0 +1,11 @@ +--- tidy.c.orig Fri Aug 4 19:21:05 2000 ++++ tidy.c Mon Nov 19 14:39:50 2001 +@@ -785,6 +785,8 @@ + Quiet = yes; + else if (strcmp(arg, "slides") == 0) + BurstSlides = yes; ++ else if (strcmp(arg, "preserve") == 0) ++ PreserveEntities = yes; + else if (strcmp(arg, "help") == 0 || + argv[1][1] == '?'|| argv[1][1] == 'h') + { Property changes on: head/www/tidy/files/patch-tidy.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/web2ldap/files/patch-ac =================================================================== --- head/www/web2ldap/files/patch-ac (revision 363345) +++ head/www/web2ldap/files/patch-ac (nonexistent) @@ -1,13 +0,0 @@ -*** fcgi/web2ldap.py.orig Wed Mar 20 15:57:19 2002 ---- fcgi/web2ldap.py Wed Mar 20 15:57:25 2002 -*************** -*** 1,4 **** -! #!/usr/bin/python -OO - - """ - fcgi/web2ldap.py - stub script for running as FastCGI server ---- 1,4 ---- -! #!/usr/local/bin/python -OO - - """ - fcgi/web2ldap.py - stub script for running as FastCGI server Property changes on: head/www/web2ldap/files/patch-ac ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/web2ldap/files/patch-ad =================================================================== --- head/www/web2ldap/files/patch-ad (revision 363345) +++ head/www/web2ldap/files/patch-ad (nonexistent) @@ -1,19 +0,0 @@ -*** sbin/compile.py.orig Tue May 13 15:46:59 2003 ---- sbin/compile.py Thu Feb 24 15:04:30 2005 -*************** -*** 4,10 **** - $Id: compile.py,v 1.3 2003/05/13 11:46:59 michael Exp $ - """ - -! #!/usr/bin/python - - import sys,compileall - ---- 4,10 ---- - $Id: compile.py,v 1.3 2003/05/13 11:46:59 michael Exp $ - """ - -! #!/usr/local/bin/python - - import sys,compileall - Property changes on: head/www/web2ldap/files/patch-ad ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/web2ldap/files/patch-ag =================================================================== --- head/www/web2ldap/files/patch-ag (revision 363345) +++ head/www/web2ldap/files/patch-ag (nonexistent) @@ -1,13 +0,0 @@ -*** sbin/web2ldap.py.orig Wed Mar 20 15:58:37 2002 ---- sbin/web2ldap.py Wed Mar 20 16:00:47 2002 -*************** -*** 1,4 **** -! #!/usr/bin/python -OO - - """ - sbin/web2ldap.py - startscript for running as stand-alone HTTP server ---- 1,4 ---- -! #!/usr/local/bin/python -OO - - """ - sbin/web2ldap.py - startscript for running as stand-alone HTTP server Property changes on: head/www/web2ldap/files/patch-ag ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/web2ldap/files/patch-ah =================================================================== --- head/www/web2ldap/files/patch-ah (revision 363345) +++ head/www/web2ldap/files/patch-ah (nonexistent) @@ -1,15 +0,0 @@ -*** etc/web2ldap/web2ldapcnf/standalone.py.orig Sat Jun 5 12:03:35 2004 ---- etc/web2ldap/web2ldapcnf/standalone.py Thu Feb 24 19:57:00 2005 -*************** -*** 65,69 **** - document_root = os.path.join(web2ldapcnf.web2ldap_dir,'htdocs') - - # Path name of mime.types file -! mime_types = '/etc/mime.types' - ---- 65,69 ---- - document_root = os.path.join(web2ldapcnf.web2ldap_dir,'htdocs') - - # Path name of mime.types file -! mime_types = '%%LOCALBASE%%/etc/mime.types' - Property changes on: head/www/web2ldap/files/patch-ah ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/web2ldap/files/patch-ai =================================================================== --- head/www/web2ldap/files/patch-ai (revision 363345) +++ head/www/web2ldap/files/patch-ai (nonexistent) @@ -1,19 +0,0 @@ -*** etc/web2ldap/web2ldapcnf/standalone.py.orig Thu Feb 24 20:11:25 2005 ---- etc/web2ldap/web2ldapcnf/standalone.py Thu Feb 24 20:12:36 2005 -*************** -*** 22,28 **** - access_allowed = ['127.0.0.0/255.0.0.0'] - - # User account name to setuid after being started as root -! run_username = 'web2ldap' - - # Contact mail address of the server admin when running stand-alone - server_admin = 'admin@web2ldap.de' ---- 22,28 ---- - access_allowed = ['127.0.0.0/255.0.0.0'] - - # User account name to setuid after being started as root -! run_username = 'nobody' - - # Contact mail address of the server admin when running stand-alone - server_admin = 'admin@web2ldap.de' Property changes on: head/www/web2ldap/files/patch-ai ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/web2ldap/files/patch-etc__web2ldap__web2ldapcnf__standalone.py_1 =================================================================== --- head/www/web2ldap/files/patch-etc__web2ldap__web2ldapcnf__standalone.py_1 (nonexistent) +++ head/www/web2ldap/files/patch-etc__web2ldap__web2ldapcnf__standalone.py_1 (revision 363346) @@ -0,0 +1,15 @@ +*** etc/web2ldap/web2ldapcnf/standalone.py.orig Sat Jun 5 12:03:35 2004 +--- etc/web2ldap/web2ldapcnf/standalone.py Thu Feb 24 19:57:00 2005 +*************** +*** 65,69 **** + document_root = os.path.join(web2ldapcnf.web2ldap_dir,'htdocs') + + # Path name of mime.types file +! mime_types = '/etc/mime.types' + +--- 65,69 ---- + document_root = os.path.join(web2ldapcnf.web2ldap_dir,'htdocs') + + # Path name of mime.types file +! mime_types = '%%LOCALBASE%%/etc/mime.types' + Property changes on: head/www/web2ldap/files/patch-etc__web2ldap__web2ldapcnf__standalone.py_1 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/web2ldap/files/patch-etc__web2ldap__web2ldapcnf__standalone.py_2 =================================================================== --- head/www/web2ldap/files/patch-etc__web2ldap__web2ldapcnf__standalone.py_2 (nonexistent) +++ head/www/web2ldap/files/patch-etc__web2ldap__web2ldapcnf__standalone.py_2 (revision 363346) @@ -0,0 +1,19 @@ +*** etc/web2ldap/web2ldapcnf/standalone.py.orig Thu Feb 24 20:11:25 2005 +--- etc/web2ldap/web2ldapcnf/standalone.py Thu Feb 24 20:12:36 2005 +*************** +*** 22,28 **** + access_allowed = ['127.0.0.0/255.0.0.0'] + + # User account name to setuid after being started as root +! run_username = 'web2ldap' + + # Contact mail address of the server admin when running stand-alone + server_admin = 'admin@web2ldap.de' +--- 22,28 ---- + access_allowed = ['127.0.0.0/255.0.0.0'] + + # User account name to setuid after being started as root +! run_username = 'nobody' + + # Contact mail address of the server admin when running stand-alone + server_admin = 'admin@web2ldap.de' Property changes on: head/www/web2ldap/files/patch-etc__web2ldap__web2ldapcnf__standalone.py_2 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/web2ldap/files/patch-fcgi__web2ldap.py =================================================================== --- head/www/web2ldap/files/patch-fcgi__web2ldap.py (nonexistent) +++ head/www/web2ldap/files/patch-fcgi__web2ldap.py (revision 363346) @@ -0,0 +1,13 @@ +*** fcgi/web2ldap.py.orig Wed Mar 20 15:57:19 2002 +--- fcgi/web2ldap.py Wed Mar 20 15:57:25 2002 +*************** +*** 1,4 **** +! #!/usr/bin/python -OO + + """ + fcgi/web2ldap.py - stub script for running as FastCGI server +--- 1,4 ---- +! #!/usr/local/bin/python -OO + + """ + fcgi/web2ldap.py - stub script for running as FastCGI server Property changes on: head/www/web2ldap/files/patch-fcgi__web2ldap.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/web2ldap/files/patch-sbin__compile.py =================================================================== --- head/www/web2ldap/files/patch-sbin__compile.py (nonexistent) +++ head/www/web2ldap/files/patch-sbin__compile.py (revision 363346) @@ -0,0 +1,19 @@ +*** sbin/compile.py.orig Tue May 13 15:46:59 2003 +--- sbin/compile.py Thu Feb 24 15:04:30 2005 +*************** +*** 4,10 **** + $Id: compile.py,v 1.3 2003/05/13 11:46:59 michael Exp $ + """ + +! #!/usr/bin/python + + import sys,compileall + +--- 4,10 ---- + $Id: compile.py,v 1.3 2003/05/13 11:46:59 michael Exp $ + """ + +! #!/usr/local/bin/python + + import sys,compileall + Property changes on: head/www/web2ldap/files/patch-sbin__compile.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/web2ldap/files/patch-sbin__web2ldap.py =================================================================== --- head/www/web2ldap/files/patch-sbin__web2ldap.py (nonexistent) +++ head/www/web2ldap/files/patch-sbin__web2ldap.py (revision 363346) @@ -0,0 +1,13 @@ +*** sbin/web2ldap.py.orig Wed Mar 20 15:58:37 2002 +--- sbin/web2ldap.py Wed Mar 20 16:00:47 2002 +*************** +*** 1,4 **** +! #!/usr/bin/python -OO + + """ + sbin/web2ldap.py - startscript for running as stand-alone HTTP server +--- 1,4 ---- +! #!/usr/local/bin/python -OO + + """ + sbin/web2ldap.py - startscript for running as stand-alone HTTP server Property changes on: head/www/web2ldap/files/patch-sbin__web2ldap.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/webcopy/files/patch-aa =================================================================== --- head/www/webcopy/files/patch-aa (revision 363345) +++ head/www/webcopy/files/patch-aa (nonexistent) @@ -1,19 +0,0 @@ ---- Makefile.orig 1996-06-08 09:42:14.000000000 -0700 -+++ Makefile 2014-06-03 17:06:14.896004168 -0700 -@@ -43,14 +43,14 @@ - - # Select or change one of the following WebCopy destination: - --DESTINATION=webcopy.test -+#DESTINATION=webcopy.test - #DESTINATION=/usr/local/bin/webcopy - #DESTINATION=/usr/local/ucb/webcopy - #DESTINATION=/usr/bin/webcopy - #DESTINATION=/usr/ucb/webcopy - #DESTINATION=/bin/webcopy - #DESTINATION=$(HOME)/bin/webcopy --#DESTINATION= -+DESTINATION=$(PREFIX)/bin/webcopy - - # Select default perl interpreter version: - Property changes on: head/www/webcopy/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/webcopy/files/patch-ab =================================================================== --- head/www/webcopy/files/patch-ab (revision 363345) +++ head/www/webcopy/files/patch-ab (nonexistent) @@ -1,59 +0,0 @@ -*** webcopy.src.old Sat Jun 8 20:42:14 1996 ---- webcopy.src Sun Sep 15 20:14:20 1996 -*************** -*** 1,4 **** -! #!%PERL% -- # -*- perl -*- - eval 'exec %PERL% -S $0 "$*"' - if undef; - # ---- 1,4 ---- -! #!%PERL% -- - eval 'exec %PERL% -S $0 "$*"' - if undef; - # -*************** -*** 275,280 **** ---- 275,281 ---- - &check_tag("OVERLAY", "SRC", $image) || - &check_tag("BODY", "BACKGROUND", $image) || - &check_tag("TABLE", "BACKGROUND", $image) || -+ &check_tag("EMBED", "SRC", $image) || - &check_tag("BGSOUND", "SRC", $image) || - &check_tag("FRAME", "SRC", $link) || - &check_tag("AREA", "HREF", $link) || -*************** -*** 316,323 **** - ($quote)=$value=~/^([\"\'])/; - if ($quote) { - if ($value!~/.$quote$/) { -! ($_,$etc)=$etc=~/^([^$quote]*)$quote?(.*)$/; -! $value.=$_.$quote; - } - $value=~s/$quote\s*(.*)\s*$quote$/$1/; - $value=~s/\s*$//; ---- 317,324 ---- - ($quote)=$value=~/^([\"\'])/; - if ($quote) { - if ($value!~/.$quote$/) { -! ($_,$etc)=$value=~/^($quote[^$quote]*)$quote?(.*)$/; -! $value=$_.$quote; - } - $value=~s/$quote\s*(.*)\s*$quote$/$1/; - $value=~s/\s*$//; -*************** -*** 460,466 **** - local($url,$file)=@_; - local($status,$code,$info,$line,$length,$html,$redirect,$update,$data, - $bytes,$step,$slice); -! if ($useremote || $userpass) { - $update="Pragma: no-cache${rn}"; - } else { - (($update=(($_=&get_date($file))) && ---- 461,467 ---- - local($url,$file)=@_; - local($status,$code,$info,$line,$length,$html,$redirect,$update,$data, - $bytes,$step,$slice); -! if ($useremote) { - $update="Pragma: no-cache${rn}"; - } else { - (($update=(($_=&get_date($file))) && Property changes on: head/www/webcopy/files/patch-ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/webcopy/files/patch-ac =================================================================== --- head/www/webcopy/files/patch-ac (revision 363345) +++ head/www/webcopy/files/patch-ac (nonexistent) @@ -1,34 +0,0 @@ -*** webcopy.src Sat Nov 1 11:00:23 1997 ---- webcopy.src.neu Sat Nov 1 13:48:20 1997 -*************** -*** 384,389 **** ---- 384,390 ---- - return; - } - } -+ $ref =~ s/&/&/; - $ref="$path$ref" unless $ref=~m!^/!; - ($ref,$qs)=$ref=~m!^([^?]*)(.*)$!; - $isdir=$ref=~m!/$!; -*************** -*** 454,459 **** ---- 455,461 ---- - - sub transfer { - local($url,$file)=@_; -+ $file=&unescape($file); - local($status,$code,$info,$line,$length,$html,$redirect,$update,$data, - $bytes,$step,$slice); - if ($useremote) { -*************** -*** 560,565 **** ---- 562,568 ---- - local(@subdirs)=split('/',$path); - local($sub); - $name=pop(@subdirs); # get name of file from path -+ $name=&unescape($name); - for $sub (@subdirs) { - $dir.= "/".&unescape($sub); - stat(&real($dir)); - - Property changes on: head/www/webcopy/files/patch-ac ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/webcopy/files/patch-ad =================================================================== --- head/www/webcopy/files/patch-ad (revision 363345) +++ head/www/webcopy/files/patch-ad (nonexistent) @@ -1,19 +0,0 @@ -*** webcopy.src.orig Tue Nov 25 20:46:36 1997 ---- webcopy.src Tue Nov 25 20:48:57 1997 -*************** -*** 675,681 **** - Usage: $0 [options] http://host:port/path/file [http://proxy:port] - - Options (can be combined): -! -o output to stdout -tdelay set delay seconds - -v verbose mode -wpath set working directory - -q query transfer -xfile set default index.html - -s suppress log -zfile post 'file' or query string ---- 678,684 ---- - Usage: $0 [options] http://host:port/path/file [http://proxy:port] - - Options (can be combined): -! -o output to stdout -tdelay set delay seconds ($delay by default) - -v verbose mode -wpath set working directory - -q query transfer -xfile set default index.html - -s suppress log -zfile post 'file' or query string Property changes on: head/www/webcopy/files/patch-ad ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/webcopy/files/patch-ae =================================================================== --- head/www/webcopy/files/patch-ae (revision 363345) +++ head/www/webcopy/files/patch-ae (nonexistent) @@ -1,12 +0,0 @@ -*** webcopy.src.bak Sat Jun 8 20:42:14 1996 ---- webcopy.src Sun Jan 25 01:04:21 1998 -*************** -*** 474,480 **** - } - socket(S,&PF_INET,&SOCK_STREAM,$local_prot) || die "$0: socket: $!\n"; #P4 - socket(S,PF_INET,SOCK_STREAM,$local_prot) || die "$0: socket: $!\n"; #P5 -- bind(S,$local_sock) || die "$0: bind: $!\n"; - connect(S,$remote_sock) || return(901,"$!",0); - $_=select(S); $|=1; select($_); - if ($verbose>3) { ---- 474,479 ---- Property changes on: head/www/webcopy/files/patch-ae ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/webcopy/files/patch-af =================================================================== --- head/www/webcopy/files/patch-af (revision 363345) +++ head/www/webcopy/files/patch-af (nonexistent) @@ -1,20 +0,0 @@ ---- webcopy.src.orig Sun May 21 20:24:21 2000 -+++ webcopy.src Sun May 21 20:25:51 2000 -@@ -481,7 +481,7 @@ - $_=select(S); $|=1; select($_); - if ($verbose>3) { - print(($post?"POST":"GET") . " $proxy$url HTTP/1.0${rn}" . -- "User-Agent: $agent${rn}Accept: */*${rn}$update"); -+ "User-Agent: $agent${rn}Accept: */*${rn}Host: ${host}${rn}$update"); - print "Authorization: $userpass${rn}" if $userpass; - if ($post) { - print "Content-Length: " . length($post_data) . -@@ -492,7 +492,7 @@ - } - } - print S ($post?"POST":"GET") . " $proxy$url HTTP/1.0${rn}" . -- "User-Agent: $agent${rn}Accept: */*${rn}$update"; -+ "User-Agent: $agent${rn}Accept: */*${rn}Host: ${host}${rn}$update"; - print S "Authorization: $userpass${rn}" if $userpass; - if ($post) { - print S "Content-Length: " . length($post_data) . Property changes on: head/www/webcopy/files/patch-af ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/webcopy/files/patch-Makefile =================================================================== --- head/www/webcopy/files/patch-Makefile (nonexistent) +++ head/www/webcopy/files/patch-Makefile (revision 363346) @@ -0,0 +1,19 @@ +--- Makefile.orig 1996-06-08 09:42:14.000000000 -0700 ++++ Makefile 2014-06-03 17:06:14.896004168 -0700 +@@ -43,14 +43,14 @@ + + # Select or change one of the following WebCopy destination: + +-DESTINATION=webcopy.test ++#DESTINATION=webcopy.test + #DESTINATION=/usr/local/bin/webcopy + #DESTINATION=/usr/local/ucb/webcopy + #DESTINATION=/usr/bin/webcopy + #DESTINATION=/usr/ucb/webcopy + #DESTINATION=/bin/webcopy + #DESTINATION=$(HOME)/bin/webcopy +-#DESTINATION= ++DESTINATION=$(PREFIX)/bin/webcopy + + # Select default perl interpreter version: + Property changes on: head/www/webcopy/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/webcopy/files/patch-webcopy.src_1 =================================================================== --- head/www/webcopy/files/patch-webcopy.src_1 (nonexistent) +++ head/www/webcopy/files/patch-webcopy.src_1 (revision 363346) @@ -0,0 +1,59 @@ +*** webcopy.src.old Sat Jun 8 20:42:14 1996 +--- webcopy.src Sun Sep 15 20:14:20 1996 +*************** +*** 1,4 **** +! #!%PERL% -- # -*- perl -*- + eval 'exec %PERL% -S $0 "$*"' + if undef; + # +--- 1,4 ---- +! #!%PERL% -- + eval 'exec %PERL% -S $0 "$*"' + if undef; + # +*************** +*** 275,280 **** +--- 275,281 ---- + &check_tag("OVERLAY", "SRC", $image) || + &check_tag("BODY", "BACKGROUND", $image) || + &check_tag("TABLE", "BACKGROUND", $image) || ++ &check_tag("EMBED", "SRC", $image) || + &check_tag("BGSOUND", "SRC", $image) || + &check_tag("FRAME", "SRC", $link) || + &check_tag("AREA", "HREF", $link) || +*************** +*** 316,323 **** + ($quote)=$value=~/^([\"\'])/; + if ($quote) { + if ($value!~/.$quote$/) { +! ($_,$etc)=$etc=~/^([^$quote]*)$quote?(.*)$/; +! $value.=$_.$quote; + } + $value=~s/$quote\s*(.*)\s*$quote$/$1/; + $value=~s/\s*$//; +--- 317,324 ---- + ($quote)=$value=~/^([\"\'])/; + if ($quote) { + if ($value!~/.$quote$/) { +! ($_,$etc)=$value=~/^($quote[^$quote]*)$quote?(.*)$/; +! $value=$_.$quote; + } + $value=~s/$quote\s*(.*)\s*$quote$/$1/; + $value=~s/\s*$//; +*************** +*** 460,466 **** + local($url,$file)=@_; + local($status,$code,$info,$line,$length,$html,$redirect,$update,$data, + $bytes,$step,$slice); +! if ($useremote || $userpass) { + $update="Pragma: no-cache${rn}"; + } else { + (($update=(($_=&get_date($file))) && +--- 461,467 ---- + local($url,$file)=@_; + local($status,$code,$info,$line,$length,$html,$redirect,$update,$data, + $bytes,$step,$slice); +! if ($useremote) { + $update="Pragma: no-cache${rn}"; + } else { + (($update=(($_=&get_date($file))) && Property changes on: head/www/webcopy/files/patch-webcopy.src_1 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/webcopy/files/patch-webcopy.src_2 =================================================================== --- head/www/webcopy/files/patch-webcopy.src_2 (nonexistent) +++ head/www/webcopy/files/patch-webcopy.src_2 (revision 363346) @@ -0,0 +1,34 @@ +*** webcopy.src Sat Nov 1 11:00:23 1997 +--- webcopy.src.neu Sat Nov 1 13:48:20 1997 +*************** +*** 384,389 **** +--- 384,390 ---- + return; + } + } ++ $ref =~ s/&/&/; + $ref="$path$ref" unless $ref=~m!^/!; + ($ref,$qs)=$ref=~m!^([^?]*)(.*)$!; + $isdir=$ref=~m!/$!; +*************** +*** 454,459 **** +--- 455,461 ---- + + sub transfer { + local($url,$file)=@_; ++ $file=&unescape($file); + local($status,$code,$info,$line,$length,$html,$redirect,$update,$data, + $bytes,$step,$slice); + if ($useremote) { +*************** +*** 560,565 **** +--- 562,568 ---- + local(@subdirs)=split('/',$path); + local($sub); + $name=pop(@subdirs); # get name of file from path ++ $name=&unescape($name); + for $sub (@subdirs) { + $dir.= "/".&unescape($sub); + stat(&real($dir)); + + Property changes on: head/www/webcopy/files/patch-webcopy.src_2 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/webcopy/files/patch-webcopy.src_3 =================================================================== --- head/www/webcopy/files/patch-webcopy.src_3 (nonexistent) +++ head/www/webcopy/files/patch-webcopy.src_3 (revision 363346) @@ -0,0 +1,19 @@ +*** webcopy.src.orig Tue Nov 25 20:46:36 1997 +--- webcopy.src Tue Nov 25 20:48:57 1997 +*************** +*** 675,681 **** + Usage: $0 [options] http://host:port/path/file [http://proxy:port] + + Options (can be combined): +! -o output to stdout -tdelay set delay seconds + -v verbose mode -wpath set working directory + -q query transfer -xfile set default index.html + -s suppress log -zfile post 'file' or query string +--- 678,684 ---- + Usage: $0 [options] http://host:port/path/file [http://proxy:port] + + Options (can be combined): +! -o output to stdout -tdelay set delay seconds ($delay by default) + -v verbose mode -wpath set working directory + -q query transfer -xfile set default index.html + -s suppress log -zfile post 'file' or query string Property changes on: head/www/webcopy/files/patch-webcopy.src_3 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/webcopy/files/patch-webcopy.src_4 =================================================================== --- head/www/webcopy/files/patch-webcopy.src_4 (nonexistent) +++ head/www/webcopy/files/patch-webcopy.src_4 (revision 363346) @@ -0,0 +1,12 @@ +*** webcopy.src.bak Sat Jun 8 20:42:14 1996 +--- webcopy.src Sun Jan 25 01:04:21 1998 +*************** +*** 474,480 **** + } + socket(S,&PF_INET,&SOCK_STREAM,$local_prot) || die "$0: socket: $!\n"; #P4 + socket(S,PF_INET,SOCK_STREAM,$local_prot) || die "$0: socket: $!\n"; #P5 +- bind(S,$local_sock) || die "$0: bind: $!\n"; + connect(S,$remote_sock) || return(901,"$!",0); + $_=select(S); $|=1; select($_); + if ($verbose>3) { +--- 474,479 ---- Property changes on: head/www/webcopy/files/patch-webcopy.src_4 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/webcopy/files/patch-webcopy.src_5 =================================================================== --- head/www/webcopy/files/patch-webcopy.src_5 (nonexistent) +++ head/www/webcopy/files/patch-webcopy.src_5 (revision 363346) @@ -0,0 +1,20 @@ +--- webcopy.src.orig Sun May 21 20:24:21 2000 ++++ webcopy.src Sun May 21 20:25:51 2000 +@@ -481,7 +481,7 @@ + $_=select(S); $|=1; select($_); + if ($verbose>3) { + print(($post?"POST":"GET") . " $proxy$url HTTP/1.0${rn}" . +- "User-Agent: $agent${rn}Accept: */*${rn}$update"); ++ "User-Agent: $agent${rn}Accept: */*${rn}Host: ${host}${rn}$update"); + print "Authorization: $userpass${rn}" if $userpass; + if ($post) { + print "Content-Length: " . length($post_data) . +@@ -492,7 +492,7 @@ + } + } + print S ($post?"POST":"GET") . " $proxy$url HTTP/1.0${rn}" . +- "User-Agent: $agent${rn}Accept: */*${rn}$update"; ++ "User-Agent: $agent${rn}Accept: */*${rn}Host: ${host}${rn}$update"; + print S "Authorization: $userpass${rn}" if $userpass; + if ($post) { + print S "Content-Length: " . length($post_data) . Property changes on: head/www/webcopy/files/patch-webcopy.src_5 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/webcrawl/Makefile =================================================================== --- head/www/webcrawl/Makefile (revision 363345) +++ head/www/webcrawl/Makefile (revision 363346) @@ -1,23 +1,23 @@ # Created by: Dima Sivachenko # $FreeBSD$ PORTNAME= webcrawl PORTVERSION= 1.10 PORTREVISION= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= apps/www/mirroring -EXTRACT_SUFX= .tgz MAINTAINER= demon@FreeBSD.org COMMENT= Download web sites without user interaction by following links +USES= tar:tgz ALL_TARGET= PLIST_FILES= bin/webcrawl man/man1/webcrawl.1.gz do-install: ${INSTALL_PROGRAM} ${WRKSRC}/webcrawl ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/webcrawl.1 ${STAGEDIR}${MANPREFIX}/man/man1 .include Index: head/www/webcrawl/files/patch-aa =================================================================== --- head/www/webcrawl/files/patch-aa (revision 363345) +++ head/www/webcrawl/files/patch-aa (nonexistent) @@ -1,23 +0,0 @@ ---- Makefile.orig Fri Apr 30 03:02:34 1999 -+++ Makefile Sun Feb 6 22:25:51 2000 -@@ -2,15 +2,18 @@ - INSTDIR=/usr/local/bin - MAN=/usr/local/man - -+CC ?= gcc -+CFLAGS ?= -O2 -+ - webcrawl: $(OBJ) -- gcc -o webcrawl $(OBJ) -+ $(CC) -o webcrawl $(OBJ) - clean: - rm -f *.o *~ webcrawl - install: webcrawl - install webcrawl $(INSTDIR) - install webcrawl.1 $(MAN)/man1 - .c.o: -- gcc -Wall -c $*.c -+ $(CC) ${CFLAGS} -Wall -c $*.c - - webcrawl.o: webcrawl.c web.h - http.o: http.c web.h Property changes on: head/www/webcrawl/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/webcrawl/files/patch-Makefile =================================================================== --- head/www/webcrawl/files/patch-Makefile (nonexistent) +++ head/www/webcrawl/files/patch-Makefile (revision 363346) @@ -0,0 +1,23 @@ +--- Makefile.orig Fri Apr 30 03:02:34 1999 ++++ Makefile Sun Feb 6 22:25:51 2000 +@@ -2,15 +2,18 @@ + INSTDIR=/usr/local/bin + MAN=/usr/local/man + ++CC ?= gcc ++CFLAGS ?= -O2 ++ + webcrawl: $(OBJ) +- gcc -o webcrawl $(OBJ) ++ $(CC) -o webcrawl $(OBJ) + clean: + rm -f *.o *~ webcrawl + install: webcrawl + install webcrawl $(INSTDIR) + install webcrawl.1 $(MAN)/man1 + .c.o: +- gcc -Wall -c $*.c ++ $(CC) ${CFLAGS} -Wall -c $*.c + + webcrawl.o: webcrawl.c web.h + http.o: http.c web.h Property changes on: head/www/webcrawl/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/weblint/Makefile =================================================================== --- head/www/weblint/Makefile (revision 363345) +++ head/www/weblint/Makefile (revision 363346) @@ -1,15 +1,13 @@ # Created by: pst # $FreeBSD$ PORTNAME= weblint PORTVERSION= 1.020 CATEGORIES= www MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:NEILB MAINTAINER= ports@FreeBSD.org COMMENT= HTML validator and sanity checker -MAN1= weblint.1 - .include Index: head/www/weblint/files/patch-aa =================================================================== --- head/www/weblint/files/patch-aa (revision 363345) +++ head/www/weblint/files/patch-aa (nonexistent) @@ -1,51 +0,0 @@ -*** Makefile.orig Sat Aug 16 17:10:21 1997 ---- Makefile Thu Oct 30 02:07:26 1997 -*************** -*** 5,12 **** - - SHELL = /bin/sh - -! BINDIR = /usr/local/bin -! MANDIR = /usr/local/man/man1 - PSROFF = groff -Tps - PSVIEW = ghostview - RM = /bin/rm -f ---- 5,14 ---- - - SHELL = /bin/sh - -! PREFIX ?= /usr/local -! BINDIR = ${DESTDIR}${PREFIX}/bin -! MANDIR = ${DESTDIR}${PREFIX}/man/man1 -! LIBDIR = ${DESTDIR}${PREFIX}/lib - PSROFF = groff -Tps - PSVIEW = ghostview - RM = /bin/rm -f -*************** -*** 16,28 **** - TARFILE = $(PROGRAM)-$(VERSION).tar - TGZ = $(TARFILE).gz - -! all: $(PROGRAM) $(PSFILE) - - install: $(PROGRAM) -! -cp $(PROGRAM) $(BINDIR) -! -chmod 755 $(BINDIR)/$(PROGRAM) -! -cp $(PROGRAM).1 $(MANDIR) -! -chmod 644 $(MANDIR)/$(PROGRAM).1 - - test: - @./test.pl ---- 18,29 ---- - TARFILE = $(PROGRAM)-$(VERSION).tar - TGZ = $(TARFILE).gz - -! all: $(PROGRAM) - - install: $(PROGRAM) -! install -c -m 755 -o bin -g bin $(PROGRAM) $(BINDIR) -! install -c -m 644 -o bin -g bin $(PROGRAM).1 $(MANDIR) -! install -c -m 644 -o bin -g bin weblintrc $(LIBDIR) - - test: - @./test.pl Property changes on: head/www/weblint/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/weblint/files/patch-Makefile =================================================================== --- head/www/weblint/files/patch-Makefile (nonexistent) +++ head/www/weblint/files/patch-Makefile (revision 363346) @@ -0,0 +1,51 @@ +*** Makefile.orig Sat Aug 16 17:10:21 1997 +--- Makefile Thu Oct 30 02:07:26 1997 +*************** +*** 5,12 **** + + SHELL = /bin/sh + +! BINDIR = /usr/local/bin +! MANDIR = /usr/local/man/man1 + PSROFF = groff -Tps + PSVIEW = ghostview + RM = /bin/rm -f +--- 5,14 ---- + + SHELL = /bin/sh + +! PREFIX ?= /usr/local +! BINDIR = ${DESTDIR}${PREFIX}/bin +! MANDIR = ${DESTDIR}${PREFIX}/man/man1 +! LIBDIR = ${DESTDIR}${PREFIX}/lib + PSROFF = groff -Tps + PSVIEW = ghostview + RM = /bin/rm -f +*************** +*** 16,28 **** + TARFILE = $(PROGRAM)-$(VERSION).tar + TGZ = $(TARFILE).gz + +! all: $(PROGRAM) $(PSFILE) + + install: $(PROGRAM) +! -cp $(PROGRAM) $(BINDIR) +! -chmod 755 $(BINDIR)/$(PROGRAM) +! -cp $(PROGRAM).1 $(MANDIR) +! -chmod 644 $(MANDIR)/$(PROGRAM).1 + + test: + @./test.pl +--- 18,29 ---- + TARFILE = $(PROGRAM)-$(VERSION).tar + TGZ = $(TARFILE).gz + +! all: $(PROGRAM) + + install: $(PROGRAM) +! install -c -m 755 -o bin -g bin $(PROGRAM) $(BINDIR) +! install -c -m 644 -o bin -g bin $(PROGRAM).1 $(MANDIR) +! install -c -m 644 -o bin -g bin weblintrc $(LIBDIR) + + test: + @./test.pl Property changes on: head/www/weblint/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/webstats/files/patch-aa =================================================================== --- head/www/webstats/files/patch-aa (revision 363345) +++ head/www/webstats/files/patch-aa (nonexistent) @@ -1,13 +0,0 @@ ---- configfiles/serverwide/webstats.ini Wed Sep 5 22:13:38 2001 -+++ configfiles/serverwide/webstats.ini Sun Feb 16 18:08:11 2003 -@@ -6,8 +6,8 @@ - - [misc] - #where are the analog and rmagic executables? --ANALOG=/usr/bin/analog --RMAGIC=/usr/local/bin/rmagic -+ANALOG=%%PREFIX%%/bin/analog -+RMAGIC=%%PREFIX%%/reportmagic/rmagic.pl - - #where should the logfile for webstats go to? - WEBSTATSLOG=/tmp/webstats_log Property changes on: head/www/webstats/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/webstats/files/patch-ab =================================================================== --- head/www/webstats/files/patch-ab (revision 363345) +++ head/www/webstats/files/patch-ab (nonexistent) @@ -1,8 +0,0 @@ ---- configfiles/vhosts/analog.cfg Mon Jul 2 16:29:54 2001 -+++ configfiles/vhosts/analog.cfg Sun Feb 16 18:09:00 2003 -@@ -14,4 +14,4 @@ - - #don't touch this line! it tells analog where the main configuration - #file is located --CONFIGFILE /etc/webstats/default.cfg -+CONFIGFILE %%PREFIX%%/etc/webstats/default.cfg Property changes on: head/www/webstats/files/patch-ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/webstats/files/patch-ac =================================================================== --- head/www/webstats/files/patch-ac (revision 363345) +++ head/www/webstats/files/patch-ac (nonexistent) @@ -1,9 +0,0 @@ ---- configfiles/vhosts/rmagic.ini Mon Jul 2 16:29:43 2001 -+++ configfiles/vhosts/rmagic.ini Sun Feb 16 18:08:38 2003 -@@ -22,5 +22,5 @@ - - #don't touch this line! it tells report magic where the main - #configuration file is located --Include = /etc/webstats/default.ini -+Include = %%PREFIX%%/etc/webstats/default.ini - Property changes on: head/www/webstats/files/patch-ac ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/webstats/files/patch-ad =================================================================== --- head/www/webstats/files/patch-ad (revision 363345) +++ head/www/webstats/files/patch-ad (nonexistent) @@ -1,22 +0,0 @@ ---- scripts/perl/webstats Wed Feb 6 09:51:43 2002 -+++ scripts/perl/webstats Sun Feb 16 18:09:33 2003 -@@ -42,8 +42,8 @@ - #use strict; - use Config::IniFiles; - --#we read variables from /etc/webstats/webstats.ini --$cfg = new Config::IniFiles -file => "/etc/webstats/webstats.ini"; -+#we read variables from $PREFIX/etc/webstats/webstats.ini -+$cfg = new Config::IniFiles -file => "%%PREFIX%%/etc/webstats/webstats.ini"; - - my $VHOSTDIR=$cfg->val('rmagic', 'VHOSTDIR'); - my $WWWDIR=$cfg->val('rmagic', 'WWWDIR'); -@@ -73,7 +73,7 @@ - # - #What does it do?: - # --# if DEBUG variable in /etc/webstats/webstats.ini is set to "yes" -+# if DEBUG variable in $PREFIX/etc/webstats/webstats.ini is set to "yes" - # print some useful information to $WEBSTATSLOG - sub debug{ - if ($DEBUG eq "yes"){ Property changes on: head/www/webstats/files/patch-ad ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/webstats/files/patch-ae =================================================================== --- head/www/webstats/files/patch-ae (revision 363345) +++ head/www/webstats/files/patch-ae (nonexistent) @@ -1,11 +0,0 @@ ---- scripts/php/webstats.php Sun Jul 15 21:50:15 2001 -+++ scripts/php/webstats.php Sun Feb 16 18:10:25 2003 -@@ -4,7 +4,7 @@ - value("misc","SERVERNAME","not defined/config file not found?"); - $vhost_directory = $serverwideini->value("rmagic","VHOSTDIR","VHOSTDIR not defined/config file not found?"); - $logs_directory = $serverwideini->value("rmagic","LOGSDIR","LOGSDIR not defined/config file not found?"); Property changes on: head/www/webstats/files/patch-ae ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/webstats/files/patch-configfiles__serverwide__webstats.ini =================================================================== --- head/www/webstats/files/patch-configfiles__serverwide__webstats.ini (nonexistent) +++ head/www/webstats/files/patch-configfiles__serverwide__webstats.ini (revision 363346) @@ -0,0 +1,13 @@ +--- configfiles/serverwide/webstats.ini Wed Sep 5 22:13:38 2001 ++++ configfiles/serverwide/webstats.ini Sun Feb 16 18:08:11 2003 +@@ -6,8 +6,8 @@ + + [misc] + #where are the analog and rmagic executables? +-ANALOG=/usr/bin/analog +-RMAGIC=/usr/local/bin/rmagic ++ANALOG=%%PREFIX%%/bin/analog ++RMAGIC=%%PREFIX%%/reportmagic/rmagic.pl + + #where should the logfile for webstats go to? + WEBSTATSLOG=/tmp/webstats_log Property changes on: head/www/webstats/files/patch-configfiles__serverwide__webstats.ini ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/webstats/files/patch-configfiles__vhosts__analog.cfg =================================================================== --- head/www/webstats/files/patch-configfiles__vhosts__analog.cfg (nonexistent) +++ head/www/webstats/files/patch-configfiles__vhosts__analog.cfg (revision 363346) @@ -0,0 +1,8 @@ +--- configfiles/vhosts/analog.cfg Mon Jul 2 16:29:54 2001 ++++ configfiles/vhosts/analog.cfg Sun Feb 16 18:09:00 2003 +@@ -14,4 +14,4 @@ + + #don't touch this line! it tells analog where the main configuration + #file is located +-CONFIGFILE /etc/webstats/default.cfg ++CONFIGFILE %%PREFIX%%/etc/webstats/default.cfg Property changes on: head/www/webstats/files/patch-configfiles__vhosts__analog.cfg ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/webstats/files/patch-configfiles__vhosts__rmagic.ini =================================================================== --- head/www/webstats/files/patch-configfiles__vhosts__rmagic.ini (nonexistent) +++ head/www/webstats/files/patch-configfiles__vhosts__rmagic.ini (revision 363346) @@ -0,0 +1,9 @@ +--- configfiles/vhosts/rmagic.ini Mon Jul 2 16:29:43 2001 ++++ configfiles/vhosts/rmagic.ini Sun Feb 16 18:08:38 2003 +@@ -22,5 +22,5 @@ + + #don't touch this line! it tells report magic where the main + #configuration file is located +-Include = /etc/webstats/default.ini ++Include = %%PREFIX%%/etc/webstats/default.ini + Property changes on: head/www/webstats/files/patch-configfiles__vhosts__rmagic.ini ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/webstats/files/patch-scripts__perl__webstats =================================================================== --- head/www/webstats/files/patch-scripts__perl__webstats (nonexistent) +++ head/www/webstats/files/patch-scripts__perl__webstats (revision 363346) @@ -0,0 +1,22 @@ +--- scripts/perl/webstats Wed Feb 6 09:51:43 2002 ++++ scripts/perl/webstats Sun Feb 16 18:09:33 2003 +@@ -42,8 +42,8 @@ + #use strict; + use Config::IniFiles; + +-#we read variables from /etc/webstats/webstats.ini +-$cfg = new Config::IniFiles -file => "/etc/webstats/webstats.ini"; ++#we read variables from $PREFIX/etc/webstats/webstats.ini ++$cfg = new Config::IniFiles -file => "%%PREFIX%%/etc/webstats/webstats.ini"; + + my $VHOSTDIR=$cfg->val('rmagic', 'VHOSTDIR'); + my $WWWDIR=$cfg->val('rmagic', 'WWWDIR'); +@@ -73,7 +73,7 @@ + # + #What does it do?: + # +-# if DEBUG variable in /etc/webstats/webstats.ini is set to "yes" ++# if DEBUG variable in $PREFIX/etc/webstats/webstats.ini is set to "yes" + # print some useful information to $WEBSTATSLOG + sub debug{ + if ($DEBUG eq "yes"){ Property changes on: head/www/webstats/files/patch-scripts__perl__webstats ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/webstats/files/patch-scripts__php__webstats.php =================================================================== --- head/www/webstats/files/patch-scripts__php__webstats.php (nonexistent) +++ head/www/webstats/files/patch-scripts__php__webstats.php (revision 363346) @@ -0,0 +1,11 @@ +--- scripts/php/webstats.php Sun Jul 15 21:50:15 2001 ++++ scripts/php/webstats.php Sun Feb 16 18:10:25 2003 +@@ -4,7 +4,7 @@ + value("misc","SERVERNAME","not defined/config file not found?"); + $vhost_directory = $serverwideini->value("rmagic","VHOSTDIR","VHOSTDIR not defined/config file not found?"); + $logs_directory = $serverwideini->value("rmagic","LOGSDIR","LOGSDIR not defined/config file not found?"); Property changes on: head/www/webstats/files/patch-scripts__php__webstats.php ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/webstone/Makefile =================================================================== --- head/www/webstone/Makefile (revision 363345) +++ head/www/webstone/Makefile (revision 363346) @@ -1,38 +1,38 @@ # Created by: Soren Dossing # $FreeBSD$ PORTNAME= webstone PORTVERSION= 2.5 CATEGORIES= www benchmarks MASTER_SITES= http://www.mindcraft.com/webstone/ DISTNAME= ws25_src -EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= World wide web server benchmarking +USES= tar:tgz GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/WebStone2.5/src ALL_TARGET= install NO_INSTALL_MANPAGES= yes do-install: @${RM} ${WRKSRC}/../bin/runs/keepme @${RMDIR} ${WRKSRC}/../bin/runs @${MKDIR} ${STAGEDIR}${PREFIX}/webstone/bin @${MKDIR} ${STAGEDIR}${PREFIX}/webstone/conf @${MKDIR} ${STAGEDIR}${PREFIX}/webstone/lgm ${INSTALL_SCRIPT} ${WRKSRC}/../bin/* ${STAGEDIR}${PREFIX}/webstone/bin ${INSTALL_SCRIPT} ${WRKSRC}/../lgm/* ${STAGEDIR}${PREFIX}/webstone/lgm ${INSTALL_DATA} ${WRKSRC}/../conf/* ${STAGEDIR}${PREFIX}/webstone/conf ${INSTALL_SCRIPT} ${WRKSRC}/../webstone ${STAGEDIR}${PREFIX}/webstone @${MKDIR} ${WRKSRC}/../bin/runs @${TOUCH} ${WRKSRC}/../bin/runs/keepme .for file in webclient webmaster genrand ${STRIP_CMD} ${STAGEDIR}${PREFIX}/webstone/bin/${file} .endfor .for file in ws20_cgi ws25_cgi ${STRIP_CMD} ${STAGEDIR}${PREFIX}/webstone/lgm/${file} .endfor .include Index: head/www/webstone/files/patch-ab =================================================================== --- head/www/webstone/files/patch-ab (revision 363345) +++ head/www/webstone/files/patch-ab (nonexistent) @@ -1,14 +0,0 @@ ---- Makefile.in.orig Mon Sep 4 18:52:21 2000 -+++ Makefile.in Mon Sep 4 18:52:45 2000 -@@ -64,9 +64,9 @@ - .SUFFIXES: - .SUFFIXES: .c .o - --all: $(TARGETS) cgi api -+all: $(TARGETS) cgi - --install: all install-api install-cgi -+install: all install-cgi - $(CP) $(TARGETS) $(BINDIR) - - pure: all Property changes on: head/www/webstone/files/patch-ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/webstone/files/patch-ac =================================================================== --- head/www/webstone/files/patch-ac (revision 363345) +++ head/www/webstone/files/patch-ac (nonexistent) @@ -1,28 +0,0 @@ ---- webmaster.c.orig 1998-07-25 09:50:18.000000000 +0200 -+++ webmaster.c 2011-12-20 19:14:07.911175579 +0100 -@@ -88,7 +88,7 @@ - SOCKET socknum[MAXCLIENTS]; - SOCKET sockIO[MAXTOTALPROCS]; - SOCKET sockErr[MAXTOTALPROCS]; --THREAD FILE *debugfile = stderr; -+THREAD FILE *debugfile; - - struct hostent *master_phe; /* IP addresses for webmaster */ - -@@ -1343,7 +1343,7 @@ - } - #endif /* WIN32 */ - --void -+int - main(const int argc, char *argv[]) - { - -@@ -1385,6 +1385,7 @@ - - /* Initalization of variables. */ - /* debugfile = stdout; */ -+ debugfile = stderr; - memset(buffer, 0, NCCARGS); - memset(webserver, 0, MAXHOSTNAMELEN); - memset(configfile, 0, MAXPATHLEN); Property changes on: head/www/webstone/files/patch-ac ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/webstone/files/patch-ad =================================================================== --- head/www/webstone/files/patch-ad (revision 363345) +++ head/www/webstone/files/patch-ad (nonexistent) @@ -1,29 +0,0 @@ ---- webclient.c.orig 1998-07-25 09:50:17.000000000 +0200 -+++ webclient.c 2011-12-20 19:15:12.739176097 +0100 -@@ -79,7 +79,7 @@ - char proxyserver[MAXHOSTNAMELEN]; - char debug_filename[MAXPATHLEN]; - --THREAD FILE *debugfile = stderr; -+THREAD FILE *debugfile; - THREAD FILE *logfile; - THREAD stats_t timestat; - THREAD rqst_timer_t timerarray[MAXNUMOFFILES]; -@@ -691,7 +691,7 @@ - } - } - --void -+int - main(int argc, char *argv[]) - { - long fcount = 0; -@@ -928,7 +928,7 @@ - CloseHandle(hSemaphore); - #endif /* WIN32 */ - -- return; -+ return(0); - } - - void Property changes on: head/www/webstone/files/patch-ad ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/webstone/files/patch-ae =================================================================== --- head/www/webstone/files/patch-ae (revision 363345) +++ head/www/webstone/files/patch-ae (nonexistent) @@ -1,17 +0,0 @@ ---- genrand.c~ 1998-07-25 09:50:16.000000000 +0200 -+++ genrand.c 2011-12-20 19:16:38.086174883 +0100 -@@ -31,7 +31,7 @@ - #include - #include "sysdep.h" - --void -+int - main(const int argc, char* argv[]) - { - FILE* file; -@@ -70,4 +70,5 @@ - } - - fclose(file); -+ return(0); - } Property changes on: head/www/webstone/files/patch-ae ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/webstone/files/patch-af =================================================================== --- head/www/webstone/files/patch-af (revision 363345) +++ head/www/webstone/files/patch-af (nonexistent) @@ -1,11 +0,0 @@ ---- CGI-test/ws25_cgi.c~ 1998-07-25 10:49:54.000000000 +0200 -+++ CGI-test/ws25_cgi.c 2011-12-20 19:17:47.104175312 +0100 -@@ -62,7 +62,7 @@ - #include - #include - --void -+int - main() - { - char *query_string; Property changes on: head/www/webstone/files/patch-af ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/webstone/files/patch-CGI-test__ws25_cgi.c =================================================================== --- head/www/webstone/files/patch-CGI-test__ws25_cgi.c (nonexistent) +++ head/www/webstone/files/patch-CGI-test__ws25_cgi.c (revision 363346) @@ -0,0 +1,11 @@ +--- CGI-test/ws25_cgi.c~ 1998-07-25 10:49:54.000000000 +0200 ++++ CGI-test/ws25_cgi.c 2011-12-20 19:17:47.104175312 +0100 +@@ -62,7 +62,7 @@ + #include + #include + +-void ++int + main() + { + char *query_string; Property changes on: head/www/webstone/files/patch-CGI-test__ws25_cgi.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/webstone/files/patch-Makefile.in =================================================================== --- head/www/webstone/files/patch-Makefile.in (nonexistent) +++ head/www/webstone/files/patch-Makefile.in (revision 363346) @@ -0,0 +1,14 @@ +--- Makefile.in.orig Mon Sep 4 18:52:21 2000 ++++ Makefile.in Mon Sep 4 18:52:45 2000 +@@ -64,9 +64,9 @@ + .SUFFIXES: + .SUFFIXES: .c .o + +-all: $(TARGETS) cgi api ++all: $(TARGETS) cgi + +-install: all install-api install-cgi ++install: all install-cgi + $(CP) $(TARGETS) $(BINDIR) + + pure: all Property changes on: head/www/webstone/files/patch-Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/webstone/files/patch-genrand.c =================================================================== --- head/www/webstone/files/patch-genrand.c (nonexistent) +++ head/www/webstone/files/patch-genrand.c (revision 363346) @@ -0,0 +1,17 @@ +--- genrand.c~ 1998-07-25 09:50:16.000000000 +0200 ++++ genrand.c 2011-12-20 19:16:38.086174883 +0100 +@@ -31,7 +31,7 @@ + #include + #include "sysdep.h" + +-void ++int + main(const int argc, char* argv[]) + { + FILE* file; +@@ -70,4 +70,5 @@ + } + + fclose(file); ++ return(0); + } Property changes on: head/www/webstone/files/patch-genrand.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/webstone/files/patch-webclient.c =================================================================== --- head/www/webstone/files/patch-webclient.c (nonexistent) +++ head/www/webstone/files/patch-webclient.c (revision 363346) @@ -0,0 +1,29 @@ +--- webclient.c.orig 1998-07-25 09:50:17.000000000 +0200 ++++ webclient.c 2011-12-20 19:15:12.739176097 +0100 +@@ -79,7 +79,7 @@ + char proxyserver[MAXHOSTNAMELEN]; + char debug_filename[MAXPATHLEN]; + +-THREAD FILE *debugfile = stderr; ++THREAD FILE *debugfile; + THREAD FILE *logfile; + THREAD stats_t timestat; + THREAD rqst_timer_t timerarray[MAXNUMOFFILES]; +@@ -691,7 +691,7 @@ + } + } + +-void ++int + main(int argc, char *argv[]) + { + long fcount = 0; +@@ -928,7 +928,7 @@ + CloseHandle(hSemaphore); + #endif /* WIN32 */ + +- return; ++ return(0); + } + + void Property changes on: head/www/webstone/files/patch-webclient.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/webstone/files/patch-webmaster.c =================================================================== --- head/www/webstone/files/patch-webmaster.c (nonexistent) +++ head/www/webstone/files/patch-webmaster.c (revision 363346) @@ -0,0 +1,28 @@ +--- webmaster.c.orig 1998-07-25 09:50:18.000000000 +0200 ++++ webmaster.c 2011-12-20 19:14:07.911175579 +0100 +@@ -88,7 +88,7 @@ + SOCKET socknum[MAXCLIENTS]; + SOCKET sockIO[MAXTOTALPROCS]; + SOCKET sockErr[MAXTOTALPROCS]; +-THREAD FILE *debugfile = stderr; ++THREAD FILE *debugfile; + + struct hostent *master_phe; /* IP addresses for webmaster */ + +@@ -1343,7 +1343,7 @@ + } + #endif /* WIN32 */ + +-void ++int + main(const int argc, char *argv[]) + { + +@@ -1385,6 +1385,7 @@ + + /* Initalization of variables. */ + /* debugfile = stdout; */ ++ debugfile = stderr; + memset(buffer, 0, NCCARGS); + memset(webserver, 0, MAXHOSTNAMELEN); + memset(configfile, 0, MAXPATHLEN); Property changes on: head/www/webstone/files/patch-webmaster.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/webstone-ssl/Makefile =================================================================== --- head/www/webstone-ssl/Makefile (revision 363345) +++ head/www/webstone-ssl/Makefile (revision 363346) @@ -1,45 +1,45 @@ # Created by: Kazumasa Nishizawa # $FreeBSD$ PORTNAME= webstone PORTVERSION= 2.5 CATEGORIES= www benchmarks MASTER_SITES= http://crypto.stanford.edu/~nagendra/projects/WebStone/download/ PKGNAMESUFFIX= -ssl DISTNAME= WebStone-SSL-${PORTVERSION} -EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= World wide web server benchmarking with SSL support WRKSRC= ${WRKDIR}/WebStone${PORTVERSION}/src +USES= tar:tgz USE_OPENSSL= yes USE_AUTOTOOLS= autoconf213 ALL_TARGET= install MAKE_JOBS_UNSAFE= yes CPPFLAGS+= -I${OPENSSLINC} LDFLAGS+= -L${OPENSSLLIB} pre-configure: @${RM} -f ${WRKSRC}/config.cache do-install: @${RMDIR} ${WRKSRC}/../bin/runs @${MKDIR} ${STAGEDIR}${PREFIX}/webstone-ssl/bin @${MKDIR} ${STAGEDIR}${PREFIX}/webstone-ssl/conf @${MKDIR} ${STAGEDIR}${PREFIX}/webstone-ssl/lgm ${INSTALL_SCRIPT} ${WRKSRC}/../bin/* ${STAGEDIR}${PREFIX}/webstone-ssl/bin ${INSTALL_SCRIPT} ${WRKSRC}/../lgm/* ${STAGEDIR}${PREFIX}/webstone-ssl/lgm ${INSTALL_DATA} ${WRKSRC}/../conf/* ${STAGEDIR}${PREFIX}/webstone-ssl/conf ${INSTALL_SCRIPT} ${WRKSRC}/../webstone ${STAGEDIR}${PREFIX}/webstone-ssl @${MKDIR} ${WRKSRC}/../bin/runs .for i in webclient webmaster genrand ${STRIP_CMD} ${STAGEDIR}${PREFIX}/webstone-ssl/bin/${i} .endfor .for i in ws20_cgi ws25_cgi ${STRIP_CMD} ${STAGEDIR}${PREFIX}/webstone-ssl/lgm/${i} .endfor .include Index: head/www/webstone-ssl/files/patch-ab =================================================================== --- head/www/webstone-ssl/files/patch-ab (revision 363345) +++ head/www/webstone-ssl/files/patch-ab (nonexistent) @@ -1,37 +0,0 @@ ---- Makefile.in.orig Fri Jun 16 05:49:19 2000 -+++ Makefile.in Tue Mar 13 04:51:41 2001 -@@ -29,7 +29,7 @@ - VERSION = @VERSION@ - - CC = @CC@ --LIBS = @LIBS@ -lssl -lcrypto #-lm -+LIBS = @LIBS@ -lssl -lcrypto -lcompat #-lm - LDFLAGS = @LDFLAGS@ - INCLUDES = - CFLAGS = @CFLAGS@ -DSTONE_SSL -@@ -47,11 +47,11 @@ - MAIN3 = genrand.c - - MASTERSRCS = timefunc.c bench.c parse_file_list.c statistics.c \ -- errexit.c sysdep.c -+ errexit.c sysdep.c random.c - - STONESRCS = timefunc.c get.c \ - parse_file_list.c bench.c statistics.c errexit.c \ -- sysdep.c -+ sysdep.c random.c - - COMPILE = $(CC) $(CFLAGS) $(DEFS) $(INCLUDES) - -@@ -64,9 +64,9 @@ - .SUFFIXES: - .SUFFIXES: .c .o - --all: $(TARGETS) cgi api -+all: $(TARGETS) cgi - --install: all install-api install-cgi -+install: all install-cgi - $(CP) $(TARGETS) $(BINDIR) - - pure: all Property changes on: head/www/webstone-ssl/files/patch-ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/webstone-ssl/files/patch-ac =================================================================== --- head/www/webstone-ssl/files/patch-ac (revision 363345) +++ head/www/webstone-ssl/files/patch-ac (nonexistent) @@ -1,13 +0,0 @@ ---- configure.in.orig Fri Jun 16 05:55:49 2000 -+++ configure.in Fri Oct 27 15:15:36 2000 -@@ -79,8 +79,9 @@ - # Replace `main' with a function in -lm: - AC_CHECK_LIB(m, floor) --AC_CHECK_LIB(nsl, gethostbyname) --AC_CHECK_LIB(socket, connect, AC_SUBST(LIBS), , -lnsl) -+#AC_CHECK_LIB(nsl, gethostbyname) -+#AC_CHECK_LIB(socket, connect, AC_SUBST(LIBS), , -lnsl) -+AC_CHECK_LIB(c, connect) - - # - # checks for header files Property changes on: head/www/webstone-ssl/files/patch-ac ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/webstone-ssl/files/patch-Makefile.in =================================================================== --- head/www/webstone-ssl/files/patch-Makefile.in (nonexistent) +++ head/www/webstone-ssl/files/patch-Makefile.in (revision 363346) @@ -0,0 +1,37 @@ +--- Makefile.in.orig Fri Jun 16 05:49:19 2000 ++++ Makefile.in Tue Mar 13 04:51:41 2001 +@@ -29,7 +29,7 @@ + VERSION = @VERSION@ + + CC = @CC@ +-LIBS = @LIBS@ -lssl -lcrypto #-lm ++LIBS = @LIBS@ -lssl -lcrypto -lcompat #-lm + LDFLAGS = @LDFLAGS@ + INCLUDES = + CFLAGS = @CFLAGS@ -DSTONE_SSL +@@ -47,11 +47,11 @@ + MAIN3 = genrand.c + + MASTERSRCS = timefunc.c bench.c parse_file_list.c statistics.c \ +- errexit.c sysdep.c ++ errexit.c sysdep.c random.c + + STONESRCS = timefunc.c get.c \ + parse_file_list.c bench.c statistics.c errexit.c \ +- sysdep.c ++ sysdep.c random.c + + COMPILE = $(CC) $(CFLAGS) $(DEFS) $(INCLUDES) + +@@ -64,9 +64,9 @@ + .SUFFIXES: + .SUFFIXES: .c .o + +-all: $(TARGETS) cgi api ++all: $(TARGETS) cgi + +-install: all install-api install-cgi ++install: all install-cgi + $(CP) $(TARGETS) $(BINDIR) + + pure: all Property changes on: head/www/webstone-ssl/files/patch-Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/webstone-ssl/files/patch-configure.in =================================================================== --- head/www/webstone-ssl/files/patch-configure.in (nonexistent) +++ head/www/webstone-ssl/files/patch-configure.in (revision 363346) @@ -0,0 +1,13 @@ +--- configure.in.orig Fri Jun 16 05:55:49 2000 ++++ configure.in Fri Oct 27 15:15:36 2000 +@@ -79,8 +79,9 @@ + # Replace `main' with a function in -lm: + AC_CHECK_LIB(m, floor) +-AC_CHECK_LIB(nsl, gethostbyname) +-AC_CHECK_LIB(socket, connect, AC_SUBST(LIBS), , -lnsl) ++#AC_CHECK_LIB(nsl, gethostbyname) ++#AC_CHECK_LIB(socket, connect, AC_SUBST(LIBS), , -lnsl) ++AC_CHECK_LIB(c, connect) + + # + # checks for header files Property changes on: head/www/webstone-ssl/files/patch-configure.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/wwwoffle/files/patch-conf::Makefile.in =================================================================== --- head/www/wwwoffle/files/patch-conf::Makefile.in (revision 363345) +++ head/www/wwwoffle/files/patch-conf::Makefile.in (nonexistent) @@ -1,11 +0,0 @@ ---- conf/Makefile.in- Fri Mar 29 16:40:55 2002 -+++ conf/Makefile.in Fri Mar 29 16:39:51 2002 -@@ -49,7 +49,7 @@ - echo "WWWOFFLE: There is already a config file $(CONFDIR)/wwwoffle.conf." ;\ - echo "WWWOFFLE: Run 'conf/upgrade-config.pl $(CONFDIR)/wwwoffle.conf' to upgrade it." ;\ - echo "WWWOFFLE: " ) -- [ ! -f $(CONFDIR)/wwwoffle.conf ] || $(INSTALL) -c -m 640 wwwoffle.conf.install $(CONFDIR)/wwwoffle.conf.install -+ $(INSTALL) -c -m 640 wwwoffle.conf.install $(CONFDIR)/wwwoffle.conf.install - [ -f $(CONFDIR)/wwwoffle.conf ] || $(INSTALL) -c -m 640 wwwoffle.conf.install $(CONFDIR)/wwwoffle.conf - - ######## CONF FILE ######## Property changes on: head/www/wwwoffle/files/patch-conf::Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/wwwoffle/files/patch-aa =================================================================== --- head/www/wwwoffle/files/patch-aa (revision 363345) +++ head/www/wwwoffle/files/patch-aa (nonexistent) @@ -1,37 +0,0 @@ ---- src/Makefile.in~ Wed Feb 1 04:02:32 2006 -+++ src/Makefile.in Mon Apr 3 10:21:07 2006 -@@ -140,7 +140,7 @@ - document.o html.o css.o xml.o vrml.o javaclass.o \ - configrdwr.o configmisc.o configdata.o configfunc.o \ - io.o iopriv.o iozlib.o iognutls.o iochunk.o \ -- errors.o miscurl.o miscencdec.o headbody.o proto.o certificates.o sockets.o md5.o -+ errors.o miscurl.o miscencdec.o headbody.o proto.o certificates.o sockets.o - - wwwoffle : $(WWWOFFLE_OBJ) - $(LINK) $(WWWOFFLE_OBJ) -o $@ $(LIBRARY) -@@ -156,7 +156,7 @@ - parse.o purge.o refresh.o spool.o \ - configrdwr.o configmisc.o configdata.o configfunc.o configedit.o \ - io.o iopriv.o iozlib.o iognutls.o iochunk.o \ -- errors.o miscurl.o miscencdec.o headbody.o proto.o certificates.o sockets.o md5.o -+ errors.o miscurl.o miscencdec.o headbody.o proto.o certificates.o sockets.o - - wwwoffled : $(WWWOFFLED_OBJ) - $(LINK) $(WWWOFFLED_OBJ) -o $@ $(LIBRARY) -@@ -170,7 +170,7 @@ - parse.o \ - configrdwr.o configmisc.o configdata.o configfunc.o \ - io.o iopriv.o iozlib.o iognutls.o iochunk.o \ -- errors.o miscurl.o miscencdec.o headbody.o proto.o certificates.o sockets.o md5.o -+ errors.o miscurl.o miscencdec.o headbody.o proto.o certificates.o sockets.o - - wwwoffle-tools : $(WWWOFFLE_TOOLS_OBJ) - $(LINK) $(WWWOFFLE_TOOLS_OBJ) -o $@ $(LIBRARY) -@@ -249,7 +249,6 @@ - sockets.o : sockets.c autoconfig.h errors.h sockets.h \ - sockets4.c sockets6.c - --md5.o : md5.c md5.h - - ######## SOURCE FILES ######## - Property changes on: head/www/wwwoffle/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/wwwoffle/files/patch-ab =================================================================== --- head/www/wwwoffle/files/patch-ab (revision 363345) +++ head/www/wwwoffle/files/patch-ab (nonexistent) @@ -1,11 +0,0 @@ ---- src/miscencdec.c.orig Sun Nov 18 11:39:53 2001 -+++ src/miscencdec.c Tue Feb 26 21:03:13 2002 -@@ -35,7 +35,7 @@ - #endif - - #include "misc.h" --#include "md5.h" -+#include - - - /* To understand why the URLDecode*() and URLEncode*() functions are coded this way see README.URL */ Property changes on: head/www/wwwoffle/files/patch-ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/wwwoffle/files/patch-conf::wwwoffle.conf =================================================================== --- head/www/wwwoffle/files/patch-conf::wwwoffle.conf (revision 363345) +++ head/www/wwwoffle/files/patch-conf::wwwoffle.conf (nonexistent) @@ -1,12 +0,0 @@ ---- conf/wwwoffle.conf.template.orig Sat Feb 4 06:41:35 2006 -+++ conf/wwwoffle.conf.template Mon Apr 3 10:23:41 2006 -@@ -12,7 +12,8 @@ - StartUp - { - bind-ipv4 = 0.0.0.0 -- bind-ipv6 = :: -+#bind-ipv6 = :: -+ bind-ipv6 = none - - http-port = 8080 - https-port = 8443 Property changes on: head/www/wwwoffle/files/patch-conf::wwwoffle.conf ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/wwwoffle/files/patch-doc-Makefile.in =================================================================== --- head/www/wwwoffle/files/patch-doc-Makefile.in (revision 363345) +++ head/www/wwwoffle/files/patch-doc-Makefile.in (nonexistent) @@ -1,11 +0,0 @@ ---- doc/Makefile.in.orig 2006-02-07 04:06:14.000000000 +0900 -+++ doc/Makefile.in 2009-07-08 16:30:38.000000000 +0900 -@@ -22,7 +22,7 @@ - - prefix=@prefix@ - mandir=$(DESTDIR)@mandir@ --docdir=$(DESTDIR)${prefix}/doc/wwwoffle -+docdir=$(DESTDIR)@docdir@ - - SPOOLDIR=@SPOOLDIR@ - CONFDIR=@CONFDIR@ Property changes on: head/www/wwwoffle/files/patch-doc-Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/wwwoffle/files/patch-conf__Makefile.in =================================================================== --- head/www/wwwoffle/files/patch-conf__Makefile.in (nonexistent) +++ head/www/wwwoffle/files/patch-conf__Makefile.in (revision 363346) @@ -0,0 +1,11 @@ +--- conf/Makefile.in- Fri Mar 29 16:40:55 2002 ++++ conf/Makefile.in Fri Mar 29 16:39:51 2002 +@@ -49,7 +49,7 @@ + echo "WWWOFFLE: There is already a config file $(CONFDIR)/wwwoffle.conf." ;\ + echo "WWWOFFLE: Run 'conf/upgrade-config.pl $(CONFDIR)/wwwoffle.conf' to upgrade it." ;\ + echo "WWWOFFLE: " ) +- [ ! -f $(CONFDIR)/wwwoffle.conf ] || $(INSTALL) -c -m 640 wwwoffle.conf.install $(CONFDIR)/wwwoffle.conf.install ++ $(INSTALL) -c -m 640 wwwoffle.conf.install $(CONFDIR)/wwwoffle.conf.install + [ -f $(CONFDIR)/wwwoffle.conf ] || $(INSTALL) -c -m 640 wwwoffle.conf.install $(CONFDIR)/wwwoffle.conf + + ######## CONF FILE ######## Property changes on: head/www/wwwoffle/files/patch-conf__Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/wwwoffle/files/patch-conf__wwwoffle.conf =================================================================== --- head/www/wwwoffle/files/patch-conf__wwwoffle.conf (nonexistent) +++ head/www/wwwoffle/files/patch-conf__wwwoffle.conf (revision 363346) @@ -0,0 +1,12 @@ +--- conf/wwwoffle.conf.template.orig Sat Feb 4 06:41:35 2006 ++++ conf/wwwoffle.conf.template Mon Apr 3 10:23:41 2006 +@@ -12,7 +12,8 @@ + StartUp + { + bind-ipv4 = 0.0.0.0 +- bind-ipv6 = :: ++#bind-ipv6 = :: ++ bind-ipv6 = none + + http-port = 8080 + https-port = 8443 Property changes on: head/www/wwwoffle/files/patch-conf__wwwoffle.conf ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/wwwoffle/files/patch-doc__Makefile.in =================================================================== --- head/www/wwwoffle/files/patch-doc__Makefile.in (nonexistent) +++ head/www/wwwoffle/files/patch-doc__Makefile.in (revision 363346) @@ -0,0 +1,11 @@ +--- doc/Makefile.in.orig 2006-02-07 04:06:14.000000000 +0900 ++++ doc/Makefile.in 2009-07-08 16:30:38.000000000 +0900 +@@ -22,7 +22,7 @@ + + prefix=@prefix@ + mandir=$(DESTDIR)@mandir@ +-docdir=$(DESTDIR)${prefix}/doc/wwwoffle ++docdir=$(DESTDIR)@docdir@ + + SPOOLDIR=@SPOOLDIR@ + CONFDIR=@CONFDIR@ Property changes on: head/www/wwwoffle/files/patch-doc__Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/wwwoffle/files/patch-src__Makefile.in =================================================================== --- head/www/wwwoffle/files/patch-src__Makefile.in (nonexistent) +++ head/www/wwwoffle/files/patch-src__Makefile.in (revision 363346) @@ -0,0 +1,37 @@ +--- src/Makefile.in~ Wed Feb 1 04:02:32 2006 ++++ src/Makefile.in Mon Apr 3 10:21:07 2006 +@@ -140,7 +140,7 @@ + document.o html.o css.o xml.o vrml.o javaclass.o \ + configrdwr.o configmisc.o configdata.o configfunc.o \ + io.o iopriv.o iozlib.o iognutls.o iochunk.o \ +- errors.o miscurl.o miscencdec.o headbody.o proto.o certificates.o sockets.o md5.o ++ errors.o miscurl.o miscencdec.o headbody.o proto.o certificates.o sockets.o + + wwwoffle : $(WWWOFFLE_OBJ) + $(LINK) $(WWWOFFLE_OBJ) -o $@ $(LIBRARY) +@@ -156,7 +156,7 @@ + parse.o purge.o refresh.o spool.o \ + configrdwr.o configmisc.o configdata.o configfunc.o configedit.o \ + io.o iopriv.o iozlib.o iognutls.o iochunk.o \ +- errors.o miscurl.o miscencdec.o headbody.o proto.o certificates.o sockets.o md5.o ++ errors.o miscurl.o miscencdec.o headbody.o proto.o certificates.o sockets.o + + wwwoffled : $(WWWOFFLED_OBJ) + $(LINK) $(WWWOFFLED_OBJ) -o $@ $(LIBRARY) +@@ -170,7 +170,7 @@ + parse.o \ + configrdwr.o configmisc.o configdata.o configfunc.o \ + io.o iopriv.o iozlib.o iognutls.o iochunk.o \ +- errors.o miscurl.o miscencdec.o headbody.o proto.o certificates.o sockets.o md5.o ++ errors.o miscurl.o miscencdec.o headbody.o proto.o certificates.o sockets.o + + wwwoffle-tools : $(WWWOFFLE_TOOLS_OBJ) + $(LINK) $(WWWOFFLE_TOOLS_OBJ) -o $@ $(LIBRARY) +@@ -249,7 +249,6 @@ + sockets.o : sockets.c autoconfig.h errors.h sockets.h \ + sockets4.c sockets6.c + +-md5.o : md5.c md5.h + + ######## SOURCE FILES ######## + Property changes on: head/www/wwwoffle/files/patch-src__Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/wwwoffle/files/patch-src__miscencdec.c =================================================================== --- head/www/wwwoffle/files/patch-src__miscencdec.c (nonexistent) +++ head/www/wwwoffle/files/patch-src__miscencdec.c (revision 363346) @@ -0,0 +1,11 @@ +--- src/miscencdec.c.orig Sun Nov 18 11:39:53 2001 ++++ src/miscencdec.c Tue Feb 26 21:03:13 2002 +@@ -35,7 +35,7 @@ + #endif + + #include "misc.h" +-#include "md5.h" ++#include + + + /* To understand why the URLDecode*() and URLEncode*() functions are coded this way see README.URL */ Property changes on: head/www/wwwoffle/files/patch-src__miscencdec.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property