svn commit: r400131 - in head/sysutils/uniutils: . files

[Thierry Thomas]

Author: thierry
Date: Sat Oct 24 16:48:48 2015
New Revision: 400131
URL: https://svnweb.freebsd.org/changeset/ports/400131

Log:
  - Fix hard-coded endian assumption;
  
  - Change /usr/local replacement from LOCALBASE -> PREFIX.
  
  PR:		ports/203706
  Submitted by:	John Hein <z7dr6ut7gs (at) snkmail.com>

Modified:
  head/sysutils/uniutils/Makefile
  head/sysutils/uniutils/files/patch-utf8lookup

Modified: head/sysutils/uniutils/Makefile
==============================================================================
--- head/sysutils/uniutils/Makefile	Sat Oct 24 16:28:40 2015	(r400130)
+++ head/sysutils/uniutils/Makefile	Sat Oct 24 16:48:48 2015	(r400131)
@@ -3,7 +3,7 @@
 
 PORTNAME=	uniutils
 PORTVERSION=	2.27
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils textproc
 MASTER_SITES=	http://billposer.org/Software/Downloads/
 
@@ -26,7 +26,7 @@ PORTDOCS=	AUTHORS NEWS README
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 pre-configure:
-	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/Makefile.in
+	${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' ${WRKSRC}/Makefile.in
 	${REINPLACE_CMD} -e 's|TestData|${EXAMPLESDIR}|' ${WRKSRC}/README
 
 regression-test:

Modified: head/sysutils/uniutils/files/patch-utf8lookup
==============================================================================
--- head/sysutils/uniutils/files/patch-utf8lookup	Sat Oct 24 16:28:40 2015	(r400130)
+++ head/sysutils/uniutils/files/patch-utf8lookup	Sat Oct 24 16:48:48 2015	(r400131)
@@ -1,11 +1,14 @@
---- utf8lookup.orig	Sun Jan 29 21:43:23 2006
-+++ utf8lookup	Tue Jan 31 00:11:48 2006
-@@ -10,7 +10,7 @@
+--- utf8lookup.orig	2007-06-30 05:31:37 UTC
++++ utf8lookup
+@@ -8,9 +8,10 @@
+ #       UTF-32   name
+ #	000543   ARMENIAN CAPITAL LETTER CHEH
  #
++[ $(( $(printf '\1' | od -dAn) )) -eq 1 ] && end=le || end=be
  echo 0x$1 |		 # feed command-line argument to ascii2binary's stdin
  ascii2binary -t ui |	 # convert text to unsigned integer
 -iconv -f utf32 -t utf8 | # convert utf-32 to utf-8 encoding
-+iconv -f ucs-4le -t utf-8 | # convert utf-32 to utf-8 encoding
++iconv -f ucs-4$end -t utf-8 | # convert utf-32 to utf-8 encoding
  uniname -b -c -e -g      # feed to uniname, suppressing byte and character offsets,
  			 # UTF-8 encoding, and glyph