Fold x11/rclock as a subpackage into x11/rxvt. ok ish@

x11/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.165 2003/04/27 08:04:26 sturm Exp $
+# $OpenBSD: Makefile,v 1.166 2003/05/30 11:18:01 naddy Exp $
 # $FreeBSD: Makefile,v 1.178 1997/11/24 05:32:52 fenner Exp $
 
 #    SUBDIR += FWF
@@ -126,7 +126,6 @@
      SUBDIR += qvwm,esound,imlib
      SUBDIR += qvwm,imlib
      SUBDIR += ratpoison
-     SUBDIR += rclock
      SUBDIR += rdesktop
      SUBDIR += rep-gtk
      SUBDIR += root-tail

x11/rclock/Makefile

@@ -1,24 +0,0 @@
-# $OpenBSD: Makefile,v 1.16 2002/12/25 17:49:09 margarida Exp $
-
-COMMENT=	"analog clock for X11 w/appoint. reminder and mail notif"
-
-PKGNAME=	rclock-2.7.6
-DISTNAME=	rxvt-2.7.6
-CATEGORIES=	x11
-
-MASTER_SITES=	${MASTER_SITE_BACKUP}
-
-PERMIT_PACKAGE_CDROM=	Yes
-PERMIT_PACKAGE_FTP=	Yes
-PERMIT_DISTFILES_CDROM=	Yes
-PERMIT_DISTFILES_FTP=	Yes
-
-USE_X11=	Yes
-CONFIGURE_STYLE=gnu
-MODGNU_CONFIG_GUESS_DIRS=	${WRKSRC} ${WRKSRC}/autoconf
-
-ALL_TARGET=	clock
-
-NO_REGRESS=	Yes
-
-.include <bsd.port.mk>

x11/rclock/distinfo

@@ -1,3 +0,0 @@
-MD5 (rxvt-2.7.6.tar.gz) = 38ebb05ad29dd4e979743ec1d47be4dc
-RMD160 (rxvt-2.7.6.tar.gz) = 76a1f18d0042af51cae10caae3414c4e6b77d7a0
-SHA1 (rxvt-2.7.6.tar.gz) = c89c12d8024f3de9126d140282110b1486d42b2a

x11/rclock/patches/patch-Makefile_in

@@ -1,12 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.1 2001/06/22 20:53:20 jasoni Exp $
---- Makefile.in.orig	Thu Apr 12 07:45:06 2001
-+++ Makefile.in	Fri Jun 22 13:42:25 2001
-@@ -9,7 +9,7 @@ VPATH =		@srcdir@
- first_rule: all
- dummy:
- 
--subdirs = src doc rclock src/graphics src/test
-+subdirs = rclock # src doc rclock src/graphics src/test
- 
- DIST =	INSTALL README.configure configure Makefile Makefile.in ChangeLog
- 

x11/rclock/pkg/PLIST

@@ -1,3 +0,0 @@
-@comment $OpenBSD: PLIST,v 1.2 2001/06/22 20:53:21 jasoni Exp $
-bin/rclock
-man/man1/rclock.1

x11/rxvt/Makefile

@@ -1,8 +1,11 @@
-# $OpenBSD: Makefile,v 1.28 2003/05/18 17:48:23 ish Exp $
+# $OpenBSD: Makefile,v 1.29 2003/05/30 11:18:02 naddy Exp $
 
 COMMENT=	"color, low memory usage, xterm replacement"
+COMMENT-clock=	"analog clock for X11 w/appoint. reminder and mail notif"
 
-DISTNAME=	rxvt-2.6.4
+VER=		2.6.4
+DISTNAME=	rxvt-${VER}
+PKGNAME-clock=	rclock-${VER}
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.rxvt.org/pub/rxvt/ \
 		ftp://ftp.ics.es.osaka-u.ac.jp/pub/mirrors/rxvt/ \
@@ -17,9 +20,12 @@ PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
 
+MULTI_PACKAGES=	-clock
+SUBPACKAGE?=
+
 USE_X11=		Yes
 CONFIGURE_STYLE= 	gnu
-MODGNU_CONFIG_GUESS_DIRS=	${WRKSRC} ${WRKSRC}/autoconf
+MODGNU_CONFIG_GUESS_DIRS=	${WRKSRC}/autoconf
 CONFIGURE_ARGS=		--enable-utmp \
 			--enable-wtmp \
 			--with-xpm \

x11/rxvt/patches/patch-Makefile.in

@@ -1,11 +0,0 @@
---- Makefile.in.orig	Wed Oct 31 12:44:29 2001
-+++ Makefile.in	Wed Oct 31 12:44:48 2001
-@@ -9,7 +9,7 @@ VPATH =		@srcdir@
- first_rule: all
- dummy:
- 
--subdirs = src doc rclock src/graphics
-+subdirs = src doc # rclock src/graphics
- 
- DIST =	INSTALL README.configure configure Makefile Makefile.in ChangeLog
- 

x11/rxvt/patches/patch-rclock_feature_h

@@ -1,4 +1,4 @@
-$OpenBSD: patch-rclock_feature_h,v 1.1 2001/06/22 20:53:20 jasoni Exp $
+$OpenBSD: patch-rclock_feature_h,v 1.1 2003/05/30 11:18:02 naddy Exp $
 --- rclock/feature.h.orig	Mon Apr 20 00:30:42 1998
 +++ rclock/feature.h	Fri Jun 22 13:43:33 2001
 @@ -53,7 +53,7 @@

x11/rxvt/pkg/DESCR-clock

@@ -4,4 +4,3 @@ there is mail waiting; an appointment reminder is also builtin.
 
 The ~/.rclock file lists the messages to display and/or the programs
 to run at specified times and dates.
-

x11/rxvt/pkg/PLIST-clock

@@ -0,0 +1,3 @@
+@comment $OpenBSD: PLIST-clock,v 1.1 2003/05/30 11:18:02 naddy Exp $
+bin/rclock
+man/man1/rclock.1