1 files changed, 84 insertions, 124 deletions

diff --git a/www/amphetadesk/Makefile b/www/amphetadesk/Makefile
index 3f72b1933f73..9ecbdcc8911f 100644
--- a/www/amphetadesk/Makefile
+++ b/www/amphetadesk/Makefile
@@ -7,15 +7,17 @@
 
 PORTNAME=	amphetadesk
 PORTVERSION=	0.93.1
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	${PORTNAME}-src-v${PORTVERSION}
 
-MAINTAINER=	kstailey@yahoo.com
+MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	RSS client that serves HTTP to your local web browser
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \
+RUN_DEPENDS=	\
+		${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \
 		${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
 		${SITE_PERL}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser \
 		${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
@@ -26,137 +28,95 @@ BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/
 		${SITE_PERL}/XML/Simple.pm:${PORTSDIR}/textproc/p5-XML-Simple \
 		${SITE_PERL}/Text/Template.pm:${PORTSDIR}/textproc/p5-Text-Template \
 		${SITE_PERL}/URI/URL.pm:${PORTSDIR}/net/p5-URI
-RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_PERL5=	yes
+USE_RC_SUBR=	yes
 USE_REINPLACE=	yes
 NO_BUILD=	yes
 
-post-extract:
-	@ ${INSTALL_SCRIPT} ${FILESDIR}/AmphetaDesk ${WRKSRC}
+.ifndef(NOPORTDOCS)
+PORTDOCS=	\
+		*
+.endif
 
 post-patch:
-	@ ${FIND} ${WRKSRC} -type f | \
-		${XARGS} -n 10 -x ${REINPLACE_CMD} -E \
-		-e 's|/usr/bin/perl|${PERL}|'
-	@ ${REINPLACE_CMD} -E -e 's|%%ADESK%%|${ADESK}|' ${WRKSRC}/AmphetaDesk
-
-# fit in 80 colums via macro reductions
-# srcs
-AWRK=		${WRKSRC}/lib/AmphetaDesk
-TWRK=		${WRKSRC}/lib/Text
-DWRK=		${WRKSRC}/docs
-IWRK=		${DWRK}/images
-DATA=		${WRKSRC}/data
-LIST=		${DATA}/lists/services-channels-recent.xml
-TMPL=		${WRKSRC}/templates
-DEFL=		${TMPL}/default
-GUI=		${DEFL}/gui
-DIMG		=${DEFL}/images
+	@${FIND} ${WRKSRC} -type f -print0 | \
+		${XARGS} -0 -x -n 10 \
+		${REINPLACE_CMD} -E \
+		-e 's|([[:space:]]+)(AmphetaDesk)|\1AmphetaDesk::\2|g' \
+		-e 's|([[:space:]]*)(Text::Template)|\1AmphetaDesk::\2|g' \
+		-e 's|([[:space:]]*)(XML::Simple)|\1AmphetaDesk::\2|g' \
+		-e 's|^.*use[[:space:]]*FindBin.*$$||' \
+		-e "s|\([\$$]Bin|\(\$$ENV{'DIRNAME'}|g"
+	@${REINPLACE_CMD} -E \
+		-e 's|%%DATADIR%%|${DATADIR}|' \
+		-e 's|%%DOCSDIR%%|${DOCSDIR}|' \
+		${WRKSRC}/lib/AmphetaDesk/Settings.pm
+# rc.d
+	@${SED}  \
+		-e 's|%%PREFIX%%|${PREFIX}|' \
+		-e "s|%%PERL%%|${PERL}|" \
+		${FILESDIR}/${PORTNAME}.sh > ${WRKDIR}/${PORTNAME}.sh
 
-# dests
-ADESK_DOC=	${PREFIX}/share/doc/AmphetaDesk
-ADESK_IMG=	${ADESK_DOC}/images
-ADESK=		${SITE_PERL}/AmphetaDesk
-ADESK_OS=	${ADESK}/OS
-ADESK_DATA=	${ADESK}/data
-ADESK_LIST=	${ADESK_DATA}/lists
-ADESK_TMPL=	${ADESK}/templates
-ADESK_DEFL=	${ADESK_TMPL}/default
-ADESK_GUI=	${ADESK_DEFL}/gui
-ADESK_DIMG=	${ADESK_DEFL}/images
+post-configure:
+	@${REINPLACE_CMD} -E \
+		-e 's|^.*/usr/bin/perl.*$$||' \
+		${WRKSRC}/AmphetaDesk.pl
+	@${SED} \
+		-e "s|%%PREFIX%%|${PREFIX}|" \
+		-e 's|%%DATADIR%%|${DATADIR}|' \
+		-e "s|%%PERL%%|${PERL}|" \
+		${FILESDIR}/wrapper.sh > \
+		${WRKDIR}/wrapper.sh
 
 do-install:
-	@ ${MKDIR} ${ADESK}
-	@ ${MKDIR} ${ADESK_OS}
-	@ ${MKDIR} ${ADESK_DOC}
-	@ ${MKDIR} ${ADESK_IMG}
-	@ ${MKDIR} ${ADESK_LIST}
-	@ ${MKDIR} ${ADESK_TMPL}
-	@ ${MKDIR} ${ADESK_DEFL}
-	@ ${MKDIR} ${ADESK_GUI}
-	@ ${MKDIR} ${ADESK_DIMG}
-	@ ${INSTALL_SCRIPT} ${WRKSRC}/AmphetaDesk	   ${PREFIX}/bin
-	@ ${INSTALL_SCRIPT} ${WRKSRC}/AmphetaDesk.pl	   ${ADESK}
-	@ ${INSTALL_DATA} ${WRKSRC}/lib/AmphetaDesk.pm 	   ${SITE_PERL}
-	@ ${INSTALL_DATA} ${WRKSRC}/lib/README.txt     	   ${ADESK}
-	@ ${INSTALL_DATA} ${AWRK}/Channels.pm	       	   ${ADESK}
-	@ ${INSTALL_DATA} ${AWRK}/ChannelsList.pm      	   ${ADESK}
-	@ ${INSTALL_DATA} ${AWRK}/MyChannels.pm	       	   ${ADESK}
-	@ ${INSTALL_DATA} ${AWRK}/Settings.pm	       	   ${ADESK}
-	@ ${INSTALL_DATA} ${AWRK}/Templates.pm	       	   ${ADESK}
-	@ ${INSTALL_DATA} ${AWRK}/Utilities.pm	       	   ${ADESK}
-	@ ${INSTALL_DATA} ${AWRK}/Versioning.pm	       	   ${ADESK}
-	@ ${INSTALL_DATA} ${AWRK}/WWW.pm	       	   ${ADESK}
-	@ ${INSTALL_DATA} ${AWRK}/WebServer.pm	       	   ${ADESK}
-	@ ${INSTALL_DATA} ${AWRK}/OS/Linux.pm	       	   ${ADESK_OS}
-	@ ${INSTALL_DATA} ${DWRK}/CHANGELOG	       	   ${ADESK_DOC}
-	@ ${INSTALL_DATA} ${DWRK}/LICENSE	       	   ${ADESK_DOC}
-	@ ${INSTALL_DATA} ${DWRK}/README.txt	       	   ${ADESK_DOC}
-	@ ${INSTALL_DATA} ${DWRK}/TODO		       	   ${ADESK_DOC}
-	@ ${INSTALL_DATA} ${DWRK}/build.html	       	   ${ADESK_DOC}
-	@ ${INSTALL_DATA} ${DWRK}/files_and_dirs.html  	   ${ADESK_DOC}
-	@ ${INSTALL_DATA} ${DWRK}/finding_more.html	   ${ADESK_DOC}
-	@ ${INSTALL_DATA} ${DWRK}/give_thanks.html	   ${ADESK_DOC}
-	@ ${INSTALL_DATA} ${DWRK}/history.html		   ${ADESK_DOC}
-	@ ${INSTALL_DATA} ${DWRK}/index.html		   ${ADESK_DOC}
-	@ ${INSTALL_DATA} ${DWRK}/kudos.html		   ${ADESK_DOC}
-	@ ${INSTALL_DATA} ${DWRK}/naming.html		   ${ADESK_DOC}
-	@ ${INSTALL_DATA} ${DWRK}/news.html		   ${ADESK_DOC}
-	@ ${INSTALL_DATA} ${DWRK}/news.xml		   ${ADESK_DOC}
-	@ ${INSTALL_DATA} ${DWRK}/screenshots.html	   ${ADESK_DOC}
-	@ ${INSTALL_DATA} ${DWRK}/skinning.html		   ${ADESK_DOC}
-	@ ${INSTALL_DATA} ${DWRK}/version.txt		   ${ADESK_DOC}
-	@ ${INSTALL_DATA} ${DWRK}/website_integration.html ${ADESK_DOC}
-	@ ${INSTALL_DATA} ${DWRK}/whats_new.html	   ${ADESK_DOC}
-	@ ${INSTALL_DATA} ${DWRK}/xml_my_services.html	   ${ADESK_DOC}
-	@ ${INSTALL_DATA} ${DWRK}/xml_my_settings.html	   ${ADESK_DOC}
-	@ ${INSTALL_DATA} ${DWRK}/xml_services_lists.html  ${ADESK_DOC}
-	@ ${INSTALL_DATA} ${IWRK}/bkgrnd.gif      	   ${ADESK_IMG}
-	@ ${INSTALL_DATA} ${IWRK}/fyuze.gif       	   ${ADESK_IMG}
-	@ ${INSTALL_DATA} ${IWRK}/globe.gif       	   ${ADESK_IMG}
-	@ ${INSTALL_DATA} ${IWRK}/livejournal.jpg 	   ${ADESK_IMG}
-	@ ${INSTALL_DATA} ${IWRK}/logo-88x31.gif  	   ${ADESK_IMG}
-	@ ${INSTALL_DATA} ${IWRK}/logo.gif        	   ${ADESK_IMG}
-	@ ${INSTALL_DATA} ${IWRK}/mailarchive.gif 	   ${ADESK_IMG}
-	@ ${INSTALL_DATA} ${IWRK}/meerkat.jpg     	   ${ADESK_IMG}
-	@ ${INSTALL_DATA} ${IWRK}/moreover.gif    	   ${ADESK_IMG}
-	@ ${INSTALL_DATA} ${IWRK}/network54.gif   	   ${ADESK_IMG}
-	@ ${INSTALL_DATA} ${IWRK}/newsisfree.gif  	   ${ADESK_IMG}
-	@ ${INSTALL_DATA} ${IWRK}/nwfusion.gif    	   ${ADESK_IMG}
-	@ ${INSTALL_DATA} ${IWRK}/quicktopic.gif  	   ${ADESK_IMG}
-	@ ${INSTALL_DATA} ${IWRK}/racingnews.jpg  	   ${ADESK_IMG}
-	@ ${INSTALL_DATA} ${IWRK}/sherch.jpg      	   ${ADESK_IMG}
-	@ ${INSTALL_DATA} ${IWRK}/snewp.jpg       	   ${ADESK_IMG}
-	@ ${INSTALL_DATA} ${IWRK}/syndic8.gif     	   ${ADESK_IMG}
-	@ ${INSTALL_DATA} ${IWRK}/xml.gif	  	   ${ADESK_IMG}
-	@ ${INSTALL_DATA} ${IWRK}/xml_pill.gif    	   ${ADESK_IMG}
-	@ ${INSTALL_DATA} ${IWRK}/xml_radio.gif   	   ${ADESK_IMG}
-	@ ${INSTALL_DATA} ${IWRK}/yahoogroups.gif 	   ${ADESK_IMG}
-	@ ${INSTALL_DATA} ${DATA}/README.txt		   ${ADESK_DATA}
-	@ ${INSTALL_DATA} ${LIST}			   ${ADESK_LIST}
-	@ ${INSTALL_DATA} ${TMPL}/README.txt		   ${ADESK_TMPL}
-	@ ${INSTALL_DATA} ${DEFL}/add_a_channel.html	   ${ADESK_DEFL}
-	@ ${INSTALL_DATA} ${DEFL}/index.html		   ${ADESK_DEFL}
-	@ ${INSTALL_DATA} ${DEFL}/my_channels.html	   ${ADESK_DEFL}
-	@ ${INSTALL_DATA} ${DEFL}/my_settings.html	   ${ADESK_DEFL}
-	@ ${INSTALL_DATA} ${DEFL}/popup.html		   ${ADESK_DEFL}
-	@ ${INSTALL_DATA} ${DEFL}/tpl_footer.html	   ${ADESK_DEFL}
-	@ ${INSTALL_DATA} ${DEFL}/tpl_header.html	   ${ADESK_DEFL}
-	@ ${INSTALL_DATA} ${GUI}/linux_icon.png		   ${ADESK_GUI}
-	@ ${INSTALL_DATA} ${GUI}/linux_logo.png		   ${ADESK_GUI}
-	@ ${INSTALL_DATA} ${DIMG}/bkgrnd.gif   		   ${ADESK_DIMG}
-	@ ${INSTALL_DATA} ${DIMG}/delete.gif   		   ${ADESK_DIMG}
-	@ ${INSTALL_DATA} ${DIMG}/email.gif    		   ${ADESK_DIMG}
-	@ ${INSTALL_DATA} ${DIMG}/globe.gif    		   ${ADESK_DIMG}
-	@ ${INSTALL_DATA} ${DIMG}/logo.gif		   ${ADESK_DIMG}
-	@ ${INSTALL_DATA} ${DIMG}/xml.gif		   ${ADESK_DIMG}
-	@ ${INSTALL_DATA} ${DIMG}/xml_radio.gif		   ${ADESK_DIMG}
-
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500601
-IGNORE=		requires perl 5.6.x or later. Install lang/perl5 then try again
+## create site_perl
+# dirs
+	@${MKDIR} ${SITE_PERL:S|${LOCALBASE}|${PREFIX}|}/AmphetaDesk
+	@cd ${WRKSRC}/lib && \
+		${FIND} * -type d ! -empty -print0 | \
+		${XARGS} -0 -x -n 10 -I {} \
+		${MKDIR} ${SITE_PERL:S|${LOCALBASE}|${PREFIX}|}/AmphetaDesk/{}
+# files
+	@cd ${WRKSRC}/lib && \
+		${FIND} * -type f -name "*pm" -print0 | \
+		${XARGS} -0 -x -n 10 -I {} \
+		${INSTALL_DATA} {} ${SITE_PERL:S|${LOCALBASE}|${PREFIX}|}/AmphetaDesk/{}
+# script
+	@${INSTALL_DATA} ${WRKSRC}/AmphetaDesk.pl \
+		${PREFIX}/bin/AmphetaDesk-real
+	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh \
+		${PREFIX}/bin/AmphetaDesk
+## docs
+.ifndef(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for ext in html txt xml
+	@${INSTALL_DATA} ${WRKSRC}/docs/*.${ext} ${DOCSDIR}
+.endfor
+	@${MKDIR} ${DOCSDIR}/images
+.for ext in gif jpg
+	@${INSTALL_DATA} ${WRKSRC}/docs/images/*.${ext} \
+		${DOCSDIR}/images
+.endfor
 .endif
+## lists
+	@${MKDIR} ${DATADIR}/lists
+	@${INSTALL_DATA} ${WRKSRC}/data/lists/services-channels-recent.xml \
+		${DATADIR}/lists
+## templates
+# dirs
+	@cd ${WRKSRC} && \
+		${FIND} templates -type d ! -empty -print0 | \
+		${XARGS} -0 -x -n 10 -I {} \
+		${MKDIR} ${DATADIR}/{}
+# files
+.for ext in gif html ico png pict 
+	@cd ${WRKSRC} && \
+		${FIND} templates -type f -name "*.${ext}" -print0 | \
+		${XARGS} -0 -x -n 10 -I {} \
+		${INSTALL_DATA} {} ${DATADIR}/{}
+.endfor
+# rc.d
+	@${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${PREFIX}/etc/rc.d
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>