Thu Feb 2 09:47:19 2012 UTC ()
Use ${RM} -f to avoid failure if no files are found to be removed.


(hans)
diff -r1.49 -r1.50 pkgsrc/www/p5-Apache-Gallery/Makefile
cvs diff -r1.49 -r1.50 pkgsrc/www/p5-Apache-Gallery/Makefile (expand / switch to unified diff)

--- pkgsrc/www/p5-Apache-Gallery/Makefile 2011/11/01 06:02:47 1.49
+++ pkgsrc/www/p5-Apache-Gallery/Makefile 2012/02/02 09:47:19 1.50
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.49 2011/11/01 06:02:47 sbd Exp $ 1# $NetBSD: Makefile,v 1.50 2012/02/02 09:47:19 hans Exp $
2# 2#
3 3
4DISTNAME= Apache-Gallery-0.9.1 4DISTNAME= Apache-Gallery-0.9.1
5PKGNAME= p5-${DISTNAME} 5PKGNAME= p5-${DISTNAME}
6PKGREVISION= 15 6PKGREVISION= 15
7SVR4_PKGNAME= p5aga 7SVR4_PKGNAME= p5aga
8CATEGORIES= www graphics perl5 8CATEGORIES= www graphics perl5
9MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Apache/} 9MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Apache/}
10 10
11MAINTAINER= kim@tac.nyc.ny.us 11MAINTAINER= kim@tac.nyc.ny.us
12HOMEPAGE= http://apachegallery.dk/ 12HOMEPAGE= http://apachegallery.dk/
13COMMENT= Perl5/Apache module for handling image directories 13COMMENT= Perl5/Apache module for handling image directories
14LICENSE= artistic 14LICENSE= artistic
@@ -62,27 +62,27 @@ SUBST_STAGE.paths= post-patch @@ -62,27 +62,27 @@ SUBST_STAGE.paths= post-patch
62 62
63USE_TOOLS+= pax 63USE_TOOLS+= pax
64 64
65post-extract: 65post-extract:
66 ${CP} ${FILESDIR}/ag.conf ${WRKSRC} 66 ${CP} ${FILESDIR}/ag.conf ${WRKSRC}
67 67
68post-patch: 68post-patch:
69 @${MV} -f ${WRKSRC}/templates/default/gallery.css \ 69 @${MV} -f ${WRKSRC}/templates/default/gallery.css \
70 ${WRKSRC}/htdocs/gallery-default.css 70 ${WRKSRC}/htdocs/gallery-default.css
71 @${MV} -f ${WRKSRC}/templates/new/gallery.css \ 71 @${MV} -f ${WRKSRC}/templates/new/gallery.css \
72 ${WRKSRC}/htdocs/gallery-new.css 72 ${WRKSRC}/htdocs/gallery-new.css
73 73
74pre-configure: 74pre-configure:
75 ${FIND} ${WRKSRC} -name "*.orig" -type f | ${XARGS} ${RM} 75 ${FIND} ${WRKSRC} -name "*.orig" -type f | ${XARGS} ${RM} -f
76 76
77post-build: 77post-build:
78 @for j in default new; \ 78 @for j in default new; \
79 do \ 79 do \
80 cd ${WRKSRC}/templates/$$j && \ 80 cd ${WRKSRC}/templates/$$j && \
81 for i in *.tpl; \ 81 for i in *.tpl; \
82 do \ 82 do \
83 ${CP} -p $$i $$i.orig && \ 83 ${CP} -p $$i $$i.orig && \
84 ${SED} -e "s,/icons/,/${AG}/," \ 84 ${SED} -e "s,/icons/,/${AG}/," \
85 -e "s,/gallery.css,/${AG}/gallery-$$j.css," \ 85 -e "s,/gallery.css,/${AG}/gallery-$$j.css," \
86 $$i.orig > $$i; \ 86 $$i.orig > $$i; \
87 ${RM} -f $$i.orig; \ 87 ${RM} -f $$i.orig; \
88 done; \ 88 done; \