Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 5 Jun 2014 04:58:00 +0000 (UTC)
From:      Martin Wilke <miwi@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r356582 - head/www/podcastamatic
Message-ID:  <201406050458.s554w0I9030454@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: miwi
Date: Thu Jun  5 04:58:00 2014
New Revision: 356582
URL: http://svnweb.freebsd.org/changeset/ports/356582
QAT: https://qat.redports.org/buildarchive/r356582/

Log:
  -  Stage support
  
  PR:		190360

Modified:
  head/www/podcastamatic/Makefile
  head/www/podcastamatic/pkg-plist

Modified: head/www/podcastamatic/Makefile
==============================================================================
--- head/www/podcastamatic/Makefile	Thu Jun  5 04:41:03 2014	(r356581)
+++ head/www/podcastamatic/Makefile	Thu Jun  5 04:58:00 2014	(r356582)
@@ -17,10 +17,16 @@ RUN_DEPENDS=	p5-MP3-Info>=0:${PORTSDIR}/
 
 USES=		perl5 zip
 USE_PERL5=	run
-
+USES+=		shebangfix
+SHEBANG_FILES=	podcastamatic.pl
 NO_BUILD=	yes
 
-NO_STAGE=	yes
+SUB_LIST=	PORTNAME="${PORTNAME}"
+
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
+
 do-patch:
 	@${REINPLACE_CMD} -e "s|${PORTNAME}.conf|${PREFIX}/etc/${PORTNAME}.conf|"\
 		 ${WRKSRC}/${PORTNAME}.pl
@@ -35,18 +41,11 @@ do-patch:
 	@${REINPLACE_CMD} -e "s|[wW]:|${PREFIX}/www|" ${WRKSRC}/example_${PORTNAME}.conf
 
 do-install:
-	@${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl ${PREFIX}/bin/${PORTNAME}
-	@${INSTALL_DATA} ${WRKSRC}/example_${PORTNAME}.conf ${PREFIX}/etc/${PORTNAME}.conf.sample
-	test \! -f ${PREFIX}/etc/${PORTNAME}.conf && ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf ${PREFIX}/etc/${PORTNAME}.conf || true
-	@${MKDIR} ${PREFIX}/share/${PORTNAME}
-	@${INSTALL_DATA} ${WRKSRC}/style.css ${PREFIX}/share/${PORTNAME}/
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/readme.html ${DOCSDIR}
-.endif
-	@${ECHO}
-	@${ECHO} "Edit ${PREFIX}/etc/${PORTNAME}.conf"
-	@${ECHO} "CSS in ${PREFIX}/share/${PORTNAME}/style.css"
-	@${ECHO}
+	@${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	@${INSTALL_DATA} ${WRKSRC}/example_${PORTNAME}.conf ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/${PORTNAME}
+	@${INSTALL_DATA} ${WRKSRC}/style.css ${STAGEDIR}${PREFIX}/share/${PORTNAME}/
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/readme.html ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/www/podcastamatic/pkg-plist
==============================================================================
--- head/www/podcastamatic/pkg-plist	Thu Jun  5 04:41:03 2014	(r356581)
+++ head/www/podcastamatic/pkg-plist	Thu Jun  5 04:58:00 2014	(r356582)
@@ -1,7 +1,7 @@
-@unexec cmp %D/etc/podcastamatic.conf.sample %D/etc/podcastamatic.conf && rm %D/etc/podcastamatic.conf || true
 bin/podcastamatic
+@unexec if cmp -s %D/etc/podcastamatic.conf %D/etc/podcastamatic.conf.sample; then rm -f %D/etc/podcastamatic.conf; fi
 etc/podcastamatic.conf.sample
-@exec [ -f %B/podcastamatic.conf ] || cp %F %B/podcastamatic.conf
+@exec cp -n %D/%F %B/podcastamatic.conf
 %%PORTDOCS%%%%DOCSDIR%%/readme.html
 %%DATADIR%%/style.css
 @dirrm %%DATADIR%%



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406050458.s554w0I9030454>