Repeat after me: Do not use bar/.libs/foo.la, use bar/foo.la.

3 files changed, 38 insertions, 1 deletions

diff --git a/time/libical/distinfo b/time/libical/distinfo
index eb764571da9..29aac53a1d2 100644
--- a/time/libical/distinfo
+++ b/time/libical/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.3 2009/11/20 11:47:08 drochner Exp $
+$NetBSD: distinfo,v 1.4 2009/11/25 21:35:58 joerg Exp $
 
 SHA1 (libical-0.44.tar.gz) = f781150e2d98806e91b7e0bee02abdc6baf9ac7d
 RMD160 (libical-0.44.tar.gz) = 5640ffd3ff01807e49d9090000510c4959218c39
 Size (libical-0.44.tar.gz) = 1149067 bytes
+SHA1 (patch-aa) = 88c6b75e74438785bafed8ae4521b3a8eb613c3d
+SHA1 (patch-ab) = 49e41ed5200ab73b37ac0824cd8b9650053186a3
 SHA1 (patch-as) = 86fc413de3e1e5c858c04099ea530484a6e46a6d
diff --git a/time/libical/patches/patch-aa b/time/libical/patches/patch-aa
new file mode 100644
index 00000000000..276b5b772d1
--- /dev/null
+++ b/time/libical/patches/patch-aa
@@ -0,0 +1,22 @@
+$NetBSD: patch-aa,v 1.1 2009/11/25 21:35:59 joerg Exp $
+
+--- src/libicalvcal/Makefile.in.orig	2009-11-25 22:31:36.000000000 +0100
++++ src/libicalvcal/Makefile.in
+@@ -58,7 +58,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
+ 	"$(DESTDIR)$(libicalvcalincludedir)"
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+-libicalvcal_la_DEPENDENCIES = ../libical/.libs/libical.la
++libicalvcal_la_DEPENDENCIES = ../libical/libical.la
+ am__libicalvcal_la_SOURCES_DIST = icalvcal.h icalvcal.c port.h vcc.h \
+ 	vobject.h vobject.c vcaltmp.h vcaltmp.c vcc.c vcc.y
+ @DEV_FALSE@am__objects_1 = vcc.lo
+@@ -239,7 +239,7 @@ INCLUDES = \
+ 	-I$(top_srcdir)/src/libicalss
+ 
+ libicalvcal_la_LDFLAGS = -version-info 44:0:44
+-libicalvcal_la_LIBADD = ../libical/.libs/libical.la
++libicalvcal_la_LIBADD = ../libical/libical.la
+ @DEV_FALSE@libicalvcal_la_DEVSOURCES = vcc.c
+ @DEV_TRUE@libicalvcal_la_DEVSOURCES = vcc.y
+ libicalvcal_la_SOURCES = \
diff --git a/time/libical/patches/patch-ab b/time/libical/patches/patch-ab
new file mode 100644
index 00000000000..d0f5ff35bfd
--- /dev/null
+++ b/time/libical/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2009/11/25 21:35:59 joerg Exp $
+
+--- src/libicalvcal/Makefile.am.orig	2009-11-25 22:31:34.000000000 +0100
++++ src/libicalvcal/Makefile.am
+@@ -12,7 +12,7 @@ INCLUDES =				\
+ 	-I$(top_srcdir)/src/libicalss
+ 
+ libicalvcal_la_LDFLAGS = -version-info 44:0:44
+-libicalvcal_la_LIBADD = ../libical/.libs/libical.la
++libicalvcal_la_LIBADD = ../libical/libical.la
+ 
+ if DEV
+ libicalvcal_la_DEVSOURCES = vcc.y