Fix GCC 3.3.1 related build problem.

4 files changed, 74 insertions, 12 deletions

diff --git a/time/ical/Makefile b/time/ical/Makefile
index 33398ef91db..a87284879fd 100644
--- a/time/ical/Makefile
+++ b/time/ical/Makefile
@@ -1,6 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/07/17 22:55:01 grant Exp $
-# $FreeBSD Id: Makefile,v 1.15 1998/02/07 22:59:16 hoek Exp
-#
+# $NetBSD: Makefile,v 1.7 2003/10/02 20:14:23 tron Exp $
 
 DISTNAME=	ical-2.2.1
 CATEGORIES=	time
@@ -10,8 +8,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://members.nbci.com/majahj/ical/
 COMMENT=	Calendar application
 
-DEPENDS+=	tk>=8.3.2:../../x11/tk
-
+USE_BUILDLINK2=	yes
 USE_X11=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
@@ -25,4 +22,5 @@ post-configure:
 	         ${WRKDIR}/${DISTNAME}/startup.tcl \
 	         ${WRKDIR}/${DISTNAME}/time/Makefile
 
+.include "../../x11/tk/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/ical/distinfo b/time/ical/distinfo
index b1e815cd110..cc85b5d0e50 100644
--- a/time/ical/distinfo
+++ b/time/ical/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2001/10/15 17:09:44 tron Exp $
+$NetBSD: distinfo,v 1.4 2003/10/02 20:14:23 tron Exp $
 
 SHA1 (ical-2.2.1.tar.gz) = ba6af590a4d81360f6933762f2adab0886bb4e5f
 Size (ical-2.2.1.tar.gz) = 261959 bytes
-SHA1 (patch-aa) = 52c4adac05aa32913e6587e33a3818b497f6a0e6
-SHA1 (patch-ab) = a73037d1f1adf1397029fde66f8d965e9076aba5
+SHA1 (patch-aa) = 238d2d4ce21cc60ec0eaae854aa722ca0486701d
+SHA1 (patch-ab) = 17ad50ae2815a56590ab9e8745f790782e3b18d4
 SHA1 (patch-ac) = 002612db5040469d0f316893a40eb067d94e677e
 SHA1 (patch-ad) = 8d77fd27aad3d6a19cbe1596d716eec78203c5ba
diff --git a/time/ical/patches/patch-aa b/time/ical/patches/patch-aa
index 1a03b0be527..38c52be2d40 100644
--- a/time/ical/patches/patch-aa
+++ b/time/ical/patches/patch-aa
@@ -1,4 +1,5 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/12/17 23:32:10 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2003/10/02 20:14:23 tron Exp $
+
 --- Makefile.in.orig	Sat Sep 12 17:57:48 1998
 +++ Makefile.in	Sat Sep 12 17:59:28 1998
 @@ -76,13 +76,13 @@
diff --git a/time/ical/patches/patch-ab b/time/ical/patches/patch-ab
index 946a7b7c33a..96dd64d8cba 100644
--- a/time/ical/patches/patch-ab
+++ b/time/ical/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/12/17 23:32:10 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2003/10/02 20:14:23 tron Exp $
 
---- configure.orig	Wed Oct 22 01:52:57 1997
-+++ configure	Tue Apr  6 01:03:05 1999
+--- configure.orig	1997-10-22 01:52:57.000000000 +0200
++++ configure	2003-10-02 22:12:00.000000000 +0200
 @@ -1089,8 +1089,8 @@
  
  #### Check that the library files exist
@@ -13,3 +13,66 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/12/17 23:32:10 wiz Exp $
  for f in "$lib1" "$lib2"; do
      if test ! -f "$f"; then
  	echo "$ac_t""$f not found" 1>&6
+@@ -1661,7 +1661,7 @@
+ #endif
+ 
+ #include <string.h>
+-static void* ptr = &strerror;
++static void* ptr = (void *) &strerror;
+ int main() {return 0;}
+ 
+ EOF
+@@ -1699,7 +1699,7 @@
+ #endif
+ 
+ #include <errno.h>
+-static void* ptr = &sys_errlist;
++static void* ptr = (void *) &sys_errlist;
+ int main() {return 0;}
+ 
+ EOF
+@@ -1737,7 +1737,7 @@
+ #endif
+ 
+ #include <sys/time.h>
+-static void* ptr = &gettimeofday;
++static void* ptr = (void *) &gettimeofday;
+ int main() {return 0;}
+ 
+ EOF
+@@ -1775,7 +1775,7 @@
+ #endif
+ 
+ #include <unistd.h>
+-static void* ptr = &gethostname;
++static void* ptr = (void *) &gethostname;
+ int main() {return 0;}
+ 
+ EOF
+@@ -1813,7 +1813,7 @@
+ #endif
+ 
+ #include <unistd.h>
+-static void* ptr = &getpid;
++static void* ptr = (void *) &getpid;
+ int main() {return 0;}
+ 
+ EOF
+@@ -1851,7 +1851,7 @@
+ #endif
+ 
+ #include <string.h>
+-static void* ptr = &strncasecmp;
++static void* ptr = (void *) &strncasecmp;
+ int main() {return 0;}
+ 
+ EOF
+@@ -1889,7 +1889,7 @@
+ #endif
+ 
+ #include <unistd.h>
+-static void* ptr = &gethostid;
++static void* ptr = (void *) &gethostid;
+ int main() {return 0;}
+ 
+ EOF