From joshe@jade.elsasser.org  Wed Jul  9 21:53:56 2003
Return-Path: <joshe@jade.elsasser.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 234FB37B422
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  9 Jul 2003 21:53:56 -0700 (PDT)
Received: from vineyard.net (k1.vineyard.net [204.17.195.90])
	by mx1.FreeBSD.org (Postfix) with ESMTP id EF6AC43F75
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  9 Jul 2003 21:53:54 -0700 (PDT)
	(envelope-from joshe@jade.elsasser.org)
Received: from localhost (loopback [127.0.0.1])
	by vineyard.net (Postfix) with ESMTP id E51A891C3B
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 10 Jul 2003 00:53:53 -0400 (EDT)
Received: from vineyard.net ([127.0.0.1])
 by localhost (king1.vineyard.net [127.0.0.1]) (amavisd-new, port 10024)
 with ESMTP id 26339-03 for <FreeBSD-gnats-submit@freebsd.org>;
 Thu, 10 Jul 2003 00:53:53 -0400 (EDT)
Received: from jade.elsasser.org (loopback [127.0.0.1])
	by vineyard.net (Postfix) with ESMTP id 4EB2D91BF6
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 10 Jul 2003 00:53:53 -0400 (EDT)
Received: by jade.elsasser.org (Postfix, from userid 1000)
	id E664714775A; Thu, 10 Jul 2003 00:53:51 -0400 (EDT)
Message-Id: <20030710045351.E664714775A@jade.elsasser.org>
Date: Thu, 10 Jul 2003 00:53:51 -0400 (EDT)
From: Josh Elsasser <jre@vineyard.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: PATCH: add WITHOUT_GUI knob to multimedia/smpeg
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         54304
>Category:       ports
>Synopsis:       PATCH: add WITHOUT_GUI knob to multimedia/smpeg
>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:   Wed Jul 09 22:00:32 PDT 2003
>Closed-Date:    Mon Jul 14 23:22:07 PDT 2003
>Last-Modified:  Mon Jul 14 23:22:07 PDT 2003
>Originator:     Josh Elsasser
>Release:        FreeBSD 4.8-STABLE i386
>Organization:
>Environment:
System: FreeBSD jade.nat.elsasser.org 4.8-STABLE FreeBSD 4.8-STABLE #3: Sun Jun 29 11:42:10 EDT 2003 joshe@jade.nat.elsasser.org:/sd1/obj/usr/src/sys/JADE i386


	
>Description:

	The smpeg library has an optional GTK player program which the
multimedia/smpeg port always builds, creating a dependency on GTK.
This patch adds a WITHOUT_GUI knob to control building of that
optional program.

>How-To-Repeat:
	
>Fix:

diff -u -rN /usr/ports/multimedia/smpeg/Makefile smpeg/Makefile
--- /usr/ports/multimedia/smpeg/Makefile	Wed May 14 08:54:27 2003
+++ smpeg/Makefile	Thu Jul 10 00:46:45 2003
@@ -22,7 +22,6 @@
 SDL_CONFIG=	${LOCALBASE}/bin/sdl11-config
 
 USE_GMAKE=	yes
-USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}" \
@@ -36,6 +35,14 @@
 		--enable-mmx
 
 MAN1=		gtv.1 plaympeg.1
+
+.if !defined(WITHOUT_GUI)
+USE_GNOME=	gtk12
+PLIST_SUB+=	GUI=""
+.else
+CONFIGURE_ARGS+= --disable-gtk-player
+PLIST_SUB+=	GUI="@comment "
+.endif
 
 post-configure:
 	@${PERL} -pi -e 's|^deplibs_check_method=.*|deplibs_check_method=pass_all|' \
diff -u -rN /usr/ports/multimedia/smpeg/pkg-plist smpeg/pkg-plist
--- /usr/ports/multimedia/smpeg/pkg-plist	Fri Apr  6 09:40:22 2001
+++ smpeg/pkg-plist	Thu Jul 10 00:47:13 2003
@@ -1,4 +1,4 @@
-bin/gtv
+%%GUI%%bin/gtv
 bin/plaympeg
 bin/smpeg-config
 include/smpeg/MPEG.h
>Release-Note:
>Audit-Trail:

From: KATO Tsuguru <tkato@prontomail.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc: jre@vineyard.net
Subject: Re: ports/54304: PATCH: add WITHOUT_GUI knob to multimedia/smpeg
Date: Thu, 10 Jul 2003 17:01:43 +0900

 Well, it should be better to utilize WANT_GNOME funtcion in
 this case.
 
 
 diff -urN /usr/ports/multimedia/smpeg/Makefile multimedia/smpeg/Makefile
 --- /usr/ports/multimedia/smpeg/Makefile	Mon Apr 21 12:24:59 2003
 +++ multimedia/smpeg/Makefile	Thu Jul 10 16:44:49 2003
 @@ -21,8 +21,9 @@
  
  SDL_CONFIG=	${LOCALBASE}/bin/sdl11-config
  
 +WANT_GNOME=	yes
 +USE_REINPLACE=	yes
  USE_GMAKE=	yes
 -USE_GNOME=	gtk12
  USE_LIBTOOL=	yes
  INSTALLS_SHLIB=	yes
  CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}" \
 @@ -37,8 +38,16 @@
  
  MAN1=		gtv.1 plaympeg.1
  
 +.include <bsd.port.pre.mk>
 +
 +.if ${HAVE_GNOME:Mgtk12}!=""
 +USE_GNOME+=	gtk12
 +.else
 +CONFIGURE_ARGS+=	--disable-gtk-player
 +.endif
 +
  post-configure:
 -	@${PERL} -pi -e 's|^deplibs_check_method=.*|deplibs_check_method=pass_all|' \
 +	@${REINPLACE_CMD} -e 's|^deplibs_check_method=.*|deplibs_check_method=pass_all|' \
  		${WRKSRC}/libtool
  
 -.include <bsd.port.mk>
 +.include <bsd.port.post.mk>
 diff -urN /usr/ports/multimedia/smpeg/pkg-plist multimedia/smpeg/pkg-plist
 --- /usr/ports/multimedia/smpeg/pkg-plist	Fri Apr  6 22:40:22 2001
 +++ multimedia/smpeg/pkg-plist	Thu Jul 10 16:44:19 2003
 @@ -1,4 +1,4 @@
 -bin/gtv
 +%%GNOME:%%bin/gtv
  bin/plaympeg
  bin/smpeg-config
  include/smpeg/MPEG.h
State-Changed-From-To: open->closed 
State-Changed-By: daichi 
State-Changed-When: Mon Jul 14 23:21:55 PDT 2003 
State-Changed-Why:  
Committed. Thanks! 

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