From nobody@FreeBSD.org  Wed Nov 21 22:28:15 2012
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 80BD62B4
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 21 Nov 2012 22:28:15 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 5EF638FC14
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 21 Nov 2012 22:28:15 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.5/8.14.5) with ESMTP id qALMSFSW078712
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 21 Nov 2012 22:28:15 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.5/8.14.5/Submit) id qALMSFZf078711;
	Wed, 21 Nov 2012 22:28:15 GMT
	(envelope-from nobody)
Message-Id: <201211212228.qALMSFZf078711@red.freebsd.org>
Date: Wed, 21 Nov 2012 22:28:15 GMT
From: Chris Petrik <c.petrik.sosa@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [PATCH] audio/hydrogen optionsng
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: devel@stasyan.com

>Number:         173795
>Category:       ports
>Synopsis:       [PATCH] audio/hydrogen optionsng
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    bapt
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Nov 21 22:30:00 UTC 2012
>Closed-Date:    Sat Dec 29 22:19:12 UTC 2012
>Last-Modified:  Sat Dec 29 22:20:00 UTC 2012
>Originator:     Chris Petrik
>Release:        
>Organization:
na
>Environment:
>Description:
OptionsNG Changes
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: hydrogen/Makefile
===================================================================
--- hydrogen/Makefile	(revision 305743)
+++ hydrogen/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	Hydrogen
-# Date created:			23 Jun 2004
-# Whom:				Jean-Yves Lefort <jylefort@brutele.be>
-#
+# Created by:	Jean-Yves Lefort <jylefort@brutele.be>
 # $FreeBSD$
-#
 
 PORTNAME=	hydrogen
 PORTVERSION=	0.9.5
@@ -13,32 +9,32 @@
 MAINTAINER=	devel@stasyan.com
 COMMENT=	An advanced drum machine
 
-LIB_DEPENDS+=	sndfile:${PORTSDIR}/audio/libsndfile \
-		tar.0:${PORTSDIR}/devel/libtar \
-		lrdf.2:${PORTSDIR}/textproc/liblrdf
-
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+LIB_DEPENDS+=	sndfile:${PORTSDIR}/audio/libsndfile \
+		tar:${PORTSDIR}/devel/libtar \
+		lrdf:${PORTSDIR}/textproc/liblrdf
+
 BROKEN=		does not install
 
 MAJORVERSION=	0.9.5
 USE_QT4=	corelib gui linguist_build moc_build network qt3support rcc_build sql uic_build xml
 USE_SCONS=	yes
 
-OPTIONS=	JACK "JACK support" on \
-		ALSA "ALSA support" off \
-		PORTAUDIO "PortAudio support" off \
-		LIBARCHIVE "LibArchive support" off \
-		LASH "Lash support" off
+OPTIONS_DEFINE=	JACK ALSA PORTAUDIO LIBARCHIVE LASH
+OPTIONS_DEFAULT=	JACK
 
+LIBARCHIVE_DESC=	LibArchive support
+
 post-patch:
 		${REINPLACE_CMD} -e "s|includes = \[\]|includes = \['-I${QT_INCDIR}/QtCore', '-I${QT_INCDIR}/QtXml', '-I${QT_INCDIR}/QtGui',  '-I${QT_INCDIR}', '-I${QT_INCDIR}/Qt', '-I${LOCALBASE}/include'\]|g; s|ldflags = \[\]|ldflags = \['-L${QT_LIBDIR}','-L${LOCALBASE}/lib'\,'-lQtCore', '-lQtGui', '-lQtXml', '-lQtNetwork', '${PTHREAD_LIBS}']|g" ${WRKSRC}/Sconstruct
 
 .include <bsd.port.options.mk>
 
 SCONS_ENV+=	oss=1
-.if defined(WITH_JACK)
+
+.if ${PORT_OPTIONS:MJACK}
 LIB_DEPENDS+=	jack:${PORTSDIR}/audio/jack
 CPPFLAGS+=	${PTHREAD_CFLAGS}
 LDFLAGS+=	${PTHREAD_LIBS}
