[pkgsrc/trunk]: pkgsrc/time/ical Switch to Tcl/Tk 8.4, bl3ify, and enable pkg...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/68a5df65e0d2
branches:  trunk
changeset: 471850:68a5df65e0d2
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Thu Apr 01 00:52:39 2004 +0000

description:
Switch to Tcl/Tk 8.4, bl3ify, and enable pkgviews installation.
Bump PKGREVISION due to Tcl/Tk dependency changes.

diffstat:

 time/ical/Makefile         |   16 +-
 time/ical/distinfo         |   16 +-
 time/ical/patches/patch-ac |  275 +++++++++++++++++++++++++++-
 time/ical/patches/patch-ad |  442 ++++++++++++++++++++++++++++++++++++++++++--
 time/ical/patches/patch-ae |   53 +++++
 time/ical/patches/patch-af |   20 ++
 time/ical/patches/patch-ag |   12 +
 time/ical/patches/patch-ah |   13 +
 time/ical/patches/patch-ai |   13 +
 time/ical/patches/patch-aj |   27 ++
 time/ical/patches/patch-ak |   13 +
 time/ical/patches/patch-al |   40 ++++
 time/ical/patches/patch-am |   31 +++
 time/ical/patches/patch-an |   26 ++
 14 files changed, 958 insertions(+), 39 deletions(-)

diffs (truncated from 1174 to 300 lines):

diff -r 5e392fca6f11 -r 68a5df65e0d2 time/ical/Makefile
--- a/time/ical/Makefile        Wed Mar 31 23:46:14 2004 +0000
+++ b/time/ical/Makefile        Thu Apr 01 00:52:39 2004 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2004/03/19 08:34:01 bouyer Exp $
+# $NetBSD: Makefile,v 1.10 2004/04/01 00:52:39 minskim Exp $
 
 DISTNAME=      ical-2.2.1
+PKGREVISION=   1
 CATEGORIES=    time
 MASTER_SITES=  http://members.nbci.com/majahj/ical/
 
@@ -8,14 +9,16 @@
 HOMEPAGE=      http://members.nbci.com/majahj/ical/
 COMMENT=       Calendar application
 
-USE_BUILDLINK2=        yes
+PKG_INSTALLATION_TYPES=        overwrite pkgviews
+
+USE_BUILDLINK3=        yes
 USE_LANGUAGES= c c++
 USE_X11=       yes
 GNU_CONFIGURE= yes
 CONFIGURE_ARGS=        --prefix=${PREFIX} \
-               --with-tclconfig=${PREFIX}/lib \
-               --with-tclsh=${PREFIX}/bin/tclsh \
-               --with-tkconfig=${PREFIX}/lib
+               --with-tclconfig=${BUILDLINK_PREFIX.tcl}/lib \
+               --with-tclsh=${BUILDLINK_PREFIX.tcl}/bin/tclsh \
+               --with-tkconfig=${BUILDLINK_PREFIX.tk}/lib
 
 post-configure:
        ${TOUCH} ${WRKDIR}/${DISTNAME}/Makefile \
@@ -23,5 +26,6 @@
                 ${WRKDIR}/${DISTNAME}/startup.tcl \
                 ${WRKDIR}/${DISTNAME}/time/Makefile
 
-.include "../../x11/tk83/buildlink2.mk"
+.include "../../lang/tcl/buildlink3.mk"
+.include "../../x11/tk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 5e392fca6f11 -r 68a5df65e0d2 time/ical/distinfo
--- a/time/ical/distinfo        Wed Mar 31 23:46:14 2004 +0000
+++ b/time/ical/distinfo        Thu Apr 01 00:52:39 2004 +0000
@@ -1,8 +1,18 @@
-$NetBSD: distinfo,v 1.4 2003/10/02 20:14:23 tron Exp $
+$NetBSD: distinfo,v 1.5 2004/04/01 00:52:39 minskim Exp $
 
 SHA1 (ical-2.2.1.tar.gz) = ba6af590a4d81360f6933762f2adab0886bb4e5f
 Size (ical-2.2.1.tar.gz) = 261959 bytes
 SHA1 (patch-aa) = 238d2d4ce21cc60ec0eaae854aa722ca0486701d
 SHA1 (patch-ab) = 17ad50ae2815a56590ab9e8745f790782e3b18d4
