Repocopy x11-wm/Makefile to x11/Makefile

PR:		ports/64681
Requested by:	Serge Gagnon <gagnon_s@sympatico.ca> (maintainer)

9 files changed, 4 insertions, 77 deletions

diff --git a/CVSROOT/modules b/CVSROOT/modules
index 96650c8d5820..591f2ff19fd1 100644
--- a/CVSROOT/modules
+++ b/CVSROOT/modules
@@ -74,7 +74,7 @@ taginfo		CVSROOT taginfo
 9box		ports/x11/9box
 9e		ports/archivers/9e
 9libs		ports/x11-toolkits/9libs
-9menu		ports/x11-wm/9menu
+9menu		ports/x11/9menu
 9term		ports/x11/9term
 9wm		ports/x11-wm/9wm
 ADMsmb		ports/security/ADMsmb
diff --git a/MOVED b/MOVED
index bf825d3934d5..d2db49c55dd0 100644
--- a/MOVED
+++ b/MOVED
@@ -1001,3 +1001,4 @@ mail/mew2-xemacs21|mail/mew2|2004-03-28|removed old version of xemacs 21.x
 mail/mew3-xemacs21|mail/mew3|2004-03-28|removed old version of xemacs 21.x
 net/memcached|databases/memcached|2004-03-27|remove duplicate port
 japanese/emacs21-emcws|japanese/emacs-emcws|2004-03-29|emacs 21.x moved to default port location
+x11-wm/9menu|x11/9menu|2004-03-29|accurate category
diff --git a/x11-wm/9menu/Makefile b/x11-wm/9menu/Makefile
deleted file mode 100644
index e7c9429b7c44..000000000000
--- a/x11-wm/9menu/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# New ports collection makefile for:    9menu
-# Date created:         Sun Aug 13 12:36:14 CDT 1995
-# Whom:                 erich@rrnet.com
-#
-# $FreeBSD$
-#
-
-PORTNAME=	9menu
-PORTVERSION=	1.7
-CATEGORIES=	x11-wm plan9
-MASTER_SITES=	ftp://freefriends.org/arnold/Source/ \
-		${MASTER_SITE_NETBSD}
-EXTRACT_SUFX=	.shar.gz
-
-MAINTAINER=	gagnon_s@sympatico.ca
-COMMENT=	A simple menu patterened after plan9
-
-PLIST_FILES=		bin/9menu
-USE_XLIB=		yes
-EXTRACT_CMD=		zcat
-EXTRACT_BEFORE_ARGS=
-EXTRACT_AFTER_ARGS=	|sh
-MAKEFILE=		Makefile.noimake
-ALL_TARGET=		9menu
-
-NO_WRKSUBDIR=	yes
-
-MAN1=		9menu.1
-MANCOMPRESSED=	yes
-
-.include <bsd.port.mk>
diff --git a/x11-wm/9menu/distinfo b/x11-wm/9menu/distinfo
deleted file mode 100644
index c3994b5485b9..000000000000
--- a/x11-wm/9menu/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (9menu-1.7.shar.gz) = faa42b7a708cdfdbf5ce6cd1391e9eed
-SIZE (9menu-1.7.shar.gz) = 8854
diff --git a/x11-wm/9menu/files/patch-aa b/x11-wm/9menu/files/patch-aa
deleted file mode 100644
index b4f58f7337c7..000000000000
--- a/x11-wm/9menu/files/patch-aa
+++ /dev/null
@@ -1,31 +0,0 @@
-*** Makefile.orig	Fri Aug 11 15:55:35 1995
---- Makefile.noimake	Fri Aug 11 16:03:26 1995
-***************
-*** 6,13 ****
-  # arnold@skeeve.atl.ga.us
-  
-  CC = gcc
-! CFLAGS = -g -O
-! LIBS = -lX11
-  
-  9menu: 9menu.c
-  	$(CC) $(CFLAGS) 9menu.c $(LIBS) -o 9menu
---- 6,23 ----
-  # arnold@skeeve.atl.ga.us
-  
-  CC = gcc
-! CFLAGS = -O -I/usr/X11R6/include
-! LIBS = -L/usr/X11R6/lib -lX11
-! 
-! 
-! all: 9menu
-  
-  9menu: 9menu.c
-  	$(CC) $(CFLAGS) 9menu.c $(LIBS) -o 9menu
-+ 
-+ install:
-+ 	$(INSTALL) -c 9menu $(PREFIX)/bin
-+ 	$(INSTALL) -c 9menu.1 $(PREFIX)/man/man1
-+ 	strip $(PREFIX)/bin/9menu
-+ 	gzip -9nf $(PREFIX)/man/man1/9menu.1
-+ 
diff --git a/x11-wm/9menu/pkg-descr b/x11-wm/9menu/pkg-descr
deleted file mode 100644
index 67b630a8fabb..000000000000
--- a/x11-wm/9menu/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-This is 9menu, a simple program that allows you to create X menus from the
-shell, where each menu item will run a command. 9menu is intended for use
-with 9wm, but can be used with any other window manager.
-
-The idea of a command line menu generator is from xmenu, but xmenu was
-exclusively a pop-up menu, not what I wanted.
-
---
-Arnold Robbins
-arnold@gnu.ai.mit.edu
diff --git a/x11-wm/Makefile b/x11-wm/Makefile
index 20346d0b7836..dc68d2de442d 100644
--- a/x11-wm/Makefile
+++ b/x11-wm/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD$
 #
 
-    SUBDIR += 9menu
     SUBDIR += 9wm
     SUBDIR += aewm
     SUBDIR += aewm++
diff --git a/x11/9menu/Makefile b/x11/9menu/Makefile
index e7c9429b7c44..ffd3c27ef22a 100644
--- a/x11/9menu/Makefile
+++ b/x11/9menu/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	9menu
 PORTVERSION=	1.7
-CATEGORIES=	x11-wm plan9
+CATEGORIES=	x11 plan9
 MASTER_SITES=	ftp://freefriends.org/arnold/Source/ \
 		${MASTER_SITE_NETBSD}
 EXTRACT_SUFX=	.shar.gz
diff --git a/x11/Makefile b/x11/Makefile
index d6d9dc6429a9..b29b0518982e 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -3,6 +3,7 @@
 
     SUBDIR += 3ddesktop
     SUBDIR += 9box
+    SUBDIR += 9menu
     SUBDIR += 9term
     SUBDIR += XFree86
     SUBDIR += XFree86-4