Attachment #65132 for bug #96606

View | Details | Raw Unified | Return to bug 96606 | Differences between
Collapse All | Expand All




DOCSDIR=	${PREFIX}/share/doc/tabe
CONFIGURE_ARGS=	--prefix=${PREFIX} \
		--includedir=${PREFIX}/include/tabe \
		--with-db-name=${BDB_LIB_NAME} \
		--with-db-inc=${BDB_INCLUDE_DIR} \
		--with-db-lib=${BDB_LIB_DIR} \
		--with-db-bin=${LOCALBASE}/bin \
		--enable-shared

.if !defined(WITHOUT_X11)
PLIST_SUB+=	X11=""
USE_XLIB=	yes
PLIST_SUB+=	X11=""
.else
CONFIGURE_ARGS+=--without-x
PLIST_SUB+=	X11="@comment "
.endif

.include <bsd.port.pre.mk>

pre-everything::
.if defined(WITH_BDB_VER)
	@${ECHO} ""
	@${ECHO} "WARNING:"
	@${ECHO} "	You have defined WITH_BDB_VER. Make sure you use the same"
	@${ECHO} "	db version for all ports that use libtabe, such as xcin."
	@${ECHO} "	Otherwise, ports that use libtabe may not work correctly."
	@${ECHO} ""
.endif

post-patch:
.if defined(WITHOUT_X11)
	${REINPLACE_CMD} -e '/all:/s/ bims//; /bims/d' ${WRKSRC}/src/Makefile.in
.endif


	${MKDIR} ${DATADIR}
	${TOUCH} ${DATADIR}/${PORTNAME}-${PORTVERSION}

.include <bsd.port.post.mk>




--- configure.orig	Sat Oct 20 07:03:29 2001
+++ configure	Mon May  1 10:53:24 2006
@@ -22,6 +22,8 @@
 ac_help="$ac_help
   --with-db-bin=PATH      set the binary dir of Berkeley DB2/3."
 ac_help="$ac_help
+  --with-db-name=NAME     set the library name of Berkeley DB."
+ac_help="$ac_help
   --enable-shared[=PKGS]  build shared libraries [default=yes]"
 ac_help="$ac_help
   --enable-static[=PKGS]  build static libraries [default=yes]"
@@ -790,6 +792,14 @@
   :
 fi
 
+# Check whether --with-db_name or --without-db_name was given.
+if test "${with_db_name+set}" = set; then
+  withval="$with_db_name"
+    test x$withval != x && with_db_name="$withval"
+else
+    with_db_name='db'
+fi;
+
 
 if test "$program_prefix" != NONE; then
     program_prefix="$program_prefix/"
@@ -5315,18 +5325,22 @@
   cat conftest.$ac_ext >&5
 fi
 rm -f conftest*
-test "$ac_cv_search_db_create" = "no" && for i in db db3; do
+test "$ac_cv_search_db_create" = "no" && for i in $with_db_name; do
 LIBS="-l$i  $ac_func_search_save_LIBS"
+__db_create="db_create"
+if [ "$i" = "db-4.2" ]; then
+  __db_create="db_create_4002"
+fi
 cat > conftest.$ac_ext <<EOF
 #line 5322 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char db_create();
