Remove www/oops: Development stops long ago, domain has been expired

Expiration date was 31 August 2014

18 files changed, 1 insertions, 773 deletions

diff --git a/MOVED b/MOVED
index 88b800def516..8ec0109cd9ad 100644
--- a/MOVED
+++ b/MOVED
@@ -6994,3 +6994,4 @@ net-mgmt/zenpack-graphportlet||2014-09-01|Not staged
 sysutils/boxbackup||2014-09-01|Not staged
 www/webcalendar-devel|www/webcalendar|2014-09-04|Removed, use www/webcalendar instead
 devel/ruby-memoize||2014-09-06|Has expired: RubyForge shutdown May 15 2014
+www/oops||2014-09-06|Development stops long ago, domain has been expired
diff --git a/www/Makefile b/www/Makefile
index 4562b2fd01bf..5d63a5341f90 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -549,7 +549,6 @@
     SUBDIR += ocsigen
     SUBDIR += ojs2
     SUBDIR += ompload
-    SUBDIR += oops
     SUBDIR += opencart
     SUBDIR += openxmldir
     SUBDIR += opera
diff --git a/www/oops/Makefile b/www/oops/Makefile
deleted file mode 100644
index fff0f6ea3723..000000000000
--- a/www/oops/Makefile
+++ /dev/null
@@ -1,100 +0,0 @@
-# Created by: osa
-# $FreeBSD$
-
-PORTNAME=	oops
-PORTVERSION=	${OOPSVERSION}
-PORTREVISION=	13
-CATEGORIES=	www
-MASTER_SITES=	http://oops-cache.org/ \
-		ftp://kucha.ru/pub/misc/oops/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Caching web proxy server
-BROKEN=		Fails to stage
-DEPRECATED=	Development stops long ago, domain has been expired
-EXPIRATION_DATE=	2014-08-31
-
-BUILD_DEPENDS+=	gawk:${PORTSDIR}/lang/gawk
-
-OOPSVERSION=	1.5.24
-
-USE_SUBMAKE=	yes
-USE_AUTOTOOLS=	autoconf
-CONFIGURE_ARGS?=--sbindir=${PREFIX}/sbin \
-		--sysconfdir=${PREFIX}/etc/oops \
-		--localstatedir=${OOPSVAR} \
-		--libdir=${PREFIX}/libexec/oops \
-		--enable-oops-user=${USERS} \
-		--enable-large-files \
-		--with-regexp=system
-CFLAGS+=	-fPIC
-CXXFLAGS+=	-fPIC
-
-.if ${CC} == "clang" || ${CXX} == "clang++"
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-configure.in \
-		${PATCHDIR}/extra-patch-src_modules_Makefile.in
-.endif
-
-USERS=		oops
-GROUPS=		nobody
-
-OOPSVAR=	/var/run/oops
-OOPSLOG=	/var/log/oops
-MAN8=		oops.8 oopsctl.8
-
-USE_RC_SUBR=	oops
-PKGMESSAGE=	${WRKDIR}/pkg-message
-SUB_FILES=	pkg-message
-
-OPTIONS_DEFINE= MYSQL PGSQL PCRE
-OPTIONS_RADIO=	DB
-OPTIONS_RADIO_DB=	GIGABASE DB4
-DB_DESC=	DB storage
-OPTIONS_DEFAULT=	GIGABASE
-GIGABASE_DESC=	GigaBase storage
-DB4_DESC=	Berkeley DB v4 storage
-MYSQL_DESC=	MySQL auth support
-PGSQL_DESC=	PostgreSQL auth support
-
-PGSQL_USES=		pgsql
-PGSQL_CONFIGURE_ARGS=	--with-PGSQL=${PREFIX}/pgsql
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MGIGABASE}
-LIB_DEPENDS+=		libgigabase_r.so:${PORTSDIR}/databases/gigabase
-CONFIGURE_ARGS+=	--without-DB
-.endif
-
-.if ${PORT_OPTIONS:MDB4}
-USE_BDB=		db48+
-CONFIGURE_ARGS+=	--without-GB
-.endif
-
-.if ${PORT_OPTIONS:MMYSQL}
-USE_MYSQL=		YES
-CONFIGURE_ARGS+=	--with-MYSQL=${PREFIX}
-.endif
-
-.if ${PORT_OPTIONS:MPCRE}
-LIB_DEPENDS+=		libpcre.so:${PORTSDIR}/devel/pcre
-CONFIGURE_ARGS+=	--with-regexp=pcre
-.endif
-
-pre-configure:
-	@cd ${WRKSRC} && ${AUTOHEADER}
-
-post-install:
-	@${INSTALL_MAN} ${WRKSRC}/doc/oops.8 ${PREFIX}/man/man8
-	@${INSTALL_MAN} ${WRKSRC}/doc/oopsctl.8 ${PREFIX}/man/man8
-	@${MKDIR} -m 750 ${OOPSVAR}
-	@${CHOWN} oops ${OOPSVAR}
-	@${MKDIR} -m 750 ${OOPSLOG}
-	@${CHOWN} oops ${OOPSLOG}
-	${INSTALL_SCRIPT} ${WRKDIR}/oops ${PREFIX}/etc/rc.d
-	@${CAT} ${PKGMESSAGE}
-
-post-clean:
-	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
-
-.include <bsd.port.mk>
diff --git a/www/oops/distinfo b/www/oops/distinfo
deleted file mode 100644
index 6bb9d2a3279a..000000000000
--- a/www/oops/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (oops-1.5.24.tar.gz) = 0a752ca8a9aa9bd122f63c96f3c9611eb87e6dc81f2485c3792bd566df7533e5
-SIZE (oops-1.5.24.tar.gz) = 479299
diff --git a/www/oops/files/extra-patch-configure.in b/www/oops/files/extra-patch-configure.in
deleted file mode 100644
index 37f968fe599b..000000000000
--- a/www/oops/files/extra-patch-configure.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.in.orig	2012-02-15 20:36:22.000000000 +0400
-+++ configure.in	2012-02-15 20:37:23.000000000 +0400
-@@ -316,7 +316,6 @@
- 
- 	  ;;
- freebsd*) CFLAGS="$CFLAGS -D_REENTRANT -DFREEBSD -D_THREAD_SAFE -DFD_SETSIZE=2048 -I."
--	  CXXSOFLAGS="-shared"
- 	  LIBS="$LEXLIB $LIBS"
- 	  if test "$large_files" = "yes" ; then
- 		## FreeBSD need no any special flags for 64bit files
-@@ -696,8 +695,7 @@
- 	res=`./confmain`
-     fi
-     if test "$res" = "yes"; then
--	    CFLAGS="$CFLAGS -export-dynamic"
--	    AC_MSG_RESULT(yes)
-+	    AC_MSG_RESULT(no)
-     else
- 	    AC_MSG_RESULT(no)
-     fi
diff --git a/www/oops/files/extra-patch-src_modules_Makefile.in b/www/oops/files/extra-patch-src_modules_Makefile.in
deleted file mode 100644
index b165558a5f05..000000000000
--- a/www/oops/files/extra-patch-src_modules_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/modules/Makefile.in.orig	2004-11-23 08:20:06.000000000 +0300
-+++ src/modules/Makefile.in	2012-02-03 05:25:52.000000000 +0400
-@@ -2,9 +2,9 @@
- CXX = @CXX@
- LIBS = @LIBS@
- CFLAGS = @CFLAGS@ @DEFS@
--LDFLAGS = @LDFLAGS@
-+LDFLAGS = @SOFLAGS@ --export-dynamic
- LD = @LD@
--SOFLAGS = @SOFLAGS@
-+SOFLAGS =
- OPT_MODS = @OPT_MODS@
- CXXCOMPFLAGS = @LIBGB_INCL@ @CXXCOMPFLAGS@
- CXXSOFLAGS = @LIBGB_INCL@ @CXXSOFLAGS@
diff --git a/www/oops/files/oops.in b/www/oops/files/oops.in
deleted file mode 100644
index 9168a424df50..000000000000
--- a/www/oops/files/oops.in
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: oops
-# REQUIRE: DAEMON
-
-. /etc/rc.subr
-
-name="oops"
-rcvar=oops_enable
-
-command="%%PREFIX%%/sbin/oopsctl"
-procname="%%PREFIX%%/sbin/oops"
-pidfile="/var/run/oops/oops.pid"
-
-required_files="%%PREFIX%%/etc/oops/oops.cfg"
-required_dirs="/var/run/oops"
-
-extra_commands="reconfig rotate"
-
-start_cmd="start_cmd"
-stop_cmd="stop_cmd"
-reconfig_cmd="reconfig_cmd"
-rotate_cmd="rotate_cmd"
-
-start_cmd()	{
-	${command} start 2>&1 > /dev/null
-}
-
-stop_cmd()	{
-	${command} stop
-}
-
-reconfig_cmd()	{
-	${command} reconfigure
-}
-
-rotate_cmd()	{
-	${command} rotate
-}
-
-load_rc_config "oops"
-: ${oops_enable="NO"}
-
-run_rc_command "$1"
diff --git a/www/oops/files/patch-configure.in b/www/oops/files/patch-configure.in
deleted file mode 100644
index d91ba7565be9..000000000000
--- a/www/oops/files/patch-configure.in
+++ /dev/null
@@ -1,37 +0,0 @@
---- configure.in.orig	2004-11-23 08:20:04.000000000 +0300
-+++ configure.in	2012-02-02 20:33:20.000000000 +0400
-@@ -325,19 +325,7 @@
- 	  if test "X$LIBGB_NAME" != "X" ; then
- 		LIBGB_NAME="$LIBGB_NAME -lstdc++"
- 	  fi
--          rel=`uname -r`
--          case "$rel" in
--            4*)
--              CFLAGS="$CFLAGS -pthread"
--              ;;
--            5*)
--              LIBS="-lc_r $LEXLIB $LIBS"
--              ;;
--            *)
--              CFLAGS="$CFLAGS -pthread"
--              LIBS="-lc_r $LEXLIB $LIBS"
--              ;;
--          esac
-+	  LIBS="-lpthread $LEXLIB $LIBS"
- 	  RPATH_OPTION="-rpath"
- 	  ;;
- bsdi*)	  CFLAGS="$CFLAGS -pthread -DBSDOS"
-@@ -430,10 +432,10 @@
- esac
- 
- if test "X$MYSQL_PATH" != "X" ; then
--    LIBS="-L$MYSQL_PATH/lib -lmysqlclient $LIBS"
-+    LIBS="-L$MYSQL_PATH/lib/mysql -lmysqlclient $LIBS"
-     AC_DEFINE(HAVE_MYSQL)
--    CFLAGS="$CFLAGS -I$MYSQL_PATH/include"
--    MYSQL_LIB="-L$MYSQL_PATH/lib -lmysqlclient"
-+    CFLAGS="$CFLAGS -I$MYSQL_PATH/include/mysql"
-+    MYSQL_LIB="-L$MYSQL_PATH/lib/mysql -lmysqlclient"
- fi
- 
- if test "X$PGSQL_PATH" != "X" ; then
diff --git a/www/oops/files/patch-src__Makefile.in b/www/oops/files/patch-src__Makefile.in
deleted file mode 100644
index 8f8fe154ba1b..000000000000
--- a/www/oops/files/patch-src__Makefile.in
+++ /dev/null
@@ -1,31 +0,0 @@
---- src/Makefile.in.orig	Mon Jan 31 15:38:43 2005
-+++ src/Makefile.in	Wed Feb  9 15:38:59 2005
-@@ -2,7 +2,7 @@
- CXX = @CXX@
- LDFLAGS = @LDFLAGS@
- EXTLDFLAGS = @EXTLDFLAGS@
--INSTALL = @INSTALL@ @SETOWNER@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL@ -m 644 @SETOWNER@
- CHOWN = @CHOWN@
- STATIC_MODULES = @STATIC_MODULES@
-@@ -49,19 +49,16 @@
- 
- mkinstalldirs:
- 	../mkinstalldirs ${OOPSPATH} \
--			 ${OOPSPATH}/logs \
- 			 ${OOPSPATH}/DB \
- 			 ${OOPSPATH}/storages \
- 			 ${OOPS_SYSCONFDIR}/tables \
- 			 ${OOPS_LIBDIR}
- 
- 	if [ "X@OOPS_USER@" != "X" ]; then\
--		${CHOWN} @OOPS_USER@ ${OOPSPATH}/logs;\
- 		${CHOWN} @OOPS_USER@ ${OOPSPATH}/DB;\
- 	fi
- 
- install: all mkinstalldirs
--	$(INSTALL) -d ${OOPS_SBINDIR}
- 	$(INSTALL) oops ${OOPS_SBINDIR}
- 	if [ -f ${OOPS_SYSCONFDIR}/oops.cfg ]; then\
- 		$(INSTALL_DATA) oops.cfg ${OOPS_SYSCONFDIR}/oops.cfg.sample ;\
diff --git a/www/oops/files/patch-src_lib.c b/www/oops/files/patch-src_lib.c
deleted file mode 100644
index 8ddc6b6ef4c7..000000000000
--- a/www/oops/files/patch-src_lib.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/lib.c.orig	Thu May 25 12:28:53 2006
-+++ src/lib.c	Thu May 25 12:30:17 2006
-@@ -306,6 +306,9 @@
- 			rc = gethostbyname_r(val, &he_b, &he_d);
- 			if ( !rc ) he = &he_b;
- 			    else   he = NULL;
-+#elif  defined(__FreeBSD__)
-+			gethostbyname_r(val, &he_b, he_strb, sizeof(he_strb), &he, &he_errno);
-+
- #else
- 			he = gethostbyname_r(val, &he_b, he_strb, sizeof(he_strb), &he_errno);
- #endif
diff --git a/www/oops/files/patch-src_methodreport b/www/oops/files/patch-src_methodreport
deleted file mode 100644
index ce25ddd0fcdf..000000000000
--- a/www/oops/files/patch-src_methodreport
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -ruN src.orig/http_utils.c src/http_utils.c
---- src.orig/http_utils.c	2012-01-11 18:04:20.773665172 +0400
-+++ src/http_utils.c	2012-01-11 18:07:47.378664712 +0400
-@@ -120,6 +120,7 @@
-     else if ( rq->meth == METH_MOVE ) meth="MOVE";
-     else if ( rq->meth == METH_LOCK ) meth="LOCK";
-     else if ( rq->meth == METH_UNLOCK ) meth="UNLOCK";
-+    else if ( rq->meth == METH_REPORT ) meth="REPORT";
-     else
- 	return;
-     IF_STRDUP(rq->tag, "TCP_MISS");
-diff -ruN src.orig/oops.h src/oops.h
---- src.orig/oops.h	2012-01-11 18:04:20.752662579 +0400
-+++ src/oops.h	2012-01-11 18:05:59.183668229 +0400
-@@ -224,6 +224,7 @@
- #define	METH_OPTIONS            15
- #define	METH_PURGE_SITE         16
- #define METH_PURGE_SITE_R       17
-+#define METH_REPORT             18
- 
- #define	AND_PUT		            1
- #define	AND_USE		            2
-diff -ruN src.orig/run_client.c src/run_client.c
---- src.orig/run_client.c	2012-01-11 18:04:20.816667134 +0400
-+++ src/run_client.c	2012-01-11 18:08:03.998664367 +0400
-@@ -1201,6 +1201,8 @@
-         rq->meth = METH_PURGE_SITE_R;
-     else if (!strcasecmp(src, "OPTIONS"))
-         rq->meth = METH_OPTIONS;
-+    else if (!strcasecmp(src, "REPORT"))
-+        rq->meth = METH_REPORT;
-     else {
-         my_xlog(OOPS_LOG_SEVERE, "parse_http_request(): Unrecognized method `%s'.\n", src);
-         *p = ' ';
diff --git a/www/oops/files/patch-src_modules_netflow.c b/www/oops/files/patch-src_modules_netflow.c
deleted file mode 100644
index 8ccfec31e4dc..000000000000
--- a/www/oops/files/patch-src_modules_netflow.c
+++ /dev/null
@@ -1,38 +0,0 @@
--- src/modules/netflow.c.orig	2012-02-02 19:12:00.000000000 +0400
-+++ src/modules/netflow.c	2012-02-02 19:13:28.000000000 +0400
-@@ -165,22 +165,22 @@
- char            buf[1024];
- route_entry_t  *rt, *rt_ptr;
- 
--    if ( 0 == file_name[0] ) return;
-+    if ( 0 == file_name[0] ) return(0);
-     rc = stat(file_name, &sb);
-     if ( rc < 0 ) {
-         my_xlog(OOPS_LOG_NOTICE|OOPS_LOG_DBG|OOPS_LOG_INFORM, "netflow: can't stat(`%s'): %s\n", file_name, strerror(errno));
--        return;
-+        return(0);
-     }
-     if ( sb.st_mtime <= file_mtime ) {
-         my_xlog(OOPS_LOG_DBG, "netflow: %s already seen\n", file_name);
--        return;
-+        return(0);
-     }
-     /* reload */
-     my_xlog(OOPS_LOG_NOTICE|OOPS_LOG_DBG, "netflow: reload from `%s'\n", file_name);
-     file = fopen(file_name, "r");
-     if ( file == NULL ) {
-         my_xlog(OOPS_LOG_SEVERE, "netflow: can't fopen(`%s'): %s\n", file_name, strerror(errno));
--        return;
-+        return(0);
-     }
-     NF_WRLOCK_CL;
-     /* allocate tables once and forever to avoid memory fragmentation */
-@@ -191,7 +191,7 @@
-     if ( NULL == rt_ptr ) {
-         fclose(file);
-         NF_UNLOCK_CL;
--        return;
-+        return(0);
-     }
-     while(fgets(buf, sizeof(buf) - 1, file) && (new_rt_entries < MAXRTTABLESZ)) {
-         char        *p = buf, *d;
diff --git a/www/oops/files/patch-src_modules_transparent.c b/www/oops/files/patch-src_modules_transparent.c
deleted file mode 100644
index 3b6e23e1ef42..000000000000
--- a/www/oops/files/patch-src_modules_transparent.c
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- src/modules/transparent.c.orig
-+++ src/modules/transparent.c
-@@ -214,7 +214,7 @@
- 	natLookup.nl_outip = rq->client_sa.sin_addr;
- 	natLookup.nl_flags = IPN_TCP;
- 	if (natfd < 0) {
--	    natfd = open(IPL_NAT, O_RDONLY, 0);
-+	    natfd = open(IPNAT_NAME, O_RDONLY, 0);
- 	    if (natfd < 0) {
- 		my_xlog(OOPS_LOG_HTTP|OOPS_LOG_DBG|OOPS_LOG_SEVERE, "transparent/redir(): NAT open failed: %m\n");
- 		goto notdone;
-@@ -270,7 +270,7 @@
- 	natLookup.nl_outip = rq->client_sa.sin_addr;
- 	natLookup.nl_flags = IPN_TCP;
- 	if (natfd < 0) {
--	    natfd = open(IPL_NAT, O_RDONLY, 0);
-+	    natfd = open(IPNAT_NAME, O_RDONLY, 0);
- 	    if (natfd < 0) {
- 		my_xlog(OOPS_LOG_HTTP|OOPS_LOG_DBG|OOPS_LOG_SEVERE, "transparent/redir(): NAT open failed: %m\n");
- 		goto notdone;
diff --git a/www/oops/files/patch-src_oops.cfg.in b/www/oops/files/patch-src_oops.cfg.in
deleted file mode 100644
index c128195689b8..000000000000
--- a/www/oops/files/patch-src_oops.cfg.in
+++ /dev/null
@@ -1,114 +0,0 @@
-
-$FreeBSD$
-
---- src/oops.cfg.in.orig
-+++ src/oops.cfg.in
-@@ -8,8 +8,7 @@
- #  nameservers. Use your own, not our.
- ## 
- 
--nameserver 195.114.128.50
--nameserver 193.219.193.130
-+nameserver 127.0.0.1
- 
- ##
- #  Ports and address to use for HTTP and ICP
-@@ -38,14 +37,14 @@
- #  When used in form 'filename [{N S}] [[un]buffered]'
- #  will be rotated automatically (up to N files up to S bytes in size)
- ##
--logfile		/dev/tty
--#logfile	@OOPS_HOME@/logs/oops.log { 3 1m } unbuffered
-+#logfile		/dev/tty
-+logfile	/var/log/oops/oops.log { 3 1m } unbuffered
- 
- ##
- #  Accesslog - the same as for squid. Re rotating - see note for logfile
- ##
--accesslog	/dev/tty
--#accesslog	@OOPS_HOME@/logs/access.log
-+#accesslog	/dev/tty
-+accesslog	/var/log/oops/access.log { 3 1m } unbuffered
- 
- ##
- #  Pidfile. for kill -1 `cat oops.pid` and for locking.
-@@ -325,16 +324,15 @@
- ##
- #  Never use "parent" when connecting to server in these domains
- ##
--local-domain	odessa.ua od.ua
--local-domain	odessa.net paco.net netsy.net netsy.com te.net.ua
-+#local-domain	myowndomain.tld
- 
--local-networks	195.114.128/19 10/8 192.168/16
-+local-networks	10/8 192.168/16
- 
- #
- # Groups
- #
- 
--group	paco	{
-+group	mynet	{
- ##
- #	You can describe group ip adresses here, or using src_ip acl's
- #	with networks_acl directive.
-@@ -344,7 +342,7 @@
- #       networks are ordered by masklen - longest masks(most specific networks)
- #	are checked first.
- ##
--	networks	195.114.128/19 127/8 195.5.40.93/32 ;
-+	networks	192.168/16 127/8 ;
- #	networks_acl	LOCAL_NETWORKS !BAD_NETWORKS ;
- 	badports	[0:79],110,138,139,513,[6000:6010] ;
- 	miss		allow;
-@@ -697,15 +695,15 @@
- #	format	"%h->%A %l %u [%t] \"%r\" %s %b \"%{User-Agent}i\""
- #}
- 
--module	berkeley_db {
-+#module	berkeley_db {
-     ##
-     #  dbhome - directory where all DB indexes reside. Use full path
-     #	    this directory must exist.
-     #  dbname - filename for index file. Use just filename (no full path)
-     ##
- 
--	dbhome	@OOPS_HOME@/DB
--	dbname	dburl
-+	#dbhome	@OOPS_HOME@/DB
-+	#dbname	dburl
- 
-     ##
-     #  This parameter specifies internal cache size of BerkeleyDB.
-@@ -719,9 +717,9 @@
-     ##
-     #db_cache_mem	4m
- 
--}
-+#}
- 
--#module	gigabase_db {
-+module	gigabase_db {
- #    This module enable GigaBASE as database engine.
- #    You can use berkeley_db or gigabase_db, not both.
- #    Also, important notice - indexes created with different modules
-@@ -732,8 +730,8 @@
- #    #  dbname - filename for index file. Use just filename (no full path)
- #    ##
- #
--#	dbhome	@OOPS_HOME@/DB
--#	dbname	gdburl
-+	dbhome	@OOPS_HOME@/DB
-+	dbname	gdburl
- #
- #    ##
- #    #  This parameter specifies internal cache size of BerkeleyDB.
-@@ -747,7 +745,7 @@
- #    ##
- #    #db_cache_mem	4m
- #
--#}
-+}
- 
- #module wccp2 {
- # Cache identity.
diff --git a/www/oops/files/patch-x64 b/www/oops/files/patch-x64
deleted file mode 100644
index dac6c0845d08..000000000000
--- a/www/oops/files/patch-x64
+++ /dev/null
@@ -1,222 +0,0 @@
-diff -ruN src.orig/hash.c src/hash.c
---- src.orig/hash.c	2011-12-15 19:50:59.084410154 +0400
-+++ src/hash.c	2011-12-15 19:27:15.384413000 +0400
-@@ -1,4 +1,5 @@
- #include    <stdio.h>
-+#include    <string.h>
- #include    <strings.h>
- #include    "hash.h"
- 
-@@ -37,7 +38,7 @@
- int
- hash_put(hash_t *hash, void *key, void *data, hash_entry_t **res)
- {
--unsigned int     index = 0;
-+uintptr_t        index = 0;
- hash_entry_t    *he = NULL;
- hash_row_t      *row = NULL;
- int             rc = 0;
-@@ -48,7 +49,7 @@
-     if ( hash->valid != HASH_VALID ) return(EINVAL);
-     switch(hash->type) {
-     case HASH_KEY_INT:
--        index = (unsigned int)key % hash->rows;
-+        index = (uintptr_t)key % hash->rows;
-         break;
-     case HASH_KEY_STRING:
-         index = string_hash((char*)key) % hash->rows;
-@@ -65,7 +66,7 @@
-     while ( he ) {
-         switch(hash->type) {
-         case(HASH_KEY_INT):
--            if ( (int)he->key == (int)key ) {
-+            if ( he->key == key ) {
-                 rc = EEXIST;
-                 goto done;
-             }
-@@ -122,7 +123,7 @@
- int
- hash_get(hash_t *hash, void *key, hash_entry_t **he_res)
- {
--unsigned int    index = 0;
-+uintptr_t    index = 0;
- hash_entry_t    *he = NULL;
- hash_row_t      *row = NULL;
- int             rc = 0;
-@@ -134,7 +135,7 @@
-     if ( hash->valid != HASH_VALID ) return(EINVAL);
-     switch(hash->type) {
-     case HASH_KEY_INT:
--        index = (unsigned int)key % hash->rows;
-+        index = (uintptr_t)key % hash->rows;
-         break;
-     case HASH_KEY_STRING:
-         index = string_hash((char*)key) % hash->rows;
-@@ -155,7 +156,7 @@
-         }
-         switch(hash->type) {
-         case(HASH_KEY_INT):
--            if ( (int)he->key == (int)key ) {
-+            if ( he->key == key ) {
-                 he->ref_count++;
-                 *he_res = he;
-                 goto done;
-diff -ruN src.orig/icp.c src/icp.c
---- src.orig/icp.c	2011-12-15 19:50:59.097408824 +0400
-+++ src/icp.c	2011-12-15 19:23:18.626418000 +0400
-@@ -36,7 +36,7 @@
- 		int	version:8;
- 		short	msg_len;
- 	} w0;
--	int	rq_n;
-+	uintptr_t	rq_n;
- 	int	opt;
- 	int	opt_data;
- 	int	sender;
-@@ -45,15 +45,15 @@
- struct	icp_lookup {
- 	struct sockaddr_in	sa;
- 	char			type;
--	int			rq_n;
-+	uintptr_t			rq_n;
- };
- 
- static	struct	peer	*peer_by_addr(struct sockaddr_in*);
- static	int     	process_hit(struct icp_lookup *icp_lookup, struct icp_queue_elem *qe);
- static	void		process_icp_msg(int so, char *buf, int len, struct sockaddr_in *, struct sockaddr_in *);
- static	int     	process_miss(struct icp_lookup *icp_lookup, struct icp_queue_elem *qe);
--static	void		send_icp_op(int so, struct sockaddr_in *sa, int op, int rq_n, char *urlp);
--static	void		send_icp_op_err(int so, struct sockaddr_in *sa, int rq_n);
-+static	void		send_icp_op(int so, struct sockaddr_in *sa, int op, uintptr_t rq_n, char *urlp);
-+static	void		send_icp_op_err(int so, struct sockaddr_in *sa, uintptr_t rq_n);
- 
- 
- #define	icp_opcode	icp_hdr->w0.opcode
-@@ -473,7 +473,7 @@
- }
- 
- static void
--send_icp_op_err(int so, struct sockaddr_in *sa, int rq_n)
-+send_icp_op_err(int so, struct sockaddr_in *sa, uintptr_t rq_n)
- {
- char	buf[5*4];
- int	len = sizeof(buf);
-@@ -488,7 +488,7 @@
- }
- 
- static void
--send_icp_op(int so, struct sockaddr_in *sa, int op, int rq_n, char *urlp)
-+send_icp_op(int so, struct sockaddr_in *sa, int op, uintptr_t rq_n, char *urlp)
- {
- char	*buf;
- int	len = strlen(urlp)+1 + sizeof(struct icp_hdr);
-@@ -545,7 +545,7 @@
- static int
- process_miss(struct icp_lookup *icp_lookup, struct icp_queue_elem *qe)
- {
--int				rq_n;
-+uintptr_t				rq_n;
- 
-     if ( !qe || !icp_lookup ) return(0);
-     rq_n = icp_lookup->rq_n;
-@@ -578,7 +578,7 @@
- static int
- process_hit(struct icp_lookup *icp_lookup, struct icp_queue_elem *qe)
- {
--int				rq_n;
-+uintptr_t				rq_n;
- 
-     if ( !qe || !icp_lookup ) return(0);
-     rq_n = icp_lookup->rq_n;
-diff -ruN src.orig/oops.h src/oops.h
---- src.orig/oops.h	2011-12-15 19:50:59.092410511 +0400
-+++ src/oops.h	2011-12-15 19:32:49.781410000 +0400
-@@ -839,8 +839,8 @@
- 	struct	acls		*http;
- 	struct	acls		*icp;
- 	struct	badports	*badports;
--	int			bandwidth;
--	int			miss_deny;		/* TRUE if deny		*/
-+	uintptr_t			bandwidth;
-+	uintptr_t			miss_deny;		/* TRUE if deny		*/
- 	struct	l_string_list	*auth_mods;		/* auth modules		*/
- 	l_mod_call_list_t	*redir_mods;		/* redir modules	*/
- 	pthread_mutex_t		group_mutex;
-@@ -852,10 +852,10 @@
- 	struct	denytime	*denytimes;
- 	hash_t			*dstdomain_cache;	/* cashe for dstdom checks */
- 	acl_chk_list_hdr_t	*networks_acl;
--	int			maxreqrate;		/* max request rate	*/
--	int			per_sess_bw;		/* max bandw per session */
--	int			per_ip_bw;		/* bandw per ip address (or client) */
--	int			per_ip_conn;		/* max number of conns per ip	*/
-+	uintptr_t			maxreqrate;		/* max request rate	*/
-+	uintptr_t			per_sess_bw;		/* max bandw per session */
-+	uintptr_t			per_ip_bw;		/* bandw per ip address (or client) */
-+	uintptr_t			per_ip_conn;		/* max number of conns per ip	*/
- 	struct	sockaddr_in	conn_from_sa;		/* connect from address	*/
- };
- 
-@@ -922,7 +922,7 @@
- 	/* url in icp format			*/
- 	char			*url;
- 	/* request number - id of request	*/
--	int			rq_n;
-+	uintptr_t			rq_n;
- 	/* how much peers was sent request to	*
- 	 * (we will wait that many answers)	*/
- 	int			requests_sent;
-@@ -1014,7 +1014,7 @@
- #define	IS_HUPED(a)	(((a)->answer)&FD_POLL_HU)
- 
- struct	pollarg {
--	int	fd;
-+	uintptr_t	fd;
- 	short	request;
- 	short	answer;
- };
-diff -ruN src.orig/parser.y src/parser.y
---- src.orig/parser.y	2011-12-15 19:50:59.089409966 +0400
-+++ src/parser.y	2011-12-15 19:45:36.266416000 +0400
-@@ -69,7 +69,7 @@
- %}
- 
- %union	{
--	int				INT;
-+	uintptr_t				INT;
- 	char				*STRPTR;
- 	char				CHAR;
- 	struct	cidr_net		*NETPTR;
-@@ -907,26 +907,26 @@
- 					new_grp->badports = ops->val;
- 					break;
- 				case OP_BANDWIDTH:
--					new_grp->bandwidth = (int)ops->val;
-+					new_grp->bandwidth = (uintptr_t)ops->val;
- 					break;
- 				case OP_PER_SESS_BW:
--					new_grp->per_sess_bw = (int)ops->val;
-+					new_grp->per_sess_bw = (uintptr_t)ops->val;
- 					break;
- 				case OP_PER_IP_BW:
--					new_grp->per_ip_bw = (int)ops->val;
-+					new_grp->per_ip_bw = (uintptr_t)ops->val;
- 					break;
- 				case OP_PER_IP_CONN:
--					new_grp->per_ip_conn = (int)ops->val;
-+					new_grp->per_ip_conn = (uintptr_t)ops->val;
- 					break;
- 				case OP_CONN_FROM:
- 					memcpy(&new_grp->conn_from_sa, ops->val, sizeof(new_grp->conn_from_sa));
- 					free(ops->val);
- 					break;
- 				case OP_MISS:
--					new_grp->miss_deny = (int)ops->val;
-+					new_grp->miss_deny = (uintptr_t)ops->val;
- 					break;
- 				case OP_MAXREQRATE:
--					new_grp->maxreqrate = (int)ops->val;
-+					new_grp->maxreqrate = (uintptr_t)ops->val;
- 					break;
- 				case OP_AUTH_MODS:
- 					if ( ops->val ) {
diff --git a/www/oops/files/pkg-message.in b/www/oops/files/pkg-message.in
deleted file mode 100644
index 6006c5c4ba08..000000000000
--- a/www/oops/files/pkg-message.in
+++ /dev/null
@@ -1,11 +0,0 @@
-===>  CONFIGURATION NOTE:
-	To setup oops, you should check %%PREFIX%%/etc/oops/oops.cfg
-	(a copy of %%PREFIX%%/etc/oops/oops.cfg.sample) as well as
-	other files in %%PREFIX%%/etc/oops before running oops.
-
-	If you use storages, do not forget to format them before
-	the first use (oops -z -c %%PREFIX%%/etc/oops/oops.cfg).
-===>  BE CAREFULL HOW TO BOOT on 1.5.24 and above:
-	To run oops server from startup, add oops_enable="YES"
-	in your /etc/rc.conf.
-
diff --git a/www/oops/pkg-descr b/www/oops/pkg-descr
deleted file mode 100644
index 5700282b2273..000000000000
--- a/www/oops/pkg-descr
+++ /dev/null
@@ -1,22 +0,0 @@
-Oops - caching proxy server.
-Oops! is a proxy server; the main aims of its development being
-stable operation, service speed, main protocols support,
-modularity, ease at use. What is one more server for when there is
-already Squid? I personally was not satisfied with Squid on some
-points, that is was why I wished to get rid of it. And that was done.
-
-Basic differences from Squid: 
-Each request is served by a separate thread, which allows to use all
-available processors on multiprocessor machine. 
-Cashed documents are stored in one or several big files. This makes
-it possible to remove from the operational system a load on operation
-with directories and to speed up access to the documents, and to use
-raw-devices as a storage of cashed objects either. 
-The program modular structure provides extension of its function
-without any change of the source code. 
-The special attention was paid to the point of providing a stable,
-continuous, unbreakable work, easy and simple
-configuration/reconfiguration. Thus, for example, the reconfiguration
-on the fly doesn't result in a breakaway of already established connections.
-
-WWW: http://oops-cache.org/oops.eng/
diff --git a/www/oops/pkg-plist b/www/oops/pkg-plist
deleted file mode 100644
index 78dd191e0c83..000000000000
--- a/www/oops/pkg-plist
+++ /dev/null
@@ -1,45 +0,0 @@
-@sample %%ETCDIR%%/accel_maps.sample
-@sample %%ETCDIR%%/acl_local_networks.sample
-@sample %%ETCDIR%%/auth_template.html.sample
-@sample %%ETCDIR%%/err_template.html.sample
-@sample %%ETCDIR%%/oops.cfg.sample
-@sample %%ETCDIR%%/passwd.sample
-@sample %%ETCDIR%%/redir_rules.sample
-@sample %%ETCDIR%%/redir_template.html.sample
-@sample %%ETCDIR%%/select.sql.sample
-%%ETCDIR%%/tables/koi-alt.tab
-%%ETCDIR%%/tables/koi-iso.tab
-%%ETCDIR%%/tables/koi-win.tab
-libexec/oops/accel.so
-libexec/oops/berkeley_db_api.so
-libexec/oops/custom_log.so
-libexec/oops/err.so
-libexec/oops/fastredir.so
-libexec/oops/gigabase_db_api.so
-libexec/oops/lang.so
-libexec/oops/log_dummy.so
-libexec/oops/netflow.so
-libexec/oops/oopsctl_mod.so
-libexec/oops/pam.so
-libexec/oops/passwd_file.so
-libexec/oops/passwd_ldap.so
-libexec/oops/passwd_mysql.so
-libexec/oops/passwd_pgsql.so
-libexec/oops/redir.so
-libexec/oops/transparent.so
-libexec/oops/vary_header.so
-libexec/oops/wccp2.so
-libexec/oops/win_http.so
-sbin/oops
-sbin/oopsctl
-@dirrm libexec/oops
-@dirrm %%ETCDIR%%/tables
-@dirrmtry %%ETCDIR%%
-@dirrmtry oops/DB
-@dirrmtry oops/storages
-@dirrmtry oops
-@dirrmtry /var/log/oops
-@unexec rm -f /var/run/oops/oopsctl 2>/dev/null || true
-@unexec rm -f /var/run/oops/oops_statfile 2>/dev/null || true
-@unexec rm -f /var/run/oops/oops.pid 2>/dev/null || true
-@dirrmtry /var/run/oops