Module Name: src Committed By: bouyer Date: Wed Jun 17 20:13:35 UTC 2009
Modified Files: src/distrib/sets/lists/xbase [netbsd-5]: mi src/external/mit/xorg/bin/xvidtune [netbsd-5]: Makefile Log Message: Pull up following revision(s) (requested by mrg in ticket #805): external/mit/xorg/bin/xvidtune/Makefile: revision 1.2 distrib/sets/lists/xbase/mi: revision 1.76 fix xsrc/41577: install the Xvidtune app-defaults file, after the necessary preprocessing and sed processing it needs. To generate a diff of this commit: cvs rdiff -u -r1.69.2.2 -r1.69.2.3 src/distrib/sets/lists/xbase/mi cvs rdiff -u -r1.1.1.1 -r1.1.1.1.8.1 \ src/external/mit/xorg/bin/xvidtune/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/xbase/mi diff -u src/distrib/sets/lists/xbase/mi:1.69.2.2 src/distrib/sets/lists/xbase/mi:1.69.2.3 --- src/distrib/sets/lists/xbase/mi:1.69.2.2 Wed Feb 18 01:10:57 2009 +++ src/distrib/sets/lists/xbase/mi Wed Jun 17 20:13:35 2009 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.69.2.2 2009/02/18 01:10:57 snj Exp $ +# $NetBSD: mi,v 1.69.2.3 2009/06/17 20:13:35 bouyer Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -1348,6 +1348,7 @@ ./usr/X11R7/lib/X11/app-defaults/Xmessage -unknown- xorg ./usr/X11R7/lib/X11/app-defaults/Xmessage-color -unknown- xorg ./usr/X11R7/lib/X11/app-defaults/Xmh -unknown- xorg +./usr/X11R7/lib/X11/app-defaults/Xvidtune -unknown- xorg ./usr/X11R7/lib/X11/locale/C/Compose -unknown- xorg ./usr/X11R7/lib/X11/locale/C/XI18N_OBJS -unknown- xorg ./usr/X11R7/lib/X11/locale/C/XLC_LOCALE -unknown- xorg Index: src/external/mit/xorg/bin/xvidtune/Makefile diff -u src/external/mit/xorg/bin/xvidtune/Makefile:1.1.1.1 src/external/mit/xorg/bin/xvidtune/Makefile:1.1.1.1.8.1 --- src/external/mit/xorg/bin/xvidtune/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008 +++ src/external/mit/xorg/bin/xvidtune/Makefile Wed Jun 17 20:13:35 2009 @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $ +# $NetBSD: Makefile,v 1.1.1.1.8.1 2009/06/17 20:13:35 bouyer Exp $ .include <bsd.own.mk> PROG= xvidtune -#APPDEFS= Xvidtune.ad +APPDEFS= Xvidtune.ad SRCS= xvidtune.c @@ -13,6 +13,14 @@ .PATH: ${X11SRCDIR.${PROG}} +VENDOR_NAME=The Xorg Foundation + +Xvidtune.ad: Xvidtune.cpp Makefile + $(CC) -E ${X11SRCDIR.xvidtune}/Xvidtune.cpp | \ + sed -e 's/^\#.*$$//g' -e 's|__VENDOR__|$(VENDOR_NAME)|' > ${.TARGET} + +CLEANFILES+= Xvidtune.ad + .include <bsd.x11.mk> .include <bsd.prog.mk> #XTODO= Xvidtune.ad