Date: Sun, 8 Mar 1998 10:04:39 +0800 (CST) From: frankch@waru.life.nthu.edu.tw To: FreeBSD-gnats-submit@FreeBSD.ORG Subject: ports/5940: update ports/x11/rxvt to 2.4.5 Message-ID: <199803080204.KAA27432@waru.life.nthu.edu.tw>
next in thread | raw e-mail | index | archive | help
>Number: 5940
>Category: ports
>Synopsis: update ports/x11/rxvt
>Confidential: yes
>Severity: non-critical
>Priority: high
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Mar 7 18:20:01 PST 1998
>Last-Modified:
>Originator: Frank Chen Hsiung Chan
>Organization:
National Tsing Hua University
>Release: FreeBSD 2.2.5-STABLE i386
>Environment:
FreeBSD 2.2.5-STABLE (waru) #0: Sat Jan 10 11:42:38 CST 1998
>Description:
The rxvt port in x11 category is obselet, the latest version
is 2.4.5
>How-To-Repeat:
>Fix:
apply the following patch to ports/x11/rxvt
NOTE: this will make several patches in patches dir empty,
be sure to remove them.
Also, I removed the utmp support. If someone really want
them bad, just add it (but then you have to suid the program)
diff -ruN rxvt.orig/Makefile rxvt/Makefile
--- rxvt.orig/Makefile Sun Mar 8 09:40:54 1998
+++ rxvt/Makefile Sun Mar 8 09:43:22 1998
@@ -1,18 +1,14 @@
# New ports collection Makefile for: rxvt
-# Version required: 2.20
+# Version required: 2.45
# Date created: 5th December 1994
# Whom: gpalmer@FreeBSD.org
#
# $Id: Makefile,v 1.13 1997/03/07 12:29:49 obrien Exp $
#
-DISTNAME= rxvt-2.20
+DISTNAME= rxvt-2.4.5
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_SUNSITE} \
- ftp://ftp.nuclecu.unam.mx/linux/local/rxvt/ \
- ftp://tsx-11.mit.edu/pub/linux/sources/usr.bin.X11/
-MASTER_SITE_SUBDIR= utils/file/managers/mc/rxvt
-#MASTER_SITE_SUBDIR= X11/xutils/terms
+MASTER_SITES= ftp://ftp.math.fu-berlin.de/pub/rxvt/
MAINTAINER= winter@jurai.net
diff -ruN rxvt.orig/files/md5 rxvt/files/md5
--- rxvt.orig/files/md5 Sun Mar 8 09:40:54 1998
+++ rxvt/files/md5 Sun Mar 8 09:43:33 1998
@@ -1 +1 @@
-MD5 (rxvt-2.20.tar.gz) = 860432f0d146d0cdf4630967f6c94ae3
+MD5 (rxvt-2.4.5.tar.gz) = e8983c7382f1590e7fd86f1b2e14848a
diff -ruN rxvt.orig/patches/patch-aa rxvt/patches/patch-aa
--- rxvt.orig/patches/patch-aa Sun Mar 8 09:40:54 1998
+++ rxvt/patches/patch-aa Sun Mar 8 09:51:51 1998
@@ -1,5 +1,5 @@
---- Makefile.in.orig Fri Sep 27 10:48:20 1996
-+++ Makefile.in Mon Feb 24 01:09:28 1997
+--- Makefile.in.orig Sun Mar 8 09:47:15 1998
++++ Makefile.in Sun Mar 8 09:48:22 1998
@@ -7,7 +7,7 @@
first_rule: all
dummy:
@@ -7,5 +7,16 @@
-subdirs = src doc rclock src/graphics
+subdirs = src doc #rclock src/graphics
- DIST_ETC = etc/XTerm.ad etc/color etc/termcap etc/terminfo etc/xmkdir
+ DIST = INSTALL configure Makefile Makefile.in
+--- doc/Makefile.in.orig Sun Mar 8 09:51:09 1998
++++ doc/Makefile.in Sun Mar 8 09:51:27 1998
+@@ -53,7 +53,7 @@
+
+ tags allbin:
+
+-alldoc: lsm rxvt.1
++alldoc: rxvt.1
+
+ clean:
+ $(RMF) $(VERNAME).lsm rxvt.1 *~
diff -ruN rxvt.orig/patches/patch-ab rxvt/patches/patch-ab
--- rxvt.orig/patches/patch-ab Sun Mar 8 09:40:54 1998
+++ rxvt/patches/patch-ab Sun Mar 8 09:50:09 1998
@@ -1,19 +1,11 @@
---- ./src/utmp.c.org Thu Jan 23 10:46:02 1997
-+++ ./src/utmp.c Thu Apr 24 15:20:49 1997
-@@ -80,6 +80,8 @@
- #include <stdio.h>
- #include <string.h>
+--- src/command.c.orig Sun Mar 8 09:48:42 1998
++++ src/command.c Sun Mar 8 09:49:08 1998
+@@ -505,7 +505,7 @@
+ ttydev = tty_name;
-+#include <sys/types.h>
-+
- #ifdef HAVE_UTMPX_H
- # include <utmpx.h>
- # define USE_SYSV_UTMP
-@@ -90,7 +92,6 @@
- # endif
- #endif
-
--#include <sys/types.h>
- #include <sys/stat.h>
-
- #ifdef TIME_WITH_SYS_TIME
+ #define PTYCHAR1 "pqrstuvwxyz"
+-#define PTYCHAR2 "0123456789abcdef"
++#define PTYCHAR2 "0123456789abcdefghijklmnopqrstuv"
+ for (c1 = PTYCHAR1; *c1; c1++) {
+ ptydev[len - 2] = ttydev[len - 2] = *c1;
+ for (c2 = PTYCHAR2; *c2; c2++) {
diff -ruN rxvt.orig/patches/patch-ad rxvt/patches/patch-ad
--- rxvt.orig/patches/patch-ad Sun Mar 8 09:40:54 1998
+++ rxvt/patches/patch-ad Thu Jan 1 08:00:00 1970
@@ -1,11 +0,0 @@
---- doc/Makefile.in.orig Fri Sep 27 10:48:24 1996
-+++ doc/Makefile.in Mon Feb 24 01:14:02 1997
-@@ -25,7 +25,7 @@
-
- tags allbin:
-
--alldoc: rxvt.1 LSM
-+alldoc: rxvt.1 # LSM
-
- clean:
- $(RMF) LSM rxvt.1 *~
diff -ruN rxvt.orig/patches/patch-ae rxvt/patches/patch-ae
--- rxvt.orig/patches/patch-ae Sun Mar 8 09:40:54 1998
+++ rxvt/patches/patch-ae Thu Jan 1 08:00:00 1970
@@ -1,42 +0,0 @@
---- src/feature.h.orig Thu Jan 23 10:46:02 1997
-+++ src/feature.h Mon Feb 24 03:56:40 1997
-@@ -136,8 +136,8 @@
- * default rendition rather than the current rendition
- * NB: this make break some applications and should used with caution
- *----------------------------------------------------------------------*/
--#define XPM_BACKGROUND
--#define XPM_SCALING
-+/* #define XPM_BACKGROUND */
-+/* #define XPM_SCALING */
- #define PATH_ENV "RXVTPATH"
- /* #define XPM_BUFFERING */
- /* #define NO_CURSORCOLOR */
-@@ -272,8 +272,9 @@
- * for XTERM_SCROLLBAR it is *always* 14.
- *----------------------------------------------------------------------*/
- /* #define XTERM_SCROLLBAR */
--#define SCROLLBAR_RIGHT
-+/* #define SCROLLBAR_RIGHT */
- /* #define SB_WIDTH 10 */
-+#define SB_WIDTH 8
- /*}}}*/
-
- /*{{{ menuBar: */
-@@ -367,14 +368,15 @@
- * for BSD-type systems, to define where the tty table is located
- * if it isn't /etc/ttytab
- *----------------------------------------------------------------------*/
--/* #define UTMP_SUPPORT */
-+#define UTMP_SUPPORT
- #ifdef UTMP_SUPPORT
- # ifndef UTMP_FILENAME
- /* # define UTMP_FILENAME "/var/adm/utmp" */
- /* # define UTMP_FILENAME "/var/adm/utmp" */
-+# define UTMP_FILENAME "/var/run/utmp"
- # endif
- # ifndef TTYTAB_FILENAME
--/* # define TTYTAB_FILENAME "/etc/ttys" */
-+# define TTYTAB_FILENAME "/etc/ttys"
- # endif
- #endif
- /*}}}*/
diff -ruN rxvt.orig/patches/patch-ah rxvt/patches/patch-ah
--- rxvt.orig/patches/patch-ah Sun Mar 8 09:40:54 1998
+++ rxvt/patches/patch-ah Thu Jan 1 08:00:00 1970
@@ -1,11 +0,0 @@
---- src/command.c.orig Fri Sep 27 10:48:22 1996
-+++ src/command.c Mon Feb 24 01:25:51 1997
-@@ -509,7 +509,7 @@
- ttydev = tty_name;
-
- # define PTYCHAR1 "pqrstuvwxyz"
--# define PTYCHAR2 "0123456789abcdef"
-+# define PTYCHAR2 "0123456789abcdefghijklmnopqrstuv"
- for (c1 = PTYCHAR1; *c1; c1++)
- {
- ptydev [len-2] = ttydev [len-2] = *c1;
diff -ruN rxvt.orig/pkg/DESCR rxvt/pkg/DESCR
--- rxvt.orig/pkg/DESCR Sun Mar 8 09:40:54 1998
+++ rxvt/pkg/DESCR Sun Mar 8 09:45:26 1998
@@ -4,3 +4,5 @@
Modifications were made by Rob Nation (nation@rocket.sanders.lockheed.com)
to make it a little more compact, and to add and remove certain features.
+
+HomePage of rxvt: http://babayaga.math.fu-berlin.de/rxvt/
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199803080204.KAA27432>