+char $__db_create();
 
 int main() {
-db_create()
+$__db_create()
 ; return 0; }
 EOF
 if { (eval echo configure:5333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
@@ -5385,7 +5399,7 @@
   cat conftest.$ac_ext >&5
 fi
 rm -f conftest*
-test "$ac_cv_search_db_open" = "no" && for i in db db2; do
+test "$ac_cv_search_db_open" = "no" && for i in $with_db_name; do
 LIBS="-l$i  $ac_func_search_save_LIBS"
 cat > conftest.$ac_ext <<EOF
 #line 5392 "configure"
@@ -6219,6 +6233,7 @@
 s%@with_db_inc@%$with_db_inc%g
 s%@with_db_lib@%$with_db_lib%g
 s%@with_db_bin@%$with_db_bin%g
+s%@with_db_name@%$with_db_name%g
 s%@USE_DB@%$USE_DB%g
 s%@x_includes@%$x_includes%g
 s%@x_libraries@%$x_libraries%g




--- src/tabe_tsidbint.c.orig	Sun Nov 11 07:33:07 2001
+++ src/tabe_tsidbint.c	Mon May  1 00:47:55 2006
@@ -27,6 +27,7 @@
 #endif
 
 #include "tabe.h"
+#define DB_VERSION (DB_VERSION_MAJOR*100000+DB_VERSION_MINOR*1000+DB_VERSION_PATCH)
 
 static void tabeTsiDBClose(struct TsiDB *tsidb);
 static int  tabeTsiDBRecordNumber(struct TsiDB *tsidb);
@@ -69,7 +70,7 @@
 {
   DB *dbp=NULL;
 
-#ifdef HAVE_DB3
+#if DB_VERSION >= 300000
   /* create a db handler */
   if ((errno = db_create(&dbp, NULL, 0)) != 0) {
     fprintf(stderr, "db_create: %s\n", db_strerror(errno));
@@ -82,26 +83,32 @@
       return(NULL);
     }
     else {
-#ifndef HAVE_DB3
-      errno = db_open(db_name, DB_BTREE, DB_CREATE, 0644, NULL, NULL, &dbp);
-#else
+#if DB_VERSION >= 401025
+      errno = dbp->open(dbp, NULL, db_name, NULL, DB_BTREE, DB_CREATE, 0644);
+#elif DB_VERSION >= 300000
       errno = dbp->open(dbp, db_name, NULL, DB_BTREE, DB_CREATE, 0644);
+#else
+      errno = db_open(db_name, DB_BTREE, DB_CREATE, 0644, NULL, NULL, &dbp);
 #endif
     }
   }
   else {
     if (flags & DB_FLAG_READONLY) {
-#ifndef HAVE_DB3
-      errno = db_open(db_name, DB_BTREE, DB_RDONLY, 0444, NULL, NULL, &dbp);
-#else
+#if DB_VERSION >= 401025
+      errno = dbp->open(dbp, NULL, db_name, NULL, DB_BTREE, DB_RDONLY, 0444);
+#elif DB_VERSION >= 300000
       errno = dbp->open(dbp, db_name, NULL, DB_BTREE, DB_RDONLY, 0444);
+#else
+      errno = db_open(db_name, DB_BTREE, DB_RDONLY, 0444, NULL, NULL, &dbp);
 #endif
     }
     else {
-#ifndef HAVE_DB3
-      errno = db_open(db_name, DB_BTREE, 0, 0644, NULL, NULL, &dbp);
-#else
+#if DB_VERSION >= 401025
+      errno = dbp->open(dbp, NULL, db_name, NULL, DB_BTREE, 0, 0644);
+#elif DB_VERSION >= 300000
       errno = dbp->open(dbp, db_name, NULL, DB_BTREE, 0, 0644);
+#else
+      errno = db_open(db_name, DB_BTREE, 0, 0644, NULL, NULL, &dbp);
 #endif
     }
   }
@@ -112,10 +119,10 @@
   }
   if (errno < 0) {
     /* DB specific errno */
-#ifndef HAVE_DB3
-    fprintf(stderr, "tabeTsiDBOpen(): DB error opening DB File %s.\n", db_name);
-#else
+#if DB_VERSION >= 300000
     fprintf(stderr, "tabeTsiDBOpen(): %s.\n", db_strerror(errno));
+#else
+    fprintf(stderr, "tabeTsiDBOpen(): DB error opening DB File %s.\n", db_name);
 #endif
     return(NULL);
   }
@@ -265,12 +272,18 @@
   switch(tsidb->type) {
   case DB_TYPE_DB:
     dbp = (DB *)tsidb->dbp;
+#if DB_VERSION >= 403000
+    errno = dbp->stat(dbp, NULL, &sp, 0);
+#elif DB_VERSION >= 303011
+    errno = dbp->stat(dbp, &sp, 0);
+#else
     errno = dbp->stat(dbp, &sp, NULL, 0);
+#endif
     if (!errno) {
-#ifndef HAVE_DB3
-      return(sp->bt_nrecs);
-#else
+#if DB_VERSION >= 300000
       return(sp->bt_ndata);  /* or sp->bt_nkeys? */
+#else
+      return(sp->bt_nrecs);
 #endif
     }
     break;
@@ -502,14 +515,10 @@
     dbcp->c_close(dbcp);
   }
 
-#ifndef HAVE_DB3
-#if DB_VERSION_MINOR > 6 || (DB_VERSION_MINOR == 6 && DB_VERSION_PATCH > 4)
+#if DB_VERSION >= 206004
   dbp->cursor(dbp, NULL, &dbcp, 0);
 #else
   dbp->cursor(dbp, NULL, &dbcp);
-#endif
-#else
-  dbp->cursor(dbp, NULL, &dbcp, 0);
 #endif
   tsidb->dbcp = dbcp;
 




--- src/tabe_tsiyindbint.c.orig	Mon May  1 00:49:54 2006
+++ src/tabe_tsiyindbint.c	Mon May  1 00:50:03 2006
@@ -27,6 +27,7 @@
 #endif
 
 #include "tabe.h"
+#define DB_VERSION (DB_VERSION_MAJOR*100000+DB_VERSION_MINOR*1000+DB_VERSION_PATCH)
 
 static void tabeTsiYinDBClose(struct TsiYinDB *tsiyindb);
 static int  tabeTsiYinDBRecordNumber(struct TsiYinDB *tsiyindb);
@@ -72,7 +73,7 @@
 {
   DB *dbp=NULL;
 
-#ifdef HAVE_DB3
+#if DB_VERSION >= 300000
   /* create a db handler */
   if ((errno = db_create(&dbp, NULL, 0)) != 0) {
     fprintf(stderr, "db_create: %s\n", db_strerror(errno));
@@ -85,26 +86,32 @@
       return(NULL);
     }
     else {
-#ifndef HAVE_DB3
-      errno = db_open(db_name, DB_BTREE, DB_CREATE, 0644, NULL, NULL, &dbp);
-#else
+#if DB_VERSION >= 401025
+      errno = dbp->open(dbp, NULL, db_name, NULL, DB_BTREE, DB_CREATE, 0644);
+#elif DB_VERSION >= 300000
       errno = dbp->open(dbp, db_name, NULL, DB_BTREE, DB_CREATE, 0644);
+#else
+      errno = db_open(db_name, DB_BTREE, DB_CREATE, 0644, NULL, NULL, &dbp);
 #endif
     }
   }
   else {
     if (flags & DB_FLAG_READONLY) {
-#ifndef HAVE_DB3
-      errno = db_open(db_name, DB_BTREE, DB_RDONLY, 0444, NULL, NULL, &dbp);
-#else
+#if DB_VERSION >= 401025
+      errno = dbp->open(dbp, NULL, db_name, NULL, DB_BTREE, DB_RDONLY, 0444);
+#elif DB_VERSION >= 300000
       errno = dbp->open(dbp, db_name, NULL, DB_BTREE, DB_RDONLY, 0444);
+#else
+      errno = db_open(db_name, DB_BTREE, DB_RDONLY, 0444, NULL, NULL, &dbp);
 #endif
     }
     else {
-#ifndef HAVE_DB3
-      errno = db_open(db_name, DB_BTREE, 0, 0644, NULL, NULL, &dbp);
-#else
+#if DB_VERSION >= 401025
+      errno = dbp->open(dbp, NULL, db_name, NULL, DB_BTREE, 0, 0644);
+#elif DB_VERSION >= 300000
       errno = dbp->open(dbp, db_name, NULL, DB_BTREE, 0, 0644);
+#else
+      errno = db_open(db_name, DB_BTREE, 0, 0644, NULL, NULL, &dbp);
 #endif
     }
   }
@@ -115,11 +122,11 @@
   }
   if (errno < 0) {
     /* DB specific errno */
-#ifndef HAVE_DB3
+#if DB_VERSION >= 300000
+    fprintf(stderr, "tabeTsiYinDBOpen(): %s.\n", db_strerror(errno));
+#else
     fprintf(stderr, "tabeTsiYinDBOpen(): DB error opening DB File %s.\n",
 	    db_name);
-#else
-    fprintf(stderr, "tabeTsiYinDBOpen(): %s.\n", db_strerror(errno));
 #endif
     return(NULL);
   }
