Date: Thu, 5 Dec 2002 14:48:30 +0300 (MSK) From: "Sergey A.Osokin" <osa@FreeBSD.org.ru> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/46006: [NON-MAINTAINER] update www/oops from 1.5.22-20020519 to 1.5.22-20021204 Message-ID: <20021205114830.5B1A52F8@freebsd.org.ru>
next in thread | raw e-mail | index | archive | help
>Number: 46006
>Category: ports
>Synopsis: [NON-MAINTAINER] update www/oops from 1.5.22-20020519 to 1.5.22-20021204
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Thu Dec 05 03:50:01 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: Sergey A. Osokin
>Release: FreeBSD 4.7-STABLE i386
>Organization:
n/a
>Environment:
FreeBSD 4.7-STABLE i386
>Description:
1) update www/oops from 1.5.22-20020519 to 1.5.22-20021204
2) fix BATCH build mode (thanks Dmitry Morozovsky <marck@rinet.ru>)
3) fix build with databases/db4 (thanks Sergey Mokryshev <mokr@mokr.net>)
>How-To-Repeat:
>Fix:
Please close PRs: 40593, 44071 because this PR is superset
and 45989 becase i can't reproduce it
? ports/www/oops/files/patch-src::modules::berkeley_db_api.c
Index: ports/www/oops/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/oops/Makefile,v
retrieving revision 1.20
diff -u -r1.20 Makefile
--- ports/www/oops/Makefile 2002/11/10 16:48:26 1.20
+++ ports/www/oops/Makefile 2002/12/05 11:21:00
@@ -17,8 +17,10 @@
MAINTAINER= ports@FreeBSD.org
+BUILD_DEPENDS+= gawk:${PORTSDIR}/lang/gawk
+
OOPSVERSION= 1.5.22
-OOPSDATE= 20020519
+OOPSDATE= 20021204
USE_SUBMAKE= yes
USE_AUTOCONF= yes
@@ -47,7 +49,7 @@
@cd ${WRKSRC} && ${AUTOHEADER}
pre-install:
- @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
+ @PKG_PREFIX=${PREFIX} BATCH=${BATCH} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
.include <bsd.port.pre.mk>
Index: ports/www/oops/distinfo
===================================================================
RCS file: /home/ncvs/ports/www/oops/distinfo,v
retrieving revision 1.10
diff -u -r1.10 distinfo
--- ports/www/oops/distinfo 2002/05/20 11:34:38 1.10
+++ ports/www/oops/distinfo 2002/12/05 11:21:00
@@ -1,2 +1,2 @@
MD5 (oops-1.5.22.tar.gz) = bd6f743fb4abc6cf08ae310b1927b211
-MD5 (oops-1.5.22-20020519.patch) = e7ee38d48f2f906b4491b9f309db100a
+MD5 (oops-1.5.22-20021204.patch) = ed992b95213a674794e2675f5e2fb179
Index: ports/www/oops/pkg-install
===================================================================
RCS file: /home/ncvs/ports/www/oops/pkg-install,v
retrieving revision 1.2
diff -u -r1.2 pkg-install
--- ports/www/oops/pkg-install 2000/12/15 11:35:58 1.2
+++ ports/www/oops/pkg-install 2002/12/05 11:21:00
@@ -37,7 +37,13 @@
echo "You already have a user \"${user}\", so I will use it."
else
echo "You need a user \"${user}\"."
- if yesno "Would you like me to create it" y; then
+ doadduser=1
+ if [ "$BATCH" = "yes" ]; then
+ doadduser=0
+ else
+ yesno "Would you like me to create it" y && doadduser=0
+ fi
+ if [ $doadduser = 0 ]; then
/usr/sbin/pw useradd ${user} -g ${group} -h - -d /nonexistent \
-s /nonexistent -c "Oops Cache System" || exit
echo "Done."
Index: ports/www/oops/files/patch-configure.in
===================================================================
RCS file: /home/ncvs/ports/www/oops/files/patch-configure.in,v
retrieving revision 1.2
diff -u -r1.2 patch-configure.in
--- ports/www/oops/files/patch-configure.in 2002/07/26 12:14:00 1.2
+++ ports/www/oops/files/patch-configure.in 2002/12/05 11:21:00
@@ -1,8 +1,5 @@
-
-$FreeBSD: ports/www/oops/files/patch-configure.in,v 1.2 2002/07/26 12:14:00 naddy Exp $
-
---- configure.in.orig Wed Dec 19 13:18:40 2001
-+++ configure.in Thu Jul 25 19:54:48 2002
+--- configure.in.orig Wed Dec 19 15:18:40 2001
++++ configure.in Sat Oct 5 18:27:46 2002
@@ -49,7 +49,7 @@
AC_ARG_WITH(zlib,--with-zlib=[[PATH]] Which zlib library/object file to use,
with_zlib="$withval", with_zlib="")
@@ -12,7 +9,17 @@
AC_CHECK_HEADERS(netinet/ip_fil.h, AC_DEFINE(HAVE_IPF))
AC_CHECK_HEADERS(netinet/ip6.h, AC_DEFINE(HAVE_IP6_H))
-@@ -524,10 +524,10 @@
+@@ -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
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20021205114830.5B1A52F8>