From nobody@FreeBSD.org  Tue Jun 27 00:49:37 2006
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 5EE4216A401
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 27 Jun 2006 00:49:37 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [216.136.204.117])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9D7D243D45
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 27 Jun 2006 00:49:24 +0000 (GMT)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.13.1/8.13.1) with ESMTP id k5R0nO26087213
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 27 Jun 2006 00:49:24 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.13.1/8.13.1/Submit) id k5R0nOQb087212;
	Tue, 27 Jun 2006 00:49:24 GMT
	(envelope-from nobody)
Message-Id: <200606270049.k5R0nOQb087212@www.freebsd.org>
Date: Tue, 27 Jun 2006 00:49:24 GMT
From: Arseny Nasokin <tarc@tarc.po.cs.msu.su>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [PATCH][OPTIONS]audio/snd options fixes
X-Send-Pr-Version: www-2.3

>Number:         99508
>Category:       ports
>Synopsis:       [PATCH][OPTIONS]audio/snd options fixes
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    rafan
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jun 27 00:50:17 GMT 2006
>Closed-Date:    Sat Jul 15 16:26:52 GMT 2006
>Last-Modified:  Sat Jul 15 16:26:52 GMT 2006
>Originator:     Arseny Nasokin
>Release:        FreeBSD 7.0-CURRENT
>Organization:
Moscow State University
>Environment:
>Description:
some missed options added and all checks moved to post section
>How-To-Repeat:

>Fix:
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/audio/snd/Makefile,v
retrieving revision 1.54
diff -d -u -r1.54 Makefile
--- Makefile    6 May 2006 01:28:19 -0000       1.54
+++ Makefile    27 Jun 2006 00:31:18 -0000
@@ -27,9 +27,13 @@
                CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
 MAKEFILE=      makefile
 MAN1=          snd.1
-OPTIONS=       ESD             "output through enlightened sound daemon" on \
-               GUILE           "use Guile" on \
-               RUBY            "use Ruby as the extension language" on
+
+OPTIONS=       ESD             "output through enlightened sound daemon" on    \
+               GUILE           "use Guile" on                                  \
+               X11             "Build with GUI support"        on              \
+               RUBY            "use Ruby as the extension language" on         \
+               NLS             "Native Language Support"       on              
+
 PLIST=         ${WRKDIR}/plist
 PLIST_FILES=   share/examples/snd/DotEmacs
 PLIST_DIRS=    share/examples/snd
@@ -43,17 +47,22 @@
                share/doc/snd/tutorial/1_intro_and_build_snd.html~
 .endif

-.if defined(WITH_ESD)
+WANT_GNOME=yes
+USE_X_PREFIX=no
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_ESD) || ! defined (WITHOUT_ESD)
 CONFIGURE_ARGS+=       --with-esd
 RUN_DEPENDS+=          esd:${PORTSDIR}/audio/esound
 .endif

-.if defined(WITH_RUBY)
+.if defined(WITH_RUBY) || ! defined (WITHOUT_RUBY)
 CONFIGURE_ARGS+=       --with-ruby
 RUN_DEPENDS+=          ruby:${PORTSDIR}/lang/ruby16
 .endif

-.if defined(WITH_GUILE)
+.if defined(WITH_GUILE) || !defined(WITHOUT_GUILE)
 LIB_DEPENDS+=          guile.15:${PORTSDIR}/lang/guile
 .if !defined(WITHOUT_X11)
 LIB_DEPENDS+=          guilegtk-1.2:${PORTSDIR}/x11-toolkits/guile-gtk
@@ -80,8 +89,6 @@
 USE_XLIB=      yes
 .endif

-.include <bsd.port.pre.mk>
-
 .if ${ARCH} == "sparc64"
 BROKEN=                does not compile on sparc64
 .endif
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->itetcu 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Tue Jun 27 00:50:36 UTC 2006 
Responsible-Changed-Why:  
itetcu@ wants to have OPTIONS PRs 

http://www.freebsd.org/cgi/query-pr.cgi?pr=99508 
State-Changed-From-To: open->feedback 
State-Changed-By: itetcu 
State-Changed-When: Tue Jun 27 09:05:47 UTC 2006 
State-Changed-Why:  
The patch fails, please check and send a new one. Also note taht it is 
enought to test for ! defined WIHTOUT_foo for OPTIONS that default to 
'on' and USE_X_PREFIX=no is the default. 

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

From: Arseny Nasokin <tarc@tarc.po.cs.msu.su>
To: bug-followup@FreeBSD.org, Arseny Nasokin <tarc@tarc.po.cs.msu.su>,
        Ion-Mihai Tetcu <itetcu@FreeBSD.org>
