summaryrefslogtreecommitdiffstats
path: root/www/flock/files
diff options
context:
space:
mode:
authoralane <alane@FreeBSD.org>2002-12-14 22:49:59 +0000
committeralane <alane@FreeBSD.org>2002-12-14 22:49:59 +0000
commitc4d5940314c9cc34ec927e7a46557404f7b2f4ed (patch)
tree93cbab5e24b7c323f3c62258b856c704e2236ab4 /www/flock/files
parent47e8e9b2378aa0577111ed1d0ffb8d880e61b946 (diff)
downloadFreeBSD-ports-c4d5940314c9cc34ec927e7a46557404f7b2f4ed.zip
FreeBSD-ports-c4d5940314c9cc34ec927e7a46557404f7b2f4ed.tar.gz
The problem wasn't the patch, it was third party font ports. The patch has
been restored, extra knobs have added, and extensive diagnostics have been added. PLEASE upgrade to this version. Approved by: kris (part of phoenix upgrade)
Diffstat (limited to 'www/flock/files')
-rw-r--r--www/flock/files/mozconfig.in18
-rw-r--r--www/flock/files/patch-nsprpub-pr-src-pthreads-ptio.c22
2 files changed, 36 insertions, 4 deletions
diff --git a/www/flock/files/mozconfig.in b/www/flock/files/mozconfig.in
index 2bea08b..50703b5 100644
--- a/www/flock/files/mozconfig.in
+++ b/www/flock/files/mozconfig.in
@@ -33,13 +33,12 @@ ac_add_options --with-system-zlib
ac_add_options --with-system-png=@LOCALBASE@
ac_add_options --with-system-mng=@LOCALBASE@
######################################################################
-# enable features
+# set compile/link features
ac_add_options --with-pthreads
-ac_add_options --enable-xft
ac_add_options --enable-reorder
ac_add_options --enable-strip
######################################################################
-# disable unneeded to speed up and/or save space
+# disable unneeded/unavailable
ac_add_options --disable-auto-deps
ac_add_options --disable-bidi
ac_add_options --disable-dtd-debug
@@ -47,10 +46,21 @@ ac_add_options --disable-jsd
ac_add_options --disable-ldap
ac_add_options --disable-pedantic
ac_add_options --disable-xinerama
+######################################################################
+# conditional from port Makefile
if test -n "$WITH_DEBUG"; then
ac_add_options --enable-debug
+else
+ ac_add_options --disable-debug
+fi # test -n "$WITH_DEBUG"
+if test -n "$WITH_LOGGING"; then
ac_add_options --enable-logging
else
ac_add_options --disable-logging
-fi # test -n "$WITH_DEBUG"
+fi # test -n "$WITH_LOGGING"
+if test -z "$WITHOUT_XFT"; then
+ ac_add_options --enable-xft
+else
+ ac_add_options --disable-xft
+fi # test -z "$WITHOUT_XFT"
######################################################################
diff --git a/www/flock/files/patch-nsprpub-pr-src-pthreads-ptio.c b/www/flock/files/patch-nsprpub-pr-src-pthreads-ptio.c
new file mode 100644
index 0000000..4a965d4
--- /dev/null
+++ b/www/flock/files/patch-nsprpub-pr-src-pthreads-ptio.c
@@ -0,0 +1,22 @@
+Index: nsprpub/pr/src/pthreads/ptio.c
+diff -u nsprpub/pr/src/pthreads/ptio.c.orig nsprpub/pr/src/pthreads/ptio.c
+--- nsprpub/pr/src/pthreads/ptio.c.orig Fri Apr 12 03:14:39 2002
++++ nsprpub/pr/src/pthreads/ptio.c Tue Jul 30 18:52:11 2002
+@@ -3414,6 +3414,17 @@
+ if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno);
+ else
+ {
++#if (defined(_PR_INET6_PROBE) || defined(_PR_INET6)) && \
++ defined(__FreeBSD__) && defined(IPV6_V6ONLY)
++ if (domain == PR_AF_INET6) {
++ int opt = 0;
++ if (setsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY,
++ &opt, sizeof(opt))) {
++ close(osfd);
++ return NULL;
++ }
++ }
++#endif
+ fd = pt_SetMethods(osfd, ftype, PR_FALSE, PR_FALSE);
+ if (fd == NULL) close(osfd);
+ }
OpenPOWER on IntegriCloud