Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 7 Jun 2019 08:04:18 +0000 (UTC)
From:      Stefan Esser <se@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r503623 - in head/math/gh-bc: . files
Message-ID:  <201906070804.x5784IRM074042@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: se
Date: Fri Jun  7 08:04:17 2019
New Revision: 503623
URL: https://svnweb.freebsd.org/changeset/ports/503623

Log:
  Another attempt to fix build breakage that does only affect the package
  builder and does not occur on my system.
  
  Approved by:	antoine (implicit)

Added:
  head/math/gh-bc/files/
  head/math/gh-bc/files/patch-locale__install.sh   (contents, props changed)
Modified:
  head/math/gh-bc/Makefile
  head/math/gh-bc/pkg-plist

Modified: head/math/gh-bc/Makefile
==============================================================================
--- head/math/gh-bc/Makefile	Fri Jun  7 07:53:48 2019	(r503622)
+++ head/math/gh-bc/Makefile	Fri Jun  7 08:04:17 2019	(r503623)
@@ -2,7 +2,7 @@
 
 PORTNAME=	bc
 PORTVERSION=	2.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 PKGNAMEPREFIX=	gh-
 
@@ -29,9 +29,7 @@ do-install:
 		${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.ISO8859-1/bc.cat ${STAGEDIR}${PREFIX}/share/nls/C/
+		${MV} ${STAGEDIR}${PREFIX}/share/nls/en_US/bc.cat ${STAGEDIR}${PREFIX}/share/nls/C/
 
 do-test:
 		${MAKE} -C ${WRKSRC} test

Added: head/math/gh-bc/files/patch-locale__install.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/gh-bc/files/patch-locale__install.sh	Fri Jun  7 08:04:17 2019	(r503623)
@@ -0,0 +1,20 @@
+--- locale_install.sh.orig	2019-05-29 01:32:06 UTC
++++ locale_install.sh
+@@ -114,6 +114,7 @@ for file in $locales_dir/*.msg; do
+ 		continue
+ 	fi
+ 
++	echo gencatfile "$loc" "$file"
+ 	gencatfile "$loc" "$file"
+ 
+ done
+@@ -143,7 +144,8 @@ for file in $locales_dir/*.msg; do
+ 			gencatfile "$destdir/$linksrc" "$linkdir/$link"
+ 		fi
+ 
+-		ln -s "$linksrc" "$loc"
++		echo ln "$linksrc" "$loc"
++		ln "$linksrc" "$loc"
+ 	fi
+ 
+ done

Modified: head/math/gh-bc/pkg-plist
==============================================================================
--- head/math/gh-bc/pkg-plist	Fri Jun  7 07:53:48 2019	(r503622)
+++ head/math/gh-bc/pkg-plist	Fri Jun  7 08:04:17 2019	(r503623)
@@ -47,4 +47,3 @@ share/nls/fr_CH.UTF-8/bc.cat
 share/nls/fr_FR.ISO8859-1/bc.cat
 share/nls/fr_FR.ISO8859-15/bc.cat
 share/nls/fr_FR.UTF-8/bc.cat
-



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