Fri May 21 06:04:37 2010 UTC ()
look for and find the app-defaults in the new app-defalts/ subdir of
the distribution sources.  also, most of them lost the ".ad" suffix.


(mrg)
diff -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/viewres/Makefile
diff -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xcalc/Makefile
diff -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xgc/Makefile
diff -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xlogo/Makefile
cvs diff -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/viewres/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/bin/viewres/Makefile 2008/07/29 05:01:22 1.1.1.1
+++ src/external/mit/xorg/bin/viewres/Makefile 2010/05/21 06:04:36 1.2
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $ 1# $NetBSD: Makefile,v 1.2 2010/05/21 06:04:36 mrg Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5PROG= viewres 5PROG= viewres
6 6
7APPDEFS=Viewres.ad 7APPDEFS=Viewres Viewres-color
8 8
9LDADD+= -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11 9LDADD+= -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11
10DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \ 10DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
11 ${LIBXPM} ${LIBXEXT} ${LIBX11} 11 ${LIBXPM} ${LIBXEXT} ${LIBX11}
12 12
13.PATH: ${X11SRCDIR.${PROG}} 13.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
14 14
15.include <bsd.x11.mk> 15.include <bsd.x11.mk>
16.include <bsd.prog.mk> 16.include <bsd.prog.mk>
cvs diff -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xcalc/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/bin/xcalc/Makefile 2008/07/29 05:01:22 1.1.1.1
+++ src/external/mit/xorg/bin/xcalc/Makefile 2010/05/21 06:04:36 1.2
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $ 1# $NetBSD: Makefile,v 1.2 2010/05/21 06:04:36 mrg Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5PROG= xcalc 5PROG= xcalc
6SRCS= actions.c math.c xcalc.c 6SRCS= actions.c math.c xcalc.c
7 7
8APPDEFS=XCalc.ad XCalc-color.ad 8APPDEFS=XCalc XCalc-color
9 9
10LDADD+= -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11 -lm 10LDADD+= -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11 -lm
11DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \ 11DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
12 ${LIBXPM} ${LIBXEXT} ${LIBX11} ${LIBM} 12 ${LIBXPM} ${LIBXEXT} ${LIBX11} ${LIBM}
13 13
14.PATH: ${X11SRCDIR.${PROG}} 14.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
15 15
16.include <bsd.x11.mk> 16.include <bsd.x11.mk>
17.include <bsd.prog.mk> 17.include <bsd.prog.mk>
cvs diff -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xgc/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/bin/xgc/Makefile 2008/07/29 05:01:22 1.1.1.1
+++ src/external/mit/xorg/bin/xgc/Makefile 2010/05/21 06:04:37 1.2
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $ 1# $NetBSD: Makefile,v 1.2 2010/05/21 06:04:37 mrg Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5PROG= xgc 5PROG= xgc
6SRCS= dashlist.c planemask.c getfile.c tests.c text.c \ 6SRCS= dashlist.c planemask.c getfile.c tests.c text.c \
7 choice.c main.c interpret.c record.c testfrac.c gram.y lex.l 7 choice.c main.c interpret.c record.c testfrac.c gram.y lex.l
8 8
9YHEADER=1 9YHEADER=1
10CPPFLAGS+=-I. -I${X11SRCDIR.${PROG}} -DHAS_SNPRINTF 10CPPFLAGS+=-I. -I${X11SRCDIR.${PROG}} -DHAS_SNPRINTF
11 11
12APPDEFS=Xgc.ad 12APPDEFS=Xgc Xgc-color
13 13
14LDADD+= -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11 -lm 14LDADD+= -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11 -lm
15DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXPM} \ 15DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXPM} \
16 ${LIBXEXT} ${LIBX11} ${LIBM} 16 ${LIBXEXT} ${LIBX11} ${LIBM}
17 17
18.PATH: ${X11SRCDIR.${PROG}} 18.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
19 19
20.include <bsd.x11.mk> 20.include <bsd.x11.mk>
21.include <bsd.prog.mk> 21.include <bsd.prog.mk>
cvs diff -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xlogo/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/bin/xlogo/Makefile 2008/07/29 05:01:22 1.1.1.1
+++ src/external/mit/xorg/bin/xlogo/Makefile 2010/05/21 06:04:37 1.2
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $ 1# $NetBSD: Makefile,v 1.2 2010/05/21 06:04:37 mrg Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5PROG= xlogo 5PROG= xlogo
6SRCS= xlogo.c Logo.c RenderLogo.c 6SRCS= xlogo.c Logo.c RenderLogo.c
7 7
8CPPFLAGS+= -DXRENDER -DXFREE86_FT2 -I${DESTDIR}${X11INCDIR}/freetype2 8CPPFLAGS+= -DXRENDER -DXFREE86_FT2 -I${DESTDIR}${X11INCDIR}/freetype2
9 9
10APPDEFS=XLogo.ad XLogo-color.ad 10APPDEFS=XLogo XLogo-color
11 11
12LDADD+= -lXft -lfontconfig -lfreetype -lexpat -lXrender 12LDADD+= -lXft -lfontconfig -lfreetype -lexpat -lXrender
13DPADD+= ${LIBXFT} ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT} ${LIBXRENDER} 13DPADD+= ${LIBXFT} ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT} ${LIBXRENDER}
14LDADD+= -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11 -lm 14LDADD+= -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11 -lm
15DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \ 15DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
16 ${LIBXPM} ${LIBXEXT} ${LIBX11} ${LIBM} 16 ${LIBXPM} ${LIBXEXT} ${LIBX11} ${LIBM}
17 17
18.PATH: ${X11SRCDIR.${PROG}} 18.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
19 19
20.include <bsd.x11.mk> 20.include <bsd.x11.mk>
21.include <bsd.prog.mk> 21.include <bsd.prog.mk>