[src/trunk]: src/external/mit/xorg handle moved manual pages, and tools build...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/external/mit/xorg handle moved manual pages, and tools build...
From: mrg <mrg%NetBSD.org@localhost>
Date: Tue, 07 Apr 2020 00:41:42 +0000

details:   https://anonhg.NetBSD.org/src/rev/ca9f29a3b7df
branches:  trunk
changeset: 787047:ca9f29a3b7df
user:      mrg <mrg%NetBSD.org@localhost>
date:      Fri May 31 05:24:49 2013 +0000

description:
handle moved manual pages, and tools build of bdftopcf.

diffstat:

 external/mit/xorg/bin/appres/Makefile      |  5 +++--
 external/mit/xorg/bin/bdftopcf/Makefile    |  5 ++++-
 external/mit/xorg/bin/beforelight/Makefile |  3 ++-
 external/mit/xorg/bin/editres/Makefile     |  3 ++-
 external/mit/xorg/bin/fslsfonts/Makefile   |  3 ++-
 external/mit/xorg/bin/fstobdf/Makefile     |  3 ++-
 external/mit/xorg/bin/listres/Makefile     |  3 ++-
 external/mit/xorg/bin/mkfontdir/Makefile   |  3 ++-
 external/mit/xorg/tools/bdftopcf/Makefile  |  5 +++--
 9 files changed, 22 insertions(+), 11 deletions(-)

diffs (158 lines):

diff -r 43bad89c76ee -r ca9f29a3b7df external/mit/xorg/bin/appres/Makefile
--- a/external/mit/xorg/bin/appres/Makefile     Fri May 31 01:50:25 2013 +0000
+++ b/external/mit/xorg/bin/appres/Makefile     Fri May 31 05:24:49 2013 +0000
@@ -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 @@
 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>
diff -r 43bad89c76ee -r ca9f29a3b7df external/mit/xorg/bin/bdftopcf/Makefile
--- a/external/mit/xorg/bin/bdftopcf/Makefile   Fri May 31 01:50:25 2013 +0000
+++ b/external/mit/xorg/bin/bdftopcf/Makefile   Fri May 31 05:24:49 2013 +0000
@@ -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>
diff -r 43bad89c76ee -r ca9f29a3b7df external/mit/xorg/bin/beforelight/Makefile
--- a/external/mit/xorg/bin/beforelight/Makefile        Fri May 31 01:50:25 2013 +0000
+++ b/external/mit/xorg/bin/beforelight/Makefile        Fri May 31 05:24:49 2013 +0000
@@ -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 @@
        ${LIBXPM} ${LIBXEXT} ${LIBX11}
 
 .PATH: ${X11SRCDIR.beforelight} ${X11SRCDIR.beforelight}/app-defaults
+.PATH: ${X11SRCDIR.${PROG}}/man
 
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
diff -r 43bad89c76ee -r ca9f29a3b7df external/mit/xorg/bin/editres/Makefile
--- a/external/mit/xorg/bin/editres/Makefile    Fri May 31 01:50:25 2013 +0000
+++ b/external/mit/xorg/bin/editres/Makefile    Fri May 31 05:24:49 2013 +0000
@@ -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 @@
        ${LIBXPM} ${LIBXEXT} ${LIBX11}
 
 .PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}}/man
 
 CWARNFLAGS.clang+=     -Wno-format
 
diff -r 43bad89c76ee -r ca9f29a3b7df external/mit/xorg/bin/fslsfonts/Makefile
--- a/external/mit/xorg/bin/fslsfonts/Makefile  Fri May 31 01:50:25 2013 +0000
+++ b/external/mit/xorg/bin/fslsfonts/Makefile  Fri May 31 05:24:49 2013 +0000
@@ -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 @@
 DPADD+=        ${LIBFS}
 
 .PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}}/man
 
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
diff -r 43bad89c76ee -r ca9f29a3b7df external/mit/xorg/bin/fstobdf/Makefile
--- a/external/mit/xorg/bin/fstobdf/Makefile    Fri May 31 01:50:25 2013 +0000
+++ b/external/mit/xorg/bin/fstobdf/Makefile    Fri May 31 05:24:49 2013 +0000
@@ -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+=        ${LIBFS} ${LIBXEXT} ${LIBX11}
 
 .PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}}/man
 
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
diff -r 43bad89c76ee -r ca9f29a3b7df external/mit/xorg/bin/listres/Makefile
--- a/external/mit/xorg/bin/listres/Makefile    Fri May 31 01:50:25 2013 +0000
+++ b/external/mit/xorg/bin/listres/Makefile    Fri May 31 05:24:49 2013 +0000
@@ -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 @@
        ${LIBXPM} ${LIBXEXT} ${LIBX11}
 
 .PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}}/man
 
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
diff -r 43bad89c76ee -r ca9f29a3b7df external/mit/xorg/bin/mkfontdir/Makefile
--- a/external/mit/xorg/bin/mkfontdir/Makefile  Fri May 31 01:50:25 2013 +0000
+++ b/external/mit/xorg/bin/mkfontdir/Makefile  Fri May 31 05:24:49 2013 +0000
@@ -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
 
diff -r 43bad89c76ee -r ca9f29a3b7df external/mit/xorg/tools/bdftopcf/Makefile
--- a/external/mit/xorg/tools/bdftopcf/Makefile Fri May 31 01:50:25 2013 +0000
+++ b/external/mit/xorg/tools/bdftopcf/Makefile Fri May 31 05:24:49 2013 +0000
@@ -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 @@
                -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 \

Prev by Date: [src/trunk]: src/external/mit/xorg/bin/xfs remove cache.c from SRCS list for ...
Next by Date: [src/trunk]: src/external/mit/xorg/bin/imake add -Wno-error to work around so...
Previous by Thread: [src/trunk]: src/external/mit/xorg/bin/xfs remove cache.c from SRCS list for ...
Next by Thread: [src/trunk]: src/external/mit/xorg/bin/imake add -Wno-error to work around so...
Indexes:

Home | Main Index | Thread Index | Old Index