From crees@bayofrum.net  Fri Apr 12 10:29:02 2013
Return-Path: <crees@bayofrum.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	by hub.freebsd.org (Postfix) with ESMTP id EA3D7B9A
	for <freebsd-gnats-submit@freebsd.org>; Fri, 12 Apr 2013 10:29:02 +0000 (UTC)
	(envelope-from crees@bayofrum.net)
Received: from mk-outboundfilter-1.mail.uk.tiscali.com (mk-outboundfilter-1.mail.uk.tiscali.com [212.74.114.37])
	by mx1.freebsd.org (Postfix) with ESMTP id 8D4321E13
	for <freebsd-gnats-submit@freebsd.org>; Fri, 12 Apr 2013 10:29:01 +0000 (UTC)
Received: from host-2-102-106-22.as13285.net (HELO pegasus.bayofrum.net) ([2.102.106.22])
  by smtp.pipex.tiscali.co.uk with ESMTP; 12 Apr 2013 11:28:50 +0100
Received: by pegasus.bayofrum.net (Postfix, from userid 1001)
	id 3A8C720DBB; Fri, 12 Apr 2013 11:27:12 +0100 (BST)
Message-Id: <20130412102712.3A8C720DBB@pegasus.bayofrum.net>
Date: Fri, 12 Apr 2013 11:27:12 +0100 (BST)
From: Chris Rees <crees@FreeBSD.org>
Reply-To: Chris Rees <crees@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] Fix port: net/minidlna missing dependency on iconv
X-Send-Pr-Version: 3.113
X-GNATS-Notify: william88@gmail.com

>Number:         177803
>Category:       ports
>Synopsis:       [PATCH] Fix port: net/minidlna missing dependency on iconv
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    wg
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Apr 12 10:30:00 UTC 2013
>Closed-Date:    Sat May 04 17:53:19 UTC 2013
>Last-Modified:  Sat May  4 18:00:00 UTC 2013
>Originator:     Chris Rees
>Release:        FreeBSD 9.1-STABLE amd64
>Organization:
>Environment:
System: FreeBSD pegasus.bayofrum.net 9.1-STABLE FreeBSD 9.1-STABLE #0 r247189: Sat Feb 23 15:20:18 GMT 2013 root@pegasus.bayofrum.net:/usr/obj/usr/home/crees/workspace/src/stable/9/sys/PEGASUS amd64


	
>Description:
	Minidlna requires libiconv, which is normally pulled in from flac.

	However, when flac is compiled WITHOUT_NLS, minidlna build fails because it still depends on iconv.
>How-To-Repeat:
	
>Fix:

	

--- patch.txt begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 315789)
+++ Makefile	(working copy)
@@ -20,6 +20,8 @@
 		FLAC:${PORTSDIR}/audio/flac      	\
 		avformat:${PORTSDIR}/multimedia/ffmpeg
 
+USE_ICONV=	yes
+
 MAKE_JOBS_SAFE=	yes
 MAKEFILE=	${FILESDIR}/BSDmakefile
 MAKE_ENV+=	FILESDIR="${FILESDIR}" INSTALL_DATA="${INSTALL_DATA}"
--- patch.txt ends here ---



-- 
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Fri Apr 12 10:30:08 UTC 2013 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

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

From: Edwin Groothuis <edwin@FreeBSD.org>
To: william88@gmail.com
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/177803: [PATCH] Fix port: net/minidlna missing dependency on iconv
Date: Fri, 12 Apr 2013 10:30:07 UT

 Maintainer of net/minidlna,
 
 Please note that PR ports/177803 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/177803
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: William Grzybowski <william88@gmail.com>
To: bug-followup@FreeBSD.org, crees@FreeBSD.org
Cc:  
Subject: Re: ports/177803: [PATCH] Fix port: net/minidlna missing dependency
 on iconv
Date: Fri, 12 Apr 2013 08:18:13 -0300

 I approved.
 
 Thank you.
 
 --
 William Grzybowski
 ------------------------------------------
 Curitiba/PR - Brasil
Responsible-Changed-From-To: freebsd-ports-bugs->crees 
Responsible-Changed-By: crees 
Responsible-Changed-When: Fri Apr 12 12:08:15 UTC 2013 
Responsible-Changed-Why:  
This was mine 

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

From: Chris Rees <crees@FreeBSD.org>
To: William Grzybowski <william88@gmail.com>
Cc: "bug-followup@freebsd.org" <bug-followup@freebsd.org>
Subject: Re: ports/177803: [PATCH] Fix port: net/minidlna missing dependency
 on iconv