-SHA1 (patch-ac) = 002612db5040469d0f316893a40eb067d94e677e
-SHA1 (patch-ad) = 8d77fd27aad3d6a19cbe1596d716eec78203c5ba
+SHA1 (patch-ac) = 8fc75ec309325eb46c0a024d99a3b6dfb3f26cae
+SHA1 (patch-ad) = 251c01e9922f6f6fb353b18a9c4c58c7ebde76ca
+SHA1 (patch-ae) = be5885bb63149db74dbddc95dd346fdbccc13087
+SHA1 (patch-af) = 48d148d37bba928e470e02037325bedb9b460406
+SHA1 (patch-ag) = c1fb1fdbca761f19b66ac8405d3e78d4a1e9076e
+SHA1 (patch-ah) = f80d4792d0f980c8b7606bdc9c78378bb18b3b21
+SHA1 (patch-ai) = 2379fc3829e6ec844f9ade5163e9243dc71c13ce
+SHA1 (patch-aj) = f41d1049e258ece3f0928f9be399111aac4391fc
+SHA1 (patch-ak) = bd9fd4cef88050a09c6765b9f483904808e470dd
+SHA1 (patch-al) = 39096e3102a81191c980c70efb5a44f1032d6f9e
+SHA1 (patch-am) = bdba66e18987c46482b13effa678952908beb536
+SHA1 (patch-an) = df67d141a4e08a8a525940777a37177a6849b356
diff -r 5e392fca6f11 -r 68a5df65e0d2 time/ical/patches/patch-ac
--- a/time/ical/patches/patch-ac        Wed Mar 31 23:46:14 2004 +0000
+++ b/time/ical/patches/patch-ac        Thu Apr 01 00:52:39 2004 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.1 2001/10/15 17:09:44 tron Exp $
+$NetBSD: patch-ac,v 1.2 2004/04/01 00:52:39 minskim Exp $
 
---- cal_tcl.C.orig     Fri Jun 30 15:23:29 2000
-+++ cal_tcl.C  Mon Oct 15 19:04:22 2001
+--- cal_tcl.C.orig     2000-06-30 08:23:29.000000000 -0500
++++ cal_tcl.C
 @@ -16,6 +16,9 @@
  #include "calfile.h"
  #include "uid.h"
@@ -12,7 +12,162 @@
  implementArray(FileList,CalFile*)
  
  Calendar_Tcl::Calendar_Tcl(Tcl_Interp* tcl, char const* h, char const* f)
