Update to 1.5.23.

8 files changed, 28 insertions, 177 deletions

diff --git a/www/oops/Makefile b/www/oops/Makefile
index 974587f1e075..33d746ece3b3 100644
--- a/www/oops/Makefile
+++ b/www/oops/Makefile
@@ -6,25 +6,20 @@
 #
 
 PORTNAME=	oops
-PORTVERSION=	${OOPSVERSION}.${OOPSDATE}
-PORTREVISION=	1
+PORTVERSION=	${OOPSVERSION}
 CATEGORIES=	www
 MASTER_SITES=	http://oops-cache.org/
 DISTNAME=	${PORTNAME}-${OOPSVERSION}
 
-PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	${PORTNAME}-${OOPSVERSION}-${OOPSDATE}.patch.gz
-PATCH_DIST_STRIP=	-d ${WRKDIR}/${DISTNAME}
-
 MAINTAINER=	osa@FreeBSD.org
 COMMENT=	A caching web proxy server
 
 BUILD_DEPENDS+=	gawk:${PORTSDIR}/lang/gawk
 
-OOPSVERSION=	1.5.22
-OOPSDATE=	20030403
+OOPSVERSION=	1.5.23
 
 USE_SUBMAKE=	yes
+USE_REINPLACE=	yes
 USE_AUTOCONF=	yes
 CONFIGURE_ARGS?=--sbindir=${PREFIX}/sbin \
 		--sysconfdir=${PREFIX}/etc/oops \
@@ -32,7 +27,8 @@ CONFIGURE_ARGS?=--sbindir=${PREFIX}/sbin \
 		--libdir=${PREFIX}/libexec/oops \
 		--enable-oops-user=oops \
 		--enable-large-files
-MAKE_ENV+=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+MAKE_ENV+=	CXX="${CXX}" \
+		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
 MAN8=		oops.8 oopsctl.8
@@ -49,6 +45,10 @@ pre-fetch:
 .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|CXX=g++||g' \
+		${WRKSRC}/configure.in
+
 pre-configure:
 	@cd ${WRKSRC} && ${AUTOHEADER}
 
