From stijn@pcwin002.win.tue.nl  Mon Jun 24 03:03:41 2002
Return-Path: <stijn@pcwin002.win.tue.nl>
Received: from pcwin002.win.tue.nl (pcwin002.win.tue.nl [131.155.71.72])
	by hub.freebsd.org (Postfix) with ESMTP id 10BE337B409
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 24 Jun 2002 03:03:40 -0700 (PDT)
Received: from pcwin002.win.tue.nl (orb_rules@localhost [127.0.0.1])
	by pcwin002.win.tue.nl (8.12.3/8.12.3) with ESMTP id g5OA3cNi059260
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 24 Jun 2002 12:03:38 +0200 (CEST)
	(envelope-from stijn@pcwin002.win.tue.nl)
Received: (from stijn@localhost)
	by pcwin002.win.tue.nl (8.12.3/8.12.3/Submit) id g5OA3cwh059259;
	Mon, 24 Jun 2002 12:03:38 +0200 (CEST)
Message-Id: <200206241003.g5OA3cwh059259@pcwin002.win.tue.nl>
Date: Mon, 24 Jun 2002 12:03:38 +0200 (CEST)
From: Stijn Hoop <stijn@win.tue.nl>
Reply-To: Stijn Hoop <stijn@win.tue.nl>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [MAINTAINER UPDATE]: x11-wm/bbkeys
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         39773
>Category:       ports
>Synopsis:       [MAINTAINER UPDATE]: x11-wm/bbkeys
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jun 24 03:10:01 PDT 2002
>Closed-Date:    Mon Jun 24 10:32:59 PDT 2002
>Last-Modified:  Mon Jun 24 10:32:59 PDT 2002
>Originator:     Stijn Hoop
>Release:        FreeBSD 4.6-STABLE i386
>Organization:
>Environment:
System: FreeBSD pcwin002.win.tue.nl 4.6-STABLE FreeBSD 4.6-STABLE #0: Mon Jun 17 04:35:36 CEST 2002 src@pcwin002.win.tue.nl:/usr/obj/usr/src/sys/PCWIN002 i386

>Description:

- 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

>Fix:

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 11:55:00 2002
@@ -13,21 +13,21 @@
 
 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
 
 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' \
+	@${REINPLACE_CMD} '/^(docdir|doc_DATA)/ && next; print' \
 		${WRKSRC}/Makefile.in
 .endif
 
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
>Release-Note:
>Audit-Trail:

From: Stijn Hoop <stijn@win.tue.nl>
To: FreeBSD-gnats-submit@freebsd.org, freebsd-ports@freebsd.org
Cc:  
Subject: Re: ports/39773: [MAINTAINER UPDATE]: x11-wm/bbkeys
Date: Mon, 24 Jun 2002 12:20:59 +0200

 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 
State-Changed-By: pat 
State-Changed-When: Mon Jun 24 10:31:21 PDT 2002 
State-Changed-Why:  
Committed, Thanks! (slight change to keep the port from depending on perl) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=39773 
>Unformatted:
