From 1883e6c2c925ec7e05a60968f57c152bcf9df6c4 Mon Sep 17 00:00:00 2001
From: tron <tron>
Date: Tue, 4 Sep 2001 05:31:10 +0000
Subject: Use a proper order for the include directories while building
 "korganizer" to avoid build failures if "ical.h" from the "evolution" package
 is installed. This fixes pkg/13860.

---
 misc/kdepim2/distinfo         |  4 ++--
 misc/kdepim2/patches/patch-aa | 17 +++++++++++++----
 2 files changed, 15 insertions(+), 6 deletions(-)

(limited to 'misc')

diff --git a/misc/kdepim2/distinfo b/misc/kdepim2/distinfo
index d2dcebca541..e588f2546de 100644
--- a/misc/kdepim2/distinfo
+++ b/misc/kdepim2/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 13:52:13 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/09/04 05:31:10 tron Exp $
 
 SHA1 (kdepim-2.1.tar.bz2) = 05590938b1c18ee3b41edd40c646f5fbcd7be2ca
 Size (kdepim-2.1.tar.bz2) = 2280237 bytes
-SHA1 (patch-aa) = 9c4bae53fdfcfe481f9d198b65355d9b350eeae1
+SHA1 (patch-aa) = f44a7264f7fe9641cdab5c089f6d1fdca56b6367
diff --git a/misc/kdepim2/patches/patch-aa b/misc/kdepim2/patches/patch-aa
index 8380c58f43f..44f25e1f16a 100644
--- a/misc/kdepim2/patches/patch-aa
+++ b/misc/kdepim2/patches/patch-aa
@@ -1,8 +1,17 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/03/14 16:15:16 skrll Exp $
+$NetBSD: patch-aa,v 1.2 2001/09/04 05:31:10 tron Exp $
 
---- korganizer/Makefile.in.orig	Mon Jan 22 15:38:33 2001
-+++ korganizer/Makefile.in
-@@ -829,7 +829,7 @@
+--- korganizer/Makefile.in.orig	Wed Feb 21 13:13:32 2001
++++ korganizer/Makefile.in	Tue Sep  4 07:13:40 2001
+@@ -206,7 +206,7 @@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ 
+-INCLUDES = $(all_includes) 	   -I$(srcdir)/versit            -I$(top_srcdir)/libical/src/libical            -I$(top_srcdir)/libical/src/libicalss 	   -I$(top_builddir)/libical/src/libical 	   -I$(top_builddir)/libical/src/libicalss
++INCLUDES = -I$(srcdir)/versit            -I$(top_srcdir)/libical/src/libical            -I$(top_srcdir)/libical/src/libicalss 	   -I$(top_builddir)/libical/src/libical 	   -I$(top_builddir)/libical/src/libicalss $(all_includes)
+ 
+ 
+ bin_PROGRAMS = korganizer alarmd
+@@ -835,7 +835,7 @@
  #>- $(srcdir)/parseholiday.c: parseholiday.y
  #>+ 1
  $(srcdir)/parseholiday.c: outgoingdialog_base.h incomingdialog_base.h categoryselectdialog_base.h categoryeditdialog_base.h kofilterview_base.h  parseholiday.y
-- 
cgit v1.2.3