Update to version 2.16

Submitted by:	Matthew N. Dodd <winter@jurai.net> (with some mods by me)

17 files changed, 182 insertions, 820 deletions

diff --git a/x11/rxvt-devel/Makefile b/x11/rxvt-devel/Makefile
index c18efda1492f..0e5918c3cd1d 100644
--- a/x11/rxvt-devel/Makefile
+++ b/x11/rxvt-devel/Makefile
@@ -1,23 +1,21 @@
 # New ports collection Makefile for: rxvt
-# Version required:	2.09
-# Date created:		5th December 1994
-# Whom:			gpalmer@FreeBSD.org
+# Version required:	2.16
+# Date created:         5th December 1994
+# Whom:                 gpalmer@FreeBSD.org
 #
-# $Id: Makefile,v 1.8 1996/10/15 19:24:55 asami Exp $
+# $Id: Makefile,v 1.7 1995/04/12 20:31:23 asami Exp $
 #
 
-DISTNAME=	rxvt-2.09
+DISTNAME=	rxvt-2.16
 CATEGORIES=	x11
-MASTER_SITES=	ftp://iraun1.ira.uka.de/pub/x11/misc/
+MASTER_SITES=	${MASTER_SITE_SUNSITE}  \
+		ftp://ftp.jurai.net/users/winter/rxvt/distfiles/
+MASTER_SITE_SUBDIR=	X11/xutils/terms
 
-MAINTAINER=	gpalmer@FreeBSD.ORG
+MAINTAINER=	winter@jurai.net
 
-WRKSRC=		${WRKDIR}/rxvt
-USE_IMAKE=	yes
-
-# Get rid of the rclock directory until I can figure out how to patch
-# that up also and make it!
-pre-configure:
-	@/bin/rm -rf ${WRKDIR}/rclock
+USE_X11=	yes
+GNU_CONFIGURE=  yes
+MAN1=		rxvt.1
 
 .include <bsd.port.mk>
