aboutsummaryrefslogtreecommitdiff
path: root/mail/lightning
diff options
context:
space:
mode:
authorMichael Johnson <ahze@FreeBSD.org>2006-11-18 05:08:06 +0000
committerMichael Johnson <ahze@FreeBSD.org>2006-11-18 05:08:06 +0000
commit47815bcda5d9ed6dea673394c5c580be2b7e78a9 (patch)
tree717b188e28276c456176464508aa5249fac5ca90 /mail/lightning
parent2c569943bd3a1cb74fb8c12512ce604d3ec227ba (diff)
downloadports-47815bcda5d9ed6dea673394c5c580be2b7e78a9.tar.gz
ports-47815bcda5d9ed6dea673394c5c580be2b7e78a9.zip
Notes
Diffstat (limited to 'mail/lightning')
-rw-r--r--mail/lightning/Makefile2
-rw-r--r--mail/lightning/files/patch-nothreads-sqlite12
-rw-r--r--mail/lightning/files/patch-storage_build_Makefile.in10
3 files changed, 11 insertions, 13 deletions
diff --git a/mail/lightning/Makefile b/mail/lightning/Makefile
index c784738ed886..5d83151d1908 100644
--- a/mail/lightning/Makefile
+++ b/mail/lightning/Makefile
@@ -17,7 +17,7 @@ COMMENT= Thunderbird mail client with lightning calendar plugin
BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip
-CONFLICTS= thunderbird-[0-9]*
+CONFLICTS= thunderbird-[0-9]* lightning-0.[0-9]*
USE_GCC= 3.4+
ALL_TARGET= default
CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
diff --git a/mail/lightning/files/patch-nothreads-sqlite b/mail/lightning/files/patch-nothreads-sqlite
deleted file mode 100644
index 1b1bbbcbda15..000000000000
--- a/mail/lightning/files/patch-nothreads-sqlite
+++ /dev/null
@@ -1,12 +0,0 @@
---- db/sqlite3/src/Makefile.in.orig Mon Sep 25 18:38:04 2006
-+++ db/sqlite3/src/Makefile.in Mon Sep 25 18:38:14 2006
-@@ -99,7 +99,8 @@
- # REFEF_IO allows us to override IO functions, which is used in the AsyncIO
- # -DSQLITE_SECURE_DELETE=1 will cause SQLITE to 0-fill delete data so we
- # don't have to vacuum to make sure the data is not visible in the file.
--DEFINES = -DSQLITE_ENABLE_REDEF_IO -DSQLITE_SECURE_DELETE=1 -DTHREADSAFE=1
-+DEFINES = -DSQLITE_ENABLE_REDEF_IO -DSQLITE_SECURE_DELETE=1
-+# -DTHREADSAFE=1
-
- ifdef ENABLE_TESTS
- ##LIBS = $(DIST)/lib/$(LIB_PREFIX)sqlite3_s.$(LIB_SUFFIX)
diff --git a/mail/lightning/files/patch-storage_build_Makefile.in b/mail/lightning/files/patch-storage_build_Makefile.in
new file mode 100644
index 000000000000..18202a5a61d8
--- /dev/null
+++ b/mail/lightning/files/patch-storage_build_Makefile.in
@@ -0,0 +1,10 @@
+--- storage/build/Makefile.in.orig Tue Feb 21 11:18:56 2006
++++ storage/build/Makefile.in Sun Nov 5 16:16:06 2006
+@@ -77,6 +77,7 @@
+ $(EXTRA_DSO_LIBS) \
+ $(MOZ_COMPONENT_LIBS) \
+ $(MOZ_JS_LIBS) \
++ %%PTHREAD_LIBS%% \
+ $(NULL)
+
+ include $(topsrcdir)/config/rules.mk