--Apple-Mail-3-329296974
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
	charset=US-ASCII;
	delsp=yes;
	format=flowed

Hi,

I whould like to add an option in audio/daapd to add support for  
mpeg4id (id3 tags for mpeg4).
mpeg4id is part of faad2, so the option adds audio/faad2/buildlink3.mk

I'm wondering what is the correct name for such an option. mk/defauls/ 
options.descriptions contains a "faad" option, which is used by some  
packages to include faad2 buildlink, but this option has no  
description at all.
So the first question is : should i reuse the faad option, or use  
another one ?
Also, pkglint should be able to shout when i use an option not in  
options.descriptions (well, i tried to go for it, but i'm not really  
speaking perl).

Regards,
antoine


--Apple-Mail-3-329296974
Content-Transfer-Encoding: 7bit
Content-Type: application/octet-stream;
	x-unix-mode=0644;
	name="daapd.diff"
Content-Disposition: attachment;
	filename=daapd.diff

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/audio/daapd/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- Makefile	22 May 2005 20:07:37 -0000	1.10
+++ Makefile	10 Oct 2005 15:52:45 -0000
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.10 2005/05/22 20:07:37 jlam Exp $
 
 DISTNAME=		daapd-0.2.3d
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		audio
 MASTER_SITES=		${HOMEPAGE}
 EXTRACT_SUFX=		.tgz
@@ -20,6 +20,17 @@
 
 CONF_FILES=    		${EGDIR}/daapd.conf ${PKG_SYSCONFDIR}/daapd.conf
 
+PKG_OPTIONS_VAR=PKG_OPTIONS.daapd
+PKG_SUPPORTED_OPTIONS=faad
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mfaad)
+.include "../../audio/faad2/buildlink3.mk"
+  MAKE_ENV+= WITH_FAAD=1
+.else
+  MAKE_ENV+= WITH_FAAD=0
+.endif
+
 post-install:
 	${INSTALL_DATA_DIR} ${PKG_SYSCONFDIR}
 	${INSTALL_DATA_DIR} ${EGDIR}
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/audio/daapd/distinfo,v
retrieving revision 1.8
diff -u -r1.8 distinfo
--- distinfo	10 Oct 2005 13:06:11 -0000	1.8
+++ distinfo	10 Oct 2005 15:52:45 -0000
@@ -3,4 +3,4 @@
 SHA1 (daapd-0.2.3d.tgz) = 3ca12f0cb608a0be2d8351dbc341aa7d2a4f08f8
 RMD160 (daapd-0.2.3d.tgz) = 3093b678d4f74fa371cb7cccee860b3f3d1f5bcd
 Size (daapd-0.2.3d.tgz) = 202317 bytes
-SHA1 (patch-aa) = cfcaebcaf34df8b676892f0dc93200743f3b81e4
+SHA1 (patch-aa) = a6b576702f33ebd5c4313f2f76ed41738b270027
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/audio/daapd/patches/patch-aa,v
retrieving revision 1.7
diff -u -r1.7 patch-aa
--- patches/patch-aa	10 Oct 2005 13:06:11 -0000	1.7
+++ patches/patch-aa	10 Oct 2005 15:52:45 -0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.7 2005/10/10 13:06:11 joerg Exp $
+$NetBSD$
 
---- makefile.orig	2004-09-07 21:17:58.000000000 -0400
+--- makefile.orig	2004-09-08 03:17:58.000000000 +0200
 +++ makefile
 @@ -2,7 +2,7 @@
  
  HOWL_ENABLE = 1
  ZLIB_ENABLE = 1
 -MPEG4_ENABLE = 1
-+MPEG4_ENABLE = 0
++MPEG4_ENABLE = $(WITH_FAAD)
  
  
  # no need to touch anything below this line

--Apple-Mail-3-329296974--