From david@usermode.org  Mon Oct 24 05:30:08 2005
Return-Path: <david@usermode.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 5BA6916A41F
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 24 Oct 2005 05:30:08 +0000 (GMT)
	(envelope-from david@usermode.org)
Received: from smtpauth01.mail.atl.earthlink.net (smtpauth01.mail.atl.earthlink.net [209.86.89.61])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 15A3A43D46
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 24 Oct 2005 05:30:08 +0000 (GMT)
	(envelope-from david@usermode.org)
Received: from [68.164.156.40] (helo=scatha.usermode.org)
	by smtpauth01.mail.atl.earthlink.net with asmtp (TLSv1:RC4-MD5:128)
	(Exim 4.34)
	id 1ETuuN-0008UI-9Y
	for FreeBSD-gnats-submit@freebsd.org; Mon, 24 Oct 2005 01:30:07 -0400
Message-Id: <E1ETuuN-0008UI-9Y@smtpauth01.mail.atl.earthlink.net>
Date: Mon, 24 Oct 2005 05:30:08 +0000 (GMT)
From: David Johnson <david@usermode.org>
Reply-To: David Johnson <david@usermode.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: maintainer update of misc/qbrew
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         87901
>Category:       ports
>Synopsis:       maintainer update of misc/qbrew
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    garga
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Oct 24 05:30:19 GMT 2005
>Closed-Date:    Tue Oct 25 09:01:47 GMT 2005
>Last-Modified:  Tue Oct 25 09:01:47 GMT 2005
>Originator:     David Johnson
>Release:        FreeBSD 5.4-RELEASE i386
>Organization:
>Environment:
System: FreeBSD scatha.usermode.org 5.4-RELEASE FreeBSD 5.4-RELEASE #0: Thu May 12 21:32:57 PDT 2005 david@scatha.usermode.org:/usr/obj/usr/src/sys/SCATHA i386


	
>Description:
Honor X11BASE, per request of Kris Kennaway. 
>How-To-Repeat:
	
>Fix:

	

--- qbrew.diff begins here ---
diff -ruN qbrew.org/Makefile qbrew/Makefile
--- qbrew.org/Makefile	Sun Oct 23 22:14:34 2005
+++ qbrew/Makefile	Sun Oct 23 22:23:02 2005
@@ -17,6 +17,9 @@
 GNU_CONFIGURE=	yes
 USE_QT_VER=	3
 QT_NONSTANDARD=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS=		--x-includes=${X11BASE}/include	\
+			--x-libraries=${X11BASE}/lib
 
 post-install:
 	${STRIP_CMD} ${PREFIX}/bin/qbrew
--- qbrew.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->garga 
Responsible-Changed-By: garga 
Responsible-Changed-When: Mon Oct 24 09:08:21 GMT 2005 
Responsible-Changed-Why:  
Grabbed. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=87901 
State-Changed-From-To: open->feedback 
State-Changed-By: garga 
State-Changed-When: Mon Oct 24 12:20:13 GMT 2005 
State-Changed-Why:  
Ask for maintainer approval. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=87901 

