[pkgsrc/trunk]: pkgsrc/time/xfce4-orage Use libical to trim things down a bit...

[richard <richard%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c7ae585781f5
branches:  trunk
changeset: 352604:c7ae585781f5
user:      richard <richard%pkgsrc.org@localhost>
date:      Sat Sep 17 10:37:49 2016 +0000

description:
Use libical to trim things down a bit in the PLIST and avoid picking up
libpopt which builds tz_convert.  Also add some TLC for solaris specific
zoneinfo location and table names.
bump PKGREVISION to pick up dependency change on libical

diffstat:

 time/xfce4-orage/Makefile |   22 +-
 time/xfce4-orage/PLIST    |  583 +---------------------------------------------
 2 files changed, 21 insertions(+), 584 deletions(-)

diffs (truncated from 637 to 300 lines):

diff -r 644f3fc60250 -r c7ae585781f5 time/xfce4-orage/Makefile
--- a/time/xfce4-orage/Makefile Sat Sep 17 08:36:50 2016 +0000
+++ b/time/xfce4-orage/Makefile Sat Sep 17 10:37:49 2016 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2016/08/03 10:23:29 adam Exp $
+# $NetBSD: Makefile,v 1.35 2016/09/17 10:37:49 richard Exp $
 
-PKGREVISION= 1
+PKGREVISION= 2
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 VERSION=       4.12.1
@@ -14,11 +14,29 @@
 
 CONFIGURE_ARGS+=       --disable-libxfce4mcs
 
+# avoid picking up native libpopt, e.g. on Linux
+CONFIGURE_ENV+=        ac_cv_lib_popt_poptGetContext=no
+
 MAKE_DIRS+=    ${PREFIX}/libexec/xfce4 ${PREFIX}/libexec/xfce4/panel-plugins
 MAKE_DIRS+=    ${PREFIX}/share/xfce4 ${PREFIX}/share/xfce4/panel-plugins
 
+# solaris does it differently, so help orage out a bit
+.if !exists(/usr/share/zoneinfo) && exists(/usr/share/lib/zoneinfo) \
+       && exists(/usr/share/lib/zoneinfo/tab/zone_sun.tab)
+SUBST_CLASSES+=                zoneinfo
+SUBST_MESSAGE.zoneinfo=        Fixing up zoneinfo location
+SUBST_STAGE.zoneinfo=  pre-configure
+#SUBST_FILES.zoneinfo= libical/zoneinfo/tz_convert.par # use libical now
+SUBST_FILES.zoneinfo+= src/parameters.c src/tz_zoneinfo_read.c
+SUBST_FILES.zoneinfo+= tz_convert/tz_convert.*
+SUBST_SED.zoneinfo=    -e 's|/usr/share/zoneinfo|/usr/share/lib/zoneinfo|g'
+SUBST_SED.zoneinfo+=   -e 's|zone\.tab|tab/zone_sun.tab|g'
+SUBST_SED.zoneinfo+=   -e 's|iso3166\.tab|tab/country.tab|g'
+.endif
+
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../time/libical/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 644f3fc60250 -r c7ae585781f5 time/xfce4-orage/PLIST
--- a/time/xfce4-orage/PLIST    Sat Sep 17 08:36:50 2016 +0000
+++ b/time/xfce4-orage/PLIST    Sat Sep 17 10:37:49 2016 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2015/06/29 15:03:01 youri Exp $
+@comment $NetBSD: PLIST,v 1.9 2016/09/17 10:37:49 richard Exp $
 bin/globaltime
 bin/orage
 lib/xfce4/panel/plugins/liborageclock.la
@@ -97,585 +97,4 @@
 share/orage/sounds/Spo.wav
 share/orage/sounds/Tear.wav
 share/orage/sounds/Wall_c.wav
-share/orage/zoneinfo/Africa/Abidjan.ics
-share/orage/zoneinfo/Africa/Accra.ics
-share/orage/zoneinfo/Africa/Addis_Ababa.ics
-share/orage/zoneinfo/Africa/Algiers.ics
-share/orage/zoneinfo/Africa/Asmara.ics
-share/orage/zoneinfo/Africa/Asmera.ics
-share/orage/zoneinfo/Africa/Bamako.ics
-share/orage/zoneinfo/Africa/Bangui.ics
-share/orage/zoneinfo/Africa/Banjul.ics
-share/orage/zoneinfo/Africa/Bissau.ics
-share/orage/zoneinfo/Africa/Blantyre.ics
-share/orage/zoneinfo/Africa/Brazzaville.ics
-share/orage/zoneinfo/Africa/Bujumbura.ics
-share/orage/zoneinfo/Africa/Cairo.ics
-share/orage/zoneinfo/Africa/Casablanca.ics
-share/orage/zoneinfo/Africa/Ceuta.ics
-share/orage/zoneinfo/Africa/Conakry.ics
-share/orage/zoneinfo/Africa/Dakar.ics
-share/orage/zoneinfo/Africa/Dar_es_Salaam.ics
-share/orage/zoneinfo/Africa/Djibouti.ics
-share/orage/zoneinfo/Africa/Douala.ics
-share/orage/zoneinfo/Africa/El_Aaiun.ics
-share/orage/zoneinfo/Africa/Freetown.ics
-share/orage/zoneinfo/Africa/Gaborone.ics
-share/orage/zoneinfo/Africa/Harare.ics
-share/orage/zoneinfo/Africa/Johannesburg.ics
-share/orage/zoneinfo/Africa/Kampala.ics
-share/orage/zoneinfo/Africa/Khartoum.ics
-share/orage/zoneinfo/Africa/Kigali.ics
-share/orage/zoneinfo/Africa/Kinshasa.ics
-share/orage/zoneinfo/Africa/Lagos.ics
-share/orage/zoneinfo/Africa/Libreville.ics
-share/orage/zoneinfo/Africa/Lome.ics
-share/orage/zoneinfo/Africa/Luanda.ics
-share/orage/zoneinfo/Africa/Lubumbashi.ics
-share/orage/zoneinfo/Africa/Lusaka.ics
-share/orage/zoneinfo/Africa/Malabo.ics
-share/orage/zoneinfo/Africa/Maputo.ics
-share/orage/zoneinfo/Africa/Maseru.ics
-share/orage/zoneinfo/Africa/Mbabane.ics
-share/orage/zoneinfo/Africa/Mogadishu.ics
-share/orage/zoneinfo/Africa/Monrovia.ics
-share/orage/zoneinfo/Africa/Nairobi.ics
-share/orage/zoneinfo/Africa/Ndjamena.ics
-share/orage/zoneinfo/Africa/Niamey.ics
-share/orage/zoneinfo/Africa/Nouakchott.ics
-share/orage/zoneinfo/Africa/Ouagadougou.ics
-share/orage/zoneinfo/Africa/Porto-Novo.ics
-share/orage/zoneinfo/Africa/Sao_Tome.ics
-share/orage/zoneinfo/Africa/Timbuktu.ics
-share/orage/zoneinfo/Africa/Tripoli.ics
-share/orage/zoneinfo/Africa/Tunis.ics
-share/orage/zoneinfo/Africa/Windhoek.ics
-share/orage/zoneinfo/America/Adak.ics
-share/orage/zoneinfo/America/Anchorage.ics
-share/orage/zoneinfo/America/Anguilla.ics
-share/orage/zoneinfo/America/Antigua.ics
-share/orage/zoneinfo/America/Araguaina.ics
-share/orage/zoneinfo/America/Argentina/Buenos_Aires.ics
-share/orage/zoneinfo/America/Argentina/Catamarca.ics
-share/orage/zoneinfo/America/Argentina/ComodRivadavia.ics
-share/orage/zoneinfo/America/Argentina/Cordoba.ics
-share/orage/zoneinfo/America/Argentina/Jujuy.ics
-share/orage/zoneinfo/America/Argentina/La_Rioja.ics
-share/orage/zoneinfo/America/Argentina/Mendoza.ics
-share/orage/zoneinfo/America/Argentina/Rio_Gallegos.ics
-share/orage/zoneinfo/America/Argentina/Salta.ics
-share/orage/zoneinfo/America/Argentina/San_Juan.ics
-share/orage/zoneinfo/America/Argentina/San_Luis.ics
-share/orage/zoneinfo/America/Argentina/Tucuman.ics
-share/orage/zoneinfo/America/Argentina/Ushuaia.ics
-share/orage/zoneinfo/America/Aruba.ics
-share/orage/zoneinfo/America/Asuncion.ics
-share/orage/zoneinfo/America/Atikokan.ics
-share/orage/zoneinfo/America/Atka.ics
-share/orage/zoneinfo/America/Bahia.ics
-share/orage/zoneinfo/America/Barbados.ics
-share/orage/zoneinfo/America/Belem.ics
-share/orage/zoneinfo/America/Belize.ics
-share/orage/zoneinfo/America/Blanc-Sablon.ics
-share/orage/zoneinfo/America/Boa_Vista.ics
-share/orage/zoneinfo/America/Bogota.ics
-share/orage/zoneinfo/America/Boise.ics
-share/orage/zoneinfo/America/Buenos_Aires.ics
-share/orage/zoneinfo/America/Cambridge_Bay.ics
-share/orage/zoneinfo/America/Campo_Grande.ics
-share/orage/zoneinfo/America/Cancun.ics
-share/orage/zoneinfo/America/Caracas.ics
-share/orage/zoneinfo/America/Catamarca.ics
-share/orage/zoneinfo/America/Cayenne.ics
-share/orage/zoneinfo/America/Cayman.ics
-share/orage/zoneinfo/America/Chicago.ics
-share/orage/zoneinfo/America/Chihuahua.ics
-share/orage/zoneinfo/America/Coral_Harbour.ics
-share/orage/zoneinfo/America/Cordoba.ics
-share/orage/zoneinfo/America/Costa_Rica.ics
-share/orage/zoneinfo/America/Cuiaba.ics
-share/orage/zoneinfo/America/Curacao.ics
-share/orage/zoneinfo/America/Danmarkshavn.ics
-share/orage/zoneinfo/America/Dawson.ics
-share/orage/zoneinfo/America/Dawson_Creek.ics
-share/orage/zoneinfo/America/Denver.ics
-share/orage/zoneinfo/America/Detroit.ics
-share/orage/zoneinfo/America/Dominica.ics
-share/orage/zoneinfo/America/Edmonton.ics
-share/orage/zoneinfo/America/Eirunepe.ics
-share/orage/zoneinfo/America/El_Salvador.ics
-share/orage/zoneinfo/America/Ensenada.ics
-share/orage/zoneinfo/America/Fort_Wayne.ics
-share/orage/zoneinfo/America/Fortaleza.ics
-share/orage/zoneinfo/America/Glace_Bay.ics
-share/orage/zoneinfo/America/Godthab.ics
-share/orage/zoneinfo/America/Goose_Bay.ics
-share/orage/zoneinfo/America/Grand_Turk.ics
-share/orage/zoneinfo/America/Grenada.ics
-share/orage/zoneinfo/America/Guadeloupe.ics
-share/orage/zoneinfo/America/Guatemala.ics
-share/orage/zoneinfo/America/Guayaquil.ics
-share/orage/zoneinfo/America/Guyana.ics
-share/orage/zoneinfo/America/Halifax.ics
-share/orage/zoneinfo/America/Havana.ics
-share/orage/zoneinfo/America/Hermosillo.ics
-share/orage/zoneinfo/America/Indiana/Indianapolis.ics
-share/orage/zoneinfo/America/Indiana/Knox.ics
-share/orage/zoneinfo/America/Indiana/Marengo.ics
-share/orage/zoneinfo/America/Indiana/Petersburg.ics
-share/orage/zoneinfo/America/Indiana/Tell_City.ics
-share/orage/zoneinfo/America/Indiana/Vevay.ics
-share/orage/zoneinfo/America/Indiana/Vincennes.ics
-share/orage/zoneinfo/America/Indiana/Winamac.ics
-share/orage/zoneinfo/America/Indianapolis.ics
-share/orage/zoneinfo/America/Inuvik.ics
-share/orage/zoneinfo/America/Iqaluit.ics
-share/orage/zoneinfo/America/Jamaica.ics
-share/orage/zoneinfo/America/Jujuy.ics
-share/orage/zoneinfo/America/Juneau.ics
-share/orage/zoneinfo/America/Kentucky/Louisville.ics
-share/orage/zoneinfo/America/Kentucky/Monticello.ics
-share/orage/zoneinfo/America/Knox_IN.ics
-share/orage/zoneinfo/America/La_Paz.ics
-share/orage/zoneinfo/America/Lima.ics
-share/orage/zoneinfo/America/Los_Angeles.ics
-share/orage/zoneinfo/America/Louisville.ics
-share/orage/zoneinfo/America/Maceio.ics
-share/orage/zoneinfo/America/Managua.ics
-share/orage/zoneinfo/America/Manaus.ics
-share/orage/zoneinfo/America/Marigot.ics
-share/orage/zoneinfo/America/Martinique.ics
-share/orage/zoneinfo/America/Mazatlan.ics
-share/orage/zoneinfo/America/Mendoza.ics
-share/orage/zoneinfo/America/Menominee.ics
-share/orage/zoneinfo/America/Merida.ics
-share/orage/zoneinfo/America/Mexico_City.ics
-share/orage/zoneinfo/America/Miquelon.ics
-share/orage/zoneinfo/America/Moncton.ics
-share/orage/zoneinfo/America/Monterrey.ics
-share/orage/zoneinfo/America/Montevideo.ics
-share/orage/zoneinfo/America/Montreal.ics
-share/orage/zoneinfo/America/Montserrat.ics
-share/orage/zoneinfo/America/Nassau.ics
-share/orage/zoneinfo/America/New_York.ics
-share/orage/zoneinfo/America/Nipigon.ics
-share/orage/zoneinfo/America/Nome.ics
-share/orage/zoneinfo/America/Noronha.ics
-share/orage/zoneinfo/America/North_Dakota/Center.ics
-share/orage/zoneinfo/America/North_Dakota/New_Salem.ics
-share/orage/zoneinfo/America/Panama.ics
-share/orage/zoneinfo/America/Pangnirtung.ics
-share/orage/zoneinfo/America/Paramaribo.ics
-share/orage/zoneinfo/America/Phoenix.ics
-share/orage/zoneinfo/America/Port-au-Prince.ics
-share/orage/zoneinfo/America/Port_of_Spain.ics
-share/orage/zoneinfo/America/Porto_Acre.ics
-share/orage/zoneinfo/America/Porto_Velho.ics
-share/orage/zoneinfo/America/Puerto_Rico.ics
-share/orage/zoneinfo/America/Rainy_River.ics
-share/orage/zoneinfo/America/Rankin_Inlet.ics
-share/orage/zoneinfo/America/Recife.ics
-share/orage/zoneinfo/America/Regina.ics
-share/orage/zoneinfo/America/Resolute.ics
-share/orage/zoneinfo/America/Rio_Branco.ics
-share/orage/zoneinfo/America/Rosario.ics
-share/orage/zoneinfo/America/Santarem.ics
-share/orage/zoneinfo/America/Santiago.ics
-share/orage/zoneinfo/America/Santo_Domingo.ics
-share/orage/zoneinfo/America/Sao_Paulo.ics
-share/orage/zoneinfo/America/Scoresbysund.ics
-share/orage/zoneinfo/America/Shiprock.ics
-share/orage/zoneinfo/America/St_Barthelemy.ics
-share/orage/zoneinfo/America/St_Johns.ics
-share/orage/zoneinfo/America/St_Kitts.ics
-share/orage/zoneinfo/America/St_Lucia.ics
-share/orage/zoneinfo/America/St_Thomas.ics
-share/orage/zoneinfo/America/St_Vincent.ics
-share/orage/zoneinfo/America/Swift_Current.ics
-share/orage/zoneinfo/America/Tegucigalpa.ics
-share/orage/zoneinfo/America/Thule.ics
-share/orage/zoneinfo/America/Thunder_Bay.ics
-share/orage/zoneinfo/America/Tijuana.ics
-share/orage/zoneinfo/America/Toronto.ics
-share/orage/zoneinfo/America/Tortola.ics
-share/orage/zoneinfo/America/Vancouver.ics
-share/orage/zoneinfo/America/Virgin.ics
-share/orage/zoneinfo/America/Whitehorse.ics
-share/orage/zoneinfo/America/Winnipeg.ics
-share/orage/zoneinfo/America/Yakutat.ics
-share/orage/zoneinfo/America/Yellowknife.ics
-share/orage/zoneinfo/Antarctica/Casey.ics
-share/orage/zoneinfo/Antarctica/Davis.ics
-share/orage/zoneinfo/Antarctica/DumontDUrville.ics
-share/orage/zoneinfo/Antarctica/Mawson.ics
-share/orage/zoneinfo/Antarctica/McMurdo.ics
-share/orage/zoneinfo/Antarctica/Palmer.ics
-share/orage/zoneinfo/Antarctica/Rothera.ics
-share/orage/zoneinfo/Antarctica/South_Pole.ics
-share/orage/zoneinfo/Antarctica/Syowa.ics
-share/orage/zoneinfo/Antarctica/Vostok.ics
-share/orage/zoneinfo/Arctic/Longyearbyen.ics
-share/orage/zoneinfo/Asia/Aden.ics
-share/orage/zoneinfo/Asia/Almaty.ics
-share/orage/zoneinfo/Asia/Amman.ics
-share/orage/zoneinfo/Asia/Anadyr.ics
-share/orage/zoneinfo/Asia/Aqtau.ics
-share/orage/zoneinfo/Asia/Aqtobe.ics
-share/orage/zoneinfo/Asia/Ashgabat.ics
-share/orage/zoneinfo/Asia/Ashkhabad.ics
-share/orage/zoneinfo/Asia/Baghdad.ics
-share/orage/zoneinfo/Asia/Bahrain.ics
-share/orage/zoneinfo/Asia/Baku.ics
-share/orage/zoneinfo/Asia/Bangkok.ics
-share/orage/zoneinfo/Asia/Beirut.ics
-share/orage/zoneinfo/Asia/Bishkek.ics
-share/orage/zoneinfo/Asia/Brunei.ics
-share/orage/zoneinfo/Asia/Calcutta.ics
-share/orage/zoneinfo/Asia/Choibalsan.ics
-share/orage/zoneinfo/Asia/Chongqing.ics
-share/orage/zoneinfo/Asia/Chungking.ics
-share/orage/zoneinfo/Asia/Colombo.ics
-share/orage/zoneinfo/Asia/Dacca.ics
-share/orage/zoneinfo/Asia/Damascus.ics
-share/orage/zoneinfo/Asia/Dhaka.ics
-share/orage/zoneinfo/Asia/Dili.ics
-share/orage/zoneinfo/Asia/Dubai.ics
-share/orage/zoneinfo/Asia/Dushanbe.ics
-share/orage/zoneinfo/Asia/Gaza.ics