kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

editors/emacs-devel: Build pure GTK Emacs by default

Browse source 
- Add PGTK to OPTIONS_DEFAULT
- Remove M17N, OTF, XFT, XIM, and XPM from OPTIONS_DEFAULT
- Eliminate X11 dependencies for pure GTK Emacs by
  - removing CAIRO_IMPLIES=XFT and OTF_IMPLIES=XFT
  - adding CAIRO_PREVENTS=XFT and PGTK_PREVENTS=M17N XFT XPM
  - not including USES=xorg.

While here, pull in a new 2022-01-03 revision and incorporate minor
formatting changes suggested by portfmt.

Reported by:	jbeich
Reviewed by:	jbeich
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D33714
This commit is contained in:
Joseph Mingrone 2022-01-01 17:23:42 -04:00
parent 9e5b3be5aa
commit 08f3c048b6
No known key found for this signature in database
GPG key ID: 36A40C83B0D6EF9E
2 changed files with 30 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
editors/emacs-devel/Makefile
View file

@ -1,7 +1,7 @@
# Created by: Kenneth Vestergaard Schmidt <kvs@pil.dk>
PORTNAME= emacs
DISTVERSION= 29.0.50.20220101
DISTVERSION= 29.0.50.20220103
PORTEPOCH= 2
CATEGORIES= editors
PKGNAMESUFFIX= -devel
@ -25,12 +25,7 @@ USES= autoreconf:build cpe gmake localbase:ldflags ncurses pkgconfig
CPE_VENDOR= gnu
USE_GITHUB= yes
GH_ACCOUNT= emacs-mirror
GH_TAGNAME= 4d1968b
.if ${FLAVOR:U} != nox
USES+= desktop-file-utils gnome xorg
USE_XORG= ice sm x11 xcb xext xfixes xinerama xmu xrandr xrender xt
.endif
GH_TAGNAME= ab5ee3e
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-build-details \
@ -50,6 +45,7 @@ CONFIGURE_ARGS+= --with-sound=no \
--without-lcms2 \
--without-libotf \
--without-m17n-flt \
--without-pgtk \
--without-png \
--without-rsvg \
--without-tiff \
@ -86,9 +82,9 @@ OPTIONS_DEFINE= ACL DBUS GCONF GNUTLS GSETTINGS HARFBUZZ JSON \
PGTK SCROLLBARS SOURCES SQLITE3 THREADS XFT XIM \
XML XWIDGETS
OPTIONS_DEFAULT= ACL CAIRO DBUS GIF GNUTLS GSETTINGS GTK3 \
HARFBUZZ JPEG JSON KQUEUE LCMS2 M17N MAILUTILS \
MODULES OSS OTF PNG SCROLLBARS SOURCES SQLITE3 \
SVG THREADS TIFF WEBP XFT XIM XML XPM
HARFBUZZ JPEG JSON KQUEUE LCMS2 MAILUTILS \
MODULES OSS PGTK PNG SCROLLBARS SOURCES SQLITE3 \
SVG THREADS TIFF WEBP XML
OPTIONS_GROUP= GRAPHICS
OPTIONS_GROUP_GRAPHICS= CAIRO GIF JPEG MAGICK PNG SVG TIFF WEBP XPM
OPTIONS_RADIO= FILENOTIFY SOUND X11TOOLKIT
@ -98,13 +94,13 @@ OPTIONS_RADIO_X11TOOLKIT= GTK2 GTK3 XAW XAW3D
.if ${FLAVOR:U} == nox
OPTIONS_EXCLUDE= ALSA CAIRO DBUS GCONF GFILE GIF GSETTINGS GTK2 \
GTK3 HARFBUZZ JPEG LCMS2 M17N MAGICK OSS OTF \
PNG PGTK SCROLLBARS SVG TIFF WEBP XAW XAW3D XFT \
PGTK PNG SCROLLBARS SVG TIFF WEBP XAW XAW3D XFT \
XIM XPM XWIDGETS
.endif
OPTIONS_SUB= YES
ACL_DESC= Access control list support
CAIRO_DESC= Cairo graphics library support [implies PNG, XFT]
CAIRO_DESC= Cairo graphics library support [implies PNG]
FILENOTIFY_DESC= File notification support
GFILE_DESC= File notification via gfile
GRAPHICS_DESC= Graphics support
@ -130,7 +126,8 @@ XWIDGETS_DESC= Experimental GTK widgets [implies GTK3]
ACL_CONFIGURE_ENABLE= acl
ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
ALSA_CONFIGURE_ON= --with-sound=alsa
CAIRO_IMPLIES= PNG XFT
CAIRO_IMPLIES= PNG
CAIRO_PREVENTS= XFT
CAIRO_USE= GNOME=cairo
CAIRO_CONFIGURE_WITH= cairo
DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus
@ -149,6 +146,8 @@ GTK2_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
GTK2_USE= GNOME=cairo,gtk20
GTK2_CONFIGURE_ON= --with-x-toolkit=gtk2
GTK3_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
GTK3_USE= GNOME=cairo,gtk30
GTK3_CONFIGURE_ON= --with-x-toolkit=gtk3
HARFBUZZ_LIB_DEPENDS= libharfbuzz.so:print/harfbuzz
@ -176,10 +175,10 @@ NATIVECOMP_CONFIGURE_WITH= native-compilation
NATIVECOMP_MAKE_ARGS= NATIVE_FULL_AOT=1
NATIVECOMP_LDFLAGS= -L${LOCALBASE}/lib/${_GCC_PORT}
OSS_CONFIGURE_ON= --with-sound=oss
OTF_IMPLIES= XFT
OTF_LIB_DEPENDS= libotf.so:print/libotf
OTF_CONFIGURE_WITH= libotf
PGTK_IMPLIES= CAIRO GTK3
PGTK_PREVENTS= M17N XFT XPM
PGTK_CONFIGURE_WITH= pgtk
PNG_LIB_DEPENDS= libpng.so:graphics/png
PNG_CONFIGURE_WITH= png
@ -218,16 +217,24 @@ XWIDGETS_CONFIGURE_WITH= xwidgets
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNATIVECOMP} && !defined(_GCC_PORT_CHOSEN)
_GCC_PORT!= ${BSDMAKE} -V_GCC_PORT USE_GCC=11+ _GCC_PORT_CHOSEN=yes
.endif
.if ${ARCH:Mpowerpc64*}
USE_GCC= yes
.endif
.if !${PORT_OPTIONS:MGTK2} && !${PORT_OPTIONS:MGTK3} && \
!${PORT_OPTIONS:MXAW} && !${PORT_OPTIONS:MXAW3D}
.if ${PORT_OPTIONS:MNATIVECOMP} && !defined(_GCC_PORT_CHOSEN)
_GCC_PORT!= ${BSDMAKE} -V_GCC_PORT USE_GCC=11+ _GCC_PORT_CHOSEN=yes
.endif
.if ${FLAVOR:U} != nox
USES+= desktop-file-utils gnome
.if !${PORT_OPTIONS:MPGTK}
USES+= xorg
USE_XORG+= ice sm x11 xcb xext xfixes xinerama xmu xrandr xrender xt
.endif
.endif
.if !${PORT_OPTIONS:MGTK2} && !${PORT_OPTIONS:MGTK3} && !${PORT_OPTIONS:MXAW} && \
!${PORT_OPTIONS:MXAW3D}
CONFIGURE_ARGS+= --with-x-toolkit=no
.endif

6
editors/emacs-devel/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1641004289
SHA256 (emacs-mirror-emacs-29.0.50.20220101-4d1968b_GH0.tar.gz) = b4a8cfaee14298cfeb4fe1abc04724cbb9d3a20d0cdf2907d7b0802b5e1ae4a0
SIZE (emacs-mirror-emacs-29.0.50.20220101-4d1968b_GH0.tar.gz) = 44706883
TIMESTAMP = 1641226625
SHA256 (emacs-mirror-emacs-29.0.50.20220103-ab5ee3e_GH0.tar.gz) = e9abb10085ffeb7cd603df39f51c7dde721332cf58a99f7b6a72353a54a7ab69
SIZE (emacs-mirror-emacs-29.0.50.20220103-ab5ee3e_GH0.tar.gz) = 44711749