Module Name: src
Committed By: mrg
Date: Fri May 31 05:24:50 UTC 2013
Modified Files:
src/external/mit/xorg/bin/appres: Makefile
src/external/mit/xorg/bin/bdftopcf: Makefile
src/external/mit/xorg/bin/beforelight: Makefile
src/external/mit/xorg/bin/editres: Makefile
src/external/mit/xorg/bin/fslsfonts: Makefile
src/external/mit/xorg/bin/fstobdf: Makefile
src/external/mit/xorg/bin/listres: Makefile
src/external/mit/xorg/bin/mkfontdir: Makefile
src/external/mit/xorg/tools/bdftopcf: Makefile
Log Message:
handle moved manual pages, and tools build of bdftopcf.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/appres/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/bdftopcf/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/beforelight/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/editres/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/fslsfonts/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/fstobdf/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/listres/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/mkfontdir/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/tools/bdftopcf/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/appres/Makefile
diff -u src/external/mit/xorg/bin/appres/Makefile:1.1.1.1 src/external/mit/xorg/bin/appres/Makefile:1.2
--- src/external/mit/xorg/bin/appres/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/appres/Makefile Fri May 31 05:24:49 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2013/05/31 05:24:49 mrg Exp $
.include <bsd.own.mk>
@@ -7,7 +7,8 @@ PROG= appres
LDADD+= -lXt -lSM -lICE -lXext -lX11 -lXdmcp -lXau
DPADD+= ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11} ${LIBXDMCP} ${LIBXAU}
-.PATH: ${X11SRCDIR.appres}
+.PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}}/man
.include <bsd.x11.mk>
.include <bsd.prog.mk>
Index: src/external/mit/xorg/bin/bdftopcf/Makefile
diff -u src/external/mit/xorg/bin/bdftopcf/Makefile:1.2 src/external/mit/xorg/bin/bdftopcf/Makefile:1.3
--- src/external/mit/xorg/bin/bdftopcf/Makefile:1.2 Sat Jul 23 23:42:02 2011
+++ src/external/mit/xorg/bin/bdftopcf/Makefile Fri May 31 05:24:49 2013
@@ -1,13 +1,16 @@
-# $NetBSD: Makefile,v 1.2 2011/07/23 23:42:02 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2013/05/31 05:24:49 mrg Exp $
.include <bsd.own.mk>
PROG= bdftopcf
+CPPFLAGS+= -I${X11SRCDIR.${PROG}}/../include -DHAVE_CONFIG_H
+
LDADD+= -lXfont -lfontenc -lfreetype -lm -lz -lbz2
DPADD+= ${LIBXFONT} ${LIBFONTENC} ${LIBFREETYPE} ${LIBM} ${LIBZ} ${LIBBZ2}
.PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}}/man
.include <bsd.x11.mk>
.include <bsd.prog.mk>
Index: src/external/mit/xorg/bin/beforelight/Makefile
diff -u src/external/mit/xorg/bin/beforelight/Makefile:1.2 src/external/mit/xorg/bin/beforelight/Makefile:1.3
--- src/external/mit/xorg/bin/beforelight/Makefile:1.2 Sun Nov 21 02:33:39 2010
+++ src/external/mit/xorg/bin/beforelight/Makefile Fri May 31 05:24:49 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/11/21 02:33:39 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2013/05/31 05:24:49 mrg Exp $
.include <bsd.own.mk>
@@ -12,6 +12,7 @@ DPADD+= ${LIBXSS} ${LIBXAW} ${LIBXMU} ${
${LIBXPM} ${LIBXEXT} ${LIBX11}
.PATH: ${X11SRCDIR.beforelight} ${X11SRCDIR.beforelight}/app-defaults
+.PATH: ${X11SRCDIR.${PROG}}/man
.include <bsd.x11.mk>
.include <bsd.prog.mk>
Index: src/external/mit/xorg/bin/editres/Makefile
diff -u src/external/mit/xorg/bin/editres/Makefile:1.2 src/external/mit/xorg/bin/editres/Makefile:1.3
--- src/external/mit/xorg/bin/editres/Makefile:1.2 Thu Aug 11 23:15:35 2011
+++ src/external/mit/xorg/bin/editres/Makefile Fri May 31 05:24:49 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/08/11 23:15:35 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2013/05/31 05:24:49 mrg Exp $
.include <bsd.own.mk>
@@ -13,6 +13,7 @@ DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${L
${LIBXPM} ${LIBXEXT} ${LIBX11}
.PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}}/man
CWARNFLAGS.clang+= -Wno-format
Index: src/external/mit/xorg/bin/fslsfonts/Makefile
diff -u src/external/mit/xorg/bin/fslsfonts/Makefile:1.1.1.1 src/external/mit/xorg/bin/fslsfonts/Makefile:1.2
--- src/external/mit/xorg/bin/fslsfonts/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/fslsfonts/Makefile Fri May 31 05:24:49 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2013/05/31 05:24:49 mrg Exp $
.include <bsd.own.mk>
@@ -8,6 +8,7 @@ LDADD+= -lFS
DPADD+= ${LIBFS}
.PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}}/man
.include <bsd.x11.mk>
.include <bsd.prog.mk>
Index: src/external/mit/xorg/bin/fstobdf/Makefile
diff -u src/external/mit/xorg/bin/fstobdf/Makefile:1.1.1.1 src/external/mit/xorg/bin/fstobdf/Makefile:1.2
--- src/external/mit/xorg/bin/fstobdf/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/fstobdf/Makefile Fri May 31 05:24:49 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2013/05/31 05:24:49 mrg Exp $
.include <bsd.own.mk>
@@ -9,6 +9,7 @@ LDADD+= -lFS -lXext -lX11
DPADD+= ${LIBFS} ${LIBXEXT} ${LIBX11}
.PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}}/man
.include <bsd.x11.mk>
.include <bsd.prog.mk>
Index: src/external/mit/xorg/bin/listres/Makefile
diff -u src/external/mit/xorg/bin/listres/Makefile:1.1.1.1 src/external/mit/xorg/bin/listres/Makefile:1.2
--- src/external/mit/xorg/bin/listres/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/listres/Makefile Fri May 31 05:24:49 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2013/05/31 05:24:49 mrg Exp $
.include <bsd.own.mk>
@@ -9,6 +9,7 @@ DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${L
${LIBXPM} ${LIBXEXT} ${LIBX11}
.PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}}/man
.include <bsd.x11.mk>
.include <bsd.prog.mk>
Index: src/external/mit/xorg/bin/mkfontdir/Makefile
diff -u src/external/mit/xorg/bin/mkfontdir/Makefile:1.1.1.1 src/external/mit/xorg/bin/mkfontdir/Makefile:1.2
--- src/external/mit/xorg/bin/mkfontdir/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/mkfontdir/Makefile Fri May 31 05:24:49 2013
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2013/05/31 05:24:49 mrg Exp $
.include <bsd.own.mk>
.PATH: ${X11SRCDIR.mkfontdir}
+.PATH: ${X11SRCDIR.mkfontdir}/man
MAN= mkfontdir.1
Index: src/external/mit/xorg/tools/bdftopcf/Makefile
diff -u src/external/mit/xorg/tools/bdftopcf/Makefile:1.5 src/external/mit/xorg/tools/bdftopcf/Makefile:1.6
--- src/external/mit/xorg/tools/bdftopcf/Makefile:1.5 Sun Dec 19 13:04:54 2010
+++ src/external/mit/xorg/tools/bdftopcf/Makefile Fri May 31 05:24:50 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/12/19 13:04:54 tsutsui Exp $
+# $NetBSD: Makefile,v 1.6 2013/05/31 05:24:50 mrg Exp $
NOMAN= 1
@@ -17,7 +17,8 @@ HOST_CPPFLAGS+= -I${DESTDIR}${X11INCDIR}
-I${DESTDIR}${X11INCDIR}/freetype2 \
-I${X11SRCDIR.Xfont}/src/stubs \
-DBDFFORMAT -DPCFFORMAT -DSNFFORMAT -DX_GZIP_FONT_COMPRESSION \
- -DFONT_ENCODINGS_DIRECTORY=\"${X11FONTDIR}/encodings/encodings.dir\"
+ -DFONT_ENCODINGS_DIRECTORY=\"${X11FONTDIR}/encodings/encodings.dir\" \
+ -DPACKAGE_STRING="\"NetBSD tool bdftopcf 1.0.4\""
.PATH: ${X11SRCDIR.Xfont}/src/bitmap
SRCS+= bdfread.c bdfutils.c bitmap.c bitmaputil.c fontink.c \
