diff options
| author | Adriaan de Groot <adridg@FreeBSD.org> | 2022-05-16 21:55:28 +0000 |
|---|---|---|
| committer | Adriaan de Groot <adridg@FreeBSD.org> | 2022-05-16 22:01:50 +0000 |
| commit | 16efa5a804e5bdc8e319809155f4122960a5f3ee (patch) | |
| tree | 6ed8d54a1f9a2d0f204e7e8d4ec63f7839f3b99b | |
| parent | 1c7a8416105f137f8062ecafb52d7281fe963ec2 (diff) | |
| download | ports-16efa5a804e5bdc8e319809155f4122960a5f3ee.tar.gz ports-16efa5a804e5bdc8e319809155f4122960a5f3ee.zip | |
x11/xscreensaver: remove XFT option
Xft isn't optional: it is mandatory, and xscreensaver configure
complains if it isn't there (but completes with a successful
exit code, which is a bit strange). Without XFT, the build
eventually fails like so:
dialog.c:695:52: error: use of undeclared identifier 'FcChar32'
if (XftCharExists (ws->dpy, ws->label_font, (FcChar32) *uc))
PR: 263869
Reported by: riggs
Approved by: build-fix blanket
| -rw-r--r-- | x11/xscreensaver/Makefile | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile index 1dfc19010e84..b5b815c743d7 100644 --- a/x11/xscreensaver/Makefile +++ b/x11/xscreensaver/Makefile @@ -2,6 +2,7 @@ PORTNAME= xscreensaver PORTVERSION= 6.02 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= http://www.jwz.org/xscreensaver/ @@ -22,7 +23,7 @@ USES= autoreconf cpe gettext gl gmake gnome jpeg localbase:ldflags perl5 \ USE_GL= gl glu USE_GNOME= cairo gdkpixbuf2 gtk20 intltool libglade2 libxml2 USE_PERL5= run -USE_XORG= ice sm x11 xext xi xinerama xmu xrandr xrender xt xxf86vm +USE_XORG= ice sm x11 xext xft xi xinerama xmu xrandr xrender xt xxf86vm CPE_VENDOR= xscreensaver_project GNU_CONFIGURE= yes @@ -41,15 +42,16 @@ CONFIGURE_ARGS= --enable-locking \ --with-xdbe-ext \ --with-xf86gamma-ext \ --with-xf86vmode-ext \ + --with-xft \ --with-xinerama-ext \ --with-xshm-ext \ --without-kerberos MAKE_ARGS+= install_prefix=${STAGEDIR} MAKE_JOBS_UNSAFE= yes -OPTIONS_DEFINE= FIREF NLS NSFW PAM SETUID_HACKS XAOS1 XDALI XEARTH XFT \ +OPTIONS_DEFINE= FIREF NLS NSFW PAM SETUID_HACKS XAOS1 XDALI XEARTH \ XMOUN XPLANET XSNOW -OPTIONS_DEFAULT= PAM XFT +OPTIONS_DEFAULT= PAM OPTIONS_SUB= yes PAM_CONFIGURE_WITH= passwd-helper=${PREFIX}/bin/pam_helper @@ -72,9 +74,6 @@ XAOS1_RUN_DEPENDS= xaos:graphics/xaos XDALI_DESC= Add extra port x11-clocks/xdaliclock XDALI_RUN_DEPENDS= xdaliclock:x11-clocks/xdaliclock -XFT_CONFIGURE_WITH= xft -XFT_USE= XORG=xft - XEARTH_DESC= Add extra port astro/xearth XEARTH_RUN_DEPENDS= xearth:astro/xearth |