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/XFree86-4-libraries | |
| 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/XFree86-4-libraries')
| -rw-r--r-- | x11/XFree86-4-libraries/Makefile | 4 | ||||
| -rw-r--r-- | x11/XFree86-4-libraries/pkg-plist | 6 | ||||
| -rw-r--r-- | x11/XFree86-4-libraries/scripts/configure | 1 |
3 files changed, 3 insertions, 8 deletions
diff --git a/x11/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile index c41ec2b3cda4..0d7361907189 100644 --- a/x11/XFree86-4-libraries/Makefile +++ b/x11/XFree86-4-libraries/Makefile @@ -7,7 +7,7 @@ PORTNAME= libraries PORTVERSION= 4.2.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \ ${MASTER_SITE_LOCAL:S/$/:local/} @@ -50,7 +50,7 @@ MAKE_ENV= PKGNAMEPREFIX=${PKGNAMEPREFIX} \ PORTNAME=${PORTNAME} \ PORTVERSION=${PORTVERSION} MAN1= libxrx.1 -MAN3= Xaw.3 Xft.3 +MAN3= Xaw.3 XBUILD_DIRS= lib nls programs/Xserver/include \ programs/Xserver/hw/xfree86/parser \ programs/xrx diff --git a/x11/XFree86-4-libraries/pkg-plist b/x11/XFree86-4-libraries/pkg-plist index 4a48b4141c0b..bc7a65e634aa 100644 --- a/x11/XFree86-4-libraries/pkg-plist +++ b/x11/XFree86-4-libraries/pkg-plist @@ -158,8 +158,6 @@ include/X11/Xaw/XawInit.h include/X11/Xcms.h include/X11/Xdefs.h include/X11/Xdmcp.h -include/X11/Xft/Xft.h -include/X11/Xft/XftFreetype.h include/X11/Xfuncproto.h include/X11/Xfuncs.h include/X11/Xlib.h @@ -378,7 +376,6 @@ include/xf86Optrec.h include/xf86Parser.h lib/X11/XErrorDB lib/X11/XKeysymDB -lib/X11/XftConfig lib/X11/locale/C/XI18N_OBJS lib/X11/locale/C/XLC_LOCALE lib/X11/locale/armscii-8/Compose @@ -555,9 +552,6 @@ lib/libXfont.a lib/libXfont.so lib/libXfont.so.1 lib/libXfontcache.a -lib/libXft.a -lib/libXft.so -lib/libXft.so.1 lib/libXi.a lib/libXi.so lib/libXi.so.6 diff --git a/x11/XFree86-4-libraries/scripts/configure b/x11/XFree86-4-libraries/scripts/configure index d37c78c4c1cc..b1aaeea01b30 100644 --- a/x11/XFree86-4-libraries/scripts/configure +++ b/x11/XFree86-4-libraries/scripts/configure @@ -76,6 +76,7 @@ configure () { echo "#define FreeBSDCC ${CC}" >> $LOCALDEF echo "#define FreeBSDCXX ${CXX}" >> $LOCALDEF echo "#define FreeBSDCFLAGS ${CFLAGS}" >> $LOCALDEF + echo "#define BuildXftLibrary NO" >> $LOCALDEF # Copy ORIGDEF to DESTDEF rm -f $DESTDEF |