From bb6f6481e99e2ebb64da3d4852b8f823e0362d4f Mon Sep 17 00:00:00 2001 From: ryoon Date: Wed, 2 Feb 2011 13:48:06 +0000 Subject: Update to 3.6. PR pkg/44477 Changelog: Major changes in release 3.6 * Work properly when the -1 timezone is specified * Use ISO 3166-2 region codes * Distribute .po files * Distribute BUGS LIMITATIONS doc/GREG-REFORM * Fix NLS support in gcal, gcal2txt, tcal, txt2gcal Major changes in release 3.5.1 * Update NEWS * --version reports the right version Major changes in release 3.5 * Change source license to GPLv3+ * Do not include Henry Spencer V8 regex library * Change documentation license to FDL 1.3+ * Use automake * Use the start of the week day specified by the locale * Typo fixed in data/dates/lotr: Sm8 = Smaug * Typo fixed in src/help.c and *.po: assigments -> assignments * Hyphens corrected in gcal.1 * Date of Nikolaustag changed in data/dates/world Bug report and patch by Wolfram Kleff * Spell check in doc/en/texi/gcal.texi Patch by James Troup * Do not install files in $(HOME) Patch by Edward Betts * Add --from-code=iso-8859-1 to po/Makefile.in.in Patch by Sandro Tosi * Fix German translation Patch by Jens Seidel * Changes to src/{hd-data2.c,hd-data3.c,hd-defs.h,hd-data.c} -fixed Czech holidays; bug report and patch by Martin Mares -removed non ASCII char -All Saints Day on some states; patch by Marc-Jano Knopp -All Souls day is no holiday; patch by Thorsten Alteholz Major changes in release 3.01.1 * typos fixed in data files * typo fixed in src/help.c --- time/gcal/Makefile | 24 +++++--------- time/gcal/PLIST | 79 +++++++++++----------------------------------- time/gcal/distinfo | 11 +++---- time/gcal/patches/patch-aa | 17 ---------- time/gcal/patches/patch-ab | 19 ----------- time/gcal/patches/patch-ac | 13 -------- 6 files changed, 30 insertions(+), 133 deletions(-) delete mode 100644 time/gcal/patches/patch-aa delete mode 100644 time/gcal/patches/patch-ab delete mode 100644 time/gcal/patches/patch-ac (limited to 'time/gcal') diff --git a/time/gcal/Makefile b/time/gcal/Makefile index b24b8063b74..f5e4cb88153 100644 --- a/time/gcal/Makefile +++ b/time/gcal/Makefile @@ -1,32 +1,24 @@ -# $NetBSD: Makefile,v 1.19 2010/03/21 16:29:43 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2011/02/02 13:48:06 ryoon Exp $ # -DISTNAME= gcal-3.01 -PKGREVISION= 5 +DISTNAME= gcal-3.6 CATEGORIES= time MASTER_SITES= ${MASTER_SITE_GNU:=gcal/} MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.gnu.org/software/gcal/gcal.html +HOMEPAGE= http://www.gnu.org/software/gcal/ COMMENT= GNU version of the standard calendar utility +LICENSE= gnu-gpl-v3 PKG_DESTDIR_SUPPORT= user-destdir -USE_PKGLOCALEDIR= yes - -INFO_FILES= # PLIST GNU_CONFIGURE= yes -USE_TOOLS+= msgfmt -BROKEN_GETTEXT_DETECTION= yes +USE_PKGLOCALEDIR= yes +INFO_FILES= yes -REPLACE_PERL+= misc/gcalltx/gcalltxp.in -USE_TOOLS+= perl:run +USE_TOOLS+= msgfmt xgettext msgmerge awk -INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} \ - localedir=${DESTDIR}${PREFIX}/${PKGLOCALEDIR}/locale \ - gnulocaledir=${DESTDIR}${PREFIX}/${PKGLOCALEDIR}/locale \ - infodir=${DESTDIR}${PREFIX}/${PKGINFODIR} \ - mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 +CHECK_FILES_SKIP+= lib/charset.alias .include "../../devel/gettext-lib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/time/gcal/PLIST b/time/gcal/PLIST index c2d45c94ef6..7db329d1090 100644 --- a/time/gcal/PLIST +++ b/time/gcal/PLIST @@ -1,30 +1,18 @@ -@comment $NetBSD: PLIST,v 1.6 2009/06/14 18:17:58 joerg Exp $ +@comment $NetBSD: PLIST,v 1.7 2011/02/02 13:48:06 ryoon Exp $ bin/gcal -bin/gcal-daily -bin/gcal-ddiff -bin/gcal-ddiffdrv -bin/gcal-dst -bin/gcal-gcalltx -bin/gcal-gcalltx.pl -bin/gcal-moon -bin/gcal-mrms -bin/gcal-srss -bin/gcal-wlocdrv bin/gcal2txt bin/tcal bin/txt2gcal info/gcal.info -man/man1/gcal.1 -man/man1/gcal2txt.1 -man/man1/tcal.1 -man/man1/txt2gcal.1 -share/gcal/CREDITS.dates +share/gcal/CREDITS +share/gcal/Makefile.in share/gcal/README -share/gcal/README.dates share/gcal/ancient share/gcal/ansipic.rc share/gcal/birthday.rc share/gcal/bkk.rc +share/gcal/cal2gcal.awk +share/gcal/cal2gcal.pl share/gcal/calendar.birth share/gcal/calendar.chris share/gcal/calendar.compu @@ -36,6 +24,8 @@ share/gcal/calendar.ushol share/gcal/can_holiday share/gcal/celtic share/gcal/computing +share/gcal/ct2gcal.awk +share/gcal/ct2gcal.pl share/gcal/de-mdata.rc share/gcal/de-sdata.rc share/gcal/events @@ -45,6 +35,7 @@ share/gcal/events3 share/gcal/events4 share/gcal/events5 share/gcal/events6 +share/gcal/gcalrc share/gcal/gdead share/gcal/hawaii share/gcal/literature @@ -58,54 +49,12 @@ share/gcal/lives6 share/gcal/lotr share/gcal/mdata.rc share/gcal/meteoric.rc -share/gcal/misc/README -share/gcal/misc/daily/daily -share/gcal/misc/daily/daily.awk -share/gcal/misc/daily/daily.pl -share/gcal/misc/daily/daily.rc -share/gcal/misc/ddiff/ddiff -share/gcal/misc/ddiff/ddiff1.awk -share/gcal/misc/ddiff/ddiff1.pl -share/gcal/misc/ddiff/ddiff2.awk -share/gcal/misc/ddiff/ddiff2.pl -share/gcal/misc/ddiff/ddiffdrv -share/gcal/misc/ddiff/ddiffdrv.awk -share/gcal/misc/ddiff/ddiffdrv.pl -share/gcal/misc/ddiff/zone.tab -share/gcal/misc/dst/dst -share/gcal/misc/dst/dst.awk -share/gcal/misc/dst/dst.pl -share/gcal/misc/gcalltx/gcalltx -share/gcal/misc/gcalltx/gcalltx.pl -share/gcal/misc/gcalltx/gcalltx.sed -share/gcal/misc/gcalmagic.add -share/gcal/misc/moon/moon -share/gcal/misc/mrms/mrms -share/gcal/misc/mrms/mrms.awk -share/gcal/misc/mrms/mrms.pl -share/gcal/misc/mrms/mrms.rc -share/gcal/misc/srss/srss -share/gcal/misc/srss/srss.awk -share/gcal/misc/srss/srss.pl -share/gcal/misc/srss/srss.rc -share/gcal/misc/wloc/wlocdrv -share/gcal/misc/wloc/wlocdrv1.awk -share/gcal/misc/wloc/wlocdrv1.pl -share/gcal/misc/wloc/wlocdrv2.awk -share/gcal/misc/wloc/wlocdrv2.pl -share/gcal/misc/wloc/zone.tab share/gcal/movies share/gcal/ms.rc share/gcal/music +share/gcal/old2v220.awk +share/gcal/old2v220.pl share/gcal/radio -share/gcal/scripts/cal2gcal.awk -share/gcal/scripts/cal2gcal.pl -share/gcal/scripts/ct2gcal.awk -share/gcal/scripts/ct2gcal.pl -share/gcal/scripts/old2v220.awk -share/gcal/scripts/old2v220.pl -share/gcal/scripts/v2x2v300.awk -share/gcal/scripts/v2x2v300.pl share/gcal/sdata.rc share/gcal/sfo share/gcal/space @@ -116,15 +65,23 @@ share/gcal/textpic.rc share/gcal/usa_holiday share/gcal/usa_other share/gcal/usa_states +share/gcal/v2x2v300.awk +share/gcal/v2x2v300.pl share/gcal/witchcraft share/gcal/wloc.rc share/gcal/world share/gcal/wtt1.rc share/gcal/wtt2.rc share/gcal/wtt3.rc +share/locale/ca/LC_MESSAGES/gcal.mo +share/locale/da/LC_MESSAGES/gcal.mo share/locale/de/LC_MESSAGES/gcal.mo +share/locale/es/LC_MESSAGES/gcal.mo share/locale/fr/LC_MESSAGES/gcal.mo +share/locale/lt/LC_MESSAGES/gcal.mo share/locale/nl/LC_MESSAGES/gcal.mo share/locale/pl/LC_MESSAGES/gcal.mo share/locale/ru/LC_MESSAGES/gcal.mo +share/locale/rw/LC_MESSAGES/gcal.mo share/locale/sv/LC_MESSAGES/gcal.mo +share/locale/tr/LC_MESSAGES/gcal.mo diff --git a/time/gcal/distinfo b/time/gcal/distinfo index 95746a4818e..972f531cfed 100644 --- a/time/gcal/distinfo +++ b/time/gcal/distinfo @@ -1,8 +1,5 @@ -$NetBSD: distinfo,v 1.4 2005/09/22 01:38:50 minskim Exp $ +$NetBSD: distinfo,v 1.5 2011/02/02 13:48:06 ryoon Exp $ -SHA1 (gcal-3.01.tar.gz) = 2f8dda0f759760c38beccd07fb73b18b392d6920 -RMD160 (gcal-3.01.tar.gz) = 01b54c72df3cbae242d221745343db4a9f3615cb -Size (gcal-3.01.tar.gz) = 2371244 bytes -SHA1 (patch-aa) = 4dd11184acc9e4f1d9dcba796a14b68adb012a87 -SHA1 (patch-ab) = eb85707cf22603be7ba43a3e1478b510c8d45645 -SHA1 (patch-ac) = 67fd170face9176330a94aa05133710848386aec +SHA1 (gcal-3.6.tar.gz) = 8aae14b37b1bf1aa752a99608a5909baf5aa30db +RMD160 (gcal-3.6.tar.gz) = 5751ceaee44f3b7ecb5ce8f036e65c2895189958 +Size (gcal-3.6.tar.gz) = 2672720 bytes diff --git a/time/gcal/patches/patch-aa b/time/gcal/patches/patch-aa deleted file mode 100644 index bb06baebdd8..00000000000 --- a/time/gcal/patches/patch-aa +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-aa,v 1.1 2004/09/10 03:34:29 atatat Exp $ - -Make declared prototype match function declaration. - ---- src/hd-astro.h.orig 2000-06-13 21:00:01.000000000 -0400 -+++ src/hd-astro.h -@@ -79,8 +79,8 @@ equinox_solstice __P_((const double lon - int *day, - int *month, - int *year, -- int hour, -- int min)); -+ const int hour, -+ const int min)); - EXPORT double - delta_t __P_((const int day, - const int month, diff --git a/time/gcal/patches/patch-ab b/time/gcal/patches/patch-ab deleted file mode 100644 index 316e2b46611..00000000000 --- a/time/gcal/patches/patch-ab +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2004/09/10 03:34:29 atatat Exp $ - -Make declared prototype match function declaration. - ---- src/rc-astro.h.orig 2000-06-13 21:00:01.000000000 -0400 -+++ src/rc-astro.h -@@ -81,9 +81,9 @@ gd_latitude2gc_latitude __P_((const doub - EXPORT double - sun_rise_set __P_((const Aevent_enum event, - const Bool is_limited, -- int day, -- int month, -- int year, -+ const int day, -+ const int month, -+ const int year, - Coor_struct *coordinates)); - EXPORT double - moon_rise_set __P_((const Aevent_enum event, diff --git a/time/gcal/patches/patch-ac b/time/gcal/patches/patch-ac deleted file mode 100644 index 96008aa5a91..00000000000 --- a/time/gcal/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2005/09/22 01:38:50 minskim Exp $ - ---- misc/Makefile.in.orig 2005-09-21 18:26:15.000000000 -0700 -+++ misc/Makefile.in -@@ -252,7 +252,7 @@ installaliasdirs: $(top_srcdir)/mkinstal - $(NORMAL_INSTALL) - $(SHELL) $(top_srcdir)/mkinstalldirs $(localedir) - --installalias: installalias-@USE_NLS@ -+installalias: #installalias-@USE_NLS@ - installalias-yes: $(srcdir)/locale.alias installaliasdirs - $(NORMAL_INSTALL) - @if test ! -f "$(localedir)/locale.alias"; \ -- cgit v1.2.3