Date: Fri, 12 Apr 2013 14:10:02 +0100

 On 12 April 2013 12:18, William Grzybowski <william88@gmail.com> wrote:
 > I approved.
 >
 > Thank you.
 
 Actually, it turns out it's a little more complicated than that.  Some
 dependencies were also compiled without NLS, which made it fail there
 (I couldn't work out which).
 
 The patch below actually makes the port respect WITHOUT_NLS, which is
 the correct behaviour in the first place.
 
 WITHOUT_NLS:
 http://www.bayofrum.net:8080/tb/index.php?action=display_markup_log&build=9.1-local&id=412
 
 WITH_NLS:
 http://www.bayofrum.net/tb/index.php?action=display_markup_log&build=8.2-local&id=2377
 
 http://www.bayofrum.net/~crees/patches/minidlna-nls.diff
 
 Chris
Responsible-Changed-From-To: crees->wg 
Responsible-Changed-By: crees 
Responsible-Changed-When: Sun Apr 14 16:15:09 UTC 2013 
Responsible-Changed-Why:  
Aha, you can commit to your own ports now :) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=177803 
State-Changed-From-To: feedback->closed 
State-Changed-By: crees 
State-Changed-When: Sat May 4 17:53:19 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/177803: commit references a PR
Date: Sat,  4 May 2013 17:51:41 +0000 (UTC)

 --===============4436536064165561282==
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
 Author: crees
 Date: Sat May  4 17:51:27 2013
 New Revision: 317329
 URL: http://svnweb.freebsd.org/changeset/ports/317329
 
 Log:
   Fix build when flac is compiled WITHOUT_NLS
   
   PR:		ports/177803
   Approved by:	william (maintainer)
 
 Added:
   head/net/minidlna/files/config.h.in
      - copied unchanged from r315789, head/net/minidlna/files/config.h
 Deleted:
   head/net/minidlna/files/config.h
 Modified:
   head/net/minidlna/Makefile
   head/net/minidlna/files/BSDmakefile
 
 Modified: head/net/minidlna/Makefile
 ==============================================================================
 --- head/net/minidlna/Makefile	Sat May  4 17:29:38 2013	(r317328)
 +++ head/net/minidlna/Makefile	Sat May  4 17:51:27 2013	(r317329)
 @@ -3,6 +3,7 @@
  
  PORTNAME=	minidlna
  PORTVERSION=	1.0.25
 +PORTREVISION=	1
  PORTEPOCH=	1
  CATEGORIES=	net multimedia www
  MASTER_SITES=	SF
 @@ -33,6 +34,16 @@ SUB_LIST+=	USER=${USERS}
  USERS=	dlna
  GROUPS=	dlna
  
 +.include <bsd.port.options.mk>
 +
 +do-configure:
 +.if ${PORT_OPTIONS:MNLS}
 +	${CP} ${FILESDIR}/config.h.in ${WRKSRC}/config.h
 +.else
 +	${SED} 's,^#define HAVE_ICONV_H,/* & */,' ${FILESDIR}/config.h.in > \
 +		${WRKSRC}/config.h
 +.endif
 +
  post-install:
  	${FMT} ${PKGMESSAGE}
  
 
 Modified: head/net/minidlna/files/BSDmakefile
 ==============================================================================
 --- head/net/minidlna/files/BSDmakefile	Sat May  4 17:29:38 2013	(r317328)
 +++ head/net/minidlna/files/BSDmakefile	Sat May  4 17:51:27 2013	(r317329)
 @@ -4,7 +4,7 @@ NO_MAN=	Ha-ha...
  OS!=	uname
  VERS!=	uname -r
  
 -CFLAGS=-I${FILESDIR} -I${.CURDIR} -I${LOCALBASE}/include -I${LOCALBASE}/include/ffmpeg
 +CFLAGS=	-I${.CURDIR} -I${LOCALBASE}/include -I${LOCALBASE}/include/ffmpeg
  CFLAGS+=-I${LOCALBASE}/include/libavutil
  CFLAGS+=-DPREFIX='"${PREFIX}"' -DOS='"${OS}"' -DOSVERSION='"${VERS}"'
  CFLAGS+=-Wformat -Wunused -Wall
 
 Copied: head/net/minidlna/files/config.h.in (from r315789, head/net/minidlna/files/config.h)
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/net/minidlna/files/config.h.in	Sat May  4 17:51:27 2013	(r317329, copy of r315789, head/net/minidlna/files/config.h)
 @@ -0,0 +1,34 @@
 +/* MiniDLNA Project
 + * http://sourceforge.net/projects/minidlna/
 + * (c) 2008-2009 Justin Maggard
 + * generated by ./genconfig.sh on  13  2010 00:06:49 EDT */
 +#ifndef __CONFIG_H__
 +#define __CONFIG_H__
 +
 +#define PFRULE_INOUT_COUNTS
 +#define OS_NAME		OS
 +#define OS_VERSION	OS "/" OSVERSION
 +#define OS_URL		"http://www." OS ".org/"
 +
 +/* full path of the file database */
 +#define DEFAULT_DB_PATH	"/var/db/minidlna"
 +#define DEFAULT_LOG_PATH	"/var/log"
 +
 +/* Comment the following line to use home made daemonize() func instead
 + * of BSD daemon() */
 +#define USE_DAEMON
 +
 +/* Enable if the system inotify.h exists.  Otherwise our own inotify.h will be used. */
 +/*#define HAVE_INOTIFY_H*/
 +
 +/* Enable if the system iconv.h exists.  ID3 tag reading in various character sets will not work properly otherwise. */
 +#define HAVE_ICONV_H
 +
 +/* Enable NETGEAR-specific tweaks. */
 +/*#define NETGEAR*/
 +/* Enable ReadyNAS-specific tweaks. */
 +/*#define READYNAS*/
 +/* Compile in TiVo support. */
 +/* #define TIVO_SUPPORT -- not yet ported to FreeBSD */
 +
 +#endif
 
 --===============4436536064165561282==
 Content-Type: text/plain; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
 
 _______________________________________________
 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"
 --===============4436536064165561282==--
 
>Unformatted:
