Attachment #29588 for bug #50187

View | Details | Raw Unified | Return to bug 50187
Collapse All | Expand All




# New ports collection makefile for:	oops
# Date created:		15 August 2000
# Whom:			Sergey Osokin aka oZZ <osa@FreeBSD.org.ru>
#

DISTNAME=	${PORTNAME}-${OOPSVERSION}

PATCH_SITES=	${MASTER_SITES}
PATCHFILES=	${PORTNAME}-${OOPSVERSION}-${OOPSDATE}.patch.gz
PATCH_DIST_STRIP=	-d ${WRKDIR}/${DISTNAME}

MAINTAINER=	osa@FreeBSD.org.ru
COMMENT=	A caching web proxy server

BUILD_DEPENDS+=	gawk:${PORTSDIR}/lang/gawk

OOPSVERSION=	1.5.22
OOPSDATE=	20030321

USE_SUBMAKE=	yes
USE_AUTOCONF=	yes

Lines 1-2 Link Here

(-)ports/www/oops/distinfo (-1 / +1 lines)
1	MD5 (oops-1.5.22.tar.gz) = bd6f743fb4abc6cf08ae310b1927b211	1	MD5 (oops-1.5.22.tar.gz) = bd6f743fb4abc6cf08ae310b1927b211
2	MD5 (oops-1.5.22-20021204.patch) = ed992b95213a674794e2675f5e2fb179	2	MD5 (oops-1.5.22-20030321.patch.gz) = 8b1557c61235fdb807adc59663e244bc




--- 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="")
 

 AC_CHECK_HEADERS(netinet/ip_fil.h, AC_DEFINE(HAVE_IPF))
 AC_CHECK_HEADERS(netinet/ip6.h, AC_DEFINE(HAVE_IP6_H))
 
@@ -375,10 +375,10 @@
     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 @@
 esac
 
 if test "X$MYSQL_PATH" != "X" ; then

 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"

Lines 1-6 Link Here

(-)ports/www/oops/files/patch-src::Makefile.in (-3 / +12 lines)
1	--- src/Makefile.in.orig Mon Mar 19 00:32:47 2001	1	--- src/Makefile.in.orig Fri Mar 21 19:42:58 2003
2	+++ src/Makefile.in Mon Mar 19 00:36:54 2001	2	+++ src/Makefile.in Fri Mar 21 19:43:33 2003
3	@@ -53,51 +53,15 @@	3	@@ -45,7 +45,7 @@
		4	cd modules; $(MAKE)
		5
		6	oops: ${OBJS}
		7	- ${CC} ${CFLAGS} ${OBJS} ${EXTLDFLAGS} ${LDFLAGS} ${LIBGB_PATH} ${LIBGB_NAME} ${OOPS_LIBS} ${LIBZ_NAME} ${OOPS_RPATH} -o oops
		8	+ ${CXX} ${CFLAGS} ${OBJS} ${EXTLDFLAGS} ${LDFLAGS} ${LIBGB_PATH} ${LIBGB_NAME} ${OOPS_LIBS} ${LIBZ_NAME} ${OOPS_RPATH} -o oops
		9
		10	mkinstalldirs:
		11	../mkinstalldirs ${OOPSPATH} \
		12	@@ -62,51 +62,15 @@
4		13
5	install: all mkinstalldirs	14	install: all mkinstalldirs
6	$(INSTALL) oops ${OOPS_SBINDIR}	15	$(INSTALL) oops ${OOPS_SBINDIR}




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

 #include	"rwlock.h"
 #endif
 
@@ -119,11 +121,11 @@
 #include	<sys/stat.h>
 #endif

Return to bug 50187

Lines 1-4 Link Here

(-)ports/www/oops/Makefile (-4 / +4 lines)
1	# New ports collection makefile for: oops	1	# New ports collection makefile for: oops
2	# Date created: 15 August 2000	2	# Date created: 15 August 2000
3	# Whom: Sergey Osokin aka oZZ <ports@FreeBSD.org>	3	# Whom: Sergey Osokin aka oZZ <osa@FreeBSD.org.ru>
4	#	4	#
Lines 12-27 Link Here
12	DISTNAME= ${PORTNAME}-${OOPSVERSION}	12	DISTNAME= ${PORTNAME}-${OOPSVERSION}
13		13
14	PATCH_SITES= ${MASTER_SITES}	14	PATCH_SITES= ${MASTER_SITES}
15	PATCHFILES= ${PORTNAME}-${OOPSVERSION}-${OOPSDATE}.patch	15	PATCHFILES= ${PORTNAME}-${OOPSVERSION}-${OOPSDATE}.patch.gz
16	PATCH_DIST_STRIP= -d ${WRKDIR}/${DISTNAME}	16	PATCH_DIST_STRIP= -d ${WRKDIR}/${DISTNAME}
17		17
18	MAINTAINER= ports@FreeBSD.org	18	MAINTAINER= osa@FreeBSD.org.ru
19	COMMENT= A caching web proxy server	19	COMMENT= A caching web proxy server
20		20
21	BUILD_DEPENDS+= gawk:${PORTSDIR}/lang/gawk	21	BUILD_DEPENDS+= gawk:${PORTSDIR}/lang/gawk
22		22
23	OOPSVERSION= 1.5.22	23	OOPSVERSION= 1.5.22
24	OOPSDATE= 20021204	24	OOPSDATE= 20030321
25		25
26	USE_SUBMAKE= yes	26	USE_SUBMAKE= yes
27	USE_AUTOCONF= yes	27	USE_AUTOCONF= yes

