head	1.5;
access;
symbols
	pkgsrc-2013Q2:1.5.0.2
	pkgsrc-2013Q2-base:1.5
	pkgsrc-2012Q4:1.4.0.16
	pkgsrc-2012Q4-base:1.4
	pkgsrc-2012Q3:1.4.0.14
	pkgsrc-2012Q3-base:1.4
	pkgsrc-2012Q2:1.4.0.12
	pkgsrc-2012Q2-base:1.4
	pkgsrc-2012Q1:1.4.0.10
	pkgsrc-2012Q1-base:1.4
	pkgsrc-2011Q4:1.4.0.8
	pkgsrc-2011Q4-base:1.4
	pkgsrc-2011Q3:1.4.0.6
	pkgsrc-2011Q3-base:1.4
	pkgsrc-2011Q2:1.4.0.4
	pkgsrc-2011Q2-base:1.4
	pkgsrc-2011Q1:1.4.0.2
	pkgsrc-2011Q1-base:1.4
	pkgsrc-2009Q4:1.3.0.40
	pkgsrc-2009Q4-base:1.3
	pkgsrc-2008Q4:1.3.0.38
	pkgsrc-2008Q4-base:1.3
	pkgsrc-2008Q3:1.3.0.36
	pkgsrc-2008Q3-base:1.3
	cube-native-xorg:1.3.0.34
	cube-native-xorg-base:1.3
	pkgsrc-2008Q2:1.3.0.32
	pkgsrc-2008Q2-base:1.3
	pkgsrc-2008Q1:1.3.0.30
	pkgsrc-2008Q1-base:1.3
	pkgsrc-2007Q4:1.3.0.28
	pkgsrc-2007Q4-base:1.3
	pkgsrc-2007Q3:1.3.0.26
	pkgsrc-2007Q3-base:1.3
	pkgsrc-2007Q2:1.3.0.24
	pkgsrc-2007Q2-base:1.3
	pkgsrc-2007Q1:1.3.0.22
	pkgsrc-2007Q1-base:1.3
	pkgsrc-2006Q4:1.3.0.20
	pkgsrc-2006Q4-base:1.3
	pkgsrc-2006Q3:1.3.0.18
	pkgsrc-2006Q3-base:1.3
	pkgsrc-2006Q2:1.3.0.16
	pkgsrc-2006Q2-base:1.3
	pkgsrc-2006Q1:1.3.0.14
	pkgsrc-2006Q1-base:1.3
	pkgsrc-2005Q4:1.3.0.12
	pkgsrc-2005Q4-base:1.3
	pkgsrc-2005Q3:1.3.0.10
	pkgsrc-2005Q3-base:1.3
	pkgsrc-2005Q2:1.3.0.8
	pkgsrc-2005Q2-base:1.3
	pkgsrc-2005Q1:1.3.0.6
	pkgsrc-2005Q1-base:1.3
	pkgsrc-2004Q4:1.3.0.4
	pkgsrc-2004Q4-base:1.3
	pkgsrc-2004Q3:1.3.0.2
	pkgsrc-2004Q3-base:1.3
	pkgsrc-2004Q2:1.2.0.2
	pkgsrc-2004Q2-base:1.2
	pkgsrc-2004Q1:1.1.0.12
	pkgsrc-2004Q1-base:1.1
	pkgsrc-2003Q4:1.1.0.10
	pkgsrc-2003Q4-base:1.1
	netbsd-1-6-1:1.1.0.6
	netbsd-1-6-1-base:1.1
	netbsd-1-6:1.1.0.8
	netbsd-1-6-RELEASE-base:1.1
	pkgviews:1.1.0.4
	pkgviews-base:1.1
	buildlink2:1.1.0.2
	buildlink2-base:1.1
	netbsd-1-5-PATCH003:1.1;
locks; strict;
comment	@# @;


1.5
date	2013.01.09.17.22.14;	author is;	state dead;
branches;
next	1.4;

1.4
date	2011.01.29.22.53.29;	author markd;	state Exp;
branches;
next	1.3;

1.3
date	2004.09.08.15.40.07;	author wulf;	state dead;
branches;
next	1.2;

1.2
date	2004.04.01.00.52.39;	author minskim;	state Exp;
branches;
next	1.1;

1.1
date	2001.10.15.17.09.44;	author tron;	state Exp;
branches;
next	;


desc
@@


1.5
log
@Upgrade from the no-longer-maintained 2.x to 3.0.2. This fixes pkg/47421
@
text
@$NetBSD: patch-ac,v 1.4 2011/01/29 22:53:29 markd Exp $

Fix build with gcc4.5