diff --git a/x11/rxvt-devel/distinfo b/x11/rxvt-devel/distinfo
index 6efdef7dda7a..f78eaebd0643 100644
--- a/x11/rxvt-devel/distinfo
+++ b/x11/rxvt-devel/distinfo
@@ -1 +1 @@
-MD5 (rxvt-2.09.tar.gz) = 8572a17742148f97128de01b9faf1612
+MD5 (rxvt-2.16.tar.gz) = b7e468ba8b7dd335f5462e62aa2a566a
diff --git a/x11/rxvt-devel/files/patch-aa b/x11/rxvt-devel/files/patch-aa
index 87953ca79716..db6bfb619da0 100644
--- a/x11/rxvt-devel/files/patch-aa
+++ b/x11/rxvt-devel/files/patch-aa
@@ -1,52 +1,11 @@
-*** Imakefile.orig	Thu Oct 20 15:23:25 1994
---- Imakefile	Mon Dec  5 01:22:49 1994
-***************
-*** 4,10 ****
-   */
-  
-  # uncomment for gcc
-! CC=gcc 
-  
-  # add -DDEBUG to get rxvt to self-check for internal screen corruption
-  # add -DDEBUG_MALLOC to self check on out of bound memory usage.
---- 4,10 ----
-   */
-  
-  # uncomment for gcc
-! CC=cc 
-  
-  # add -DDEBUG to get rxvt to self-check for internal screen corruption
-  # add -DDEBUG_MALLOC to self check on out of bound memory usage.
-***************
-*** 77,86 ****
-  #EXTRA_LOAD_FLAGS= -lc -lucb
-  
-  # Using this defines adds in UTMP support for Sun OS 4.1.x
-! EXTRA_DEFINES = -DBSD -DUTMP_SUPPORT -DUTMP=\"/etc/utmp\" -DBSD -DTTYTAB=\"/etc/ttytab\" -DPRINT_PIPE $(GREEK_EXTRA) -DMAX_REFRESH_PERIOD=10 -DMULTIPLE_CLICKS -DFAKE_RESOURCES -DUSE_XCOPYAREA -DCOLOR -DGRAPHICS
-  
-  # for FreeBSD 
-! #EXTRA_DEFINES = -DUTMP_SUPPORT -DUTMP=\"/var/run/utmp\" -DBSD -DFREEBSD -DTTYTAB=\"/etc/ttys\" -DPRINT_PIPE $(GREEK_EXTRA) -DMAX_REFRESH_PERIOD=10 -DMULTIPLE_CLICKS -DFAKE_RESOURCES -DCOLOR -DGRAPHICS
-  
-  # for NetBSD 0.9
-  #DEFS = -DUTMP_SUPPORT -DUTMP=\"/var/run/utmp\" -DBSD -DFREEBSD -DTTYTAB=\"/etc/ttys\" -DPRINT_PIPE $(GREEK_EXTRA) -DMAX_REFRESH_PERIOD=10 -DMULTIPLE_CLICKS -DFAKE_RESOURCES -DCOLOR -DGRAPHICS
---- 77,86 ----
-  #EXTRA_LOAD_FLAGS= -lc -lucb
-  
-  # Using this defines adds in UTMP support for Sun OS 4.1.x
-! #EXTRA_DEFINES = -DBSD -DUTMP_SUPPORT -DUTMP=\"/etc/utmp\" -DBSD -DTTYTAB=\"/etc/ttytab\" -DPRINT_PIPE $(GREEK_EXTRA) -DMAX_REFRESH_PERIOD=10 -DMULTIPLE_CLICKS -DFAKE_RESOURCES -DUSE_XCOPYAREA -DCOLOR -DGRAPHICS
-  
-  # for FreeBSD 
-! EXTRA_DEFINES = -DUTMP_SUPPORT -DUTMP=\"/var/run/utmp\" -DBSD -DFREEBSD -DTTYTAB=\"/etc/ttys\" -DPRINT_PIPE $(GREEK_EXTRA) -DMAX_REFRESH_PERIOD=10 -DMULTIPLE_CLICKS -DFAKE_RESOURCES -DCOLOR -DGRAPHICS
-  
-  # for NetBSD 0.9
-  #DEFS = -DUTMP_SUPPORT -DUTMP=\"/var/run/utmp\" -DBSD -DFREEBSD -DTTYTAB=\"/etc/ttys\" -DPRINT_PIPE $(GREEK_EXTRA) -DMAX_REFRESH_PERIOD=10 -DMULTIPLE_CLICKS -DFAKE_RESOURCES -DCOLOR -DGRAPHICS
-***************
-*** 95,100 ****
---- 95,101 ----
-  
-  DEPLIBS = $(DEPXLIB) 
-  LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) 
-+ INSTALLFLAGS = -g wheel -o root -c -s -m 4755
-  
-  SRCS = rxvt.c command.c sbar.c screen.c utmp.c xsetup.c debug.c resources.c graphics.c\
-  	$(GREEK_SRC)
+--- Makefile.in.orig	Tue Apr  2 09:00:00 1996
++++ Makefile.in	Sat Dec  7 16:38:15 1996
+@@ -9,7 +9,7 @@
+ first_rule: all
+ dummy:
+ 
+-subdirs=src doc rclock test/graphics test/vttest
++subdirs=src doc #rclock test/graphics test/vttest
+ 
+ DIST_ETC = etc/xmkdir etc/XTerm.ad etc/termcap etc/terminfo
+ DIST_OLD = etc/old/Imakefile etc/old/Makefile etc/old/config.h
diff --git a/x11/rxvt-devel/files/patch-ac b/x11/rxvt-devel/files/patch-ac
index 570dfbf392aa..b1c6fd150e1f 100644
--- a/x11/rxvt-devel/files/patch-ac
+++ b/x11/rxvt-devel/files/patch-ac
@@ -1,190 +1,29 @@
-# The following is a security patch for rxvt, it (hopefully) avoids problems
-# with unauthorized users obtaining root.
-#
-# Based upon code provided by Marc Ewing (marc@redhat.com) for a previous
-# version of rxvt.
-#
-# BSD utmp code fixed again by peter@freebsd.org
-
-*** rxvt.h	Sat Feb 19 09:41:52 1994
---- rxvt.h	Wed Jan 10 23:42:09 1996
-***************
-*** 21,23 ****
---- 21,27 ----
-  extern void clean_exit(int);
-  extern void cleanutent(void);
-  extern void makeutent(char *);
-+ 
-+ void save_privs(void);
-+ void get_privs(void);
-+ void release_privs(void);
-*** rxvt.c	Fri Aug  5 23:52:07 1994
---- rxvt.c	Sat Feb 24 22:03:27 1996
-***************
-*** 45,50 ****
---- 45,54 ----
-    int i;
-    char *shell;
-    char **com_argv;
-+ 
-+   /* Save and give up setuid/setgid privileges */
-+   save_privs();
-+   release_privs();
-    
-    for (i = 0; i < argc; i++)
-      if (strcmp(argv[i],"-e") == 0)
-*** command.c	Sat Feb 24 22:03:27 1996
---- command.c	Sat Feb 24 22:12:26 1996
-***************
-*** 222,227 ****
---- 222,251 ----
-  }
-  #endif
-  
-+ static uid_t saved_uid;
-+ static gid_t saved_gid;
-+ 
-+ void save_privs()
-+ {
-+     saved_uid = geteuid();
-+     saved_gid = getegid();
-+ }
-+ 
-+ void get_privs()
-+ {
-+     if (seteuid(saved_uid) < 0)
-+ 	perror("failed to restore saved uid");
-+     if (setegid(saved_gid) < 0)
-+ 	perror("failed to restore saved gid");
-+ }
-+ 
-+ void release_privs()
-+ {
-+     if (seteuid(getuid()) < 0)
-+ 	perror("failed to release setuid");
-+     if (setegid(getgid()) < 0)
-+ 	perror("failed to release setgid");
-+ }
-  
-  /*  Catch a SIGCHLD signal and exit if the direct child has died.
-   */
-***************
-*** 337,344 ****
---- 361,370 ----
-  	gid = gr->gr_gid;
-        else
-  	gid = -1;
-+       get_privs();
-        fchown(ttyfd,uid,gid);
-        fchmod(ttyfd,0600);
-+       release_privs();
-  #endif
-  #ifdef TIOCCONS
-       if (console) 
-*** utmp.c	Tue Oct  4 08:47:56 1994
---- utmp.c	Sat Feb 24 22:21:30 1996
-***************
-*** 71,79 ****
-    extern char ttynam[];
-    extern struct stat ttyfd_stat;
-  
-!   chmod(ttynam,ttyfd_stat.st_mode);
-! 
-!   chown(ttynam,ttyfd_stat.st_uid,ttyfd_stat.st_gid);
-  #endif
-    if(madeutent)
-      cleanutent();
---- 71,83 ----
-    extern char ttynam[];
-    extern struct stat ttyfd_stat;
-  
-!   get_privs();
-!   if (chmod(ttynam,ttyfd_stat.st_mode) < 0)
-! 	perror("cant reset tty modes");
-! 
-!   if (chown(ttynam,ttyfd_stat.st_uid,ttyfd_stat.st_gid) < 0)
-! 	perror("cant reset tty owner");
-!   release_privs();
-  #endif
-    if(madeutent)
-      cleanutent();
-***************
-*** 166,171 ****
---- 170,176 ----
-  {
-    FILE *utmp;
-  
-+   get_privs();
-    if((utmp = fopen(UTMP,"r+")) == NULL)
-      return -1;
-    utmp_pos = get_tslot(ttyname) * sizeof(struct utmp);
-***************
-*** 174,179 ****
---- 179,185 ----
-    fseek(utmp,utmp_pos,0);
-    fwrite((char *)u, sizeof(struct utmp),1,utmp);
-    fclose(utmp);
-+   release_privs();
-    madeutent = 1;
-    return(utmp_pos);
-  }
-***************
-*** 228,239 ****
---- 234,247 ----
-    FILE *ut;
-    struct utmp u;
-    
-+   get_privs();
-    if((ut = fopen(UTMP,"r+")) == NULL)
-      return;
-    fseek(ut,utmp_pos,0);
-    memset(&u,0,sizeof(u));
-    fwrite((char *)&u,sizeof(struct utmp),1,ut);
-    fclose(ut);
-+   release_privs();
-  }
-  
-  
-***************
-*** 250,259 ****
---- 258,269 ----
-  int write_utmp(struct utmp * u) 
-  {
-    int pos;
-+   get_privs();
-    utmpname(UTMP);
-    setutent();
-    pututline(u);
-    endutent();
-+   release_privs();
-    pos = (int)NULL;
-    madeutent = 1;
-    return(pos);
-***************
-*** 305,311 ****
-  {
-    int pid;
-    struct utmp *u;
-!   
-    utmpname(UTMP);
-    setutent();
-    pid = getpid();
---- 315,322 ----
-  {
-    int pid;
-    struct utmp *u;
-! 
-!   get_privs();
-    utmpname(UTMP);
-    setutent();
-    pid = getpid();
-***************
-*** 333,338 ****
---- 344,350 ----
-  	  endutent();
-  	}
-      }
-+   release_privs();
-  }
-  
-  #endif /* BSD */
+--- src/Makefile.in.orig	Tue Apr  2 09:00:00 1996
++++ src/Makefile.in	Sat Dec  7 17:29:38 1996
+@@ -6,7 +6,7 @@
+ first_rule: all
+ dummy:
+ 
+-CFLAGS = $(XCFLAGS)
++CFLAGS = $(XCFLAGS) -DFREEBSD
+ CPPFLAGS = $(XCPPFLAGS)
+ LDFLAGS = $(XLDFLAGS)
+ DEFS = $(XDEFS)
+@@ -34,7 +34,7 @@
+ all: rxvt
+ 
+ rxvt: VERSION depend $(OBJS)
+-	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) -lX11
++	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) -L$(prefix)/lib -lX11
+ 
+ VERSION:
+ 	@echo "#define VERSION \""$(VERSION)"\""
+@@ -72,7 +72,7 @@
+ depend dep: .depend
+ 
+ .depend:
+-	$(DEPEND) -s "# DO NOT DELETE" -- $(CPPFLAGS) -- $(SRCS)
++	$(DEPEND) -I$(XINC) -s "# DO NOT DELETE" -- $(CPPFLAGS) -- $(SRCS)
+ 	@touch .depend
+ 
+ # ------------------------------------------------------------------------
diff --git a/x11/rxvt-devel/pkg-comment b/x11/rxvt-devel/pkg-comment
index ba4fbfb17e90..fbd15b64acab 100644
--- a/x11/rxvt-devel/pkg-comment
+++ b/x11/rxvt-devel/pkg-comment
@@ -1 +1 @@
-A cut-down version of xterm for those with less memory.
+rxvt - a low memory usage xterm replacement that supports color
diff --git a/x11/rxvt-unicode/Makefile b/x11/rxvt-unicode/Makefile
index c18efda1492f..0e5918c3cd1d 100644
--- a/x11/rxvt-unicode/Makefile
+++ b/x11/rxvt-unicode/Makefile
@@ -1,23 +1,21 @@
 # New ports collection Makefile for: rxvt