@@ -268,12 +275,18 @@
   switch(tsiyindb->type) {
   case DB_TYPE_DB:
     dbp = (DB *)tsiyindb->dbp;
+#if DB_VERSION >= 403000
+    errno = dbp->stat(dbp, NULL, &sp, 0);
+#elif DB_VERSION >= 303011
+    errno = dbp->stat(dbp, &sp, 0);
+#else
     errno = dbp->stat(dbp, &sp, NULL, 0);
+#endif
     if (!errno) {
-#ifndef HAVE_DB3
-      return(sp->bt_nrecs);
-#else
+#if DB_VERSION >= 300000
       return(sp->bt_ndata);  /* or sp->bt_nkeys? */
+#else
+      return(sp->bt_nrecs);
 #endif
     }
     break;
@@ -481,14 +494,10 @@
     dbcp->c_close(dbcp);
   }
 
-#ifndef HAVE_DB3
-#if DB_VERSION_MINOR > 6 || (DB_VERSION_MINOR == 6 && DB_VERSION_PATCH > 4)
+#if DB_VERSION >= 206004
   dbp->cursor(dbp, NULL, &dbcp, 0);
 #else
   dbp->cursor(dbp, NULL, &dbcp);
-#endif
-#else
-  dbp->cursor(dbp, NULL, &dbcp, 0);
 #endif
   tsiyindb->dbcp = dbcp;
 




--- util/tsipackdb.in.orig	Sun Nov 11 07:33:09 2001
+++ util/tsipackdb.in	Mon May  1 10:19:51 2006
@@ -29,31 +29,37 @@
 }
 
 pack_db_file () {
-    db_stat=`mywhich ${1}_stat`
-    db_dump=`mywhich ${1}_dump`
-    db_load=`mywhich ${1}_load`
-    test x$db_stat != x && test x$db_dump != x && test x$db_load != x && \
-	$db_stat -d $2 2>&1 | (
-	    read line
-	    read line
-	    test "$line" = "$3" && \
-		echo "Using $db_dump and $db_load to pack $2 ...." && \
-		${1}_dump $2 | ${1}_load $2.new && \
-		mv $2.new $2 && \
-		return 0
-	    return -1 \
-	)
-}
+    case "${1}" in
+    db|db3|db4|db41) 
+        db_dump=`mywhich ${1}_dump`
+        db_load=`mywhich ${1}_load`
+        ;;
+    db-4.[234])
+        db_name=${1#db-}
+        db_dump=`mywhich db_dump-${db_name}`
+        db_load=`mywhich db_load-${db_name}`
+        ;;
+    *)
+        echo "unsupportted Berkyley version: ${1}"
+        return 1
+    esac
+    if [ -x "$db_dump" ] && [ -x "$db_load" ]; then
+
+	echo "Try using $db_dump and $db_load to pack $2 ...."
 
+	$db_dump $2 > $2.tmp && \
+	$db_load $2.new < $2.tmp && \
+	mv $2.new $2 && \
+	return 0
 
-if [ "$USE_DB" = "DB2" ]; then
-    pack_db_file db  $1 "$DB2_VER" && exit 0
-    pack_db_file db2 $1 "$DB2_VER" && exit 0
-fi
+    fi
+
+    return 1
+}
 
-if [ "$USE_DB" = "DB3" ]; then
-    pack_db_file db  $1 "$DB3_VER" && exit 0
-    pack_db_file db3 $1 "$DB3_VER" && exit 0
-fi
+for dbname in @with_db_name@ db db2 db3 db4
+do
+    pack_db_file $dbname $1 && exit 0
+done
 
 exit 0

