5 files changed, 14 insertions, 70 deletions

diff --git a/www/oops/Makefile b/www/oops/Makefile
index 9cd794279a5b..218ac81c395c 100644
--- a/www/oops/Makefile
+++ b/www/oops/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	oops
-PORTVERSION=	1.5.6
+PORTVERSION=	1.5.17
 CATEGORIES=	www
 MASTER_SITES=	http://zipper.paco.net/~igor/oops/
 
@@ -19,7 +19,8 @@ CONFIGURE_ARGS=	--sbindir=${PREFIX}/sbin \
 		--sysconfdir=${PREFIX}/etc/oops \
 		--localstatedir=/var/run \
 		--libdir=${PREFIX}/libexec/oops \
-		--enable-oops-user=oops
+		--enable-oops-user=oops \
+		--without-DB
 
 MAN8=		oops.8 oopsctl.8
 
diff --git a/www/oops/distinfo b/www/oops/distinfo
index ae5331560bda..d86e6a478458 100644
--- a/www/oops/distinfo
+++ b/www/oops/distinfo
@@ -1 +1 @@
-MD5 (oops-1.5.6.tar.gz) = f45fac49062e20df65ff16ae5f45257e
+MD5 (oops-1.5.17.tar.gz) = 44713057354b06be2c5574877ef0fbc5
diff --git a/www/oops/files/patch-aa b/www/oops/files/patch-aa
index 33eb92201f71..08dd2cc580bf 100644
--- a/www/oops/files/patch-aa
+++ b/www/oops/files/patch-aa
@@ -1,5 +1,5 @@
---- src/Makefile.in.orig	Mon Nov 13 13:24:03 2000
-+++ src/Makefile.in	Wed Dec 13 20:31:44 2000
+--- src/Makefile.in.orig	Mon Mar 19 00:32:47 2001
++++ src/Makefile.in	Mon Mar 19 00:36:54 2001
 @@ -44,7 +44,7 @@
  			 ${OOPSPATH}/DB \
  			 ${OOPSPATH}/storages \
@@ -8,14 +8,8 @@
 +			 ${OOPS_LIBDIR}
  
  	if [ "X@OOPS_USER@" != "X" ]; then\
- 		${CHOWN} @OOPS_USER@ ${OOPSPATH};\
-@@ -52,56 +52,21 @@
- 		${CHOWN} @OOPS_USER@ ${OOPSPATH}/DB;\
- 		${CHOWN} @OOPS_USER@ ${OOPSPATH}/storages;\
- 		${CHOWN} @OOPS_USER@ ${OOPS_SYSCONFDIR}/tables;\
--		${CHOWN} @OOPS_USER@ ${OOPS_LIBDIR}/modules;\
-+		${CHOWN} @OOPS_USER@ ${OOPS_LIBDIR};\
- 	fi
+ 		${CHOWN} @OOPS_USER@ ${OOPSPATH}/logs;\
+@@ -53,51 +53,15 @@
  
  install: all mkinstalldirs
  	$(INSTALL) oops ${OOPS_SBINDIR}
@@ -66,14 +60,13 @@
 -	fi
 +	$(INSTALL_DATA) oops.cfg ${OOPS_SYSCONFDIR}/oops.cfg.sample
 +	$(INSTALL_DATA) err_template.html ${OOPS_SYSCONFDIR}/err_template.html.sample
-+	$(INSTALL_DATA) auth_template.html ${OOPS_SYSCONFDIR}/auth_template.html.sample 
 +	$(INSTALL_DATA) auth_template.html ${OOPS_SYSCONFDIR}/auth_template.html.sample
-+	$(INSTALL_DATA) passwd ${OOPS_SYSCONFDIR}/passwd.sample 
-+	$(INSTALL_DATA) redir_rules ${OOPS_SYSCONFDIR}/redir_rules.sample 
++	$(INSTALL_DATA) passwd ${OOPS_SYSCONFDIR}/passwd.sample
++	$(INSTALL_DATA) redir_rules ${OOPS_SYSCONFDIR}/redir_rules.sample
 +	$(INSTALL_DATA) redir_template.html ${OOPS_SYSCONFDIR}/redir_template.html.sample