-@@ -517,7 +520,7 @@
+@@ -192,27 +195,27 @@ void Calendar_Tcl::add_error(char const*
+ /*
+  * Forward declaration of handler procedures.
+  */
+-static int cal_delete (ClientData, Tcl_Interp*, int, char*[]);
+-static int cal_main   (ClientData, Tcl_Interp*, int, char*[]);
+-static int cal_include        (ClientData, Tcl_Interp*, int, char*[]);
+-static int cal_exclude        (ClientData, Tcl_Interp*, int, char*[]);
+-static int cal_forincs        (ClientData, Tcl_Interp*, int, char*[]);
+-static int cal_add    (ClientData, Tcl_Interp*, int, char*[]);
+-static int cal_remove (ClientData, Tcl_Interp*, int, char*[]);
+-static int cal_hide   (ClientData, Tcl_Interp*, int, char*[]);
+-static int cal_ronly  (ClientData, Tcl_Interp*, int, char*[]);
+-static int cal_dirty  (ClientData, Tcl_Interp*, int, char*[]);
+-static int cal_stale  (ClientData, Tcl_Interp*, int, char*[]);
+-static int cal_save   (ClientData, Tcl_Interp*, int, char*[]);
+-static int cal_reread (ClientData, Tcl_Interp*, int, char*[]);
+-static int cal_query  (ClientData, Tcl_Interp*, int, char*[]);
+-static int cal_listing        (ClientData, Tcl_Interp*, int, char*[]);
+-static int cal_loop   (ClientData, Tcl_Interp*, int, char*[]);
+-static int cal_incal  (ClientData, Tcl_Interp*, int, char*[]);
+-static int cal_option (ClientData, Tcl_Interp*, int, char*[]);
+-static int cal_doption        (ClientData, Tcl_Interp*, int, char*[]);
+-static int cal_loopf  (ClientData, Tcl_Interp*, int, char*[]);
+-static int cal_loopb  (ClientData, Tcl_Interp*, int, char*[]);
++static int cal_delete (ClientData, Tcl_Interp*, int, const char*[]);
++static int cal_main   (ClientData, Tcl_Interp*, int, const char*[]);
++static int cal_include        (ClientData, Tcl_Interp*, int, const char*[]);
++static int cal_exclude        (ClientData, Tcl_Interp*, int, const char*[]);
++static int cal_forincs        (ClientData, Tcl_Interp*, int, const char*[]);
++static int cal_add    (ClientData, Tcl_Interp*, int, const char*[]);
++static int cal_remove (ClientData, Tcl_Interp*, int, const char*[]);
++static int cal_hide   (ClientData, Tcl_Interp*, int, const char*[]);
++static int cal_ronly  (ClientData, Tcl_Interp*, int, const char*[]);
++static int cal_dirty  (ClientData, Tcl_Interp*, int, const char*[]);
++static int cal_stale  (ClientData, Tcl_Interp*, int, const char*[]);
++static int cal_save   (ClientData, Tcl_Interp*, int, const char*[]);
++static int cal_reread (ClientData, Tcl_Interp*, int, const char*[]);
++static int cal_query  (ClientData, Tcl_Interp*, int, const char*[]);
++static int cal_listing        (ClientData, Tcl_Interp*, int, const char*[]);
++static int cal_loop   (ClientData, Tcl_Interp*, int, const char*[]);
++static int cal_incal  (ClientData, Tcl_Interp*, int, const char*[]);
++static int cal_option (ClientData, Tcl_Interp*, int, const char*[]);
++static int cal_doption        (ClientData, Tcl_Interp*, int, const char*[]);
++static int cal_loopf  (ClientData, Tcl_Interp*, int, const char*[]);
++static int cal_loopb  (ClientData, Tcl_Interp*, int, const char*[]);
+ 
+ static Dispatch_Entry calendar_dispatch[] = {
+     { "delete",               0, 0, cal_delete        },
+@@ -243,7 +246,7 @@ static Dispatch_Entry calendar_dispatch[
+ // query operations.
+ 
+ static int parse_items(Tcl_Interp* tcl, Calendar_Tcl* cal, ItemList& items,
+-                     int& argc, char**& argv)
++                     int& argc, const char**& argv)
+ {
+     // modifies       items, argc, argv
+     // effects        If "argc/argv" starts with "-all", then strips off
+@@ -282,7 +285,7 @@ static int parse_items(Tcl_Interp* tcl, 
+ 
+     if ((argc >= 2) && (strcmp(argv[0], "-items") == 0)) {
+       int count;
+-      char** list;
++      const char** list;
+       if (Tcl_SplitList(tcl, argv[1], &count, &list) != TCL_OK) {
+           TCL_Error(tcl, "invalid item list");
+       }
+@@ -309,23 +312,23 @@ static int parse_items(Tcl_Interp* tcl, 
+     return TCL_OK;
+ }
+ 
+-int Calendar_Tcl::method(int argc, char* argv[]) {
++int Calendar_Tcl::method(int argc, const char* argv[]) {
+     return Dispatch(calendar_dispatch, (ClientData)this, tcl(), argc, argv);
+ }
+ 
+-static int cal_delete(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
++static int cal_delete(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]){
+     Calendar_Tcl* cal = (Calendar_Tcl*) c;
+     delete cal;
+ 
+     TCL_Return(tcl, "");
+ }
+ 
+-static int cal_main(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
++static int cal_main(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]){
+     Calendar_Tcl* cal = (Calendar_Tcl*) c;
+     TCL_Return(tcl, (char*) cal->main->GetName());
+ }
+ 
+-static int cal_include(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
++static int cal_include(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]){
+     Calendar_Tcl* cal = (Calendar_Tcl*) c;
+ 
+     if (cal->main->GetCalendar()->ReadOnly()) {
+@@ -348,7 +351,7 @@ static int cal_include(ClientData c, Tcl
+     TCL_Return(tcl, "");
+ }
+ 
+-static int cal_exclude(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
++static int cal_exclude(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]){
+     Calendar_Tcl* cal = (Calendar_Tcl*) c;
+ 
+     if (cal->main->GetCalendar()->ReadOnly()) {
+@@ -381,11 +384,11 @@ static int cal_exclude(ClientData c, Tcl
+     TCL_Error(tcl, "no such calendar");
+ }
+ 
+-static int cal_forincs(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
++static int cal_forincs(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]){
+     Calendar_Tcl* cal = (Calendar_Tcl*) c;
+ 
+-    char* var = argv[0];
+-    char* body = argv[1];
++    const char* var = argv[0];
++    const char* body = argv[1];
+     for (int i = 0; i < cal->includes->size(); i++) {
+       if (Tcl_SetVar(tcl, var, (char*) (cal->includes->slot(i)->GetName()),
+                      0) == NULL) {
+@@ -401,7 +404,7 @@ static int cal_forincs(ClientData c, Tcl
+     TCL_Return(tcl, "");
+ }
+ 
+-static int cal_add(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
++static int cal_add(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]){
+     Calendar_Tcl* cal = (Calendar_Tcl*) c;
+ 
+     // Find item
+@@ -444,7 +447,7 @@ static int cal_add(ClientData c, Tcl_Int
+     TCL_Return(tcl, "");
+ }
+ 
+-static int cal_remove(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
++static int cal_remove(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]){
+     Calendar_Tcl* cal = (Calendar_Tcl*) c;
+ 
+     // Find item
+@@ -471,7 +474,7 @@ static int cal_remove(ClientData c, Tcl_
+     TCL_Return(tcl, "");
+ }
+ 
+-static int cal_hide(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
++static int cal_hide(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]){
+     Calendar_Tcl* cal = (Calendar_Tcl*) c;
+ 
+     // Find item
+@@ -509,7 +512,7 @@ static int cal_hide(ClientData c, Tcl_In
+     TCL_Return(tcl, "");
+ }
+ 
+-static int cal_ronly(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
++static int cal_ronly(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]){
+     Calendar_Tcl* cal = (Calendar_Tcl*) c;
+ 
+     CalFile* file = cal->name2file(argv[0]);
+@@ -517,10 +520,10 @@ static int cal_ronly(ClientData c, Tcl_I
        TCL_Error(tcl, "no such calendar");
      }
  
@@ -20,8 +175,12 @@
 +    TCL_Return(tcl, file->GetCalendar()->ReadOnly() ? One : Zero);
  }
  
- static int cal_dirty(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
-@@ -528,7 +531,7 @@
+-static int cal_dirty(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
++static int cal_dirty(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]){
+     Calendar_Tcl* cal = (Calendar_Tcl*) c;
+ 
+     CalFile* file = cal->name2file(argv[0]);
+@@ -528,10 +531,10 @@ static int cal_dirty(ClientData c, Tcl_I
        TCL_Error(tcl, "no such calendar");
      }
  
@@ -29,8 +188,12 @@
 +    TCL_Return(tcl, (file->IsModified() ? One : Zero));
  }
  
- static int cal_stale(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
-@@ -539,7 +542,7 @@
+-static int cal_stale(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
++static int cal_stale(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]){
+     Calendar_Tcl* cal = (Calendar_Tcl*) c;
+ 
+     CalFile* file = cal->name2file(argv[0]);
+@@ -539,10 +542,10 @@ static int cal_stale(ClientData c, Tcl_I
        TCL_Error(tcl, "no such calendar");
      }
  
@@ -38,4 +201,98 @@
 +    TCL_Return(tcl, (file->FileHasChanged() ? One : Zero));
  }
  
- static int cal_save(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
+-static int cal_save(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
++static int cal_save(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]){
+     Calendar_Tcl* cal = (Calendar_Tcl*) c;
+ 
+     CalFile* file = cal->name2file(argv[0]);
+@@ -561,7 +564,7 @@ static int cal_save(ClientData c, Tcl_In
+     TCL_Return(tcl, "");
+ }
+ 
+-static int cal_reread(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
++static int cal_reread(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]){
+     Calendar_Tcl* cal = (Calendar_Tcl*) c;
+ 
+     CalFile* file = cal->name2file(argv[0]);
+@@ -602,7 +605,7 @@ static int cal_reread(ClientData c, Tcl_
+ //            If "body" says "continue", move to the next iteration
+ 
+ static int item_loop(Tcl_Interp* tcl, Occurrences const& list,
+-                   char* ivar, char* dvar, char* body) {
++                   const char* ivar, const char* dvar, const char* body) {
+     for (int i = 0; i < list.size(); i++) {