[32269] trunk/dports/editors/nvi

23 Dec 2007

Revision: 32269
          http://trac.macosforge.org/projects/macports/changeset/32269
Author:   ryandesign@macports.org
Date:     2007-12-23 05:50:00 -0800 (Sun, 23 Dec 2007)

Log Message:
-----------
nvi: update to 1.81.6; see #13680

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

Added Paths:
-----------
    trunk/dports/editors/nvi/files/patch-ex_script.c.diff

Removed Paths:
-------------
    trunk/dports/editors/nvi/files/patch-ex__ex_script.c
    trunk/dports/editors/nvi/files/patch_configure

Modified: trunk/dports/editors/nvi/Portfile
===================================================================

--- trunk/dports/editors/nvi/Portfile	2007-12-23 13:44:49 UTC (rev 32268)
+++ trunk/dports/editors/nvi/Portfile	2007-12-23 13:50:00 UTC (rev 32269)
@@ -2,7 +2,7 @@
 
 PortSystem 1.0
 name            nvi
-version         1.81.5
+version         1.81.6
 categories      editors
 maintainers     nomaintainer
 description     A vi/ex clone
@@ -13,15 +13,16 @@
 homepage        http://www.bostic.com/vi/
 platforms       darwin
 master_sites	http://www.kotnet.org/~skimo/nvi/devel/
-checksums       md5 5cc674f049054f3e8f7600df8d8d5cf4 
+checksums       md5 88d1e23115ee9f2961186b62e55f5704
+use_bzip2       yes
 worksrcdir	${name}-${version}/dist
 depends_lib	port:db3
 
-patchfiles 	patch_configure patch-ex__ex_script.c
+patchfiles	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
 
-#build.target
 variant x11 {
     configure.args-delete --without-x
     configure.args-append --with-x

Deleted: trunk/dports/editors/nvi/files/patch-ex__ex_script.c
===================================================================
--- trunk/dports/editors/nvi/files/patch-ex__ex_script.c	2007-12-23 13:44:49 UTC (rev 32268)
+++ trunk/dports/editors/nvi/files/patch-ex__ex_script.c	2007-12-23 13:50:00 UTC (rev 32269)
@@ -1,24 +0,0 @@
---- ../ex/ex_script.c.orig	2005-09-28 19:37:10.000000000 -0700
-+++ ../ex/ex_script.c	2005-09-28 19:37:23.000000000 -0700
-@@ -12,6 +12,10 @@
- 
- #include "config.h"
- 
-+#ifdef __APPLE__
-+#undef HAVE_SYS5_PTY
-+#endif
-+
- #ifndef lint
- static const char sccsid[] = "$Id: patch-ex__ex_script.c,v 1.1 2005/09/29 02:56:02 toby Exp $ (Berkeley) $Date: 2005/09/29 02:56:02 $";
- #endif /* not lint */
-@@ -45,6 +49,10 @@
- #include "script.h"
- #include "pathnames.h"
- 
-+#ifdef __APPLE__
-+#undef HAVE_SYS5_PTY
-+#endif
-+
- static void	sscr_check __P((SCR *));
- static int	sscr_getprompt __P((SCR *));
- static int	sscr_init __P((SCR *));

Copied: trunk/dports/editors/nvi/files/patch-ex_script.c.diff (from rev 32259, trunk/dports/editors/nvi/files/patch-ex__ex_script.c)
===================================================================
--- trunk/dports/editors/nvi/files/patch-ex_script.c.diff	                        (rev 0)
+++ trunk/dports/editors/nvi/files/patch-ex_script.c.diff	2007-12-23 13:50:00 UTC (rev 32269)
@@ -0,0 +1,24 @@
+--- ../ex/ex_script.c	2007-11-18 10:41:42.000000000 -0600
++++ ../ex/ex_script.c	2007-12-23 07:24:58.000000000 -0600
+@@ -12,6 +12,10 @@
+ 
+ #include "config.h"
+ 
++#ifdef __APPLE__
++#undef HAVE_SYS5_PTY
++#endif
++
+ #ifndef lint
+ static const char sccsid[] = "$Id: ex_script.c,v 10.38 2001/06/25 15:19:19 skimo Exp $ (Berkeley) $Date: 2001/06/25 15:19:19 $";
+ #endif /* not lint */
+@@ -45,6 +49,10 @@
+ #include "script.h"
+ #include "pathnames.h"
+ 
++#ifdef __APPLE__
++#undef HAVE_SYS5_PTY
++#endif
++
+ static void	sscr_check __P((SCR *));
+ static int	sscr_getprompt __P((SCR *));
+ static int	sscr_init __P((SCR *));

Deleted: trunk/dports/editors/nvi/files/patch_configure
===================================================================
--- trunk/dports/editors/nvi/files/patch_configure	2007-12-23 13:44:49 UTC (rev 32268)
+++ trunk/dports/editors/nvi/files/patch_configure	2007-12-23 13:50:00 UTC (rev 32269)
@@ -1,42 +0,0 @@
---- configure.org	Wed Jul 23 15:11:42 2003
-+++ configure	Wed Jul 23 15:13:51 2003
-@@ -3560,7 +3560,7 @@
-     ;;
- 
-   darwin* | rhapsody*)
--    allow_undefined_flag='-undefined suppress'
-+    allow_undefined_flag='-undefined suppress -flat_namespace'
-     # FIXME: Relying on posixy $() will cause problems for
-     #        cross-compilation, but unfortunately the echo tests do not
-     #        yet detect zsh echo's removal of \ escapes.
-@@ -10676,17 +10676,17 @@
- saveLDFLAGS="$LDFLAGS"
- if test "x$with_db3" != "x"; then
- 	LDFLAGS="-L$with_db3/lib $LDFLAGS"
--	CFLAGS="-I$with_db3/include $CFLAGS"
-+	CFLAGS="-I$with_db3/include/db3 $CFLAGS"
- fi;
- 
--echo $ac_n "checking for db_create in -ldb""... $ac_c" 1>&6
--echo "configure:10684: checking for db_create in -ldb" >&5
-+echo $ac_n "checking for db_create in -ldb-3.3""... $ac_c" 1>&6
-+echo "configure:10684: checking for db_create in -ldb-3.3" >&5
- ac_lib_var=`echo db'_'db_create | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-ldb  $LIBS"
-+LIBS="-ldb-3.3  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 10692 "configure"
- #include "confdefs.h"
-@@ -10835,7 +10835,7 @@
- 	dl_src=../common/dldb.c
- 	LIBS="-ldl $LIBS"
- else
--	LIBS="-ldb $LIBS"
-+	LIBS="-ldb-3.3 $LIBS"
- 	if test "X$with_db3" != "X"; then
- 		LDFLAGS="`echo $with_db3/lib | sed "$LRscript"` $LDFLAGS"
- 	fi

    

ryandesign＠macports.org

tags

participants (1)