pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11/kdelibs3 Use zonetab package rather than doing it ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/fbea69ea5b1d
branches:  trunk
changeset: 535311:fbea69ea5b1d
user:      markd <markd%pkgsrc.org@localhost>
date:      Tue Nov 13 11:19:18 2007 +0000

description:
Use zonetab package rather than doing it locally.

diffstat:

 x11/kdelibs3/Makefile         |    8 +-
 x11/kdelibs3/PLIST            |    3 +-
 x11/kdelibs3/distinfo         |    3 +-
 x11/kdelibs3/files/zone.tab   |  407 ------------------------------------------
 x11/kdelibs3/patches/patch-aq |   18 -
 5 files changed, 6 insertions(+), 433 deletions(-)

diffs (truncated from 500 to 300 lines):

diff -r 041aba60032a -r fbea69ea5b1d x11/kdelibs3/Makefile
--- a/x11/kdelibs3/Makefile     Tue Nov 13 11:13:45 2007 +0000
+++ b/x11/kdelibs3/Makefile     Tue Nov 13 11:19:18 2007 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.129 2007/10/20 10:36:14 markd Exp $
+# $NetBSD: Makefile,v 1.130 2007/11/13 11:19:18 markd Exp $
 
 DISTNAME=      kdelibs-${_KDE_VERSION}
+PKGREVISION=   1
 CATEGORIES=    x11
 COMMENT=       Support libraries for the KDE integrated X11 desktop
 
@@ -68,10 +69,10 @@
 .  else
 PLIST_SUBST+=          KDED_WORKAROUND=""
 .  endif
-PLIST_SUBST+=          NEED_ZONETAB=""
+# make sure zone.tab is installed
+DEPENDS+=              zonetab-[0-9]*:../../time/zonetab
 .else
 PLIST_SUBST+=          KDED_WORKAROUND=""
-PLIST_SUBST+=          NEED_ZONETAB="@comment "
 .endif
 
 .include "../../mk/krb5.buildlink3.mk"
@@ -79,7 +80,6 @@
 
 post-install:
 .if ${OPSYS} == "NetBSD"
-       ${INSTALL_DATA} ${FILESDIR}/zone.tab ${PREFIX}/share
 .  if ${OS_VERSION:M1.5.[12]*} || ${OS_VERSION:M1.[0-4]*}
        @${RM} ${PREFIX}/lib/kded.*
 .  endif
diff -r 041aba60032a -r fbea69ea5b1d x11/kdelibs3/PLIST
--- a/x11/kdelibs3/PLIST        Tue Nov 13 11:13:45 2007 +0000
+++ b/x11/kdelibs3/PLIST        Tue Nov 13 11:19:18 2007 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.40 2007/10/20 10:36:14 markd Exp $
+@comment $NetBSD: PLIST,v 1.41 2007/11/13 11:19:18 markd Exp $
 bin/artsmessage
 bin/checkXML
 ${CUPS}bin/cupsdconf
@@ -5213,7 +5213,6 @@
 share/kde/servicetypes/renamedlgplugin.desktop
 share/kde/servicetypes/scriptinterface.desktop
 share/locale/all_languages
-${NEED_ZONETAB}share/zone.tab
 @comment in xmlcatmgr: share/sgml/catalog
 @comment in kde: @dirrm share/kde/servicetypes
 @comment in kde: @dirrm share/kde/services/kresources/kabc
diff -r 041aba60032a -r fbea69ea5b1d x11/kdelibs3/distinfo
--- a/x11/kdelibs3/distinfo     Tue Nov 13 11:13:45 2007 +0000
+++ b/x11/kdelibs3/distinfo     Tue Nov 13 11:19:18 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.89 2007/10/20 10:36:15 markd Exp $
+$NetBSD: distinfo,v 1.90 2007/11/13 11:19:18 markd Exp $
 
 SHA1 (kdelibs-3.5.8.tar.bz2) = b524a5d9969e7319bb5ffb926a39fd6afb39b2ed
 RMD160 (kdelibs-3.5.8.tar.bz2) = e3524ca8613fca338a0530213e921fbfae56e866
