- Move pager ports from misc/ to sysutils/

misc/44bsd-more -> sysutils/44bsd-more
misc/less -> sysutils/less
misc/most -> sysutils/most
misc/reed -> sysutils/reed
misc/wmcp -> x11-wm/wmcp (this one is a X11 desktop pager)

Repocopied by:	marcus

39 files changed, 15 insertions, 1066 deletions

diff --git a/MOVED b/MOVED
index f3c3254..d2c5f3f 100644
--- a/MOVED
+++ b/MOVED
@@ -1563,3 +1563,8 @@ russian/openoffice-1.0||2005-06-29|no longer maintained
 russian/openoffice-1.1||2005-06-29|localized version should be built via knob
 astro/gdesklets-weather||2005-07-03|does not work for a long time
 net/gdesklets-rssgrab||2005-07-03|dissapeared
+misc/44bsd-more|sysutils/44bsd-more|2005-07-10|moved to better category
+misc/less|sysutils/less|2005-07-10|moved to better category
+misc/most|sysutils/most|2005-07-10|moved to better category
+misc/reed|sysutils/reed|2005-07-10|moved to better category
+misc/wmcp|x11-wm/wmcp|2005-07-10|moved to better category
diff --git a/misc/44bsd-more/Makefile b/misc/44bsd-more/Makefile
deleted file mode 100644
index d73499c..0000000
--- a/misc/44bsd-more/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-# Ports collection makefile for:  more
-# Date created:			  24 May 2000
-# Whom:				  Tim van der Hoek <hoek@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	44bsd-more
-PORTVERSION=	${RELDATE}
-CATEGORIES=	misc
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	hoek
-
-MAINTAINER=	hoek@FreeBSD.org
-COMMENT=	The pager installed with FreeBSD before less(1) was imported
-
-USE_BZIP2=	yes
-USE_REINPLACE=	yes
-NO_WRKSUBDIR=	yes
-
-MAN1=		44bsd-more.1
-
-RELDATE=	20000521
-
-post-extract:
-	-cd ${WRKSRC} && co RCS/*,v
-
-post-patch:
-	${REINPLACE_CMD} -e \
-	    's!/usr/share/misc/more.help!${PREFIX}/share/misc/44bsd-more.help!'\
-	    ${WRKSRC}/pathnames.h
-	${CP} ${FILESDIR}/queue.h ${WRKSRC}
-	${REINPLACE_CMD} -e 's/static char \*getvar/static const char \*getvar/' \
-	    ${WRKSRC}/ncommand.c
-
-do-install:
-	${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_MAN} ${WRKSRC}/more.1 ${PREFIX}/man/man1/44bsd-more.1
-.for f in default.morerc less.morerc most.morerc
-	${INSTALL_DATA} ${WRKSRC}/${f} ${EXAMPLESDIR}
-.endfor
-	${INSTALL_DATA} ${WRKSRC}/more.help ${PREFIX}/share/misc/44bsd-more.help
-	${INSTALL_PROGRAM} ${WRKSRC}/more ${PREFIX}/bin/44bsd-more
-
-tarup:
-	cd ${WRKSRC} && tar cyf /tmp/${DISTFILES} RCS
-	scp /tmp/${DISTFILES} freefall:public_html/dists
-
-.include <bsd.port.mk>
diff --git a/misc/44bsd-more/distinfo b/misc/44bsd-more/distinfo
deleted file mode 100644
index 83d680b..0000000
--- a/misc/44bsd-more/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (44bsd-more-20000521.tar.bz2) = 5a9f04f31e5fddd3fdc143a470501f42
-SIZE (44bsd-more-20000521.tar.bz2) = 90043
diff --git a/misc/44bsd-more/files/patch-Makefile b/misc/44bsd-more/files/patch-Makefile
deleted file mode 100644
index 5daca79..0000000
--- a/misc/44bsd-more/files/patch-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile	2000/05/23 04:17:57	1.15
-+++ Makefile	2004/03/08 21:36:24
-@@ -6,7 +6,7 @@
- CFLAGS+=-I${.CURDIR} -I${.OBJDIR} -DTERMIOS
- SRCS=	ch.c command.c help.c input.c line.c linenum.c macro.c main.c marks.c \
- 	ncommand.c option.c os.c output.c position.c prim.c screen.c search.c \
--	signal.c tags.c ttyin.c
-+	signal.c tags.c ttyin.c defrc.h
- DPADD=	${LIBTERMCAP}
- LDADD=	-ltermcap
- 
diff --git a/misc/44bsd-more/files/patch-less.h b/misc/44bsd-more/files/patch-less.h
deleted file mode 100644
index f1ec835..0000000
--- a/misc/44bsd-more/files/patch-less.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- less.h	2000/05/22 23:34:52	1.8
-+++ less.h	2004/03/08 21:33:32
-@@ -114,7 +114,7 @@
-  * its users aren't careful.  Access through the macros is considered
-  * careful.
-  */
--GLOBAL(enum error erreur, NULL);
-+GLOBAL(enum error erreur, E_OK);
- GLOBAL(char *errstr, NULL);  /* must point be null or free()'ble */
- 
- #define SETERR(e) do { \
diff --git a/misc/44bsd-more/files/patch-main.c b/misc/44bsd-more/files/patch-main.c
deleted file mode 100644
index 3e000da..0000000
--- a/misc/44bsd-more/files/patch-main.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- main.c.orig	Tue Aug  5 17:17:15 2003
-+++ main.c	Tue Aug  5 17:21:34 2003
-@@ -33,9 +33,9 @@
-  */
- 
- #ifndef lint
--char copyright[] =
-+char copyright[] = \
- "@(#) Copyright (c) 1988 Mark Nudleman.\n\
--@(#) Copyright (c) 1988, 1993
-+@(#) Copyright (c) 1988, 1993\
- 	Regents of the University of California.  All rights reserved.\n";
- #endif /* not lint */
- 
diff --git a/misc/44bsd-more/files/patch-screen.c b/misc/44bsd-more/files/patch-screen.c
deleted file mode 100644
index 9e846af..0000000
--- a/misc/44bsd-more/files/patch-screen.c
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -U8 -r ../work.orig/screen.c ./screen.c
---- ../work.orig/screen.c	Fri Jan  5 22:17:02 2001
-+++ ./screen.c	Fri Jan  5 22:36:53 2001
-@@ -122,17 +122,19 @@
- #define M_UL 2
- #define M_BO 4
- 
- /*
-  * These two variables are sometimes defined in,
-  * and needed by, the termcap library.
-  * It may be necessary on some systems to declare them extern here.
-  */
-+#if 0
- /*extern*/ speed_t ospeed;	/* Terminal output baud rate */
-+#endif
- /*extern*/ char PC;		/* Pad character */
- 
- extern int back_scroll;
- 
- /*
-  * Change terminal to "raw mode", or restore to "normal" mode.
-  * "Raw mode" means
-  *	1. An outstanding read will complete on receipt of a single keystroke.
diff --git a/misc/44bsd-more/files/patch-tags.c b/misc/44bsd-more/files/patch-tags.c
deleted file mode 100644
index 5bbe515..0000000
--- a/misc/44bsd-more/files/patch-tags.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- tags.c.orig	Fri Jan 12 15:52:49 2001
-+++ tags.c	Fri Jan 12 15:55:10 2001
-@@ -42,7 +42,7 @@
- #endif /* not lint */
- 
- #include <sys/types.h>
--#include <sys/queue.h>
-+#include "queue.h"
- 
- #include <ctype.h>
- #include <stdio.h>
diff --git a/misc/44bsd-more/files/queue.h b/misc/44bsd-more/files/queue.h
deleted file mode 100644
index 7bf71b4..0000000
--- a/misc/44bsd-more/files/queue.h
+++ /dev/null
@@ -1,539 +0,0 @@
-/*
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)queue.h	8.5 (Berkeley) 8/20/94
- * $FreeBSD: /tmp/pcvs/ports/misc/44bsd-more/files/Attic/queue.h,v 1.1 2001-01-06 03:41:36 hoek Exp $
- */
-
-#ifndef _SYS_QUEUE_H_
-#define	_SYS_QUEUE_H_
-
-/*
- * This file defines five types of data structures: singly-linked lists,
- * singly-linked tail queues, lists, tail queues, and circular queues.
- *
- * A singly-linked list is headed by a single forward pointer. The elements
- * are singly linked for minimum space and pointer manipulation overhead at
- * the expense of O(n) removal for arbitrary elements. New elements can be
- * added to the list after an existing element or at the head of the list.
- * Elements being removed from the head of the list should use the explicit
- * macro for this purpose for optimum efficiency. A singly-linked list may
- * only be traversed in the forward direction.  Singly-linked lists are ideal
- * for applications with large datasets and few or no removals or for
- * implementing a LIFO queue.
- *
- * A singly-linked tail queue is headed by a pair of pointers, one to the
- * head of the list and the other to the tail of the list. The elements are
- * singly linked for minimum space and pointer manipulation overhead at the
- * expense of O(n) removal for arbitrary elements. New elements can be added
- * to the list after an existing element, at the head of the list, or at the
- * end of the list. Elements being removed from the head of the tail queue
- * should use the explicit macro for this purpose for optimum efficiency.
- * A singly-linked tail queue may only be traversed in the forward direction.
- * Singly-linked tail queues are ideal for applications with large datasets
- * and few or no removals or for implementing a FIFO queue.
- *
- * A list is headed by a single forward pointer (or an array of forward
- * pointers for a hash table header). The elements are doubly linked
- * so that an arbitrary element can be removed without a need to
- * traverse the list. New elements can be added to the list before
- * or after an existing element or at the head of the list. A list
- * may only be traversed in the forward direction.
- *
- * A tail queue is headed by a pair of pointers, one to the head of the
- * list and the other to the tail of the list. The elements are doubly
- * linked so that an arbitrary element can be removed without a need to
- * traverse the list. New elements can be added to the list before or
- * after an existing element, at the head of the list, or at the end of
- * the list. A tail queue may be traversed in either direction.
- *
- * A circle queue is headed by a pair of pointers, one to the head of the
- * list and the other to the tail of the list. The elements are doubly
- * linked so that an arbitrary element can be removed without a need to
- * traverse the list. New elements can be added to the list before or after
- * an existing element, at the head of the list, or at the end of the list.
- * A circle queue may be traversed in either direction, but has a more
- * complex end of list detection.
- *
- * For details on the use of these macros, see the queue(3) manual page.
- *
- *
- *			SLIST	LIST	STAILQ	TAILQ	CIRCLEQ
- * _HEAD		+	+	+	+	+
- * _ENTRY		+	+	+	+	+
- * _INIT		+	+	+	+	+
- * _EMPTY		+	+	+	+	+
- * _FIRST		+	+	+	+	+
- * _NEXT		+	+	+	+	+
- * _PREV		-	-	-	+	+
- * _LAST		-	-	+	+	+
- * _FOREACH		+	+	+	+	+
- * _FOREACH_REVERSE	-	-	-	+	+
- * _INSERT_HEAD		+	+	+	+	+
- * _INSERT_BEFORE	-	+	-	+	+
- * _INSERT_AFTER	+	+	+	+	+
- * _INSERT_TAIL		-	-	+	+	+
- * _REMOVE_HEAD		+	-	+	-	-
- * _REMOVE		+	+	+	+	+
- *
- */
-
-/*
- * Singly-linked List definitions.
- */
-#define SLIST_HEAD(name, type)						\
-struct name {								\
-	struct type *slh_first;	/* first element */			\
-}
-
-#define SLIST_HEAD_INITIALIZER(head)					\
-	{ NULL }
- 
-#define SLIST_ENTRY(type)						\
-struct {								\
-	struct type *sle_next;	/* next element */			\
-}
- 
-/*
- * Singly-linked List functions.
- */
-#define	SLIST_EMPTY(head)	((head)->slh_first == NULL)
-
-#define	SLIST_FIRST(head)	((head)->slh_first)
-
-#define SLIST_FOREACH(var, head, field)					\
-	for((var) = (head)->slh_first; (var); (var) = (var)->field.sle_next)
-
-#define SLIST_INIT(head) {						\
-	(head)->slh_first = NULL;					\
-}
-
-#define SLIST_INSERT_AFTER(slistelm, elm, field) do {			\
-	(elm)->field.sle_next = (slistelm)->field.sle_next;		\
-	(slistelm)->field.sle_next = (elm);				\
-} while (0)
-
-#define SLIST_INSERT_HEAD(head, elm, field) do {			\
-	(elm)->field.sle_next = (head)->slh_first;			\
-	(head)->slh_first = (elm);					\
-} while (0)
-
-#define SLIST_NEXT(elm, field)	((elm)->field.sle_next)
-
-#define SLIST_REMOVE_HEAD(head, field) do {				\
-	(head)->slh_first = (head)->slh_first->field.sle_next;		\
-} while (0)
-
-#define SLIST_REMOVE(head, elm, type, field) do {			\
-	if ((head)->slh_first == (elm)) {				\
-		SLIST_REMOVE_HEAD((head), field);			\
-	}								\
-	else {								\
-		struct type *curelm = (head)->slh_first;		\
-		while( curelm->field.sle_next != (elm) )		\
-			curelm = curelm->field.sle_next;		\
-		curelm->field.sle_next =				\
-		    curelm->field.sle_next->field.sle_next;		\
-	}								\
-} while (0)
-
-/*
- * Singly-linked Tail queue definitions.
- */
-#define STAILQ_HEAD(name, type)						\
-struct name {								\
-	struct type *stqh_first;/* first element */			\
-	struct type **stqh_last;/* addr of last next element */		\
-}
-
-#define STAILQ_HEAD_INITIALIZER(head)					\
-	{ NULL, &(head).stqh_first }
-
-#define STAILQ_ENTRY(type)						\
-struct {								\
-	struct type *stqe_next;	/* next element */			\
-}
-
-/*
- * Singly-linked Tail queue functions.
- */
-#define STAILQ_EMPTY(head) ((head)->stqh_first == NULL)
-
-#define	STAILQ_INIT(head) do {						\
-	(head)->stqh_first = NULL;					\
-	(head)->stqh_last = &(head)->stqh_first;			\
-} while (0)
-
-#define STAILQ_FIRST(head)	((head)->stqh_first)
-#define STAILQ_LAST(head)	(*(head)->stqh_last)
-
-#define STAILQ_FOREACH(var, head, field)				\
-	for((var) = (head)->stqh_first; (var); (var) = (var)->field.stqe_next)
-
-#define STAILQ_INSERT_HEAD(head, elm, field) do {			\
-	if (((elm)->field.stqe_next = (head)->stqh_first) == NULL)	\
-		(head)->stqh_last = &(elm)->field.stqe_next;		\
-	(head)->stqh_first = (elm);					\
-} while (0)
-
-#define STAILQ_INSERT_TAIL(head, elm, field) do {			\
-	(elm)->field.stqe_next = NULL;					\
-	*(head)->stqh_last = (elm);					\
-	(head)->stqh_last = &(elm)->field.stqe_next;			\
-} while (0)
-
-#define STAILQ_INSERT_AFTER(head, tqelm, elm, field) do {		\
-	if (((elm)->field.stqe_next = (tqelm)->field.stqe_next) == NULL)\
-		(head)->stqh_last = &(elm)->field.stqe_next;		\
-	(tqelm)->field.stqe_next = (elm);				\
-} while (0)
-
-#define STAILQ_NEXT(elm, field)	((elm)->field.stqe_next)
-
-#define STAILQ_REMOVE_HEAD(head, field) do {				\
-	if (((head)->stqh_first =					\
-	     (head)->stqh_first->field.stqe_next) == NULL)		\
-		(head)->stqh_last = &(head)->stqh_first;		\
-} while (0)
-
-#define STAILQ_REMOVE_HEAD_UNTIL(head, elm, field) do {			\
-	if (((head)->stqh_first = (elm)->field.stqe_next) == NULL)	\
-		(head)->stqh_last = &(head)->stqh_first;		\
-} while (0)
-
-#define STAILQ_REMOVE(head, elm, type, field) do {			\
-	if ((head)->stqh_first == (elm)) {				\
-		STAILQ_REMOVE_HEAD(head, field);			\
-	}								\
-	else {								\
-		struct type *curelm = (head)->stqh_first;		\
-		while( curelm->field.stqe_next != (elm) )		\
-			curelm = curelm->field.stqe_next;		\
-		if((curelm->field.stqe_next =				\
-		    curelm->field.stqe_next->field.stqe_next) == NULL)	\
-			(head)->stqh_last = &(curelm)->field.stqe_next;	\
-	}								\
-} while (0)
-
-/*
- * List definitions.
- */
-#define LIST_HEAD(name, type)						\
-struct name {								\
-	struct type *lh_first;	/* first element */			\
-}
-
-#define LIST_HEAD_INITIALIZER(head)					\
-	{ NULL }
-
-#define LIST_ENTRY(type)						\
-struct {								\
-	struct type *le_next;	/* next element */			\
-	struct type **le_prev;	/* address of previous next element */	\
-}
-
-/*
- * List functions.
- */
-
-#define	LIST_EMPTY(head) ((head)->lh_first == NULL)
-
-#define LIST_FIRST(head)	((head)->lh_first)
-
-#define LIST_FOREACH(var, head, field)					\
-	for((var) = (head)->lh_first; (var); (var) = (var)->field.le_next)
-
-#define	LIST_INIT(head) do {						\
-	(head)->lh_first = NULL;					\
-} while (0)
-
-#define LIST_INSERT_AFTER(listelm, elm, field) do {			\
-	if (((elm)->field.le_next = (listelm)->field.le_next) != NULL)	\
-		(listelm)->field.le_next->field.le_prev =		\
-		    &(elm)->field.le_next;				\
-	(listelm)->field.le_next = (elm);				\
-	(elm)->field.le_prev = &(listelm)->field.le_next;		\
-} while (0)
-
-#define LIST_INSERT_BEFORE(listelm, elm, field) do {			\
-	(elm)->field.le_prev = (listelm)->field.le_prev;		\
-	(elm)->field.le_next = (listelm);				\
-	*(listelm)->field.le_prev = (elm);				\
-	(listelm)->field.le_prev = &(elm)->field.le_next;		\
-} while (0)
-
-#define LIST_INSERT_HEAD(head, elm, field) do {				\
-	if (((elm)->field.le_next = (head)->lh_first) != NULL)		\
-		(head)->lh_first->field.le_prev = &(elm)->field.le_next;\
-	(head)->lh_first = (elm);					\
-	(elm)->field.le_prev = &(head)->lh_first;			\
-} while (0)
-
-#define LIST_NEXT(elm, field)	((elm)->field.le_next)
-
-#define LIST_REMOVE(elm, field) do {					\
-	if ((elm)->field.le_next != NULL)				\
-		(elm)->field.le_next->field.le_prev = 			\
-		    (elm)->field.le_prev;				\
-	*(elm)->field.le_prev = (elm)->field.le_next;			\
-} while (0)
-
-/*
- * Tail queue definitions.
- */
-#define TAILQ_HEAD(name, type)						\
-struct name {								\
-	struct type *tqh_first;	/* first element */			\
-	struct type **tqh_last;	/* addr of last next element */		\
-}
-
-#define TAILQ_HEAD_INITIALIZER(head)					\
-	{ NULL, &(head).tqh_first }
-
-#define TAILQ_ENTRY(type)						\
-struct {								\
-	struct type *tqe_next;	/* next element */			\
-	struct type **tqe_prev;	/* address of previous next element */	\
-}
-
-/*
- * Tail queue functions.
- */
-#define	TAILQ_EMPTY(head) ((head)->tqh_first == NULL)
-
-#define TAILQ_FOREACH(var, head, field)					\
-	for (var = TAILQ_FIRST(head); var; var = TAILQ_NEXT(var, field))
-
-#define TAILQ_FOREACH_REVERSE(var, head, headname, field)		\
-	for ((var) = TAILQ_LAST((head), headname);			\
-	     (var);							\
-	     (var) = TAILQ_PREV((var), headname, field))
-
-#define	TAILQ_FIRST(head) ((head)->tqh_first)
-
-#define	TAILQ_LAST(head, headname) \
-	(*(((struct headname *)((head)->tqh_last))->tqh_last))
-
-#define	TAILQ_NEXT(elm, field) ((elm)->field.tqe_next)
-
-#define TAILQ_PREV(elm, headname, field) \
-	(*(((struct headname *)((elm)->field.tqe_prev))->tqh_last))
-
-#define	TAILQ_INIT(head) do {						\
-	(head)->tqh_first = NULL;					\
-	(head)->tqh_last = &(head)->tqh_first;				\
-} while (0)
-
-#define TAILQ_INSERT_HEAD(head, elm, field) do {			\
-	if (((elm)->field.tqe_next = (head)->tqh_first) != NULL)	\
-		(head)->tqh_first->field.tqe_prev =			\
-		    &(elm)->field.tqe_next;				\
-	else								\
-		(head)->tqh_last = &(elm)->field.tqe_next;		\
-	(head)->tqh_first = (elm);					\
-	(elm)->field.tqe_prev = &(head)->tqh_first;			\
-} while (0)
-
-#define TAILQ_INSERT_TAIL(head, elm, field) do {			\
-	(elm)->field.tqe_next = NULL;					\
-	(elm)->field.tqe_prev = (head)->tqh_last;			\
-	*(head)->tqh_last = (elm);					\
-	(head)->tqh_last = &(elm)->field.tqe_next;			\
-} while (0)
-
-#define TAILQ_INSERT_AFTER(head, listelm, elm, field) do {		\
-	if (((elm)->field.tqe_next = (listelm)->field.tqe_next) != NULL)\
-		(elm)->field.tqe_next->field.tqe_prev = 		\
-		    &(elm)->field.tqe_next;				\
-	else								\
-		(head)->tqh_last = &(elm)->field.tqe_next;		\
-	(listelm)->field.tqe_next = (elm);				\
-	(elm)->field.tqe_prev = &(listelm)->field.tqe_next;		\
-} while (0)
-
-#define TAILQ_INSERT_BEFORE(listelm, elm, field) do {			\
-	(elm)->field.tqe_prev = (listelm)->field.tqe_prev;		\
-	(elm)->field.tqe_next = (listelm);				\
-	*(listelm)->field.tqe_prev = (elm);				\
-	(listelm)->field.tqe_prev = &(elm)->field.tqe_next;		\
-} while (0)
-
-#define TAILQ_REMOVE(head, elm, field) do {				\
-	if (((elm)->field.tqe_next) != NULL)				\
-		(elm)->field.tqe_next->field.tqe_prev = 		\
-		    (elm)->field.tqe_prev;				\
-	else								\
-		(head)->tqh_last = (elm)->field.tqe_prev;		\
-	*(elm)->field.tqe_prev = (elm)->field.tqe_next;			\
-} while (0)
-
-/*
- * Circular queue definitions.
- */
-#define CIRCLEQ_HEAD(name, type)					\
-struct name {								\
-	struct type *cqh_first;		/* first element */		\
-	struct type *cqh_last;		/* last element */		\
-}
-
-#define CIRCLEQ_ENTRY(type)						\
-struct {								\
-	struct type *cqe_next;		/* next element */		\
-	struct type *cqe_prev;		/* previous element */		\
-}
-
-/*
- * Circular queue functions.
- */
-#define CIRCLEQ_EMPTY(head) ((head)->cqh_first == (void *)(head))
-
-#define CIRCLEQ_FIRST(head) ((head)->cqh_first)
-
-#define CIRCLEQ_FOREACH(var, head, field)				\
-	for((var) = (head)->cqh_first;					\
-	    (var) != (void *)(head);					\
-	    (var) = (var)->field.cqe_next)
-
-#define CIRCLEQ_FOREACH_REVERSE(var, head, field)			\
-	for((var) = (head)->cqh_last;					\
-	    (var) != (void *)(head);					\
-	    (var) = (var)->field.cqe_prev)
-
-#define	CIRCLEQ_INIT(head) do {						\
-	(head)->cqh_first = (void *)(head);				\
-	(head)->cqh_last = (void *)(head);				\
-} while (0)
-
-#define CIRCLEQ_INSERT_AFTER(head, listelm, elm, field) do {		\
-	(elm)->field.cqe_next = (listelm)->field.cqe_next;		\
-	(elm)->field.cqe_prev = (listelm);				\
-	if ((listelm)->field.cqe_next == (void *)(head))		\
-		(head)->cqh_last = (elm);				\
-	else								\
-		(listelm)->field.cqe_next->field.cqe_prev = (elm);	\
-	(listelm)->field.cqe_next = (elm);				\
-} while (0)
-
-#define CIRCLEQ_INSERT_BEFORE(head, listelm, elm, field) do {		\
-	(elm)->field.cqe_next = (listelm);				\
-	(elm)->field.cqe_prev = (listelm)->field.cqe_prev;		\
-	if ((listelm)->field.cqe_prev == (void *)(head))		\
-		(head)->cqh_first = (elm);				\
-	else								\
-		(listelm)->field.cqe_prev->field.cqe_next = (elm);	\
-	(listelm)->field.cqe_prev = (elm);				\
-} while (0)
-
-#define CIRCLEQ_INSERT_HEAD(head, elm, field) do {			\
-	(elm)->field.cqe_next = (head)->cqh_first;			\
-	(elm)->field.cqe_prev = (void *)(head);				\
-	if ((head)->cqh_last == (void *)(head))				\
-		(head)->cqh_last = (elm);				\
-	else								\
-		(head)->cqh_first->field.cqe_prev = (elm);		\
-	(head)->cqh_first = (elm);					\
-} while (0)
-
-#define CIRCLEQ_INSERT_TAIL(head, elm, field) do {			\
-	(elm)->field.cqe_next = (void *)(head);				\
-	(elm)->field.cqe_prev = (head)->cqh_last;			\
-	if ((head)->cqh_first == (void *)(head))			\
-		(head)->cqh_first = (elm);				\
-	else								\
-		(head)->cqh_last->field.cqe_next = (elm);		\
-	(head)->cqh_last = (elm);					\
-} while (0)
-
-#define CIRCLEQ_LAST(head) ((head)->cqh_last)
-
-#define CIRCLEQ_NEXT(elm,field) ((elm)->field.cqe_next)
-
-#define CIRCLEQ_PREV(elm,field) ((elm)->field.cqe_prev)
-
-#define	CIRCLEQ_REMOVE(head, elm, field) do {				\
-	if ((elm)->field.cqe_next == (void *)(head))			\
-		(head)->cqh_last = (elm)->field.cqe_prev;		\
-	else								\
-		(elm)->field.cqe_next->field.cqe_prev =			\
-		    (elm)->field.cqe_prev;				\
-	if ((elm)->field.cqe_prev == (void *)(head))			\
-		(head)->cqh_first = (elm)->field.cqe_next;		\
-	else								\
-		(elm)->field.cqe_prev->field.cqe_next =			\
-		    (elm)->field.cqe_next;				\
-} while (0)
-
-#ifdef _KERNEL
-
-/*
- * XXX insque() and remque() are an old way of handling certain queues.
- * They bogusly assumes that all queue heads look alike.
- */
-
-struct quehead {
-	struct quehead *qh_link;
-	struct quehead *qh_rlink;
-};
-
-#ifdef	__GNUC__
-
-static __inline void
-insque(void *a, void *b)
-{
-	struct quehead *element = a, *head = b;
-
-	element->qh_link = head->qh_link;
-	element->qh_rlink = head;
-	head->qh_link = element;
-	element->qh_link->qh_rlink = element;
-}
-
-static __inline void
-remque(void *a)
-{
-	struct quehead *element = a;
-
-	element->qh_link->qh_rlink = element->qh_rlink;
-	element->qh_rlink->qh_link = element->qh_link;
-	element->qh_rlink = 0;
-}
-
-#else /* !__GNUC__ */
-
-void	insque __P((void *a, void *b));
-void	remque __P((void *a));
-
-#endif /* __GNUC__ */
-
-#endif /* _KERNEL */
-
-#endif /* !_SYS_QUEUE_H_ */
diff --git a/misc/44bsd-more/pkg-descr b/misc/44bsd-more/pkg-descr
deleted file mode 100644
index 5563a57..0000000
--- a/misc/44bsd-more/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-This is /usr/bin/more from FreeBSD before the import of the less(1) pager.
-It is an older version of less that includes some enhancements and fixes
-not in less.  These enhancments include support for global(1) tags,
-nicer horizontal scrolling, support for portable keyboard configurations
-using termcap(5), and a much shorter manpage.
-
-Due to the debatability of the latter feature (is it an enhancement or
-a bug?), /usr/bin/more has been replaced.  This port is available for
-those who desire any of the above features.
diff --git a/misc/44bsd-more/pkg-plist b/misc/44bsd-more/pkg-plist
deleted file mode 100644
index 0f18d76..0000000
--- a/misc/44bsd-more/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-bin/44bsd-more
-share/misc/44bsd-more.help
-share/examples/44bsd-more/default.morerc
-share/examples/44bsd-more/less.morerc
-share/examples/44bsd-more/most.morerc
-@dirrm share/examples/44bsd-more
diff --git a/misc/Makefile b/misc/Makefile
index 5c5f15c..5bbbeb9 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -3,7 +3,6 @@
 
     COMMENT = Miscellaneous utilities
 
