Attachment #27054 for bug #46006

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

Lines 17-24 Link Here

(-)ports/www/oops/Makefile (-2 / +4 lines)
17		17
18	MAINTAINER= ports@FreeBSD.org	18	MAINTAINER= ports@FreeBSD.org
19		19
		20	BUILD_DEPENDS+= gawk:${PORTSDIR}/lang/gawk
		21
20	OOPSVERSION= 1.5.22	22	OOPSVERSION= 1.5.22
21	OOPSDATE= 20020519	23	OOPSDATE= 20021204
22		24
23	USE_SUBMAKE= yes	25	USE_SUBMAKE= yes
24	USE_AUTOCONF= yes	26	USE_AUTOCONF= yes
Lines 47-53 Link Here
47	@cd ${WRKSRC} && ${AUTOHEADER}	49	@cd ${WRKSRC} && ${AUTOHEADER}
48		50
49	pre-install:	51	pre-install:
50	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL	52	@PKG_PREFIX=${PREFIX} BATCH=${BATCH} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
51		53
52	.include <bsd.port.pre.mk>	54	.include <bsd.port.pre.mk>
53		55

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-20020519.patch) = e7ee38d48f2f906b4491b9f309db100a	2	MD5 (oops-1.5.22-20021204.patch) = ed992b95213a674794e2675f5e2fb179

Lines 37-43 Link Here

(-)ports/www/oops/pkg-install (-1 / +7 lines)
37	echo "You already have a user \"${user}\", so I will use it."	37	echo "You already have a user \"${user}\", so I will use it."
38	else	38	else
39	echo "You need a user \"${user}\"."	39	echo "You need a user \"${user}\"."
40	if yesno "Would you like me to create it" y; then	40	doadduser=1
		41	if [ "$BATCH" = "yes" ]; then
		42	doadduser=0
		43	else
		44	yesno "Would you like me to create it" y && doadduser=0
		45	fi
		46	if [ $doadduser = 0 ]; then
41	/usr/sbin/pw useradd ${user} -g ${group} -h - -d /nonexistent \	47	/usr/sbin/pw useradd ${user} -g ${group} -h - -d /nonexistent \
42	-s /nonexistent -c "Oops Cache System" \|\| exit	48	-s /nonexistent -c "Oops Cache System" \|\| exit
43	echo "Done."	49	echo "Done."




--- configure.in.orig	Wed Dec 19 15:18:40 2001
+++ configure.in	Sat Oct  5 18:27:46 2002

--- configure.in.orig	Wed Dec 19 13:18:40 2001
+++ configure.in	Thu Jul 25 19:54:48 2002
@@ -49,7 +49,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))
 
@@ -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 @@
 esac
 
 if test "X$MYSQL_PATH" != "X" ; then

Return to bug 46006

Lines 1-8 Link Here

(-)ports/www/oops/files/patch-configure.in (-6 / +13 lines)
1		1	--- configure.in.orig Wed Dec 19 15:18:40 2001
2	$FreeBSD: ports/www/oops/files/patch-configure.in,v 1.2 2002/07/26 12:14:00 naddy Exp $	2	+++ configure.in Sat Oct 5 18:27:46 2002
3
4	--- configure.in.orig Wed Dec 19 13:18:40 2001
5	+++ configure.in Thu Jul 25 19:54:48 2002
6	@@ -49,7 +49,7 @@	3	@@ -49,7 +49,7 @@
7	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,
8	with_zlib="$withval", with_zlib="")	5	with_zlib="$withval", with_zlib="")
Lines 12-18 Link Here
12	AC_CHECK_HEADERS(netinet/ip_fil.h, AC_DEFINE(HAVE_IPF))	9	AC_CHECK_HEADERS(netinet/ip_fil.h, AC_DEFINE(HAVE_IPF))
13	AC_CHECK_HEADERS(netinet/ip6.h, AC_DEFINE(HAVE_IP6_H))	10	AC_CHECK_HEADERS(netinet/ip6.h, AC_DEFINE(HAVE_IP6_H))
14		11
15	@@ -524,10 +524,10 @@	12	@@ -66,6 +66,9 @@
		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 @@
16	esac	23	esac
17		24
18	if test "X$MYSQL_PATH" != "X" ; then	25	if test "X$MYSQL_PATH" != "X" ; then