-# Version required:	2.09
-# Date created:		5th December 1994
-# Whom:			gpalmer@FreeBSD.org
+# Version required:	2.16
+# Date created:         5th December 1994
+# Whom:                 gpalmer@FreeBSD.org
 #
-# $Id: Makefile,v 1.8 1996/10/15 19:24:55 asami Exp $
+# $Id: Makefile,v 1.7 1995/04/12 20:31:23 asami Exp $
 #
 
-DISTNAME=	rxvt-2.09
+DISTNAME=	rxvt-2.16
 CATEGORIES=	x11
-MASTER_SITES=	ftp://iraun1.ira.uka.de/pub/x11/misc/
+MASTER_SITES=	${MASTER_SITE_SUNSITE}  \
+		ftp://ftp.jurai.net/users/winter/rxvt/distfiles/
+MASTER_SITE_SUBDIR=	X11/xutils/terms
 
-MAINTAINER=	gpalmer@FreeBSD.ORG
+MAINTAINER=	winter@jurai.net
 
-WRKSRC=		${WRKDIR}/rxvt
-USE_IMAKE=	yes
-
-# Get rid of the rclock directory until I can figure out how to patch
-# that up also and make it!
-pre-configure:
-	@/bin/rm -rf ${WRKDIR}/rclock
+USE_X11=	yes
+GNU_CONFIGURE=  yes
+MAN1=		rxvt.1
 
 .include <bsd.port.mk>
