svn commit: r317329 - in head/net/minidlna: . files

[Chris Rees]

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