summaryrefslogtreecommitdiff
path: root/www/oops
diff options
context:
space:
mode:
authorMax Khon <fjoe@FreeBSD.org>2003-03-24 15:13:35 +0000
committerMax Khon <fjoe@FreeBSD.org>2003-03-24 15:13:35 +0000
commit775f41988abb6b9a3d7bf339f7fffdd98f86969d (patch)
tree745f4295a38383f143c093cca386132b551e4a90 /www/oops
parent- detached from licq distribution (diff)
- Update to 1.5.22-20030321
- Assign maintainership to Sergey Osokin PR: 50187
Notes
Notes: svn path=/head/; revision=77393
Diffstat (limited to 'www/oops')
-rw-r--r--www/oops/Makefile8
-rw-r--r--www/oops/distinfo2
-rw-r--r--www/oops/files/patch-configure.in37
-rw-r--r--www/oops/files/patch-src::Makefile.in15
-rw-r--r--www/oops/files/patch-src::environment.h25
5 files changed, 58 insertions, 29 deletions
diff --git a/www/oops/Makefile b/www/oops/Makefile
index 7fe7ddca878d..7b9987026940 100644
--- a/www/oops/Makefile
+++ b/www/oops/Makefile
@@ -1,6 +1,6 @@
# New ports collection makefile for: oops
# Date created: 15 August 2000
-# Whom: Sergey Osokin aka oZZ <ports@FreeBSD.org>
+# Whom: Sergey Osokin aka oZZ <osa@FreeBSD.org.ru>
#
# $FreeBSD$
#
@@ -12,16 +12,16 @@ MASTER_SITES= http://oops-cache.org/
DISTNAME= ${PORTNAME}-${OOPSVERSION}
PATCH_SITES= ${MASTER_SITES}
-PATCHFILES= ${PORTNAME}-${OOPSVERSION}-${OOPSDATE}.patch
+PATCHFILES= ${PORTNAME}-${OOPSVERSION}-${OOPSDATE}.patch.gz
PATCH_DIST_STRIP= -d ${WRKDIR}/${DISTNAME}
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= osa@FreeBSD.org.ru
COMMENT= A caching web proxy server
BUILD_DEPENDS+= gawk:${PORTSDIR}/lang/gawk
OOPSVERSION= 1.5.22
-OOPSDATE= 20021204
+OOPSDATE= 20030321
USE_SUBMAKE= yes
USE_AUTOCONF= yes
diff --git a/www/oops/distinfo b/www/oops/distinfo
index d88f358d468f..d9d7e6509e4b 100644
--- a/www/oops/distinfo
+++ b/www/oops/distinfo
@@ -1,2 +1,2 @@
MD5 (oops-1.5.22.tar.gz) = bd6f743fb4abc6cf08ae310b1927b211
-MD5 (oops-1.5.22-20021204.patch) = ed992b95213a674794e2675f5e2fb179
+MD5 (oops-1.5.22-20030321.patch.gz) = 8b1557c61235fdb807adc59663e244bc
diff --git a/www/oops/files/patch-configure.in b/www/oops/files/patch-configure.in
index 0170d7974b64..d78dcdab0f96 100644
--- a/www/oops/files/patch-configure.in
+++ b/www/oops/files/patch-configure.in
@@ -1,6 +1,6 @@
---- configure.in.orig Wed Dec 19 15:18:40 2001
-+++ configure.in Sat Oct 5 18:27:46 2002
-@@ -49,7 +49,7 @@
+--- configure.in.orig Fri Mar 21 18:46:36 2003
++++ configure.in Fri Mar 21 18:54:01 2003
+@@ -37,7 +37,7 @@
AC_ARG_WITH(zlib,--with-zlib=[[PATH]] Which zlib library/object file to use,
with_zlib="$withval", with_zlib="")
@@ -9,17 +9,7 @@
AC_CHECK_HEADERS(netinet/ip_fil.h, AC_DEFINE(HAVE_IPF))
AC_CHECK_HEADERS(netinet/ip6.h, AC_DEFINE(HAVE_IP6_H))
-@@ -66,6 +66,9 @@
- LIBDB_PATH="/usr/local/BerkeleyDB.3.0"
- elif test -r "$pwd/libdb.a"; then
- LIBDB_PATH="$pwd"
-+elif test -r "/usr/local/lib/libdb4.a"; then
-+ LIBDB_PATH="/usr/local"
-+ LIBDB_NAME=-ldb4
- elif test -r "/usr/local/lib/libdb.a"; then
- LIBDB_PATH="/usr/local"
- elif test -r "/usr/lib/libdb2.a"; then
-@@ -524,10 +527,10 @@
+@@ -375,10 +375,10 @@
esac
if test "X$MYSQL_PATH" != "X" ; then
@@ -33,3 +23,22 @@
fi
if test "X$PGSQL_PATH" != "X" ; then
+@@ -464,6 +464,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 +577,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 a8b75be97a18..44e53ba15ce1 100644
--- a/www/oops/files/patch-src::Makefile.in
+++ b/www/oops/files/patch-src::Makefile.in
@@ -1,6 +1,15 @@
---- src/Makefile.in.orig Mon Mar 19 00:32:47 2001
-+++ src/Makefile.in Mon Mar 19 00:36:54 2001
-@@ -53,51 +53,15 @@
+--- src/Makefile.in.orig Fri Mar 21 19:42:58 2003
++++ src/Makefile.in Fri Mar 21 19:43:33 2003
+@@ -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} ${LIBZ_NAME} ${OOPS_RPATH} -o oops
+
+ mkinstalldirs:
+ ../mkinstalldirs ${OOPSPATH} \
+@@ -62,51 +62,15 @@
install: all mkinstalldirs
$(INSTALL) oops ${OOPS_SBINDIR}
diff --git a/www/oops/files/patch-src::environment.h b/www/oops/files/patch-src::environment.h
index a6fdd392ea7e..ce28186849c6 100644
--- a/www/oops/files/patch-src::environment.h
+++ b/www/oops/files/patch-src::environment.h
@@ -1,9 +1,20 @@
-
-$FreeBSD$
-
---- src/environment.h.orig Wed Dec 12 16:49:39 2001
-+++ src/environment.h Thu Jul 25 20:10:35 2002
-@@ -67,7 +67,7 @@
+--- 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>
@@ -12,7 +23,7 @@ $FreeBSD$
#include "rwlock.h"
#endif
-@@ -119,11 +119,11 @@
+@@ -119,11 +121,11 @@
#include <sys/stat.h>
#endif