@@ -47,30 +43,30 @@
 SCONS_ENV+=	jack=0
 .endif
 
-.if defined(WITH_PORTAUDIO)
-LIB_DEPENDS+=	portaudio.0:${PORTSDIR}/audio/portaudio
+.if ${PORT_OPTIONS:MPORTAUDIO}
+LIB_DEPENDS+=	portaudio:${PORTSDIR}/audio/portaudio
 SCONS_ENV+=	portaudio=1
 .else
 SCONS_ENV+=	portaudio=0
 .endif
 
-.if defined(WITH_LIBARCHIVE)
+.if ${PORT_OPTIONS:MLIBARCHIVE}
 LIB_DEPENDS+=	archive:${PORTSDIR}/archivers/libarchive
 SCONS_ENV+=	libarchive=1
 .else
 SCONS_ENV+=	libarchive=0
 .endif
 
-.if defined(WITH_ALSA)
-LIB_DEPENDS+=	asound.2:${PORTSDIR}/audio/alsa-lib
+.if ${PORT_OPTIONS:MALSA}
+LIB_DEPENDS+=	asound:${PORTSDIR}/audio/alsa-lib
 RUN_DEPENDS+=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins
 SCONS_ENV+=	alsa=1
 .else
 SCONS_ENV+=	alsa=0
 .endif
 
-.if defined(WITH_LASH)
-LIB_DEPENDS+=	lash.2:${PORTSDIR}/audio/lash
+.if ${PORT_OPTIONS:MLASH}
+LIB_DEPENDS+=	lash:${PORTSDIR}/audio/lash
 SCONS_ENV+=	lash=1
 .else
 SCONS_ENV+=	lash=0


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Wed Nov 21 22:30:08 UTC 2012 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

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

