summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/CHANGES-20174
-rw-r--r--x11/Makefile4
-rw-r--r--x11/mrxvt/DESCR6
-rw-r--r--x11/mrxvt/Makefile53
-rw-r--r--x11/mrxvt/PLIST28
-rw-r--r--x11/mrxvt/distinfo13
-rw-r--r--x11/mrxvt/patches/patch-aa13
-rw-r--r--x11/mrxvt/patches/patch-src_init.c15
-rw-r--r--x11/mrxvt/patches/patch-src_transparent.c24
-rw-r--r--x11/multi-aterm/DESCR2
-rw-r--r--x11/multi-aterm/Makefile38
-rw-r--r--x11/multi-aterm/PLIST2
-rw-r--r--x11/multi-aterm/distinfo7
-rw-r--r--x11/multi-aterm/options.mk22
-rw-r--r--x11/multi-aterm/patches/patch-aa15
15 files changed, 4 insertions, 242 deletions
diff --git a/doc/CHANGES-2017 b/doc/CHANGES-2017
index 5fe75938413..1b10319ce62 100644
--- a/doc/CHANGES-2017
+++ b/doc/CHANGES-2017
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2017,v 1.3543 2017/09/03 08:58:29 wiz Exp $
+$NetBSD: CHANGES-2017,v 1.3544 2017/09/03 09:04:48 wiz Exp $
Changes to the packages collection and infrastructure in 2017:
@@ -4979,3 +4979,5 @@ Changes to the packages collection and infrastructure in 2017:
Updated lang/go to 1.9 [bsiegert 2017-09-03]
Updated textproc/p5-Lingua-EN-Fathom to 1.19 [wiz 2017-09-03]
Removed databases/maatkit successor databases/percona-toolkit [wiz 2017-09-03]
+ Removed x11/multi-aterm [wiz 2017-09-03]
+ Removed x11/mrxvt [wiz 2017-09-03]
diff --git a/x11/Makefile b/x11/Makefile
index d408dbae843..73eaf843177 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.806 2017/08/28 11:30:53 bouyer Exp $
+# $NetBSD: Makefile,v 1.807 2017/09/03 09:04:47 wiz Exp $
#
COMMENT= Packages to support the X window system
@@ -383,8 +383,6 @@ SUBDIR+= modular-xorg-xquartz
SUBDIR+= motif
SUBDIR+= mowitz
SUBDIR+= mozo
-SUBDIR+= mrxvt
-SUBDIR+= multi-aterm
SUBDIR+= mxterm
SUBDIR+= neXtaw
SUBDIR+= numlockx
diff --git a/x11/mrxvt/DESCR b/x11/mrxvt/DESCR
deleted file mode 100644
index 18a9cd490f7..00000000000
--- a/x11/mrxvt/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-Mrxvt (previously named as materm) is a lightweight and powerful
-multi-tabbed X terminal emulator based on the popular rxvt and aterm.
-It implements many useful features seen in some modern X terminal
-emulators, like gnome-terminal and konsole, but keeps to be
-lightweight and independent from the GNOME and KDE desktop
-environment.
diff --git a/x11/mrxvt/Makefile b/x11/mrxvt/Makefile
deleted file mode 100644
index 2b366a5ba27..00000000000
--- a/x11/mrxvt/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-# $NetBSD: Makefile,v 1.34 2016/02/26 11:27:16 jperkin Exp $
-#
-
-DISTNAME= mrxvt-0.5.4
-PKGREVISION= 10
-CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=materm/}
-PATCH_SITES= ${MASTER_SITES}
-PATCHFILES= mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= https://code.google.com/p/mrxvt/
-COMMENT= Multi-tabbed terminal emulator with Xft support
-
-GNU_CONFIGURE= YES
-USE_TOOLS+= gmake
-USE_FEATURES+= snprintf
-
-CONFIGURE_ARGS+= --enable-xft
-CONFIGURE_ARGS+= --enable-text-shadow
-CONFIGURE_ARGS+= --enable-24bits
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
-
-CONFIGURE_ARGS.HPUX+= --disable-lastlog --disable-utmp --disable-wtmp
-
-EGDIR= ${PREFIX}/share/examples
-MAKE_DIRS+= ${PKG_SYSCONFDIR}/mrxvt
-CONF_FILES= ${EGDIR}/mrxvt/mrxvtrc ${PKG_SYSCONFDIR}/mrxvt/mrxvtrc
-CONF_FILES+= ${EGDIR}/mrxvt/default.menu ${PKG_SYSCONFDIR}/mrxvt/default.menu
-CONF_FILES+= ${EGDIR}/mrxvt/submenus.menu ${PKG_SYSCONFDIR}/mrxvt/submenus.menu
-
-INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} sysconfdir=${EGDIR:Q}
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS:M*BSD} || ${OPSYS} == "Darwin" || ${OPSYS} == "DragonFly"
-# Make mrxvt setuid root so that tty ownership setting and utmp logging
-# function correctly.
-#
-CONFIGURE_ARGS+= --enable-ttygid
-SPECIAL_PERMS= ${PREFIX}/bin/mrxvt ${SETUID_ROOT_PERMS}
-.endif
-
-BUILDLINK_DEPMETHOD.libXt+= build
-
-.include "../../mk/jpeg.buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXft/buildlink3.mk"
-.include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/x11/mrxvt/PLIST b/x11/mrxvt/PLIST
deleted file mode 100644
index e100dabdca6..00000000000
--- a/x11/mrxvt/PLIST
+++ /dev/null
@@ -1,28 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:25:01 joerg Exp $
-bin/mrxvt
-man/man1/mrxvt.1
-share/doc/mrxvt/README.greek.bz2
-share/doc/mrxvt/README.menu.bz2
-share/doc/mrxvt/README.xvt.bz2
-share/doc/mrxvt/behind_mrxvt.txt.bz2
-share/doc/mrxvt/etc/XTerm.ad
-share/doc/mrxvt/etc/mrxvt.terminfo
-share/doc/mrxvt/etc/rxvt.termcap
-share/doc/mrxvt/etc/rxvt.terminfo
-share/doc/mrxvt/hack-mrxvt.txt.bz2
-share/doc/mrxvt/mrxvt_seq.txt.bz2
-share/doc/mrxvt/rxvtRef.txt.bz2
-share/doc/mrxvt/scripts/mrxvt.vbs
-share/doc/mrxvt/scripts/mrxvtset.pl
-share/doc/mrxvt/scripts/settitle.c
-share/doc/mrxvt/xterm-ctlseqs.txt.bz2
-share/examples/mrxvt/default.menu
-share/examples/mrxvt/mrxvtrc
-share/examples/mrxvt/mrxvtrc.sample
-share/examples/mrxvt/submenus.menu
-share/pixmaps/mrxvt-csh.png
-share/pixmaps/mrxvt-csh.xpm
-share/pixmaps/mrxvt-root.png
-share/pixmaps/mrxvt-root.xpm
-share/pixmaps/mrxvt.png
-share/pixmaps/mrxvt.xpm
diff --git a/x11/mrxvt/distinfo b/x11/mrxvt/distinfo
deleted file mode 100644
index f6b79f4ad1a..00000000000
--- a/x11/mrxvt/distinfo
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: distinfo,v 1.10 2015/11/04 03:28:49 agc Exp $
-
-SHA1 (mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch) = 62b1d128f71e463dd38239efa4d5bc0daa77e9cf
-RMD160 (mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch) = 039929a83065055abfe29e239d7760390bb54a6b
-SHA512 (mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch) = 703d32e803d73e21ba5c746bcea94331c43e53e6f1b84a86271e94ae4cc59e6c4e8d4e86cbc3e29d594aec04881db57f587b1e94c42249b2beef08e718b69a36
-Size (mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch) = 380 bytes
-SHA1 (mrxvt-0.5.4.tar.gz) = f50e9ad2f652d4212b0ac5241b919372d9e43744
-RMD160 (mrxvt-0.5.4.tar.gz) = 175ce5c554c267ada4efde18e22704ff1b688dac
-SHA512 (mrxvt-0.5.4.tar.gz) = 572bb4dda9f9b9dcb597f3185922646523bce34003f536acca82992f68f8f7c1a5f2778d626f805ea2cd061e8451fbbf12010e5d655221f76b83440825c80992
-Size (mrxvt-0.5.4.tar.gz) = 603978 bytes
-SHA1 (patch-aa) = 809be5640f60ccc8238c2b851056fd520426f6b1
-SHA1 (patch-src_init.c) = 358b46b1c03ef3cdf62b964ca435db7987c9c33d
-SHA1 (patch-src_transparent.c) = 09229a237dfc2fef6c6d76f75270ead5c75521e1
diff --git a/x11/mrxvt/patches/patch-aa b/x11/mrxvt/patches/patch-aa
deleted file mode 100644
index 5fba04cccdf..00000000000
--- a/x11/mrxvt/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2011/01/17 21:28:09 tnn Exp $
-
---- src/logging.c.orig 2008-02-17 22:04:50.000000000 +0000
-+++ src/logging.c
-@@ -105,7 +105,7 @@ rxvt_makeutent(rxvt_t *r, int page, cons
- else if (sscanf(pty, "pts/%d", &i) == 1)
- sprintf(ut_id, "vt%02x", (i & 0xff)); /* sysv naming */
- #endif
-- else if (STRNCMP(pty, "pty", 3) && STRNCMP(pty, "tty", 3)) {
-+ else if (STRNCMP(pty, "pty", 3) && STRNCMP(pty, "tty", 3) && STRNCMP(pty, "pts", 3)) {
- rxvt_msg (DBG_ERROR, DBG_LOGGING, "can't parse tty name \"%s\"", pty);
- return;
- }
diff --git a/x11/mrxvt/patches/patch-src_init.c b/x11/mrxvt/patches/patch-src_init.c
deleted file mode 100644
index 7ecda312fd4..00000000000
--- a/x11/mrxvt/patches/patch-src_init.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_init.c,v 1.1 2015/02/08 18:12:49 tnn Exp $
-
-Fix strict alignment SIGBUS
-
---- src/init.c.orig 2008-06-13 19:08:13.000000000 +0000
-+++ src/init.c
-@@ -3239,7 +3239,7 @@ rxvt_create_show_windows( rxvt_t *r, int
- XGCValues gcvalue;
- unsigned long gcmask;
- #ifndef NO_FRILLS
-- CARD32 pid = (CARD32) getpid ();
-+ CARD64 pid = (CARD64) getpid ();
- #endif
- #ifdef TRANSPARENT
- register int i;
diff --git a/x11/mrxvt/patches/patch-src_transparent.c b/x11/mrxvt/patches/patch-src_transparent.c
deleted file mode 100644
index aace6cc9c42..00000000000
--- a/x11/mrxvt/patches/patch-src_transparent.c
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-src_transparent.c,v 1.1 2015/02/08 18:12:49 tnn Exp $
-
-Fix strict aligment SIGBUS
-
---- src/transparent.c.orig 2008-02-17 22:04:50.000000000 +0000
-+++ src/transparent.c
-@@ -56,7 +56,7 @@ rxvt_set_opacity (rxvt_t* r)
- Window wintree[PARENT_NUMBER];
- Window root;
- Window* list;
-- CARD32 opacity;
-+ CARD64 opacity;
-
-
- /* do not set opacity */
-@@ -71,7 +71,7 @@ rxvt_set_opacity (rxvt_t* r)
- XSetWindowBackground(r->Xdisplay, r->TermWin.parent, VTBG(r,0) );
- #endif
-
-- opacity = (CARD32) (r->TermWin.opacity * (0xffffffff / 100));
-+ opacity = (CARD64) (r->TermWin.opacity * (0xffffffff / 100));
-
- /*
- ** look for parent tree of top level window because the window
diff --git a/x11/multi-aterm/DESCR b/x11/multi-aterm/DESCR
deleted file mode 100644
index 239ada08c1e..00000000000
--- a/x11/multi-aterm/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-multi-aterm is a multi-terminal for the X Windows system based on aterm that
-provides tabbed functionality without requiring KDE or GNOME.
diff --git a/x11/multi-aterm/Makefile b/x11/multi-aterm/Makefile
deleted file mode 100644
index 708ce9e5245..00000000000
--- a/x11/multi-aterm/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# $NetBSD: Makefile,v 1.15 2012/10/29 05:06:41 asau Exp $
-#
-
-# materm is now mrxvt
-DISTNAME= multi-aterm-0.0.4
-PKGREVISION= 1
-CATEGORIES= x11
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-COMMENT= Multi-terminal for the X Window System based on aterm
-
-GNU_CONFIGURE= YES
-
-CONFIGURE_ARGS+= --enable-mousewheel
-CONFIGURE_ARGS+= --enable-swapscreen
-CONFIGURE_ARGS+= --enable-keepscrolling
-CONFIGURE_ARGS+= --enable-half-shadow
-CONFIGURE_ARGS+= --enable-shading
-CONFIGURE_ARGS+= --enable-fading
-CONFIGURE_ARGS+= --enable-transparency
-CONFIGURE_ARGS+= --with-xpm=${BUILDLINK_PREFIX.libXpm}
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${X11_TYPE} == "modular"
-CONFIGURE_ARGS+= --x-includes=${PREFIX:Q}/include
-CONFIGURE_ARGS+= --x-libraries=${PREFIX:Q}/lib
-.endif
-
-.include "options.mk"
-
-BUILDLINK_DEPMETHOD.libXt?= build
-
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/x11/multi-aterm/PLIST b/x11/multi-aterm/PLIST
deleted file mode 100644
index e91ee59a652..00000000000
--- a/x11/multi-aterm/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/07/02 13:28:30 jmmv Exp $
-bin/multi-aterm
diff --git a/x11/multi-aterm/distinfo b/x11/multi-aterm/distinfo
deleted file mode 100644
index 3f0b632fb07..00000000000
--- a/x11/multi-aterm/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.3 2015/11/04 03:28:49 agc Exp $
-
-SHA1 (multi-aterm-0.0.4.tar.gz) = a0d5843b5d98ba29c873d8a37c7676d5686a7ec1
-RMD160 (multi-aterm-0.0.4.tar.gz) = 3935e59699e238bbdedc291fb6198771673c02e1
-SHA512 (multi-aterm-0.0.4.tar.gz) = 3746b7ffd48b0fb38cc14545aa67fff2666c9433b516a655a1f3eaceef11783586a350c4364fd1a3d0db5738206fbf74aa636a8d9b03280ebf0225b5d31f5302
-Size (multi-aterm-0.0.4.tar.gz) = 214408 bytes
-SHA1 (patch-aa) = 4d2cc181e0f9c6be7fc84a4bdb9819d853dd5b6a
diff --git a/x11/multi-aterm/options.mk b/x11/multi-aterm/options.mk
deleted file mode 100644
index e29f2aecadb..00000000000
--- a/x11/multi-aterm/options.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: options.mk,v 1.2 2005/10/05 13:29:49 wiz Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.aterm
-PKG_SUPPORTED_OPTIONS= aterm-big5 aterm-greek aterm-kanji aterm-xterm-scroll
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Materm-big5)
-CONFIGURE_ARGS+=--enable-big5
-.endif
-
-.if !empty(PKG_OPTIONS:Materm-greek)
-CONFIGURE_ARGS+=--enable-greek
-.endif
-
-.if !empty(PKG_OPTIONS:Materm-kanji)
-CONFIGURE_ARGS+=--enable-kanji
-.endif
-
-.if !empty(PKG_OPTIONS:Materm-xterm-scroll)
-CONFIGURE_ARGS+=--enable-xterm-scroll
-.endif
diff --git a/x11/multi-aterm/patches/patch-aa b/x11/multi-aterm/patches/patch-aa
deleted file mode 100644
index 3ab5608b09d..00000000000
--- a/x11/multi-aterm/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/07/02 13:28:32 jmmv Exp $
-
---- configure.orig 2003-07-02 14:24:21.000000000 +0200
-+++ configure
-@@ -3410,8 +3410,8 @@ echo "${ECHO_T}libraries $x_libraries, h
- fi
-
-
--LDFLAGS="-L$x_libraries"
--CPPFLAGS="-I$x_includes"
-+LDFLAGS="$LDFLAGS -L$x_libraries"
-+CPPFLAGS="$CPPFLAGS -I$x_includes"
-
- # check for lice
-