Module Name: src
Committed By: snj
Date: Fri Apr 10 20:40:19 UTC 2015
Modified Files:
src/distrib/sets/lists/xcomp [netbsd-7]: mi
src/external/mit/xorg/lib/libXaw [netbsd-7]: Makefile
Log Message:
Pull up following revision(s) (requested by mrg in ticket #673):
distrib/sets/lists/xcomp/mi: revision 1.162
external/mit/xorg/lib/libXaw/Makefile: revision 1.10
don't install X11/Xaw/Print.h and X11/Xaw/PrintSP.h. they haven't been
included upstream since libXaw 1.0.5 (released in 2008) and are useless
in this Xprint-less world.
To generate a diff of this commit:
cvs rdiff -u -r1.152.2.5 -r1.152.2.6 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.9 -r1.9.20.1 src/external/mit/xorg/lib/libXaw/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.152.2.5 src/distrib/sets/lists/xcomp/mi:1.152.2.6
--- src/distrib/sets/lists/xcomp/mi:1.152.2.5 Wed Mar 11 07:21:15 2015
+++ src/distrib/sets/lists/xcomp/mi Fri Apr 10 20:40:19 2015
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.152.2.5 2015/03/11 07:21:15 snj Exp $
+# $NetBSD: mi,v 1.152.2.6 2015/04/10 20:40:19 snj Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -5240,8 +5240,8 @@
./usr/X11R7/include/X11/Xaw/PannerP.h -unknown- xorg
./usr/X11R7/include/X11/Xaw/Porthole.h -unknown- xorg
./usr/X11R7/include/X11/Xaw/PortholeP.h -unknown- xorg
-./usr/X11R7/include/X11/Xaw/Print.h -unknown- xorg
-./usr/X11R7/include/X11/Xaw/PrintSP.h -unknown- xorg
+./usr/X11R7/include/X11/Xaw/Print.h -obsoltete- obsolete
+./usr/X11R7/include/X11/Xaw/PrintSP.h -obsolete- obsolete
./usr/X11R7/include/X11/Xaw/Repeater.h -unknown- xorg
./usr/X11R7/include/X11/Xaw/RepeaterP.h -unknown- xorg
./usr/X11R7/include/X11/Xaw/Reports.h -unknown- xorg
Index: src/external/mit/xorg/lib/libXaw/Makefile
diff -u src/external/mit/xorg/lib/libXaw/Makefile:1.9 src/external/mit/xorg/lib/libXaw/Makefile:1.9.20.1
--- src/external/mit/xorg/lib/libXaw/Makefile:1.9 Thu Aug 11 23:15:38 2011
+++ src/external/mit/xorg/lib/libXaw/Makefile Fri Apr 10 20:40:19 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2011/08/11 23:15:38 joerg Exp $
+# $NetBSD: Makefile,v 1.9.20.1 2015/04/10 20:40:19 snj Exp $
.include <bsd.own.mk>
@@ -38,7 +38,7 @@ INCS= AllWidgets.h AsciiSink.h AsciiSink
Form.h FormP.h Grip.h GripP.h Label.h LabelP.h List.h \
ListP.h MenuButton.h MenuButtoP.h MultiSrc.h MultiSrcP.h \
MultiSink.h MultiSinkP.h Paned.h PanedP.h Panner.h \
- PannerP.h Porthole.h PortholeP.h Print.h PrintSP.h \
+ PannerP.h Porthole.h PortholeP.h \
Repeater.h RepeaterP.h Reports.h Scrollbar.h ScrollbarP.h \
Simple.h SimpleP.h SimpleMenu.h SimpleMenP.h Sme.h SmeP.h \
SmeBSB.h SmeBSBP.h SmeLine.h SmeLineP.h StripChart.h \