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

[William Grzybowski]

Author: wg
Date: Tue Nov  5 16:12:04 2013
New Revision: 332862
URL: http://svnweb.freebsd.org/changeset/ports/332862

Log:
  net/minidlna: update to 1.1.1
  
  - Update to 1.1.1
  - Fix build for non-default LOCALBASE
  - Use options helpers

Deleted:
  head/net/minidlna/files/patch-clients.h
  head/net/minidlna/files/patch-icons
Modified:
  head/net/minidlna/Makefile
  head/net/minidlna/distinfo
  head/net/minidlna/files/patch-getifaddr.c

Modified: head/net/minidlna/Makefile
==============================================================================
--- head/net/minidlna/Makefile	Tue Nov  5 15:58:12 2013	(r332861)
+++ head/net/minidlna/Makefile	Tue Nov  5 16:12:04 2013	(r332862)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	minidlna
-PORTVERSION=	1.1.0
-PORTREVISION=	1
+PORTVERSION=	1.1.1
 PORTEPOCH=	1
 CATEGORIES=	net multimedia www
 MASTER_SITES=	SF
@@ -23,6 +22,9 @@ LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/d
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-db-path=/var/db/minidlna \
 		--with-os-url="http://www.FreeBSD.org"
+CFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+USES=		iconv
 
 PKGMESSAGE=	${WRKSRC}/pkg-message
 SUB_FILES+=	pkg-message
@@ -32,20 +34,14 @@ SUB_LIST+=	USER=${USERS}
 USERS=	dlna
 GROUPS=	dlna
 
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	NLS
+OPTIONS_SUB=	yes
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+NLS_USES=	gettext
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/*.5 ${STAGEDIR}${MANPREFIX}/man/man5/
 	${INSTALL_MAN} ${WRKSRC}/*.8 ${STAGEDIR}${MANPREFIX}/man/man8/
 	${INSTALL_DATA} ${WRKSRC}/minidlna.conf ${STAGEDIR}${PREFIX}/etc/minidlna.conf.sample
-	@${FMT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>

Modified: head/net/minidlna/distinfo
==============================================================================
--- head/net/minidlna/distinfo	Tue Nov  5 15:58:12 2013	(r332861)
+++ head/net/minidlna/distinfo	Tue Nov  5 16:12:04 2013	(r332862)
@@ -1,2 +1,2 @@
-SHA256 (minidlna-1.1.0.tar.gz) = c2ef2ebe4311d08a60a87ec0c86fbe5e7f4fd25b947841f1d71b0508c60a90e2
-SIZE (minidlna-1.1.0.tar.gz) = 423555
+SHA256 (minidlna-1.1.1.tar.gz) = 9b70082fd6a12e16cea1558ffff05c07e12ef0c405ee806721e75ce1ce9ad037
+SIZE (minidlna-1.1.1.tar.gz) = 678403

Modified: head/net/minidlna/files/patch-getifaddr.c
==============================================================================
--- head/net/minidlna/files/patch-getifaddr.c	Tue Nov  5 15:58:12 2013	(r332861)
+++ head/net/minidlna/files/patch-getifaddr.c	Tue Nov  5 16:12:04 2013	(r332862)
@@ -1,13 +1,11 @@
-diff --git getifaddr.c getifaddr.c
-index 9c437b7..5eb6716 100644
---- getifaddr.c
-+++ getifaddr.c
-@@ -175,7 +175,7 @@ getsysaddrs(void)
- 		if (p->ifa_addr && p->ifa_addr->sa_family == AF_INET)
- 		{
- 			addr_in = (struct sockaddr_in *)p->ifa_addr;
--			if (p->ifa_flags & (IFF_LOOPBACK | IFF_SLAVE))
-+			if (p->ifa_flags & (IFF_LOOPBACK))
- 				continue;
- 			memcpy(&lan_addr[n_lan_addr].addr, &addr_in->sin_addr, sizeof(lan_addr[n_lan_addr].addr));
- 			if (!inet_ntop(AF_INET, &addr_in->sin_addr, lan_addr[n_lan_addr].str, sizeof(lan_addr[0].str)) )
+--- getifaddr.c.orig	2013-11-01 23:06:41.000000000 -0200
++++ getifaddr.c	2013-11-05 13:51:05.978629077 -0200
+@@ -82,7 +82,7 @@
+ 		if (ifname && strcmp(p->ifa_name, ifname) != 0)
+ 			continue;
+ 		addr_in = (struct sockaddr_in *)p->ifa_addr;
+-		if (!ifname && (p->ifa_flags & (IFF_LOOPBACK | IFF_SLAVE)))
++		if (!ifname && (p->ifa_flags & IFF_LOOPBACK))
+ 			continue;
+ 		memcpy(&lan_addr[n_lan_addr].addr, &addr_in->sin_addr, sizeof(lan_addr[n_lan_addr].addr));
+ 		if (!inet_ntop(AF_INET, &addr_in->sin_addr, lan_addr[n_lan_addr].str, sizeof(lan_addr[0].str)) )