From owner-svn-ports-all@FreeBSD.ORG Sun Jun 9 20:10:56 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 8E34837C; Sun, 9 Jun 2013 20:10:56 +0000 (UTC) (envelope-from wg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 7F8DE1F5F; Sun, 9 Jun 2013 20:10:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r59KAu1q055936; Sun, 9 Jun 2013 20:10:56 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r59KAsfc055925; Sun, 9 Jun 2013 20:10:54 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201306092010.r59KAsfc055925@svn.freebsd.org> From: William Grzybowski Date: Sun, 9 Jun 2013 20:10:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r320407 - in head/net/minidlna: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Jun 2013 20:10:56 -0000 Author: wg Date: Sun Jun 9 20:10:54 2013 New Revision: 320407 URL: http://svnweb.freebsd.org/changeset/ports/320407 Log: - Update to 1.1.0 Changes: http://sourceforge.net/projects/minidlna/files/minidlna/1.1.0/ Approved by: culot / jpaetzel (mentors, implicit) Added: head/net/minidlna/files/patch-clang-inline (contents, props changed) head/net/minidlna/files/patch-clients.h (contents, props changed) head/net/minidlna/files/patch-getifaddr.c (contents, props changed) head/net/minidlna/files/patch-minidlna.conf (contents, props changed) head/net/minidlna/files/patch-utils.c-mpo (contents, props changed) Deleted: head/net/minidlna/files/BSDmakefile head/net/minidlna/files/config.h.in head/net/minidlna/files/getifaddr.c head/net/minidlna/files/patch-aa head/net/minidlna/files/patch-ab head/net/minidlna/files/patch-conf head/net/minidlna/files/patch-inline head/net/minidlna/files/patch-lg head/net/minidlna/files/patch-minidlna.c head/net/minidlna/files/patch-other-subnets head/net/minidlna/files/patch-replace-glob3 head/net/minidlna/files/patch-type-mismatch head/net/minidlna/files/patch-upnphttp head/net/minidlna/files/patch-utils-mpo head/net/minidlna/files/patch-warnings head/net/minidlna/files/scandir-patch Modified: head/net/minidlna/Makefile head/net/minidlna/distinfo head/net/minidlna/files/minidlna.in head/net/minidlna/pkg-plist Modified: head/net/minidlna/Makefile ============================================================================== --- head/net/minidlna/Makefile Sun Jun 9 19:47:46 2013 (r320406) +++ head/net/minidlna/Makefile Sun Jun 9 20:10:54 2013 (r320407) @@ -2,29 +2,27 @@ # $FreeBSD$ PORTNAME= minidlna -PORTVERSION= 1.0.25 -PORTREVISION= 2 +PORTVERSION= 1.1.0 PORTEPOCH= 1 CATEGORIES= net multimedia www MASTER_SITES= SF -DISTFILES= ${PORTNAME}_${PORTVERSION}_src.tar.gz MAINTAINER= wg@FreeBSD.org COMMENT= Media-server compatible with "Digital Life Network Alliance" LIB_DEPENDS= sqlite3:${PORTSDIR}/databases/sqlite3 \ - jpeg:${PORTSDIR}/graphics/jpeg \ + jpeg:${PORTSDIR}/graphics/jpeg \ exif:${PORTSDIR}/graphics/libexif \ id3tag:${PORTSDIR}/audio/libid3tag \ - ogg:${PORTSDIR}/audio/libogg \ + ogg:${PORTSDIR}/audio/libogg \ vorbis:${PORTSDIR}/audio/libvorbis \ - FLAC:${PORTSDIR}/audio/flac \ + FLAC:${PORTSDIR}/audio/flac \ avformat:${PORTSDIR}/multimedia/ffmpeg +GNU_CONFIGURE= yes MAKE_JOBS_SAFE= yes -MAKEFILE= ${FILESDIR}/BSDmakefile -MAKE_ENV+= FILESDIR="${FILESDIR}" INSTALL_DATA="${INSTALL_DATA}" -EXTRACT_AFTER_ARGS=--exclude getifaddr.c +CONFIGURE_ARGS+=--with-db-path=/var/db/minidlna \ + --with-os-url="http://www.FreeBSD.org" PKGMESSAGE= ${WRKSRC}/pkg-message SUB_FILES+= pkg-message @@ -34,23 +32,26 @@ SUB_LIST+= USER=${USERS} USERS= dlna GROUPS= dlna +MAN5= minidlna.conf.5 +MAN8= minidlnad.8 + .include -do-configure: .if ${PORT_OPTIONS:MNLS} - ${CP} ${FILESDIR}/config.h.in ${WRKSRC}/config.h +USES+= gettext +PLIST_SUB+= NLS="" .else - ${SED} 's,^#define HAVE_ICONV_H,/* & */,' ${FILESDIR}/config.h.in > \ - ${WRKSRC}/config.h +CONFIGURE_ARGS+= --disable-nls +PLIST_SUB+= NLS="@comment " .endif post-install: - ${FMT} ${PKGMESSAGE} - -.include - -.if ${OSVERSION} < 800500 -EXTRA_PATCHES= ${FILESDIR}/scandir-patch -.endif + ${INSTALL_MAN} ${MAN5:S,^,${WRKSRC}/,} ${MANPREFIX}/man/man5/ + ${INSTALL_MAN} ${MAN8:S,^,${WRKSRC}/,} ${MANPREFIX}/man/man8/ + ${INSTALL_DATA} ${WRKSRC}/minidlna.conf ${PREFIX}/etc/minidlna.conf.sample + @${MKDIR} /var/run/minidlna + @${MKDIR} /var/db/minidlna + @${CHOWN} ${USERS} /var/db/minidlna + @${FMT} ${PKGMESSAGE} -.include +.include Modified: head/net/minidlna/distinfo ============================================================================== --- head/net/minidlna/distinfo Sun Jun 9 19:47:46 2013 (r320406) +++ head/net/minidlna/distinfo Sun Jun 9 20:10:54 2013 (r320407) @@ -1,2 +1,2 @@ -SHA256 (minidlna_1.0.25_src.tar.gz) = 170560fbe042c2bbcba78c5f15b54f4fac321ff770490b23b55789be463f2851 -SIZE (minidlna_1.0.25_src.tar.gz) = 211756 +SHA256 (minidlna-1.1.0.tar.gz) = c2ef2ebe4311d08a60a87ec0c86fbe5e7f4fd25b947841f1d71b0508c60a90e2 +SIZE (minidlna-1.1.0.tar.gz) = 423555 Modified: head/net/minidlna/files/minidlna.in ============================================================================== --- head/net/minidlna/files/minidlna.in Sun Jun 9 19:47:46 2013 (r320406) +++ head/net/minidlna/files/minidlna.in Sun Jun 9 20:10:54 2013 (r320407) @@ -1,5 +1,4 @@ #!/bin/sh - # $FreeBSD$ # # PROVIDE: minidlna @@ -14,21 +13,21 @@ name=minidlna rcvar=minidlna_enable -command=%%PREFIX%%/sbin/minidlna +command=%%PREFIX%%/sbin/minidlnad load_rc_config $name minidlna_enable=${minidlna_enable-"NO"} minidlna_uid=${minidlna_uid-"%%USER%%"} -pidfile="/var/db/minidlna/minidlna.pid" +pidfile="/var/run/minidlna/minidlna.pid" start_precmd="rm -f $pidfile" stop_postcmd=$start_precmd -command_args="-P $pidfile -u $minidlna_uid" +command_args="-P $pidfile -u $minidlna_uid -f %%PREFIX%%/etc/minidlna.conf" extra_commands=rescan -rescan_cmd="$command -R -u $minidlna_uid" -required_dirs="/var/db/minidlna" +rescan_cmd="$command -R -u $minidlna_uid -f %%PREFIX%%/etc/minidlna.conf" +required_dirs="/var/run/minidlna /var/db/minidlna" run_rc_command $1 Added: head/net/minidlna/files/patch-clang-inline ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/minidlna/files/patch-clang-inline Sun Jun 9 20:10:54 2013 (r320407) @@ -0,0 +1,137 @@ +diff --git tagutils/misc.c tagutils/misc.c +index 98ad543..5dc94e5 100644 +--- tagutils/misc.c ++++ tagutils/misc.c +@@ -30,7 +30,7 @@ + + #include "misc.h" + +-inline __u16 ++__u16 + le16_to_cpu(__u16 le16) + { + #if __BYTE_ORDER == __LITTLE_ENDIAN +@@ -41,7 +41,7 @@ le16_to_cpu(__u16 le16) + #endif + } + +-inline __u32 ++__u32 + le32_to_cpu(__u32 le32) + { + #if __BYTE_ORDER == __LITTLE_ENDIAN +@@ -56,7 +56,7 @@ le32_to_cpu(__u32 le32) + #endif + } + +-inline __u64 ++__u64 + le64_to_cpu(__u64 le64) + { + #if __BYTE_ORDER == __LITTLE_ENDIAN +@@ -77,7 +77,7 @@ le64_to_cpu(__u64 le64) + #endif + } + +-inline __u8 ++__u8 + fget_byte(FILE *fp) + { + __u8 d; +@@ -87,7 +87,7 @@ fget_byte(FILE *fp) + return d; + } + +-inline __u16 ++__u16 + fget_le16(FILE *fp) + { + __u16 d; +@@ -98,7 +98,7 @@ fget_le16(FILE *fp) + return d; + } + +-inline __u32 ++__u32 + fget_le32(FILE *fp) + { + __u32 d; +@@ -109,7 +109,7 @@ fget_le32(FILE *fp) + return d; + } + +-inline __u32 ++__u32 + cpu_to_be32(__u32 cpu32) + { + #if __BYTE_ORDER == __LITTLE_ENDIAN +diff --git tagutils/misc.h tagutils/misc.h +index c7642fe..fc488a1 100644 +--- tagutils/misc.h ++++ tagutils/misc.h +@@ -37,14 +37,14 @@ typedef signed long long __s64; + #endif + + +-inline __u16 le16_to_cpu(__u16 le16); +-inline __u32 le32_to_cpu(__u32 le32); +-inline __u64 le64_to_cpu(__u64 le64); +-inline __u8 fget_byte(FILE *fp); +-inline __u16 fget_le16(FILE *fp); +-inline __u32 fget_le32(FILE *fp); +- +-inline __u32 cpu_to_be32(__u32 cpu32); ++__u16 le16_to_cpu(__u16 le16); ++__u32 le32_to_cpu(__u32 le32); ++__u64 le64_to_cpu(__u64 le64); ++__u8 fget_byte(FILE *fp); ++__u16 fget_le16(FILE *fp); ++__u32 fget_le32(FILE *fp); ++ ++__u32 cpu_to_be32(__u32 cpu32); + + extern char * sha1_hex(char *key); + +diff --git utils.c utils.c +index 57ae5a4..d46f2f0 100644 +--- utils.c ++++ utils.c +@@ -33,7 +33,7 @@ + #include "upnpglobalvars.h" + #include "log.h" + +-inline int ++int + strcatf(struct string_s *str, const char *fmt, ...) + { + int ret; +@@ -52,14 +52,14 @@ strcatf(struct string_s *str, const char *fmt, ...) + return ret; + } + +-inline void ++void + strncpyt(char *dst, const char *src, size_t len) + { + strncpy(dst, src, len); + dst[len-1] = '\0'; + } + +-inline int ++int + xasprintf(char **strp, char *fmt, ...) + { + va_list args; +diff --git utils.h utils.h +index d9d49a4..fbff582 100644 +--- utils.h ++++ utils.h +@@ -29,7 +29,7 @@ + /* String functions */ + int strcatf(struct string_s *str, char *fmt, ...); + void strncpyt(char *dst, const char *src, size_t len); +-inline int xasprintf(char **strp, char *fmt, ...); ++int xasprintf(char **strp, char *fmt, ...); + int ends_with(const char * haystack, const char * needle); + char *trim(char *str); + char *strstrc(const char *s, const char *p, const char t); Added: head/net/minidlna/files/patch-clients.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/minidlna/files/patch-clients.h Sun Jun 9 20:10:54 2013 (r320407) @@ -0,0 +1,12 @@ +diff --git clients.h clients.h +index d3ffe1d..2a4c579 100644 +--- clients.h ++++ clients.h +@@ -1,6 +1,7 @@ + #ifndef __CLIENTS_H__ + #define __CLIENTS_H__ + #include ++#include + #include + + #define CLIENT_CACHE_SLOTS 20 Added: head/net/minidlna/files/patch-getifaddr.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/minidlna/files/patch-getifaddr.c Sun Jun 9 20:10:54 2013 (r320407) @@ -0,0 +1,13 @@ +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)) ) Added: head/net/minidlna/files/patch-minidlna.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/minidlna/files/patch-minidlna.conf Sun Jun 9 20:10:54 2013 (r320407) @@ -0,0 +1,13 @@ +diff --git minidlna.conf minidlna.conf +index bfb71d5..b579912 100644 +--- minidlna.conf ++++ minidlna.conf +@@ -21,7 +21,7 @@ media_dir=/opt + #friendly_name=My DLNA Server + + # set this if you would like to specify the directory where you want MiniDLNA to store its database and album art cache +-#db_dir=/var/cache/minidlna ++#db_dir=/var/db/minidlna + + # set this if you would like to specify the directory where you want MiniDLNA to store its log file + #log_dir=/var/log Added: head/net/minidlna/files/patch-utils.c-mpo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/minidlna/files/patch-utils.c-mpo Sun Jun 9 20:10:54 2013 (r320407) @@ -0,0 +1,13 @@ +diff --git utils.c utils.c +index d46f2f0..15e7905 100644 +--- utils.c ++++ utils.c +@@ -396,7 +396,7 @@ is_audio(const char * file) + int + is_image(const char * file) + { +- return (ends_with(file, ".jpg") || ends_with(file, ".jpeg")); ++ return (ends_with(file, ".jpg") || ends_with(file, ".jpeg") || ends_with(file, ".mpo")); + } + + int Modified: head/net/minidlna/pkg-plist ============================================================================== --- head/net/minidlna/pkg-plist Sun Jun 9 19:47:46 2013 (r320406) +++ head/net/minidlna/pkg-plist Sun Jun 9 20:10:54 2013 (r320407) @@ -1,4 +1,16 @@ -sbin/minidlna +sbin/minidlnad @unexec if cmp -s %D/etc/minidlna.conf %D/etc/minidlna.conf.sample; then rm -f %D/etc/minidlna.conf; fi etc/minidlna.conf.sample @exec [ -f %D/etc/minidlna.conf ] || cp -p %D/etc/minidlna.conf.sample %D/etc/minidlna.conf +%%NLS%%share/locale/da/LC_MESSAGES/minidlna.mo +%%NLS%%share/locale/de/LC_MESSAGES/minidlna.mo +%%NLS%%share/locale/es/LC_MESSAGES/minidlna.mo +%%NLS%%share/locale/fr/LC_MESSAGES/minidlna.mo +%%NLS%%share/locale/it/LC_MESSAGES/minidlna.mo +%%NLS%%share/locale/ja/LC_MESSAGES/minidlna.mo +%%NLS%%share/locale/nb/LC_MESSAGES/minidlna.mo +%%NLS%%share/locale/nl/LC_MESSAGES/minidlna.mo +%%NLS%%share/locale/pl/LC_MESSAGES/minidlna.mo +%%NLS%%share/locale/ru/LC_MESSAGES/minidlna.mo +%%NLS%%share/locale/sl/LC_MESSAGES/minidlna.mo +%%NLS%%share/locale/sv/LC_MESSAGES/minidlna.mo