From: Renato Botelho <garga@FreeBSD.org>
To: david@usermode.org
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/87901: maintainer update of misc/qbrew
Date: Mon, 24 Oct 2005 12:20:03 +0000

 Dear maintainer,
 
 Since I'm here, I propose you the following patch, the main differences is:
 
 - Use DATADIR macro
 - Respect NOPORTDOCS
 - Use PORTDOCS
 
 Do you approve this?
 
 --- qbrew.patch begins here ---
 Index: Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/misc/qbrew/Makefile,v
 retrieving revision 1.11
 diff -u -r1.11 Makefile
 --- Makefile	6 Jul 2005 05:37:45 -0000	1.11
 +++ Makefile	24 Oct 2005 12:18:53 -0000
 @@ -13,12 +13,25 @@
  MAINTAINER=	david@usermode.org
  COMMENT=	A homebrewer's recipe calculator
  
 +USE_REINPLACE=	yes
  USE_GMAKE=	yes
  GNU_CONFIGURE=	yes
  USE_QT_VER=	3
 +PORTDOCS=	*
  QT_NONSTANDARD=	yes
 +CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 +CONFIGURE_ARGS=		--x-includes=${X11BASE}/include	\
 +			--x-libraries=${X11BASE}/lib
 +
 +.include <bsd.port.pre.mk>
 +
 +post-patch:
 +.if defined(NOPORTDOCS)
 +	@${REINPLACE_CMD} -E 's,^(SUBDIRS = .*) docs,\1,' \
 +		${WRKSRC}/Makefile.in
 +.endif
  
  post-install:
  	${STRIP_CMD} ${PREFIX}/bin/qbrew
  
 -.include <bsd.port.mk>
 +.include <bsd.port.post.mk>
 Index: pkg-plist
 ===================================================================
 RCS file: /home/pcvs/ports/misc/qbrew/pkg-plist,v
 retrieving revision 1.7
 diff -u -r1.7 pkg-plist
 --- pkg-plist	6 Jul 2005 05:37:45 -0000	1.7
 +++ pkg-plist	24 Oct 2005 12:18:53 -0000
 @@ -1,37 +1,11 @@
  bin/qbrew
 -share/doc/qbrew/en/primer-design.html
 -share/doc/qbrew/en/primer-equipment.html
 -share/doc/qbrew/en/primer-firstbrew.html
 -share/doc/qbrew/en/primer-glossary.html
 -share/doc/qbrew/en/primer-mashing.html
 -share/doc/qbrew/en/primer-recipes.html
 -share/doc/qbrew/en/primer.html
 -share/doc/qbrew/en/qbrew-changes.html
 -share/doc/qbrew/en/qbrew-commandline.html
 -share/doc/qbrew/en/qbrew-configuration.html
 -share/doc/qbrew/en/qbrew-copyright.html
 -share/doc/qbrew/en/qbrew-credits.html
 -share/doc/qbrew/en/qbrew-faq.html
 -share/doc/qbrew/en/qbrew-handbook.html
 -share/doc/qbrew/en/qbrew-hop.html
 -share/doc/qbrew/en/qbrew-install.html
 -share/doc/qbrew/en/qbrew-intro.html
 -share/doc/qbrew/en/qbrew-misc.html
 -share/doc/qbrew/en/qbrew-notes.html
 -share/doc/qbrew/en/qbrew-reference.html
 -share/doc/qbrew/en/qbrew-using.html
 -share/doc/qbrew/en/qbrew.docbook
 -share/doc/qbrew/en/qbrew.xsl
 -share/doc/qbrew/en/sqa.html
 -share/qbrew/ChangeLog
 -share/qbrew/LICENSE
 -share/qbrew/README
 -share/qbrew/paleale.qbrew
 -share/qbrew/qbrew.png
 -share/qbrew/qbrew.svg
 -share/qbrew/qbrewdata
 -share/qbrew/splash.png
 -share/qbrew/stout.qbrew
 -@dirrm share/qbrew
 -@dirrm share/doc/qbrew/en
 -@dirrm share/doc/qbrew
 +%%DATADIR%%/ChangeLog
 +%%DATADIR%%/LICENSE
 +%%DATADIR%%/README
 +%%DATADIR%%/paleale.qbrew
 +%%DATADIR%%/qbrew.png
 +%%DATADIR%%/qbrew.svg
 +%%DATADIR%%/qbrewdata
 +%%DATADIR%%/splash.png
 +%%DATADIR%%/stout.qbrew
 +@dirrm %%DATADIR%%
 --- qbrew.patch ends here ---
State-Changed-From-To: feedback->closed 
State-Changed-By: garga 
State-Changed-When: Tue Oct 25 09:01:45 GMT 2005 
State-Changed-Why:  
Committed. Thanks! 

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