diff --git a/www/oops/distinfo b/www/oops/distinfo
index 1b610a1ad7dc..d1db0461ba0f 100644
--- a/www/oops/distinfo
+++ b/www/oops/distinfo
@@ -1,2 +1 @@
-MD5 (oops-1.5.22.tar.gz) = bd6f743fb4abc6cf08ae310b1927b211
-MD5 (oops-1.5.22-20030403.patch.gz) = 7b0e8432ce7e43289bb535472ccca626
+MD5 (oops-1.5.23.tar.gz) = 9362626f71dd91d17ba50a7023634129
diff --git a/www/oops/files/patch-configure.in b/www/oops/files/patch-configure.in
deleted file mode 100644
index e055af54de9a..000000000000
--- a/www/oops/files/patch-configure.in
+++ /dev/null
@@ -1,67 +0,0 @@
---- configure.in.orig	Tue Sep 16 16:32:04 2003
-+++ configure.in	Tue Sep 16 16:34:21 2003
-@@ -37,7 +37,7 @@
- AC_ARG_WITH(zlib,--with-zlib=[[PATH]]         Which zlib library/object file to use,
-   with_zlib="$withval", with_zlib="")
- 
--AC_CHECK_HEADERS(crypt.h getopt.h pthread.h stdlib.h string.h strings.h unistd.h sys/inttypes.h)
-+AC_CHECK_HEADERS(crypt.h getopt.h pthread.h stdlib.h string.h strings.h unistd.h inttypes.h)
- AC_CHECK_HEADERS(netinet/ip_fil.h, AC_DEFINE(HAVE_IPF))
- AC_CHECK_HEADERS(netinet/ip6.h, AC_DEFINE(HAVE_IP6_H))
- 
-@@ -296,10 +296,9 @@
- 	  LIBS="-oldstyle_liblookup -lpthread $LIBS"
- 
- 	  ;;
--freebsd*) CFLAGS="$CFLAGS -pthread -D_REENTRANT -DFREEBSD -D_THREAD_SAFE -DFD_SETSIZE=2048 -I."
--	  CXX=g++
-+freebsd*) CFLAGS="$CFLAGS $PTHREAD_CFLAGS -D_REENTRANT -DFREEBSD -DFD_SETSIZE=2048 -I."
- 	  CXXSOFLAGS="-shared -Xlinker -Bstatic"
--	  LIBS="-lc_r $LEXLIB $LIBS"
-+	  LIBS="$PTHREAD_LIBS $LEXLIB $LIBS"
- 	  if test "$large_files" = "yes" ; then
- 		## FreeBSD need no any special flags for 64bit files
- 		CFLAGS="$CFLAGS -DWITH_LARGE_FILES"
-@@ -375,10 +374,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
-@@ -427,6 +426,9 @@
-     cp -f lib/rwlock/rwlock.h ./; 
-     cd ..
-     ;;
-+freebsd*)
-+    echo "Already have pthread_rwlock_init() support in our libc_r";
-+    ;;
- *)
-     AC_CHECK_FUNC(pthread_rwlock_init,AC_DEFINE(HAVE_PTHREAD_RWLOCK_INIT),EXTRASRC="$EXTRASRC rwlock.c" ; cd src; cp -f lib/rwlock/rwlock.c ./; cp -f lib/rwlock/rwlock.h ./; cd ..)
-     ;;
-@@ -464,6 +466,9 @@
-     LIBDB_PATH="$pwd"
- elif test -r "/usr/local/lib/libdb.a"; then
-     LIBDB_PATH="/usr/local"
-+elif test -r "/usr/local/lib/libdb4.a"; then
-+    LIBDB_PATH="/usr/local"
-+    LIBDB_NAME=-ldb4
- elif test -r "/usr/lib/libdb2.a"; then                                         
-     LIBDB_PATH="/usr"                                                          
-     LIBDB_NAME=-ldb2                                                           
-@@ -574,7 +579,7 @@
-     AC_DEFINE(HAVE_ZLIB)
-     AC_MSG_RESULT(/usr/local/lib/libz.a)
-     if test "X`echo $CFLAGS | grep '\-I/usr/local/include'`" = "X"; then
--	CFLAGS="$CFLAGS -I/usr/local/include"
-+	CFLAGS="$CFLAGS"
-     fi
- elif test -r "/usr/lib/libz.a"; then
-     LIBZ_NAME="/usr/lib/libz.a"
diff --git a/www/oops/files/patch-src::Makefile.in b/www/oops/files/patch-src::Makefile.in
index 303f238c344d..62a61006f25f 100644
--- a/www/oops/files/patch-src::Makefile.in
+++ b/www/oops/files/patch-src::Makefile.in
@@ -1,23 +1,5 @@
---- src/Makefile.in.orig	Tue Aug 19 15:56:34 2003
-+++ src/Makefile.in	Tue Aug 19 15:58:11 2003
-@@ -29,7 +29,7 @@
- 
- #CFLAGS = -Wall -ggdb -D_REENTRANT -D_POSIX_PTHREADS_SEMANTICS
- 
--CFLAGS = @CFLAGS@ @DEFS@
-+CFLAGS = @CFLAGS@ @DEFS@ ${PTHREAD_CFLAGS}
- 
- VER=@VER@
- OOPSPATH=@prefix@/oops
-@@ -45,7 +45,7 @@
- 	cd modules; $(MAKE)
- 
- oops:	${OBJS}
--	${CC} ${CFLAGS} ${OBJS} ${EXTLDFLAGS} ${LDFLAGS} ${LIBGB_PATH} ${LIBGB_NAME} ${OOPS_LIBS} ${LIBZ_NAME} ${OOPS_RPATH} -o oops
-+	${CXX} ${CFLAGS} ${OBJS} ${EXTLDFLAGS} ${LDFLAGS} ${LIBGB_PATH} ${LIBGB_NAME} ${OOPS_LIBS} ${PTHREAD_LIBS} ${LIBZ_NAME} ${OOPS_RPATH} -o oops
- 
- mkinstalldirs:
- 	../mkinstalldirs ${OOPSPATH} \
+--- src/Makefile.in.orig	Wed Oct 22 17:48:56 2003
++++ src/Makefile.in	Wed Oct 22 17:51:00 2003
 @@ -62,51 +62,15 @@
  
  install: all mkinstalldirs
@@ -67,15 +49,15 @@
 -	   else\
 -		$(INSTALL_DATA) acl_local_networks ${OOPS_SYSCONFDIR}/acl_local_networks ;\
 -	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) 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) select.sql ${OOPS_SYSCONFDIR}/select.sql.sample
