svn commit: r354857 - head/audio/mpdscribble

[Vanilla I. Shu]

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
- at 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
- at exec [ -f %B/mpdscribble.conf ] || cp -p %B/%f %B/mpdscribble.conf
+ at sample etc/mpdscribble.conf.sample
+man/man1/mpdscribble.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/NEWS