svn commit: r363346 - in head/www: analog/files bkmrkconv/files cacheboy16/files cgi-lib/files cgihtml/files demoroniser/files jesred/files kannel/files libwww libwww/files links1/files lusca-head/...
Adam Weinberger
adamw at FreeBSD.org
Tue Jul 29 15:49:53 UTC 2014
Author: adamw
Date: Tue Jul 29 15:49:46 2014
New Revision: 363346
URL: http://svnweb.freebsd.org/changeset/ports/363346
QAT: https://qat.redports.org/buildarchive/r363346/
Log:
Rename www/ patch-xy patches to reflect the files they modify.
Added:
head/www/analog/files/patch-analog.cfg
- copied unchanged from r363316, head/www/analog/files/patch-ac
head/www/analog/files/patch-src__Makefile
- copied unchanged from r363316, head/www/analog/files/patch-aa
head/www/analog/files/patch-src__tree.c
- copied unchanged from r363316, head/www/analog/files/patch-ab
head/www/bkmrkconv/files/patch-bkmrkconv.pl
- copied unchanged from r363316, head/www/bkmrkconv/files/patch-aa
head/www/cacheboy16/files/patch-include-squid_types.h
- copied unchanged from r363316, head/www/cacheboy16/files/patch-aa
head/www/cgi-lib/files/patch-list-lib.c
- copied unchanged from r363316, head/www/cgi-lib/files/patch-ab
head/www/cgi-lib/files/patch-makefile
- copied unchanged from r363316, head/www/cgi-lib/files/patch-aa
head/www/cgihtml/files/patch-cgi-lib.c
- copied unchanged from r363316, head/www/cgihtml/files/patch-aa
head/www/demoroniser/files/patch-demoroniser.pl
- copied unchanged from r363316, head/www/demoroniser/files/patch-aa
head/www/jesred/files/patch-Makefile
- copied unchanged from r363316, head/www/jesred/files/patch-aa
head/www/jesred/files/patch-path.h
- copied unchanged from r363316, head/www/jesred/files/patch-ab
head/www/kannel/files/patch-debian__kannel.conf
- copied unchanged from r363316, head/www/kannel/files/patch-ad
head/www/kannel/files/patch-gwlib__gwthread-pthread.c
- copied unchanged from r363316, head/www/kannel/files/patch-af
head/www/libwww/files/patch-Library__src__HTMIMImp.c
- copied unchanged from r363316, head/www/libwww/files/patch-aa
head/www/links1/files/patch-kbd.c
- copied unchanged from r363316, head/www/links1/files/patch-ab
head/www/lusca-head/files/patch-errors_Makefile.in
- copied unchanged from r363316, head/www/lusca-head/files/patch-ab
head/www/lusca-head/files/patch-include-squid_types.h
- copied unchanged from r363316, head/www/lusca-head/files/patch-aa
head/www/lynx-current/files/patch-makefile.in
- copied unchanged from r363316, head/www/lynx-current/files/patch-aa
head/www/mathopd/files/patch-Makefile
- copied unchanged from r363316, head/www/mathopd/files/patch-ab
head/www/mathopd/files/patch-src__Makefile
- copied unchanged from r363316, head/www/mathopd/files/patch-aa
head/www/npc/files/patch-Makefile
- copied unchanged from r363316, head/www/npc/files/patch-aa
head/www/p5-FAQ-OMatic/files/patch-fom.PL
- copied unchanged from r363316, head/www/p5-FAQ-OMatic/files/patch-aa
head/www/polipo/files/patch-paths
- copied unchanged from r363316, head/www/polipo/files/patch-aa
head/www/pwebstats/files/patch-pwebstats
- copied unchanged from r363316, head/www/pwebstats/files/patch-aa
head/www/py-HTMLgen/files/patch-installp.py
- copied unchanged from r363316, head/www/py-HTMLgen/files/patch-aa
head/www/reportmagic/files/patch-Install.PL
- copied unchanged from r363316, head/www/reportmagic/files/patch-aa
head/www/smb_auth/files/patch-Makefile
- copied unchanged from r363316, head/www/smb_auth/files/patch-aa
head/www/squid/files/patch-include-squid_types.h
- copied unchanged from r363316, head/www/squid/files/patch-aa
head/www/tclhttpd/files/patch-Makefile.in
- copied unchanged from r363316, head/www/tclhttpd/files/patch-ab
head/www/tclhttpd/files/patch-bin__httpd.tcl
- copied unchanged from r363316, head/www/tclhttpd/files/patch-ac
head/www/tclhttpd/files/patch-bin__tclhttpd.rc
- copied unchanged from r363316, head/www/tclhttpd/files/patch-ae
head/www/tclhttpd/files/patch-configure
- copied unchanged from r363316, head/www/tclhttpd/files/patch-ad
head/www/tclhttpd/files/patch-src__limit.c
- copied unchanged from r363316, head/www/tclhttpd/files/patch-ak
head/www/tclhttpd/files/patch-tcllib
- copied unchanged from r363316, head/www/tclhttpd/files/patch-ah
head/www/thumbnail_index/files/patch-Makefile
- copied unchanged from r363316, head/www/thumbnail_index/files/patch-aa
head/www/thumbnail_index/files/patch-pwd-and-wc
- copied unchanged from r363316, head/www/thumbnail_index/files/patch-ab
head/www/tidy/files/patch-Makefile
- copied unchanged from r363316, head/www/tidy/files/patch-aa
head/www/tidy/files/patch-config.c
- copied unchanged from r363316, head/www/tidy/files/patch-ac
head/www/tidy/files/patch-html.h
- copied unchanged from r363316, head/www/tidy/files/patch-ad
head/www/tidy/files/patch-lexer.c
- copied unchanged from r363316, head/www/tidy/files/patch-ae
head/www/tidy/files/patch-localize.c
- copied unchanged from r363316, head/www/tidy/files/patch-af
head/www/tidy/files/patch-man_page.txt
- copied unchanged from r363316, head/www/tidy/files/patch-ag
head/www/tidy/files/patch-platform.h
- copied unchanged from r363316, head/www/tidy/files/patch-ab
head/www/tidy/files/patch-tidy.c
- copied unchanged from r363316, head/www/tidy/files/patch-ah
head/www/web2ldap/files/patch-etc__web2ldap__web2ldapcnf__standalone.py_1
- copied unchanged from r363316, head/www/web2ldap/files/patch-ah
head/www/web2ldap/files/patch-etc__web2ldap__web2ldapcnf__standalone.py_2
- copied unchanged from r363316, head/www/web2ldap/files/patch-ai
head/www/web2ldap/files/patch-fcgi__web2ldap.py
- copied unchanged from r363316, head/www/web2ldap/files/patch-ac
head/www/web2ldap/files/patch-sbin__compile.py
- copied unchanged from r363316, head/www/web2ldap/files/patch-ad
head/www/web2ldap/files/patch-sbin__web2ldap.py
- copied unchanged from r363316, head/www/web2ldap/files/patch-ag
head/www/webcopy/files/patch-Makefile
- copied unchanged from r363316, head/www/webcopy/files/patch-aa
head/www/webcopy/files/patch-webcopy.src_1
- copied unchanged from r363316, head/www/webcopy/files/patch-ab
head/www/webcopy/files/patch-webcopy.src_2
- copied unchanged from r363316, head/www/webcopy/files/patch-ac
head/www/webcopy/files/patch-webcopy.src_3
- copied unchanged from r363316, head/www/webcopy/files/patch-ad
head/www/webcopy/files/patch-webcopy.src_4
- copied unchanged from r363316, head/www/webcopy/files/patch-ae
head/www/webcopy/files/patch-webcopy.src_5
- copied unchanged from r363316, head/www/webcopy/files/patch-af
head/www/webcrawl/files/patch-Makefile
- copied unchanged from r363316, head/www/webcrawl/files/patch-aa
head/www/weblint/files/patch-Makefile
- copied unchanged from r363316, head/www/weblint/files/patch-aa
head/www/webstats/files/patch-configfiles__serverwide__webstats.ini
- copied unchanged from r363316, head/www/webstats/files/patch-aa
head/www/webstats/files/patch-configfiles__vhosts__analog.cfg
- copied unchanged from r363316, head/www/webstats/files/patch-ab
head/www/webstats/files/patch-configfiles__vhosts__rmagic.ini
- copied unchanged from r363316, head/www/webstats/files/patch-ac
head/www/webstats/files/patch-scripts__perl__webstats
- copied unchanged from r363316, head/www/webstats/files/patch-ad
head/www/webstats/files/patch-scripts__php__webstats.php
- copied unchanged from r363316, head/www/webstats/files/patch-ae
head/www/webstone-ssl/files/patch-Makefile.in
- copied unchanged from r363316, head/www/webstone-ssl/files/patch-ab
head/www/webstone-ssl/files/patch-configure.in
- copied unchanged from r363316, head/www/webstone-ssl/files/patch-ac
head/www/webstone/files/patch-CGI-test__ws25_cgi.c
- copied unchanged from r363316, head/www/webstone/files/patch-af
head/www/webstone/files/patch-Makefile.in
- copied unchanged from r363316, head/www/webstone/files/patch-ab
head/www/webstone/files/patch-genrand.c
- copied unchanged from r363316, head/www/webstone/files/patch-ae
head/www/webstone/files/patch-webclient.c
- copied unchanged from r363316, head/www/webstone/files/patch-ad
head/www/webstone/files/patch-webmaster.c
- copied unchanged from r363316, head/www/webstone/files/patch-ac
head/www/wwwoffle/files/patch-conf__Makefile.in
- copied unchanged from r363316, head/www/wwwoffle/files/patch-conf::Makefile.in
head/www/wwwoffle/files/patch-conf__wwwoffle.conf
- copied unchanged from r363316, head/www/wwwoffle/files/patch-conf::wwwoffle.conf
head/www/wwwoffle/files/patch-doc__Makefile.in
- copied unchanged from r363316, head/www/wwwoffle/files/patch-doc-Makefile.in
head/www/wwwoffle/files/patch-src__Makefile.in
- copied unchanged from r363316, head/www/wwwoffle/files/patch-aa
head/www/wwwoffle/files/patch-src__miscencdec.c
- copied unchanged from r363316, head/www/wwwoffle/files/patch-ab
Deleted:
head/www/analog/files/patch-aa
head/www/analog/files/patch-ab
head/www/analog/files/patch-ac
head/www/bkmrkconv/files/patch-aa
head/www/cacheboy16/files/patch-aa
head/www/cgi-lib/files/patch-aa
head/www/cgi-lib/files/patch-ab
head/www/cgihtml/files/patch-aa
head/www/demoroniser/files/patch-aa
head/www/jesred/files/patch-aa
head/www/jesred/files/patch-ab
head/www/kannel/files/patch-ad
head/www/kannel/files/patch-af
head/www/libwww/files/patch-aa
head/www/links1/files/patch-ab
head/www/lusca-head/files/patch-aa
head/www/lusca-head/files/patch-ab
head/www/lynx-current/files/patch-aa
head/www/mathopd/files/patch-aa
head/www/mathopd/files/patch-ab
head/www/npc/files/patch-aa
head/www/p5-FAQ-OMatic/files/patch-aa
head/www/polipo/files/patch-aa
head/www/pwebstats/files/patch-aa
head/www/py-HTMLgen/files/patch-aa
head/www/reportmagic/files/patch-aa
head/www/smb_auth/files/patch-aa
head/www/squid/files/patch-aa
head/www/tclhttpd/files/patch-ab
head/www/tclhttpd/files/patch-ac
head/www/tclhttpd/files/patch-ad
head/www/tclhttpd/files/patch-ae
head/www/tclhttpd/files/patch-ah
head/www/tclhttpd/files/patch-ak
head/www/thumbnail_index/files/patch-aa
head/www/thumbnail_index/files/patch-ab
head/www/tidy/files/patch-aa
head/www/tidy/files/patch-ab
head/www/tidy/files/patch-ac
head/www/tidy/files/patch-ad
head/www/tidy/files/patch-ae
head/www/tidy/files/patch-af
head/www/tidy/files/patch-ag
head/www/tidy/files/patch-ah
head/www/web2ldap/files/patch-ac
head/www/web2ldap/files/patch-ad
head/www/web2ldap/files/patch-ag
head/www/web2ldap/files/patch-ah
head/www/web2ldap/files/patch-ai
head/www/webcopy/files/patch-aa
head/www/webcopy/files/patch-ab
head/www/webcopy/files/patch-ac
head/www/webcopy/files/patch-ad
head/www/webcopy/files/patch-ae
head/www/webcopy/files/patch-af
head/www/webcrawl/files/patch-aa
head/www/weblint/files/patch-aa
head/www/webstats/files/patch-aa
head/www/webstats/files/patch-ab
head/www/webstats/files/patch-ac
head/www/webstats/files/patch-ad
head/www/webstats/files/patch-ae
head/www/webstone-ssl/files/patch-ab
head/www/webstone-ssl/files/patch-ac
head/www/webstone/files/patch-ab
head/www/webstone/files/patch-ac
head/www/webstone/files/patch-ad
head/www/webstone/files/patch-ae
head/www/webstone/files/patch-af
head/www/wwwoffle/files/patch-aa
head/www/wwwoffle/files/patch-ab
head/www/wwwoffle/files/patch-conf::Makefile.in
head/www/wwwoffle/files/patch-conf::wwwoffle.conf
head/www/wwwoffle/files/patch-doc-Makefile.in
Modified:
head/www/libwww/Makefile
head/www/npc/Makefile
head/www/tidy/Makefile
head/www/webcrawl/Makefile
head/www/weblint/Makefile
head/www/webstone-ssl/Makefile
head/www/webstone/Makefile
Copied: head/www/analog/files/patch-analog.cfg (from r363316, head/www/analog/files/patch-ac)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/analog/files/patch-analog.cfg Tue Jul 29 15:49:46 2014 (r363346, copy of r363316, head/www/analog/files/patch-ac)
@@ -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]"
Copied: head/www/analog/files/patch-src__Makefile (from r363316, head/www/analog/files/patch-aa)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/analog/files/patch-src__Makefile Tue Jul 29 15:49:46 2014 (r363346, copy of r363316, head/www/analog/files/patch-aa)
@@ -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
Copied: head/www/analog/files/patch-src__tree.c (from r363316, head/www/analog/files/patch-ab)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/analog/files/patch-src__tree.c Tue Jul 29 15:49:46 2014 (r363346, copy of r363316, head/www/analog/files/patch-ab)
@@ -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 ||
Copied: head/www/bkmrkconv/files/patch-bkmrkconv.pl (from r363316, head/www/bkmrkconv/files/patch-aa)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/bkmrkconv/files/patch-bkmrkconv.pl Tue Jul 29 15:49:46 2014 (r363346, copy of r363316, head/www/bkmrkconv/files/patch-aa)
@@ -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;
Copied: head/www/cacheboy16/files/patch-include-squid_types.h (from r363316, head/www/cacheboy16/files/patch-aa)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/cacheboy16/files/patch-include-squid_types.h Tue Jul 29 15:49:46 2014 (r363346, copy of r363316, head/www/cacheboy16/files/patch-aa)
@@ -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 <sys/types.h>
+ #endif
+-#if HAVE_SYS_BITYPES_H
+-#include <sys/bitypes.h>
+-#endif
+
+ #endif /* SQUID_TYPES_H */
Copied: head/www/cgi-lib/files/patch-list-lib.c (from r363316, head/www/cgi-lib/files/patch-ab)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/cgi-lib/files/patch-list-lib.c Tue Jul 29 15:49:46 2014 (r363346, copy of r363316, head/www/cgi-lib/files/patch-ab)
@@ -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;
+-
+ }
+
+
Copied: head/www/cgi-lib/files/patch-makefile (from r363316, head/www/cgi-lib/files/patch-aa)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/cgi-lib/files/patch-makefile Tue Jul 29 15:49:46 2014 (r363346, copy of r363316, head/www/cgi-lib/files/patch-aa)
@@ -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
Copied: head/www/cgihtml/files/patch-cgi-lib.c (from r363316, head/www/cgihtml/files/patch-aa)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/cgihtml/files/patch-cgi-lib.c Tue Jul 29 15:49:46 2014 (r363346, copy of r363316, head/www/cgihtml/files/patch-aa)
@@ -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 <io.h>
++#define mktemp _mktemp
++#define snprintf _snprintf
++#else
++#include <unistd.h>
+ #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);
Copied: head/www/demoroniser/files/patch-demoroniser.pl (from r363316, head/www/demoroniser/files/patch-aa)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/demoroniser/files/patch-demoroniser.pl Tue Jul 29 15:49:46 2014 (r363346, copy of r363316, head/www/demoroniser/files/patch-aa)
@@ -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
+ #
Copied: head/www/jesred/files/patch-Makefile (from r363316, head/www/jesred/files/patch-aa)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/jesred/files/patch-Makefile Tue Jul 29 15:49:46 2014 (r363346, copy of r363316, head/www/jesred/files/patch-aa)
@@ -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
Copied: head/www/jesred/files/patch-path.h (from r363316, head/www/jesred/files/patch-ab)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/jesred/files/patch-path.h Tue Jul 29 15:49:46 2014 (r363346, copy of r363316, head/www/jesred/files/patch-ab)
@@ -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
Copied: head/www/kannel/files/patch-debian__kannel.conf (from r363316, head/www/kannel/files/patch-ad)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/kannel/files/patch-debian__kannel.conf Tue Jul 29 15:49:46 2014 (r363346, copy of r363316, head/www/kannel/files/patch-ad)
@@ -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"
Copied: head/www/kannel/files/patch-gwlib__gwthread-pthread.c (from r363316, head/www/kannel/files/patch-af)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/kannel/files/patch-gwlib__gwthread-pthread.c Tue Jul 29 15:49:46 2014 (r363346, copy of r363316, head/www/kannel/files/patch-af)
@@ -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.");
Modified: head/www/libwww/Makefile
==============================================================================
--- head/www/libwww/Makefile Tue Jul 29 15:44:45 2014 (r363345)
+++ head/www/libwww/Makefile Tue Jul 29 15:49:46 2014 (r363346)
@@ -7,7 +7,6 @@ PORTREVISION= 4
CATEGORIES= www devel
MASTER_SITES= http://www.w3.org/Library/Distribution/
DISTNAME= w3c-${PORTNAME}-${PORTVERSION}
-EXTRACT_SUFX= .tgz
MAINTAINER= marius at nuenneri.ch
COMMENT= The W3C Reference Library
@@ -15,7 +14,7 @@ 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
Copied: head/www/libwww/files/patch-Library__src__HTMIMImp.c (from r363316, head/www/libwww/files/patch-aa)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/libwww/files/patch-Library__src__HTMIMImp.c Tue Jul 29 15:49:46 2014 (r363346, copy of r363316, head/www/libwww/files/patch-aa)
@@ -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;
Copied: head/www/links1/files/patch-kbd.c (from r363316, head/www/links1/files/patch-ab)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/links1/files/patch-kbd.c Tue Jul 29 15:49:46 2014 (r363346, copy of r363316, head/www/links1/files/patch-ab)
@@ -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;
Copied: head/www/lusca-head/files/patch-errors_Makefile.in (from r363316, head/www/lusca-head/files/patch-ab)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/lusca-head/files/patch-errors_Makefile.in Tue Jul 29 15:49:46 2014 (r363346, copy of r363316, head/www/lusca-head/files/patch-ab)
@@ -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 \
Copied: head/www/lusca-head/files/patch-include-squid_types.h (from r363316, head/www/lusca-head/files/patch-aa)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/lusca-head/files/patch-include-squid_types.h Tue Jul 29 15:49:46 2014 (r363346, copy of r363316, head/www/lusca-head/files/patch-aa)
@@ -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 <sys/types.h>
+ #endif
+-#if HAVE_SYS_BITYPES_H
+-#include <sys/bitypes.h>
+-#endif
+
+ #endif /* SQUID_TYPES_H */
Copied: head/www/lynx-current/files/patch-makefile.in (from r363316, head/www/lynx-current/files/patch-aa)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/lynx-current/files/patch-makefile.in Tue Jul 29 15:49:46 2014 (r363346, copy of r363316, head/www/lynx-current/files/patch-aa)
@@ -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 at 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
Copied: head/www/mathopd/files/patch-Makefile (from r363316, head/www/mathopd/files/patch-ab)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/mathopd/files/patch-Makefile Tue Jul 29 15:49:46 2014 (r363346, copy of r363316, head/www/mathopd/files/patch-ab)
@@ -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 <bsd.subdir.mk>
Copied: head/www/mathopd/files/patch-src__Makefile (from r363316, head/www/mathopd/files/patch-aa)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/mathopd/files/patch-src__Makefile Tue Jul 29 15:49:46 2014 (r363346, copy of r363316, head/www/mathopd/files/patch-aa)
@@ -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 <bsd.prog.mk>
Modified: head/www/npc/Makefile
==============================================================================
--- head/www/npc/Makefile Tue Jul 29 15:44:45 2014 (r363345)
+++ head/www/npc/Makefile Tue Jul 29 15:49:46 2014 (r363346)
@@ -16,11 +16,10 @@ 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 <bsd.port.mk>
Copied: head/www/npc/files/patch-Makefile (from r363316, head/www/npc/files/patch-aa)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/npc/files/patch-Makefile Tue Jul 29 15:49:46 2014 (r363346, copy of r363316, head/www/npc/files/patch-aa)
@@ -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
Copied: head/www/p5-FAQ-OMatic/files/patch-fom.PL (from r363316, head/www/p5-FAQ-OMatic/files/patch-aa)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/p5-FAQ-OMatic/files/patch-fom.PL Tue Jul 29 15:49:46 2014 (r363346, copy of r363316, head/www/p5-FAQ-OMatic/files/patch-aa)
@@ -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 = <STDIN>;
++
++close( F );
Copied: head/www/polipo/files/patch-paths (from r363316, head/www/polipo/files/patch-aa)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/polipo/files/patch-paths Tue Jul 29 15:49:46 2014 (r363346, copy of r363316, head/www/polipo/files/patch-aa)
@@ -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
+
Copied: head/www/pwebstats/files/patch-pwebstats (from r363316, head/www/pwebstats/files/patch-aa)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/pwebstats/files/patch-pwebstats Tue Jul 29 15:49:46 2014 (r363346, copy of r363316, head/www/pwebstats/files/patch-aa)
@@ -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};
Copied: head/www/py-HTMLgen/files/patch-installp.py (from r363316, head/www/py-HTMLgen/files/patch-aa)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/py-HTMLgen/files/patch-installp.py Tue Jul 29 15:49:46 2014 (r363346, copy of r363316, head/www/py-HTMLgen/files/patch-aa)
@@ -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)
Copied: head/www/reportmagic/files/patch-Install.PL (from r363316, head/www/reportmagic/files/patch-aa)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/reportmagic/files/patch-Install.PL Tue Jul 29 15:49:46 2014 (r363346, copy of r363316, head/www/reportmagic/files/patch-aa)
@@ -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;
Copied: head/www/smb_auth/files/patch-Makefile (from r363316, head/www/smb_auth/files/patch-aa)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/smb_auth/files/patch-Makefile Tue Jul 29 15:49:46 2014 (r363346, copy of r363316, head/www/smb_auth/files/patch-aa)
@@ -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)
Copied: head/www/squid/files/patch-include-squid_types.h (from r363316, head/www/squid/files/patch-aa)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/squid/files/patch-include-squid_types.h Tue Jul 29 15:49:46 2014 (r363346, copy of r363316, head/www/squid/files/patch-aa)
@@ -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 <sys/types.h>
+ #endif
+-#if HAVE_SYS_BITYPES_H
+-#include <sys/bitypes.h>
+-#endif
+
+ #endif /* SQUID_TYPES_H */
Copied: head/www/tclhttpd/files/patch-Makefile.in (from r363316, head/www/tclhttpd/files/patch-ab)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/tclhttpd/files/patch-Makefile.in Tue Jul 29 15:49:46 2014 (r363346, copy of r363316, head/www/tclhttpd/files/patch-ab)
@@ -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 =
+
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list