Skip site navigation (1)Skip section navigation (2) 
Date:      Sat, 19 Jul 2014 23:55:19 +0000 (UTC)
From:      John Marino <marino@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r362289 - head/databases/gnatsweb4
Message-ID:  <201407192355.s6JNtJqg057612@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: marino
Date: Sat Jul 19 23:55:19 2014
New Revision: 362289
URL: http://svnweb.freebsd.org/changeset/ports/362289
QAT: https://qat.redports.org/buildarchive/r362289/

Log:
  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.

Modified:
  head/databases/gnatsweb4/Makefile
  head/databases/gnatsweb4/pkg-plist

Modified: head/databases/gnatsweb4/Makefile
==============================================================================
--- head/databases/gnatsweb4/Makefile	Sat Jul 19 23:14:51 2014	(r362288)
+++ head/databases/gnatsweb4/Makefile	Sat Jul 19 23:55:19 2014	(r362289)
@@ -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>

Modified: head/databases/gnatsweb4/pkg-plist
==============================================================================
--- head/databases/gnatsweb4/pkg-plist	Sat Jul 19 23:14:51 2014	(r362288)
+++ head/databases/gnatsweb4/pkg-plist	Sat Jul 19 23:55:19 2014	(r362289)
@@ -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%%

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407192355.s6JNtJqg057612>