Date: Sun, 23 Mar 2003 15:13:25 +0100 (CET) From: Thierry Thomas <thierry@pompo.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/50213: databases/dbtool: upgrading to 1.6 and fixing on -CURRENT. Message-ID: <20030323141325.0019E22BF4E@ws90bj.pompo.net>
next in thread | raw e-mail | index | archive | help
>Number: 50213
>Category: ports
>Synopsis: databases/dbtool: upgrading to 1.6 and fixing on -CURRENT.
>Confidential: no
>Severity: serious
>Priority: high
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sun Mar 23 06:20:11 PST 2003
>Closed-Date:
>Last-Modified:
>Originator: Thierry Thomas
>Release: FreeBSD 5.0-RELEASE-p5 i386
>Organization:
Kabbale Eros
>Environment:
System: FreeBSD ws90bj.pompo.net 5.0-RELEASE-p5 FreeBSD 5.0-RELEASE-p5 #0: Fri Mar 21 14:26:03 CET 2003 thierry@ws90bj.pompo.net:/usr/obj/usr/src/sys/WS90BJ-030112 i386
>Description:
- databases/dbtool 1.5 is broken on -CURRENT (gcc 3.2 compliance);
- installing examples.
>How-To-Repeat:
Try to build on 5.0 (or check the log on Bento):
===> Building for dbtool-1.5
c++ -DPACKAGE=\"dbtool\" -DVERSION=\"1.5\" -DSTDC_HEADERS=1 -DHAVE_UNISTD_H=1 -DHAVE_STDIO_H=1 -DHAVE_STDLIB_H=1 -DHAVE_LIBPCRE=1 -DHAVE_LIBGDBM=1 -DHAVE_GETOPT=1 -DHAVE_FDOPEN=1 -DHAVE_FGETC=1 -DHAVE_GETENV=1 -DHAVE_GETPASS=1 -I. -I. -O -pipe -mcpu=pentiumpro -I/usr/local/include -g -Wstrict-prototypes -O -c cipher.cc
In file included from /usr/include/g++/backward/strstream:51,
from cipher.h:16,
from cipher.cc:12:
/usr/include/g++/backward/backward_warning.h:32:2: warning: #warning This file includes at least one deprecated or antiquated header. Please consider using one of the 32 headers found in section 17.4.1.2 of the C++ standard. Examples include substituting the <X> header for the <X.h> header for C++ includes, or <sstream> instead of the deprecated header <strstream.h>. To disable this warning use -Wno-deprecated.
In file included from cipher.cc:12:
cipher.h:31: syntax error before `&' token
cipher.h:32: syntax error before `&' token
cipher.h:33: syntax error before `&' token
cipher.h:36: syntax error before `)' token
cipher.cc:14: syntax error before `&' token
cipher.cc: In member function `void cipher::init(...)':
cipher.cc:21: `phrase' undeclared (first use this function)
cipher.cc:21: (Each undeclared identifier is reported only once for each
function it appears in.)
cipher.cc: At global scope:
cipher.cc:32: syntax error before `::' token
cipher.cc:37: ISO C++ forbids declaration of `plainText' with no type
cipher.cc:37: conflicting types for `int plainText'
cipher.cc:36: previous declaration as `unsigned char*plainText'
cipher.cc:37: `size' was not declared in this scope
cipher.cc:38: syntax error before `for'
gmake: *** [cipher.o] Erreur 1
*** Error code 2
Stop in /usr/ports/databases/dbtool.
>Fix:
Please apply the following patch (Note the creation of files/*):
diff -urN databases/dbtool.orig/Makefile databases/dbtool/Makefile
--- databases/dbtool.orig/Makefile Sat Feb 22 22:13:05 2003
+++ databases/dbtool/Makefile Sun Mar 23 13:58:29 2003
@@ -7,8 +7,7 @@
#
PORTNAME= dbtool
-PORTVERSION= 1.5
-PORTREVISION= 0
+PORTVERSION= 1.6
CATEGORIES= databases
MASTER_SITES= ftp://ftp.daemon.de/scip/Apps/dbtool/
@@ -24,6 +23,9 @@
.else
LIB_DEPENDS+= gdbm.3:${PORTSDIR}/databases/gdbm
.endif
+.if !defined(NOPORTDOCS)
+RUN_DEPENDS+= bash:${PORTSDIR}/shells/bash2
+.endif
GNU_CONFIGURE= yes
CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib" \
@@ -31,9 +33,13 @@
USE_GMAKE= yes
USE_REINPLACE= yes
+REINPLACE_ARGS= -i ""
MAN1= dbtool.1
+SH2BASH= samples/account-db/accdb
+UB2PFX= samples/locate/locate samples/locate/updatedb
+
post-extract:
.if !defined(WITH_BERKELEY_DB)
@${ECHO_MSG}
@@ -47,5 +53,22 @@
@${REINPLACE_CMD} -e "s,stdin,input,g" ${WRKSRC}/${file}
.endfor
@${REINPLACE_CMD} -e "s,==,=,g" ${WRKSRC}/configure
+.if !defined(NOPORTDOCS)
+.for file in ${SH2BASH}
+ @${REINPLACE_CMD} -e "s|/bin/sh|${LOCALBASE}/bin/bash|" ${WRKSRC}/${file}
+.endfor
+.for file in ${UB2PFX}
+ @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/${file}
+ @${RM} ${WRKSRC}/${file}.orig
+.endfor
+.endif
+
+post-install:
+.if !defined(NOPORTDOCS)
+ @${MKDIR} ${EXAMPLESDIR}
+ @${CP} -Rp ${WRKSRC}/samples/* ${EXAMPLESDIR}
+ @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
+ @${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}."
+.endif
.include <bsd.port.mk>
diff -urN databases/dbtool.orig/distinfo databases/dbtool/distinfo
--- databases/dbtool.orig/distinfo Sat Jun 15 21:41:56 2002
+++ databases/dbtool/distinfo Sun Mar 23 11:38:04 2003
@@ -1 +1 @@
-MD5 (dbtool-1.5.tar.gz) = 0d90a7578d4342c6c7fd995bc2bf00de
+MD5 (dbtool-1.6.tar.gz) = a8e3f0982b42b0dbb3b9c1c31c975060
diff -urN databases/dbtool.orig/files/patch-Makefile.in databases/dbtool/files/patch-Makefile.in
--- databases/dbtool.orig/files/patch-Makefile.in Thu Jan 1 01:00:00 1970
+++ databases/dbtool/files/patch-Makefile.in Sun Mar 23 11:50:40 2003
@@ -0,0 +1,20 @@
+--- Makefile.in.orig Sat Apr 20 20:43:22 2002
++++ Makefile.in Sat Mar 22 14:06:46 2003
+@@ -68,7 +68,7 @@
+ dbtool_SOURCES = cipher.cc config.cc dbtool.cc digest.cc engine.cc rijndael.cc
+ man_MANS = dbtool.1
+ EXTRA_DIST = $(man_MANS)
+-CXXFLAGS = -g -Wstrict-prototypes -O
++CXXFLAGS = @CXXFLAGS@
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_CLEAN_FILES =
+@@ -84,7 +84,7 @@
+ dbtool_LDADD = $(LDADD)
+ dbtool_DEPENDENCIES =
+ dbtool_LDFLAGS =
+-CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS)
+ CXXLD = $(CXX)
+ CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
+ man1dir = $(mandir)/man1
diff -urN databases/dbtool.orig/files/patch-samples_locate_locate databases/dbtool/files/patch-samples_locate_locate
--- databases/dbtool.orig/files/patch-samples_locate_locate Thu Jan 1 01:00:00 1970
+++ databases/dbtool/files/patch-samples_locate_locate Sun Mar 23 13:49:29 2003
@@ -0,0 +1,16 @@
+--- samples/locate/locate.orig Sat Apr 20 17:14:18 2002
++++ samples/locate/locate Sun Mar 23 12:25:01 2003
+@@ -12,10 +12,10 @@
+ #
+ # $Id: locate,v 1.3 2001/06/26 23:00:02 scip Exp $
+
+-dbtool="/usr/bin/dbtool";
++dbtool="%%PREFIX%%/bin/dbtool";
+ find="/usr/bin/find";
+-db="/var/local/locate.db";
+-sort="/bin/sort";
++db="/var/db/locate.db";
++sort="/usr/bin/sort";
+ regex=$1;
+
+ if [ "x$regex" != "x" ]; then
diff -urN databases/dbtool.orig/files/patch-samples_locate_updatedb databases/dbtool/files/patch-samples_locate_updatedb
--- databases/dbtool.orig/files/patch-samples_locate_updatedb Thu Jan 1 01:00:00 1970
+++ databases/dbtool/files/patch-samples_locate_updatedb Sun Mar 23 13:49:52 2003
@@ -0,0 +1,16 @@
+--- samples/locate/updatedb.orig Sat Apr 20 17:14:18 2002
++++ samples/locate/updatedb Sun Mar 23 12:24:47 2003
+@@ -11,10 +11,10 @@
+ # $Id: updatedb,v 1.2 2001/06/26 23:00:02 scip Exp $
+ #
+
+-dbtool="/usr/bin/dbtool";
++dbtool="%%PREFIX%%/bin/dbtool";
+ find="/usr/bin/find";
+-db="/var/local/locate.db";
+-egrep="/bin/egrep";
++db="/var/db/locate.db";
++egrep="/usr/bin/egrep";
+ cp="/bin/cp"
+
+ $cp /dev/null $db;
diff -urN databases/dbtool.orig/pkg-plist databases/dbtool/pkg-plist
--- databases/dbtool.orig/pkg-plist Sun Apr 29 18:58:46 2001
+++ databases/dbtool/pkg-plist Sun Mar 23 13:51:02 2003
@@ -1 +1,12 @@
bin/dbtool
+%%PORTDOCS%%%%EXAMPLESDIR%%/account-db/README
+%%PORTDOCS%%%%EXAMPLESDIR%%/account-db/accdb
+%%PORTDOCS%%%%EXAMPLESDIR%%/locate/README
+%%PORTDOCS%%%%EXAMPLESDIR%%/locate/locate
+%%PORTDOCS%%%%EXAMPLESDIR%%/locate/updatedb
+%%PORTDOCS%%%%EXAMPLESDIR%%/uback/README
+%%PORTDOCS%%%%EXAMPLESDIR%%/README
+@dirrm %%PORTDOCS%%%%EXAMPLESDIR%%/account-db
+@dirrm %%PORTDOCS%%%%EXAMPLESDIR%%/locate
+@dirrm %%PORTDOCS%%%%EXAMPLESDIR%%/uback
+@dirrm %%PORTDOCS%%%%EXAMPLESDIR%%
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030323141325.0019E22BF4E>