From owner-svn-ports-all@FreeBSD.ORG Sat May 31 09:54:19 2014 Return-Path: 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 974DF7FA; Sat, 31 May 2014 09:54:19 +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 77E2629A6; Sat, 31 May 2014 09:54:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4V9sJle023721; Sat, 31 May 2014 09:54:19 GMT (envelope-from ohauer@svn.freebsd.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4V9sJ0M023719; Sat, 31 May 2014 09:54:19 GMT (envelope-from ohauer@svn.freebsd.org) Message-Id: <201405310954.s4V9sJ0M023719@svn.freebsd.org> From: Olli Hauer Date: Sat, 31 May 2014 09:54:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r355949 - head/www/p5-Apache-Gallery 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 31 May 2014 09:54:19 -0000 Author: ohauer Date: Sat May 31 09:54:18 2014 New Revision: 355949 URL: http://svnweb.freebsd.org/changeset/ports/355949 QAT: https://qat.redports.org/buildarchive/r355949/ Log: - cleanup Makefile - do not mix pkg-plist and PLIST_(FILES|DIRS|DIRSTRY) - MANx is wrong with staging -> correct PERL5_MAN3 in pkg-plist PR: ports/188875 Submitted by: ohauer Approved by: maintainer timeout (3 weeks) Modified: head/www/p5-Apache-Gallery/Makefile head/www/p5-Apache-Gallery/pkg-plist Modified: head/www/p5-Apache-Gallery/Makefile ============================================================================== --- head/www/p5-Apache-Gallery/Makefile Sat May 31 09:46:08 2014 (r355948) +++ head/www/p5-Apache-Gallery/Makefile Sat May 31 09:54:18 2014 (r355949) @@ -28,9 +28,6 @@ USES= perl5 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 @@ post-install: ${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 - -.if !defined(BATCH) - @${CAT} ${PKGMESSAGE} -.endif + @${MKDIR} ${STAGEDIR}/${DOCSDIR} + ${INSTALL_DATA} ${DOC_FILES:S|^|${WRKSRC}/|} ${STAGEDIR}/${DOCSDIR} .include Modified: head/www/p5-Apache-Gallery/pkg-plist ============================================================================== --- head/www/p5-Apache-Gallery/pkg-plist Sat May 31 09:46:08 2014 (r355948) +++ head/www/p5-Apache-Gallery/pkg-plist Sat May 31 09:54:18 2014 (r355949) @@ -1,6 +1,6 @@ +%%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 %%DATADIR%%/templates/bright/README %%DATADIR%%/templates/bright/dircomment.tpl %%DATADIR%%/templates/bright/directory.tpl @@ -18,11 +18,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 +43,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 +68,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 +96,14 @@ www/icons/gallery/video-mov.png 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 %%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 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 www/icons/gallery -%%PORTDOCS%%@dirrm %%DOCSDIR%% +@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Gallery +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache +@dirrmtry %%SITE_PERL%%/Apache