diff options
| author | John Marino <marino@FreeBSD.org> | 2014-07-19 23:55:19 +0000 |
|---|---|---|
| committer | John Marino <marino@FreeBSD.org> | 2014-07-19 23:55:19 +0000 |
| commit | b3510459f755a0f8abab7a32bb52232d5a514b51 (patch) | |
| tree | fb564075c62c95d07613a873c0c29ecd057a0b52 /databases/gnatsweb4 | |
| parent | 8a24d5105524451a42c3b76a8019c77c07f08930 (diff) | |
| download | ports-b3510459f755a0f8abab7a32bb52232d5a514b51.tar.gz ports-b3510459f755a0f8abab7a32bb52232d5a514b51.zip | |
databases/gnatsweb4: Unbreak after stage attempt (plist)
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.
Notes
Notes:
svn path=/head/; revision=362289
Diffstat (limited to 'databases/gnatsweb4')
| -rw-r--r-- | databases/gnatsweb4/Makefile | 15 | ||||
| -rw-r--r-- | databases/gnatsweb4/pkg-plist | 5 |
2 files changed, 9 insertions, 11 deletions
diff --git a/databases/gnatsweb4/Makefile b/databases/gnatsweb4/Makefile index f3d3a064025a..626674a3e418 100644 --- a/databases/gnatsweb4/Makefile +++ b/databases/gnatsweb4/Makefile @@ -3,7 +3,7 @@ PORTNAME= gnatsweb PORTVERSION= 4.00 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= databases devel www MASTER_SITES= GNU @@ -30,20 +30,19 @@ PORTEXAMPLESS= gnatsweb-site-example.pl OPTIONS_DEFINE= DOCS EXAMPLES do-install: - @${MKDIR} ${STAGEDIR}${ETCDIR} - ${INSTALL_DATA} ${WRKSRC}/gnatsweb-site.pl ${STAGEDIR}${ETCDIR}/gnatsweb-site.pl.default - ${INSTALL_DATA} ${WRKSRC}/gnatsweb-site.pl ${STAGEDIR}${ETCDIR}/gnatsweb-site.pl.sample - @${MKDIR} ${STAGEDIR}${CGI_DIR} + @${MKDIR} ${STAGEDIR}${ETCDIR} ${STAGEDIR}${CGI_DIR} \ + ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/gnatsweb-site.pl \ + ${STAGEDIR}${ETCDIR}/gnatsweb-site.pl.sample ${INSTALL_SCRIPT} ${WRKSRC}/gnatsweb.pl ${STAGEDIR}${CGI_DIR} ${LN} -s ${ETCDIR}/gnatsweb-site.pl ${STAGEDIR}${CGI_DIR} ${INSTALL_DATA} ${WRKSRC}/gnatsweb.html ${STAGEDIR}${CGI_DIR} - @${MKDIR} ${STAGEDIR}${DOCSDIR} for doc in ${PORTDOCS}; do \ ${INSTALL_DATA} ${WRKSRC}/$${doc} ${STAGEDIR}${DOCSDIR}; \ done - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} for example in ${EXAMPLEFILES}; do \ - ${INSTALL_DATA} ${WRKSRC}/$${example} ${STAGEDIR}${EXAMPLESDIR}; \ + ${INSTALL_DATA} ${WRKSRC}/$${example} \ + ${STAGEDIR}${EXAMPLESDIR}; \ done .include <bsd.port.mk> diff --git a/databases/gnatsweb4/pkg-plist b/databases/gnatsweb4/pkg-plist index d38366c9e7b8..d7f2ba61e271 100644 --- a/databases/gnatsweb4/pkg-plist +++ b/databases/gnatsweb4/pkg-plist @@ -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 -%%ETCDIR%%/gnatsweb-site.pl.default +@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.sample @exec [ -f %B/gnatsweb-site.pl ] || cp %B/%f %B/gnatsweb-site.pl %%CGI_DIR%%/gnatsweb.pl %%CGI_DIR%%/gnatsweb-site.pl %%CGI_DIR%%/gnatsweb.html -%%ETCDIR%%/gnatsweb-site.pl @dirrmtry %%CGI_DIR%% @dirrmtry %%ETCDIR%% @dirrm %%WWWDIR%% |