Return to bug 96606

Lines 25-42 Link Here

(-)/home/rafan/tmp/ports/a/libtabe/Makefile (-2 / +18 lines)
25	DOCSDIR= ${PREFIX}/share/doc/tabe	25	DOCSDIR= ${PREFIX}/share/doc/tabe
26	CONFIGURE_ARGS= --prefix=${PREFIX} \	26	CONFIGURE_ARGS= --prefix=${PREFIX} \
27	--includedir=${PREFIX}/include/tabe \	27	--includedir=${PREFIX}/include/tabe \
		28	--with-db-name=${BDB_LIB_NAME} \
28	--with-db-inc=${BDB_INCLUDE_DIR} \	29	--with-db-inc=${BDB_INCLUDE_DIR} \
29	--with-db-lib=${BDB_LIB_DIR} \	30	--with-db-lib=${BDB_LIB_DIR} \
30	--with-db-bin=${LOCALBASE}/bin \	31	--with-db-bin=${LOCALBASE}/bin \
31	--enable-shared	32	--enable-shared
32		33
33	.if !defined(WITHOUT_X11)	34	.if !defined(WITHOUT_X11)
34	PLIST_SUB+= X11=""
35	USE_XLIB= yes	35	USE_XLIB= yes
		36	PLIST_SUB+= X11=""
36	.else	37	.else
37	CONFIGURE_ARGS+=--without-x	38	CONFIGURE_ARGS+=--without-x
38	PLIST_SUB+= X11="@comment "	39	PLIST_SUB+= X11="@comment "
		40	.endif
		41
		42	.include <bsd.port.pre.mk>
		43
		44	pre-everything::
		45	.if defined(WITH_BDB_VER)
		46	@${ECHO} ""
		47	@${ECHO} "WARNING:"
		48	@${ECHO} " You have defined WITH_BDB_VER. Make sure you use the same"
		49	@${ECHO} " db version for all ports that use libtabe, such as xcin."
		50	@${ECHO} " Otherwise, ports that use libtabe may not work correctly."
		51	@${ECHO} ""
		52	.endif
		53
39	post-patch:	54	post-patch:
		55	.if defined(WITHOUT_X11)
40	${REINPLACE_CMD} -e '/all:/s/ bims//; /bims/d' ${WRKSRC}/src/Makefile.in	56	${REINPLACE_CMD} -e '/all:/s/ bims//; /bims/d' ${WRKSRC}/src/Makefile.in
41	.endif	57	.endif
42		58
Lines 55-58 Link Here
55	${MKDIR} ${DATADIR}	71	${MKDIR} ${DATADIR}
56	${TOUCH} ${DATADIR}/${PORTNAME}-${PORTVERSION}	72	${TOUCH} ${DATADIR}/${PORTNAME}-${PORTVERSION}
57		73
58	.include <bsd.port.mk>	74	.include <bsd.port.post.mk>

Lines 1-36 Link Here

(-)/home/rafan/tmp/ports/a/libtabe/files/patch-configure (-20 / +53 lines)
1	--- configure.orig Sat Oct 20 20:03:29 2001	1	--- configure.orig Sat Oct 20 07:03:29 2001
2	+++ configure Wed Apr 5 13:26:48 2006	2	+++ configure Mon May 1 10:53:24 2006
3	@@ -5315,18 +5315,15 @@	3	@@ -22,6 +22,8 @@
		4	ac_help="$ac_help
		5	--with-db-bin=PATH set the binary dir of Berkeley DB2/3."
		6	ac_help="$ac_help
		7	+ --with-db-name=NAME set the library name of Berkeley DB."
		8	+ac_help="$ac_help
		9	--enable-shared[=PKGS] build shared libraries [default=yes]"
		10	ac_help="$ac_help
		11	--enable-static[=PKGS] build static libraries [default=yes]"
		12	@@ -790,6 +792,14 @@
		13	:
		14	fi
		15
		16	+# Check whether --with-db_name or --without-db_name was given.
		17	+if test "${with_db_name+set}" = set; then
		18	+ withval="$with_db_name"
		19	+ test x$withval != x && with_db_name="$withval"
		20	+else
		21	+ with_db_name='db'
		22	+fi;
		23	+
		24
		25	if test "$program_prefix" != NONE; then
		26	program_prefix="$program_prefix/"
		27	@@ -5315,18 +5325,22 @@
4	cat conftest.$ac_ext >&5	28	cat conftest.$ac_ext >&5
5	fi	29	fi
6	rm -f conftest*	30	rm -f conftest*
7	-test "$ac_cv_search_db_create" = "no" && for i in db db3; do	31	-test "$ac_cv_search_db_create" = "no" && for i in db db3; do
8	+test "$ac_cv_search_db_create" = "no" && for i in db db3 db4 db41 db-4.2 db-4.3 db-4.4; do	32	+test "$ac_cv_search_db_create" = "no" && for i in $with_db_name; do
9	LIBS="-l$i $ac_func_search_save_LIBS"	33	LIBS="-l$i $ac_func_search_save_LIBS"
		34	+__db_create="db_create"
		35	+if [ "$i" = "db-4.2" ]; then
		36	+ __db_create="db_create_4002"
		37	+fi
