diff options
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/XFree86-4-clients/Makefile | 3 | ||||
| -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 | ||||
| -rw-r--r-- | x11/fbdesk/Makefile | 3 | ||||
| -rw-r--r-- | x11/fspanel/Makefile | 2 | ||||
| -rw-r--r-- | x11/fspanel/files/patch-configure | 13 | ||||
| -rw-r--r-- | x11/mlterm/Makefile | 2 | ||||
| -rw-r--r-- | x11/xstroke/Makefile | 2 |
9 files changed, 25 insertions, 11 deletions
diff --git a/x11/XFree86-4-clients/Makefile b/x11/XFree86-4-clients/Makefile index c7fe90ff65bf..eb2764026aae 100644 --- a/x11/XFree86-4-clients/Makefile +++ b/x11/XFree86-4-clients/Makefile @@ -22,7 +22,8 @@ PATCHFILES= 4.2.0-4.2.1-1-freebsd.patch.gz MAINTAINER= anholt@freebsd.org LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ - GLU.1:${PORTSDIR}/x11/XFree86-4-libraries + GLU.1:${PORTSDIR}/x11/XFree86-4-libraries \ + Xft.2:${PORTSDIR}/x11-fonts/Xft XFREE86_VERSION= 4 USE_IMAKE= YES 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 diff --git a/x11/fbdesk/Makefile b/x11/fbdesk/Makefile index 4a767988d4e9..981505307aeb 100644 --- a/x11/fbdesk/Makefile +++ b/x11/fbdesk/Makefile @@ -12,7 +12,8 @@ MASTER_SITES= http://fluxbox.sourceforge.net/download/ MAINTAINER= hendrik@scholz.net -LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png +LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ + Xft.2:${PORTSDIR}/x11-fonts/Xft USE_X_PREFIX= yes GNU_CONFIGURE= yes 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 diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile index 1bb52e3937d5..23e0bfa67fbb 100644 --- a/x11/mlterm/Makefile +++ b/x11/mlterm/Makefile @@ -29,7 +29,7 @@ MAN1= mlterm.1 mlclient.1 PKGNAMESUFFIX= -noaa .else CONFIGURE_ARGS+= --enable-anti-alias -LIB_DEPENDS= Xft2.2:${PORTSDIR}/x11-fonts/Xft +LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/Xft .endif post-configure: diff --git a/x11/xstroke/Makefile b/x11/xstroke/Makefile index 4dba512c6179..0b2bb72929a2 100644 --- a/x11/xstroke/Makefile +++ b/x11/xstroke/Makefile @@ -14,6 +14,8 @@ MASTER_SITES= ftp://ftp.handhelds.org/pub/projects/xstroke/release-${PORTVERSION MAINTAINER= ports@FreeBSD.org +BROKEN= Needs updates for Xft and XFree86 4.3 + LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt USE_REINPLACE= yes |