diff options
Diffstat (limited to 'editors/nvi-devel/files')
| -rw-r--r-- | editors/nvi-devel/files/patch-configure | 41 | ||||
| -rw-r--r-- | editors/nvi-devel/files/patch-configure-incl | 17 | ||||
| -rw-r--r-- | editors/nvi-devel/files/patch-vi-relative | 57 |
3 files changed, 41 insertions, 74 deletions
diff --git a/editors/nvi-devel/files/patch-configure b/editors/nvi-devel/files/patch-configure new file mode 100644 index 000000000000..8ee779b5196b --- /dev/null +++ b/editors/nvi-devel/files/patch-configure @@ -0,0 +1,41 @@ +# This patch makes the following changes: +# +# - -ldb -> -ldb3 +# - db3 include files in include/db3, not include +# +# As far as I can tell, both of these are FreeBSDisms, so this patch +# should not be submitted to the vendor. + +--- ../dist/configure~ Sun Feb 10 23:08:14 2002 ++++ ../dist/configure Sun Feb 10 23:08:11 2002 +@@ -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 -ldb3""... $ac_c" 1>&6 ++echo "configure:10684: checking for db_create in -ldb3" >&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="-ldb3 $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="-ldb3 $LIBS" + if test "X$with_db3" != "X"; then + LDFLAGS="`echo $with_db3/lib | sed "$LRscript"` $LDFLAGS" + fi diff --git a/editors/nvi-devel/files/patch-configure-incl b/editors/nvi-devel/files/patch-configure-incl deleted file mode 100644 index 475f48c03463..000000000000 --- a/editors/nvi-devel/files/patch-configure-incl +++ /dev/null @@ -1,17 +0,0 @@ -# The db3 port installs its include files into ${PREFIX}/include/db3, -# but the distfile assumes they're in ${PREFIX}/include. This seems -# to be a FreeBSDism, so this patch has not, and probably should not, -# be submitted to the maintainer. - -diff -ru nvi-1.81.4.orig/dist/configure nvi-1.81.4/dist/configure ---- nvi-1.81.4.orig/dist/configure Mon Jun 18 14:24:37 2001 -+++ nvi-1.81.4/dist/configure Fri Jul 6 03:27:53 2001 -@@ -6980,7 +6980,7 @@ - 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 -I$with_db3/include/db3 $CFLAGS" - fi; - - echo $ac_n "checking for db_create in -ldb""... $ac_c" 1>&6 diff --git a/editors/nvi-devel/files/patch-vi-relative b/editors/nvi-devel/files/patch-vi-relative deleted file mode 100644 index 735dc464c03d..000000000000 --- a/editors/nvi-devel/files/patch-vi-relative +++ /dev/null @@ -1,57 +0,0 @@ -# Vendor patch to fix FreeBSD PR 28687. - -diff -ru nvi-1.81.4.orig/vi/vs_relative.c nvi-1.81.4/vi/vs_relative.c ---- nvi-1.81.4.orig/vi/vs_relative.c Wed Jul 19 10:05:20 2000 -+++ nvi-1.81.4/vi/vs_relative.c Mon Jul 9 15:26:39 2001 -@@ -10,7 +10,7 @@ - #include "config.h" - - #ifndef lint --static const char sccsid[] = "$Id: vs_relative.c,v 10.16 2000/07/19 17:05:20 skimo Exp $ (Berkeley) $Date: 2000/07/19 17:05:20 $"; -+static const char sccsid[] = "$Id: vs_relative.c,v 10.18 2001/07/08 13:02:48 skimo Exp $ (Berkeley) $Date: 2001/07/08 13:02:48 $"; - #endif /* not lint */ - - #include <sys/types.h> -@@ -111,6 +111,15 @@ - int ch, leftright, listset; - CHAR_T *p; - -+ /* -+ * Initialize the screen offset. -+ */ -+ scno = 0; -+ -+ /* Leading number if O_NUMBER option set. */ -+ if (O_ISSET(sp, O_NUMBER)) -+ scno += O_NUMBER_LENGTH; -+ - /* Need the line to go any further. */ - if (lp == NULL) { - (void)db_get(sp, lno, 0, &lp, &len); -@@ -122,7 +131,7 @@ - if (lp == NULL) { - done: if (diffp != NULL) /* XXX */ - *diffp = 0; -- return (0); -+ return scno; - } - - /* Store away the values of the list and leftright edit options. */ -@@ -130,15 +139,10 @@ - leftright = O_ISSET(sp, O_LEFTRIGHT); - - /* -- * Initialize the pointer into the buffer and screen and current -- * offsets. -+ * Initialize the pointer into the buffer and current offset. - */ - p = lp; -- curoff = scno = 0; -- -- /* Leading number if O_NUMBER option set. */ -- if (O_ISSET(sp, O_NUMBER)) -- scno += O_NUMBER_LENGTH; -+ curoff = 0; - - /* Macro to return the display length of any signal character. */ - #define CHLEN(val) (ch = *(UCHAR_T *)p++) == '\t' && \ |