10	cat > conftest.$ac_ext <<EOF	38	cat > conftest.$ac_ext <<EOF
11	#line 5322 "configure"	39	#line 5322 "configure"
12	#include "confdefs.h"	40	#include "confdefs.h"
13	-/* Override any gcc2 internal prototype to avoid an error. */	41	/* Override any gcc2 internal prototype to avoid an error. */
14	-/* We use char because int might match the return type of a gcc2	42	/* We use char because int might match the return type of a gcc2
15	- builtin and then its argument prototype would still apply. */	43	builtin and then its argument prototype would still apply. */
16	-char db_create();	44	-char db_create();
17	+#include "db.h"	45	+char $__db_create();
18		46
19	int main() {	47	int main() {
20	-db_create()	48	-db_create()
21	+db_create(0,0,0)	49	+$__db_create()
22	; return 0; }	50	; return 0; }
23	EOF	51	EOF
24	if { (eval echo configure:5333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then	52	if { (eval echo configure:5333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
25	@@ -5726,11 +5723,6 @@	53	@@ -5385,7 +5399,7 @@
26	echo "$ac_t""libraries $x_libraries, headers $x_includes" 1>&6	54	cat conftest.$ac_ext >&5
27	fi	55	fi
28		56	rm -f conftest*
29	-if test x$no_x = xyes; then	57	-test "$ac_cv_search_db_open" = "no" && for i in db db2; do
30	- echo "$ac_t""You need X11R6 header files to compile libtabe." 1>&6	58	+test "$ac_cv_search_db_open" = "no" && for i in $with_db_name; do
31	- echo "$ac_t""Please use --x-includes to configure." 1>&6	59	LIBS="-l$i $ac_func_search_save_LIBS"
32	- exit 1	60	cat > conftest.$ac_ext <<EOF
33	-fi	61	#line 5392 "configure"
34		62	@@ -6219,6 +6233,7 @@
35		63	s%@with_db_inc@%$with_db_inc%g
36		64	s%@with_db_lib@%$with_db_lib%g
		65	s%@with_db_bin@%$with_db_bin%g
		66	+s%@with_db_name@%$with_db_name%g
		67	s%@USE_DB@%$USE_DB%g
		68	s%@x_includes@%$x_includes%g
		69	s%@x_libraries@%$x_libraries%g

Lines 1-50 Link Here

(-)/home/rafan/tmp/ports/a/libtabe/files/patch-src::tabe_tsidbint.c (-23 / +86 lines)
1	--- src/tabe_tsidbint.c.orig Sun Nov 11 20:33:07 2001	1	--- src/tabe_tsidbint.c.orig Sun Nov 11 07:33:07 2001
2	+++ src/tabe_tsidbint.c Wed Apr 5 13:40:32 2006	2	+++ src/tabe_tsidbint.c Mon May 1 00:47:55 2006
3	@@ -84,8 +84,10 @@	3	@@ -27,6 +27,7 @@
		4	#endif
		5
		6	#include "tabe.h"
		7	+#define DB_VERSION (DB_VERSION_MAJOR100000+DB_VERSION_MINOR1000+DB_VERSION_PATCH)
		8
		9	static void tabeTsiDBClose(struct TsiDB *tsidb);
		10	static int tabeTsiDBRecordNumber(struct TsiDB *tsidb);
		11	@@ -69,7 +70,7 @@
		12	{
		13	DB *dbp=NULL;
		14
		15	-#ifdef HAVE_DB3
		16	+#if DB_VERSION >= 300000
		17	/* create a db handler */
		18	if ((errno = db_create(&dbp, NULL, 0)) != 0) {
		19	fprintf(stderr, "db_create: %s\n", db_strerror(errno));
		20	@@ -82,26 +83,32 @@
		21	return(NULL);
		22	}
4	else {	23	else {
5	#ifndef HAVE_DB3	24	-#ifndef HAVE_DB3
6	errno = db_open(db_name, DB_BTREE, DB_CREATE, 0644, NULL, NULL, &dbp);	25	- errno = db_open(db_name, DB_BTREE, DB_CREATE, 0644, NULL, NULL, &dbp);
7	-#else	26	-#else
8	+#elif (DB_VERSION_MAJOR == 3 \|\| (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 0))	27	+#if DB_VERSION >= 401025
		28	+ errno = dbp->open(dbp, NULL, db_name, NULL, DB_BTREE, DB_CREATE, 0644);
		29	+#elif DB_VERSION >= 300000
9	errno = dbp->open(dbp, db_name, NULL, DB_BTREE, DB_CREATE, 0644);	30	errno = dbp->open(dbp, db_name, NULL, DB_BTREE, DB_CREATE, 0644);
10	+#else	31	+#else
11	+ errno = dbp->open(dbp, NULL, db_name, NULL, DB_BTREE, DB_CREATE, 0644);	32	+ errno = db_open(db_name, DB_BTREE, DB_CREATE, 0644, NULL, NULL, &dbp);
12	#endif	33	#endif
13	}	34	}
14	}	35	}
15	@@ -93,15 +95,19 @@	36	else {
16	if (flags & DB_FLAG_READONLY) {	37	if (flags & DB_FLAG_READONLY) {
17	#ifndef HAVE_DB3	38	-#ifndef HAVE_DB3
18	errno = db_open(db_name, DB_BTREE, DB_RDONLY, 0444, NULL, NULL, &dbp);	39	- errno = db_open(db_name, DB_BTREE, DB_RDONLY, 0444, NULL, NULL, &dbp);
19	-#else	40	-#else
20	+#elif (DB_VERSION_MAJOR == 3 \|\| (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 0))	41	+#if DB_VERSION >= 401025
		42	+ errno = dbp->open(dbp, NULL, db_name, NULL, DB_BTREE, DB_RDONLY, 0444);
		43	+#elif DB_VERSION >= 300000
21	errno = dbp->open(dbp, db_name, NULL, DB_BTREE, DB_RDONLY, 0444);	44	errno = dbp->open(dbp, db_name, NULL, DB_BTREE, DB_RDONLY, 0444);
22	+#else	45	+#else
23	+ errno = dbp->open(dbp, NULL, db_name, NULL, DB_BTREE, DB_RDONLY, 0444);	46	+ errno = db_open(db_name, DB_BTREE, DB_RDONLY, 0444, NULL, NULL, &dbp);
24	#endif	47	#endif
25	}	48	}
26	else {	49	else {
27	#ifndef HAVE_DB3	50	-#ifndef HAVE_DB3
28	errno = db_open(db_name, DB_BTREE, 0, 0644, NULL, NULL, &dbp);	51	- errno = db_open(db_name, DB_BTREE, 0, 0644, NULL, NULL, &dbp);
29	-#else	52	-#else
30	+#elif (DB_VERSION_MAJOR == 3 \|\| (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 0))	53	+#if DB_VERSION >= 401025
		54	+ errno = dbp->open(dbp, NULL, db_name, NULL, DB_BTREE, 0, 0644);
		55	+#elif DB_VERSION >= 300000
31	errno = dbp->open(dbp, db_name, NULL, DB_BTREE, 0, 0644);	56	errno = dbp->open(dbp, db_name, NULL, DB_BTREE, 0, 0644);
32	+#else	57	+#else
33	+ errno = dbp->open(dbp, NULL, db_name, NULL, DB_BTREE, 0, 0644);	58	+ errno = db_open(db_name, DB_BTREE, 0, 0644, NULL, NULL, &dbp);
34	#endif	59	#endif
35	}	60	}
36	}	61	}
37	@@ -265,7 +271,13 @@	62	@@ -112,10 +119,10 @@
		63	}
		64	if (errno < 0) {
		65	/* DB specific errno */
		66	-#ifndef HAVE_DB3
		67	- fprintf(stderr, "tabeTsiDBOpen(): DB error opening DB File %s.\n", db_name);
		68	-#else
		69	+#if DB_VERSION >= 300000
		70	fprintf(stderr, "tabeTsiDBOpen(): %s.\n", db_strerror(errno));
		71	+#else
		72	+ fprintf(stderr, "tabeTsiDBOpen(): DB error opening DB File %s.\n", db_name);
		73	#endif
		74	return(NULL);
		75	}
		76	@@ -265,12 +272,18 @@
38	switch(tsidb->type) {	77	switch(tsidb->type) {
39	case DB_TYPE_DB:	78	case DB_TYPE_DB:
40	dbp = (DB *)tsidb->dbp;	79	dbp = (DB *)tsidb->dbp;
41	+#ifndef HAVE_DB3	80	+#if DB_VERSION >= 403000
42	errno = dbp->stat(dbp, &sp, NULL, 0);	81	+ errno = dbp->stat(dbp, NULL, &sp, 0);
43	+#elif (DB_VERSION_MAJOR == 3 \|\| (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR <= 2))	82	+#elif DB_VERSION >= 303011
44	+ errno = dbp->stat(dbp, &sp, 0);	83	+ errno = dbp->stat(dbp, &sp, 0);
45	+#else	84	+#else
46	+ errno = dbp->stat(dbp, NULL, &sp, 0);	85	errno = dbp->stat(dbp, &sp, NULL, 0);
47	+#endif	86	+#endif
48	if (!errno) {	87	if (!errno) {
49	#ifndef HAVE_DB3	88	-#ifndef HAVE_DB3
50	return(sp->bt_nrecs);	89	- return(sp->bt_nrecs);
		90	-#else
		91	+#if DB_VERSION >= 300000
		92	return(sp->bt_ndata); /* or sp->bt_nkeys? */
		93	+#else
		94	+ return(sp->bt_nrecs);
		95	#endif
		96	}
		97	break;
		98	@@ -502,14 +515,10 @@
		99	dbcp->c_close(dbcp);
		100	}
		101
		102	-#ifndef HAVE_DB3
		103	-#if DB_VERSION_MINOR > 6 \|\| (DB_VERSION_MINOR == 6 && DB_VERSION_PATCH > 4)
		104	+#if DB_VERSION >= 206004
		105	dbp->cursor(dbp, NULL, &dbcp, 0);
		106	#else
		107	dbp->cursor(dbp, NULL, &dbcp);
		108	-#endif
		109	-#else
		110	- dbp->cursor(dbp, NULL, &dbcp, 0);
		111	#endif
		112	tsidb->dbcp = dbcp;
		113

Lines 1-50 Link Here

(-)/home/rafan/tmp/ports/a/libtabe/files/patch-src::tabe_tsiyindbint.c (-23 / +87 lines)
1	--- src/tabe_tsiyindbint.c.orig Sun Nov 11 20:33:08 2001	1	--- src/tabe_tsiyindbint.c.orig Mon May 1 00:49:54 2006
2	+++ src/tabe_tsiyindbint.c Wed Apr 5 14:30:18 2006	2	+++ src/tabe_tsiyindbint.c Mon May 1 00:50:03 2006
3	@@ -87,8 +87,10 @@	3	@@ -27,6 +27,7 @@
		4	#endif
		5
		6	#include "tabe.h"
		7	+#define DB_VERSION (DB_VERSION_MAJOR100000+DB_VERSION_MINOR1000+DB_VERSION_PATCH)
		8
		9	static void tabeTsiYinDBClose(struct TsiYinDB *tsiyindb);
		10	static int tabeTsiYinDBRecordNumber(struct TsiYinDB *tsiyindb);
		11	@@ -72,7 +73,7 @@
		12	{
		13	DB *dbp=NULL;
		14
		15	-#ifdef HAVE_DB3
		16	+#if DB_VERSION >= 300000
		17	/* create a db handler */
		18	if ((errno = db_create(&dbp, NULL, 0)) != 0) {
		19	fprintf(stderr, "db_create: %s\n", db_strerror(errno));
		20	@@ -85,26 +86,32 @@
		21	return(NULL);
		22	}
4	else {	23	else {
5	#ifndef HAVE_DB3	24	-#ifndef HAVE_DB3
6	errno = db_open(db_name, DB_BTREE, DB_CREATE, 0644, NULL, NULL, &dbp);	25	- errno = db_open(db_name, DB_BTREE, DB_CREATE, 0644, NULL, NULL, &dbp);
7	-#else	26	-#else
8	+#elif (DB_VERSION_MAJOR == 3 \|\| (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 0))	27	+#if DB_VERSION >= 401025
		28	+ errno = dbp->open(dbp, NULL, db_name, NULL, DB_BTREE, DB_CREATE, 0644);
		29	+#elif DB_VERSION >= 300000
9	errno = dbp->open(dbp, db_name, NULL, DB_BTREE, DB_CREATE, 0644);	30	errno = dbp->open(dbp, db_name, NULL, DB_BTREE, DB_CREATE, 0644);
10	+#else	31	+#else
11	+ errno = dbp->open(dbp, NULL, db_name, NULL, DB_BTREE, DB_CREATE, 0644);	32	+ errno = db_open(db_name, DB_BTREE, DB_CREATE, 0644, NULL, NULL, &dbp);
12	#endif	33	#endif
13	}	34	}
14	}	35	}
15	@@ -96,15 +98,19 @@	36	else {
16	if (flags & DB_FLAG_READONLY) {	37	if (flags & DB_FLAG_READONLY) {
17	#ifndef HAVE_DB3	38	-#ifndef HAVE_DB3
18	errno = db_open(db_name, DB_BTREE, DB_RDONLY, 0444, NULL, NULL, &dbp);	39	- errno = db_open(db_name, DB_BTREE, DB_RDONLY, 0444, NULL, NULL, &dbp);
19	-#else	40	-#else
20	+#elif (DB_VERSION_MAJOR == 3 \|\| (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 0))	41	+#if DB_VERSION >= 401025
		42	+ errno = dbp->open(dbp, NULL, db_name, NULL, DB_BTREE, DB_RDONLY, 0444);
		43	+#elif DB_VERSION >= 300000
21	errno = dbp->open(dbp, db_name, NULL, DB_BTREE, DB_RDONLY, 0444);	44	errno = dbp->open(dbp, db_name, NULL, DB_BTREE, DB_RDONLY, 0444);
22	+#else	45	+#else
23	+ errno = dbp->open(dbp, NULL, db_name, NULL, DB_BTREE, DB_RDONLY, 0444);	46	+ errno = db_open(db_name, DB_BTREE, DB_RDONLY, 0444, NULL, NULL, &dbp);
24	#endif	47	#endif
25	}	48	}
26	else {	49	else {
27	#ifndef HAVE_DB3	50	-#ifndef HAVE_DB3
28	errno = db_open(db_name, DB_BTREE, 0, 0644, NULL, NULL, &dbp);	51	- errno = db_open(db_name, DB_BTREE, 0, 0644, NULL, NULL, &dbp);
29	-#else	52	-#else
30	+#elif (DB_VERSION_MAJOR == 3 \|\| (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 0))	53	+#if DB_VERSION >= 401025
		54	+ errno = dbp->open(dbp, NULL, db_name, NULL, DB_BTREE, 0, 0644);
		55	+#elif DB_VERSION >= 300000
31	errno = dbp->open(dbp, db_name, NULL, DB_BTREE, 0, 0644);	56	errno = dbp->open(dbp, db_name, NULL, DB_BTREE, 0, 0644);
32	+#else	57	+#else
33	+ errno = dbp->open(dbp, NULL, db_name, NULL, DB_BTREE, 0, 0644);	58	+ errno = db_open(db_name, DB_BTREE, 0, 0644, NULL, NULL, &dbp);
34	#endif	59	#endif
35	}	60	}
36	}	61	}
37	@@ -268,7 +274,13 @@	62	@@ -115,11 +122,11 @@
		63	}
		64	if (errno < 0) {
		65	/* DB specific errno */
		66	-#ifndef HAVE_DB3
		67	+#if DB_VERSION >= 300000
		68	+ fprintf(stderr, "tabeTsiYinDBOpen(): %s.\n", db_strerror(errno));
		69	+#else
		70	fprintf(stderr, "tabeTsiYinDBOpen(): DB error opening DB File %s.\n",
		71	db_name);
		72	-#else
		73	- fprintf(stderr, "tabeTsiYinDBOpen(): %s.\n", db_strerror(errno));
		74	#endif
		75	return(NULL);
		76	}
		77	@@ -268,12 +275,18 @@
