diff options
Diffstat (limited to 'www')
33 files changed, 737 insertions, 66 deletions
diff --git a/www/firefox-devel/Makefile b/www/firefox-devel/Makefile index 87ad5278d832..b6a6ce1dcb53 100644 --- a/www/firefox-devel/Makefile +++ b/www/firefox-devel/Makefile @@ -9,7 +9,7 @@ PORTNAME= phoenix PORTVERSION= 0.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www # pita MASTER_SITES= ${MASTER_SITE_LOCAL} ${BSD_WEBDIR} MASTER_SITE_SUBDIR= alane @@ -21,7 +21,6 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ mng.1:${PORTSDIR}/graphics/libmng \ freetype.9:${PORTSDIR}/print/freetype2 \ IDL.2:${PORTSDIR}/devel/ORBit \ - Xft2.2:${PORTSDIR}/x11-fonts/Xft \ iconv.3:${PORTSDIR}/converters/libiconv BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \ freetype-config:${PORTSDIR}/print/freetype2 @@ -60,6 +59,7 @@ SORT?=/usr/bin/sort PLIST=${WRKDIR}/plist .if defined(WITH_DEBUG) +WITH_LOGGING= yes WITHOUT_OPTIMIZE= yes CONFIGURE_ENV+= WITH_DEBUG=yes .endif # defined(WITH_DEBUG) @@ -68,6 +68,35 @@ CONFIGURE_ENV+= WITH_DEBUG=yes CFLAGS+= -O2 .endif # defined(WITH_OPTIMIZE) +.if defined(WITH_LOGGING) +CONFIGURE_ENV+= WITH_LOGGING=yes +.endif # defined(WITH_LOGGING) + +.if defined(WITHOUT_XFT) +CONFIGURE_ENV+= WITHOUT_XFT=yes +.else +LIB_DEPENDS+= Xft2.2:${PORTSDIR}/x11-fonts/Xft +.endif # !defined(WITHOUT_XFT) + +# check for known bad fonts +.if exists(${X11BASE}/lib/X11/fonts/lfpfonts-var/fonts.dir) +BAD_FONTS=yes +.endif # exists(${X11BASE}/lib/X11/fonts/lfpfonts-var/fonts.dir) +.if exists(${X11BASE}/lib/X11/fonts/lfpfonts-fix/fonts.dir) +BAD_FONTS=yes +.endif # exists(${X11BASE}/lib/X11/fonts/lfpfonts-var/fonts.dir) + +.if defined(BAD_FONTS) && !defined(WITHOUT_XFT) +.undef NO_IGNORE +BROKEN= "You have X fonts installed (lfpfonts*) that cause breakage unless" +BROKEN+="WITHOUT_XFT is set, which turns off AntiAliasing. Blease either" +BROKEN+="uninstall the fonts or restart the make with 'make -DWITHOUT_XFT'." +BROKEN+="There may be other third party font packages that also cause this" +BROKEN+="breakage; they will be tested for as they are identified. If you" +BROKEN+="find a font port that verifiably causes this breakage, please" +BROKEN+="let us know by mailing ${MAINTAINER}. Thank you." +BROKEN+="NOTE: The Microsoft webfonts port is known to be safe." +.endif # defined(BAD_FONTS) && !defined(WITHOUT_XFT) CPPFLAGS+= -I${X11BASE}/include CFLAGS+= ${PTHREAD_CFLAGS} diff --git a/www/firefox-devel/files/mozconfig.in b/www/firefox-devel/files/mozconfig.in index 2bea08b6719a..50703b5df336 100644 --- a/www/firefox-devel/files/mozconfig.in +++ b/www/firefox-devel/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/firefox-devel/files/patch-nsprpub-pr-src-pthreads-ptio.c b/www/firefox-devel/files/patch-nsprpub-pr-src-pthreads-ptio.c new file mode 100644 index 000000000000..4a965d4c7440 --- /dev/null +++ b/www/firefox-devel/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); + } diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile index 87ad5278d832..b6a6ce1dcb53 100644 --- a/www/firefox-esr/Makefile +++ b/www/firefox-esr/Makefile @@ -9,7 +9,7 @@ PORTNAME= phoenix PORTVERSION= 0.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www # pita MASTER_SITES= ${MASTER_SITE_LOCAL} ${BSD_WEBDIR} MASTER_SITE_SUBDIR= alane @@ -21,7 +21,6 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ mng.1:${PORTSDIR}/graphics/libmng \ freetype.9:${PORTSDIR}/print/freetype2 \ IDL.2:${PORTSDIR}/devel/ORBit \ - Xft2.2:${PORTSDIR}/x11-fonts/Xft \ iconv.3:${PORTSDIR}/converters/libiconv BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \ freetype-config:${PORTSDIR}/print/freetype2 @@ -60,6 +59,7 @@ SORT?=/usr/bin/sort PLIST=${WRKDIR}/plist .if defined(WITH_DEBUG) +WITH_LOGGING= yes WITHOUT_OPTIMIZE= yes CONFIGURE_ENV+= WITH_DEBUG=yes .endif # defined(WITH_DEBUG) @@ -68,6 +68,35 @@ CONFIGURE_ENV+= WITH_DEBUG=yes CFLAGS+= -O2 .endif # defined(WITH_OPTIMIZE) +.if defined(WITH_LOGGING) +CONFIGURE_ENV+= WITH_LOGGING=yes +.endif # defined(WITH_LOGGING) + +.if defined(WITHOUT_XFT) +CONFIGURE_ENV+= WITHOUT_XFT=yes +.else +LIB_DEPENDS+= Xft2.2:${PORTSDIR}/x11-fonts/Xft +.endif # !defined(WITHOUT_XFT) + +# check for known bad fonts +.if exists(${X11BASE}/lib/X11/fonts/lfpfonts-var/fonts.dir) +BAD_FONTS=yes +.endif # exists(${X11BASE}/lib/X11/fonts/lfpfonts-var/fonts.dir) +.if exists(${X11BASE}/lib/X11/fonts/lfpfonts-fix/fonts.dir) +BAD_FONTS=yes +.endif # exists(${X11BASE}/lib/X11/fonts/lfpfonts-var/fonts.dir) + +.if defined(BAD_FONTS) && !defined(WITHOUT_XFT) +.undef NO_IGNORE +BROKEN= "You have X fonts installed (lfpfonts*) that cause breakage unless" +BROKEN+="WITHOUT_XFT is set, which turns off AntiAliasing. Blease either" +BROKEN+="uninstall the fonts or restart the make with 'make -DWITHOUT_XFT'." +BROKEN+="There may be other third party font packages that also cause this" +BROKEN+="breakage; they will be tested for as they are identified. If you" +BROKEN+="find a font port that verifiably causes this breakage, please" +BROKEN+="let us know by mailing ${MAINTAINER}. Thank you." +BROKEN+="NOTE: The Microsoft webfonts port is known to be safe." +.endif # defined(BAD_FONTS) && !defined(WITHOUT_XFT) CPPFLAGS+= -I${X11BASE}/include CFLAGS+= ${PTHREAD_CFLAGS} diff --git a/www/firefox-esr/files/mozconfig.in b/www/firefox-esr/files/mozconfig.in index 2bea08b6719a..50703b5df336 100644 --- a/www/firefox-esr/files/mozconfig.in +++ b/www/firefox-esr/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/firefox-esr/files/patch-nsprpub-pr-src-pthreads-ptio.c b/www/firefox-esr/files/patch-nsprpub-pr-src-pthreads-ptio.c new file mode 100644 index 000000000000..4a965d4c7440 --- /dev/null +++ b/www/firefox-esr/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); + } diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 87ad5278d832..b6a6ce1dcb53 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -9,7 +9,7 @@ PORTNAME= phoenix PORTVERSION= 0.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www # pita MASTER_SITES= ${MASTER_SITE_LOCAL} ${BSD_WEBDIR} MASTER_SITE_SUBDIR= alane @@ -21,7 +21,6 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ mng.1:${PORTSDIR}/graphics/libmng \ freetype.9:${PORTSDIR}/print/freetype2 \ IDL.2:${PORTSDIR}/devel/ORBit \ - Xft2.2:${PORTSDIR}/x11-fonts/Xft \ iconv.3:${PORTSDIR}/converters/libiconv BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \ freetype-config:${PORTSDIR}/print/freetype2 @@ -60,6 +59,7 @@ SORT?=/usr/bin/sort PLIST=${WRKDIR}/plist .if defined(WITH_DEBUG) +WITH_LOGGING= yes WITHOUT_OPTIMIZE= yes CONFIGURE_ENV+= WITH_DEBUG=yes .endif # defined(WITH_DEBUG) @@ -68,6 +68,35 @@ CONFIGURE_ENV+= WITH_DEBUG=yes CFLAGS+= -O2 .endif # defined(WITH_OPTIMIZE) +.if defined(WITH_LOGGING) +CONFIGURE_ENV+= WITH_LOGGING=yes +.endif # defined(WITH_LOGGING) + +.if defined(WITHOUT_XFT) +CONFIGURE_ENV+= WITHOUT_XFT=yes +.else +LIB_DEPENDS+= Xft2.2:${PORTSDIR}/x11-fonts/Xft +.endif # !defined(WITHOUT_XFT) + +# check for known bad fonts +.if exists(${X11BASE}/lib/X11/fonts/lfpfonts-var/fonts.dir) +BAD_FONTS=yes +.endif # exists(${X11BASE}/lib/X11/fonts/lfpfonts-var/fonts.dir) +.if exists(${X11BASE}/lib/X11/fonts/lfpfonts-fix/fonts.dir) +BAD_FONTS=yes +.endif # exists(${X11BASE}/lib/X11/fonts/lfpfonts-var/fonts.dir) + +.if defined(BAD_FONTS) && !defined(WITHOUT_XFT) +.undef NO_IGNORE +BROKEN= "You have X fonts installed (lfpfonts*) that cause breakage unless" +BROKEN+="WITHOUT_XFT is set, which turns off AntiAliasing. Blease either" +BROKEN+="uninstall the fonts or restart the make with 'make -DWITHOUT_XFT'." +BROKEN+="There may be other third party font packages that also cause this" +BROKEN+="breakage; they will be tested for as they are identified. If you" +BROKEN+="find a font port that verifiably causes this breakage, please" +BROKEN+="let us know by mailing ${MAINTAINER}. Thank you." +BROKEN+="NOTE: The Microsoft webfonts port is known to be safe." +.endif # defined(BAD_FONTS) && !defined(WITHOUT_XFT) CPPFLAGS+= -I${X11BASE}/include CFLAGS+= ${PTHREAD_CFLAGS} diff --git a/www/firefox/files/mozconfig.in b/www/firefox/files/mozconfig.in index 2bea08b6719a..50703b5df336 100644 --- a/www/firefox/files/mozconfig.in +++ b/www/firefox/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/firefox/files/patch-nsprpub-pr-src-pthreads-ptio.c b/www/firefox/files/patch-nsprpub-pr-src-pthreads-ptio.c new file mode 100644 index 000000000000..4a965d4c7440 --- /dev/null +++ b/www/firefox/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); + } diff --git a/www/firefox10/Makefile b/www/firefox10/Makefile index 87ad5278d832..b6a6ce1dcb53 100644 --- a/www/firefox10/Makefile +++ b/www/firefox10/Makefile @@ -9,7 +9,7 @@ PORTNAME= phoenix PORTVERSION= 0.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www # pita MASTER_SITES= ${MASTER_SITE_LOCAL} ${BSD_WEBDIR} MASTER_SITE_SUBDIR= alane @@ -21,7 +21,6 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ mng.1:${PORTSDIR}/graphics/libmng \ freetype.9:${PORTSDIR}/print/freetype2 \ IDL.2:${PORTSDIR}/devel/ORBit \ - Xft2.2:${PORTSDIR}/x11-fonts/Xft \ iconv.3:${PORTSDIR}/converters/libiconv BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \ freetype-config:${PORTSDIR}/print/freetype2 @@ -60,6 +59,7 @@ SORT?=/usr/bin/sort PLIST=${WRKDIR}/plist .if defined(WITH_DEBUG) +WITH_LOGGING= yes WITHOUT_OPTIMIZE= yes CONFIGURE_ENV+= WITH_DEBUG=yes .endif # defined(WITH_DEBUG) @@ -68,6 +68,35 @@ CONFIGURE_ENV+= WITH_DEBUG=yes CFLAGS+= -O2 .endif # defined(WITH_OPTIMIZE) +.if defined(WITH_LOGGING) +CONFIGURE_ENV+= WITH_LOGGING=yes +.endif # defined(WITH_LOGGING) + +.if defined(WITHOUT_XFT) +CONFIGURE_ENV+= WITHOUT_XFT=yes +.else +LIB_DEPENDS+= Xft2.2:${PORTSDIR}/x11-fonts/Xft +.endif # !defined(WITHOUT_XFT) + +# check for known bad fonts +.if exists(${X11BASE}/lib/X11/fonts/lfpfonts-var/fonts.dir) +BAD_FONTS=yes +.endif # exists(${X11BASE}/lib/X11/fonts/lfpfonts-var/fonts.dir) +.if exists(${X11BASE}/lib/X11/fonts/lfpfonts-fix/fonts.dir) +BAD_FONTS=yes +.endif # exists(${X11BASE}/lib/X11/fonts/lfpfonts-var/fonts.dir) + +.if defined(BAD_FONTS) && !defined(WITHOUT_XFT) +.undef NO_IGNORE +BROKEN= "You have X fonts installed (lfpfonts*) that cause breakage unless" +BROKEN+="WITHOUT_XFT is set, which turns off AntiAliasing. Blease either" +BROKEN+="uninstall the fonts or restart the make with 'make -DWITHOUT_XFT'." +BROKEN+="There may be other third party font packages that also cause this" +BROKEN+="breakage; they will be tested for as they are identified. If you" +BROKEN+="find a font port that verifiably causes this breakage, please" +BROKEN+="let us know by mailing ${MAINTAINER}. Thank you." +BROKEN+="NOTE: The Microsoft webfonts port is known to be safe." +.endif # defined(BAD_FONTS) && !defined(WITHOUT_XFT) CPPFLAGS+= -I${X11BASE}/include CFLAGS+= ${PTHREAD_CFLAGS} diff --git a/www/firefox10/files/mozconfig.in b/www/firefox10/files/mozconfig.in index 2bea08b6719a..50703b5df336 100644 --- a/www/firefox10/files/mozconfig.in +++ b/www/firefox10/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/firefox10/files/patch-nsprpub-pr-src-pthreads-ptio.c b/www/firefox10/files/patch-nsprpub-pr-src-pthreads-ptio.c new file mode 100644 index 000000000000..4a965d4c7440 --- /dev/null +++ b/www/firefox10/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); + } diff --git a/www/firefox15/Makefile b/www/firefox15/Makefile index 87ad5278d832..b6a6ce1dcb53 100644 --- a/www/firefox15/Makefile +++ b/www/firefox15/Makefile @@ -9,7 +9,7 @@ PORTNAME= phoenix PORTVERSION= 0.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www # pita MASTER_SITES= ${MASTER_SITE_LOCAL} ${BSD_WEBDIR} MASTER_SITE_SUBDIR= alane @@ -21,7 +21,6 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ mng.1:${PORTSDIR}/graphics/libmng \ freetype.9:${PORTSDIR}/print/freetype2 \ IDL.2:${PORTSDIR}/devel/ORBit \ - Xft2.2:${PORTSDIR}/x11-fonts/Xft \ iconv.3:${PORTSDIR}/converters/libiconv BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \ freetype-config:${PORTSDIR}/print/freetype2 @@ -60,6 +59,7 @@ SORT?=/usr/bin/sort PLIST=${WRKDIR}/plist .if defined(WITH_DEBUG) +WITH_LOGGING= yes WITHOUT_OPTIMIZE= yes CONFIGURE_ENV+= WITH_DEBUG=yes .endif # defined(WITH_DEBUG) @@ -68,6 +68,35 @@ CONFIGURE_ENV+= WITH_DEBUG=yes CFLAGS+= -O2 .endif # defined(WITH_OPTIMIZE) +.if defined(WITH_LOGGING) +CONFIGURE_ENV+= WITH_LOGGING=yes +.endif # defined(WITH_LOGGING) + +.if defined(WITHOUT_XFT) +CONFIGURE_ENV+= WITHOUT_XFT=yes +.else +LIB_DEPENDS+= Xft2.2:${PORTSDIR}/x11-fonts/Xft +.endif # !defined(WITHOUT_XFT) + +# check for known bad fonts +.if exists(${X11BASE}/lib/X11/fonts/lfpfonts-var/fonts.dir) +BAD_FONTS=yes +.endif # exists(${X11BASE}/lib/X11/fonts/lfpfonts-var/fonts.dir) +.if exists(${X11BASE}/lib/X11/fonts/lfpfonts-fix/fonts.dir) +BAD_FONTS=yes +.endif # exists(${X11BASE}/lib/X11/fonts/lfpfonts-var/fonts.dir) + +.if defined(BAD_FONTS) && !defined(WITHOUT_XFT) +.undef NO_IGNORE +BROKEN= "You have X fonts installed (lfpfonts*) that cause breakage unless" +BROKEN+="WITHOUT_XFT is set, which turns off AntiAliasing. Blease either" +BROKEN+="uninstall the fonts or restart the make with 'make -DWITHOUT_XFT'." +BROKEN+="There may be other third party font packages that also cause this" +BROKEN+="breakage; they will be tested for as they are identified. If you" +BROKEN+="find a font port that verifiably causes this breakage, please" +BROKEN+="let us know by mailing ${MAINTAINER}. Thank you." +BROKEN+="NOTE: The Microsoft webfonts port is known to be safe." +.endif # defined(BAD_FONTS) && !defined(WITHOUT_XFT) CPPFLAGS+= -I${X11BASE}/include CFLAGS+= ${PTHREAD_CFLAGS} diff --git a/www/firefox15/files/mozconfig.in b/www/firefox15/files/mozconfig.in index 2bea08b6719a..50703b5df336 100644 --- a/www/firefox15/files/mozconfig.in +++ b/www/firefox15/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/firefox15/files/patch-nsprpub-pr-src-pthreads-ptio.c b/www/firefox15/files/patch-nsprpub-pr-src-pthreads-ptio.c new file mode 100644 index 000000000000..4a965d4c7440 --- /dev/null +++ b/www/firefox15/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); + } diff --git a/www/firefox3-devel/Makefile b/www/firefox3-devel/Makefile index 87ad5278d832..b6a6ce1dcb53 100644 --- a/www/firefox3-devel/Makefile +++ b/www/firefox3-devel/Makefile @@ -9,7 +9,7 @@ PORTNAME= phoenix PORTVERSION= 0.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www # pita MASTER_SITES= ${MASTER_SITE_LOCAL} ${BSD_WEBDIR} MASTER_SITE_SUBDIR= alane @@ -21,7 +21,6 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ mng.1:${PORTSDIR}/graphics/libmng \ freetype.9:${PORTSDIR}/print/freetype2 \ IDL.2:${PORTSDIR}/devel/ORBit \ - Xft2.2:${PORTSDIR}/x11-fonts/Xft \ iconv.3:${PORTSDIR}/converters/libiconv BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \ freetype-config:${PORTSDIR}/print/freetype2 @@ -60,6 +59,7 @@ SORT?=/usr/bin/sort PLIST=${WRKDIR}/plist .if defined(WITH_DEBUG) +WITH_LOGGING= yes WITHOUT_OPTIMIZE= yes CONFIGURE_ENV+= WITH_DEBUG=yes .endif # defined(WITH_DEBUG) @@ -68,6 +68,35 @@ CONFIGURE_ENV+= WITH_DEBUG=yes CFLAGS+= -O2 .endif # defined(WITH_OPTIMIZE) +.if defined(WITH_LOGGING) +CONFIGURE_ENV+= WITH_LOGGING=yes +.endif # defined(WITH_LOGGING) + +.if defined(WITHOUT_XFT) +CONFIGURE_ENV+= WITHOUT_XFT=yes +.else +LIB_DEPENDS+= Xft2.2:${PORTSDIR}/x11-fonts/Xft +.endif # !defined(WITHOUT_XFT) + +# check for known bad fonts +.if exists(${X11BASE}/lib/X11/fonts/lfpfonts-var/fonts.dir) +BAD_FONTS=yes +.endif # exists(${X11BASE}/lib/X11/fonts/lfpfonts-var/fonts.dir) +.if exists(${X11BASE}/lib/X11/fonts/lfpfonts-fix/fonts.dir) +BAD_FONTS=yes +.endif # exists(${X11BASE}/lib/X11/fonts/lfpfonts-var/fonts.dir) + +.if defined(BAD_FONTS) && !defined(WITHOUT_XFT) +.undef NO_IGNORE +BROKEN= "You have X fonts installed (lfpfonts*) that cause breakage unless" +BROKEN+="WITHOUT_XFT is set, which turns off AntiAliasing. Blease either" +BROKEN+="uninstall the fonts or restart the make with 'make -DWITHOUT_XFT'." +BROKEN+="There may be other third party font packages that also cause this" +BROKEN+="breakage; they will be tested for as they are identified. If you" +BROKEN+="find a font port that verifiably causes this breakage, please" +BROKEN+="let us know by mailing ${MAINTAINER}. Thank you." +BROKEN+="NOTE: The Microsoft webfonts port is known to be safe." +.endif # defined(BAD_FONTS) && !defined(WITHOUT_XFT) CPPFLAGS+= -I${X11BASE}/include CFLAGS+= ${PTHREAD_CFLAGS} diff --git a/www/firefox3-devel/files/mozconfig.in b/www/firefox3-devel/files/mozconfig.in index 2bea08b6719a..50703b5df336 100644 --- a/www/firefox3-devel/files/mozconfig.in +++ b/www/firefox3-devel/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/firefox3-devel/files/patch-nsprpub-pr-src-pthreads-ptio.c b/www/firefox3-devel/files/patch-nsprpub-pr-src-pthreads-ptio.c new file mode 100644 index 000000000000..4a965d4c7440 --- /dev/null +++ b/www/firefox3-devel/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); + } diff --git a/www/firefox35/Makefile b/www/firefox35/Makefile index 87ad5278d832..b6a6ce1dcb53 100644 --- a/www/firefox35/Makefile +++ b/www/firefox35/Makefile @@ -9,7 +9,7 @@ PORTNAME= phoenix PORTVERSION= 0.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www # pita MASTER_SITES= ${MASTER_SITE_LOCAL} ${BSD_WEBDIR} MASTER_SITE_SUBDIR= alane @@ -21,7 +21,6 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ mng.1:${PORTSDIR}/graphics/libmng \ freetype.9:${PORTSDIR}/print/freetype2 \ IDL.2:${PORTSDIR}/devel/ORBit \ - Xft2.2:${PORTSDIR}/x11-fonts/Xft \ iconv.3:${PORTSDIR}/converters/libiconv BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \ freetype-config:${PORTSDIR}/print/freetype2 @@ -60,6 +59,7 @@ SORT?=/usr/bin/sort PLIST=${WRKDIR}/plist .if defined(WITH_DEBUG) +WITH_LOGGING= yes WITHOUT_OPTIMIZE= yes CONFIGURE_ENV+= WITH_DEBUG=yes .endif # defined(WITH_DEBUG) @@ -68,6 +68,35 @@ CONFIGURE_ENV+= WITH_DEBUG=yes CFLAGS+= -O2 .endif # defined(WITH_OPTIMIZE) +.if defined(WITH_LOGGING) +CONFIGURE_ENV+= WITH_LOGGING=yes +.endif # defined(WITH_LOGGING) + +.if defined(WITHOUT_XFT) +CONFIGURE_ENV+= WITHOUT_XFT=yes +.else +LIB_DEPENDS+= Xft2.2:${PORTSDIR}/x11-fonts/Xft +.endif # !defined(WITHOUT_XFT) + +# check for known bad fonts +.if exists(${X11BASE}/lib/X11/fonts/lfpfonts-var/fonts.dir) +BAD_FONTS=yes +.endif # exists(${X11BASE}/lib/X11/fonts/lfpfonts-var/fonts.dir) +.if exists(${X11BASE}/lib/X11/fonts/lfpfonts-fix/fonts.dir) +BAD_FONTS=yes +.endif # exists(${X11BASE}/lib/X11/fonts/lfpfonts-var/fonts.dir) + +.if defined(BAD_FONTS) && !defined(WITHOUT_XFT) +.undef NO_IGNORE +BROKEN= "You have X fonts installed (lfpfonts*) that cause breakage unless" +BROKEN+="WITHOUT_XFT is set, which turns off AntiAliasing. Blease either" +BROKEN+="uninstall the fonts or restart the make with 'make -DWITHOUT_XFT'." +BROKEN+="There may be other third party font packages that also cause this" +BROKEN+="breakage; they will be tested for as they are identified. If you" +BROKEN+="find a font port that verifiably causes this breakage, please" +BROKEN+="let us know by mailing ${MAINTAINER}. Thank you." +BROKEN+="NOTE: The Microsoft webfonts port is known to be safe." +.endif # defined(BAD_FONTS) && !defined(WITHOUT_XFT) CPPFLAGS+= -I${X11BASE}/include CFLAGS+= ${PTHREAD_CFLAGS} diff --git a/www/firefox35/files/mozconfig.in b/www/firefox35/files/mozconfig.in index 2bea08b6719a..50703b5df336 100644 --- a/www/firefox35/files/mozconfig.in +++ b/www/firefox35/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/firefox35/files/patch-nsprpub-pr-src-pthreads-ptio.c b/www/firefox35/files/patch-nsprpub-pr-src-pthreads-ptio.c new file mode 100644 index 000000000000..4a965d4c7440 --- /dev/null +++ b/www/firefox35/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); + } diff --git a/www/firefox36/Makefile b/www/firefox36/Makefile index 87ad5278d832..b6a6ce1dcb53 100644 --- a/www/firefox36/Makefile +++ b/www/firefox36/Makefile @@ -9,7 +9,7 @@ PORTNAME= phoenix PORTVERSION= 0.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www # pita MASTER_SITES= ${MASTER_SITE_LOCAL} ${BSD_WEBDIR} MASTER_SITE_SUBDIR= alane @@ -21,7 +21,6 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ mng.1:${PORTSDIR}/graphics/libmng \ freetype.9:${PORTSDIR}/print/freetype2 \ IDL.2:${PORTSDIR}/devel/ORBit \ - Xft2.2:${PORTSDIR}/x11-fonts/Xft \ iconv.3:${PORTSDIR}/converters/libiconv BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \ freetype-config:${PORTSDIR}/print/freetype2 @@ -60,6 +59,7 @@ SORT?=/usr/bin/sort PLIST=${WRKDIR}/plist .if defined(WITH_DEBUG) +WITH_LOGGING= yes WITHOUT_OPTIMIZE= yes CONFIGURE_ENV+= WITH_DEBUG=yes .endif # defined(WITH_DEBUG) @@ -68,6 +68,35 @@ CONFIGURE_ENV+= WITH_DEBUG=yes CFLAGS+= -O2 .endif # defined(WITH_OPTIMIZE) +.if defined(WITH_LOGGING) +CONFIGURE_ENV+= WITH_LOGGING=yes +.endif # defined(WITH_LOGGING) + +.if defined(WITHOUT_XFT) +CONFIGURE_ENV+= WITHOUT_XFT=yes +.else +LIB_DEPENDS+= Xft2.2:${PORTSDIR}/x11-fonts/Xft +.endif # !defined(WITHOUT_XFT) + +# check for known bad fonts +.if exists(${X11BASE}/lib/X11/fonts/lfpfonts-var/fonts.dir) +BAD_FONTS=yes +.endif # exists(${X11BASE}/lib/X11/fonts/lfpfonts-var/fonts.dir) +.if exists(${X11BASE}/lib/X11/fonts/lfpfonts-fix/fonts.dir) +BAD_FONTS=yes +.endif # exists(${X11BASE}/lib/X11/fonts/lfpfonts-var/fonts.dir) + +.if defined(BAD_FONTS) && !defined(WITHOUT_XFT) +.undef NO_IGNORE +BROKEN= "You have X fonts installed (lfpfonts*) that cause breakage unless" +BROKEN+="WITHOUT_XFT is set, which turns off AntiAliasing. Blease either" +BROKEN+="uninstall the fonts or restart the make with 'make -DWITHOUT_XFT'." +BROKEN+="There may be other third party font packages that also cause this" +BROKEN+="breakage; they will be tested for as they are identified. If you" +BROKEN+="find a font port that verifiably causes this breakage, please" +BROKEN+="let us know by mailing ${MAINTAINER}. Thank you." +BROKEN+="NOTE: The Microsoft webfonts port is known to be safe." +.endif # defined(BAD_FONTS) && !defined(WITHOUT_XFT) CPPFLAGS+= -I${X11BASE}/include CFLAGS+= ${PTHREAD_CFLAGS} diff --git a/www/firefox36/files/mozconfig.in b/www/firefox36/files/mozconfig.in index 2bea08b6719a..50703b5df336 100644 --- a/www/firefox36/files/mozconfig.in +++ b/www/firefox36/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/firefox36/files/patch-nsprpub-pr-src-pthreads-ptio.c b/www/firefox36/files/patch-nsprpub-pr-src-pthreads-ptio.c new file mode 100644 index 000000000000..4a965d4c7440 --- /dev/null +++ b/www/firefox36/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); + } diff --git a/www/flock/Makefile b/www/flock/Makefile index 87ad5278d832..b6a6ce1dcb53 100644 --- a/www/flock/Makefile +++ b/www/flock/Makefile @@ -9,7 +9,7 @@ PORTNAME= phoenix PORTVERSION= 0.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www # pita MASTER_SITES= ${MASTER_SITE_LOCAL} ${BSD_WEBDIR} MASTER_SITE_SUBDIR= alane @@ -21,7 +21,6 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ mng.1:${PORTSDIR}/graphics/libmng \ freetype.9:${PORTSDIR}/print/freetype2 \ IDL.2:${PORTSDIR}/devel/ORBit \ - Xft2.2:${PORTSDIR}/x11-fonts/Xft \ iconv.3:${PORTSDIR}/converters/libiconv BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \ freetype-config:${PORTSDIR}/print/freetype2 @@ -60,6 +59,7 @@ SORT?=/usr/bin/sort PLIST=${WRKDIR}/plist .if defined(WITH_DEBUG) +WITH_LOGGING= yes WITHOUT_OPTIMIZE= yes CONFIGURE_ENV+= WITH_DEBUG=yes .endif # defined(WITH_DEBUG) @@ -68,6 +68,35 @@ CONFIGURE_ENV+= WITH_DEBUG=yes CFLAGS+= -O2 .endif # defined(WITH_OPTIMIZE) +.if defined(WITH_LOGGING) +CONFIGURE_ENV+= WITH_LOGGING=yes +.endif # defined(WITH_LOGGING) + +.if defined(WITHOUT_XFT) +CONFIGURE_ENV+= WITHOUT_XFT=yes +.else +LIB_DEPENDS+= Xft2.2:${PORTSDIR}/x11-fonts/Xft +.endif # !defined(WITHOUT_XFT) + +# check for known bad fonts +.if exists(${X11BASE}/lib/X11/fonts/lfpfonts-var/fonts.dir) +BAD_FONTS=yes +.endif # exists(${X11BASE}/lib/X11/fonts/lfpfonts-var/fonts.dir) +.if exists(${X11BASE}/lib/X11/fonts/lfpfonts-fix/fonts.dir) +BAD_FONTS=yes +.endif # exists(${X11BASE}/lib/X11/fonts/lfpfonts-var/fonts.dir) + +.if defined(BAD_FONTS) && !defined(WITHOUT_XFT) +.undef NO_IGNORE +BROKEN= "You have X fonts installed (lfpfonts*) that cause breakage unless" +BROKEN+="WITHOUT_XFT is set, which turns off AntiAliasing. Blease either" +BROKEN+="uninstall the fonts or restart the make with 'make -DWITHOUT_XFT'." +BROKEN+="There may be other third party font packages that also cause this" +BROKEN+="breakage; they will be tested for as they are identified. If you" +BROKEN+="find a font port that verifiably causes this breakage, please" +BROKEN+="let us know by mailing ${MAINTAINER}. Thank you." +BROKEN+="NOTE: The Microsoft webfonts port is known to be safe." +.endif # defined(BAD_FONTS) && !defined(WITHOUT_XFT) CPPFLAGS+= -I${X11BASE}/include CFLAGS+= ${PTHREAD_CFLAGS} diff --git a/www/flock/files/mozconfig.in b/www/flock/files/mozconfig.in index 2bea08b6719a..50703b5df336 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 000000000000..4a965d4c7440 --- /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); + } diff --git a/www/mozilla-firebird/Makefile b/www/mozilla-firebird/Makefile index 87ad5278d832..b6a6ce1dcb53 100644 --- a/www/mozilla-firebird/Makefile +++ b/www/mozilla-firebird/Makefile @@ -9,7 +9,7 @@ PORTNAME= phoenix PORTVERSION= 0.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www # pita MASTER_SITES= ${MASTER_SITE_LOCAL} ${BSD_WEBDIR} MASTER_SITE_SUBDIR= alane @@ -21,7 +21,6 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ mng.1:${PORTSDIR}/graphics/libmng \ freetype.9:${PORTSDIR}/print/freetype2 \ IDL.2:${PORTSDIR}/devel/ORBit \ - Xft2.2:${PORTSDIR}/x11-fonts/Xft \ iconv.3:${PORTSDIR}/converters/libiconv BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \ freetype-config:${PORTSDIR}/print/freetype2 @@ -60,6 +59,7 @@ SORT?=/usr/bin/sort PLIST=${WRKDIR}/plist .if defined(WITH_DEBUG) +WITH_LOGGING= yes WITHOUT_OPTIMIZE= yes CONFIGURE_ENV+= WITH_DEBUG=yes .endif # defined(WITH_DEBUG) @@ -68,6 +68,35 @@ CONFIGURE_ENV+= WITH_DEBUG=yes CFLAGS+= -O2 .endif # defined(WITH_OPTIMIZE) +.if defined(WITH_LOGGING) +CONFIGURE_ENV+= WITH_LOGGING=yes +.endif # defined(WITH_LOGGING) + +.if defined(WITHOUT_XFT) +CONFIGURE_ENV+= WITHOUT_XFT=yes +.else +LIB_DEPENDS+= Xft2.2:${PORTSDIR}/x11-fonts/Xft +.endif # !defined(WITHOUT_XFT) + +# check for known bad fonts +.if exists(${X11BASE}/lib/X11/fonts/lfpfonts-var/fonts.dir) +BAD_FONTS=yes +.endif # exists(${X11BASE}/lib/X11/fonts/lfpfonts-var/fonts.dir) +.if exists(${X11BASE}/lib/X11/fonts/lfpfonts-fix/fonts.dir) +BAD_FONTS=yes +.endif # exists(${X11BASE}/lib/X11/fonts/lfpfonts-var/fonts.dir) + +.if defined(BAD_FONTS) && !defined(WITHOUT_XFT) +.undef NO_IGNORE +BROKEN= "You have X fonts installed (lfpfonts*) that cause breakage unless" +BROKEN+="WITHOUT_XFT is set, which turns off AntiAliasing. Blease either" +BROKEN+="uninstall the fonts or restart the make with 'make -DWITHOUT_XFT'." +BROKEN+="There may be other third party font packages that also cause this" +BROKEN+="breakage; they will be tested for as they are identified. If you" +BROKEN+="find a font port that verifiably causes this breakage, please" +BROKEN+="let us know by mailing ${MAINTAINER}. Thank you." +BROKEN+="NOTE: The Microsoft webfonts port is known to be safe." +.endif # defined(BAD_FONTS) && !defined(WITHOUT_XFT) CPPFLAGS+= -I${X11BASE}/include CFLAGS+= ${PTHREAD_CFLAGS} diff --git a/www/mozilla-firebird/files/mozconfig.in b/www/mozilla-firebird/files/mozconfig.in index 2bea08b6719a..50703b5df336 100644 --- a/www/mozilla-firebird/files/mozconfig.in +++ b/www/mozilla-firebird/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/mozilla-firebird/files/patch-nsprpub-pr-src-pthreads-ptio.c b/www/mozilla-firebird/files/patch-nsprpub-pr-src-pthreads-ptio.c new file mode 100644 index 000000000000..4a965d4c7440 --- /dev/null +++ b/www/mozilla-firebird/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); + } diff --git a/www/phoenix/Makefile b/www/phoenix/Makefile index 87ad5278d832..b6a6ce1dcb53 100644 --- a/www/phoenix/Makefile +++ b/www/phoenix/Makefile @@ -9,7 +9,7 @@ PORTNAME= phoenix PORTVERSION= 0.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www # pita MASTER_SITES= ${MASTER_SITE_LOCAL} ${BSD_WEBDIR} MASTER_SITE_SUBDIR= alane @@ -21,7 +21,6 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ mng.1:${PORTSDIR}/graphics/libmng \ freetype.9:${PORTSDIR}/print/freetype2 \ IDL.2:${PORTSDIR}/devel/ORBit \ - Xft2.2:${PORTSDIR}/x11-fonts/Xft \ iconv.3:${PORTSDIR}/converters/libiconv BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \ freetype-config:${PORTSDIR}/print/freetype2 @@ -60,6 +59,7 @@ SORT?=/usr/bin/sort PLIST=${WRKDIR}/plist .if defined(WITH_DEBUG) +WITH_LOGGING= yes WITHOUT_OPTIMIZE= yes CONFIGURE_ENV+= WITH_DEBUG=yes .endif # defined(WITH_DEBUG) @@ -68,6 +68,35 @@ CONFIGURE_ENV+= WITH_DEBUG=yes CFLAGS+= -O2 .endif # defined(WITH_OPTIMIZE) +.if defined(WITH_LOGGING) +CONFIGURE_ENV+= WITH_LOGGING=yes +.endif # defined(WITH_LOGGING) + +.if defined(WITHOUT_XFT) +CONFIGURE_ENV+= WITHOUT_XFT=yes +.else +LIB_DEPENDS+= Xft2.2:${PORTSDIR}/x11-fonts/Xft +.endif # !defined(WITHOUT_XFT) + +# check for known bad fonts +.if exists(${X11BASE}/lib/X11/fonts/lfpfonts-var/fonts.dir) +BAD_FONTS=yes +.endif # exists(${X11BASE}/lib/X11/fonts/lfpfonts-var/fonts.dir) +.if exists(${X11BASE}/lib/X11/fonts/lfpfonts-fix/fonts.dir) +BAD_FONTS=yes +.endif # exists(${X11BASE}/lib/X11/fonts/lfpfonts-var/fonts.dir) + +.if defined(BAD_FONTS) && !defined(WITHOUT_XFT) +.undef NO_IGNORE +BROKEN= "You have X fonts installed (lfpfonts*) that cause breakage unless" +BROKEN+="WITHOUT_XFT is set, which turns off AntiAliasing. Blease either" +BROKEN+="uninstall the fonts or restart the make with 'make -DWITHOUT_XFT'." +BROKEN+="There may be other third party font packages that also cause this" +BROKEN+="breakage; they will be tested for as they are identified. If you" +BROKEN+="find a font port that verifiably causes this breakage, please" +BROKEN+="let us know by mailing ${MAINTAINER}. Thank you." +BROKEN+="NOTE: The Microsoft webfonts port is known to be safe." +.endif # defined(BAD_FONTS) && !defined(WITHOUT_XFT) CPPFLAGS+= -I${X11BASE}/include CFLAGS+= ${PTHREAD_CFLAGS} diff --git a/www/phoenix/files/mozconfig.in b/www/phoenix/files/mozconfig.in index 2bea08b6719a..50703b5df336 100644 --- a/www/phoenix/files/mozconfig.in +++ b/www/phoenix/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/phoenix/files/patch-nsprpub-pr-src-pthreads-ptio.c b/www/phoenix/files/patch-nsprpub-pr-src-pthreads-ptio.c new file mode 100644 index 000000000000..4a965d4c7440 --- /dev/null +++ b/www/phoenix/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); + } |