From 29747f458a1eb2ce23b4594b09d0256dd62760b8 Mon Sep 17 00:00:00 2001 From: Joe Marcus Clarke Date: Sat, 14 Oct 2006 08:54:54 +0000 Subject: Chase the GNOME X11BASE to LOCALBASE move, and fix the build with the new freetype2 where needed. Submitted by: mezz, ahze, pav, and many others Approved by: portmgr (implicit, kris) --- www/firefox-devel/Makefile | 2 +- www/firefox-devel/files/patch-nothreads-sqlite | 12 ++++++++++++ www/firefox-devel/files/patch-nothreads-sqlite3 | 12 ------------ 3 files changed, 13 insertions(+), 13 deletions(-) create mode 100644 www/firefox-devel/files/patch-nothreads-sqlite delete mode 100644 www/firefox-devel/files/patch-nothreads-sqlite3 (limited to 'www/firefox-devel') diff --git a/www/firefox-devel/Makefile b/www/firefox-devel/Makefile index 7aba8c75f6db..88cdf524b8de 100644 --- a/www/firefox-devel/Makefile +++ b/www/firefox-devel/Makefile @@ -24,7 +24,6 @@ MOZILLA_NAME= Firefox${MOZILLA_SUFX} MOZILLA_SUFX= -devel MOZ_OPTIONS= --program-transform-name='s/firefox/${MOZILLA}/' -USE_X_PREFIX= yes WANT_GNOME= yes ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} @@ -84,6 +83,7 @@ pre-install: ${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLIST} ${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST} ${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${PLIST} + ${ECHO_CMD} "@dirrmtry share/pixmaps" >> ${PLIST} .if !defined(WITHOUT_NEWTAB) ${ECHO_CMD} >> ${SYSTEM_PREFS} ${ECHO_CMD} "// Open external links in new tab" >> ${SYSTEM_PREFS} diff --git a/www/firefox-devel/files/patch-nothreads-sqlite b/www/firefox-devel/files/patch-nothreads-sqlite new file mode 100644 index 000000000000..1b1bbbcbda15 --- /dev/null +++ b/www/firefox-devel/files/patch-nothreads-sqlite @@ -0,0 +1,12 @@ +--- 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/www/firefox-devel/files/patch-nothreads-sqlite3 b/www/firefox-devel/files/patch-nothreads-sqlite3 deleted file mode 100644 index 1b1bbbcbda15..000000000000 --- a/www/firefox-devel/files/patch-nothreads-sqlite3 +++ /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) -- cgit v1.2.3