Module Name: src
Committed By: mrg
Date: Fri Jun 12 06:57:22 UTC 2009
Modified Files:
src/distrib/sets/lists/xbase: mi
src/external/mit/xorg/bin/xvidtune: Makefile
Log Message:
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.75 -r1.76 src/distrib/sets/lists/xbase/mi
cvs rdiff -u -r1.1.1.1 -r1.2 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.75 src/distrib/sets/lists/xbase/mi:1.76
--- src/distrib/sets/lists/xbase/mi:1.75 Fri Jun 12 01:55:59 2009
+++ src/distrib/sets/lists/xbase/mi Fri Jun 12 06:57:22 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.75 2009/06/12 01:55:59 mrg Exp $
+# $NetBSD: mi,v 1.76 2009/06/12 06:57:22 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1345,6 +1345,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.2
--- 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 Fri Jun 12 06:57:22 2009
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2009/06/12 06:57:22 mrg 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