-+	$(INSTALL_DATA) accel_maps ${OOPS_SYSCONFDIR}/accel_maps.sample 
++	$(INSTALL_DATA) accel_maps ${OOPS_SYSCONFDIR}/accel_maps.sample
 +	$(INSTALL_DATA) select.sql ${OOPS_SYSCONFDIR}/select.sql.sample
-+	$(INSTALL_DATA) acl_local_networks ${OOPS_SYSCONFDIR}/acl_local_networks.sample 
++	$(INSTALL_DATA) acl_local_networks ${OOPS_SYSCONFDIR}/acl_local_networks.sample
  	if test "X@SOFLAGS@" != "X"; then \
  	for m in modules/*so ; do \
  		$(INSTALL) $$m ${OOPS_LIBDIR} ; \
diff --git a/www/oops/files/patch-ad b/www/oops/files/patch-ad
deleted file mode 100644
index fc4b10b3cde7..000000000000
--- a/www/oops/files/patch-ad
+++ /dev/null
@@ -1,52 +0,0 @@
---- configure.orig	Wed Dec 13 20:02:46 2000
-+++ configure	Wed Dec 13 20:03:33 2000
-@@ -1476,49 +1476,11 @@
-   echo "$ac_t""no" 1>&6
- fi
- 
--
- pwd=`pwd`
- LIBDB_NAME=-ldb
- echo $ac_n "checking for libdb.a""... $ac_c" 1>&6
- echo "configure:1484: checking for libdb.a" >&5
--if test "X$LIBDB_PATH" != "X" ; then
--    LIBDB_PATH=$LIBDB_PATH
--elif test -r "/usr/local/BerkeleyDB/lib/libdb.a"; then
--    LIBDB_PATH="/usr/local/BerkeleyDB"
--elif test -r "/usr/local/BerkeleyDB.3.1/lib/libdb.a"; then
--    LIBDB_PATH="/usr/local/BerkeleyDB.3.1"
--elif test -r "/usr/local/BerkeleyDB.3.0/lib/libdb.lib"; then
--    LIBDB_PATH="/usr/local/BerkeleyDB.3.0"
--elif test -r "$pwd/libdb.a"; then
--    LIBDB_PATH="$pwd"
--elif test -r "/usr/local/lib/libdb.a"; then
--    LIBDB_PATH="/usr/local"
--elif test -r "/usr/lib/libdb2.a"; then                                         
--    LIBDB_PATH="/usr"                                                          
--    LIBDB_NAME=-ldb2                                                           
--elif test -r "/usr/lib/libdb.a"; then
--    LIBDB_PATH="/usr"
--elif test -r "/usr/local/lib/libdb2.a"; then
--    LIBDB_PATH="/usr/local"
--    LIBDB_NAME=-ldb2
--elif test -r "/usr/local/BerkeleyDB/lib/libdb.lib"; then
--    LIBDB_PATH="/usr/local/BerkeleyDB"
--    LIBDB_NAME=-llibdb
--elif test -r "$pwd/libdb.lib"; then
--    LIBDB_PATH="$pwd"
--    LIBDB_NAME=-llibdb
--elif test -r "/usr/local/lib/libdb.lib"; then
--    LIBDB_PATH="/usr/local"
--    LIBDB_NAME=-llibdb
--elif test -r "/usr/lib/libdb.lib"; then
--    LIBDB_PATH="/usr"
--    LIBDB_NAME=-llibdb
--elif test -r "/usr/local/lib/libdb2.lib"; then
--    LIBDB_PATH="/usr/local"
--    LIBDB_NAME=-llibdb2
--else
--    LIBDB_PATH="no"
--fi
-+LIBDB_PATH="no"
- 
- echo "$ac_t""$LIBDB_PATH" 1>&6
diff --git a/www/oops/pkg-plist b/www/oops/pkg-plist
index edc912c970e9..84da25589f5c 100644
--- a/www/oops/pkg-plist
+++ b/www/oops/pkg-plist
@@ -22,12 +22,14 @@ libexec/oops/gigabase_db_api.so
 libexec/oops/lang.so
 libexec/oops/log_dummy.so
 libexec/oops/oopsctl_mod.so
+libexec/oops/pam.so
 libexec/oops/passwd_file.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
 @dirrm libexec/oops
 @dirrm etc/oops/tables
 @dirrm etc/oops