diff options
| author | alane <alane@FreeBSD.org> | 2002-12-15 06:49:59 +0800 |
|---|---|---|
| committer | alane <alane@FreeBSD.org> | 2002-12-15 06:49:59 +0800 |
| commit | c4d5940314c9cc34ec927e7a46557404f7b2f4ed (patch) | |
| tree | 93cbab5e24b7c323f3c62258b856c704e2236ab4 /www/firefox35/Makefile | |
| parent | 47e8e9b2378aa0577111ed1d0ffb8d880e61b946 (diff) | |
| download | freebsd-ports-gnome-c4d5940314c9cc34ec927e7a46557404f7b2f4ed.tar.gz freebsd-ports-gnome-c4d5940314c9cc34ec927e7a46557404f7b2f4ed.tar.zst freebsd-ports-gnome-c4d5940314c9cc34ec927e7a46557404f7b2f4ed.zip | |
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/firefox35/Makefile')
| -rw-r--r-- | www/firefox35/Makefile | 33 |
1 files changed, 31 insertions, 2 deletions
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} |