[57615] trunk/dports/editors/nvi

[toby at macports.org]

Revision: 57615
          http://trac.macports.org/changeset/57615
Author:   toby at macports.org
Date:     2009-09-13 23:23:04 -0700 (Sun, 13 Sep 2009)
Log Message:
-----------
update to use db 4.x
take maintainership

Modified Paths:
--------------
    trunk/dports/editors/nvi/Portfile

Added Paths:
-----------
    trunk/dports/editors/nvi/files/patch-common__db.h

Modified: trunk/dports/editors/nvi/Portfile
===================================================================
--- trunk/dports/editors/nvi/Portfile	2009-09-14 06:21:48 UTC (rev 57614)
+++ trunk/dports/editors/nvi/Portfile	2009-09-14 06:23:04 UTC (rev 57615)
@@ -4,8 +4,9 @@
 
 name            nvi
 version         1.81.6
+revision        1
 categories      editors
-maintainers     nomaintainer
+maintainers     toby
 description     A vi/ex clone
 
 long_description \
@@ -20,20 +21,23 @@
 use_bzip2       yes
 worksrcdir      ${name}-${version}/dist
 
-depends_lib \
-    port:db3
+set my_db_version db47
 
+depends_lib     port:ncurses port:${my_db_version}
+
 patchfiles \
+    patch-common__db.h \
     patch-ex_script.c.diff
 
 configure.args \
     --program-prefix=n \
-    --with-db3=${prefix} \
     --without-x \
     --mandir=${prefix}/share/man
 
 configure.cppflags-append \
-    -I${prefix}/include/db3
+    -I${prefix}/include/${my_db_version}
+configure.ldflags-append \
+    -L${prefix}/lib/${my_db_version}
 
 variant x11 {
     configure.args-delete --without-x

Added: trunk/dports/editors/nvi/files/patch-common__db.h
===================================================================
--- trunk/dports/editors/nvi/files/patch-common__db.h	                        (rev 0)
+++ trunk/dports/editors/nvi/files/patch-common__db.h	2009-09-14 06:23:04 UTC (rev 57615)
@@ -0,0 +1,14 @@
+--- ../common/db.h.orig	2009-09-13 23:17:35.000000000 -0700
++++ ../common/db.h	2009-09-13 23:18:27.000000000 -0700
+@@ -16,7 +16,10 @@
+     (env)->remove(env, path, NULL, flags)
+ #endif
+ 
+-#if DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 1
++#if DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 4
++#define db_open(db,file,type,flags,mode)				\
++    (db)->open(db, NULL, file, NULL, type, flags | DB_CREATE, mode)
++#elif DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 1
+ #define db_open(db,file,type,flags,mode)				\
+     (db)->open(db, NULL, file, NULL, type, flags, mode)
+ #else
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090913/4ffd1702/attachment-0001.html>