@@ -15,7 +15,6 @@
 SHA1 (patch-an) = d34a3cc0ac0b92921bcaeb9b05c5b7a99ee3566c
 SHA1 (patch-ao) = 7ae360b2ee2332ec3017dfd468457f2c1b139308
 SHA1 (patch-ap) = 94037230bb3d12549195d52b98ffdd821f94f90d
-SHA1 (patch-aq) = 91d970b5c2fb129e5656cf4841972453c83ba088
 SHA1 (patch-bc) = 434a48d290aa9716b8c6e372419460ebd33cf8ea
 SHA1 (patch-bd) = 2c139b81ff96d1762c14af0bb29275cf66ee8f8d
 SHA1 (patch-bv) = 882355f9dd9cdbbbe14d54e5c59b630ef0347e1c
diff -r 041aba60032a -r fbea69ea5b1d x11/kdelibs3/files/zone.tab
--- a/x11/kdelibs3/files/zone.tab       Tue Nov 13 11:13:45 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,407 +0,0 @@
-# @(#)zone.tab 1.32
-#
-# TZ zone descriptions
-#
-# From Paul Eggert (1996-08-05):
-#
-# This file contains a table with the following columns:
-# 1.  ISO 3166 2-character country code.  See the file `iso3166.tab'.
-# 2.  Latitude and longitude of the zone's principal location
-#     in ISO 6709 sign-degrees-minutes-seconds format,
-#     either +-DDMM+-DDDMM or +-DDMMSS+-DDDMMSS,
-#     first latitude (+ is north), then longitude (+ is east).
-# 3.  Zone name used in value of TZ environment variable.
-# 4.  Comments; present if and only if the country has multiple rows.
-#
-# Columns are separated by a single tab.
-# The table is sorted first by country, then an order within the country that
-# (1) makes some geographical sense, and
-# (2) puts the most populous zones first, where that does not contradict (1).
-#
-# Lines beginning with `#' are comments.
-#
-#country-
-#code  coordinates     TZ                      comments
-AD     +4230+00131     Europe/Andorra
-AE     +2518+05518     Asia/Dubai
-AF     +3431+06912     Asia/Kabul
-AG     +1703-06148     America/Antigua
-AI     +1812-06304     America/Anguilla
-AL     +4120+01950     Europe/Tirane
-AM     +4011+04430     Asia/Yerevan
-AN     +1211-06900     America/Curacao
-AO     -0848+01314     Africa/Luanda
-AQ     -7750+16636     Antarctica/McMurdo      McMurdo Station, Ross Island
-AQ     -9000+00000     Antarctica/South_Pole   Amundsen-Scott Station, South Pole
-AQ     -6734-06808     Antarctica/Rothera      Rothera Station, Adelaide Island
-AQ     -6448-06406     Antarctica/Palmer       Palmer Station, Anvers Island
-AQ     -6736+06253     Antarctica/Mawson       Mawson Station, Holme Bay
-AQ     -6835+07758     Antarctica/Davis        Davis Station, Vestfold Hills
-AQ     -6617+11031     Antarctica/Casey        Casey Station, Bailey Peninsula
-AQ     -7824+10654     Antarctica/Vostok       Vostok Station, S Magnetic Pole
-AQ     -6640+14001     Antarctica/DumontDUrville       Dumont-d'Urville Base, Terre Adelie
-AQ     -690022+0393524 Antarctica/Syowa        Syowa Station, E Ongul I
-AR     -3436-05827     America/Argentina/Buenos_Aires  Buenos Aires (BA, CF)
-AR     -3124-06411     America/Argentina/Cordoba       most locations (CB, CC, CN, ER, FM, LP, MN, NQ, RN, SA, SE, SF, SL)
-AR     -2411-06518     America/Argentina/Jujuy Jujuy (JY)
-AR     -3124-06411     America/Argentina/Tucuman       Tucuman (TM)
-AR     -2828-06547     America/Argentina/Catamarca     Catamarca (CT), Chubut (CH)
-AR     -2926-06651     America/Argentina/La_Rioja      La Rioja (LR)
-AR     -3132-06831     America/Argentina/San_Juan      San Juan (SJ)
-AR     -3253-06849     America/Argentina/Mendoza       Mendoza (MZ)
-AR     -5138-06913     America/Argentina/Rio_Gallegos  Santa Cruz (SC)
-AR     -5448-06818     America/Argentina/Ushuaia       Tierra del Fuego (TF)
-AS     -1416-17042     Pacific/Pago_Pago
-AT     +4813+01620     Europe/Vienna
-AU     -3133+15905     Australia/Lord_Howe     Lord Howe Island
-AU     -4253+14719     Australia/Hobart        Tasmania - most locations
-AU     -3956+14352     Australia/Currie        Tasmania - King Island
-AU     -3749+14458     Australia/Melbourne     Victoria
-AU     -3352+15113     Australia/Sydney        New South Wales - most locations
-AU     -3157+14127     Australia/Broken_Hill   New South Wales - Yancowinna
-AU     -2728+15302     Australia/Brisbane      Queensland - most locations
-AU     -2016+14900     Australia/Lindeman      Queensland - Holiday Islands
-AU     -3455+13835     Australia/Adelaide      South Australia
-AU     -1228+13050     Australia/Darwin        Northern Territory
-AU     -3157+11551     Australia/Perth Western Australia
-AW     +1230-06858     America/Aruba
-AX     +6006+01957     Europe/Mariehamn
-AZ     +4023+04951     Asia/Baku
-BA     +4352+01825     Europe/Sarajevo
-BB     +1306-05937     America/Barbados
-BD     +2343+09025     Asia/Dhaka
-BE     +5050+00420     Europe/Brussels
-BF     +1222-00131     Africa/Ouagadougou
-BG     +4241+02319     Europe/Sofia
-BH     +2623+05035     Asia/Bahrain
-BI     -0323+02922     Africa/Bujumbura
-BJ     +0629+00237     Africa/Porto-Novo
-BM     +3217-06446     Atlantic/Bermuda
-BN     +0456+11455     Asia/Brunei
-BO     -1630-06809     America/La_Paz
-BR     -0351-03225     America/Noronha Atlantic islands
-BR     -0127-04829     America/Belem   Amapa, E Para
-BR     -0343-03830     America/Fortaleza       NE Brazil (MA, PI, CE, RN, PB)
-BR     -0803-03454     America/Recife  Pernambuco
-BR     -0712-04812     America/Araguaina       Tocantins
-BR     -0940-03543     America/Maceio  Alagoas, Sergipe
-BR     -1259-03831     America/Bahia   Bahia
-BR     -2332-04637     America/Sao_Paulo       S & SE Brazil (GO, DF, MG, ES, RJ, SP, PR, SC, RS)
-BR     -2027-05437     America/Campo_Grande    Mato Grosso do Sul
-BR     -1535-05605     America/Cuiaba  Mato Grosso
-BR     -0846-06354     America/Porto_Velho     W Para, Rondonia
-BR     +0249-06040     America/Boa_Vista       Roraima
-BR     -0308-06001     America/Manaus  E Amazonas
-BR     -0640-06952     America/Eirunepe        W Amazonas
-BR     -0958-06748     America/Rio_Branco      Acre
-BS     +2505-07721     America/Nassau
-BT     +2728+08939     Asia/Thimphu
-BW     -2545+02555     Africa/Gaborone
-BY     +5354+02734     Europe/Minsk
-BZ     +1730-08812     America/Belize
-CA     +4734-05243     America/St_Johns        Newfoundland Island
-CA     +4439-06336     America/Halifax Atlantic Time - Nova Scotia (most places), NB, W Labrador, E Quebec & PEI
-CA     +4612-05957     America/Glace_Bay       Atlantic Time - Nova Scotia - places that did not observe DST 1966-1971
-CA     +5320-06025     America/Goose_Bay       Atlantic Time - E Labrador
-CA     +4531-07334     America/Montreal        Eastern Time - Quebec - most locations
-CA     +4339-07923     America/Toronto Eastern Time - Ontario - most locations
-CA     +4901-08816     America/Nipigon Eastern Time - Ontario & Quebec - places that did not observe DST 1967-1973
-CA     +4823-08915     America/Thunder_Bay     Eastern Time - Thunder Bay, Ontario
-CA     +6608-06544     America/Pangnirtung     Eastern Time - Pangnirtung, Nunavut
-CA     +6344-06828     America/Iqaluit Eastern Time - east Nunavut
-CA     +6408-08310     America/Coral_Harbour   Eastern Standard Time - Southampton Island
-CA     +6245-09210     America/Rankin_Inlet    Central Time - central Nunavut
-CA     +4953-09709     America/Winnipeg        Central Time - Manitoba & west Ontario
-CA     +4843-09429     America/Rainy_River     Central Time - Rainy River & Fort Frances, Ontario
-CA     +6903-10505     America/Cambridge_Bay   Central Time - west Nunavut
-CA     +5024-10439     America/Regina  Central Standard Time - Saskatchewan - most locations
-CA     +5017-10750     America/Swift_Current   Central Standard Time - Saskatchewan - midwest
-CA     +5333-11328     America/Edmonton        Mountain Time - Alberta, east British Columbia & west Saskatchewan
-CA     +6227-11421     America/Yellowknife     Mountain Time - central Northwest Territories
-CA     +6825-11330     America/Inuvik  Mountain Time - west Northwest Territories
-CA     +5946-12014     America/Dawson_Creek    Mountain Standard Time - Dawson Creek & Fort Saint John, British Columbia
-CA     +4916-12307     America/Vancouver       Pacific Time - west British Columbia
-CA     +6043-13503     America/Whitehorse      Pacific Time - south Yukon
-CA     +6404-13925     America/Dawson  Pacific Time - north Yukon
-CC     -1210+09655     Indian/Cocos
-CD     -0418+01518     Africa/Kinshasa west Dem. Rep. of Congo
-CD     -1140+02728     Africa/Lubumbashi       east Dem. Rep. of Congo
-CF     +0422+01835     Africa/Bangui
-CG     -0416+01517     Africa/Brazzaville
-CH     +4723+00832     Europe/Zurich
-CI     +0519-00402     Africa/Abidjan
-CK     -2114-15946     Pacific/Rarotonga
-CL     -3327-07040     America/Santiago        most locations
-CL     -2710-10927     Pacific/Easter  Easter Island & Sala y Gomez
-CM     +0403+00942     Africa/Douala
-CN     +3114+12128     Asia/Shanghai   east China - Beijing, Guangdong, Shanghai, etc.
-CN     +4545+12641     Asia/Harbin     Heilongjiang
-CN     +2934+10635     Asia/Chongqing  central China - Gansu, Guizhou, Sichuan, Yunnan, etc.
-CN     +4348+08735     Asia/Urumqi     Tibet & most of Xinjiang Uyghur
-CN     +3929+07559     Asia/Kashgar    southwest Xinjiang Uyghur
-CO     +0436-07405     America/Bogota
-CR     +0956-08405     America/Costa_Rica
-CS     +4450+02030     Europe/Belgrade
-CU     +2308-08222     America/Havana
-CV     +1455-02331     Atlantic/Cape_Verde
-CX     -1025+10543     Indian/Christmas
-CY     +3510+03322     Asia/Nicosia
-CZ     +5005+01426     Europe/Prague
-DE     +5230+01322     Europe/Berlin
-DJ     +1136+04309     Africa/Djibouti
-DK     +5540+01235     Europe/Copenhagen
-DM     +1518-06124     America/Dominica
-DO     +1828-06954     America/Santo_Domingo
-DZ     +3647+00303     Africa/Algiers
-EC     -0210-07950     America/Guayaquil       mainland
-EC     -0054-08936     Pacific/Galapagos       Galapagos Islands
-EE     +5925+02445     Europe/Tallinn
-EG     +3003+03115     Africa/Cairo
-EH     +2709-01312     Africa/El_Aaiun
-ER     +1520+03853     Africa/Asmera
-ES     +4024-00341     Europe/Madrid   mainland
-ES     +3553-00519     Africa/Ceuta    Ceuta & Melilla
-ES     +2806-01524     Atlantic/Canary Canary Islands
-ET     +0902+03842     Africa/Addis_Ababa
-FI     +6010+02458     Europe/Helsinki
-FJ     -1808+17825     Pacific/Fiji
-FK     -5142-05751     Atlantic/Stanley
-FM     +0725+15147     Pacific/Truk    Truk (Chuuk) and Yap
-FM     +0658+15813     Pacific/Ponape  Ponape (Pohnpei)
-FM     +0519+16259     Pacific/Kosrae  Kosrae
-FO     +6201-00646     Atlantic/Faeroe
-FR     +4852+00220     Europe/Paris
-GA     +0023+00927     Africa/Libreville
-GB     +512830-0001845 Europe/London
-GD     +1203-06145     America/Grenada
-GE     +4143+04449     Asia/Tbilisi
-GF     +0456-05220     America/Cayenne
-GH     +0533-00013     Africa/Accra
-GI     +3608-00521     Europe/Gibraltar
-GL     +6411-05144     America/Godthab most locations
-GL     +7646-01840     America/Danmarkshavn    east coast, north of Scoresbysund
-GL     +7030-02215     America/Scoresbysund    Scoresbysund / Ittoqqortoormiit
-GL     +7634-06847     America/Thule   Thule / Pituffik
-GM     +1328-01639     Africa/Banjul
-GN     +0931-01343     Africa/Conakry
-GP     +1614-06132     America/Guadeloupe
-GQ     +0345+00847     Africa/Malabo
-GR     +3758+02343     Europe/Athens
-GS     -5416-03632     Atlantic/South_Georgia
-GT     +1438-09031     America/Guatemala
-GU     +1328+14445     Pacific/Guam
-GW     +1151-01535     Africa/Bissau
-GY     +0648-05810     America/Guyana
-HK     +2217+11409     Asia/Hong_Kong
-HN     +1406-08713     America/Tegucigalpa
-HR     +4548+01558     Europe/Zagreb
-HT     +1832-07220     America/Port-au-Prince
-HU     +4730+01905     Europe/Budapest
-ID     -0610+10648     Asia/Jakarta    Java & Sumatra
-ID     -0002+10920     Asia/Pontianak  west & central Borneo
-ID     -0507+11924     Asia/Makassar   east & south Borneo, Celebes, Bali, Nusa Tengarra, west Timor
-ID     -0232+14042     Asia/Jayapura   Irian Jaya & the Moluccas
-IE     +5320-00615     Europe/Dublin
-IL     +3146+03514     Asia/Jerusalem
-IN     +2232+08822     Asia/Calcutta
-IO     -0720+07225     Indian/Chagos
-IQ     +3321+04425     Asia/Baghdad
-IR     +3540+05126     Asia/Tehran
-IS     +6409-02151     Atlantic/Reykjavik
-IT     +4154+01229     Europe/Rome
-JM     +1800-07648     America/Jamaica
-JO     +3157+03556     Asia/Amman
-JP     +353916+1394441 Asia/Tokyo
-KE     -0117+03649     Africa/Nairobi
-KG     +4254+07436     Asia/Bishkek
-KH     +1133+10455     Asia/Phnom_Penh
-KI     +0125+17300     Pacific/Tarawa  Gilbert Islands
-KI     -0308-17105     Pacific/Enderbury       Phoenix Islands
-KI     +0152-15720     Pacific/Kiritimati      Line Islands
-KM     -1141+04316     Indian/Comoro
-KN     +1718-06243     America/St_Kitts
-KP     +3901+12545     Asia/Pyongyang
-KR     +3733+12658     Asia/Seoul
-KW     +2920+04759     Asia/Kuwait
-KY     +1918-08123     America/Cayman
-KZ     +4315+07657     Asia/Almaty     most locations
-KZ     +4448+06528     Asia/Qyzylorda  Qyzylorda (Kyzylorda, Kzyl-Orda)
-KZ     +5017+05710     Asia/Aqtobe     Aqtobe (Aktobe)



Home | Main Index | Thread Index | Old Index