Re: MKXORG=yes on Linux: nbmtree: existing entry for `libXaw.so', type `link' does not match type `file'

[Hubert Feyrer <hubert%feyrer.de@localhost>]

Hi,

the fix below replaces "hardlink to symlink" by "symlink to symlink" and 
thus makes building on both NetBSD and Linux work again, see my postings 
to current-users@ on the problem[1][2].

Can I commit the patch below?


 - Hubert

[1] http://mail-index.netbsd.org/current-users/2008/09/30/msg004940.html
[2] http://mail-index.netbsd.org/current-users/2008/09/30/msg004941.html



Index: external/mit/xorg/lib/libXaw/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/lib/libXaw/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- external/mit/xorg/lib/libXaw/Makefile       13 Sep 2008 04:32:30 -0000      
1.2
+++ external/mit/xorg/lib/libXaw/Makefile       30 Sep 2008 21:13:09 -0000
@@ -6,16 +6,16 @@
 LIBOLD=        Xaw

 .if ${MKSTATICLIB} != "no"
-LINKS=          ${X11USRLIBDIR}/lib${LIB}.a ${X11USRLIBDIR}/lib${LIBOLD}.a
+SYMLINKS=          lib${LIB}.a ${X11USRLIBDIR}/lib${LIBOLD}.a
 .endif

 .if ${MKPROFILE} != "no"
-LINKS+=         ${X11USRLIBDIR}/lib${LIB}_p.a ${X11USRLIBDIR}/lib${LIBOLD}_p.a
+SYMLINKS+=         lib${LIB}_p.a ${X11USRLIBDIR}/lib${LIBOLD}_p.a
 .endif

 .if ${MKPIC} != "no"
-LINKS+=         ${X11USRLIBDIR}/lib${LIB}.so ${X11USRLIBDIR}/lib${LIBOLD}.so
-LINKS+=         ${X11USRLIBDIR}/lib${LIB}.so.8 
${X11USRLIBDIR}/lib${LIBOLD}.so.8
+SYMLINKS+=         lib${LIB}.so ${X11USRLIBDIR}/lib${LIBOLD}.so
+SYMLINKS+=         lib${LIB}.so.8 ${X11USRLIBDIR}/lib${LIBOLD}.so.8
 .endif

 .PATH: ${X11SRCDIR.Xaw}/src
Index: external/mit/xorg/lib/libXaw6/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/lib/libXaw6/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- external/mit/xorg/lib/libXaw6/Makefile      13 Sep 2008 04:32:30 -0000      
1.2
+++ external/mit/xorg/lib/libXaw6/Makefile      30 Sep 2008 21:13:09 -0000
@@ -9,7 +9,7 @@
 LIBOLD=        Xaw

 .if ${MKPIC} != "no"
-LINKS+=         ${X11USRLIBDIR}/lib${LIB}.so.6 
${X11USRLIBDIR}/lib${LIBOLD}.so.6
+SYMLINKS+=         lib${LIB}.so.6 ${X11USRLIBDIR}/lib${LIBOLD}.so.6
 .endif

 .PATH: ${X11SRCDIR.Xaw}/src
Index: external/mit/xorg/lib/libXaw7/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/lib/libXaw7/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- external/mit/xorg/lib/libXaw7/Makefile      13 Sep 2008 04:32:30 -0000      
1.2
+++ external/mit/xorg/lib/libXaw7/Makefile      30 Sep 2008 21:13:09 -0000
@@ -6,7 +6,7 @@
 LIBOLD=        Xaw

 .if ${MKPIC} != "no"
-LINKS+=         ${X11USRLIBDIR}/lib${LIB}.so.7 
${X11USRLIBDIR}/lib${LIBOLD}.so.7
+SYMLINKS+=         lib${LIB}.so.7 ${X11USRLIBDIR}/lib${LIBOLD}.so.7
 .endif

 .PATH: ${X11SRCDIR.Xaw}/src