- add USE_GCC=2.95 and unbreak this port

- use USE_XLIB=yes instead of CATEGORIES=x11, which is suggested by portlint
- replace pkg-plist with PLIST_FILES and PORTDOCS

PR:		71837
Submitted by:	leeym
Approved by:	maintainer timeout

2 files changed, 7 insertions, 18 deletions

diff --git a/misc/menushki/Makefile b/misc/menushki/Makefile
index bca6ec667518..90f38471d862 100644
--- a/misc/menushki/Makefile
+++ b/misc/menushki/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	menushki
 PORTVERSION=	1.0
 PORTREVISION=	1
-CATEGORIES=	misc x11
+CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
@@ -18,21 +18,16 @@ COMMENT=	Menu converter between varieties of Window Managers
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
+USE_XLIB=	yes
+USE_GCC=	2.95
 
-DOCS=	AUTHORS ChangeLog README TODO
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
+PLIST_FILES=	bin/menushki
+PORTDOCS=	AUTHORS ChangeLog README TODO
 
 post-install:
 .ifndef(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for files in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${files} ${DOCSDIR}
-.endfor
+	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/menushki/pkg-plist b/misc/menushki/pkg-plist
deleted file mode 100644
index 3fca614347f7..000000000000
--- a/misc/menushki/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-bin/menushki
-%%PORTDOCS%%share/doc/menushki/AUTHORS
-%%PORTDOCS%%share/doc/menushki/ChangeLog
-%%PORTDOCS%%share/doc/menushki/README
-%%PORTDOCS%%share/doc/menushki/TODO
-%%PORTDOCS%%@dirrm share/doc/menushki