Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 5 Feb 2020 21:59:14 +0000 (UTC)
From:      =?UTF-8?Q?Fernando_Apestegu=c3=ada?= <fernape@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r525352 - in head/deskutils/ical: . files
Message-ID:  <202002052159.015LxEJm050891@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: fernape
Date: Wed Feb  5 21:59:13 2020
New Revision: 525352
URL: https://svnweb.freebsd.org/changeset/ports/525352

Log:
  deskutils/ical: udpate to 3.0.4
  
  PR:     243520
  Submitted by:   fbsd@opal.com (maintainer)

Added:
  head/deskutils/ical/files/patch-time_Time.C   (contents, props changed)
Deleted:
  head/deskutils/ical/files/patch-bitmaps-dleft.xbm
  head/deskutils/ical/files/patch-bitmaps-done.xbm
  head/deskutils/ical/files/patch-bitmaps-dright.xbm
  head/deskutils/ical/files/patch-bitmaps-ical.xbm
  head/deskutils/ical/files/patch-bitmaps-left.xbm
  head/deskutils/ical/files/patch-bitmaps-right.xbm
  head/deskutils/ical/files/patch-bitmaps-sleft.xbm
  head/deskutils/ical/files/patch-bitmaps-sright.xbm
  head/deskutils/ical/files/patch-bitmaps-todo.xbm
  head/deskutils/ical/files/patch-cal_tcl.C
  head/deskutils/ical/files/patch-calendar_Makefile.in
  head/deskutils/ical/files/patch-calendar_calendar.C
  head/deskutils/ical/files/patch-calendar_calfile.C
  head/deskutils/ical/files/patch-config.h.in
  head/deskutils/ical/files/patch-configure
  head/deskutils/ical/files/patch-dateeditor.C
  head/deskutils/ical/files/patch-dispatch.C
  head/deskutils/ical/files/patch-item_tcl.C
  head/deskutils/ical/files/patch-main.C
  head/deskutils/ical/files/patch-object.C
  head/deskutils/ical/files/patch-pref.tcl
  head/deskutils/ical/files/patch-time_Makefile.in
  head/deskutils/ical/files/patch-time_tcl.C
  head/deskutils/ical/files/patch-types_Makefile.in
Modified:
  head/deskutils/ical/Makefile
  head/deskutils/ical/distinfo
  head/deskutils/ical/files/patch-Makefile.in
  head/deskutils/ical/pkg-descr
  head/deskutils/ical/pkg-plist

Modified: head/deskutils/ical/Makefile
==============================================================================
--- head/deskutils/ical/Makefile	Wed Feb  5 21:42:21 2020	(r525351)
+++ head/deskutils/ical/Makefile	Wed Feb  5 21:59:13 2020	(r525352)
@@ -2,44 +2,35 @@
 # $FreeBSD$
 
 PORTNAME=	ical
-PORTVERSION=	2.3.1
+PORTVERSION=	3.0.4
 CATEGORIES=	deskutils tk
-MASTER_SITES=	http://opal.com/jr/ical/
-
-PATCH_SITES=	http://www.isi.edu/~johnh/SOFTWARE/ICAL/ \
+MASTER_SITES=	https://launchpad.net/ical-tcl/+download/ \
 		http://opal.com/jr/ical/
-PATCHFILES=	ical-2.3.1-upvar.patch
 
 MAINTAINER=	fbsd@opal.com
 COMMENT=	Calendar application
 
 LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYRIGHT.GNU
 
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 
-USES=		tk xorg
+USES=		autoreconf:build gmake tk xorg
 USE_XORG=	x11 xext xft xrender xscrnsaver
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-tclconfig=${TCL_LIBDIR} \
-		--with-tclhdir=${TCL_INCLUDEDIR} \
-		--with-tclsh=${TCLSH} \
-		--with-tkconfig=${TK_LIBDIR} \
-		--with-tkhdir=${TK_INCLUDEDIR}
+CONFIGURE_ARGS=	--with-tkconfig=${TK_LIBDIR} \
+		--with-tclconfig=${TCL_LIBDIR} \
+		--with-tclsh=${TCLSH}
 MAKE_ENV=	STAGEDIR=${STAGEDIR}
 SUB_FILES=	pkg-message
