diff options
author | Eric Anholt <anholt@FreeBSD.org> | 2003-02-18 04:51:34 +0000 |
---|---|---|
committer | Eric Anholt <anholt@FreeBSD.org> | 2003-02-18 04:51:34 +0000 |
commit | 38805e871a0ec7d383e76a6cb1d979ba6c291d56 (patch) | |
tree | 662a776fedc3c397b783a0430a4b7be199a8e394 /www/mozilla | |
parent | Upgrade to 4.29.10 (diff) |
Remove the renaming of Xft headers and library from the Xft (Xft2) port.
Remove installing of Xft1 from XFree86-4-libraries, and add dependencies
to the Xft port by all the ports that use it along with whatever patches are
necessary.
Approved by: portmgr (kris), marcus
Notes
Notes:
svn path=/head/; revision=75774
Diffstat (limited to '')
-rw-r--r-- | www/mozilla-devel/Makefile | 8 | ||||
-rw-r--r-- | www/mozilla-firebird/Makefile | 8 | ||||
-rw-r--r-- | www/mozilla/Makefile | 7 |
3 files changed, 3 insertions, 20 deletions
diff --git a/www/mozilla-devel/Makefile b/www/mozilla-devel/Makefile index 17efc220ef6b..688a86e018cf 100644 --- a/www/mozilla-devel/Makefile +++ b/www/mozilla-devel/Makefile @@ -40,7 +40,7 @@ USE_GNOME= gtk12 orbit .endif .if !defined(WITHOUT_XFT) -LIB_DEPENDS+= Xft2.2:${PORTSDIR}/x11-fonts/Xft +LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/Xft .if exists(${X11BASE}/lib/X11/fonts/mozilla/fonts.dir) BROKEN= Mozilla-devel and Xft2 render the mozilla-fonts \ illegibly. Please remove the mozilla-fonts package. @@ -165,12 +165,6 @@ pre-everything:: post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ ${WRKSRC}/build/unix/run-mozilla.sh -.if !defined(WITHOUT_XFT) - @${REINPLACE_CMD} -e 's|X11/Xft/Xft\.h|X11/Xft/Xft2.h|g' \ - ${WRKSRC}/gfx/src/gtk/nsDrawingSurfaceGTK.cpp \ - ${WRKSRC}/gfx/src/gtk/nsFontMetricsXft.h \ - ${WRKSRC}/gfx/src/gtk/nsDeviceContextGTK.cpp -.endif @${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \ -e 's|%%HEADERS_SUFX%%|-devel|g' \ ${WRKSRC}/config/autoconf.mk.in diff --git a/www/mozilla-firebird/Makefile b/www/mozilla-firebird/Makefile index a01bf2e81ec3..fd8f49bcb698 100644 --- a/www/mozilla-firebird/Makefile +++ b/www/mozilla-firebird/Makefile @@ -76,7 +76,7 @@ CONFIGURE_ENV+= WITH_LOGGING=yes .if defined(WITHOUT_XFT) CONFIGURE_ENV+= WITHOUT_XFT=yes .else -LIB_DEPENDS+= Xft2.2:${PORTSDIR}/x11-fonts/Xft +LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/Xft .endif # !defined(WITHOUT_XFT) CPPFLAGS+= -I${X11BASE}/include @@ -101,12 +101,6 @@ post-extract:: -e 's|@PREFIX@|${LOCAL_PREFIX}|' \ <${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig -# fix for Xft (thanks to marcus@) -post-patch: - cd ${WRKSRC}/gfx/src/gtk; \ - ${REINPLACE_CMD} -e 's|X11/Xft/Xft\.h|X11/Xft/Xft2.h|g' \ - nsDrawingSurfaceGTK.cpp nsFontMetricsXft.h - post-build: ${RM} -f ${PLIST} ${TOUCH} ${PLIST} diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile index 3152f71941d0..e68984f7f1be 100644 --- a/www/mozilla/Makefile +++ b/www/mozilla/Makefile @@ -40,7 +40,7 @@ USE_GNOME= gtk12 .endif .if !defined(WITHOUT_XFT) -LIB_DEPENDS+= Xft2.2:${PORTSDIR}/x11-fonts/Xft +LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/Xft .if exists(${X11BASE}/lib/X11/fonts/mozilla/fonts.dir) BROKEN= Mozilla and Xft2 render the mozilla-fonts \ illegibly. Please remove the mozilla-fonts package. @@ -167,11 +167,6 @@ pre-everything:: post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ ${WRKSRC}/build/unix/run-mozilla.sh -.if !defined(WITHOUT_XFT) - @${REINPLACE_CMD} -e 's|X11/Xft/Xft\.h|X11/Xft/Xft2.h|g' \ - ${WRKSRC}/gfx/src/gtk/nsDrawingSurfaceGTK.cpp \ - ${WRKSRC}/gfx/src/gtk/nsFontMetricsXft.h -.endif @${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \ -e 's|%%HEADERS_SUFX%%||g' \ ${WRKSRC}/config/autoconf.mk.in |