diff --git a/x11/rxvt-unicode/distinfo b/x11/rxvt-unicode/distinfo
index 6efdef7dda7a..f78eaebd0643 100644
--- a/x11/rxvt-unicode/distinfo
+++ b/x11/rxvt-unicode/distinfo
@@ -1 +1 @@
-MD5 (rxvt-2.09.tar.gz) = 8572a17742148f97128de01b9faf1612
+MD5 (rxvt-2.16.tar.gz) = b7e468ba8b7dd335f5462e62aa2a566a
diff --git a/x11/rxvt-unicode/files/patch-aa b/x11/rxvt-unicode/files/patch-aa
index 87953ca79716..db6bfb619da0 100644
--- a/x11/rxvt-unicode/files/patch-aa
+++ b/x11/rxvt-unicode/files/patch-aa
@@ -1,52 +1,11 @@
-*** Imakefile.orig	Thu Oct 20 15:23:25 1994
---- Imakefile	Mon Dec  5 01:22:49 1994
-***************
-*** 4,10 ****
-   */
-  
-  # uncomment for gcc
-! CC=gcc 
-  
-  # add -DDEBUG to get rxvt to self-check for internal screen corruption
-  # add -DDEBUG_MALLOC to self check on out of bound memory usage.
---- 4,10 ----
-   */
-  
-  # uncomment for gcc
-! CC=cc 
-  
-  # add -DDEBUG to get rxvt to self-check for internal screen corruption
-  # add -DDEBUG_MALLOC to self check on out of bound memory usage.
-***************
-*** 77,86 ****
-  #EXTRA_LOAD_FLAGS= -lc -lucb
-  
-  # Using this defines adds in UTMP support for Sun OS 4.1.x
-! EXTRA_DEFINES = -DBSD -DUTMP_SUPPORT -DUTMP=\"/etc/utmp\" -DBSD -DTTYTAB=\"/etc/ttytab\" -DPRINT_PIPE $(GREEK_EXTRA) -DMAX_REFRESH_PERIOD=10 -DMULTIPLE_CLICKS -DFAKE_RESOURCES -DUSE_XCOPYAREA -DCOLOR -DGRAPHICS
-  
-  # for FreeBSD 
-! #EXTRA_DEFINES = -DUTMP_SUPPORT -DUTMP=\"/var/run/utmp\" -DBSD -DFREEBSD -DTTYTAB=\"/etc/ttys\" -DPRINT_PIPE $(GREEK_EXTRA) -DMAX_REFRESH_PERIOD=10 -DMULTIPLE_CLICKS -DFAKE_RESOURCES -DCOLOR -DGRAPHICS
-  
-  # for NetBSD 0.9
-  #DEFS = -DUTMP_SUPPORT -DUTMP=\"/var/run/utmp\" -DBSD -DFREEBSD -DTTYTAB=\"/etc/ttys\" -DPRINT_PIPE $(GREEK_EXTRA) -DMAX_REFRESH_PERIOD=10 -DMULTIPLE_CLICKS -DFAKE_RESOURCES -DCOLOR -DGRAPHICS
---- 77,86 ----
-  #EXTRA_LOAD_FLAGS= -lc -lucb
-  
-  # Using this defines adds in UTMP support for Sun OS 4.1.x
-! #EXTRA_DEFINES = -DBSD -DUTMP_SUPPORT -DUTMP=\"/etc/utmp\" -DBSD -DTTYTAB=\"/etc/ttytab\" -DPRINT_PIPE $(GREEK_EXTRA) -DMAX_REFRESH_PERIOD=10 -DMULTIPLE_CLICKS -DFAKE_RESOURCES -DUSE_XCOPYAREA -DCOLOR -DGRAPHICS
-  
-  # for FreeBSD 
-! EXTRA_DEFINES = -DUTMP_SUPPORT -DUTMP=\"/var/run/utmp\" -DBSD -DFREEBSD -DTTYTAB=\"/etc/ttys\" -DPRINT_PIPE $(GREEK_EXTRA) -DMAX_REFRESH_PERIOD=10 -DMULTIPLE_CLICKS -DFAKE_RESOURCES -DCOLOR -DGRAPHICS
-  
-  # for NetBSD 0.9
-  #DEFS = -DUTMP_SUPPORT -DUTMP=\"/var/run/utmp\" -DBSD -DFREEBSD -DTTYTAB=\"/etc/ttys\" -DPRINT_PIPE $(GREEK_EXTRA) -DMAX_REFRESH_PERIOD=10 -DMULTIPLE_CLICKS -DFAKE_RESOURCES -DCOLOR -DGRAPHICS
-***************
-*** 95,100 ****
---- 95,101 ----
-  
-  DEPLIBS = $(DEPXLIB) 
-  LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) 
-+ INSTALLFLAGS = -g wheel -o root -c -s -m 4755
-  
-  SRCS = rxvt.c command.c sbar.c screen.c utmp.c xsetup.c debug.c resources.c graphics.c\
-  	$(GREEK_SRC)
+--- Makefile.in.orig	Tue Apr  2 09:00:00 1996
++++ Makefile.in	Sat Dec  7 16:38:15 1996
+@@ -9,7 +9,7 @@
+ first_rule: all
+ dummy:
+ 
+-subdirs=src doc rclock test/graphics test/vttest
++subdirs=src doc #rclock test/graphics test/vttest
+ 
+ DIST_ETC = etc/xmkdir etc/XTerm.ad etc/termcap etc/terminfo
+ DIST_OLD = etc/old/Imakefile etc/old/Makefile etc/old/config.h
diff --git a/x11/rxvt-unicode/files/patch-ab b/x11/rxvt-unicode/files/patch-ab
index fb2c7d1e507f..0c8209f7823f 100644
--- a/x11/rxvt-unicode/files/patch-ab
+++ b/x11/rxvt-unicode/files/patch-ab
@@ -1,23 +1,10 @@
-*** command.c.old	Mon Dec  5 01:07:33 1994
---- command.c	Mon Dec  5 01:07:49 1994
-***************
-*** 373,381 ****
-        {
-  	int pgrp = getpid();
-  	ioctl(0, TIOCSPGRP, (char *)&pgrp);
-! 	setpgrp();
-  	close(open(ttynam, O_WRONLY, 0));
-! 	setpgrp ();
-        }
-  
-        /* init of termios structure		*/
---- 373,381 ----
-        {
-  	int pgrp = getpid();
-  	ioctl(0, TIOCSPGRP, (char *)&pgrp);
-! 	setpgrp(0,pgrp);
-  	close(open(ttynam, O_WRONLY, 0));
-! 	setpgrp (0,pgrp);
-        }
-  
-        /* init of termios structure		*/
+--- Make.common.in.orig	Tue Apr  2 09:00:00 1996
++++ Make.common.in	Sat Dec  7 17:08:14 1996
+@@ -42,6 +42,7 @@
+ 
+ # Flags & libs
+ # cannot use := to append (except GNU make), so do it this way.
++XINC = $(prefix)/include -I..
+ XCFLAGS = @CFLAGS@
+ XCPPFLAGS = @CPPFLAGS@ $(XINC)
+ XLDFLAGS = @LDFLAGS@
diff --git a/x11/rxvt-unicode/files/patch-ac b/x11/rxvt-unicode/files/patch-ac
index 570dfbf392aa..b1c6fd150e1f 100644
--- a/x11/rxvt-unicode/files/patch-ac
+++ b/x11/rxvt-unicode/files/patch-ac
@@ -1,190 +1,29 @@
-# The following is a security patch for rxvt, it (hopefully) avoids problems
-# with unauthorized users obtaining root.
-#
-# Based upon code provided by Marc Ewing (marc@redhat.com) for a previous
-# version of rxvt.
-#
-# BSD utmp code fixed again by peter@freebsd.org
-
-*** rxvt.h	Sat Feb 19 09:41:52 1994
---- rxvt.h	Wed Jan 10 23:42:09 1996
-***************
-*** 21,23 ****
---- 21,27 ----
-  extern void clean_exit(int);
-  extern void cleanutent(void);
-  extern void makeutent(char *);
-+ 
-+ void save_privs(void);
-+ void get_privs(void);
-+ void release_privs(void);
-*** rxvt.c	Fri Aug  5 23:52:07 1994
---- rxvt.c	Sat Feb 24 22:03:27 1996
-***************
-*** 45,50 ****
---- 45,54 ----
-    int i;
-    char *shell;
-    char **com_argv;
-+ 
-+   /* Save and give up setuid/setgid privileges */
-+   save_privs();
-+   release_privs();
-    
-    for (i = 0; i < argc; i++)
-      if (strcmp(argv[i],"-e") == 0)
-*** command.c	Sat Feb 24 22:03:27 1996
---- command.c	Sat Feb 24 22:12:26 1996
-***************
-*** 222,227 ****
---- 222,251 ----
-  }
-  #endif
-  
-+ static uid_t saved_uid;
-+ static gid_t saved_gid;
-+ 
-+ void save_privs()
-+ {
-+     saved_uid = geteuid();
-+     saved_gid = getegid();
-+ }
-+ 
-+ void get_privs()
-+ {
-+     if (seteuid(saved_uid) < 0)
-+ 	perror("failed to restore saved uid");
-+     if (setegid(saved_gid) < 0)
-+ 	perror("failed to restore saved gid");
-+ }
-+ 
-+ void release_privs()
-+ {
-+     if (seteuid(getuid()) < 0)
-+ 	perror("failed to release setuid");
-+     if (setegid(getgid()) < 0)
-+ 	perror("failed to release setgid");
-+ }
-  
-  /*  Catch a SIGCHLD signal and exit if the direct child has died.
-   */
-***************
-*** 337,344 ****
---- 361,370 ----
-  	gid = gr->gr_gid;
-        else
-  	gid = -1;
-+       get_privs();
-        fchown(ttyfd,uid,gid);
-        fchmod(ttyfd,0600);
-+       release_privs();
-  #endif
-  #ifdef TIOCCONS
-       if (console) 
-*** utmp.c	Tue Oct  4 08:47:56 1994
---- utmp.c	Sat Feb 24 22:21:30 1996
-***************
-*** 71,79 ****
-    extern char ttynam[];
-    extern struct stat ttyfd_stat;
-  
-!   chmod(ttynam,ttyfd_stat.st_mode);
-! 
-!   chown(ttynam,ttyfd_stat.st_uid,ttyfd_stat.st_gid);
-  #endif
-    if(madeutent)
-      cleanutent();
---- 71,83 ----
-    extern char ttynam[];
-    extern struct stat ttyfd_stat;
-  
-!   get_privs();
-!   if (chmod(ttynam,ttyfd_stat.st_mode) < 0)
-! 	perror("cant reset tty modes");
-! 
-!   if (chown(ttynam,ttyfd_stat.st_uid,ttyfd_stat.st_gid) < 0)
-! 	perror("cant reset tty owner");
-!   release_privs();
-  #endif
-    if(madeutent)
-      cleanutent();
-***************
-*** 166,171 ****
---- 170,176 ----
-  {
-    FILE *utmp;
-  
-+   get_privs();
-    if((utmp = fopen(UTMP,"r+")) == NULL)
-      return -1;
-    utmp_pos = get_tslot(ttyname) * sizeof(struct utmp);
-***************
-*** 174,179 ****
---- 179,185 ----
-    fseek(utmp,utmp_pos,0);
-    fwrite((char *)u, sizeof(struct utmp),1,utmp);
-    fclose(utmp);
-+   release_privs();
-    madeutent = 1;
-    return(utmp_pos);
-  }
-***************
-*** 228,239 ****
---- 234,247 ----
-    FILE *ut;
-    struct utmp u;
-    
-+   get_privs();
-    if((ut = fopen(UTMP,"r+")) == NULL)
-      return;
-    fseek(ut,utmp_pos,0);
-    memset(&u,0,sizeof(u));
-    fwrite((char *)&u,sizeof(struct utmp),1,ut);
-    fclose(ut);
-+   release_privs();
-  }
-  
-  
-***************
-*** 250,259 ****
---- 258,269 ----
-  int write_utmp(struct utmp * u) 
-  {
-    int pos;
-+   get_privs();
-    utmpname(UTMP);
-    setutent();
-    pututline(u);
-    endutent();
-+   release_privs();
-    pos = (int)NULL;
-    madeutent = 1;
-    return(pos);
-***************
-*** 305,311 ****
-  {
-    int pid;
-    struct utmp *u;
-!   
-    utmpname(UTMP);
-    setutent();
-    pid = getpid();
---- 315,322 ----
-  {
-    int pid;
-    struct utmp *u;
-! 
-!   get_privs();
-    utmpname(UTMP);
-    setutent();
-    pid = getpid();
-***************
-*** 333,338 ****
---- 344,350 ----
-  	  endutent();
-  	}
-      }
-+   release_privs();
-  }
-  
-  #endif /* BSD */
+--- src/Makefile.in.orig	Tue Apr  2 09:00:00 1996
++++ src/Makefile.in	Sat Dec  7 17:29:38 1996
+@@ -6,7 +6,7 @@
+ first_rule: all
+ dummy:
+ 
+-CFLAGS = $(XCFLAGS)
++CFLAGS = $(XCFLAGS) -DFREEBSD
+ CPPFLAGS = $(XCPPFLAGS)
+ LDFLAGS = $(XLDFLAGS)
+ DEFS = $(XDEFS)
+@@ -34,7 +34,7 @@
+ all: rxvt
+ 
+ rxvt: VERSION depend $(OBJS)
+-	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) -lX11
++	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) -L$(prefix)/lib -lX11
+ 
+ VERSION:
+ 	@echo "#define VERSION \""$(VERSION)"\""
+@@ -72,7 +72,7 @@
+ depend dep: .depend
+ 
+ .depend:
+-	$(DEPEND) -s "# DO NOT DELETE" -- $(CPPFLAGS) -- $(SRCS)
++	$(DEPEND) -I$(XINC) -s "# DO NOT DELETE" -- $(CPPFLAGS) -- $(SRCS)
+ 	@touch .depend
+ 
+ # ------------------------------------------------------------------------
diff --git a/x11/rxvt-unicode/pkg-comment b/x11/rxvt-unicode/pkg-comment
index ba4fbfb17e90..fbd15b64acab 100644
--- a/x11/rxvt-unicode/pkg-comment
+++ b/x11/rxvt-unicode/pkg-comment
@@ -1 +1 @@
-A cut-down version of xterm for those with less memory.
+rxvt - a low memory usage xterm replacement that supports color
diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile
index c18efda1492f..0e5918c3cd1d 100644
--- a/x11/rxvt/Makefile
+++ b/x11/rxvt/Makefile
@@ -1,23 +1,21 @@
 # New ports collection Makefile for: rxvt
