Drop the symlink patch that breaks UTF-8 support, and add patch for proper UTF-8 CTYPE, thanks to Timothy Redaelli for the help.

(Portage version: 2.1.1_pre3-r1)

4 files changed, 189 insertions, 1 deletions

diff --git a/sys-freebsd/freebsd-share/ChangeLog b/sys-freebsd/freebsd-share/ChangeLog
index b20c3f891905..54681140eccc 100644
--- a/sys-freebsd/freebsd-share/ChangeLog
+++ b/sys-freebsd/freebsd-share/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-freebsd/freebsd-share
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/ChangeLog,v 1.10 2006/05/09 12:04:33 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/ChangeLog,v 1.11 2006/07/18 21:13:32 flameeyes Exp $
+
+*freebsd-share-6.1-r1 (18 Jul 2006)
+
+  18 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/freebsd-share-6.1-utf8.patch, -freebsd-share-6.1.ebuild,
+  +freebsd-share-6.1-r1.ebuild:
+  Drop the symlink patch that breaks UTF-8 support, and add patch for proper
+  UTF-8 CTYPE, thanks to Timothy Redaelli for the help.
 
   09 May 2006; Diego Pettenò <flameeyes@gentoo.org>
   freebsd-share-6.1.ebuild:
diff --git a/sys-freebsd/freebsd-share/files/digest-freebsd-share-6.1-r1 b/sys-freebsd/freebsd-share/files/digest-freebsd-share-6.1-r1
new file mode 100644
index 000000000000..27102169636e
--- /dev/null
+++ b/sys-freebsd/freebsd-share/files/digest-freebsd-share-6.1-r1
@@ -0,0 +1,27 @@
+MD5 e8c5589329d476255f8a15f9f9bfebd1 freebsd-bin-6.1.tar.bz2 405680
+RMD160 33f2e5b49fce90dcaab652621af3b33e8e80b643 freebsd-bin-6.1.tar.bz2 405680
+SHA256 86d7a000827432c594f9d37b98a1f936f6168030cf033c6e621a37c670ef5271 freebsd-bin-6.1.tar.bz2 405680
+MD5 a04643beb2d94972200d6714688930cf freebsd-contrib-6.1.tar.bz2 36017365
+RMD160 225f6ade032533d08b98b79cb29b75da2a3c74fa freebsd-contrib-6.1.tar.bz2 36017365
+SHA256 41283b7f78597cf81f98477aef04eb9cce2b130b1a2f8b5c7d647549c973c054 freebsd-contrib-6.1.tar.bz2 36017365
+MD5 ac8defbdaaab754fee70ac27c02f2c0e freebsd-etc-6.1.tar.bz2 184045
+RMD160 b9a8bea64694c040c02b74f7633dc3cd77afa400 freebsd-etc-6.1.tar.bz2 184045
+SHA256 62b06b61e526c4a939503202aaca31cbce7a3de9daec03e67dc57119527eeff7 freebsd-etc-6.1.tar.bz2 184045
+MD5 986fe1e300d5d0d89180eb9559f87334 freebsd-gnu-6.1.tar.bz2 867244
+RMD160 5eeff2beb898984c40ae1d7c8adfdf41f2c0b8f8 freebsd-gnu-6.1.tar.bz2 867244
+SHA256 7bf79a2535539add15da6480830f771e5aea6594c24ffed2d196c7f0c700fdc1 freebsd-gnu-6.1.tar.bz2 867244
+MD5 f33af43501169d9167c71c3a48a033c2 freebsd-lib-6.1.tar.bz2 2613584
+RMD160 f71aad95ef2bac094bdab9e317a99fb866fba042 freebsd-lib-6.1.tar.bz2 2613584
+SHA256 6ecb49695dc135e64cea949cb7e9b9998b15cb962797cdafc735a7e244744c37 freebsd-lib-6.1.tar.bz2 2613584
+MD5 33a8f60e595bc82c6abb7e47de1b9fa8 freebsd-sbin-6.1.tar.bz2 1156163
+RMD160 167a4545da086f52b9a8fd52e48f9ec6cfdd3150 freebsd-sbin-6.1.tar.bz2 1156163
+SHA256 fb15602238f98f6dd2b9d56bc9ece09c922b0c49599aea87620ba70c853f95d6 freebsd-sbin-6.1.tar.bz2 1156163
+MD5 87e50c5ad62ac4c2e062c5a05b6709f3 freebsd-share-6.1.tar.bz2 3745745
+RMD160 02c0369d9384d83cc22f8e41d7c8f642b9b91b3a freebsd-share-6.1.tar.bz2 3745745
+SHA256 e784b691a3df97ac8e2c0399ae48cf13b545cddfe513d3ec47c1656fe4e41f77 freebsd-share-6.1.tar.bz2 3745745
+MD5 f9c5fe01da2eba4696619c63eb4cad8c freebsd-ubin-6.1.tar.bz2 1763218
+RMD160 5da58c546cebf30a6b661841dbcb5b53626a4a1e freebsd-ubin-6.1.tar.bz2 1763218
+SHA256 13429ed3cc8a14a4efda69b7d82004bf993b5a14591a6129a857d627221aeef6 freebsd-ubin-6.1.tar.bz2 1763218
+MD5 ca61245fd3ec21d31ab9e41cd1ad35b7 freebsd-usbin-6.1.tar.bz2 2664570
+RMD160 98a87538790a814d0afd35bb0f848bcff574c72d freebsd-usbin-6.1.tar.bz2 2664570
+SHA256 70b4a494a72d130d641500bfa857bdf98c9a4a040da2699475902523ba5c374e freebsd-usbin-6.1.tar.bz2 2664570
diff --git a/sys-freebsd/freebsd-share/files/freebsd-share-6.1-utf8.patch b/sys-freebsd/freebsd-share/files/freebsd-share-6.1-utf8.patch
new file mode 100644
index 000000000000..e7423a24aca3
--- /dev/null
+++ b/sys-freebsd/freebsd-share/files/freebsd-share-6.1-utf8.patch
@@ -0,0 +1,81 @@
+--- UTF-8.src.orig	Sat Mar 27 03:14:14 2004
++++ UTF-8.src	Mon Jun 26 23:15:34 2006
+@@ -487,9 +487,9 @@
+  * U+0300 - U+036F : Combining Diacritical Marks
+  */
+ 
+-GRAPH     0x0300 - 0x034f  0x0360 - 0x036f
+-PRINT     0x0300 - 0x034f  0x0360 - 0x036f
+-SWIDTH1   0x0300 - 0x034f  0x0360 - 0x036f
++GRAPH     0x0300 - 0x036f
++PRINT     0x0300 - 0x036f
++SWIDTH0   0x0300 - 0x036f
+ 
+ MAPUPPER  < 0x0345 0x0399 >
+ 
+@@ -593,7 +593,8 @@
+ UPPER     0x04e2  0x04e4  0x04e6  0x04e8  0x04ea  0x04ec  0x04ee
+ UPPER     0x04f0  0x04f2  0x04f4  0x04f8
+ PRINT     0x0400 - 0x0486  0x0488 - 0x04ce  0x04d0 - 0x04f5  0x04f8  0x04f9
+-SWIDTH1   0x0400 - 0x0486  0x0488 - 0x04ce  0x04d0 - 0x04f5  0x04f8  0x04f9
++SWIDTH1   0x0400 - 0x0482  0x048a - 0x04ce  0x04d0 - 0x04f5  0x04f8  0x04f9
++SWIDTH0   0x0483 - 0x0486  0x0488 - 0x0489
+ 
+ MAPUPPER  < 0x0430 - 0x044f : 0x0410 >
+ MAPUPPER  < 0x0450 - 0x045f : 0x0400 >
+@@ -1016,7 +1017,8 @@
+ GRAPH     0x0e01 - 0x0e3a  0x0e3f - 0x0e5b
+ PUNCT     0x0e3f  0x0e4f  0x0e5a  0x0e5b
+ PRINT     0x0e01 - 0x0e3a  0x0e3f - 0x0e5b
+-SWIDTH1   0x0e01 - 0x0e3a  0x0e3f - 0x0e5b
++SWIDTH0   0x0e31  0x0e34 - 0x0e3a  0x0e47 - 0x0e4e
++SWIDTH1   0x0e01 - 0x0e30  0x0e32 - 0x0e33  0x0e3f - 0x0e46  0x0e4f - 0x0e5b
+ 
+ 
+ /*
+@@ -1647,9 +1649,9 @@
+  * U+20D0 - U+20FF : Combining Diacritical Marks for Symbols
+  */
+ 
+-GRAPH     0x20d0 - 0x20ea
+-PRINT     0x20d0 - 0x20ea
+-SWIDTH1   0x20d0 - 0x20ea
++GRAPH     0x20d0 - 0x20ff
++PRINT     0x20d0 - 0x20ff
++SWIDTH0   0x20d0 - 0x20ff
+ 
+ 
+ /*
+@@ -1927,7 +1929,8 @@
+ PUNCT     0x309b  0x309c
+ PRINT     0x3041 - 0x3096  0x3099 - 0x309f
+ PHONOGRAM 0x3041 - 0x3096  0x309f
+-SWIDTH2   0x3041 - 0x3096  0x3099 - 0x309f
++SWIDTH2   0x3041 - 0x3096  0x309b - 0x309f
++SWIDTH0   0x3099 - 0x309a
+ 
+ 
+ /*
+@@ -2149,9 +2152,9 @@
+  * U+FE20 - U+FE2F : Combining Half Marks
+  */
+ 
+-GRAPH     0xfe20 - 0xfe23
+-PRINT     0xfe20 - 0xfe23
+-SWIDTH1   0xfe20 - 0xfe23
++GRAPH     0xfe20 - 0xfe2f
++PRINT     0xfe20 - 0xfe2f
++SWIDTH0   0xfe20 - 0xfe2f
+ 
+ 
+ /*
+@@ -2272,7 +2275,8 @@
+ PUNCT     0x1d100 - 0x1d126  0x1d12a - 0x1d164  0x1d16a - 0x1d16c
+ PUNCT     0x1d183  0x1d184  0x1d18c - 0x1d1a9  0x1d1ae - 0x1d1dd
+ PRINT     0x1d100 - 0x1d126  0x1d12a - 0x1d172  0x1d17b - 0x1d1dd
+-SWIDTH1   0x1d100 - 0x1d126  0x1d12a - 0x1d172  0x1d17b - 0x1d1dd
++SWIDTH1   0x1d100 - 0x1d126  0x1d12a - 0x1d164  0x1d16a - 0x1d172  0x1d183  0x1d184  0x1d18c - 0x1d1a9  0x1d1ae - 0x1d1dd
++SWIDTH0   0x1d165 - 0x1d169  0x1d17b - 0x1d182  0x1d185 - 0x1d18b  0x1d1aa - 0x1d1ad
+ 
+ 
+ /*
diff --git a/sys-freebsd/freebsd-share/freebsd-share-6.1-r1.ebuild b/sys-freebsd/freebsd-share/freebsd-share-6.1-r1.ebuild
new file mode 100644
index 000000000000..f9ccce6a09c7
--- /dev/null
+++ b/sys-freebsd/freebsd-share/freebsd-share-6.1-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/freebsd-share-6.1-r1.ebuild,v 1.1 2006/07/18 21:13:32 flameeyes Exp $
+
+inherit bsdmk freebsd
+
+DESCRIPTION="FreeBSD shared tools/files"
+SLOT="0"
+KEYWORDS="~x86-fbsd"
+
+IUSE="doc isdn"
+
+SRC_URI="mirror://gentoo/${SHARE}.tar.bz2
+	mirror://gentoo/${CONTRIB}.tar.bz2
+	mirror://gentoo/${GNU}.tar.bz2
+	mirror://gentoo/${UBIN}.tar.bz2
+	mirror://gentoo/${USBIN}.tar.bz2
+	mirror://gentoo/${SBIN}.tar.bz2
+	mirror://gentoo/${BIN}.tar.bz2
+	mirror://gentoo/${LIB}.tar.bz2
+	mirror://gentoo/${ETC}.tar.bz2"
+
+DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*"
+RDEPEND=""
+
+RESTRICT="nostrip"
+
+S="${WORKDIR}/share"
+
+pkg_setup() {
+	use isdn || mymakeopts="${mymakeopts} NO_I4B= "
+	use doc || mymakeopts="${mymakeopts} NO_SHAREDOCS= "
+
+	mymakeopts="${mymakeopts} NO_SENDMAIL= "
+}
+
+REMOVE_SUBDIRS="mk termcap zoneinfo tabset"
+
+PATCHES="${FILESDIR}/${PN}-5.3-doc-locations.patch
+	${FILESDIR}/${PN}-5.4-gentoo-skel.patch"
+
+src_unpack() {
+	freebsd_src_unpack
+
+	# Remove make.conf manpage as it describes bsdmk's make.conf.
+	sed -i -e 's:make.conf.5::' "${S}/man/man5/Makefile"
+	# Don't install the arch-specific directories in subdirectories
+	sed -i -e '/MANSUBDIR/d' "${S}"/man/man4/man4.{alpha,i386,sparc64}/Makefile
+
+	cd "${S}/mklocale"
+	# See http://opal.com/freebsd/unicode.html
+	epatch "${FILESDIR}/${P}-utf8.patch"
+
+	# Remove them so that they can't be included by error
+	rm -rf "${S}"/mk/*.mk
+
+	# Change the order, colldef has to go after mklocale or it creates symlinks
+	# with the names of directories
+	sed -i -e 's:colldef::' -e 's:mklocale:mklocale colldef:' "${S}/Makefile"
+}
+
+src_compile() {
+	export ESED="/usr/bin/sed"
+
+	# This is a groff problem and not a -shared problem.
+	export GROFF_TMAC_PATH="/usr/share/tmac/:/usr/share/groff/1.19.1/tmac/"
+	mkmake || die "emake failed"
+}
+
+src_install() {
+	mkmake DESTDIR="${D}" DOCDIR=/usr/share/doc/${PF} install || die "Install failed"
+}