1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-04 06:15:24 +00:00

- Update to 1.5.22-20030321

- Assign maintainership to Sergey Osokin

PR:		50187
This commit is contained in:
Max Khon 2003-03-24 15:13:35 +00:00
parent a31469031b
commit 775f41988a
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=77393
5 changed files with 58 additions and 29 deletions

View File

@ -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

View File

@ -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

View File

@ -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"

View File

@ -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}

View File

@ -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