diff options
author | bjs <bjs> | 2007-09-17 06:36:21 +0000 |
---|---|---|
committer | bjs <bjs> | 2007-09-17 06:36:21 +0000 |
commit | eccb945df8c4b216bd8c8f2c5320def96db680c5 (patch) | |
tree | 62539203ab1f39251094f8ff5f554e4cc29e9e25 /x11/xterm | |
parent | fdda3ff1464873e78c7408fd09538e644549c328 (diff) | |
download | pkgsrc-eccb945df8c4b216bd8c8f2c5320def96db680c5.tar.gz |
Update to version #229. Too many changes to list here; please see
${WRKSRC}/xterm.log.html. Additionally, the pkgsrc-specific
changes are:
-- Add an "xterm-toolbar" option and add it to PKG_DEFAULT_OPTIONS. Now
we may all enjoy pull-down menus.
-- In the ${X11_TYPE} == "modular" case, add --disable-imake and
--enable-narrowproto to CONFIGURE_ARGS. The latter fixes [possible]
problems with Xaw scrollbars.
-- Add USE_DIRS+=xdg-1.4 to handle newly-provided xterm pixmaps.
-- Add build-time dependency on x11/libxkbfile to pull in XKB extension
headers, e.g. ${X11BASE}/include/X11/extensions/XKBbells.h. The XKB
bell extension should now be properly detected and supported.
- Add "pcre" option, thereby supporting devel/pcre as xterm's regex
library.
Changes ok'd (more or less) by joerg@ and tested by me. For more detail
wrt: rationale for --enable-narrowproto and/or libxkbfile dependency,
please contact me.
Diffstat (limited to 'x11/xterm')
-rw-r--r-- | x11/xterm/Makefile | 15 | ||||
-rw-r--r-- | x11/xterm/PLIST | 9 | ||||
-rw-r--r-- | x11/xterm/distinfo | 8 | ||||
-rw-r--r-- | x11/xterm/options.mk | 14 |
4 files changed, 36 insertions, 10 deletions
diff --git a/x11/xterm/Makefile b/x11/xterm/Makefile index 27d32b04189..fc214323952 100644 --- a/x11/xterm/Makefile +++ b/x11/xterm/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.35 2007/03/18 16:02:09 yyamano Exp $ +# $NetBSD: Makefile,v 1.36 2007/09/17 06:36:21 bjs Exp $ -DISTNAME= xterm-224 +DISTNAME= xterm-229 CATEGORIES= x11 MASTER_SITES= ftp://invisible-island.net/xterm/ EXTRACT_SUFX= .tgz @@ -12,10 +12,15 @@ COMMENT= Latest terminal emulator for the X Window System PKG_DESTDIR_SUPPORT= user-destdir GNU_CONFIGURE= yes +USE_DIRS+= xdg-1.4 WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} .include "../../mk/bsd.prefs.mk" +.if ${X11_TYPE} == "modular" +CONFIGURE_ARGS+= --disable-imake --enable-narrowproto +.endif + .if exists(/usr/include/wchar.h) CONFIGURE_ARGS+= --enable-wide-chars .endif @@ -47,4 +52,10 @@ post-install: .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXaw/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" +### +### For detection of XKB bell extension. +### +BUILDLINK_DEPMETHOD.libxkbfile?= build +.include "../../x11/libxkbfile/buildlink3.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/x11/xterm/PLIST b/x11/xterm/PLIST index 9f84dc629c8..c772ce8cbf5 100644 --- a/x11/xterm/PLIST +++ b/x11/xterm/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2004/05/14 11:24:49 grant Exp $ +@comment $NetBSD: PLIST,v 1.3 2007/09/17 06:36:21 bjs Exp $ bin/resize bin/uxterm bin/xterm @@ -7,3 +7,10 @@ lib/X11/app-defaults/XTerm lib/X11/app-defaults/XTerm-color man/man1/resize.1 man/man1/xterm.1 +share/pixmaps/xterm-color_32x32.xpm +share/pixmaps/xterm-color_48x48.xpm +share/pixmaps/xterm_32x32.xpm +share/pixmaps/xterm_48x48.xpm +@comment in xdg-dirs: @dirrm share/pixmaps +@comment @dirrm lib/X11/app-defaults +@comment @dirrm lib/X11 diff --git a/x11/xterm/distinfo b/x11/xterm/distinfo index 09d6d8db03a..7b726de6262 100644 --- a/x11/xterm/distinfo +++ b/x11/xterm/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.21 2007/03/13 11:14:26 drochner Exp $ +$NetBSD: distinfo,v 1.22 2007/09/17 06:36:21 bjs Exp $ -SHA1 (xterm-224.tgz) = 60573ad30682f023540ae05124cad6e10a0f9b74 -RMD160 (xterm-224.tgz) = eb99a70707aa5f0750a117b6196a56d233dc6572 -Size (xterm-224.tgz) = 811925 bytes +SHA1 (xterm-229.tgz) = 483fef795ebee83c513f9a72373d9d16366163d0 +RMD160 (xterm-229.tgz) = 9ff9bd32536817cbb2498a172459428d417f1fa3 +Size (xterm-229.tgz) = 841542 bytes diff --git a/x11/xterm/options.mk b/x11/xterm/options.mk index 121eaf4effc..4fd6ada5c34 100644 --- a/x11/xterm/options.mk +++ b/x11/xterm/options.mk @@ -1,10 +1,10 @@ -# $NetBSD: options.mk,v 1.4 2006/12/15 20:33:06 joerg Exp $ +# $NetBSD: options.mk,v 1.5 2007/09/17 06:36:21 bjs Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.xterm -PKG_SUPPORTED_OPTIONS= xterm-luit freetype +PKG_SUPPORTED_OPTIONS= pcre xterm-luit freetype xterm-toolbar PKG_OPTIONS_OPTIONAL_GROUPS= color PKG_OPTIONS_GROUP.color= xterm-88color xterm-256color -PKG_SUGGESTED_OPTIONS= xterm-256color xterm-luit +PKG_SUGGESTED_OPTIONS= xterm-256color xterm-luit xterm-toolbar .include "../../mk/bsd.options.mk" @@ -26,3 +26,11 @@ CONFIGURE_ARGS+= --enable-freetype .include "../../x11/libXft/buildlink3.mk" .endif +.if !empty(PKG_OPTIONS:Mxterm-toolbar) +CONFIGURE_ARGS+= --enable-toolbar +.endif + +.if !empty(PKG_OPTIONS:Mpcre) +CONFIGURE_ARGS+= --with-pcre +. include "../../devel/pcre/buildlink3.mk" +.endif |