From: Edwin Groothuis <edwin@FreeBSD.org>
To: devel@stasyan.com
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/173795: [PATCH] audio/hydrogen optionsng
Date: Wed, 21 Nov 2012 22:30:07 UT

 Maintainer of audio/hydrogen,
 
 Please note that PR ports/173795 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/173795
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
Responsible-Changed-From-To: freebsd-ports-bugs->bapt 
Responsible-Changed-By: bapt 
Responsible-Changed-When: Sat Dec 29 22:17:25 UTC 2012 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=173795 
State-Changed-From-To: feedback->closed 
State-Changed-By: bapt 
State-Changed-When: Sat Dec 29 22:19:11 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/173795: commit references a PR
Date: Sat, 29 Dec 2012 22:19:14 +0000 (UTC)

 Author: bapt
 Date: Sat Dec 29 22:19:01 2012
 New Revision: 309634
 URL: http://svnweb.freebsd.org/changeset/ports/309634
 
 Log:
   - Convert to new options framework
   - remove shlib numbers
   - trim headers
   
   PR:		ports/173795
   Submitted by:	Chris Petrik <c.petrik.sosa@gmail.com>
   Approved by:	maintainer timeout (1 month)
 
 Modified:
   head/audio/hydrogen/Makefile
 
 Modified: head/audio/hydrogen/Makefile
 ==============================================================================
 --- head/audio/hydrogen/Makefile	Sat Dec 29 22:06:04 2012	(r309633)
 +++ head/audio/hydrogen/Makefile	Sat Dec 29 22:19:01 2012	(r309634)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	Hydrogen
 -# Date created:			23 Jun 2004
 -# Whom:				Jean-Yves Lefort <jylefort@brutele.be>
 -#
 +# Created by: Jean-Yves Lefort <jylefort@brutele.be>
  # $FreeBSD$
 -#
  
  PORTNAME=	hydrogen
  PORTVERSION=	0.9.5
 @@ -13,24 +9,23 @@ MASTER_SITES=	SF/${PORTNAME}/Hydrogen/${
  MAINTAINER=	devel@stasyan.com
  COMMENT=	An advanced drum machine
  
 -LIB_DEPENDS+=	sndfile:${PORTSDIR}/audio/libsndfile \
 -		tar.0:${PORTSDIR}/devel/libtar \
 -		lrdf.2:${PORTSDIR}/textproc/liblrdf
 -
  LICENSE=	GPLv2
  LICENSE_FILE=	${WRKSRC}/COPYING
  
 +LIB_DEPENDS+=	sndfile:${PORTSDIR}/audio/libsndfile \
 +		tar:${PORTSDIR}/devel/libtar \
 +		lrdf:${PORTSDIR}/textproc/liblrdf
 +
  BROKEN=		does not install
  
  MAJORVERSION=	0.9.5
  USE_QT4=	corelib gui linguist_build moc_build network qt3support rcc_build sql uic_build xml
  USE_SCONS=	yes
  
 -OPTIONS=	JACK "JACK support" on \
 -		ALSA "ALSA support" off \
 -		PORTAUDIO "PortAudio support" off \
 -		LIBARCHIVE "LibArchive support" off \
 -		LASH "Lash support" off
 +OPTIONS_DEFINE=	JACK ALSA PORTAUDIO LIBARCHIVE LASH
 +OPTIONS_DEFAULT=	JACK
 +
 +LIBARCHIVE_DESC=	LibArchive support
  
  post-patch:
  		${REINPLACE_CMD} -e "s|includes = \[\]|includes = \['-I${QT_INCDIR}/QtCore', '-I${QT_INCDIR}/QtXml', '-I${QT_INCDIR}/QtGui',  '-I${QT_INCDIR}', '-I${QT_INCDIR}/Qt', '-I${LOCALBASE}/include'\]|g; s|ldflags = \[\]|ldflags = \['-L${QT_LIBDIR}','-L${LOCALBASE}/lib'\,'-lQtCore', '-lQtGui', '-lQtXml', '-lQtNetwork', '${PTHREAD_LIBS}']|g" ${WRKSRC}/Sconstruct
 @@ -38,7 +33,8 @@ post-patch:
  .include <bsd.port.options.mk>
  
  SCONS_ENV+=	oss=1
 -.if defined(WITH_JACK)
 +
 +.if ${PORT_OPTIONS:MJACK}
  LIB_DEPENDS+=	jack:${PORTSDIR}/audio/jack
  CPPFLAGS+=	${PTHREAD_CFLAGS}
  LDFLAGS+=	${PTHREAD_LIBS}
 @@ -47,30 +43,30 @@ SCONS_ENV+=	jack=1
  SCONS_ENV+=	jack=0
  .endif
  
 -.if defined(WITH_PORTAUDIO)
 -LIB_DEPENDS+=	portaudio.0:${PORTSDIR}/audio/portaudio
 +.if ${PORT_OPTIONS:MPORTAUDIO}
 +LIB_DEPENDS+=	portaudio:${PORTSDIR}/audio/portaudio
  SCONS_ENV+=	portaudio=1
  .else
  SCONS_ENV+=	portaudio=0
  .endif
  
 -.if defined(WITH_LIBARCHIVE)
 +.if ${PORT_OPTIONS:MLIBARCHIVE}
  LIB_DEPENDS+=	archive:${PORTSDIR}/archivers/libarchive
  SCONS_ENV+=	libarchive=1
  .else
  SCONS_ENV+=	libarchive=0
  .endif
  
 -.if defined(WITH_ALSA)
 -LIB_DEPENDS+=	asound.2:${PORTSDIR}/audio/alsa-lib
 +.if ${PORT_OPTIONS:MALSA}
 +LIB_DEPENDS+=	asound:${PORTSDIR}/audio/alsa-lib
  RUN_DEPENDS+=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins
  SCONS_ENV+=	alsa=1
  .else
  SCONS_ENV+=	alsa=0
  .endif
  
 -.if defined(WITH_LASH)
 -LIB_DEPENDS+=	lash.2:${PORTSDIR}/audio/lash
 +.if ${PORT_OPTIONS:MLASH}
 +LIB_DEPENDS+=	lash:${PORTSDIR}/audio/lash
  SCONS_ENV+=	lash=1
  .else
  SCONS_ENV+=	lash=0
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
