aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Mingrone <jrm@FreeBSD.org>2021-11-22 17:33:21 +0000
committerJoseph Mingrone <jrm@FreeBSD.org>2021-11-22 17:36:24 +0000
commit2bf037d0b1180cd0ffd73bceb30dd1a75b87f5b8 (patch)
tree4f52cd8938d9b5b94c0a120d8bd997e7245b0f9e
parent8e148e82a6b7b0f052fb5e8524ef1ca686ccd42b (diff)
downloadports-2bf037d0b1180cd0ffd73bceb30dd1a75b87f5b8.tar.gz
ports-2bf037d0b1180cd0ffd73bceb30dd1a75b87f5b8.zip
editors/emacs-devel: Formatting cleanup
This formatting should have been committed in 61d0935ac4.
-rw-r--r--editors/emacs-devel/Makefile17
1 files changed, 9 insertions, 8 deletions
diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile
index caa1aafd1d30..79ed4305a37b 100644
--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@@ -54,10 +54,10 @@ CONFIGURE_ARGS+= --with-sound=no \
--without-rsvg \
--without-tiff \
--without-toolkit-scroll-bars \
+ --without-webp \
--without-x \
--without-xim \
--without-xpm \
- --without-webp \
--without-xwidgets
.else
CONFIGURE_ARGS+= --with-x
@@ -87,9 +87,9 @@ OPTIONS_DEFINE= ACL DBUS GCONF GNUTLS GSETTINGS HARFBUZZ JSON \
OPTIONS_DEFAULT= ACL CAIRO DBUS GIF GNUTLS GSETTINGS GTK3 \
HARFBUZZ JPEG JSON KQUEUE LCMS2 M17N MAILUTILS \
MODULES OSS OTF PNG SCROLLBARS SOURCES SVG \
- THREADS TIFF XFT XIM XML XPM WEBP
+ THREADS TIFF WEBP XFT XIM XML XPM
OPTIONS_GROUP= GRAPHICS
-OPTIONS_GROUP_GRAPHICS= CAIRO GIF JPEG MAGICK PNG SVG TIFF XPM WEBP
+OPTIONS_GROUP_GRAPHICS= CAIRO GIF JPEG MAGICK PNG SVG TIFF WEBP XPM
OPTIONS_RADIO= FILENOTIFY SOUND X11TOOLKIT
OPTIONS_RADIO_FILENOTIFY= GFILE KQUEUE
OPTIONS_RADIO_SOUND= ALSA OSS
@@ -97,8 +97,8 @@ 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 SCROLLBARS SVG TIFF XAW XAW3D XFT XIM XPM \
- XWIDGETS WEBP
+ PNG SCROLLBARS SVG TIFF WEBP XAW XAW3D XFT XIM \
+ XPM XWIDGETS
.endif
OPTIONS_SUB= YES
@@ -186,6 +186,8 @@ SVG_CONFIGURE_WITH= rsvg
THREADS_CONFIGURE_WITH= threads
TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff
TIFF_CONFIGURE_WITH= tiff
+WEBP_LIB_DEPENDS= libwebp.so:graphics/webp
+WEBP_CONFIGURE_WITH= webp
XAW3D_LIB_DEPENDS= libXaw3d.so:x11-toolkits/Xaw3d
XAW3D_CONFIGURE_ON= --with-x-toolkit=athena
XAW_USE= XORG=xaw
@@ -207,8 +209,6 @@ XWIDGETS_LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \
libwebkit2gtk-4.0.so:www/webkit2-gtk3
XWIDGETS_USE= XORG=xcomposite
XWIDGETS_CONFIGURE_WITH= xwidgets
-WEBP_LIB_DEPENDS= libwebp.so:graphics/webp
-WEBP_CONFIGURE_WITH= webp
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNATIVECOMP} && !defined(_GCC_PORT_CHOSEN)
@@ -219,7 +219,8 @@ _GCC_PORT!= ${BSDMAKE} -V_GCC_PORT USE_GCC=11+ _GCC_PORT_CHOSEN=yes
USE_GCC= yes
.endif
-.if !${PORT_OPTIONS:MGTK2} && !${PORT_OPTIONS:MGTK3} && !${PORT_OPTIONS:MXAW} && !${PORT_OPTIONS:MXAW3D}
+.if !${PORT_OPTIONS:MGTK2} && !${PORT_OPTIONS:MGTK3} && !${PORT_OPTIONS:MXAW} && \
+ !${PORT_OPTIONS:MXAW3D}
CONFIGURE_ARGS+= --with-x-toolkit=no
.endif