-# Version required:	2.09
-# Date created:		5th December 1994
-# Whom:			gpalmer@FreeBSD.org
+# Version required:	2.16
+# Date created:         5th December 1994
+# Whom:                 gpalmer@FreeBSD.org
 #
-# $Id: Makefile,v 1.8 1996/10/15 19:24:55 asami Exp $
+# $Id: Makefile,v 1.7 1995/04/12 20:31:23 asami Exp $
 #
 
-DISTNAME=	rxvt-2.09
+DISTNAME=	rxvt-2.16
 CATEGORIES=	x11
-MASTER_SITES=	ftp://iraun1.ira.uka.de/pub/x11/misc/
+MASTER_SITES=	${MASTER_SITE_SUNSITE}  \
+		ftp://ftp.jurai.net/users/winter/rxvt/distfiles/
+MASTER_SITE_SUBDIR=	X11/xutils/terms
 
-MAINTAINER=	gpalmer@FreeBSD.ORG
+MAINTAINER=	winter@jurai.net
 
-WRKSRC=		${WRKDIR}/rxvt
-USE_IMAKE=	yes
-
-# Get rid of the rclock directory until I can figure out how to patch
-# that up also and make it!
-pre-configure:
-	@/bin/rm -rf ${WRKDIR}/rclock
+USE_X11=	yes
+GNU_CONFIGURE=  yes
+MAN1=		rxvt.1
 
 .include <bsd.port.mk>
