diff options
| author | marcus <marcus@FreeBSD.org> | 2003-01-07 14:42:13 +0800 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2003-01-07 14:42:13 +0800 |
| commit | 6f0a037dadfdc1f0b18fe0441ccf9d5ad1eccd2f (patch) | |
| tree | 1369fb4d86244253b38b3bdc108a716178a594cd /x11-fonts | |
| parent | b84dde4f34b75b1e0e9ce76a7af7849cb6ce914e (diff) | |
| download | freebsd-ports-gnome-6f0a037dadfdc1f0b18fe0441ccf9d5ad1eccd2f.tar.gz freebsd-ports-gnome-6f0a037dadfdc1f0b18fe0441ccf9d5ad1eccd2f.tar.zst freebsd-ports-gnome-6f0a037dadfdc1f0b18fe0441ccf9d5ad1eccd2f.zip | |
Make Xft conditional on having XFree86 4.x installed. Also add a note
about adding an additional check with XFree86 4.3 gets added to the tree.
Diffstat (limited to 'x11-fonts')
| -rw-r--r-- | x11-fonts/Xft/Makefile | 10 | ||||
| -rw-r--r-- | x11-fonts/libXft/Makefile | 10 |
2 files changed, 18 insertions, 2 deletions
diff --git a/x11-fonts/Xft/Makefile b/x11-fonts/Xft/Makefile index c729f83857aa..f5839ff9ddb5 100644 --- a/x11-fonts/Xft/Makefile +++ b/x11-fonts/Xft/Makefile @@ -26,7 +26,15 @@ CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \ LIBS="-L${X11BASE}/lib" WRKSRC= ${WRKDIR}/${DISTNAME}/Xft +.include <bsd.port.pre.mk> + +# TODO Add a check to make sure we're not using XFree86 4.3.x which will +# have Xft2 included by default. +.if ${XFREE86_VERSION} == 3 +BROKEN= Xft2 requires XFree86 4.x to build. +.endif + pre-patch: @${REINPLACE_CMD} -e 's|[(]LIBDIR[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' ${WRKSRC}/Makefile.in -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/x11-fonts/libXft/Makefile b/x11-fonts/libXft/Makefile index c729f83857aa..f5839ff9ddb5 100644 --- a/x11-fonts/libXft/Makefile +++ b/x11-fonts/libXft/Makefile @@ -26,7 +26,15 @@ CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \ LIBS="-L${X11BASE}/lib" WRKSRC= ${WRKDIR}/${DISTNAME}/Xft +.include <bsd.port.pre.mk> + +# TODO Add a check to make sure we're not using XFree86 4.3.x which will +# have Xft2 included by default. +.if ${XFREE86_VERSION} == 3 +BROKEN= Xft2 requires XFree86 4.x to build. +.endif + pre-patch: @${REINPLACE_CMD} -e 's|[(]LIBDIR[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' ${WRKSRC}/Makefile.in -.include <bsd.port.mk> +.include <bsd.port.post.mk> |