Cc:  
Subject: Re: ports/99508: [PATCH][OPTIONS]audio/snd options fixes
Date: Tue, 27 Jun 2006 18:17:00 +0400

 I hate `cvs diff'.
 
 --- Makefile.orig	Tue Jun 27 17:51:03 2006
 +++ Makefile	Tue Jun 27 17:59:18 2006
 @@ -27,9 +27,13 @@
  		CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
  MAKEFILE=	makefile
  MAN1=		snd.1
 -OPTIONS=	ESD		"output through enlightened sound daemon" on \
 -		GUILE		"use Guile" on \
 -		RUBY		"use Ruby as the extension language" on
 +
 +OPTIONS=	ESD		"output through enlightened sound daemon" on	\
 +		GUILE		"use Guile" on					\
 +		X11             "Build with GUI support"        on		\
 +		RUBY		"use Ruby as the extension language" on		\
 +		NLS             "Native Language Support"       on
 +
  PLIST=		${WRKDIR}/plist
  PLIST_FILES=	share/examples/snd/DotEmacs
  PLIST_DIRS=	share/examples/snd
 @@ -43,6 +47,8 @@
  		share/doc/snd/tutorial/1_intro_and_build_snd.html~
  .endif
  
 +.include <bsd.port.pre.mk>
 +
  .if defined(WITH_ESD)
  CONFIGURE_ARGS+=	--with-esd
  RUN_DEPENDS+=		esd:${PORTSDIR}/audio/esound
 @@ -79,8 +85,6 @@
  USE_X_PREFIX=	yes
  USE_XLIB=	yes
  .endif
 -
 -.include <bsd.port.pre.mk>
  
  .if ${ARCH} == "sparc64"
  BROKEN=		does not compile on sparc64
 -- 
    Best regards,
    	Arseny Nasokin
State-Changed-From-To: feedback->open 
State-Changed-By: itetcu 
State-Changed-When: Wed Jun 28 21:26:06 UTC 2006 
State-Changed-Why:  
New patch received. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=99508 
State-Changed-From-To: open->feedback 
State-Changed-By: itetcu 
State-Changed-When: Wed Jun 28 21:29:47 UTC 2006 
State-Changed-Why:  
After applying the new patch: 
itetcu@it> /home/itetcu/tmp/tmp/FBSD/snd [0:28:11] 0 
> make 
"/usr/ports/Mk/bsd.gnome.mk", line 626: Malformed conditional (${_USE_GNOME_ALL:Mgtk20}=="") 
"/usr/ports/Mk/bsd.port.mk", line 5657: if-less endif 
make: fatal errors encountered -- cannot continue 

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

From: Arseny Nasokin <tarc@tarc.po.cs.msu.su>
To: bug-followup@FreeBSD.org, Arseny Nasokin <tarc@tarc.po.cs.msu.su>,
        Ion-Mihai Tetcu <itetcu@FreeBSD.org>
Cc:  
Subject: Re: ports/99508: [PATCH][OPTIONS]audio/snd options fixes
Date: Tue, 27 Jun 2006 18:17:00 +0400

 --- Makefile.orig	Tue Jun 27 17:51:03 2006
 +++ Makefile	Tue Jun 27 17:59:18 2006
 @@ -27,9 +27,13 @@
  		CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
  MAKEFILE=	makefile
  MAN1=		snd.1
 -OPTIONS=	ESD		"output through enlightened sound daemon" on \
 -		GUILE		"use Guile" on \
 -		RUBY		"use Ruby as the extension language" on
 +
 +OPTIONS=	ESD		"output through enlightened sound daemon" on	\
 +		GUILE		"use Guile" on					\
 +		X11             "Build with GUI support"        on		\
 +		RUBY		"use Ruby as the extension language" on		\
 +		NLS             "Native Language Support"       on
 +
  PLIST=		${WRKDIR}/plist
  PLIST_FILES=	share/examples/snd/DotEmacs
  PLIST_DIRS=	share/examples/snd
 @@ -43,6 +47,8 @@
  		share/doc/snd/tutorial/1_intro_and_build_snd.html~
  .endif
 
 + WANT_GTK=yes
 +.include <bsd.port.pre.mk>
 +
  .if defined(WITH_ESD)
  CONFIGURE_ARGS+=	--with-esd
  RUN_DEPENDS+=		esd:${PORTSDIR}/audio/esound
 @@ -79,8 +85,6 @@
  USE_X_PREFIX=	yes
  USE_XLIB=	yes
  .endif
 -
 -.include <bsd.port.pre.mk>
  
  .if ${ARCH} == "sparc64"
  BROKEN=		does not compile on sparc64
 
 
 -- 
    Best regards,
    	Arseny Nasokin
State-Changed-From-To: feedback->open 
State-Changed-By: itetcu 
State-Changed-When: Fri Jun 30 05:06:26 UTC 2006 
State-Changed-Why:  
new patch received 

http://www.freebsd.org/cgi/query-pr.cgi?pr=99508 
Responsible-Changed-From-To: itetcu->freebsd-ports-bugs 
Responsible-Changed-By: itetcu 
Responsible-Changed-When: Fri Jul 7 19:43:32 UTC 2006 
Responsible-Changed-Why:  
While itetcu likes OPTIONS he doesn't want to spen endless time because 
of malformated patches.  Give it back to the pool, maybe someone else is 
more lucky. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=99508 
Responsible-Changed-From-To: freebsd-ports-bugs->rafan 
Responsible-Changed-By: rafan 
Responsible-Changed-When: Tue Jul 11 04:06:18 UTC 2006 
Responsible-Changed-Why:  
Eat. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=99508 
State-Changed-From-To: open->closed 
State-Changed-By: rafan 
State-Changed-When: Sat Jul 15 16:26:48 UTC 2006 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

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