From owner-svn-ports-head@FreeBSD.ORG  Sat Jul 19 21:31:28 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C9079761;
 Sat, 19 Jul 2014 21:31:28 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9D29A20CB;
 Sat, 19 Jul 2014 21:31:28 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6JLVSrf088709;
 Sat, 19 Jul 2014 21:31:28 GMT (envelope-from crees@svn.freebsd.org)
Received: (from crees@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6JLVS8t088706;
 Sat, 19 Jul 2014 21:31:28 GMT (envelope-from crees@svn.freebsd.org)
Message-Id: <201407192131.s6JLVS8t088706@svn.freebsd.org>
From: Chris Rees <crees@FreeBSD.org>
Date: Sat, 19 Jul 2014 21:31:28 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r362282 - head/audio/musicpd
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 19 Jul 2014 21:31:28 -0000

Author: crees
Date: Sat Jul 19 21:31:27 2014
New Revision: 362282
URL: http://svnweb.freebsd.org/changeset/ports/362282
QAT: https://qat.redports.org/buildarchive/r362282/

Log:
  Stop pkg complaining, and do exactly the same as before :)

Modified:
  head/audio/musicpd/Makefile
  head/audio/musicpd/pkg-plist

Modified: head/audio/musicpd/Makefile
==============================================================================
--- head/audio/musicpd/Makefile	Sat Jul 19 20:26:10 2014	(r362281)
+++ head/audio/musicpd/Makefile	Sat Jul 19 21:31:27 2014	(r362282)
@@ -217,17 +217,26 @@ post-patch:
 .endif
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/src/mpd \
+	${INSTALL_PROGRAM} ${WRKSRC}/src/mpd \
 		${STAGEDIR}/${PREFIX}/bin/${PORTNAME}
-	@${INSTALL_MAN} ${WRKSRC}/doc/mpd.1 \
+	${INSTALL_MAN} ${WRKSRC}/doc/mpd.1 \
 		${STAGEDIR}/${PREFIX}/man/man1/${PORTNAME}.1
-	@${INSTALL_MAN} ${WRKSRC}/doc/mpd.conf.5 \
+	${INSTALL_MAN} ${WRKSRC}/doc/mpd.conf.5 \
 		${STAGEDIR}/${PREFIX}/man/man5/${PORTNAME}.conf.5
-	@${MKDIR} ${STAGEDIR}/${DOCSDIR}
-.for doc in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}/${DOCSDIR}/
-.endfor
-	@${INSTALL_DATA} ${WRKSRC}/doc/mpdconf.example \
+	${MKDIR} ${STAGEDIR}/${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}/${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/doc/mpdconf.example \
 		${STAGEDIR}/${PREFIX}/etc/${PORTNAME}.conf.sample
+	${PRINTF} "%s\n%s\n%s\n" "@cwd /" "@owner ${MPDUSER}" \
+		"@group ${MPDGROUP}" >> ${TMPPLIST}
+	cd ${STAGEDIR} && ${MKDIR} -v ${MPDDIR:S,^/,,}/.mpd | ${SORT} -r | \
+		${SED} 's,^,@dirrmtry ,' >> ${TMPPLIST}
+.ifndef WITH_PKGNG
+	# Cute, we can't use @dirrmtry with pkg_old...
+	# Remove once all using pkgng
+	${REINPLACE_CMD} \
+		's,^@dirrmtry \(.*\),@unexec rmdir \1 > /dev/null || :,' \
+		${TMPPLIST}
+.endif
 
 .include <bsd.port.mk>

Modified: head/audio/musicpd/pkg-plist
==============================================================================
--- head/audio/musicpd/pkg-plist	Sat Jul 19 20:26:10 2014	(r362281)
+++ head/audio/musicpd/pkg-plist	Sat Jul 19 21:31:27 2014	(r362282)
@@ -2,7 +2,5 @@ bin/musicpd
 @unexec if cmp -s %D/etc/musicpd.conf.sample %D/etc/musicpd.conf; then rm -f %D/etc/musicpd.conf; fi
 etc/musicpd.conf.sample
 @exec if [ ! -f %B/musicpd.conf ] ; then cp -p %D/%F %B/musicpd.conf; fi
-@exec install -d -o %%MPDUSER%% -g %%MPDGROUP%% %%MPDDIR%% %%MPDDIR%%/.mpd
-@unexec rmdir -p %%MPDDIR%%/.mpd 2>/dev/null || true
 man/man1/musicpd.1.gz
 man/man5/musicpd.conf.5.gz