- make use of MAKE_FLAGS and do-install, remove patch

- add @comment with RCS id to PLIST

plan9/9menu/Makefile

@@ -1,11 +1,15 @@
-# $OpenBSD: Makefile,v 1.9 2000/06/07 00:52:08 espie Exp $
+# $OpenBSD: Makefile,v 1.10 2000/08/19 01:27:25 brad Exp $
 
 DISTNAME=	9menu-1.5
 CATEGORIES=	plan9
-NEED_VERSION=	1.191
+NEED_VERSION=	1.310
 MASTER_SITES=	ftp://ftp.mathcs.emory.edu/pub/arnold/
 EXTRACT_SUFX=	.shar.gz
 
+EXTRACT_CMD=	gzcat
+EXTRACT_BEFORE_ARGS=	# empty
+EXTRACT_AFTER_ARGS= | ${SH}
+
 MAINTAINER=	angelos@openbsd.org
 
 PERMIT_PACKAGE_CDROM=	Yes
@@ -13,10 +17,15 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-USE_X11=	Yes
+MAKE_FLAGS=	CC="${CC}" CFLAGS="${CFLAGS} -I/usr/X11R6/include" \
+		LIBS="-L/usr/X11R6/lib -lX11"
+
+ALL_TARGET=	9menu
+
 WRKDIST=	${WRKDIR}
-EXTRACT_CMD=	gzcat
-EXTRACT_BEFORE_ARGS=	# empty
-EXTRACT_AFTER_ARGS= | ${SH}
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/9menu ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/9menu.1 ${PREFIX}/man/man1
 
 .include <bsd.port.mk>

plan9/9menu/patches/patch-aa

@@ -1,21 +0,0 @@
---- Makefile.orig	Mon Jun  8 21:02:39 1998
-+++ Makefile	Mon Jun  8 21:07:47 1998
-@@ -6,8 +6,16 @@
- # arnold@skeeve.atl.ga.us
- 
- CC = gcc
--CFLAGS = -g -O
--LIBS = -lX11
-+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:
-+	$(BSD_INSTALL_PROGRAM) 9menu $(PREFIX)/bin
-+	$(BSD_INSTALL_MAN) -c 9menu.1 $(PREFIX)/man/man1
-+

plan9/9menu/pkg/PLIST

@@ -1,2 +1,3 @@
+@comment $OpenBSD: PLIST,v 1.2 2000/08/19 01:26:49 brad Exp $
 bin/9menu
 man/man1/9menu.1