Mon Jul 4 21:07:02 2016 UTC ()
Unbreak linking on Mac OS X when bootstrap is build with full option.


(morr)
diff -r1.1 -r1.2 pkgsrc/editors/vim-share/patches/patch-auto_configure
cvs diff -r1.1 -r1.2 pkgsrc/editors/vim-share/patches/patch-auto_configure (expand / switch to unified diff)

--- pkgsrc/editors/vim-share/patches/patch-auto_configure 2012/08/28 05:59:39 1.1
+++ pkgsrc/editors/vim-share/patches/patch-auto_configure 2016/07/04 21:07:02 1.2
@@ -1,15 +1,25 @@ @@ -1,15 +1,25 @@
1$NetBSD: patch-auto_configure,v 1.1 2012/08/28 05:59:39 morr Exp $ 1$NetBSD: patch-auto_configure,v 1.2 2016/07/04 21:07:02 morr Exp $
2 2
3Buildlink takes care of include files. 3Buildlink takes care of include files.
 4Also, remove stray dollar.
4 5
5--- src/auto/configure.orig 2012-05-25 09:26:29.000000000 +0000 6--- auto/configure.orig 2016-07-02 20:33:46.000000000 +0000
6+++ src/auto/configure 7+++ auto/configure
7@@ -8198,7 +8198,7 @@ fi 8@@ -9490,7 +9490,7 @@ fi
8  9
9  10
10 if test -z "$SKIP_MOTIF"; then 11 if test -z "$SKIP_MOTIF"; then
11- gui_XXX="/usr/XXX/Motif* /usr/Motif*/XXX /usr/XXX /usr/shlib /usr/X11*/XXX /usr/XXX/X11* /usr/dt/XXX /local/Motif*/XXX /local/XXX/Motif* /usr/local/Motif*/XXX /usr/local/XXX/Motif* /usr/local/XXX /usr/local/X11*/XXX /usr/local/LessTif/Motif*/XXX $MOTIFHOME/XXX" 12- gui_XXX="/usr/XXX/Motif* /usr/Motif*/XXX /usr/XXX /usr/shlib /usr/X11*/XXX /usr/XXX/X11* /usr/dt/XXX /local/Motif*/XXX /local/XXX/Motif* /usr/local/Motif*/XXX /usr/local/XXX/Motif* /usr/local/XXX /usr/local/X11*/XXX /usr/local/LessTif/Motif*/XXX $MOTIFHOME/XXX"
12+ gui_XXX="${MOTIFBASE}/include" 13+ gui_XXX="${MOTIFBASE}/include"
13 GUI_INC_LOC="`echo $GUI_INC_LOC|sed 's%-I%%g'`" 14 GUI_INC_LOC="`echo $GUI_INC_LOC|sed 's%-I%%g'`"
14  15
15 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of Motif GUI includes" >&5 16 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of Motif GUI includes" >&5
 17@@ -14028,7 +14028,7 @@ if test "x$MACOSX" = "xyes"; then
 18 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need -framework Cocoa" >&5
 19 $as_echo_n "checking whether we need -framework Cocoa... " >&6; }
 20 if test "x$features" != "xtiny" || test "x$enable_multibyte" = "xyes"; then
 21- LIBS=$"$LIBS -framework Cocoa"
 22+ LIBS="$LIBS -framework Cocoa"
 23 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 24 $as_echo "yes" >&6; }
 25 else