sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

databases/gnatsweb4: Unbreak after stage attempt (plist)

Browse source 
The main problem was that gnatsweb-site.pl was getting installed twice,
but there may have been other issues (e.g. missing %B in @exec).

In the process, merge mkdir commands into one, and used the .sample
scheme although @sample keyword can't be used here.

This passes redports now.
This commit is contained in:
John Marino 2014-07-19 23:55:19 +00:00
parent 8a24d51055
commit b3510459f7
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=362289
2 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
databases/gnatsweb4/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= gnatsweb PORTNAME= gnatsweb
PORTVERSION= 4.00 PORTVERSION= 4.00
PORTREVISION= 2 PORTREVISION= 3
CATEGORIES= databases devel www CATEGORIES= databases devel www
MASTER_SITES= GNU MASTER_SITES= GNU
@ -30,20 +30,19 @@ PORTEXAMPLESS= gnatsweb-site-example.pl
OPTIONS_DEFINE= DOCS EXAMPLES OPTIONS_DEFINE= DOCS EXAMPLES
do-install: do-install:
@${MKDIR} ${STAGEDIR}${ETCDIR} @${MKDIR} ${STAGEDIR}${ETCDIR} ${STAGEDIR}${CGI_DIR} \
${INSTALL_DATA} ${WRKSRC}/gnatsweb-site.pl ${STAGEDIR}${ETCDIR}/gnatsweb-site.pl.default ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${EXAMPLESDIR}
${INSTALL_DATA} ${WRKSRC}/gnatsweb-site.pl ${STAGEDIR}${ETCDIR}/gnatsweb-site.pl.sample ${INSTALL_DATA} ${WRKSRC}/gnatsweb-site.pl \
@${MKDIR} ${STAGEDIR}${CGI_DIR} ${STAGEDIR}${ETCDIR}/gnatsweb-site.pl.sample
${INSTALL_SCRIPT} ${WRKSRC}/gnatsweb.pl ${STAGEDIR}${CGI_DIR} ${INSTALL_SCRIPT} ${WRKSRC}/gnatsweb.pl ${STAGEDIR}${CGI_DIR}
${LN} -s ${ETCDIR}/gnatsweb-site.pl ${STAGEDIR}${CGI_DIR} ${LN} -s ${ETCDIR}/gnatsweb-site.pl ${STAGEDIR}${CGI_DIR}
${INSTALL_DATA} ${WRKSRC}/gnatsweb.html ${STAGEDIR}${CGI_DIR} ${INSTALL_DATA} ${WRKSRC}/gnatsweb.html ${STAGEDIR}${CGI_DIR}
@${MKDIR} ${STAGEDIR}${DOCSDIR}
for doc in ${PORTDOCS}; do \ for doc in ${PORTDOCS}; do \
${INSTALL_DATA} ${WRKSRC}/$${doc} ${STAGEDIR}${DOCSDIR}; \ ${INSTALL_DATA} ${WRKSRC}/$${doc} ${STAGEDIR}${DOCSDIR}; \
done done
@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
for example in ${EXAMPLEFILES}; do \ for example in ${EXAMPLEFILES}; do \
${INSTALL_DATA} ${WRKSRC}/$${example} ${STAGEDIR}${EXAMPLESDIR}; \ ${INSTALL_DATA} ${WRKSRC}/$${example} \
${STAGEDIR}${EXAMPLESDIR}; \
done done
.include <bsd.port.mk> .include <bsd.port.mk>

5
databases/gnatsweb4/pkg-plist
View file

@ -1,10 +1,9 @@
@unexec if cmp -s %%ETCDIR%%/gnatsweb-site.pl %%ETCDIR%%/gnatsweb-site.pl.default; then rm -f %%ETCDIR%%/gnatsweb-site.pl; fi @unexec if cmp -s %D/%%ETCDIR%%/gnatsweb-site.pl.sample %D/%%ETCDIR%%/gnatsweb-site.pl.sample; then rm -f %D/%%ETCDIR%%/gnatsweb-site.pl; fi
%%ETCDIR%%/gnatsweb-site.pl.default %%ETCDIR%%/gnatsweb-site.pl.sample
@exec [ -f %B/gnatsweb-site.pl ] || cp %B/%f %B/gnatsweb-site.pl @exec [ -f %B/gnatsweb-site.pl ] || cp %B/%f %B/gnatsweb-site.pl
%%CGI_DIR%%/gnatsweb.pl %%CGI_DIR%%/gnatsweb.pl
%%CGI_DIR%%/gnatsweb-site.pl %%CGI_DIR%%/gnatsweb-site.pl
%%CGI_DIR%%/gnatsweb.html %%CGI_DIR%%/gnatsweb.html
%%ETCDIR%%/gnatsweb-site.pl
@dirrmtry %%CGI_DIR%% @dirrmtry %%CGI_DIR%%
@dirrmtry %%ETCDIR%% @dirrmtry %%ETCDIR%%
@dirrm %%WWWDIR%% @dirrm %%WWWDIR%%