diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2002-12-24 17:58:08 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2002-12-24 17:58:08 +0000 |
| commit | e075458eec522e551bed6cfedc874c63b1ccac38 (patch) | |
| tree | e30444ef0f789cbc4d0afab4c19f3ca4d624641a /mail | |
| parent | - Fix build with threads (diff) | |
Don't statically link the Pilot conduits. This fixes a problem where
certain GTK objects would conflict, thus resulting in broken conduits.
Approved by: portmgr (lioux)
Notes
Notes:
svn path=/head/; revision=71835
Diffstat (limited to 'mail')
6 files changed, 46 insertions, 2 deletions
diff --git a/mail/evolution-devel/Makefile b/mail/evolution-devel/Makefile index 98c165e33c95..00677daaddd0 100644 --- a/mail/evolution-devel/Makefile +++ b/mail/evolution-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= evolution PORTVERSION= 1.2.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= mail gnome MASTER_SITES= ${MASTER_SITE_GNOME} \ http://people.FreeBSD.org/~sobomax/:local diff --git a/mail/evolution-devel/files/patch-calendar_conduits_calendar_Makefile.in b/mail/evolution-devel/files/patch-calendar_conduits_calendar_Makefile.in new file mode 100644 index 000000000000..f80d5aaba6be --- /dev/null +++ b/mail/evolution-devel/files/patch-calendar_conduits_calendar_Makefile.in @@ -0,0 +1,11 @@ +--- calendar/conduits/calendar/Makefile.in.orig Mon Dec 9 15:55:17 2002 ++++ calendar/conduits/calendar/Makefile.in Mon Dec 9 15:56:02 2002 +@@ -231,7 +231,7 @@ + + + libecalendar_conduit_la_LDFLAGS = -module -avoid-version +-libecalendar_conduit_la_LIBADD = $(top_builddir)/e-util/libeutil.la $(top_builddir)/calendar/cal-client/libcal-client-static.la $(top_builddir)/calendar/cal-util/libcal-util-static.la $(top_builddir)/libversit/libversit.a $(top_builddir)/libical/src/libical/libical-static.la $(top_builddir)/libwombat/libwombat-static.la $(top_builddir)/e-util/libeconduit-static.la $(EVOLUTION_CALENDAR_CONDUIT_LIBS) ++libecalendar_conduit_la_LIBADD = $(top_builddir)/e-util/libeutil.la $(top_builddir)/calendar/cal-client/libcal-client.la $(top_builddir)/calendar/cal-util/libcal-util.la $(top_builddir)/libversit/libversit.a $(top_builddir)/libical/src/libical/libical-static.la $(top_builddir)/libwombat/libwombat.la $(top_builddir)/e-util/libeconduit.la $(EVOLUTION_CALENDAR_CONDUIT_LIBS) + + + Conduitdir = $(datadir)/gnome-pilot/conduits/ diff --git a/mail/evolution-devel/files/patch-calendar_conduits_todo_Makefile.in b/mail/evolution-devel/files/patch-calendar_conduits_todo_Makefile.in new file mode 100644 index 000000000000..62fd99aa6350 --- /dev/null +++ b/mail/evolution-devel/files/patch-calendar_conduits_todo_Makefile.in @@ -0,0 +1,11 @@ +--- calendar/conduits/todo/Makefile.in.orig Mon Dec 9 16:01:21 2002 ++++ calendar/conduits/todo/Makefile.in Mon Dec 9 16:01:48 2002 +@@ -231,7 +231,7 @@ + + + libetodo_conduit_la_LDFLAGS = -module -avoid-version +-libetodo_conduit_la_LIBADD = $(top_builddir)/e-util/libeutil.la $(top_builddir)/calendar/cal-client/libcal-client-static.la $(top_builddir)/calendar/cal-util/libcal-util-static.la $(top_builddir)/libversit/libversit.a $(top_builddir)/libical/src/libical/libical-static.la $(top_builddir)/libwombat/libwombat-static.la $(top_builddir)/e-util/libeconduit-static.la $(EVOLUTION_CALENDAR_CONDUIT_LIBS) ++libetodo_conduit_la_LIBADD = $(top_builddir)/e-util/libeutil.la $(top_builddir)/calendar/cal-client/libcal-client.la $(top_builddir)/calendar/cal-util/libcal-util.la $(top_builddir)/libversit/libversit.a $(top_builddir)/libical/src/libical/libical-static.la $(top_builddir)/libwombat/libwombat.la $(top_builddir)/e-util/libeconduit.la $(EVOLUTION_CALENDAR_CONDUIT_LIBS) + + + Conduitdir = $(datadir)/gnome-pilot/conduits/ diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile index 98c165e33c95..00677daaddd0 100644 --- a/mail/evolution/Makefile +++ b/mail/evolution/Makefile @@ -7,7 +7,7 @@ PORTNAME= evolution PORTVERSION= 1.2.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= mail gnome MASTER_SITES= ${MASTER_SITE_GNOME} \ http://people.FreeBSD.org/~sobomax/:local diff --git a/mail/evolution/files/patch-calendar_conduits_calendar_Makefile.in b/mail/evolution/files/patch-calendar_conduits_calendar_Makefile.in new file mode 100644 index 000000000000..f80d5aaba6be --- /dev/null +++ b/mail/evolution/files/patch-calendar_conduits_calendar_Makefile.in @@ -0,0 +1,11 @@ +--- calendar/conduits/calendar/Makefile.in.orig Mon Dec 9 15:55:17 2002 ++++ calendar/conduits/calendar/Makefile.in Mon Dec 9 15:56:02 2002 +@@ -231,7 +231,7 @@ + + + libecalendar_conduit_la_LDFLAGS = -module -avoid-version +-libecalendar_conduit_la_LIBADD = $(top_builddir)/e-util/libeutil.la $(top_builddir)/calendar/cal-client/libcal-client-static.la $(top_builddir)/calendar/cal-util/libcal-util-static.la $(top_builddir)/libversit/libversit.a $(top_builddir)/libical/src/libical/libical-static.la $(top_builddir)/libwombat/libwombat-static.la $(top_builddir)/e-util/libeconduit-static.la $(EVOLUTION_CALENDAR_CONDUIT_LIBS) ++libecalendar_conduit_la_LIBADD = $(top_builddir)/e-util/libeutil.la $(top_builddir)/calendar/cal-client/libcal-client.la $(top_builddir)/calendar/cal-util/libcal-util.la $(top_builddir)/libversit/libversit.a $(top_builddir)/libical/src/libical/libical-static.la $(top_builddir)/libwombat/libwombat.la $(top_builddir)/e-util/libeconduit.la $(EVOLUTION_CALENDAR_CONDUIT_LIBS) + + + Conduitdir = $(datadir)/gnome-pilot/conduits/ diff --git a/mail/evolution/files/patch-calendar_conduits_todo_Makefile.in b/mail/evolution/files/patch-calendar_conduits_todo_Makefile.in new file mode 100644 index 000000000000..62fd99aa6350 --- /dev/null +++ b/mail/evolution/files/patch-calendar_conduits_todo_Makefile.in @@ -0,0 +1,11 @@ +--- calendar/conduits/todo/Makefile.in.orig Mon Dec 9 16:01:21 2002 ++++ calendar/conduits/todo/Makefile.in Mon Dec 9 16:01:48 2002 +@@ -231,7 +231,7 @@ + + + libetodo_conduit_la_LDFLAGS = -module -avoid-version +-libetodo_conduit_la_LIBADD = $(top_builddir)/e-util/libeutil.la $(top_builddir)/calendar/cal-client/libcal-client-static.la $(top_builddir)/calendar/cal-util/libcal-util-static.la $(top_builddir)/libversit/libversit.a $(top_builddir)/libical/src/libical/libical-static.la $(top_builddir)/libwombat/libwombat-static.la $(top_builddir)/e-util/libeconduit-static.la $(EVOLUTION_CALENDAR_CONDUIT_LIBS) ++libetodo_conduit_la_LIBADD = $(top_builddir)/e-util/libeutil.la $(top_builddir)/calendar/cal-client/libcal-client.la $(top_builddir)/calendar/cal-util/libcal-util.la $(top_builddir)/libversit/libversit.a $(top_builddir)/libical/src/libical/libical-static.la $(top_builddir)/libwombat/libwombat.la $(top_builddir)/e-util/libeconduit.la $(EVOLUTION_CALENDAR_CONDUIT_LIBS) + + + Conduitdir = $(datadir)/gnome-pilot/conduits/ |