From owner-svn-ports-all@FreeBSD.ORG  Thu May 22 14:44:57 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@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 4FBA370F;
 Thu, 22 May 2014 14:44:57 +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 231102917;
 Thu, 22 May 2014 14:44:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4MEiv0m091034;
 Thu, 22 May 2014 14:44:57 GMT (envelope-from vanilla@svn.freebsd.org)
Received: (from vanilla@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4MEiuoQ091030;
 Thu, 22 May 2014 14:44:56 GMT (envelope-from vanilla@svn.freebsd.org)
Message-Id: <201405221444.s4MEiuoQ091030@svn.freebsd.org>
From: "Vanilla I. Shu" <vanilla@FreeBSD.org>
Date: Thu, 22 May 2014 14:44:56 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r354857 - head/audio/mpdscribble
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.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 22 May 2014 14:44:57 -0000

Author: vanilla
Date: Thu May 22 14:44:56 2014
New Revision: 354857
URL: http://svnweb.freebsd.org/changeset/ports/354857
QAT: https://qat.redports.org/buildarchive/r354857/

Log:
  Stageify, and use @sample on pkg-plist.
  
  Approved by:	portmgr@

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

Modified: head/audio/mpdscribble/Makefile
==============================================================================
--- head/audio/mpdscribble/Makefile	Thu May 22 14:37:14 2014	(r354856)
+++ head/audio/mpdscribble/Makefile	Thu May 22 14:44:56 2014	(r354857)
@@ -14,15 +14,11 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS+=	libmpdclient.so:${PORTSDIR}/audio/libmpdclient
 
-USE_BZIP2=	yes
-NO_STAGE=	yes
-USES=		pkgconfig
+USES=		pkgconfig tar:bzip2
 USE_GNOME=	glib20
 GNU_CONFIGURE=	yes
 USE_RC_SUBR=	mpdscribble
 
-MAN1=		mpdscribble.1
-
 OPTIONS_DEFINE=	SOUP DOCS
 SOUP_DESC=	Use libsoup instead of libcurl
 
@@ -37,16 +33,13 @@ CONFIGURE_ARGS+=	--with-http-client=curl
 .endif
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/mpdscribble ${PREFIX}/bin/mpdscribble
-	${INSTALL_MAN} ${WRKSRC}/doc/mpdscribble.1 ${MANPREFIX}/man/man1/mpdscribble.1
-	${INSTALL_DATA} ${WRKSRC}/doc/mpdscribble.conf ${PREFIX}/etc/mpdscribble.conf.sample
-.if !exists(${PREFIX}/etc/mpdscribble.conf)
-	@(cd ${PREFIX}/etc && ${CP} mpdscribble.conf.sample mpdscribble.conf)
-.endif
+	${INSTALL_PROGRAM} ${WRKSRC}/src/mpdscribble ${STAGEDIR}${PREFIX}/bin/mpdscribble
+	${INSTALL_MAN} ${WRKSRC}/doc/mpdscribble.1 ${STAGEDIR}${MANPREFIX}/man/man1/mpdscribble.1
+	${INSTALL_DATA} ${WRKSRC}/doc/mpdscribble.conf ${STAGEDIR}${PREFIX}/etc/mpdscribble.conf.sample
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for file in AUTHORS NEWS README
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
 .endfor
 .endif
 

Modified: head/audio/mpdscribble/pkg-plist
==============================================================================
--- head/audio/mpdscribble/pkg-plist	Thu May 22 14:37:14 2014	(r354856)
+++ head/audio/mpdscribble/pkg-plist	Thu May 22 14:44:56 2014	(r354857)
@@ -1,7 +1,6 @@
 bin/mpdscribble
-@unexec if cmp -s %D/etc/mpdscribble.conf.sample %D/etc/mpdscribble.conf; then rm -f %D/etc/mpdscribble.conf; fi
-etc/mpdscribble.conf.sample
-@exec [ -f %B/mpdscribble.conf ] || cp -p %B/%f %B/mpdscribble.conf
+@sample etc/mpdscribble.conf.sample
+man/man1/mpdscribble.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/NEWS