aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--www/firefox-devel/Makefile27
-rw-r--r--www/firefox-devel/files/patch-nsprpub-pr-src-pthrads-ptio.c22
-rw-r--r--www/firefox-esr/Makefile27
-rw-r--r--www/firefox-esr/files/patch-nsprpub-pr-src-pthrads-ptio.c22
-rw-r--r--www/firefox/Makefile27
-rw-r--r--www/firefox/files/patch-nsprpub-pr-src-pthrads-ptio.c22
-rw-r--r--www/firefox10/Makefile27
-rw-r--r--www/firefox10/files/patch-nsprpub-pr-src-pthrads-ptio.c22
-rw-r--r--www/firefox15/Makefile27
-rw-r--r--www/firefox15/files/patch-nsprpub-pr-src-pthrads-ptio.c22
-rw-r--r--www/firefox3-devel/Makefile27
-rw-r--r--www/firefox3-devel/files/patch-nsprpub-pr-src-pthrads-ptio.c22
-rw-r--r--www/firefox35/Makefile27
-rw-r--r--www/firefox35/files/patch-nsprpub-pr-src-pthrads-ptio.c22
-rw-r--r--www/firefox36/Makefile27
-rw-r--r--www/firefox36/files/patch-nsprpub-pr-src-pthrads-ptio.c22
-rw-r--r--www/flock/Makefile27
-rw-r--r--www/flock/files/patch-nsprpub-pr-src-pthrads-ptio.c22
-rw-r--r--www/mozilla-firebird/Makefile27
-rw-r--r--www/mozilla-firebird/files/patch-nsprpub-pr-src-pthrads-ptio.c22
-rw-r--r--www/phoenix/Makefile27
-rw-r--r--www/phoenix/files/patch-nsprpub-pr-src-pthrads-ptio.c22
22 files changed, 275 insertions, 264 deletions
diff --git a/www/firefox-devel/Makefile b/www/firefox-devel/Makefile
index 03a82750137a..5a332be83221 100644
--- a/www/firefox-devel/Makefile
+++ b/www/firefox-devel/Makefile
@@ -9,7 +9,7 @@
PORTNAME= phoenix
PORTVERSION= 0.4
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= www # pita
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= trevor
@@ -49,29 +49,9 @@ LOCAL_PREFIX= ${PREFIX}/lib/${PORTNAME}
.include <bsd.port.pre.mk>
-.if !defined(PERL_LEVEL)
-.if !exists(${LOCALBASE}/bin/perl)
-PERL_LEVEL=0
-.endif # !exists(${LOCALBASE}/bin/perl)
-perl_major=${PERL_VERSION:C|^([1-9]+).*|\1|}
-_perl_minor=00${PERL_VERSION:C|^([1-9]+)\.([0-9]+).*|\2|}
-perl_minor=${_perl_minor:C|^.*(...)|\1|}
-.if ${perl_minor} >= 100
-perl_minor=${PERL_VERSION:C|^([1-9]+)\.([0-9][0-9][0-9]).*|\2|}
-perl_patch=${PERL_VERSION:C|^.*(..)|\1|}
-.else # ${perl_minor} < 100
-_perl_patch=0${PERL_VERSION:C|^([1-9]+)\.([0-9]+)\.*|0|}
-perl_patch=${_perl_patch:C|^.*(..)|\1|}
-.endif # ${perl_minor} < 100
-PERL_LEVEL=${perl_major}${perl_minor}${perl_patch}
-.endif # !defined(PERL_LEVEL)
-
-SITE_PERL?= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
-
.if ${PERL_LEVEL} < 500601
.undef NO_IGNORE
-BROKEN= "right now, we can only support the ports versions of Perl."
-BROKEN+="We are working on the problem. Sorry for the inconvenience."
+BROKEN= "Phoenix only supports the ports versions of Perl."
BROKEN+="If you have installed a Perl port, and are getting this message,"
BROKEN+="please make sure you have issued the command 'use.perl port'"
.endif # ${PERL_LEVEL} < 500601
@@ -90,7 +70,6 @@ post-extract::
-e 's|@LOCALBASE@|${LOCALBASE}|' \
-e 's|@PREFIX@|${LOCAL_PREFIX}|' \
<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig
- @${CAT} ${PKGMESSAGE} 2>/dev/null; sleep 5
# fix for Xft (thanks to marcus@)
post-patch:
@@ -105,7 +84,7 @@ post-install:
@${RM} -f ${PREFIX}/bin/phoenix-config
@${LN} -s ${LOCAL_PREFIX}/bin/mozilla-config \
${PREFIX}/bin/phoenix-config
- @${CAT} ${PKGMESSAGE} 2>/dev/null; sleep 5
+ @${CAT} ${PKGMESSAGE} 2>/dev/null
@${RM} -fr ${LOCAL_PREFIX}/share/idl
@${RM} -fr ${LOCAL_PREFIX}/include
diff --git a/www/firefox-devel/files/patch-nsprpub-pr-src-pthrads-ptio.c b/www/firefox-devel/files/patch-nsprpub-pr-src-pthrads-ptio.c
new file mode 100644
index 000000000000..4a965d4c7440
--- /dev/null
+++ b/www/firefox-devel/files/patch-nsprpub-pr-src-pthrads-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);
+ }
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index 03a82750137a..5a332be83221 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -9,7 +9,7 @@
PORTNAME= phoenix
PORTVERSION= 0.4
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= www # pita
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= trevor
@@ -49,29 +49,9 @@ LOCAL_PREFIX= ${PREFIX}/lib/${PORTNAME}
.include <bsd.port.pre.mk>
-.if !defined(PERL_LEVEL)
-.if !exists(${LOCALBASE}/bin/perl)
-PERL_LEVEL=0
-.endif # !exists(${LOCALBASE}/bin/perl)
-perl_major=${PERL_VERSION:C|^([1-9]+).*|\1|}
-_perl_minor=00${PERL_VERSION:C|^([1-9]+)\.([0-9]+).*|\2|}
-perl_minor=${_perl_minor:C|^.*(...)|\1|}
-.if ${perl_minor} >= 100
-perl_minor=${PERL_VERSION:C|^([1-9]+)\.([0-9][0-9][0-9]).*|\2|}
-perl_patch=${PERL_VERSION:C|^.*(..)|\1|}
-.else # ${perl_minor} < 100
-_perl_patch=0${PERL_VERSION:C|^([1-9]+)\.([0-9]+)\.*|0|}
-perl_patch=${_perl_patch:C|^.*(..)|\1|}
-.endif # ${perl_minor} < 100
-PERL_LEVEL=${perl_major}${perl_minor}${perl_patch}
-.endif # !defined(PERL_LEVEL)
-
-SITE_PERL?= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
-
.if ${PERL_LEVEL} < 500601
.undef NO_IGNORE
-BROKEN= "right now, we can only support the ports versions of Perl."
-BROKEN+="We are working on the problem. Sorry for the inconvenience."
+BROKEN= "Phoenix only supports the ports versions of Perl."
BROKEN+="If you have installed a Perl port, and are getting this message,"
BROKEN+="please make sure you have issued the command 'use.perl port'"
.endif # ${PERL_LEVEL} < 500601
@@ -90,7 +70,6 @@ post-extract::
-e 's|@LOCALBASE@|${LOCALBASE}|' \
-e 's|@PREFIX@|${LOCAL_PREFIX}|' \
<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig
- @${CAT} ${PKGMESSAGE} 2>/dev/null; sleep 5
# fix for Xft (thanks to marcus@)
post-patch:
@@ -105,7 +84,7 @@ post-install:
@${RM} -f ${PREFIX}/bin/phoenix-config
@${LN} -s ${LOCAL_PREFIX}/bin/mozilla-config \
${PREFIX}/bin/phoenix-config
- @${CAT} ${PKGMESSAGE} 2>/dev/null; sleep 5
+ @${CAT} ${PKGMESSAGE} 2>/dev/null
@${RM} -fr ${LOCAL_PREFIX}/share/idl
@${RM} -fr ${LOCAL_PREFIX}/include
diff --git a/www/firefox-esr/files/patch-nsprpub-pr-src-pthrads-ptio.c b/www/firefox-esr/files/patch-nsprpub-pr-src-pthrads-ptio.c
new file mode 100644
index 000000000000..4a965d4c7440
--- /dev/null
+++ b/www/firefox-esr/files/patch-nsprpub-pr-src-pthrads-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);
+ }
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 03a82750137a..5a332be83221 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -9,7 +9,7 @@
PORTNAME= phoenix
PORTVERSION= 0.4
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= www # pita
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= trevor
@@ -49,29 +49,9 @@ LOCAL_PREFIX= ${PREFIX}/lib/${PORTNAME}
.include <bsd.port.pre.mk>
-.if !defined(PERL_LEVEL)
-.if !exists(${LOCALBASE}/bin/perl)
-PERL_LEVEL=0
-.endif # !exists(${LOCALBASE}/bin/perl)
-perl_major=${PERL_VERSION:C|^([1-9]+).*|\1|}
-_perl_minor=00${PERL_VERSION:C|^([1-9]+)\.([0-9]+).*|\2|}
-perl_minor=${_perl_minor:C|^.*(...)|\1|}
-.if ${perl_minor} >= 100
-perl_minor=${PERL_VERSION:C|^([1-9]+)\.([0-9][0-9][0-9]).*|\2|}
-perl_patch=${PERL_VERSION:C|^.*(..)|\1|}
-.else # ${perl_minor} < 100
-_perl_patch=0${PERL_VERSION:C|^([1-9]+)\.([0-9]+)\.*|0|}
-perl_patch=${_perl_patch:C|^.*(..)|\1|}
-.endif # ${perl_minor} < 100
-PERL_LEVEL=${perl_major}${perl_minor}${perl_patch}
-.endif # !defined(PERL_LEVEL)
-
-SITE_PERL?= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
-
.if ${PERL_LEVEL} < 500601
.undef NO_IGNORE
-BROKEN= "right now, we can only support the ports versions of Perl."
-BROKEN+="We are working on the problem. Sorry for the inconvenience."
+BROKEN= "Phoenix only supports the ports versions of Perl."
BROKEN+="If you have installed a Perl port, and are getting this message,"
BROKEN+="please make sure you have issued the command 'use.perl port'"
.endif # ${PERL_LEVEL} < 500601
@@ -90,7 +70,6 @@ post-extract::
-e 's|@LOCALBASE@|${LOCALBASE}|' \
-e 's|@PREFIX@|${LOCAL_PREFIX}|' \
<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig
- @${CAT} ${PKGMESSAGE} 2>/dev/null; sleep 5
# fix for Xft (thanks to marcus@)
post-patch:
@@ -105,7 +84,7 @@ post-install:
@${RM} -f ${PREFIX}/bin/phoenix-config
@${LN} -s ${LOCAL_PREFIX}/bin/mozilla-config \
${PREFIX}/bin/phoenix-config
- @${CAT} ${PKGMESSAGE} 2>/dev/null; sleep 5
+ @${CAT} ${PKGMESSAGE} 2>/dev/null
@${RM} -fr ${LOCAL_PREFIX}/share/idl
@${RM} -fr ${LOCAL_PREFIX}/include
diff --git a/www/firefox/files/patch-nsprpub-pr-src-pthrads-ptio.c b/www/firefox/files/patch-nsprpub-pr-src-pthrads-ptio.c
new file mode 100644
index 000000000000..4a965d4c7440
--- /dev/null
+++ b/www/firefox/files/patch-nsprpub-pr-src-pthrads-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);
+ }
diff --git a/www/firefox10/Makefile b/www/firefox10/Makefile
index 03a82750137a..5a332be83221 100644
--- a/www/firefox10/Makefile
+++ b/www/firefox10/Makefile
@@ -9,7 +9,7 @@
PORTNAME= phoenix
PORTVERSION= 0.4
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= www # pita
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= trevor
@@ -49,29 +49,9 @@ LOCAL_PREFIX= ${PREFIX}/lib/${PORTNAME}
.include <bsd.port.pre.mk>
-.if !defined(PERL_LEVEL)
-.if !exists(${LOCALBASE}/bin/perl)
-PERL_LEVEL=0
-.endif # !exists(${LOCALBASE}/bin/perl)
-perl_major=${PERL_VERSION:C|^([1-9]+).*|\1|}
-_perl_minor=00${PERL_VERSION:C|^([1-9]+)\.([0-9]+).*|\2|}
-perl_minor=${_perl_minor:C|^.*(...)|\1|}
-.if ${perl_minor} >= 100
-perl_minor=${PERL_VERSION:C|^([1-9]+)\.([0-9][0-9][0-9]).*|\2|}
-perl_patch=${PERL_VERSION:C|^.*(..)|\1|}
-.else # ${perl_minor} < 100
-_perl_patch=0${PERL_VERSION:C|^([1-9]+)\.([0-9]+)\.*|0|}
-perl_patch=${_perl_patch:C|^.*(..)|\1|}
-.endif # ${perl_minor} < 100
-PERL_LEVEL=${perl_major}${perl_minor}${perl_patch}
-.endif # !defined(PERL_LEVEL)
-
-SITE_PERL?= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
-
.if ${PERL_LEVEL} < 500601
.undef NO_IGNORE
-BROKEN= "right now, we can only support the ports versions of Perl."
-BROKEN+="We are working on the problem. Sorry for the inconvenience."
+BROKEN= "Phoenix only supports the ports versions of Perl."
BROKEN+="If you have installed a Perl port, and are getting this message,"
BROKEN+="please make sure you have issued the command 'use.perl port'"
.endif # ${PERL_LEVEL} < 500601
@@ -90,7 +70,6 @@ post-extract::
-e 's|@LOCALBASE@|${LOCALBASE}|' \
-e 's|@PREFIX@|${LOCAL_PREFIX}|' \
<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig
- @${CAT} ${PKGMESSAGE} 2>/dev/null; sleep 5
# fix for Xft (thanks to marcus@)
post-patch:
@@ -105,7 +84,7 @@ post-install:
@${RM} -f ${PREFIX}/bin/phoenix-config
@${LN} -s ${LOCAL_PREFIX}/bin/mozilla-config \
${PREFIX}/bin/phoenix-config
- @${CAT} ${PKGMESSAGE} 2>/dev/null; sleep 5
+ @${CAT} ${PKGMESSAGE} 2>/dev/null
@${RM} -fr ${LOCAL_PREFIX}/share/idl
@${RM} -fr ${LOCAL_PREFIX}/include
diff --git a/www/firefox10/files/patch-nsprpub-pr-src-pthrads-ptio.c b/www/firefox10/files/patch-nsprpub-pr-src-pthrads-ptio.c
new file mode 100644
index 000000000000..4a965d4c7440
--- /dev/null
+++ b/www/firefox10/files/patch-nsprpub-pr-src-pthrads-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);
+ }
diff --git a/www/firefox15/Makefile b/www/firefox15/Makefile
index 03a82750137a..5a332be83221 100644
--- a/www/firefox15/Makefile
+++ b/www/firefox15/Makefile
@@ -9,7 +9,7 @@
PORTNAME= phoenix
PORTVERSION= 0.4
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= www # pita
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= trevor
@@ -49,29 +49,9 @@ LOCAL_PREFIX= ${PREFIX}/lib/${PORTNAME}
.include <bsd.port.pre.mk>
-.if !defined(PERL_LEVEL)
-.if !exists(${LOCALBASE}/bin/perl)
-PERL_LEVEL=0
-.endif # !exists(${LOCALBASE}/bin/perl)
-perl_major=${PERL_VERSION:C|^([1-9]+).*|\1|}
-_perl_minor=00${PERL_VERSION:C|^([1-9]+)\.([0-9]+).*|\2|}
-perl_minor=${_perl_minor:C|^.*(...)|\1|}
-.if ${perl_minor} >= 100
-perl_minor=${PERL_VERSION:C|^([1-9]+)\.([0-9][0-9][0-9]).*|\2|}
-perl_patch=${PERL_VERSION:C|^.*(..)|\1|}
-.else # ${perl_minor} < 100
-_perl_patch=0${PERL_VERSION:C|^([1-9]+)\.([0-9]+)\.*|0|}
-perl_patch=${_perl_patch:C|^.*(..)|\1|}
-.endif # ${perl_minor} < 100
-PERL_LEVEL=${perl_major}${perl_minor}${perl_patch}
-.endif # !defined(PERL_LEVEL)
-
-SITE_PERL?= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
-
.if ${PERL_LEVEL} < 500601
.undef NO_IGNORE
-BROKEN= "right now, we can only support the ports versions of Perl."
-BROKEN+="We are working on the problem. Sorry for the inconvenience."
+BROKEN= "Phoenix only supports the ports versions of Perl."
BROKEN+="If you have installed a Perl port, and are getting this message,"
BROKEN+="please make sure you have issued the command 'use.perl port'"
.endif # ${PERL_LEVEL} < 500601
@@ -90,7 +70,6 @@ post-extract::
-e 's|@LOCALBASE@|${LOCALBASE}|' \
-e 's|@PREFIX@|${LOCAL_PREFIX}|' \
<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig
- @${CAT} ${PKGMESSAGE} 2>/dev/null; sleep 5
# fix for Xft (thanks to marcus@)
post-patch:
@@ -105,7 +84,7 @@ post-install:
@${RM} -f ${PREFIX}/bin/phoenix-config
@${LN} -s ${LOCAL_PREFIX}/bin/mozilla-config \
${PREFIX}/bin/phoenix-config
- @${CAT} ${PKGMESSAGE} 2>/dev/null; sleep 5
+ @${CAT} ${PKGMESSAGE} 2>/dev/null
@${RM} -fr ${LOCAL_PREFIX}/share/idl
@${RM} -fr ${LOCAL_PREFIX}/include
diff --git a/www/firefox15/files/patch-nsprpub-pr-src-pthrads-ptio.c b/www/firefox15/files/patch-nsprpub-pr-src-pthrads-ptio.c
new file mode 100644
index 000000000000..4a965d4c7440
--- /dev/null
+++ b/www/firefox15/files/patch-nsprpub-pr-src-pthrads-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);
+ }
diff --git a/www/firefox3-devel/Makefile b/www/firefox3-devel/Makefile
index 03a82750137a..5a332be83221 100644
--- a/www/firefox3-devel/Makefile
+++ b/www/firefox3-devel/Makefile
@@ -9,7 +9,7 @@
PORTNAME= phoenix
PORTVERSION= 0.4
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= www # pita
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= trevor
@@ -49,29 +49,9 @@ LOCAL_PREFIX= ${PREFIX}/lib/${PORTNAME}
.include <bsd.port.pre.mk>
-.if !defined(PERL_LEVEL)
-.if !exists(${LOCALBASE}/bin/perl)
-PERL_LEVEL=0
-.endif # !exists(${LOCALBASE}/bin/perl)
-perl_major=${PERL_VERSION:C|^([1-9]+).*|\1|}
-_perl_minor=00${PERL_VERSION:C|^([1-9]+)\.([0-9]+).*|\2|}
-perl_minor=${_perl_minor:C|^.*(...)|\1|}
-.if ${perl_minor} >= 100
-perl_minor=${PERL_VERSION:C|^([1-9]+)\.([0-9][0-9][0-9]).*|\2|}
-perl_patch=${PERL_VERSION:C|^.*(..)|\1|}
-.else # ${perl_minor} < 100
-_perl_patch=0${PERL_VERSION:C|^([1-9]+)\.([0-9]+)\.*|0|}
-perl_patch=${_perl_patch:C|^.*(..)|\1|}
-.endif # ${perl_minor} < 100
-PERL_LEVEL=${perl_major}${perl_minor}${perl_patch}
-.endif # !defined(PERL_LEVEL)
-
-SITE_PERL?= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
-
.if ${PERL_LEVEL} < 500601
.undef NO_IGNORE
-BROKEN= "right now, we can only support the ports versions of Perl."
-BROKEN+="We are working on the problem. Sorry for the inconvenience."
+BROKEN= "Phoenix only supports the ports versions of Perl."
BROKEN+="If you have installed a Perl port, and are getting this message,"
BROKEN+="please make sure you have issued the command 'use.perl port'"
.endif # ${PERL_LEVEL} < 500601
@@ -90,7 +70,6 @@ post-extract::
-e 's|@LOCALBASE@|${LOCALBASE}|' \
-e 's|@PREFIX@|${LOCAL_PREFIX}|' \
<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig
- @${CAT} ${PKGMESSAGE} 2>/dev/null; sleep 5
# fix for Xft (thanks to marcus@)
post-patch:
@@ -105,7 +84,7 @@ post-install:
@${RM} -f ${PREFIX}/bin/phoenix-config
@${LN} -s ${LOCAL_PREFIX}/bin/mozilla-config \
${PREFIX}/bin/phoenix-config
- @${CAT} ${PKGMESSAGE} 2>/dev/null; sleep 5
+ @${CAT} ${PKGMESSAGE} 2>/dev/null
@${RM} -fr ${LOCAL_PREFIX}/share/idl
@${RM} -fr ${LOCAL_PREFIX}/include
diff --git a/www/firefox3-devel/files/patch-nsprpub-pr-src-pthrads-ptio.c b/www/firefox3-devel/files/patch-nsprpub-pr-src-pthrads-ptio.c
new file mode 100644
index 000000000000..4a965d4c7440
--- /dev/null
+++ b/www/firefox3-devel/files/patch-nsprpub-pr-src-pthrads-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);
+ }
diff --git a/www/firefox35/Makefile b/www/firefox35/Makefile
index 03a82750137a..5a332be83221 100644
--- a/www/firefox35/Makefile
+++ b/www/firefox35/Makefile
@@ -9,7 +9,7 @@
PORTNAME= phoenix
PORTVERSION= 0.4
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= www # pita
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= trevor
@@ -49,29 +49,9 @@ LOCAL_PREFIX= ${PREFIX}/lib/${PORTNAME}
.include <bsd.port.pre.mk>
-.if !defined(PERL_LEVEL)
-.if !exists(${LOCALBASE}/bin/perl)
-PERL_LEVEL=0
-.endif # !exists(${LOCALBASE}/bin/perl)
-perl_major=${PERL_VERSION:C|^([1-9]+).*|\1|}
-_perl_minor=00${PERL_VERSION:C|^([1-9]+)\.([0-9]+).*|\2|}
-perl_minor=${_perl_minor:C|^.*(...)|\1|}
-.if ${perl_minor} >= 100
-perl_minor=${PERL_VERSION:C|^([1-9]+)\.([0-9][0-9][0-9]).*|\2|}
-perl_patch=${PERL_VERSION:C|^.*(..)|\1|}
-.else # ${perl_minor} < 100
-_perl_patch=0${PERL_VERSION:C|^([1-9]+)\.([0-9]+)\.*|0|}
-perl_patch=${_perl_patch:C|^.*(..)|\1|}
-.endif # ${perl_minor} < 100
-PERL_LEVEL=${perl_major}${perl_minor}${perl_patch}
-.endif # !defined(PERL_LEVEL)
-
-SITE_PERL?= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
-
.if ${PERL_LEVEL} < 500601
.undef NO_IGNORE
-BROKEN= "right now, we can only support the ports versions of Perl."
-BROKEN+="We are working on the problem. Sorry for the inconvenience."
+BROKEN= "Phoenix only supports the ports versions of Perl."
BROKEN+="If you have installed a Perl port, and are getting this message,"
BROKEN+="please make sure you have issued the command 'use.perl port'"
.endif # ${PERL_LEVEL} < 500601
@@ -90,7 +70,6 @@ post-extract::
-e 's|@LOCALBASE@|${LOCALBASE}|' \
-e 's|@PREFIX@|${LOCAL_PREFIX}|' \
<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig
- @${CAT} ${PKGMESSAGE} 2>/dev/null; sleep 5
# fix for Xft (thanks to marcus@)
post-patch:
@@ -105,7 +84,7 @@ post-install:
@${RM} -f ${PREFIX}/bin/phoenix-config
@${LN} -s ${LOCAL_PREFIX}/bin/mozilla-config \
${PREFIX}/bin/phoenix-config
- @${CAT} ${PKGMESSAGE} 2>/dev/null; sleep 5
+ @${CAT} ${PKGMESSAGE} 2>/dev/null
@${RM} -fr ${LOCAL_PREFIX}/share/idl
@${RM} -fr ${LOCAL_PREFIX}/include
diff --git a/www/firefox35/files/patch-nsprpub-pr-src-pthrads-ptio.c b/www/firefox35/files/patch-nsprpub-pr-src-pthrads-ptio.c
new file mode 100644
index 000000000000..4a965d4c7440
--- /dev/null
+++ b/www/firefox35/files/patch-nsprpub-pr-src-pthrads-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);
+ }
diff --git a/www/firefox36/Makefile b/www/firefox36/Makefile
index 03a82750137a..5a332be83221 100644
--- a/www/firefox36/Makefile
+++ b/www/firefox36/Makefile
@@ -9,7 +9,7 @@
PORTNAME= phoenix
PORTVERSION= 0.4
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= www # pita
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= trevor
@@ -49,29 +49,9 @@ LOCAL_PREFIX= ${PREFIX}/lib/${PORTNAME}
.include <bsd.port.pre.mk>
-.if !defined(PERL_LEVEL)
-.if !exists(${LOCALBASE}/bin/perl)
-PERL_LEVEL=0
-.endif # !exists(${LOCALBASE}/bin/perl)
-perl_major=${PERL_VERSION:C|^([1-9]+).*|\1|}
-_perl_minor=00${PERL_VERSION:C|^([1-9]+)\.([0-9]+).*|\2|}
-perl_minor=${_perl_minor:C|^.*(...)|\1|}
-.if ${perl_minor} >= 100
-perl_minor=${PERL_VERSION:C|^([1-9]+)\.([0-9][0-9][0-9]).*|\2|}
-perl_patch=${PERL_VERSION:C|^.*(..)|\1|}
-.else # ${perl_minor} < 100
-_perl_patch=0${PERL_VERSION:C|^([1-9]+)\.([0-9]+)\.*|0|}
-perl_patch=${_perl_patch:C|^.*(..)|\1|}
-.endif # ${perl_minor} < 100
-PERL_LEVEL=${perl_major}${perl_minor}${perl_patch}
-.endif # !defined(PERL_LEVEL)
-
-SITE_PERL?= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
-
.if ${PERL_LEVEL} < 500601
.undef NO_IGNORE
-BROKEN= "right now, we can only support the ports versions of Perl."
-BROKEN+="We are working on the problem. Sorry for the inconvenience."
+BROKEN= "Phoenix only supports the ports versions of Perl."
BROKEN+="If you have installed a Perl port, and are getting this message,"
BROKEN+="please make sure you have issued the command 'use.perl port'"
.endif # ${PERL_LEVEL} < 500601
@@ -90,7 +70,6 @@ post-extract::
-e 's|@LOCALBASE@|${LOCALBASE}|' \
-e 's|@PREFIX@|${LOCAL_PREFIX}|' \
<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig
- @${CAT} ${PKGMESSAGE} 2>/dev/null; sleep 5
# fix for Xft (thanks to marcus@)
post-patch:
@@ -105,7 +84,7 @@ post-install:
@${RM} -f ${PREFIX}/bin/phoenix-config
@${LN} -s ${LOCAL_PREFIX}/bin/mozilla-config \
${PREFIX}/bin/phoenix-config
- @${CAT} ${PKGMESSAGE} 2>/dev/null; sleep 5
+ @${CAT} ${PKGMESSAGE} 2>/dev/null
@${RM} -fr ${LOCAL_PREFIX}/share/idl
@${RM} -fr ${LOCAL_PREFIX}/include
diff --git a/www/firefox36/files/patch-nsprpub-pr-src-pthrads-ptio.c b/www/firefox36/files/patch-nsprpub-pr-src-pthrads-ptio.c
new file mode 100644
index 000000000000..4a965d4c7440
--- /dev/null
+++ b/www/firefox36/files/patch-nsprpub-pr-src-pthrads-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);
+ }
diff --git a/www/flock/Makefile b/www/flock/Makefile
index 03a82750137a..5a332be83221 100644
--- a/www/flock/Makefile
+++ b/www/flock/Makefile
@@ -9,7 +9,7 @@
PORTNAME= phoenix
PORTVERSION= 0.4
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= www # pita
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= trevor
@@ -49,29 +49,9 @@ LOCAL_PREFIX= ${PREFIX}/lib/${PORTNAME}
.include <bsd.port.pre.mk>
-.if !defined(PERL_LEVEL)
-.if !exists(${LOCALBASE}/bin/perl)
-PERL_LEVEL=0
-.endif # !exists(${LOCALBASE}/bin/perl)
-perl_major=${PERL_VERSION:C|^([1-9]+).*|\1|}
-_perl_minor=00${PERL_VERSION:C|^([1-9]+)\.([0-9]+).*|\2|}
-perl_minor=${_perl_minor:C|^.*(...)|\1|}
-.if ${perl_minor} >= 100
-perl_minor=${PERL_VERSION:C|^([1-9]+)\.([0-9][0-9][0-9]).*|\2|}
-perl_patch=${PERL_VERSION:C|^.*(..)|\1|}
-.else # ${perl_minor} < 100
-_perl_patch=0${PERL_VERSION:C|^([1-9]+)\.([0-9]+)\.*|0|}
-perl_patch=${_perl_patch:C|^.*(..)|\1|}
-.endif # ${perl_minor} < 100
-PERL_LEVEL=${perl_major}${perl_minor}${perl_patch}
-.endif # !defined(PERL_LEVEL)
-
-SITE_PERL?= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
-
.if ${PERL_LEVEL} < 500601
.undef NO_IGNORE
-BROKEN= "right now, we can only support the ports versions of Perl."
-BROKEN+="We are working on the problem. Sorry for the inconvenience."
+BROKEN= "Phoenix only supports the ports versions of Perl."
BROKEN+="If you have installed a Perl port, and are getting this message,"
BROKEN+="please make sure you have issued the command 'use.perl port'"
.endif # ${PERL_LEVEL} < 500601
@@ -90,7 +70,6 @@ post-extract::
-e 's|@LOCALBASE@|${LOCALBASE}|' \
-e 's|@PREFIX@|${LOCAL_PREFIX}|' \
<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig
- @${CAT} ${PKGMESSAGE} 2>/dev/null; sleep 5
# fix for Xft (thanks to marcus@)
post-patch:
@@ -105,7 +84,7 @@ post-install:
@${RM} -f ${PREFIX}/bin/phoenix-config
@${LN} -s ${LOCAL_PREFIX}/bin/mozilla-config \
${PREFIX}/bin/phoenix-config
- @${CAT} ${PKGMESSAGE} 2>/dev/null; sleep 5
+ @${CAT} ${PKGMESSAGE} 2>/dev/null
@${RM} -fr ${LOCAL_PREFIX}/share/idl
@${RM} -fr ${LOCAL_PREFIX}/include
diff --git a/www/flock/files/patch-nsprpub-pr-src-pthrads-ptio.c b/www/flock/files/patch-nsprpub-pr-src-pthrads-ptio.c
new file mode 100644
index 000000000000..4a965d4c7440
--- /dev/null
+++ b/www/flock/files/patch-nsprpub-pr-src-pthrads-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);
+ }
diff --git a/www/mozilla-firebird/Makefile b/www/mozilla-firebird/Makefile
index 03a82750137a..5a332be83221 100644
--- a/www/mozilla-firebird/Makefile
+++ b/www/mozilla-firebird/Makefile
@@ -9,7 +9,7 @@
PORTNAME= phoenix
PORTVERSION= 0.4
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= www # pita
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= trevor
@@ -49,29 +49,9 @@ LOCAL_PREFIX= ${PREFIX}/lib/${PORTNAME}
.include <bsd.port.pre.mk>
-.if !defined(PERL_LEVEL)
-.if !exists(${LOCALBASE}/bin/perl)
-PERL_LEVEL=0
-.endif # !exists(${LOCALBASE}/bin/perl)
-perl_major=${PERL_VERSION:C|^([1-9]+).*|\1|}
-_perl_minor=00${PERL_VERSION:C|^([1-9]+)\.([0-9]+).*|\2|}
-perl_minor=${_perl_minor:C|^.*(...)|\1|}
-.if ${perl_minor} >= 100
-perl_minor=${PERL_VERSION:C|^([1-9]+)\.([0-9][0-9][0-9]).*|\2|}
-perl_patch=${PERL_VERSION:C|^.*(..)|\1|}
-.else # ${perl_minor} < 100
-_perl_patch=0${PERL_VERSION:C|^([1-9]+)\.([0-9]+)\.*|0|}
-perl_patch=${_perl_patch:C|^.*(..)|\1|}
-.endif # ${perl_minor} < 100
-PERL_LEVEL=${perl_major}${perl_minor}${perl_patch}
-.endif # !defined(PERL_LEVEL)
-
-SITE_PERL?= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
-
.if ${PERL_LEVEL} < 500601
.undef NO_IGNORE
-BROKEN= "right now, we can only support the ports versions of Perl."
-BROKEN+="We are working on the problem. Sorry for the inconvenience."
+BROKEN= "Phoenix only supports the ports versions of Perl."
BROKEN+="If you have installed a Perl port, and are getting this message,"
BROKEN+="please make sure you have issued the command 'use.perl port'"
.endif # ${PERL_LEVEL} < 500601
@@ -90,7 +70,6 @@ post-extract::
-e 's|@LOCALBASE@|${LOCALBASE}|' \
-e 's|@PREFIX@|${LOCAL_PREFIX}|' \
<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig
- @${CAT} ${PKGMESSAGE} 2>/dev/null; sleep 5
# fix for Xft (thanks to marcus@)
post-patch:
@@ -105,7 +84,7 @@ post-install:
@${RM} -f ${PREFIX}/bin/phoenix-config
@${LN} -s ${LOCAL_PREFIX}/bin/mozilla-config \
${PREFIX}/bin/phoenix-config
- @${CAT} ${PKGMESSAGE} 2>/dev/null; sleep 5
+ @${CAT} ${PKGMESSAGE} 2>/dev/null
@${RM} -fr ${LOCAL_PREFIX}/share/idl
@${RM} -fr ${LOCAL_PREFIX}/include
diff --git a/www/mozilla-firebird/files/patch-nsprpub-pr-src-pthrads-ptio.c b/www/mozilla-firebird/files/patch-nsprpub-pr-src-pthrads-ptio.c
new file mode 100644
index 000000000000..4a965d4c7440
--- /dev/null
+++ b/www/mozilla-firebird/files/patch-nsprpub-pr-src-pthrads-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);
+ }
diff --git a/www/phoenix/Makefile b/www/phoenix/Makefile
index 03a82750137a..5a332be83221 100644
--- a/www/phoenix/Makefile
+++ b/www/phoenix/Makefile
@@ -9,7 +9,7 @@
PORTNAME= phoenix
PORTVERSION= 0.4
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= www # pita
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= trevor
@@ -49,29 +49,9 @@ LOCAL_PREFIX= ${PREFIX}/lib/${PORTNAME}
.include <bsd.port.pre.mk>
-.if !defined(PERL_LEVEL)
-.if !exists(${LOCALBASE}/bin/perl)
-PERL_LEVEL=0
-.endif # !exists(${LOCALBASE}/bin/perl)
-perl_major=${PERL_VERSION:C|^([1-9]+).*|\1|}
-_perl_minor=00${PERL_VERSION:C|^([1-9]+)\.([0-9]+).*|\2|}
-perl_minor=${_perl_minor:C|^.*(...)|\1|}
-.if ${perl_minor} >= 100
-perl_minor=${PERL_VERSION:C|^([1-9]+)\.([0-9][0-9][0-9]).*|\2|}
-perl_patch=${PERL_VERSION:C|^.*(..)|\1|}
-.else # ${perl_minor} < 100
-_perl_patch=0${PERL_VERSION:C|^([1-9]+)\.([0-9]+)\.*|0|}
-perl_patch=${_perl_patch:C|^.*(..)|\1|}
-.endif # ${perl_minor} < 100
-PERL_LEVEL=${perl_major}${perl_minor}${perl_patch}
-.endif # !defined(PERL_LEVEL)
-
-SITE_PERL?= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
-
.if ${PERL_LEVEL} < 500601
.undef NO_IGNORE
-BROKEN= "right now, we can only support the ports versions of Perl."
-BROKEN+="We are working on the problem. Sorry for the inconvenience."
+BROKEN= "Phoenix only supports the ports versions of Perl."
BROKEN+="If you have installed a Perl port, and are getting this message,"
BROKEN+="please make sure you have issued the command 'use.perl port'"
.endif # ${PERL_LEVEL} < 500601
@@ -90,7 +70,6 @@ post-extract::
-e 's|@LOCALBASE@|${LOCALBASE}|' \
-e 's|@PREFIX@|${LOCAL_PREFIX}|' \
<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig
- @${CAT} ${PKGMESSAGE} 2>/dev/null; sleep 5
# fix for Xft (thanks to marcus@)
post-patch:
@@ -105,7 +84,7 @@ post-install:
@${RM} -f ${PREFIX}/bin/phoenix-config
@${LN} -s ${LOCAL_PREFIX}/bin/mozilla-config \
${PREFIX}/bin/phoenix-config
- @${CAT} ${PKGMESSAGE} 2>/dev/null; sleep 5
+ @${CAT} ${PKGMESSAGE} 2>/dev/null
@${RM} -fr ${LOCAL_PREFIX}/share/idl
@${RM} -fr ${LOCAL_PREFIX}/include
diff --git a/www/phoenix/files/patch-nsprpub-pr-src-pthrads-ptio.c b/www/phoenix/files/patch-nsprpub-pr-src-pthrads-ptio.c
new file mode 100644
index 000000000000..4a965d4c7440
--- /dev/null
+++ b/www/phoenix/files/patch-nsprpub-pr-src-pthrads-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);
+ }