Tue Sep 16 22:20:02 2008 UTC ()
Add USE_TOOLS+= tbl (appeases pkglint).


(bjs)
diff -r1.47 -r1.48 pkgsrc/x11/xterm/Makefile
cvs diff -r1.47 -r1.48 pkgsrc/x11/xterm/Makefile (switch to unified diff)

--- pkgsrc/x11/xterm/Makefile 2008/09/16 22:18:26 1.47
+++ pkgsrc/x11/xterm/Makefile 2008/09/16 22:20:01 1.48
@@ -1,65 +1,67 @@ @@ -1,65 +1,67 @@
1# $NetBSD: Makefile,v 1.47 2008/09/16 22:18:26 bjs Exp $ 1# $NetBSD: Makefile,v 1.48 2008/09/16 22:20:01 bjs Exp $
2 2
3DISTNAME= xterm-237 3DISTNAME= xterm-237
4CATEGORIES= x11 4CATEGORIES= x11
5MASTER_SITES= ftp://invisible-island.net/xterm/ \ 5MASTER_SITES= ftp://invisible-island.net/xterm/ \
6 http://www.sfr-fresh.com/unix/misc/ 6 http://www.sfr-fresh.com/unix/misc/
7EXTRACT_SUFX= .tgz 7EXTRACT_SUFX= .tgz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://dickey.his.com/xterm/xterm.html 10HOMEPAGE= http://dickey.his.com/xterm/xterm.html
11COMMENT= Latest terminal emulator for the X Window System 11COMMENT= Latest terminal emulator for the X Window System
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
15GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
16USE_DIRS+= xdg-1.4 16USE_DIRS+= xdg-1.4
 17USE_TOOLS+= tbl
 18
17WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} 19WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
18 20
19CONFIGURE_ARGS+= --enable-88-color 21CONFIGURE_ARGS+= --enable-88-color
20CONFIGURE_ARGS+= --enable-256-color 22CONFIGURE_ARGS+= --enable-256-color
21CONFIGURE_ARGS+= --enable-luit 23CONFIGURE_ARGS+= --enable-luit
22CONFIGURE_ARGS+= --enable-paste64 24CONFIGURE_ARGS+= --enable-paste64
23CONFIGURE_ARGS+= --enable-mini-luit 25CONFIGURE_ARGS+= --enable-mini-luit
24CONFIGURE_ARGS+= --enable-readline-mouse 26CONFIGURE_ARGS+= --enable-readline-mouse
25CONFIGURE_ARGS+= --enable-toolbar # Resource disabled by default 27CONFIGURE_ARGS+= --enable-toolbar # Resource disabled by default
26 28
27CONFIGURE_ARGS.standard=# empty 29CONFIGURE_ARGS.standard=# empty
28CONFIGURE_ARGS.3d= --with-Xaw3d 30CONFIGURE_ARGS.3d= --with-Xaw3d
29CONFIGURE_ARGS.xpm= --with-Xaw3d 31CONFIGURE_ARGS.xpm= --with-Xaw3d
30CONFIGURE_ARGS.neXtaw= --with-neXtaw 32CONFIGURE_ARGS.neXtaw= --with-neXtaw
31CONFIGURE_ARGS+= ${${CONFIGURE_ARGS.${XAW_TYPE}}:L} 33CONFIGURE_ARGS+= ${${CONFIGURE_ARGS.${XAW_TYPE}}:L}
32 34
33.include "../../mk/bsd.prefs.mk" 35.include "../../mk/bsd.prefs.mk"
34 36
35.if ${X11_TYPE} == "modular" 37.if ${X11_TYPE} == "modular"
36CONFIGURE_ARGS+= --disable-imake 38CONFIGURE_ARGS+= --disable-imake
37CONFIGURE_ARGS+= --enable-narrowproto 39CONFIGURE_ARGS+= --enable-narrowproto
38.endif 40.endif
39 41
40.if exists(/usr/include/wchar.h) 42.if exists(/usr/include/wchar.h)
41CONFIGURE_ARGS+= --enable-wide-chars 43CONFIGURE_ARGS+= --enable-wide-chars
42.endif 44.endif
43 45
44.include "../../x11/libX11/buildlink3.mk" 46.include "../../x11/libX11/buildlink3.mk"
45.include "../../x11/libXt/buildlink3.mk" 47.include "../../x11/libXt/buildlink3.mk"
46### 48###
47### For detection of XKB bell extension. 49### For detection of XKB bell extension.
48### 50###
49BUILDLINK_DEPMETHOD.libxkbfile?= build 51BUILDLINK_DEPMETHOD.libxkbfile?= build
50.include "../../x11/libxkbfile/buildlink3.mk" 52.include "../../x11/libxkbfile/buildlink3.mk"
51 53
52post-install: 54post-install:
53 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/applications && \ 55 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/applications && \
54 ${INSTALL_DATA} ${WRKSRC}/xterm.desktop \ 56 ${INSTALL_DATA} ${WRKSRC}/xterm.desktop \
55 ${DESTDIR}${PREFIX}/share/applications && \ 57 ${DESTDIR}${PREFIX}/share/applications && \
56 ${INSTALL_DATA} ${WRKSRC}/uxterm.desktop \ 58 ${INSTALL_DATA} ${WRKSRC}/uxterm.desktop \
57 ${DESTDIR}${PREFIX}/share/applications 59 ${DESTDIR}${PREFIX}/share/applications
58 cd ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 && tbl xterm.1 \ 60 cd ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 && tbl xterm.1 \
59 > xterm.1.tbl && mv xterm.1.tbl xterm.1 61 > xterm.1.tbl && mv xterm.1.tbl xterm.1
60 62
61.include "options.mk" 63.include "options.mk"
62 64
63.include "../../mk/termcap.buildlink3.mk" 65.include "../../mk/termcap.buildlink3.mk"
64.include "../../mk/xaw.buildlink3.mk" 66.include "../../mk/xaw.buildlink3.mk"
65.include "../../mk/bsd.pkg.mk" 67.include "../../mk/bsd.pkg.mk"