svn commit: r503492 - head/math/gh-bc

[Stefan Esser]

Author: se
Date: Tue Jun  4 21:25:41 2019
New Revision: 503492
URL: https://svnweb.freebsd.org/changeset/ports/503492

Log:
  Try to fix a package build error that I cannot reproduce on my system.
  
  Even though "poudriere testport" completed without error, I have received
  a failure message from the build cluster. Since I cannot reproduce the
  problem, I can only guess that it is caused by a symbolic link in the
  share/nls directory that connects nls/C to nls/en_US.US-ASCII.
  
  I had problems with the nls/C directory disappearing due to that link
  before (it is deleted as empty when the last catalog file is deleted on
  package deinstallation, but then missing when a new file is installed
  into en_US.US-ASCII, which is just a symbolic link to C which does not
  exist at that time anymore). I think this is a bug in "pkg" and have
  opened a PR.
  
  It is possible that the port will still fail to build in the cluster,
  but without access to the work directory (or rather the stage directory)
  of the build host I can only guess what's exactly going on.
  
  IMHO there should not be any magic conenction between nls/en_US.US-ASCII
  and nls/C, since this breaks assumptions made in pkg and in the qa check
  performed by poudriere.
  
  Approved by:	antoine (implicit)

Modified:
  head/math/gh-bc/Makefile

Modified: head/math/gh-bc/Makefile
==============================================================================
--- head/math/gh-bc/Makefile	Tue Jun  4 21:24:52 2019	(r503491)
+++ head/math/gh-bc/Makefile	Tue Jun  4 21:25:41 2019	(r503492)
@@ -2,6 +2,7 @@
 
 PORTNAME=	bc
 PORTVERSION=	2.0.2
+PORTREVISION=	1
 CATEGORIES=	math
 PKGNAMEPREFIX=	gh-
 
@@ -26,10 +27,11 @@ do-install:
 		${LN} ${STAGEDIR}${PREFIX}/bin/bc ${STAGEDIR}${PREFIX}/bin/dc
 		${INSTALL_MAN} ${WRKSRC}/manuals/bc.1 ${STAGEDIR}${MANPREFIX}/man/man1
 		${INSTALL_MAN} ${WRKSRC}/manuals/dc.1 ${STAGEDIR}${MANPREFIX}/man/man1
+		${MKDIR} ${STAGEDIR}${PREFIX}/share/nls/C
 		${WRKSRC}/locale_install.sh ${STAGEDIR}${PREFIX}/share/nls/%L/%N.cat ${PORTNAME}
 		${RM} ${STAGEDIR}${PREFIX}/share/nls/en_US/bc.cat
 		${RMDIR} ${STAGEDIR}${PREFIX}/share/nls/en_US
-		${LN} ${STAGEDIR}${PREFIX}/share/nls/en_US.US-ASCII/bc.cat ${STAGEDIR}${PREFIX}/share/nls/C/
+		${LN} ${STAGEDIR}${PREFIX}/share/nls/en_US.ISO8859-1/bc.cat ${STAGEDIR}${PREFIX}/share/nls/C/
 
 do-test:
 		${MAKE} -C ${WRKSRC} test