-SUB_LIST+=	VERSION=${VERSION}
+SUB_LIST+=	VERSION=${PORTVERSION}
+WRKSRC=		${WRKDIR}/${PORTNAME}-tcl
 
 USER_TCL=	${HOME}/.tk/${PORTNAME}/user.tcl
-VERSION=	${PORTVERSION:C/([0-9]+\.[0-9]+)(\.[0-9]+)*/\1/}
 DIST_VER=	${DISTNAME:S/${PORTVERSION}/${VERSION}/}
 
-post-patch:
-	@${REINPLACE_CMD} -e 's,tcl->result,Tcl_GetStringResult(tcl),' \
-		${WRKSRC}/ical.C
-
 post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${DIST_VER}
+	@${RM} ${STAGEDIR}/${PREFIX}/lib/ical/v${PORTVERSION}/contrib/*.patch
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>

Modified: head/deskutils/ical/distinfo
==============================================================================
--- head/deskutils/ical/distinfo	Wed Feb  5 21:42:21 2020	(r525351)
+++ head/deskutils/ical/distinfo	Wed Feb  5 21:59:13 2020	(r525352)
@@ -1,5 +1,3 @@
-TIMESTAMP = 1576875998
-SHA256 (ical-2.3.1.tar.gz) = eeb7c6b8a8a36e9fe4cc5fb30dc9bb504e84d11b24fa295870e149fd89f71abd
-SIZE (ical-2.3.1.tar.gz) = 264576
-SHA256 (ical-2.3.1-upvar.patch) = 7b74f6f8011847e0cb1a0691674c0f89fe96b4296cd8891cf66867dc1627c0a0
-SIZE (ical-2.3.1-upvar.patch) = 4533
+TIMESTAMP = 1577134445
+SHA256 (ical-3.0.4.tar.gz) = 8d88bdf46fef7593308abc8b0cfb9e12e4cb08b1e5c95d0b43afd38375c5ae5c
+SIZE (ical-3.0.4.tar.gz) = 510640

Modified: head/deskutils/ical/files/patch-Makefile.in
==============================================================================
--- head/deskutils/ical/files/patch-Makefile.in	Wed Feb  5 21:42:21 2020	(r525351)
+++ head/deskutils/ical/files/patch-Makefile.in	Wed Feb  5 21:59:13 2020	(r525352)
@@ -1,34 +1,11 @@
---- Makefile.in.orig	1997-06-04 16:09:59 UTC
+--- Makefile.in.orig	2019-04-16 08:17:38 UTC
 +++ Makefile.in
-@@ -14,10 +14,10 @@
-  CONFIGURE_IN = @MFILES_IN@
-  CONFFILES    = $(srcdir)/configure.in
+@@ -404,7 +404,7 @@ app_DATA = ical.desktop
+ ical_SOURCES = cal_tcl.C dateeditor.C dispatch.C ical.C ical_tcl.C \
+ 	       item_tcl.C object.C time_tcl.C main.C
  
--       BINDIR = $(exec_prefix)/bin
--       LIBDIR = $(prefix)/lib
-+       BINDIR = $(STAGEDIR)$(exec_prefix)/bin
-+       LIBDIR = $(STAGEDIR)$(prefix)/lib
-       ILIBDIR = $(LIBDIR)/ical/v@ICAL_VERSION@
--       MANDIR = $(prefix)/man
-+       MANDIR = $(STAGEDIR)$(prefix)/man
+-ical_CPPFLAGS = -DICALLIBDIR='"$(icallibdir)"' -I$(srcdir)/calendar -I$(srcdir)/types -I$(srcdir)/time @TK_XINCLUDES@
++ical_CPPFLAGS = -DICALLIBDIR='"$(icallibdir)"' -I$(srcdir)/calendar -I$(srcdir)/types -I$(srcdir)/time @TCL_INCLUDE_SPEC@ @TK_INCLUDE_SPEC@ @TK_XINCLUDES@
+ ical_LDADD = libcalendar.a libtime.a libtypes.a \
+ 	     @TK_LIB_SPEC@ @TCL_LIB_SPEC@ @TK_LIBS@
  
-            CC = @CC@
-           CXX = @CXX@
-@@ -59,14 +59,12 @@
- # Tiny bundled executable uses shared versions of tcl/tk libraries
-  TINY_BLIBS = $(LIBS)
- 
--       OPTF = -O
--
--   CXXFLAGS = $(OPTF)
-     CXXINCS = -I. -I$(srcdir) -I$(srcdir)/calendar \
-               -I$(srcdir)/types -I$(srcdir)/time \
--              $(X_CFLAGS) -I@TCL_INCDIR@ -I@TK_INCDIR@
-+	      -I$(prefix)/include \
-+              $(X_CFLAGS) -I@TCL_INCDIR@ -I@TK_INCDIR@ \
- 
--     CFLAGS = $(OPTF) -I. -I$(srcdir) $(X_CFLAGS)
-+     CFLAGS += -I. -I$(srcdir) $(X_CFLAGS)
- 
- OBJS = cal_tcl.o dateeditor.o dispatch.o ical.o ical_tcl.o \
-        item_tcl.o object.o time_tcl.o @LIBOBJS@

Added: head/deskutils/ical/files/patch-time_Time.C
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/deskutils/ical/files/patch-time_Time.C	Wed Feb  5 21:59:13 2020	(r525352)
@@ -0,0 +1,10 @@
+--- time/Time.C.orig	2012-06-02 18:44:03 UTC
++++ time/Time.C
+@@ -4,7 +4,6 @@
+ #include <sys/types.h>
+ #include <math.h>
+ #include <string.h>
+-#include <alloca.h>
+ #include <stdlib.h>
+ 
+ #include "config.h"

Modified: head/deskutils/ical/pkg-descr
==============================================================================
--- head/deskutils/ical/pkg-descr	Wed Feb  5 21:42:21 2020	(r525351)
+++ head/deskutils/ical/pkg-descr	Wed Feb  5 21:59:13 2020	(r525352)
@@ -1,5 +1,4 @@
 Ical is an X based calendar program.
-
 * Calendar items can be created edited and deleted easily.
 * Items can be made to repeat in various ways.
 * Ical will post reminders for upcoming appointments.
@@ -10,8 +9,16 @@ Ical is an X based calendar program.
 This software was developed by the original author, Sanjay Ghemawat
 from 1993-1997.  His last version was v2.2.  As system developments
 warranted it, other folks published patches and maintenance releases
-in order to keep Ical working.  Version v2.3.1 is such a release.
+in order to keep Ical working.  Versions v2.3.1 and 2.3.2 are such
+releases.  In 2008, renewed interest in Ical led to new features
+such as timezone support, link support, key bindings and per-calendar
+colors.  This is the v3.0.x series of releases.
 
 WWW: http://opal.com/jr/ical/
+WWW: https://launchpad.net/ical-tcl/
+WWW: https://blog.tcl.tk/1861
 WWW: http://www.isi.edu/~johnh/SOFTWARE/ICAL/
+#WWW: http://www.annexia.org/freeware/ical/
 #WWW: ftp://ftp.sunet.se/pub/vendor/sco/skunkware/src/shellutil/
+#WWW: http://clef.lcs.mit.edu/%7Esanjay/ical.html
+#WWW: http://www.research.digital.com/SRC/personal/Sanjay_Ghemawat/ical/doc.html

Modified: head/deskutils/ical/pkg-plist
==============================================================================
--- head/deskutils/ical/pkg-plist	Wed Feb  5 21:42:21 2020	(r525351)
+++ head/deskutils/ical/pkg-plist	Wed Feb  5 21:59:13 2020	(r525352)
@@ -1,64 +1,77 @@
 bin/ical
-bin/ical-2.3
-lib/ical/v2.3/actions.tcl
-lib/ical/v2.3/alarm.tcl
-lib/ical/v2.3/apptlist.tcl
-lib/ical/v2.3/canvsup.tcl
-lib/ical/v2.3/contrib/README
-lib/ical/v2.3/contrib/ical.spec
-lib/ical/v2.3/contrib/ical.xbm
-lib/ical/v2.3/contrib/ical.xpm
-lib/ical/v2.3/contrib/ical2calendar
-lib/ical/v2.3/contrib/ical2html
-lib/ical/v2.3/contrib/ical2zsh
-lib/ical/v2.3/contrib/icaladd
-lib/ical/v2.3/contrib/icaladdlines
-lib/ical/v2.3/contrib/icalexpire
-lib/ical/v2.3/contrib/icalweekly
-lib/ical/v2.3/contrib/iconwindow.tcl
-lib/ical/v2.3/contrib/timeofday.tcl
-lib/ical/v2.3/contrib/weeknumber.tcl
-lib/ical/v2.3/dateeditor.tcl
-lib/ical/v2.3/dayview.tcl
-lib/ical/v2.3/dg_alarms.tcl
-lib/ical/v2.3/dg_item.tcl
-lib/ical/v2.3/dg_key.tcl
-lib/ical/v2.3/dg_monthr.tcl
-lib/ical/v2.3/dg_print.tcl
-lib/ical/v2.3/dg_range.tcl
-lib/ical/v2.3/dg_wdays.tcl
-lib/ical/v2.3/help.tcl
-lib/ical/v2.3/ical_text.tcl
-lib/ical/v2.3/ical_x.tcl
-lib/ical/v2.3/io.tcl
-lib/ical/v2.3/itemlist.tcl
-lib/ical/v2.3/itemwindow.tcl
-lib/ical/v2.3/link.tcl
-lib/ical/v2.3/listing.tcl
-lib/ical/v2.3/notelist.tcl
-lib/ical/v2.3/parse.tcl
-lib/ical/v2.3/pref.tcl
-lib/ical/v2.3/print.tcl
-lib/ical/v2.3/support.tcl
-lib/ical/v2.3/tclIndex
-lib/ical/v2.3/tcllib/canvas.tcl
-lib/ical/v2.3/tcllib/class.tcl
-lib/ical/v2.3/tcllib/dg_bug.tcl
-lib/ical/v2.3/tcllib/dg_error.tcl
-lib/ical/v2.3/tcllib/dg_file.tcl
-lib/ical/v2.3/tcllib/dg_num.tcl
-lib/ical/v2.3/tcllib/dg_string.tcl
-lib/ical/v2.3/tcllib/dg_yn.tcl
-lib/ical/v2.3/tcllib/dg_ync.tcl
-lib/ical/v2.3/tcllib/filesel.tcl
-lib/ical/v2.3/tcllib/hooks.tcl
-lib/ical/v2.3/tcllib/key.tcl
-lib/ical/v2.3/tcllib/label.tcl
-lib/ical/v2.3/tcllib/menus.tcl
-lib/ical/v2.3/tcllib/ruler.tcl
-lib/ical/v2.3/tcllib/support.tcl
-lib/ical/v2.3/tcllib/tclIndex
-lib/ical/v2.3/tcllib/textwin.tcl
-lib/ical/v2.3/timerange.tcl
-lib/ical/v2.3/trigger.tcl
+lib/ical/v3.0.4/actions.tcl
+lib/ical/v3.0.4/alarm.tcl
+lib/ical/v3.0.4/apptlist.tcl
+lib/ical/v3.0.4/canvsup.tcl
+lib/ical/v3.0.4/contrib/README
+lib/ical/v3.0.4/contrib/calicon.tcl
+lib/ical/v3.0.4/contrib/ical-script
+lib/ical/v3.0.4/contrib/ical.spec
+lib/ical/v3.0.4/contrib/ical.xbm
+lib/ical/v3.0.4/contrib/ical.xpm
+lib/ical/v3.0.4/contrib/ical2calendar
+lib/ical/v3.0.4/contrib/ical2html
+lib/ical/v3.0.4/contrib/ical2ics
+lib/ical/v3.0.4/contrib/ical2zsh
+lib/ical/v3.0.4/contrib/ical_icon.png
+lib/ical/v3.0.4/contrib/icaladd
+lib/ical/v3.0.4/contrib/icaladdlines
+lib/ical/v3.0.4/contrib/icalexpire
+lib/ical/v3.0.4/contrib/icalweekly
+lib/ical/v3.0.4/contrib/icon.png
+lib/ical/v3.0.4/contrib/iconwindow.tcl
+lib/ical/v3.0.4/contrib/oster_termine
+lib/ical/v3.0.4/contrib/public_item.tcl
+lib/ical/v3.0.4/contrib/publical
+lib/ical/v3.0.4/contrib/timeofday.tcl
+lib/ical/v3.0.4/contrib/weeknumber.tcl
+lib/ical/v3.0.4/dateeditor.tcl
+lib/ical/v3.0.4/dayview.tcl
+lib/ical/v3.0.4/dg_alarms.tcl
+lib/ical/v3.0.4/dg_colors.tcl
+lib/ical/v3.0.4/dg_item.tcl
+lib/ical/v3.0.4/dg_key.tcl
+lib/ical/v3.0.4/dg_monthr.tcl
+lib/ical/v3.0.4/dg_print.tcl
+lib/ical/v3.0.4/dg_range.tcl
+lib/ical/v3.0.4/dg_wdays.tcl
+lib/ical/v3.0.4/help.tcl
+lib/ical/v3.0.4/ical_doc.tcl
+lib/ical/v3.0.4/ical_text.tcl
+lib/ical/v3.0.4/ical_x.tcl
+lib/ical/v3.0.4/interface_doc.tcl
+lib/ical/v3.0.4/io.tcl
+lib/ical/v3.0.4/itemlist.tcl
+lib/ical/v3.0.4/itemwindow.tcl
+lib/ical/v3.0.4/link.tcl
+lib/ical/v3.0.4/listing.tcl
+lib/ical/v3.0.4/notelist.tcl
+lib/ical/v3.0.4/parse.tcl
+lib/ical/v3.0.4/pref.tcl
+lib/ical/v3.0.4/print.tcl
+lib/ical/v3.0.4/ps_header.tcl
+lib/ical/v3.0.4/startup.tcl
+lib/ical/v3.0.4/support.tcl
+lib/ical/v3.0.4/tclIndex
+lib/ical/v3.0.4/tcllib/canvas.tcl
+lib/ical/v3.0.4/tcllib/class.tcl
+lib/ical/v3.0.4/tcllib/dg_bug.tcl
+lib/ical/v3.0.4/tcllib/dg_error.tcl
+lib/ical/v3.0.4/tcllib/dg_file.tcl
+lib/ical/v3.0.4/tcllib/dg_num.tcl
+lib/ical/v3.0.4/tcllib/dg_string.tcl
+lib/ical/v3.0.4/tcllib/dg_yn.tcl
+lib/ical/v3.0.4/tcllib/dg_ync.tcl
+lib/ical/v3.0.4/tcllib/filesel.tcl
+lib/ical/v3.0.4/tcllib/hooks.tcl
+lib/ical/v3.0.4/tcllib/key.tcl
+lib/ical/v3.0.4/tcllib/label.tcl
+lib/ical/v3.0.4/tcllib/menus.tcl
+lib/ical/v3.0.4/tcllib/ruler.tcl
+lib/ical/v3.0.4/tcllib/support.tcl
+lib/ical/v3.0.4/tcllib/tclIndex
+lib/ical/v3.0.4/tcllib/textwin.tcl
+lib/ical/v3.0.4/timerange.tcl
+lib/ical/v3.0.4/trigger.tcl
 man/man1/ical.1.gz
+share/applications/ical.desktop



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002052159.015LxEJm050891>