Index: head/textproc/UCD/Makefile
===================================================================
--- head/textproc/UCD/Makefile	(revision 442379)
+++ head/textproc/UCD/Makefile	(revision 442380)
@@ -1,49 +1,51 @@
 # Created by: Thierry Thomas <thierry@pompo.net>
 # $FreeBSD$
 
 PORTNAME=	UCD
 PORTVERSION=	9.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.unicode.org/Public/zipped/${PORTVERSION}/:src\
 		ftp://www.unicode.org/Public/zipped/${PORTVERSION}/:src	\
 		http://www.unicode.org/:lic
 DISTFILES=	${PORTNAME}.zip:src	\
 		copyright.html:lic
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 EXTRACT_ONLY=
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Unicode Character Database
 
 LICENSE=	Unicode_License_Agreement
 LICENSE_NAME=	Unicode License Agreement
 LICENSE_FILE=	${_DISTDIR}/copyright.html
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 OPTIONS_DEFINE=	HAN
 OPTIONS_DEFAULT=HAN
 OPTIONS_SUB=	yes
 HAN_DESC=	Unified Han database of Hanzi/Kanji/Hanja Chinese characters
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MHAN}
 DISTFILES+=	Unihan.zip:src
 .endif
 
 DATADIR=	${PREFIX}/share/unicode/ucd
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	(cd ${STAGEDIR}${DATADIR} &&	\
 	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${PORTNAME}.zip ${EXTRACT_AFTER_ARGS})
 .if ${PORT_OPTIONS:MHAN}
 	(cd ${STAGEDIR}${DATADIR} &&	\
 	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/Unihan.zip ${EXTRACT_AFTER_ARGS})
+	# Gucharmap also needs this zipfile
+	${INSTALL_DATA} ${_DISTDIR}/Unihan.zip ${STAGEDIR}${DATADIR}
 .endif
 
 .include <bsd.port.mk>
Index: head/textproc/UCD/pkg-plist
===================================================================
--- head/textproc/UCD/pkg-plist	(revision 442379)
+++ head/textproc/UCD/pkg-plist	(revision 442380)
@@ -1,70 +1,71 @@
 %%DATADIR%%/ArabicShaping.txt
 %%DATADIR%%/BidiBrackets.txt
 %%DATADIR%%/BidiCharacterTest.txt
 %%DATADIR%%/BidiMirroring.txt
 %%DATADIR%%/BidiTest.txt
 %%DATADIR%%/Blocks.txt
 %%DATADIR%%/CJKRadicals.txt
 %%DATADIR%%/CaseFolding.txt
 %%DATADIR%%/CompositionExclusions.txt
 %%DATADIR%%/DerivedAge.txt
 %%DATADIR%%/DerivedCoreProperties.txt
 %%DATADIR%%/DerivedNormalizationProps.txt
 %%DATADIR%%/EastAsianWidth.txt
 %%DATADIR%%/EmojiSources.txt
 %%DATADIR%%/HangulSyllableType.txt
 %%DATADIR%%/Index.txt
 %%DATADIR%%/IndicPositionalCategory.txt
 %%DATADIR%%/IndicSyllabicCategory.txt
 %%DATADIR%%/Jamo.txt
 %%DATADIR%%/LineBreak.txt
 %%DATADIR%%/NameAliases.txt
 %%DATADIR%%/NamedSequences.txt
 %%DATADIR%%/NamedSequencesProv.txt
 %%DATADIR%%/NamesList.html
 %%DATADIR%%/NamesList.txt
 %%DATADIR%%/NormalizationCorrections.txt
 %%DATADIR%%/NormalizationTest.txt
 %%DATADIR%%/PropList.txt
 %%DATADIR%%/PropertyAliases.txt
 %%DATADIR%%/PropertyValueAliases.txt
 %%DATADIR%%/ReadMe.txt
 %%DATADIR%%/ScriptExtensions.txt
 %%DATADIR%%/Scripts.txt
 %%DATADIR%%/SpecialCasing.txt
 %%DATADIR%%/StandardizedVariants.html
 %%DATADIR%%/StandardizedVariants.txt
 %%DATADIR%%/TangutSources.txt
 %%DATADIR%%/USourceData.txt
 %%DATADIR%%/USourceGlyphs.pdf
 %%DATADIR%%/UnicodeData.txt
 %%HAN%%%%DATADIR%%/Unihan_DictionaryIndices.txt
 %%HAN%%%%DATADIR%%/Unihan_DictionaryLikeData.txt
 %%HAN%%%%DATADIR%%/Unihan_IRGSources.txt
 %%HAN%%%%DATADIR%%/Unihan_NumericValues.txt
 %%HAN%%%%DATADIR%%/Unihan_OtherMappings.txt
 %%HAN%%%%DATADIR%%/Unihan_RadicalStrokeCounts.txt
 %%HAN%%%%DATADIR%%/Unihan_Readings.txt
 %%HAN%%%%DATADIR%%/Unihan_Variants.txt
+%%HAN%%%%DATADIR%%/Unihan.zip
 %%DATADIR%%/auxiliary/GraphemeBreakProperty.txt
 %%DATADIR%%/auxiliary/GraphemeBreakTest.html
 %%DATADIR%%/auxiliary/GraphemeBreakTest.txt
 %%DATADIR%%/auxiliary/LineBreakTest.html
 %%DATADIR%%/auxiliary/LineBreakTest.txt
 %%DATADIR%%/auxiliary/SentenceBreakProperty.txt
 %%DATADIR%%/auxiliary/SentenceBreakTest.html
 %%DATADIR%%/auxiliary/SentenceBreakTest.txt
 %%DATADIR%%/auxiliary/WordBreakProperty.txt
 %%DATADIR%%/auxiliary/WordBreakTest.html
 %%DATADIR%%/auxiliary/WordBreakTest.txt
 %%DATADIR%%/extracted/DerivedBidiClass.txt
 %%DATADIR%%/extracted/DerivedBinaryProperties.txt
 %%DATADIR%%/extracted/DerivedCombiningClass.txt
 %%DATADIR%%/extracted/DerivedDecompositionType.txt
 %%DATADIR%%/extracted/DerivedEastAsianWidth.txt
 %%DATADIR%%/extracted/DerivedGeneralCategory.txt
 %%DATADIR%%/extracted/DerivedJoiningGroup.txt
 %%DATADIR%%/extracted/DerivedJoiningType.txt
 %%DATADIR%%/extracted/DerivedLineBreak.txt
 %%DATADIR%%/extracted/DerivedNumericType.txt
 %%DATADIR%%/extracted/DerivedNumericValues.txt