Lines 1-6 Link Here

(-)ports/www/oops/files/patch-configure.in (-14 / +23 lines)
1	--- configure.in.orig Wed Dec 19 15:18:40 2001	1	--- configure.in.orig Fri Mar 21 18:46:36 2003
2	+++ configure.in Sat Oct 5 18:27:46 2002	2	+++ configure.in Fri Mar 21 18:54:01 2003
3	@@ -49,7 +49,7 @@	3	@@ -37,7 +37,7 @@
4	AC_ARG_WITH(zlib,--with-zlib=[[PATH]] Which zlib library/object file to use,	4	AC_ARG_WITH(zlib,--with-zlib=[[PATH]] Which zlib library/object file to use,
5	with_zlib="$withval", with_zlib="")	5	with_zlib="$withval", with_zlib="")
6		6
Lines 9-25 Link Here
9	AC_CHECK_HEADERS(netinet/ip_fil.h, AC_DEFINE(HAVE_IPF))	9	AC_CHECK_HEADERS(netinet/ip_fil.h, AC_DEFINE(HAVE_IPF))
10	AC_CHECK_HEADERS(netinet/ip6.h, AC_DEFINE(HAVE_IP6_H))	10	AC_CHECK_HEADERS(netinet/ip6.h, AC_DEFINE(HAVE_IP6_H))
11		11
12	@@ -66,6 +66,9 @@	12	@@ -375,10 +375,10 @@
13	LIBDB_PATH="/usr/local/BerkeleyDB.3.0"
14	elif test -r "$pwd/libdb.a"; then
15	LIBDB_PATH="$pwd"
16	+elif test -r "/usr/local/lib/libdb4.a"; then
17	+ LIBDB_PATH="/usr/local"
18	+ LIBDB_NAME=-ldb4
19	elif test -r "/usr/local/lib/libdb.a"; then
20	LIBDB_PATH="/usr/local"
21	elif test -r "/usr/lib/libdb2.a"; then
22	@@ -524,10 +527,10 @@
23	esac	13	esac
24		14
25	if test "X$MYSQL_PATH" != "X" ; then	15	if test "X$MYSQL_PATH" != "X" ; then
Lines 33-35 Link Here
33	fi	23	fi
34		24
35	if test "X$PGSQL_PATH" != "X" ; then	25	if test "X$PGSQL_PATH" != "X" ; then
		26	@@ -464,6 +464,9 @@
		27	LIBDB_PATH="$pwd"
		28	elif test -r "/usr/local/lib/libdb.a"; then
		29	LIBDB_PATH="/usr/local"
		30	+elif test -r "/usr/local/lib/libdb4.a"; then
		31	+ LIBDB_PATH="/usr/local"
		32	+ LIBDB_NAME=-ldb4
		33	elif test -r "/usr/lib/libdb2.a"; then
		34	LIBDB_PATH="/usr"
		35	LIBDB_NAME=-ldb2
		36	@@ -574,7 +577,7 @@
		37	AC_DEFINE(HAVE_ZLIB)
		38	AC_MSG_RESULT(/usr/local/lib/libz.a)
		39	if test "X`echo $CFLAGS \| grep '\-I/usr/local/include'`" = "X"; then
		40	- CFLAGS="$CFLAGS -I/usr/local/include"
		41	+ CFLAGS="$CFLAGS"
		42	fi
		43	elif test -r "/usr/lib/libz.a"; then
		44	LIBZ_NAME="/usr/lib/libz.a"

Lines 1-9 Link Here

(-)ports/www/oops/files/patch-src::environment.h (-7 / +18 lines)
1		1	--- src/environment.h.orig Wed Dec 12 18:49:39 2001
2	$FreeBSD$	2	+++ src/environment.h Fri Mar 21 19:15:34 2003
3		3	@@ -52,11 +52,13 @@
4	--- src/environment.h.orig Wed Dec 12 16:49:39 2001	4	#if defined(HAVE_CRYPT_H)
5	+++ src/environment.h Thu Jul 25 20:10:35 2002	5	#include <crypt.h>
6	@@ -67,7 +67,7 @@	6	#endif
		7	+/*
		8	#if defined(HAVE_GETOPT_H)
		9	#include <getopt.h>
		10	#elif !defined(HAVE_GETOPT)
		11	#include "getopt.h"
		12	#endif
		13	+*/
		14
		15	#if defined(HAVE_ZLIB)
		16	#include <zlib.h>
		17	@@ -67,7 +69,7 @@
7	#include <thread.h>	18	#include <thread.h>
8	#endif	19	#endif
9	#include <pthread.h>	20	#include <pthread.h>
Lines 12-18 Link Here
12	#include "rwlock.h"	23	#include "rwlock.h"
13	#endif	24	#endif
14		25
15	@@ -119,11 +119,11 @@	26	@@ -119,11 +121,11 @@
16	#include <sys/stat.h>	27	#include <sys/stat.h>
17	#endif	28	#endif