diff options
author | anholt <anholt@FreeBSD.org> | 2003-02-18 12:51:34 +0800 |
---|---|---|
committer | anholt <anholt@FreeBSD.org> | 2003-02-18 12:51:34 +0800 |
commit | bbd40e6567929777b1318d8007a72beb45fe4d11 (patch) | |
tree | 5caa165101b54687ed4db3da64661e9f1be5752d /x11/fspanel | |
parent | 752b5659d3e9f975a4c2ff8503a818215edb7042 (diff) | |
download | freebsd-ports-gnome-bbd40e6567929777b1318d8007a72beb45fe4d11.tar.gz freebsd-ports-gnome-bbd40e6567929777b1318d8007a72beb45fe4d11.tar.zst freebsd-ports-gnome-bbd40e6567929777b1318d8007a72beb45fe4d11.zip |
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
Diffstat (limited to 'x11/fspanel')
-rw-r--r-- | x11/fspanel/Makefile | 2 | ||||
-rw-r--r-- | x11/fspanel/files/patch-configure | 13 |
2 files changed, 15 insertions, 0 deletions
diff --git a/x11/fspanel/Makefile b/x11/fspanel/Makefile index 3fc1a87cc8b7..fd9a3db87e02 100644 --- a/x11/fspanel/Makefile +++ b/x11/fspanel/Makefile @@ -13,6 +13,8 @@ DISTNAME= fspanel-0.8beta1 MAINTAINER= anarcat@anarcat.dyndns.org +LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/Xft + USE_X_PREFIX= yes HAS_CONFIGURE= yes ALL_TARGET= fspanel diff --git a/x11/fspanel/files/patch-configure b/x11/fspanel/files/patch-configure new file mode 100644 index 000000000000..7f162abf2a9e --- /dev/null +++ b/x11/fspanel/files/patch-configure @@ -0,0 +1,13 @@ +--- configure.orig Sat Jun 22 22:13:01 2002 ++++ configure Mon Feb 17 16:56:27 2003 +@@ -52,8 +52,8 @@ + xft=no + if test -e "$X11_PATH/include/X11/Xft/Xft.h"; then + echo yes +- LDFLAGS="$LDFLAGS -lXft" +- CFLAGS="$CFLAGS -DXFT" ++ LDFLAGS="$LDFLAGS `pkg-config xft --libs`" ++ CFLAGS="$CFLAGS -DXFT `pkg-config xft --cflags`" + xft=yes + else + echo no |