--- x11-wm/bbkeys/Makefile	Wed Aug 11 00:54:50 2004
+++ x11-wm/bbkeys/Makefile	Wed Aug 11 02:22:33 2004
@@ -6,7 +6,7 @@ 
 #
 
 PORTNAME=	bbkeys
-PORTVERSION=	0.8.5
+PORTVERSION=	0.8.6
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,19 +15,26 @@ 
 COMMENT=	A keygrabber for the Blackbox window manager
 
 USE_X_PREFIX=	yes
+USE_PERL5=	yes
 GNU_CONFIGURE=	yes
-USE_REINPLACE=	yes
 
 MAN1=		bbkeys.1
 MAN5=		bbkeysrc.5 bbkeys.bb.5
+PORTDOCS=	AUTHORS BUGS ChangeLog NEWS README
+PLIST_FILES=	bin/bbkeys bin/bbkeysconf.pl \
+		share/bbtools/bbkeys.bb share/bbtools/bbkeys.nobb
 
-pre-patch:
+post-patch:
+	@${PERL} -pi -e 's|: install-docDATA|:|g' ${WRKSRC}/Makefile.in
+
+post-install:
 .if !defined(NOPORTDOCS)
-	@${REINPLACE_CMD} -e 's@doc/bbkeys@share/doc/bbkeys@g' \
-		${WRKSRC}/Makefile.in
-.else
-	@${REINPLACE_CMD} -E 's|^docdir|#|; s|^doc_DATA|#|' \
-		${WRKSRC}/Makefile.in
+	@${MKDIR} ${DOCSDIR}
+.for file in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.endfor
 .endif
+	@${ECHO_CMD} "@unexec rmdir %D/share/bbtools 2>/dev/null || true" \
+		>> ${TMPPLIST}
 
 .include <bsd.port.mk>
--- x11-wm/bbkeys/distinfo	Fri Mar 19 11:50:32 2004
+++ x11-wm/bbkeys/distinfo	Tue Aug 10 23:18:33 2004
@@ -1,2 +1,2 @@ 
-MD5 (bbkeys-0.8.5.tar.gz) = 15fbc82d1ea411a1ce7c6b2667ea8282
-SIZE (bbkeys-0.8.5.tar.gz) = 184795
+MD5 (bbkeys-0.8.6.tar.gz) = 6df58a99d136f21682b859b823d31b7d
+SIZE (bbkeys-0.8.6.tar.gz) = 185230
--- x11-wm/bbkeys/pkg-plist	Tue Sep 10 20:35:31 2002
+++ x11-wm/bbkeys/pkg-plist	Thu Jan  1 09:00:00 1970
@@ -1,11 +0,0 @@ 
-bin/bbkeys
-bin/bbkeysconf.pl
-share/bbtools/bbkeys.bb
-share/bbtools/bbkeys.nobb
-%%PORTDOCS%%share/doc/bbkeys/BUGS
-%%PORTDOCS%%share/doc/bbkeys/NEWS
-%%PORTDOCS%%share/doc/bbkeys/README
-%%PORTDOCS%%share/doc/bbkeys/AUTHORS
-%%PORTDOCS%%share/doc/bbkeys/ChangeLog
-%%PORTDOCS%%@dirrm share/doc/bbkeys
-@unexec rmdir %D/share/bbtools 2>/dev/null || true