-    SUBDIR += 44bsd-more
     SUBDIR += achievo
     SUBDIR += aclgen
     SUBDIR += acron
@@ -273,7 +272,6 @@
     SUBDIR += kwatch
     SUBDIR += latex-mk
     SUBDIR += lc
-    SUBDIR += less
     SUBDIR += lesspipe
     SUBDIR += libhome
     SUBDIR += libmcal
@@ -302,7 +300,6 @@
     SUBDIR += mirmon
     SUBDIR += misterproper
     SUBDIR += mmv
-    SUBDIR += most
     SUBDIR += moviedb
     SUBDIR += mshell
     SUBDIR += mtx
@@ -374,7 +371,6 @@
     SUBDIR += quick-lounge-applet
     SUBDIR += quotes
     SUBDIR += quranref
-    SUBDIR += reed
     SUBDIR += renamedlgplugins
     SUBDIR += rfc
     SUBDIR += ringtonetools
@@ -439,7 +435,6 @@
     SUBDIR += whichman
     SUBDIR += wmScoreBoard
     SUBDIR += wmcalendar
-    SUBDIR += wmcp
     SUBDIR += wmfirew
     SUBDIR += wminfo
     SUBDIR += wmjulia
diff --git a/misc/less/Makefile b/misc/less/Makefile
deleted file mode 100644
index cf1368a..0000000
--- a/misc/less/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# New ports collection makefile for:	less
-# Date created:		8 Nov 1994
-# Whom:			ache
-#
-# $FreeBSD$
-#
-
-PORTNAME=	less
-PORTVERSION=	382
-CATEGORIES=	misc
-MASTER_SITES=	http://www.greenwoodsoftware.com/%SUBDIR%/ \
-		${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	less
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
-
-MAINTAINER=	jharris@widomaker.com
-COMMENT=	A better pager utility
-
-USE_GPG?=	yes
-SIG_FILES=	${DISTNAME}${EXTRACT_SUFX}.sig
-
-PLIST_FILES=	bin/less bin/lesskey bin/lessecho
-
-.include <bsd.port.pre.mk>
-
-GNU_CONFIGURE=	yes
-MAN1=		less.1 lesskey.1
-
-.if defined(COLOUR_LESS) || defined(COLOR_LESS)
-MAKE_ENV=	CPPFLAGS="-DCOLOUR_LESS"
-
-pre-fetch:
-	@${ECHO_MSG} "Making a colour version of less."
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/misc/less/distinfo b/misc/less/distinfo
deleted file mode 100644
index f609c49..0000000
--- a/misc/less/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-MD5 (less-382.tar.gz) = 103fe4aef6297b93f0f73f38cc3b1bd7
-SHA1 (less-382.tar.gz) = 3c3f1ae0bf18039b047524ff0f573ef514bcc944
-RMD160 (less-382.tar.gz) = 2b851c7038d9a4dea4f369ff5705eafc9093de97
-SHA256 (less-382.tar.gz) = d33cc51f220647d015fd526b3782cde03c5d8b18c5233e6388a0047a70446fe7
-SIZE (less-382.tar.gz) = 264414
-MD5 (less-382.tar.gz.sig) = aa3b51b2c8a7cdf93e7e917e9c87f0f1
-SHA1 (less-382.tar.gz.sig) = a8508e43284364811c4d7245e689e590f1bff719
-RMD160 (less-382.tar.gz.sig) = 176dfb47b3a20d0d55b07c8b04ef1068839c2387
-SHA256 (less-382.tar.gz.sig) = 9870ed946aafb08e356d28e8b883b8affcf38bd9f55b4b9dca94a27be6fa1e88
-SIZE (less-382.tar.gz.sig) = 66
diff --git a/misc/less/files/patch-aa b/misc/less/files/patch-aa
deleted file mode 100644
index 092ecbe..0000000
--- a/misc/less/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Fri Apr  9 20:02:59 1999
-+++ Makefile.in	Thu Apr 15 23:09:36 1999
-@@ -15,7 +15,7 @@
- LDFLAGS = @LDFLAGS@
- O=o
- 
--LIBS = @LIBS@
-+LIBS = -ltermcap
- 
- prefix = @prefix@
- exec_prefix = @exec_prefix@
diff --git a/misc/less/files/patch-ab b/misc/less/files/patch-ab
deleted file mode 100644
index fb9dcb9..0000000
--- a/misc/less/files/patch-ab
+++ /dev/null
@@ -1,41 +0,0 @@
---- charset.c.orig	Thu Mar 23 05:36:33 2000
-+++ charset.c	Mon Jun 19 22:33:43 2000
-@@ -267,6 +267,10 @@
- control_char(c)
- 	int c;
- {
-+#ifdef COLOR_LESS
-+	if (c == ESC)
-+		return 0;
-+#endif
- 	c &= 0377;
- 	return (chardef[c] & IS_CONTROL_CHAR);
- }
-@@ -281,6 +285,20 @@
- {
- 	static char buf[8];
- 
-+#ifdef COLOR_LESS
-+	if(c == ESC)
-+		sprintf(buf, "%c", ESC);
-+	else
-+	{
-+		c &= 0377;
-+		if (!control_char(c))
-+			sprintf(buf, "%c", c);
-+		else if (!control_char(c ^ 0100))
-+			sprintf(buf, "^%c", c ^ 0100);
-+		else
-+			sprintf(buf, binfmt, c);
-+	}
-+#else
- 	c &= 0377;
- 	if (!control_char(c))
- 		sprintf(buf, "%c", c);
-@@ -290,5 +308,6 @@
- 		sprintf(buf, "^%c", c ^ 0100);
- 	else
- 		sprintf(buf, binfmt, c);
-+#endif
- 	return (buf);
- }
diff --git a/misc/less/pkg-descr b/misc/less/pkg-descr
deleted file mode 100644
index bfa94d9..0000000
--- a/misc/less/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-This is the distribution of "less", a paginator similar to "more" or "pg",
-but much more powerful.
-
-WWW: http://www.greenwoodsoftware.com/less/
diff --git a/misc/most/Makefile b/misc/most/Makefile
deleted file mode 100644
index f2313af..0000000
--- a/misc/most/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# New ports collection makefile for:	most
-# Date created:		31 May 1997
-# Whom:			rhwang@bigpanda.com
-#
-# $FreeBSD$
-#
-
-PORTNAME=	most
-PORTVERSION=	4.10.1
-PORTREVISION=	1
-CATEGORIES=	misc
-MASTER_SITES=	ftp://space.mit.edu/pub/davis/most/ \
-		ftp://ftp.uni-stuttgart.de/pub/unix/misc/slang/most/ \
-		http://gd.tuwien.ac.at/editors/davis/most/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A pager (like less) which has support for windows and binary files
-
-LIB_DEPENDS=	slang.1:${PORTSDIR}/devel/libslang
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--enable-mmap
-MAN1=		most.1
-
-.include <bsd.port.mk>
diff --git a/misc/most/distinfo b/misc/most/distinfo
deleted file mode 100644
index 6dd9395..0000000
--- a/misc/most/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (most-4.10.1.tar.gz) = 3feeb1855e0e902b5a4decde68f9159e
-SIZE (most-4.10.1.tar.gz) = 138230
diff --git a/misc/most/files/patch-aa b/misc/most/files/patch-aa
deleted file mode 100644
index 28bd732..0000000
--- a/misc/most/files/patch-aa
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/Makefile.in	Fri Dec 20 23:32:56 2002
-+++ src/Makefile.in	Wed Mar 10 17:11:10 2004
-@@ -22,5 +22,5 @@
- BIN_DIR		= $(prefix)/bin
- MAN_DIR		= $(prefix)/man
--DOC_DIR		= $(prefix)/doc/most
-+DOC_DIR		= $(prefix)/share/doc/most
- SYS_INITFILE	= @sysconfdir@/most.conf
- MKINSDIR	= ../autoconf/mkinsdir.sh
-@@ -69,5 +69,7 @@
- 	/bin/rm -rf $(OBJDIR) Makefile sysconf.h
- installdirs:
-+.if !defined(NOPORTDOCS)
- 	$(MKINSDIR) $(DEST_DOCDIR)
-+.endif
- 	$(MKINSDIR) $(DEST_MANDIR)/man1
- 	$(MKINSDIR) $(DEST_BINDIR)
-@@ -75,4 +77,5 @@
- 	$(INSTALL) -s $(OBJDIR)/most $(DEST_BINDIR)
- 	$(INSTALL_DATA) ../most.1 $(DEST_MANDIR)/man1
-+.if !defined(NOPORTDOCS)
- 	@for i in $(DOC_FILES); \
- 	do \
-@@ -84,4 +87,5 @@
- 		fi; \
- 	done
-+.endif
- # The symlinks target is for my own private use.  It simply creates the object
- # directory as a symbolic link to a local disk instead of an NFS mounted one.
diff --git a/misc/most/files/patch-src-window.c b/misc/most/files/patch-src-window.c
deleted file mode 100644
index 27e816a..0000000
--- a/misc/most/files/patch-src-window.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/window.c.orig	Tue Feb 22 17:19:49 2005
-+++ src/window.c	Wed Jul  6 13:54:14 2005
-@@ -238,7 +238,7 @@
- 
- int most_read_from_minibuffer(char *prompt, char *what, unsigned int buflen)
- {
--   int i;
-+   int i = 0;
-    char *buf;
-    unsigned int len;
- 
diff --git a/misc/most/pkg-descr b/misc/most/pkg-descr
deleted file mode 100644
index f898e60..0000000
--- a/misc/most/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-most is a pager (like less) that displays, one windowful at a time,
-the contents of a file on a terminal.  It pauses after each windowful
-and prints the following on the window status line: the screen, the
-file name, current line number, and the percentage of the file so far
-displayed.
-
-In addition to displaying ordinary text files, most can also display
-binary files as well as files with arbitrary ascii characters.  As an
-option, autosensing of binary files can be disabled (via the -k
-option), thereby allowing one to browse files encoded in a different
-language (Japanese, Korean, Chinese, etc).
-
-WWW: http://space.mit.edu/~davis/jedsoft/most/
-FTP: ftp://ftp.jedsoft.org/pub/davis/most
diff --git a/misc/most/pkg-plist b/misc/most/pkg-plist
deleted file mode 100644
index cc68b3e..0000000
--- a/misc/most/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-bin/most
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/changes.txt
-%%PORTDOCS%%%%DOCSDIR%%/lesskeys.rc
-%%PORTDOCS%%%%DOCSDIR%%/most-fun.txt
-%%PORTDOCS%%%%DOCSDIR%%/most.doc
-%%PORTDOCS%%%%DOCSDIR%%/most.rc
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/misc/reed/Makefile b/misc/reed/Makefile
deleted file mode 100644
index 693b30f..0000000
--- a/misc/reed/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# New ports collection makefile for:	reed
-# Date created:				7 August 2001
-# Whom:					Pete Fritchman <petef@databits.net>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	reed
-PORTVERSION=	5.4
-PORTREVISION=	1
-CATEGORIES=	misc
-MASTER_SITES=	http://www.sacredchao.net/~piman/archive/
-
-MAINTAINER=	petef@FreeBSD.org
-COMMENT=	A text pager with autoscrolling and more
-
-USE_PERL5=	yes
-HAS_CONFIGURE=	yes
-CONFIGURE_SCRIPT=	configures
-
-MAN1=	breed.1 reed.1 wrap.1
-
-post-patch:
-	@${PERL} -pi -e 's!/usr/local!${PREFIX}!g' ${WRKSRC}/configures
-	@${PERL} -pi -e 's!sys/dir.h!dirent.h!g;s!.*getopt.h.*\n!!' \
-		${WRKSRC}/reed.c
-	@${PERL} -pi -e 's!getopt.h !!' ${WRKSRC}/cfg.data
-	@${PERL} -pi -e 's!-O2!${CFLAGS}!' ${WRKSRC}/Makefile.in
-	@${PERL} -pi -e 's!^#!/usr/bin/perl!#!${PERL}!' \
-		${WRKSRC}/fix_bookmarks.pl
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/reed ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/breed ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/wrap ${PREFIX}/bin
-	@${MKDIR} ${DATADIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/fix_bookmarks.pl ${DATADIR}
-.for file in ${MAN1}
-	${INSTALL_SCRIPT} ${WRKSRC}/${file} ${PREFIX}/man/man1
-.endfor
-
-.include <bsd.port.mk>
diff --git a/misc/reed/distinfo b/misc/reed/distinfo
deleted file mode 100644
index 1713301..0000000
--- a/misc/reed/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (reed-5.4.tar.gz) = 22c8d80dd6a81ecc6ef60662f2d1840c
-SIZE (reed-5.4.tar.gz) = 32414
diff --git a/misc/reed/pkg-descr b/misc/reed/pkg-descr
deleted file mode 100644
index 6275fb8..0000000
--- a/misc/reed/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-reed is a text pager for reading large files, such as full books
-(usually etexts from Project Gutenberg).  It has the features one
-would expect for a pager (multiple buffers, searching, file
-information, subshells, etc) and more: persistent bookmarks, auto
-scrolling, and support for many different types of files.
-
-- Pete
-petef@databits.net
-
-WWW: http://web.archive.org/web/20040217010815/www.sacredchao.net/software/reed/
diff --git a/misc/reed/pkg-plist b/misc/reed/pkg-plist
deleted file mode 100644
index fadfb8e..0000000
--- a/misc/reed/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-bin/breed
-bin/reed
-bin/wrap
-share/reed/fix_bookmarks.pl
-@dirrm share/reed
diff --git a/misc/wmcp/Makefile b/misc/wmcp/Makefile
deleted file mode 100644
index 7056031..0000000
--- a/misc/wmcp/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# New ports collection makefile for:	wmcp
-# Date created:			10 February 1999
-# Whom:				Jim Mock <jim@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	wmcp
-PORTVERSION=	1.2.8
-CATEGORIES=	misc windowmaker
-MASTER_SITES=	http://soupnazi.org/FreeBSD/ports/distfiles/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A dockable pager for Window Maker
-
-PLIST_FILES=	bin/wmcp
-USE_X_PREFIX=	yes
-USE_XPM=	yes
-ALL_TARGET=	clean wmcp
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/wmcp ${PREFIX}/bin
-
-.include <bsd.port.mk>
diff --git a/misc/wmcp/distinfo b/misc/wmcp/distinfo
deleted file mode 100644
index 0f963bb..0000000
--- a/misc/wmcp/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (wmcp-1.2.8.tar.gz) = 6f347dd6fb0b017de868081088cdcf13
-SIZE (wmcp-1.2.8.tar.gz) = 8673
diff --git a/misc/wmcp/files/patch-aa b/misc/wmcp/files/patch-aa
deleted file mode 100644
index 5465a92..0000000
--- a/misc/wmcp/files/patch-aa
+++ /dev/null
@@ -1,25 +0,0 @@
---- Makefile.orig	Thu May 27 16:17:20 1999
-+++ Makefile	Fri Aug 11 02:28:17 2000
-@@ -1,7 +1,7 @@
- 
- 
--INCLUDES =-I/usr/X11R6/include/X11 -I/usr/local/include -I/usr/include/X11R6/X11
--LIBINC =-L/usr/X11R6/lib -L/usr/include/lib
-+INCLUDES = -I${X11BASE}/include/X11 -I${X11BASE}/include
-+LIBINC = -L${X11BASE}/lib
- LIBS = -lm -lX11 -lXpm -lXext
- 
- TARGET  = wmcp
-@@ -31,10 +31,10 @@
- ###################################################################
- 
- ${OBJECTS}: ${SOURCE}
--	gcc -g -c -Wall ${INCLUDES} ${FLAGS} $< -o $*.o
-+	${CC} ${CFLAGS} -c ${INCLUDES} ${FLAGS} $< -o $@
- 
- ${TARGET}: ${OBJECTS}
--	gcc -g -o ${TARGET} ${OBJECTS} ${LIBINC} ${LIBS}
-+	${CC} ${CFLAGS} -o ${TARGET} ${OBJECTS} ${LIBINC} ${LIBS}
- 
- clean::
- 	for i in ${OBJECTS}; do if [ -e $$i ] ; then rm $$i; fi; done 
diff --git a/misc/wmcp/files/patch-wmcp.c b/misc/wmcp/files/patch-wmcp.c
deleted file mode 100644
index ce31d26..0000000
--- a/misc/wmcp/files/patch-wmcp.c
+++ /dev/null
@@ -1,73 +0,0 @@
---- wmcp.c.orig	Sat Jan  3 17:14:42 2004
-+++ wmcp.c	Sat Jan  3 17:15:43 2004
-@@ -806,38 +806,38 @@
- void show_usage()
- {
- 
--fprintf(stderr,"
--
--%s
--This software is GPL -- do as you wish with it.
--
--Origional Author:
--   Ben Cohen <buddog@aztec.asu.edu>
--
--Contributors:
--   Thomas Nemeth <tnemeth@multimania.com>
--   Craig Maloney <craig@ic.net>
--   Gert Beumer <Gert@scintilla.utwente.nl>
--
--
--
--usage: wmcp [-g geometry] [-d dpy] [-n workspaces] [-a alt key] [-v]
--            [-c] [-w i/n/w] [-s y/n] [-x #] [-y #] [-h]
--
--
---g    geometry:    ie: 64x64+10+10
---d    dpy:         Display. ie: 127.0.0.1:0.0
---n    workspaces:  How many buttons to start with.
---a    alt key:     integer 1-4 defining ModXMask (default 1 Mod1Mask).
---w    i/n/w:       Window State: Iconic, Normal, Withdrawn (default Withdrawn)
---s    y/n:         Shaped window: yes or no (default y)
---c                 Sends CTRL + ALT + Key (default only sends ALT + key)
---v                 Verbose. 0=off, 1=on (default 0)
---x                 Number of buttons on the x-direction (1,2,3, or 4)
---y                 Number of buttons in the y-direction (1,2,3, or 4)
---h                 Help. This screen.
--
--
-+fprintf(stderr,"\n\
-+\n\
-+%s\n\
-+This software is GPL -- do as you wish with it.\n\
-+\n\
-+Origional Author:\n\
-+   Ben Cohen <buddog@aztec.asu.edu>\n\
-+\n\
-+Contributors:\n\
-+   Thomas Nemeth <tnemeth@multimania.com>\n\
-+   Craig Maloney <craig@ic.net>\n\
-+   Gert Beumer <Gert@scintilla.utwente.nl>\n\
-+\n\
-+\n\
-+\n\
-+usage: wmcp [-g geometry] [-d dpy] [-n workspaces] [-a alt key] [-v]\n\
-+            [-c] [-w i/n/w] [-s y/n] [-x #] [-y #] [-h]\n\
-+\n\
-+\n\
-+-g    geometry:    ie: 64x64+10+10\n\
-+-d    dpy:         Display. ie: 127.0.0.1:0.0\n\
-+-n    workspaces:  How many buttons to start with.\n\
-+-a    alt key:     integer 1-4 defining ModXMask (default 1 Mod1Mask).\n\
-+-w    i/n/w:       Window State: Iconic, Normal, Withdrawn (default Withdrawn)\n\
-+-s    y/n:         Shaped window: yes or no (default y)\n\
-+-c                 Sends CTRL + ALT + Key (default only sends ALT + key)\n\
-+-v                 Verbose. 0=off, 1=on (default 0)\n\
-+-x                 Number of buttons on the x-direction (1,2,3, or 4)\n\
-+-y                 Number of buttons in the y-direction (1,2,3, or 4)\n\
-+-h                 Help. This screen.\n\
-+\n\
-+\n\
- ",VERSION);
- 
- exit(-1);
diff --git a/misc/wmcp/pkg-descr b/misc/wmcp/pkg-descr
deleted file mode 100644
index 44bf3fd..0000000
--- a/misc/wmcp/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-A very simple dockable pager for Window Maker.  Up to nine workspaces
-my be selected with buttons that send the appropriate synthetic ALT
-1..9 key code to the root window.  If you love Window Maker but can't
-live without a pager, this app may be of use to you. 
-
-- Jim <jim@FreeBSD.org>
diff --git a/sysutils/44bsd-more/Makefile b/sysutils/44bsd-more/Makefile
index d73499c..a4ae3e6 100644
--- a/sysutils/44bsd-more/Makefile
+++ b/sysutils/44bsd-more/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	44bsd-more
 PORTVERSION=	${RELDATE}
-CATEGORIES=	misc
+CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	hoek
 
diff --git a/sysutils/Makefile b/sysutils/Makefile
index 9ddd865..3b5264d 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -4,6 +4,7 @@
     COMMENT = System utilities
 
     SUBDIR += 3dm
+    SUBDIR += 44bsd-more
     SUBDIR += 915resolution
     SUBDIR += LPRng
     SUBDIR += LPRngTool
@@ -245,6 +246,7 @@
     SUBDIR += lcdproc
     SUBDIR += ldap-account-manager
     SUBDIR += ledit
+    SUBDIR += less
     SUBDIR += lfm
     SUBDIR += libcdio
     SUBDIR += libchk
@@ -301,6 +303,7 @@
     SUBDIR += modules
     SUBDIR += monit
     SUBDIR += monitord
+    SUBDIR += most
     SUBDIR += mount.app
     SUBDIR += msyslog
     SUBDIR += mtxorbd
@@ -416,6 +419,7 @@
     SUBDIR += rdiff-backup
     SUBDIR += rdiff-backup-devel
     SUBDIR += readlink
+    SUBDIR += reed
     SUBDIR += reoback
     SUBDIR += rfstool
     SUBDIR += rlogview
diff --git a/sysutils/less/Makefile b/sysutils/less/Makefile
index cf1368a..34a9d5d 100644
--- a/sysutils/less/Makefile
+++ b/sysutils/less/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	less
 PORTVERSION=	382
-CATEGORIES=	misc
+CATEGORIES=	sysutils
 MASTER_SITES=	http://www.greenwoodsoftware.com/%SUBDIR%/ \
 		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	less
diff --git a/sysutils/most/Makefile b/sysutils/most/Makefile
index f2313af..9d426fa 100644
--- a/sysutils/most/Makefile
+++ b/sysutils/most/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	most
 PORTVERSION=	4.10.1
 PORTREVISION=	1
-CATEGORIES=	misc
+CATEGORIES=	sysutils
 MASTER_SITES=	ftp://space.mit.edu/pub/davis/most/ \
 		ftp://ftp.uni-stuttgart.de/pub/unix/misc/slang/most/ \
 		http://gd.tuwien.ac.at/editors/davis/most/
diff --git a/sysutils/reed/Makefile b/sysutils/reed/Makefile
index 693b30f..75a4dcb 100644
--- a/sysutils/reed/Makefile
+++ b/sysutils/reed/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	reed
 PORTVERSION=	5.4
 PORTREVISION=	1
-CATEGORIES=	misc
+CATEGORIES=	sysutils
 MASTER_SITES=	http://www.sacredchao.net/~piman/archive/
 
 MAINTAINER=	petef@FreeBSD.org
diff --git a/x11-wm/Makefile b/x11-wm/Makefile
index 70b14ce..2766af2 100644
--- a/x11-wm/Makefile
+++ b/x11-wm/Makefile
@@ -109,6 +109,7 @@
     SUBDIR += wmakerconf
     SUBDIR += wmanager
     SUBDIR += wmconfig
+    SUBDIR += wmcp
     SUBDIR += wmg
     SUBDIR += wmi
     SUBDIR += wmii
diff --git a/x11-wm/wmcp/Makefile b/x11-wm/wmcp/Makefile
index 7056031..69437a5 100644
--- a/x11-wm/wmcp/Makefile
+++ b/x11-wm/wmcp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmcp
 PORTVERSION=	1.2.8
-CATEGORIES=	misc windowmaker
+CATEGORIES=	x11-wm windowmaker
 MASTER_SITES=	http://soupnazi.org/FreeBSD/ports/distfiles/
 
 MAINTAINER=	ports@FreeBSD.org