- Remove dependency on QT and bbconf (they're not needed anymore) - Use REINPLACE_CMD instead of PERL - Don't remove a shared directory on deinstall if not empty How-To-Repeat: N/A
Whoops, I botched that one - it obviously doesn't work in the NOPORTDOCS=yes case (which I forgot to test). Here's a better patch. diff -urN --exclude=CVS /usr/ports/x11-wm/bbkeys/Makefile bbkeys/Makefile --- /usr/ports/x11-wm/bbkeys/Makefile Wed May 15 05:43:41 2002 +++ bbkeys/Makefile Mon Jun 24 12:17:46 2002 @@ -13,19 +13,23 @@ MAINTAINER= stijn@win.tue.nl -RUN_DEPENDS= bbconf:${PORTSDIR}/x11-wm/bbconf \ - blackbox:${PORTSDIR}/x11-wm/blackbox +RUN_DEPENDS= blackbox:${PORTSDIR}/x11-wm/blackbox USE_X_PREFIX= yes +USE_REINPLACE= yes GNU_CONFIGURE= yes -USE_QT_VER= 2 MAN1= bbkeys.1 MAN5= bbkeysrc.5 bbkeys.bb.5 +.if !defined(NOPORTDOCS) +USE_PERL5= yes +.endif + pre-patch: .if !defined(NOPORTDOCS) - @${PERL} -pi -e 's@doc/bbkeys@share/doc/bbkeys@g' ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} 's@doc/bbkeys@share/doc/bbkeys@g' \ + ${WRKSRC}/Makefile.in .else @${PERL} -ni -e '/^(docdir|doc_DATA)/ && next; print' \ ${WRKSRC}/Makefile.in diff -urN --exclude=CVS /usr/ports/x11-wm/bbkeys/pkg-plist bbkeys/pkg-plist --- /usr/ports/x11-wm/bbkeys/pkg-plist Wed May 15 05:43:41 2002 +++ bbkeys/pkg-plist Thu Jun 13 14:31:39 2002 @@ -8,4 +8,4 @@ %%PORTDOCS%%share/doc/bbkeys/AUTHORS %%PORTDOCS%%share/doc/bbkeys/ChangeLog %%PORTDOCS%%@dirrm share/doc/bbkeys -@dirrm share/bbtools +@unexec rmdir %D/share/bbtools >/dev/null 2>&1 || true
State Changed From-To: open->closed Committed, Thanks! (slight change to keep the port from depending on perl)