-+	$(INSTALL_DATA) acl_local_networks ${OOPS_SYSCONFDIR}/acl_local_networks.sample
++		$(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) 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) select.sql ${OOPS_SYSCONFDIR}/select.sql.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-src::environment.h b/www/oops/files/patch-src::environment.h
deleted file mode 100644
index ce28186849c6..000000000000
--- a/www/oops/files/patch-src::environment.h
+++ /dev/null
@@ -1,39 +0,0 @@
---- src/environment.h.orig	Wed Dec 12 18:49:39 2001
-+++ src/environment.h	Fri Mar 21 19:15:34 2003
-@@ -52,11 +52,13 @@
- #if	defined(HAVE_CRYPT_H)
- #include	<crypt.h>
- #endif
-+/*
- #if	defined(HAVE_GETOPT_H)
- #include	<getopt.h>
- #elif	!defined(HAVE_GETOPT)
- #include	"getopt.h"
- #endif
-+*/
- 
- #if	defined(HAVE_ZLIB)
-   #include	<zlib.h>
-@@ -67,7 +69,7 @@
- #include	<thread.h>
- #endif
- #include	<pthread.h>
--#if	!defined(HAVE_PTHREAD_RWLOCK_INIT)
-+#if	!defined(HAVE_PTHREAD_RWLOCK_INIT) && !defined(FREEBSD)
- #include	"rwlock.h"
- #endif
- 
-@@ -119,11 +121,11 @@
- #include	<sys/stat.h>
- #endif
- 
--#if defined(HAVE_SYS_INTTYPES_H)
-+#if defined(HAVE_INTTYPES_H)
- #include    <inttypes.h>
- #endif
- 
--#if !defined(HAVE_SYS_INTTYPES_H) && !defined(_STDINT_H)
-+#if !defined(HAVE_INTTYPES_H) && !defined(_STDINT_H)
- typedef unsigned int    uintptr_t;
- #endif
- 
diff --git a/www/oops/files/patch-src::modules::Makefile.in b/www/oops/files/patch-src::modules::Makefile.in
deleted file mode 100644
index 9ac5487ce1c6..000000000000
--- a/www/oops/files/patch-src::modules::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/modules/Makefile.in.orig	Tue Aug 19 16:36:50 2003
-+++ src/modules/Makefile.in	Tue Aug 19 16:37:09 2003
-@@ -1,7 +1,7 @@
- CC = @CC@
- CXX = @CXX@
- LIBS = @LIBS@
--CFLAGS = @CFLAGS@ @DEFS@
-+CFLAGS = @CFLAGS@ @DEFS@ ${PTHREAD_CFLAGS}
- LDFLAGS = @LDFLAGS@
- LD = @LD@
- SOFLAGS = @SOFLAGS@
diff --git a/www/oops/files/patch-src::modules::berkeley_db_api.c b/www/oops/files/patch-src::modules::berkeley_db_api.c
deleted file mode 100644
index 1052ac4917c5..000000000000
--- a/www/oops/files/patch-src::modules::berkeley_db_api.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/modules/berkeley_db_api.c.orig	Tue Oct 15 04:22:09 2002
-+++ src/modules/berkeley_db_api.c	Tue Oct 15 04:22:14 2002
-@@ -37,7 +37,10 @@
- #endif
- 
- #if	defined(HAVE_BERKELEYDB)
--#include	<db.h>
-+#include	<db4/db.h>
-+/* 
-+It should be a tuneable, but since configure accept only db4 it is not a big trouble anyway
-+*/
- 
- #if	defined(MODULES)
- int		mod_run(void);
diff --git a/www/oops/pkg-plist b/www/oops/pkg-plist
index 8d61dc387dc4..091f8313e7ec 100644
--- a/www/oops/pkg-plist
+++ b/www/oops/pkg-plist
@@ -1,13 +1,11 @@
-sbin/oopsctl
-sbin/oops
-etc/oops/oops.cfg.sample
-etc/oops/err_template.html.sample
+etc/oops/accel_maps.sample
+etc/oops/acl_local_networks.sample
 etc/oops/auth_template.html.sample
+etc/oops/err_template.html.sample
+etc/oops/oops.cfg.sample
 etc/oops/passwd.sample
 etc/oops/redir_rules.sample
 etc/oops/redir_template.html.sample
-etc/oops/accel_maps.sample
-etc/oops/acl_local_networks.sample
 etc/oops/select.sql.sample
 etc/oops/tables/koi-alt.tab
 etc/oops/tables/koi-iso.tab
@@ -21,6 +19,7 @@ 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
@@ -30,6 +29,8 @@ libexec/oops/redir.so
 libexec/oops/transparent.so
 libexec/oops/vary_header.so
 libexec/oops/wccp2.so
+sbin/oopsctl
+sbin/oops
 @dirrm libexec/oops
 @dirrm etc/oops/tables
 @dirrm etc/oops