diff options
Diffstat (limited to 'misc')
-rw-r--r-- | misc/kdepim2/Makefile | 11 | ||||
-rw-r--r-- | misc/kdepim2/distinfo | 6 | ||||
-rw-r--r-- | misc/kdepim2/patches/patch-ab | 13 | ||||
-rw-r--r-- | misc/kdepim2/patches/patch-ac | 6 |
4 files changed, 24 insertions, 12 deletions
diff --git a/misc/kdepim2/Makefile b/misc/kdepim2/Makefile index 9cb360398dc..136b25662ab 100644 --- a/misc/kdepim2/Makefile +++ b/misc/kdepim2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2002/09/20 12:27:49 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2002/10/26 13:20:21 bouyer Exp $ DISTNAME= kdepim-2.2.2 PKGREVISION= 2 @@ -12,6 +12,15 @@ BUILD_DEPENDS+= qt2-designer-kde>=2.3.1nb2:../../x11/qt2-designer-kde USE_BUILDLINK2= YES LTCONFIG_OVERRIDE+= ${WRKSRC}/libical/ltconfig +.include "../../mk/bsd.prefs.mk" + +.if ${OPSYS} == "SunOS" +CFLAGS+= -DSunOS +BUILD_DEPENDS+= bison:../../devel/bison +YACC= bison -y +.endif + + .include "../../comms/pilot-link-libs/buildlink2.mk" .include "../../x11/kde2/buildlink2.mk" .include "../../x11/kdebase2/buildlink2.mk" diff --git a/misc/kdepim2/distinfo b/misc/kdepim2/distinfo index a17cdffe7b2..5bf8f615764 100644 --- a/misc/kdepim2/distinfo +++ b/misc/kdepim2/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.6 2002/03/10 20:43:46 tron Exp $ +$NetBSD: distinfo,v 1.7 2002/10/26 13:20:21 bouyer Exp $ SHA1 (kdepim-2.2.2.tar.bz2) = b33bd17cfabda2d447932a28084241006cb2edd5 Size (kdepim-2.2.2.tar.bz2) = 2428768 bytes SHA1 (patch-aa) = 73ec76d8150c8a5a633c79abe56ff6dde4ec85af -SHA1 (patch-ab) = 0accad8af75e380feb9b0d059c3a573663342e35 -SHA1 (patch-ac) = 9e9786876303c045dfac3b2cf7b806392b8e5163 +SHA1 (patch-ab) = 0ee579e364790f0ae4aff83b0d60dd5b77933a67 +SHA1 (patch-ac) = 22c2ef81a5ef0b5746161f2fe2bfc63e1fcafd77 diff --git a/misc/kdepim2/patches/patch-ab b/misc/kdepim2/patches/patch-ab index 0b60b98440c..cc57e2616ed 100644 --- a/misc/kdepim2/patches/patch-ab +++ b/misc/kdepim2/patches/patch-ab @@ -1,13 +1,16 @@ -$NetBSD: patch-ab,v 1.1 2001/10/15 22:46:20 skrll Exp $ +$NetBSD: patch-ab,v 1.2 2002/10/26 13:20:21 bouyer Exp $ ---- libical/src/libical/icallexer.l.orig Wed Apr 11 16:37:32 2001 -+++ libical/src/libical/icallexer.l -@@ -67,7 +67,7 @@ +--- libical/src/libical/icallexer.l.orig Wed Apr 11 17:37:32 2001 ++++ libical/src/libical/icallexer.l Sun Oct 20 16:46:08 2002 +@@ -67,7 +67,11 @@ renaming hack applied in icalyacc.y */ YY_BUFFER_STATE ical_yy_scan_buffer ( char *base, yy_size_t size ); YY_BUFFER_STATE ical_yy_scan_string ( yyconst char *yy_str ); --YY_BUFFER_STATE ical_yy_scan_bytes ( yyconst char *bytes, int len ); ++#ifdef SunOS + YY_BUFFER_STATE ical_yy_scan_bytes ( yyconst char *bytes, int len ); ++#else +YY_BUFFER_STATE ical_yy_scan_bytes ( yyconst char *bytes, yy_size_t len ); ++#endif %} diff --git a/misc/kdepim2/patches/patch-ac b/misc/kdepim2/patches/patch-ac index 5d4ccc86a83..9c903ad084f 100644 --- a/misc/kdepim2/patches/patch-ac +++ b/misc/kdepim2/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.2 2001/12/03 15:37:17 skrll Exp $ +$NetBSD: patch-ac,v 1.3 2002/10/26 13:20:21 bouyer Exp $ --- libkcal/Makefile.in.orig Sat Sep 8 01:48:15 2001 +++ libkcal/Makefile.in @@ -7,11 +7,11 @@ $NetBSD: patch-ac,v 1.2 2001/12/03 15:37:17 skrll Exp $ $(srcdir)/parseholiday.c: parseholiday.y - cd $(srcdir) && bison -p kcal -d -o parseholiday.c parseholiday.y -+ cd $(srcdir) && yacc -p kcal -d -o parseholiday.c parseholiday.y ++ cd $(srcdir) && $(YACC) -p kcal -d -o parseholiday.c parseholiday.y $(srcdir)/parseholiday.h: parseholiday.y - cd $(srcdir) && bison -p kcal -d -o parseholiday.c parseholiday.y -+ cd $(srcdir) && yacc -p kcal -d -o parseholiday.c parseholiday.y ++ cd $(srcdir) && $(YACC) -p kcal -d -o parseholiday.c parseholiday.y $(srcdir)/scanholiday.c: scanholiday.lex parseholiday.h cd $(srcdir) && flex -Pkcal -B -oscanholiday.c scanholiday.lex |