Update to 1.2.1

While here:
- Add license
- Use more option helper

PR:		222934
Submitted by:	Matthias Fechner <idefix@fechner.net>
Approved by:	maintainer (timeout 2 month)

net/minidlna/Makefile

@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	minidlna
-PORTVERSION=	1.2.0
-PORTREVISION=	1
+PORTVERSION=	1.2.1
 PORTEPOCH=	1
 CATEGORIES=	net multimedia www
 MASTER_SITES=	SF
@@ -11,6 +10,8 @@ MASTER_SITES=	SF
 MAINTAINER=	wg@FreeBSD.org
 COMMENT=	Media-server compatible with "Digital Life Network Alliance"
 
+LICENSE=	GPLv2
+
 LIB_DEPENDS=	libsqlite3.so:databases/sqlite3	\
 		libexif.so:graphics/libexif	\
 		libid3tag.so:audio/libid3tag	\
@@ -40,11 +41,7 @@ DEBUG_CFLAGS=	-DDEBUG
 KQUEUE_DESC=	Experimental patch for automatic rescan using kqueue(2)
 NLS_USES=	gettext-runtime
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MKQUEUE}
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-kqueue
-.endif
+KQUEUE_EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-kqueue
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/*.5 ${STAGEDIR}${MANPREFIX}/man/man5/

net/minidlna/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1499132244
-SHA256 (minidlna-1.2.0.tar.gz) = 8d34436580c4c44be25976d5e46bc5b71af69bf441c4492774eac001164c4433
-SIZE (minidlna-1.2.0.tar.gz) = 489340
+TIMESTAMP = 1513243527
+SHA256 (minidlna-1.2.1.tar.gz) = 67388ba23ab0c7033557a32084804f796aa2a796db7bb2b770fb76ac2a742eec
+SIZE (minidlna-1.2.1.tar.gz) = 459549

net/minidlna/files/extra-patch-kqueue

@@ -311,7 +311,7 @@ index ebe8095..e3eaddc 100644
 +		return 0;
 +	}
 +
-+	while( scanning )
++	while( GETFLAG(SCANNING_MASK) )
 +	{
 +		if( quitting )
 +			goto quitting;

net/minidlna/files/patch-minissdp.c

@@ -1,23 +0,0 @@
---- minissdp.c.orig	2015-09-10 19:24:09 UTC
-+++ minissdp.c
-@@ -60,7 +60,7 @@ static int
- AddMulticastMembership(int s, struct lan_addr_s *iface)
- {
- 	int ret;
--#ifdef HAVE_STRUCT_IP_MREQN
-+#if defined(HAVE_STRUCT_IP_MREQN) && !defined(__FreeBSD__)
- 	struct ip_mreqn imr;	/* Ip multicast membership */
- 	/* setting up imr structure */
- 	memset(&imr, '\0', sizeof(imr));
-@@ -117,7 +117,11 @@ OpenAndConfSSDPReceiveSocket(void)
- 	 * to receive datagramms send to this multicast address.
- 	 * To specify the local nics we want to use we have to use setsockopt,
- 	 * see AddMulticastMembership(...). */
-+#ifdef __FreeBSD__
-+	sockname.sin_addr.s_addr = htonl(INADDR_ANY);
-+#else
- 	sockname.sin_addr.s_addr = inet_addr(SSDP_MCAST_ADDR);
-+#endif
- 
- 	if (bind(s, (struct sockaddr *)&sockname, sizeof(struct sockaddr_in)) < 0)
- 	{