38	switch(tsiyindb->type) {	78	switch(tsiyindb->type) {
39	case DB_TYPE_DB:	79	case DB_TYPE_DB:
40	dbp = (DB *)tsiyindb->dbp;	80	dbp = (DB *)tsiyindb->dbp;
41	+#ifndef HAVE_DB3	81	+#if DB_VERSION >= 403000
42	errno = dbp->stat(dbp, &sp, NULL, 0);	82	+ errno = dbp->stat(dbp, NULL, &sp, 0);
43	+#elif (DB_VERSION_MAJOR == 3 \|\| (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR <= 2))	83	+#elif DB_VERSION >= 303011
44	+ errno = dbp->stat(dbp, &sp, 0);	84	+ errno = dbp->stat(dbp, &sp, 0);
45	+#else	85	+#else
46	+ errno = dbp->stat(dbp, NULL, &sp, 0);	86	errno = dbp->stat(dbp, &sp, NULL, 0);
47	+#endif	87	+#endif
48	if (!errno) {	88	if (!errno) {
49	#ifndef HAVE_DB3	89	-#ifndef HAVE_DB3
50	return(sp->bt_nrecs);	90	- return(sp->bt_nrecs);
		91	-#else
		92	+#if DB_VERSION >= 300000
		93	return(sp->bt_ndata); /* or sp->bt_nkeys? */
		94	+#else
		95	+ return(sp->bt_nrecs);
		96	#endif
		97	}
		98	break;
		99	@@ -481,14 +494,10 @@
		100	dbcp->c_close(dbcp);
		101	}
		102
		103	-#ifndef HAVE_DB3
		104	-#if DB_VERSION_MINOR > 6 \|\| (DB_VERSION_MINOR == 6 && DB_VERSION_PATCH > 4)
		105	+#if DB_VERSION >= 206004
		106	dbp->cursor(dbp, NULL, &dbcp, 0);
		107	#else
		108	dbp->cursor(dbp, NULL, &dbcp);
		109	-#endif
		110	-#else
		111	- dbp->cursor(dbp, NULL, &dbcp, 0);
		112	#endif
		113	tsiyindb->dbcp = dbcp;
		114

Line 0 Link Here

(-)/home/rafan/tmp/ports/a/libtabe/files/patch-util-tsipackdb.in (+63 lines)
	1	--- util/tsipackdb.in.orig Sun Nov 11 07:33:09 2001
	2	+++ util/tsipackdb.in Mon May 1 10:19:51 2006
	3	@@ -29,31 +29,37 @@
	4	}
	5
	6	pack_db_file () {
	7	- db_stat=`mywhich ${1}_stat`
	8	- db_dump=`mywhich ${1}_dump`
	9	- db_load=`mywhich ${1}_load`
	10	- test x$db_stat != x && test x$db_dump != x && test x$db_load != x && \
	11	- $db_stat -d $2 2>&1 \| (
	12	- read line
	13	- read line
	14	- test "$line" = "$3" && \
	15	- echo "Using $db_dump and $db_load to pack $2 ...." && \
	16	- ${1}_dump $2 \| ${1}_load $2.new && \
	17	- mv $2.new $2 && \
	18	- return 0
	19	- return -1 \
	20	- )
	21	-}
	22	+ case "${1}" in
	23	+ db\|db3\|db4\|db41)
	24	+ db_dump=`mywhich ${1}_dump`
	25	+ db_load=`mywhich ${1}_load`
	26	+ ;;
	27	+ db-4.[234])
	28	+ db_name=${1#db-}
	29	+ db_dump=`mywhich db_dump-${db_name}`
	30	+ db_load=`mywhich db_load-${db_name}`
	31	+ ;;
	32	+ *)
	33	+ echo "unsupportted Berkyley version: ${1}"
	34	+ return 1
	35	+ esac
	36	+ if [ -x "$db_dump" ] && [ -x "$db_load" ]; then
	37	+
	38	+ echo "Try using $db_dump and $db_load to pack $2 ...."
	39
	40	+ $db_dump $2 > $2.tmp && \
	41	+ $db_load $2.new < $2.tmp && \
	42	+ mv $2.new $2 && \
	43	+ return 0
	44
	45	-if [ "$USE_DB" = "DB2" ]; then
	46	- pack_db_file db $1 "$DB2_VER" && exit 0
	47	- pack_db_file db2 $1 "$DB2_VER" && exit 0
	48	-fi
	49	+ fi
	50	+
	51	+ return 1
	52	+}
	53
	54	-if [ "$USE_DB" = "DB3" ]; then
	55	- pack_db_file db $1 "$DB3_VER" && exit 0
	56	- pack_db_file db3 $1 "$DB3_VER" && exit 0
	57	-fi
	58	+for dbname in @with_db_name@ db db2 db3 db4
	59	+do
	60	+ pack_db_file $dbname $1 && exit 0
	61	+done
	62
	63	exit 0