Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 4 Jan 2003 09:50:04 -0800 (PST)
From:      Matthias Andree <matthias.andree@gmx.de>
To:        freebsd-ports@FreeBSD.org
Subject:   Re: ports/46755: CRITICAL REGRESSION: databases/db4 update breaks many ports
Message-ID:  <200301041750.h04Ho4PX002673@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/46755; it has been noted by GNATS.

From: Matthias Andree <matthias.andree@gmx.de>
To: "Sergey A. Osokin" <osa@freebsd.org.ru>,
	FreeBSD-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: ports/46755: CRITICAL REGRESSION: databases/db4 update breaks many ports
Date: Sat, 4 Jan 2003 18:40:58 +0100

 This patch should fix db4 and install the db4_dump185 utility:
 
 diff -Nur --exclude CVS /usr/ports/databases/db4/Makefile /root/db4/Makefile
 --- /usr/ports/databases/db4/Makefile	Sat Jan  4 14:24:35 2003
 +++ /root/db4/Makefile	Sat Jan  4 18:14:57 2003
 @@ -2,16 +2,16 @@
  # Date created:				16 August 2000
  # Whom:					Sergey Osokin aka oZZ <ozz@FreeBSD.org.ru>
  #
 -# $FreeBSD: ports/databases/db4/Makefile,v 1.47 2003/01/03 20:19:07 ijliao Exp $
 +# $FreeBSD: ports/databases/db4/Makefile,v 1.46 2002/11/20 13:13:48 ijliao Exp $
  #
  
  PORTNAME=	db4
 -PORTVERSION=	4.1.25
 +PORTVERSION=	4.0.14
 +PORTREVISION=	2
  CATEGORIES=	databases
  MASTER_SITES=	http://www.sleepycat.com/update/snapshot/
  DISTNAME=	db-${PORTVERSION}
  DIST_SUBDIR=	bdb
 -
  #PATCH_SITES=	${MASTER_SITES}
  #PATCHFILES=	patch.${PORTVERSION}.1 patch.${PORTVERSION}.2
  #PATCH_DIST_STRIP= -d ${WRKDIR}/${DISTNAME}
 diff -Nur --exclude CVS /usr/ports/databases/db4/distinfo /root/db4/distinfo
 --- /usr/ports/databases/db4/distinfo	Sat Jan  4 14:24:35 2003
 +++ /root/db4/distinfo	Mon Dec 24 11:45:45 2001
 @@ -1 +1 @@
 -MD5 (bdb/db-4.1.25.tar.gz) = df71961002b552c0e72c6e4e358f27e1
 +MD5 (bdb/db-4.0.14.tar.gz) = 12262c64fcd64b772e7cffad8e4d0ebc
 diff -Nur --exclude CVS /usr/ports/databases/db4/files/patch-dist::Makefile.in /root/db4/files/patch-dist::Makefile.in
 --- /usr/ports/databases/db4/files/patch-dist::Makefile.in	Sat Jan  4 14:24:35 2003
 +++ /root/db4/files/patch-dist::Makefile.in	Wed Nov 20 14:13:48 2002
 @@ -1,5 +1,5 @@
 ---- ../dist/Makefile.in.orig	Sat Aug 31 03:11:56 2002
 -+++ ../dist/Makefile.in	Sat Dec 28 01:15:46 2002
 +--- ../dist/Makefile.in.orig	Sat Nov 10 07:48:45 2001
 ++++ ../dist/Makefile.in	Sat Nov  9 17:36:00 2002
  @@ -11,7 +11,7 @@
   bindir=	@bindir@
   includedir=@includedir@
 @@ -17,7 +17,7 @@
   SOVERSION=	@DB_VERSION_MAJOR@.@DB_VERSION_MINOR@
   
   ##################################################
 -@@ -59,13 +60,13 @@
 +@@ -60,13 +61,13 @@
   LIBS=		@LIBS@
   LIBSO_LIBS=	@LIBSO_LIBS@
   
 @@ -37,7 +37,7 @@
   
   ##################################################
   # C++ API.
 -@@ -78,13 +79,13 @@
 +@@ -79,13 +80,13 @@
   XSOLINK=	@MAKEFILE_XSOLINK@
   LIBXSO_LIBS=	@LIBXSO_LIBS@
   
 @@ -57,20 +57,20 @@
   
   ##################################################
   # Java API.
 -@@ -364,8 +365,8 @@
 +@@ -235,8 +236,8 @@
 + 	db_server_proc@o@ db_server_svc@o@ db_server_util@o@ gen_db_server@o@
   
   UTIL_PROGS=\
 - 	@ADDITIONAL_PROGS@ \
 --	db_archive db_checkpoint db_deadlock \
 +-	@ADDITIONAL_PROGS@ db_archive db_checkpoint db_deadlock \
  -	db_dump db_load db_printlog db_recover db_stat db_upgrade db_verify
 -+	db4_archive db4_checkpoint db4_deadlock \
 ++	@ADDITIONAL_PROGS@ db4_archive db4_checkpoint db4_deadlock \
  +	db4_dump db4_load db4_printlog db4_recover db4_stat db4_upgrade db4_verify
   
   ##################################################
   # List of files installed into the library directory.
 -@@ -481,53 +482,53 @@
 - 	echo >> $@ exec java com.sleepycat.db.rpcserver.DbServer \$$@
 - 	chmod +x $@
 +@@ -330,53 +331,53 @@
 + 	    $(RPC_SRV_OBJS) util_log@o@ $(DEF_LIB) $(LIBS)
 + 	$(POSTLINK) $@
   
  -db_archive: db_archive@o@ util_sig@o@ $(DEF_LIB)
  +db4_archive: db_archive@o@ util_sig@o@ $(DEF_LIB)
 @@ -90,19 +90,19 @@
   	    db_deadlock@o@ util_log@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
   	$(POSTLINK) $@
   
 --db_dump: db_dump@o@ util_cache@o@ util_sig@o@ $(DEF_LIB)
 -+db4_dump: db_dump@o@ util_cache@o@ util_sig@o@ $(DEF_LIB)
 - 	$(CCLINK) -o $@ $(LDFLAGS) db_dump@o@ util_cache@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
 +-db_dump: db_dump@o@ util_sig@o@ $(DEF_LIB)
 ++db4_dump: db_dump@o@ util_sig@o@ $(DEF_LIB)
 + 	$(CCLINK) -o $@ $(LDFLAGS) db_dump@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
   	$(POSTLINK) $@
   
 --db_dump185: db_dump185@o@ @LTLIBOBJS@
 -+db4_dump185: db_dump185@o@ @LTLIBOBJS@
 - 	$(CCLINK) -o $@ $(LDFLAGS) db_dump185@o@ @LTLIBOBJS@ $(DB185LIB)
 +-db_dump185: db_dump185@o@ @LIBOBJS@
 ++db4_dump185: db_dump185@o@ @LIBOBJS@
 + 	$(CCLINK) -o $@ $(LDFLAGS) db_dump185@o@ @LIBOBJS@ $(DB185LIB)
   	$(POSTLINK) $@
   
 --db_load: db_load@o@ util_cache@o@ util_sig@o@ $(DEF_LIB)
 -+db4_load: db_load@o@ util_cache@o@ util_sig@o@ $(DEF_LIB)
 - 	$(CCLINK) -o $@ $(LDFLAGS) db_load@o@ util_cache@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
 +-db_load: db_load@o@ util_sig@o@ $(DEF_LIB)
 ++db4_load: db_load@o@ util_sig@o@ $(DEF_LIB)
 + 	$(CCLINK) -o $@ $(LDFLAGS) db_load@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
   	$(POSTLINK) $@
   
  -db_printlog: db_printlog@o@ util_sig@o@ $(DEF_LIB)
 @@ -117,9 +117,9 @@
   	    db_recover@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
   	$(POSTLINK) $@
   
 --db_stat: db_stat@o@ util_cache@o@ util_sig@o@ $(DEF_LIB)
 -+db4_stat: db_stat@o@ util_cache@o@ util_sig@o@ $(DEF_LIB)
 - 	$(CCLINK) -o $@ $(LDFLAGS) db_stat@o@ util_cache@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
 +-db_stat: db_stat@o@ util_sig@o@ $(DEF_LIB)
 ++db4_stat: db_stat@o@ util_sig@o@ $(DEF_LIB)
 + 	$(CCLINK) -o $@ $(LDFLAGS) db_stat@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
   	$(POSTLINK) $@
   
  -db_upgrade: db_upgrade@o@ util_sig@o@ $(DEF_LIB)
 @@ -128,12 +128,12 @@
   	    db_upgrade@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
   	$(POSTLINK) $@
   
 --db_verify: db_verify@o@ util_cache@o@ util_sig@o@ $(DEF_LIB)
 -+db4_verify: db_verify@o@ util_cache@o@ util_sig@o@ $(DEF_LIB)
 +-db_verify: db_verify@o@ util_sig@o@ $(DEF_LIB)
 ++db4_verify: db_verify@o@ util_sig@o@ $(DEF_LIB)
   	$(CCLINK) -o $@ $(LDFLAGS) \
 - 	    db_verify@o@ util_cache@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
 + 	    db_verify@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
   	$(POSTLINK) $@
 -@@ -536,7 +537,7 @@
 +@@ -385,7 +386,7 @@
   # Library and standard utilities install.
   ##################################################
   library_install: install_setup
 diff -Nur --exclude CVS /usr/ports/databases/db4/pkg-plist /root/db4/pkg-plist
 --- /usr/ports/databases/db4/pkg-plist	Fri Nov 22 12:40:50 2002
 +++ /root/db4/pkg-plist	Sat Jan  4 18:23:25 2003
 @@ -2,6 +2,7 @@
  bin/db4_checkpoint
  bin/db4_deadlock
  bin/db4_dump
 +bin/db4_dump185
  bin/db4_load
  bin/db4_printlog
  bin/db4_recover
 @@ -692,6 +693,7 @@
  %%PORTDOCS%%share/doc/db4/ref/simple_tut/keydata.html
  %%PORTDOCS%%share/doc/db4/ref/simple_tut/open.html
  %%PORTDOCS%%share/doc/db4/ref/simple_tut/put.html
 +%%PORTDOCS%%@exec mkdir -p %D/share/doc/db4/ref/splash
  %%PORTDOCS%%share/doc/db4/ref/tcl/error.html
  %%PORTDOCS%%share/doc/db4/ref/tcl/faq.html
  %%PORTDOCS%%share/doc/db4/ref/tcl/intro.html

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?200301041750.h04Ho4PX002673>