--- calendar/calfile.C.orig	2004-03-11 11:26:56.000000000 +0000
+++ calendar/calfile.C
@@@@ -58,7 +58,7 @@@@ CalFile::CalFile(int ro, const char* nam
     backupName = tmp;
 
     // Get directory name for access checks
-    char* lastSlash = strrchr(name, '/');
+    const char* lastSlash = strrchr(name, '/');
     if (lastSlash == 0) {
 	/* Calendar is in current directory */
 	tmp = new char[3];
@


1.4
log
@Fix build with gcc4.5
@
text
@d1 1
a1 1
$NetBSD$
@


1.3
log
@Fixed problem reported in RP 26866 and updated ical to 2.3.1
@
text
@d1 1
a1 1
$NetBSD: patch-ac,v 1.2 2004/04/01 00:52:39 minskim Exp $
d3 13
a15 296
--- 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"
 
+static char One[2] = "1";
+static char Zero[2] = "0";
+
 implementArray(FileList,CalFile*)
 
 Calendar_Tcl::Calendar_Tcl(Tcl_Interp* tcl, char const* h, char const* f)
@@@@ -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");
     }
 
-    TCL_Return(tcl, file->GetCalendar()->ReadOnly() ? "1" : "0");
+    TCL_Return(tcl, file->GetCalendar()->ReadOnly() ? One : Zero);
 }
 
-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");
     }
 
-    TCL_Return(tcl, (file->IsModified() ? "1" : "0"));
+    TCL_Return(tcl, (file->IsModified() ? One : Zero));
 }
 
-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");
     }
 
-    TCL_Return(tcl, (file->FileHasChanged() ? "1" : "0"));
+    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, 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++) {
 	if (Tcl_SetVar(tcl, ivar, (char*) list[i].item->handle(), 0) == NULL) {
 	    TCL_Error(tcl, "could not set loop variable");
@@@@ -624,7 +627,7 @@@@ static int item_loop(Tcl_Interp* tcl, Oc
     TCL_Return(tcl, "");
 }
 
-static int cal_query(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
+static int cal_query(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]){
     Calendar_Tcl* cal = (Calendar_Tcl*) c;
 
     ItemList items;
@@@@ -651,7 +654,7 @@@@ static int cal_query(ClientData c, Tcl_I
     return (item_loop(tcl, list, argv[2], argv[3], argv[4]));
 }
 
-static int cal_loopf(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
+static int cal_loopf(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]){
     Calendar_Tcl* cal = (Calendar_Tcl*) c;
 
     ItemList items;
@@@@ -718,7 +721,7 @@@@ static int cal_loopf(ClientData c, Tcl_I
     TCL_Return(tcl, "");
 }
 
-static int cal_loopb(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
+static int cal_loopb(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]){
     Calendar_Tcl* cal = (Calendar_Tcl*) c;
 
     ItemList items;
@@@@ -785,7 +788,7 @@@@ static int cal_loopb(ClientData c, Tcl_I
     TCL_Return(tcl, "");
 }
 
-static int cal_listing(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
+static int cal_listing(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]){
     Calendar_Tcl* cal = (Calendar_Tcl*) c;
 
     ItemList items;
@@@@ -812,7 +815,7 @@@@ static int cal_listing(ClientData c, Tcl
     return (item_loop(tcl, list, argv[2], argv[3], argv[4]));
 }
 
-static int cal_loop(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
+static int cal_loop(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]){
     Calendar_Tcl* cal = (Calendar_Tcl*) c;
 
     ItemList items;
@@@@ -838,7 +841,7 @@@@ static int cal_loop(ClientData c, Tcl_In
     return (item_loop(tcl, list, argv[0], 0, argv[1]));
 }
 
-static int cal_incal(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
+static int cal_incal(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]){
     Calendar_Tcl* cal = (Calendar_Tcl*) c;
 
     CalFile* file = cal->name2file(argv[0]);
@@@@ -868,7 +871,7 @@@@ static int cal_incal(ClientData c, Tcl_I
     return (item_loop(tcl, list, argv[1], 0, argv[2]));
 }
 
-static int cal_option(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
+static int cal_option(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]) {
     Calendar_Tcl* cal = (Calendar_Tcl*) c;
     CalFile* file = cal->main;
 
@@@@ -899,7 +902,7 @@@@ static int cal_option(ClientData c, Tcl_
     TCL_Return(tcl, "");
 }
 
-static int cal_doption(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
+static int cal_doption(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]) {
     Calendar_Tcl* cal = (Calendar_Tcl*) c;
     CalFile* file = cal->main;
 
@


1.2
log
@Switch to Tcl/Tk 8.4, bl3ify, and enable pkgviews installation.
Bump PKGREVISION due to Tcl/Tk dependency changes.
@
text
@d1 1
a1 1
$NetBSD$
@


1.1
log
@Fix build problem when new toolchain is used.
@
text
@d3 2
a4 2
--- cal_tcl.C.orig	Fri Jun 30 15:23:29 2000
+++ cal_tcl.C	Mon Oct 15 19:04:22 2001
d15 156
a170 1
@@@@ -517,7 +520,7 @@@@
d178 6
a183 2
 static int cal_dirty(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
@@@@ -528,7 +531,7 @@@@
d191 6
a196 2
 static int cal_stale(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
@@@@ -539,7 +542,7 @@@@
d204 95
a298 1
 static int cal_save(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
@