From 8faf7a25abb2a3ae5d32207ef3a7489fb6aef934 Mon Sep 17 00:00:00 2001 From: Koop Mast Date: Fri, 2 Jun 2017 19:56:07 +0000 Subject: [PATCH] Now that textproc/UCD was updated by thierry@ with the required files for gucharmap remove the duplicate misc/unicode-ucd port and build gucharmap against textproc/UCD. --- MOVED | 1 + deskutils/gucharmap/Makefile | 4 +- misc/Makefile | 1 - misc/unicode-ucd/Makefile | 30 --------------- misc/unicode-ucd/distinfo | 5 --- misc/unicode-ucd/pkg-descr | 9 ----- misc/unicode-ucd/pkg-plist | 71 ------------------------------------ 7 files changed, 3 insertions(+), 118 deletions(-) delete mode 100644 misc/unicode-ucd/Makefile delete mode 100644 misc/unicode-ucd/distinfo delete mode 100644 misc/unicode-ucd/pkg-descr delete mode 100644 misc/unicode-ucd/pkg-plist diff --git a/MOVED b/MOVED index e43d540d3e96..6698f27ef329 100644 --- a/MOVED +++ b/MOVED @@ -9396,3 +9396,4 @@ net-mgmt/zabbix24-server||2017-05-29|Has expired: Upstream has declared this ver net/py-cloudfiles|net/py-python-cloudfiles|2017-05-30|Rename to match PyPI naming irc/konversation-kde4|irc/konversation|2017-05-30|Renamed to irc/konversation lang/perl5.20|lang/perl5.24|2017-06-01|Support ends three years after .0 release, please upgrade to a more recent version of Perl +misc/unicode-ucd|textproc/UCD|2017-06-02|unicode-ucd was a duplicate of textproc/UCD, remove the younger port diff --git a/deskutils/gucharmap/Makefile b/deskutils/gucharmap/Makefile index 08ed7379bc20..3095b8534b44 100644 --- a/deskutils/gucharmap/Makefile +++ b/deskutils/gucharmap/Makefile @@ -14,7 +14,7 @@ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= itstool:textproc/itstool \ - unicode-ucd>=0:misc/unicode-ucd + UCD>=0:textproc/UCD PORTSCOUT= limitw:1,even @@ -22,7 +22,7 @@ USES= desktop-file-utils gmake gnome libtool localbase \ pathfix pkgconfig tar:xz USE_GNOME= cairo gdkpixbuf2 gtk30 intltool introspection:build GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-unicode-data=${LOCALBASE}/share/unicode-ucd/ +CONFIGURE_ARGS= --with-unicode-data=${LOCALBASE}/share/unicode/ucd/ USE_LDCONFIG= yes INSTALL_TARGET= install-strip diff --git a/misc/Makefile b/misc/Makefile index 2526d41ceb28..dbf8e9b78ca3 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -474,7 +474,6 @@ SUBDIR += uk-postcodes SUBDIR += umodunpack SUBDIR += unclutter - SUBDIR += unicode-ucd SUBDIR += upclient SUBDIR += us-zipcodes SUBDIR += usbids diff --git a/misc/unicode-ucd/Makefile b/misc/unicode-ucd/Makefile deleted file mode 100644 index bc5ec48dd9d9..000000000000 --- a/misc/unicode-ucd/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# $FreeBSD$ - -PORTNAME= unicode-ucd -PORTVERSION= 9.0.0 -CATEGORIES= misc -MASTER_SITES= http://www.unicode.org/Public/zipped/${PORTVERSION}/ -DISTFILES= UCD.zip \ - Unihan.zip -DIST_SUBDIR= unicode/${PORTVERSION} - -MAINTAINER= gnome@FreeBSD.org -COMMENT= Unicode Character Database - -# https://fedoraproject.org/wiki/Licensing/MIT#Modern_Style_without_sublicense_.28Unicode.29 -LICENSE= MIT - -USES= zip - -NO_WRKSUBDIR= yes -NO_BUILD= yes - -do-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/share/${PORTNAME} - cd ${WRKSRC} && ${COPYTREE_SHARE} . \ - ${STAGEDIR}${PREFIX}/share/${PORTNAME}/ -# we unpack Unihan.zip but gucharmap wants the Unihan.zip to be present - ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/Unihan.zip \ - ${STAGEDIR}${PREFIX}/share/${PORTNAME}/ - -.include diff --git a/misc/unicode-ucd/distinfo b/misc/unicode-ucd/distinfo deleted file mode 100644 index 2c94d424e414..000000000000 --- a/misc/unicode-ucd/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -TIMESTAMP = 1470738390 -SHA256 (unicode/9.0.0/UCD.zip) = df9e028425816fd5117eaea7173704056f88f7cd030681e457c6f3827f9390ec -SIZE (unicode/9.0.0/UCD.zip) = 5655592 -SHA256 (unicode/9.0.0/Unihan.zip) = 6afdd48fb3c5d79a527ed27ce2582b2f684c09e16f5d0837fe7e5b0204f46362 -SIZE (unicode/9.0.0/Unihan.zip) = 6558824 diff --git a/misc/unicode-ucd/pkg-descr b/misc/unicode-ucd/pkg-descr deleted file mode 100644 index 85bf44399451..000000000000 --- a/misc/unicode-ucd/pkg-descr +++ /dev/null @@ -1,9 +0,0 @@ -The Unicode Character Database (UCD) consists of a number of data files -listing Unicode character properties and related data. It also includes -data files containing test data for conformance to several important -Unicode algorithms. - -This package contains Unihan.zip which contains the data files for the -Unified Han database of Hanzi/Kanji/Hanja Chinese characters. - -WWW: http://www.unicode.org/ucd/ diff --git a/misc/unicode-ucd/pkg-plist b/misc/unicode-ucd/pkg-plist deleted file mode 100644 index 9c25c3b8dc51..000000000000 --- a/misc/unicode-ucd/pkg-plist +++ /dev/null @@ -1,71 +0,0 @@ -%%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 -%%DATADIR%%/Unihan.zip -%%DATADIR%%/Unihan_DictionaryIndices.txt -%%DATADIR%%/Unihan_DictionaryLikeData.txt -%%DATADIR%%/Unihan_IRGSources.txt -%%DATADIR%%/Unihan_NumericValues.txt -%%DATADIR%%/Unihan_OtherMappings.txt -%%DATADIR%%/Unihan_RadicalStrokeCounts.txt -%%DATADIR%%/Unihan_Readings.txt -%%DATADIR%%/Unihan_Variants.txt -%%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