diff --git a/x11/rxvt/distinfo b/x11/rxvt/distinfo
index 6efdef7dda7a..f78eaebd0643 100644
--- a/x11/rxvt/distinfo
+++ b/x11/rxvt/distinfo
@@ -1 +1 @@
-MD5 (rxvt-2.09.tar.gz) = 8572a17742148f97128de01b9faf1612
+MD5 (rxvt-2.16.tar.gz) = b7e468ba8b7dd335f5462e62aa2a566a
diff --git a/x11/rxvt/files/patch-aa b/x11/rxvt/files/patch-aa
index 87953ca79716..db6bfb619da0 100644
--- a/x11/rxvt/files/patch-aa
+++ b/x11/rxvt/files/patch-aa
@@ -1,52 +1,11 @@
-*** Imakefile.orig	Thu Oct 20 15:23:25 1994
---- Imakefile	Mon Dec  5 01:22:49 1994
-***************
-*** 4,10 ****
-   */
-  
-  # uncomment for gcc
-! CC=gcc 
-  
-  # add -DDEBUG to get rxvt to self-check for internal screen corruption
-  # add -DDEBUG_MALLOC to self check on out of bound memory usage.
---- 4,10 ----
-   */
-  
-  # uncomment for gcc
-! CC=cc 
-  
-  # add -DDEBUG to get rxvt to self-check for internal screen corruption
-  # add -DDEBUG_MALLOC to self check on out of bound memory usage.
-***************
-*** 77,86 ****
-  #EXTRA_LOAD_FLAGS= -lc -lucb
-  
-  # Using this defines adds in UTMP support for Sun OS 4.1.x
-! EXTRA_DEFINES = -DBSD -DUTMP_SUPPORT -DUTMP=\"/etc/utmp\" -DBSD -DTTYTAB=\"/etc/ttytab\" -DPRINT_PIPE $(GREEK_EXTRA) -DMAX_REFRESH_PERIOD=10 -DMULTIPLE_CLICKS -DFAKE_RESOURCES -DUSE_XCOPYAREA -DCOLOR -DGRAPHICS
-  
-  # for FreeBSD 
-! #EXTRA_DEFINES = -DUTMP_SUPPORT -DUTMP=\"/var/run/utmp\" -DBSD -DFREEBSD -DTTYTAB=\"/etc/ttys\" -DPRINT_PIPE $(GREEK_EXTRA) -DMAX_REFRESH_PERIOD=10 -DMULTIPLE_CLICKS -DFAKE_RESOURCES -DCOLOR -DGRAPHICS
-  
-  # for NetBSD 0.9
-  #DEFS = -DUTMP_SUPPORT -DUTMP=\"/var/run/utmp\" -DBSD -DFREEBSD -DTTYTAB=\"/etc/ttys\" -DPRINT_PIPE $(GREEK_EXTRA) -DMAX_REFRESH_PERIOD=10 -DMULTIPLE_CLICKS -DFAKE_RESOURCES -DCOLOR -DGRAPHICS
---- 77,86 ----
-  #EXTRA_LOAD_FLAGS= -lc -lucb
-  
-  # Using this defines adds in UTMP support for Sun OS 4.1.x
-! #EXTRA_DEFINES = -DBSD -DUTMP_SUPPORT -DUTMP=\"/etc/utmp\" -DBSD -DTTYTAB=\"/etc/ttytab\" -DPRINT_PIPE $(GREEK_EXTRA) -DMAX_REFRESH_PERIOD=10 -DMULTIPLE_CLICKS -DFAKE_RESOURCES -DUSE_XCOPYAREA -DCOLOR -DGRAPHICS
-  
-  # for FreeBSD 
-! EXTRA_DEFINES = -DUTMP_SUPPORT -DUTMP=\"/var/run/utmp\" -DBSD -DFREEBSD -DTTYTAB=\"/etc/ttys\" -DPRINT_PIPE $(GREEK_EXTRA) -DMAX_REFRESH_PERIOD=10 -DMULTIPLE_CLICKS -DFAKE_RESOURCES -DCOLOR -DGRAPHICS
-  
-  # for NetBSD 0.9
-  #DEFS = -DUTMP_SUPPORT -DUTMP=\"/var/run/utmp\" -DBSD -DFREEBSD -DTTYTAB=\"/etc/ttys\" -DPRINT_PIPE $(GREEK_EXTRA) -DMAX_REFRESH_PERIOD=10 -DMULTIPLE_CLICKS -DFAKE_RESOURCES -DCOLOR -DGRAPHICS
-***************
-*** 95,100 ****
---- 95,101 ----
-  
-  DEPLIBS = $(DEPXLIB) 
-  LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) 
-+ INSTALLFLAGS = -g wheel -o root -c -s -m 4755
-  
-  SRCS = rxvt.c command.c sbar.c screen.c utmp.c xsetup.c debug.c resources.c graphics.c\
-  	$(GREEK_SRC)
+--- Makefile.in.orig	Tue Apr  2 09:00:00 1996
++++ Makefile.in	Sat Dec  7 16:38:15 1996
+@@ -9,7 +9,7 @@
+ first_rule: all
+ dummy:
+ 
+-subdirs=src doc rclock test/graphics test/vttest
++subdirs=src doc #rclock test/graphics test/vttest
+ 
+ DIST_ETC = etc/xmkdir etc/XTerm.ad etc/termcap etc/terminfo
+ DIST_OLD = etc/old/Imakefile etc/old/Makefile etc/old/config.h
diff --git a/x11/rxvt/files/patch-ab b/x11/rxvt/files/patch-ab
index fb2c7d1e507f..0c8209f7823f 100644
--- a/x11/rxvt/files/patch-ab
+++ b/x11/rxvt/files/patch-ab
@@ -1,23 +1,10 @@
-*** command.c.old	Mon Dec  5 01:07:33 1994
---- command.c	Mon Dec  5 01:07:49 1994
-***************
-*** 373,381 ****
-        {
-  	int pgrp = getpid();
-  	ioctl(0, TIOCSPGRP, (char *)&pgrp);
-! 	setpgrp();
-  	close(open(ttynam, O_WRONLY, 0));
-! 	setpgrp ();
-        }
-  
-        /* init of termios structure		*/
---- 373,381 ----
-        {
-  	int pgrp = getpid();
-  	ioctl(0, TIOCSPGRP, (char *)&pgrp);
-! 	setpgrp(0,pgrp);
-  	close(open(ttynam, O_WRONLY, 0));
-! 	setpgrp (0,pgrp);
-        }
-  
-        /* init of termios structure		*/
+--- Make.common.in.orig	Tue Apr  2 09:00:00 1996
++++ Make.common.in	Sat Dec  7 17:08:14 1996
+@@ -42,6 +42,7 @@
+ 
+ # Flags & libs
+ # cannot use := to append (except GNU make), so do it this way.
++XINC = $(prefix)/include -I..
+ XCFLAGS = @CFLAGS@
+ XCPPFLAGS = @CPPFLAGS@ $(XINC)
+ XLDFLAGS = @LDFLAGS@
diff --git a/x11/rxvt/files/patch-ac b/x11/rxvt/files/patch-ac
index 570dfbf392aa..b1c6fd150e1f 100644
--- a/x11/rxvt/files/patch-ac
+++ b/x11/rxvt/files/patch-ac
@@ -1,190 +1,29 @@
-# The following is a security patch for rxvt, it (hopefully) avoids problems
-# with unauthorized users obtaining root.
-#
-# Based upon code provided by Marc Ewing (marc@redhat.com) for a previous
-# version of rxvt.
-#
-# BSD utmp code fixed again by peter@freebsd.org
-
-*** rxvt.h	Sat Feb 19 09:41:52 1994
---- rxvt.h	Wed Jan 10 23:42:09 1996
-***************
-*** 21,23 ****
---- 21,27 ----
-  extern void clean_exit(int);
-  extern void cleanutent(void);
-  extern void makeutent(char *);
-+ 
-+ void save_privs(void);
-+ void get_privs(void);
-+ void release_privs(void);
-*** rxvt.c	Fri Aug  5 23:52:07 1994
---- rxvt.c	Sat Feb 24 22:03:27 1996
-***************
-*** 45,50 ****
---- 45,54 ----
-    int i;
-    char *shell;
-    char **com_argv;
-+ 
-+   /* Save and give up setuid/setgid privileges */
-+   save_privs();
-+   release_privs();
-    
-    for (i = 0; i < argc; i++)
-      if (strcmp(argv[i],"-e") == 0)
-*** command.c	Sat Feb 24 22:03:27 1996
---- command.c	Sat Feb 24 22:12:26 1996
-***************
-*** 222,227 ****
---- 222,251 ----
-  }
-  #endif
-  
-+ static uid_t saved_uid;
-+ static gid_t saved_gid;
-+ 
-+ void save_privs()
-+ {
-+     saved_uid = geteuid();
-+     saved_gid = getegid();
-+ }
-+ 
-+ void get_privs()
-+ {
-+     if (seteuid(saved_uid) < 0)
-+ 	perror("failed to restore saved uid");
-+     if (setegid(saved_gid) < 0)
-+ 	perror("failed to restore saved gid");
-+ }
-+ 
-+ void release_privs()
-+ {
-+     if (seteuid(getuid()) < 0)
-+ 	perror("failed to release setuid");
-+     if (setegid(getgid()) < 0)
-+ 	perror("failed to release setgid");
-+ }
-  
-  /*  Catch a SIGCHLD signal and exit if the direct child has died.
-   */
-***************
-*** 337,344 ****
---- 361,370 ----
-  	gid = gr->gr_gid;
-        else
-  	gid = -1;
-+       get_privs();
-        fchown(ttyfd,uid,gid);
-        fchmod(ttyfd,0600);
-+       release_privs();
-  #endif
-  #ifdef TIOCCONS
-       if (console) 
-*** utmp.c	Tue Oct  4 08:47:56 1994
---- utmp.c	Sat Feb 24 22:21:30 1996
-***************
-*** 71,79 ****
-    extern char ttynam[];
-    extern struct stat ttyfd_stat;
-  
-!   chmod(ttynam,ttyfd_stat.st_mode);
-! 
-!   chown(ttynam,ttyfd_stat.st_uid,ttyfd_stat.st_gid);
-  #endif
-    if(madeutent)
-      cleanutent();
---- 71,83 ----
-    extern char ttynam[];
-    extern struct stat ttyfd_stat;
-  
-!   get_privs();
-!   if (chmod(ttynam,ttyfd_stat.st_mode) < 0)
-! 	perror("cant reset tty modes");
-! 
-!   if (chown(ttynam,ttyfd_stat.st_uid,ttyfd_stat.st_gid) < 0)
-! 	perror("cant reset tty owner");
-!   release_privs();
-  #endif
-    if(madeutent)
-      cleanutent();
-***************
-*** 166,171 ****
---- 170,176 ----
-  {
-    FILE *utmp;
-  
-+   get_privs();
-    if((utmp = fopen(UTMP,"r+")) == NULL)
-      return -1;
-    utmp_pos = get_tslot(ttyname) * sizeof(struct utmp);
-***************
-*** 174,179 ****
---- 179,185 ----
-    fseek(utmp,utmp_pos,0);
-    fwrite((char *)u, sizeof(struct utmp),1,utmp);
-    fclose(utmp);
-+   release_privs();
-    madeutent = 1;
-    return(utmp_pos);
-  }
-***************
-*** 228,239 ****
---- 234,247 ----
-    FILE *ut;
-    struct utmp u;
-    
-+   get_privs();
-    if((ut = fopen(UTMP,"r+")) == NULL)
-      return;
-    fseek(ut,utmp_pos,0);
-    memset(&u,0,sizeof(u));
-    fwrite((char *)&u,sizeof(struct utmp),1,ut);
-    fclose(ut);
-+   release_privs();
-  }
-  
-  
-***************
-*** 250,259 ****
---- 258,269 ----
-  int write_utmp(struct utmp * u) 
-  {
-    int pos;
-+   get_privs();
-    utmpname(UTMP);
-    setutent();
-    pututline(u);
-    endutent();
-+   release_privs();
-    pos = (int)NULL;
-    madeutent = 1;
-    return(pos);
-***************
-*** 305,311 ****
-  {
-    int pid;
-    struct utmp *u;
-!   
-    utmpname(UTMP);
-    setutent();
-    pid = getpid();
---- 315,322 ----
-  {
-    int pid;
-    struct utmp *u;
-! 
-!   get_privs();
-    utmpname(UTMP);
-    setutent();
-    pid = getpid();
-***************
-*** 333,338 ****
---- 344,350 ----
-  	  endutent();
-  	}
-      }
-+   release_privs();
-  }
-  
-  #endif /* BSD */
+--- src/Makefile.in.orig	Tue Apr  2 09:00:00 1996
++++ src/Makefile.in	Sat Dec  7 17:29:38 1996
+@@ -6,7 +6,7 @@
+ first_rule: all
+ dummy:
+ 
+-CFLAGS = $(XCFLAGS)
++CFLAGS = $(XCFLAGS) -DFREEBSD
+ CPPFLAGS = $(XCPPFLAGS)
+ LDFLAGS = $(XLDFLAGS)
+ DEFS = $(XDEFS)
+@@ -34,7 +34,7 @@
+ all: rxvt
+ 
+ rxvt: VERSION depend $(OBJS)
+-	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) -lX11
++	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) -L$(prefix)/lib -lX11
+ 
+ VERSION:
+ 	@echo "#define VERSION \""$(VERSION)"\""
+@@ -72,7 +72,7 @@
+ depend dep: .depend
+ 
+ .depend:
+-	$(DEPEND) -s "# DO NOT DELETE" -- $(CPPFLAGS) -- $(SRCS)
++	$(DEPEND) -I$(XINC) -s "# DO NOT DELETE" -- $(CPPFLAGS) -- $(SRCS)
+ 	@touch .depend
+ 
+ # ------------------------------------------------------------------------
diff --git a/x11/rxvt/pkg-comment b/x11/rxvt/pkg-comment
index ba4fbfb17e90..fbd15b64acab 100644
--- a/x11/rxvt/pkg-comment
+++ b/x11/rxvt/pkg-comment
@@ -1 +1 @@
-A cut-down version of xterm for those with less memory.
+rxvt - a low memory usage xterm replacement that supports color