diff options
| -rw-r--r-- | x11/xterm/Makefile | 47 | ||||
| -rw-r--r-- | x11/xterm/PLIST | 8 | ||||
| -rw-r--r-- | x11/xterm/distinfo | 9 | ||||
| -rw-r--r-- | x11/xterm/options.mk | 33 | ||||
| -rw-r--r-- | x11/xterm/patches/patch-aa | 18 |
5 files changed, 70 insertions, 45 deletions
diff --git a/x11/xterm/Makefile b/x11/xterm/Makefile index 1b2c84ebb12..5161e909fd4 100644 --- a/x11/xterm/Makefile +++ b/x11/xterm/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.40 2008/03/05 20:04:42 jlam Exp $ +# $NetBSD: Makefile,v 1.41 2008/04/21 17:10:40 bjs Exp $ -DISTNAME= xterm-231 -PKGREVISION= 1 +DISTNAME= xterm-235 CATEGORIES= x11 MASTER_SITES= ftp://invisible-island.net/xterm/ EXTRACT_SUFX= .tgz @@ -12,28 +11,36 @@ 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} +GNU_CONFIGURE= yes +USE_DIRS+= xdg-1.4 +WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} + +CONFIGURE_ARGS+= --enable-88-color +CONFIGURE_ARGS+= --enable-256-color +CONFIGURE_ARGS+= --enable-luit +CONFIGURE_ARGS+= --enable-paste64 +CONFIGURE_ARGS+= --enable-mini-luit +CONFIGURE_ARGS+= --enable-readline-mouse +CONFIGURE_ARGS+= --enable-toolbar # Resource disabled by default + +CONFIGURE_ARGS.standard=# empty +CONFIGURE_ARGS.3d= --with-Xaw3d +CONFIGURE_ARGS.xpm= --with-Xaw3d +CONFIGURE_ARGS.neXtaw= --with-neXtaw +CONFIGURE_ARGS+= ${${CONFIGURE_ARGS.${XAW_TYPE}}:L} .include "../../mk/bsd.prefs.mk" .if ${X11_TYPE} == "modular" -CONFIGURE_ARGS+= --disable-imake --enable-narrowproto +CONFIGURE_ARGS+= --disable-imake +CONFIGURE_ARGS+= --enable-narrowproto .endif .if exists(/usr/include/wchar.h) -CONFIGURE_ARGS+= --enable-wide-chars -.endif - -.include "options.mk" - -.if ${OPSYS} == "DragonFly" -CONFIGURE_ARGS+= --with-setuid +CONFIGURE_ARGS+= --enable-wide-chars .endif .include "../../x11/libX11/buildlink3.mk" -.include "../../x11/libXaw/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" ### ### For detection of XKB bell extension. @@ -41,5 +48,15 @@ CONFIGURE_ARGS+= --with-setuid BUILDLINK_DEPMETHOD.libxkbfile?= build .include "../../x11/libxkbfile/buildlink3.mk" +post-install: + ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/applications && \ + ${INSTALL_DATA} ${WRKSRC}/xterm.desktop \ + ${DESTDIR}${PREFIX}/share/applications && \ + ${INSTALL_DATA} ${WRKSRC}/uxterm.desktop \ + ${DESTDIR}${PREFIX}/share/applications + +.include "options.mk" + .include "../../mk/termcap.buildlink3.mk" +.include "../../mk/xaw.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xterm/PLIST b/x11/xterm/PLIST index 0bd21582eb1..f5dbc051707 100644 --- a/x11/xterm/PLIST +++ b/x11/xterm/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2008/01/25 18:21:18 bjs Exp $ +@comment $NetBSD: PLIST,v 1.5 2008/04/21 17:10:40 bjs Exp $ bin/koi8rxterm bin/resize bin/uxterm @@ -11,10 +11,12 @@ man/man1/koi8rxterm.1 man/man1/resize.1 man/man1/uxterm.1 man/man1/xterm.1 +share/applications/uxterm.desktop +share/applications/xterm.desktop 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 +@comment in xdg-dirs: @dirrm share/applications +@unexec ${RMDIR} %D/lib/X11/app-defaults 2>/dev/null || ${TRUE} diff --git a/x11/xterm/distinfo b/x11/xterm/distinfo index d0e762a8be5..7a4af7b7698 100644 --- a/x11/xterm/distinfo +++ b/x11/xterm/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.23 2008/01/25 18:21:18 bjs Exp $ +$NetBSD: distinfo,v 1.24 2008/04/21 17:10:40 bjs Exp $ -SHA1 (xterm-231.tgz) = ad1e84307e00553cff1821a8d8e57f1fd3f72635 -RMD160 (xterm-231.tgz) = b2c2d232623334e10ea7993c2396ac0c5db113bf -Size (xterm-231.tgz) = 850863 bytes +SHA1 (xterm-235.tgz) = 4d449a9e50e342e0b7a6deba9d713e6ba9323d1e +RMD160 (xterm-235.tgz) = 8a3cb03df08ad9da8d4391de612ec6e8f1573bcb +Size (xterm-235.tgz) = 857714 bytes +SHA1 (patch-aa) = cf93a5388106cf08bf7145890a45be7c12d186f6 diff --git a/x11/xterm/options.mk b/x11/xterm/options.mk index 7ebc3958bda..18f13860371 100644 --- a/x11/xterm/options.mk +++ b/x11/xterm/options.mk @@ -1,35 +1,22 @@ -# $NetBSD: options.mk,v 1.8 2008/01/25 18:22:01 bjs Exp $ +# $NetBSD: options.mk,v 1.9 2008/04/21 17:10:40 bjs Exp $ -PKG_OPTIONS_VAR= PKG_OPTIONS.xterm -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 xterm-toolbar +PKG_OPTIONS_VAR= PKG_OPTIONS.xterm +PKG_SUPPORTED_OPTIONS= debug pcre freetype +PKG_SUGGESTED_OPTIONS= freetype .include "../../mk/bsd.options.mk" -.if !empty(PKG_OPTIONS:Mxterm-88color) -CONFIGURE_ARGS+= --enable-88-color -.endif - -.if !empty(PKG_OPTIONS:Mxterm-256color) -CONFIGURE_ARGS+= --enable-256-color -.endif - -.if !empty(PKG_OPTIONS:Mxterm-luit) -CONFIGURE_ARGS+= --enable-luit +.if !empty(PKG_OPTIONS:Mdebug) +CONFIGURE_ARGS+= --enable-trace +CONFIGURE_ARGS+= --enable-warnings +.elif defined(PKG_DEVELOPER) && !empty(PKG_DEVELOPER:M[Yy][Ee][Ss]) +CONFIGURE_ARGS+= --enable-warnings .endif .if !empty(PKG_OPTIONS:Mfreetype) CONFIGURE_ARGS+= --enable-freetype - -.include "../../x11/libXft/buildlink3.mk" -.endif - -.if !empty(PKG_OPTIONS:Mxterm-toolbar) -CONFIGURE_ARGS+= --enable-toolbar +. include "../../x11/libXft/buildlink3.mk" .endif - ### ### XXX The configure test checks for pcreposix_regcomp in libpcreposix. ### However, there is no such function [insofar as I can tell]. diff --git a/x11/xterm/patches/patch-aa b/x11/xterm/patches/patch-aa new file mode 100644 index 00000000000..c08ce073e00 --- /dev/null +++ b/x11/xterm/patches/patch-aa @@ -0,0 +1,18 @@ +$NetBSD: patch-aa,v 1.8 2008/04/21 17:10:40 bjs Exp $ + +One needs to explicitly enable building in the toolbar code, yet +this turns it on by default, which not everyone wants. + +Let's attempt to convince xterm of this here. + +--- main.c.orig 2008-02-27 19:28:00.000000000 -0500 ++++ main.c +@@ -881,7 +881,7 @@ static XtResource application_resources[ + Bres("sessionMgt", "SessionMgt", sessionMgt, True), + #endif + #if OPT_TOOLBAR +- Bres(XtNtoolBar, XtCToolBar, toolBar, True), ++ Bres(XtNtoolBar, XtCToolBar, toolBar, False), + #endif + }; + |