From fabianruch@bsdgroup.de  Fri Aug  8 20:33:41 2008
Return-Path: <fabianruch@bsdgroup.de>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 66EFE106567F
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  8 Aug 2008 20:33:41 +0000 (UTC)
	(envelope-from fabianruch@bsdgroup.de)
Received: from mail.bsdgroup.de (mail.bsdgroup.de [82.193.243.42])
	by mx1.freebsd.org (Postfix) with ESMTP id B7B498FC1A
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  8 Aug 2008 20:33:40 +0000 (UTC)
	(envelope-from fabianruch@bsdgroup.de)
Received: from mail.bsdgroup.de (mail.bsdgroup.de [82.193.243.42])
	by mail.bsdgroup.de (Postfix) with SMTP id 4040E192CF4
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  8 Aug 2008 22:22:23 +0200 (CEST)
Received: from beastie.local (dslb-092-074-193-112.pools.arcor-ip.net [92.74.193.112])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mail.bsdgroup.de (Postfix) with ESMTP id 3AE9319296E;
	Fri,  8 Aug 2008 22:22:17 +0200 (CEST)
Received: from beastie.local (localhost [127.0.0.1])
	by beastie.local (8.14.2/8.14.2) with ESMTP id m78KMHwG082218;
	Fri, 8 Aug 2008 22:22:17 +0200 (CEST)
	(envelope-from fabian@beastie.local)
Received: (from fabian@localhost)
	by beastie.local (8.14.2/8.14.2/Submit) id m78KMHMa082217;
	Fri, 8 Aug 2008 22:22:17 +0200 (CEST)
	(envelope-from fabian)
Message-Id: <200808082022.m78KMHMa082217@beastie.local>
Date: Fri, 8 Aug 2008 22:22:17 +0200 (CEST)
From: Fabian Ruch <fabianruch@bsdgroup.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc: ports@freebsd.org
Subject: [PATCH] audio/jack-rack: Optional GNOME and WITHOUT_NLS support added
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         126381
>Category:       ports
>Synopsis:       [PATCH] audio/jack-rack: Optional GNOME and WITHOUT_NLS support added
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Aug 08 20:40:03 UTC 2008
>Closed-Date:    Fri Sep 05 12:29:23 UTC 2008
>Last-Modified:  Fri Sep 05 12:29:23 UTC 2008
>Originator:     Fabian Ruch
>Release:        FreeBSD 7.0-RELEASE-p2 i386
>Organization:
>Environment:
System: FreeBSD beastie.local 7.0-RELEASE-p2 FreeBSD 7.0-RELEASE-p2 #0: Wed Jun 18 07:33:20 UTC 2008
>Description:
- PORTREVISION increased (dependencies and options modified)
- BUILD_DEPENDS now holds all ports providing headers directly included by source files
- shared libraries the port depends on got versions to be checked
- post-patch script path adjustment replaced by configure argument --disable-desktop-inst
- optional GNOME and WITHOUT_NLS support added on the basis of the porters handbook
- in conjunction with the latter pkg-plist contains substitutes

Hopefully not too much mistakes in language, report and changes...

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- jack-rack-1.4.5_3.patch begins here ---
diff -ruN --exclude=CVS /usr/home/fabian/ports/audio/jack-rack.orig/Makefile /usr/home/fabian/ports/audio/jack-rack/Makefile
--- /usr/home/fabian/ports/audio/jack-rack.orig/Makefile	2008-08-06 18:02:49.000000000 +0200
+++ /usr/home/fabian/ports/audio/jack-rack/Makefile	2008-08-08 21:37:44.000000000 +0200
@@ -7,27 +7,44 @@
 
 PORTNAME=	jack-rack
 PORTVERSION=	1.4.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	SF/jack-rack
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A LADSPA effects rack for the JACK audio server
 
-BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
-LIB_DEPENDS=	jack:${PORTSDIR}/audio/jack \
-		lrdf:${PORTSDIR}/textproc/liblrdf
-RUN_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
+BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa \
+		${LOCALBASE}/include/jack/jack.h:${PORTSDIR}/audio/jack \
+		${LOCALBASE}/include/lrdf.h:${PORTSDIR}/textproc/liblrdf
+LIB_DEPENDS=	jack.0:${PORTSDIR}/audio/jack \
+		lrdf.2:${PORTSDIR}/textproc/liblrdf
 
 USE_BZIP2=	yes
-USE_GNOME=	libgnomeui libxml2
+USE_GNOME=	gtk20 libxml2
+WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--disable-ladcca --disable-lash
+CONFIGURE_ARGS=--disable-ladcca --disable-lash --disable-desktop-inst
 
-post-patch:
-	@${REINPLACE_CMD} -e '/^jr_desktop_install/ s|/usr/share|${PREFIX}/share|' \
-		${WRKSRC}/configure
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
+PLIST_SUB=	NLS=""
+.else
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB=	NLS="@comment "
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if ${HAVE_GNOME:Mlibgnomeui}!=""
+USE_GNOME+=	gnomeprefix gnomehack libgnomeui
+PKGNAMESUFFIX=	-gnome
+PLIST_SUB+=	DATADIR="share/gnome"
+.else
+CONFIGURE_ARGS+=--disable-gnome
+PLIST_SUB+=	DATADIR="share"
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN --exclude=CVS /usr/home/fabian/ports/audio/jack-rack.orig/pkg-plist /usr/home/fabian/ports/audio/jack-rack/pkg-plist
--- /usr/home/fabian/ports/audio/jack-rack.orig/pkg-plist	2008-08-06 18:02:49.000000000 +0200
+++ /usr/home/fabian/ports/audio/jack-rack/pkg-plist	2008-08-06 18:02:49.000000000 +0200
@@ -1,16 +1,16 @@
 bin/jack-rack
-share/applications/jack-rack.desktop
-share/dtds/jack_rack_1.0.dtd
-share/dtds/jack_rack_1.1.dtd
-share/dtds/jack_rack_1.2.dtd
-share/jack-rack/gnome-mixer-small.png
-share/jack-rack/jack-rack-logo.png
-share/jack-rack/jr-cross.png
-share/jack-rack/jr-down-arrow.png
-share/jack-rack/jr-up-arrow.png
-share/locale/fr/LC_MESSAGES/jack-rack.mo
-share/locale/ru/LC_MESSAGES/jack-rack.mo
-share/pixmaps/jack-rack-icon.png
-@dirrmtry share/applications
-@dirrmtry share/dtds
-@dirrm share/jack-rack
+%%DATADIR%%/applications/jack-rack.desktop
+%%DATADIR%%/dtds/jack_rack_1.0.dtd
+%%DATADIR%%/dtds/jack_rack_1.1.dtd
+%%DATADIR%%/dtds/jack_rack_1.2.dtd
+%%DATADIR%%/jack-rack/gnome-mixer-small.png
+%%DATADIR%%/jack-rack/jack-rack-logo.png
+%%DATADIR%%/jack-rack/jr-cross.png
+%%DATADIR%%/jack-rack/jr-down-arrow.png
+%%DATADIR%%/jack-rack/jr-up-arrow.png
+%%NLS%%%%DATADIR%%/locale/fr/LC_MESSAGES/jack-rack.mo
+%%NLS%%%%DATADIR%%/locale/ru/LC_MESSAGES/jack-rack.mo
+%%DATADIR%%/pixmaps/jack-rack-icon.png
+@dirrmtry %%DATADIR%%/applications
+@dirrmtry %%DATADIR%%/dtds
+@dirrm %%DATADIR%%/jack-rack
--- jack-rack-1.4.5_3.patch ends here ---


>Release-Note:
>Audit-Trail:

From: "Jeremy Messenger" <mezz7@cox.net>
To: bug-followup@freebsd.org, fabianruch@bsdgroup.de
Cc:  
Subject: Re: ports/126381: [PATCH] audio/jack-rack: Optional GNOME and
 WITHOUT_NLS support added
