Date: Tue, 22 Apr 2014 06:57:09 GMT From: Olli Hauer <ohauer@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Cc: brix@FreeBSD.org Subject: ports/188875: [patch] www/p5-Apache-Gallery fix Makefile and pkg-plist Message-ID: <201404220657.s3M6v9u1013277@freefall.freebsd.org> Resent-Message-ID: <201404220700.s3M700uX013397@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 188875
>Category: ports
>Synopsis: [patch] www/p5-Apache-Gallery fix Makefile and pkg-plist
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Apr 22 07:00:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Olli Hauer
>Release:
>Organization:
>Environment:
>Description:
- cleanup Makefile
- do not mix pkg-plist and PLIST_(FILES|DIRS|DIRSTRY)
- MANx is wrong with staging -> correct PERL5_MAN3 in pkg-plist
- sort and fix pkg-plist
>How-To-Repeat:
>Fix:
--- www_p5-Apache-Gallery.diff begins here ---
Index: Makefile
===================================================================
--- Makefile (revision 351750)
+++ Makefile (working copy)
@@ -28,9 +28,6 @@
USE_PERL5= configure
USE_APACHE= 22+
-PLIST_DIRSTRY+= www/icons
-
-MAN3= Apache::Gallery.3
DOC_FILES= INSTALL LICENSE README TODO UPGRADE
SUB_FILES+= pkg-message
@@ -54,15 +51,7 @@
${STAGEDIR}/${DATADIR}/templates/default/
${INSTALL_DATA} ${WRKSRC}/templates/new/* \
${STAGEDIR}/${DATADIR}/templates/new/
-.if ${PORT_OPTIONS:MDOCS}
- @${MKDIR} ${STAGEDIR}/${DOCSDIR}/
-.for file in ${DOC_FILES}
- @${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}/${DOCSDIR}/
-.endfor
-.endif
+ @${MKDIR} ${STAGEDIR}/${DOCSDIR}
+ ${INSTALL_DATA} ${DOC_FILES:S|^|${WRKSRC}/|} ${STAGEDIR}/${DOCSDIR}
-.if !defined(BATCH)
- @${CAT} ${PKGMESSAGE}
-.endif
-
.include <bsd.port.post.mk>
Index: pkg-plist
===================================================================
--- pkg-plist (revision 351750)
+++ pkg-plist (working copy)
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Apache::Gallery.3.gz
%%SITE_PERL%%/Apache/Gallery.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Gallery/.packlist
%%PERL5_MAN3%%/Apache::Gallery.3.gz
@@ -18,11 +19,11 @@
%%DATADIR%%/templates/bright/nopictureinfo.tpl
%%DATADIR%%/templates/bright/orig.tpl
%%DATADIR%%/templates/bright/picture.tpl
-%%DATADIR%%/templates/bright/scale.tpl
%%DATADIR%%/templates/bright/pictureinfo.tpl
%%DATADIR%%/templates/bright/refresh.tpl
%%DATADIR%%/templates/bright/rss.tpl
%%DATADIR%%/templates/bright/rss_item.tpl
+%%DATADIR%%/templates/bright/scale.tpl
%%DATADIR%%/templates/bright/scaleactive.tpl
%%DATADIR%%/templates/bright/showpicture.tpl
%%DATADIR%%/templates/bright/slideshowisoff.tpl
@@ -43,11 +44,11 @@
%%DATADIR%%/templates/default/nopictureinfo.tpl
%%DATADIR%%/templates/default/orig.tpl
%%DATADIR%%/templates/default/picture.tpl
-%%DATADIR%%/templates/default/scale.tpl
%%DATADIR%%/templates/default/pictureinfo.tpl
%%DATADIR%%/templates/default/refresh.tpl
%%DATADIR%%/templates/default/rss.tpl
%%DATADIR%%/templates/default/rss_item.tpl
+%%DATADIR%%/templates/default/scale.tpl
%%DATADIR%%/templates/default/scaleactive.tpl
%%DATADIR%%/templates/default/showpicture.tpl
%%DATADIR%%/templates/default/slideshowisoff.tpl
@@ -68,15 +69,20 @@
%%DATADIR%%/templates/new/nopictureinfo.tpl
%%DATADIR%%/templates/new/orig.tpl
%%DATADIR%%/templates/new/picture.tpl
-%%DATADIR%%/templates/new/scale.tpl
%%DATADIR%%/templates/new/pictureinfo.tpl
%%DATADIR%%/templates/new/refresh.tpl
%%DATADIR%%/templates/new/rss.tpl
%%DATADIR%%/templates/new/rss_item.tpl
+%%DATADIR%%/templates/new/scale.tpl
%%DATADIR%%/templates/new/scaleactive.tpl
%%DATADIR%%/templates/new/showpicture.tpl
%%DATADIR%%/templates/new/slideshowisoff.tpl
%%DATADIR%%/templates/new/slideshowoff.tpl
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/UPGRADE
www/icons/gallery/agfolder.png
www/icons/gallery/application-doc.png
www/icons/gallery/application-pdf.png
@@ -91,18 +97,14 @@
www/icons/gallery/video-mpeg.png
www/icons/gallery/video-mpg.png
www/icons/gallery/video-wmv.png
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/UPGRADE
+@dirrm www/icons/gallery
+@dirrmtry www/icons
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%/templates/new
+@dirrm %%DATADIR%%/templates/default
+@dirrm %%DATADIR%%/templates/bright
+@dirrm %%DATADIR%%/templates
+@dirrm %%DATADIR%%
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Gallery
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
@dirrmtry %%SITE_PERL%%/Apache
-@dirrm %%DATADIR%%/templates/bright
-@dirrm %%DATADIR%%/templates/default
-@dirrm %%DATADIR%%/templates/new
-@dirrm %%DATADIR%%/templates
-@dirrm %%DATADIR%%
-@dirrm www/icons/gallery
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
--- www_p5-Apache-Gallery.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404220657.s3M6v9u1013277>