Date: Sat, 09 Aug 2008 16:34:11 -0500

 +.if ${HAVE_GNOME:Mlibgnomeui}!=""
 +USE_GNOME+=     gnomeprefix gnomehack libgnomeui
 +PKGNAMESUFFIX=  -gnome
 +PLIST_SUB+=     DATADIR="share/gnome"
 +.else
 +CONFIGURE_ARGS+=--disable-gnome
 +PLIST_SUB+=     DATADIR="share"
 +.endif
 
 Is that share/gnome part need? Do you know that we no longer install GNOME  
 stuff in share/gnome, so your plist might be broke. See in  
 /usr/ports/UPDATING at 20071024 section if your ports tree are out of date.
 
 Cheers,
 Mezz
 
 
 -- 
 mezz7@cox.net  -  mezz@FreeBSD.org
 FreeBSD GNOME Team
 http://www.FreeBSD.org/gnome/  -  gnome@FreeBSD.org

From: Fabian Ruch <fabianruch@bsdgroup.de>
To: bug-followup@freebsd.org
Cc: mezz7@cox.net
Subject: Re: ports/126381: [PATCH] audio/jack-rack: Optional GNOME and WITHOUT_NLS support added
Date: Sun, 10 Aug 2008 00:50:33 +0200 (CEST)

 Hi,
 
 > Is that share/gnome part need? Do you know that we no longer install 
 > GNOME stuff in share/gnome, so your plist might be broke. See in 
 > /usr/ports/UPDATING at 20071024 section if your ports tree are out of date.
 
 I'm sorry. I didn't even have a look at other GNOME ports or documentation. I
 copied the path from the FreeBSD GNOME Project pages[1] (has to be updated then
 regarding USE_XLIB and DATADIR - there may be more). The jack-rack port doesn't
 require this and the PLIST_SUB lines have to be removed as well as the DATADIR
 substitute.
 
 I apologize for the negligence.
 
    Fabian
 
 [1] http://www.freebsd.org/gnome/docs/porting.html
 
 

From: "Jeremy Messenger" <mezz7@cox.net>
To: "Fabian Ruch" <fabianruch@bsdgroup.de>, bug-followup@freebsd.org
Cc:  
Subject: Re: ports/126381: [PATCH] audio/jack-rack: Optional GNOME and
 WITHOUT_NLS support added
Date: Sat, 09 Aug 2008 18:08:07 -0500

 On Sat, 09 Aug 2008 17:50:33 -0500, Fabian Ruch <fabianruch@bsdgroup.de>  
 wrote:
 
 > Hi,
 >
 >> Is that share/gnome part need? Do you know that we no longer install
 >> GNOME stuff in share/gnome, so your plist might be broke. See in
 >> /usr/ports/UPDATING at 20071024 section if your ports tree are out of  
 >> date.
 >
 > I'm sorry. I didn't even have a look at other GNOME ports or  
 > documentation. I
 > copied the path from the FreeBSD GNOME Project pages[1] (has to be  
 > updated then
 > regarding USE_XLIB and DATADIR - there may be more). The jack-rack port  
 > doesn't
 > require this and the PLIST_SUB lines have to be removed as well as the  
 > DATADIR
 > substitute.
 
 Ouch, yes, we do need to update the document that we have missed. I shall  
 fix it tonight or tomorrow. Thanks for report! :-)
 
 Cheers,
 Mezz
 
 > I apologize for the negligence.
 >
 >    Fabian
 >
 > [1] http://www.freebsd.org/gnome/docs/porting.html
 
 
 -- 
 mezz7@cox.net  -  mezz@FreeBSD.org
 FreeBSD GNOME Team
 http://www.FreeBSD.org/gnome/  -  gnome@FreeBSD.org
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Fri Sep 5 12:29:22 UTC 2008 
State-Changed-Why:  
was updated from chinsan on 2008/09/02. Thanks for your submission. 

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