diff --git a/Mk/Uses/emacs.mk b/Mk/Uses/emacs.mk index 19c10781f26d..d3281ac79694 100644 --- a/Mk/Uses/emacs.mk +++ b/Mk/Uses/emacs.mk @@ -18,7 +18,7 @@ # DEFAULT_VERSIONS+= The default flavor for ports with # USES=emacs can be added to DEFAULT_VERSIONS. # For example: DEFAULT_VERSIONS+= emacs=nox -# Valid flavors: full nox +# Valid flavors: nox # Flavors specified on the command line take # precedence. # @@ -79,7 +79,7 @@ _EMACS_RUN_DEP= yes # Only set FLAVORS when... . if defined(_EMACS_RUN_DEP) && !defined(_EMACS_NOFLAVORS) -FLAVORS= full nox +FLAVORS= nox # Sort the default to be first . if defined(EMACS_DEFAULT) FLAVORS:= ${EMACS_DEFAULT} ${FLAVORS:N${EMACS_DEFAULT}} @@ -98,30 +98,17 @@ FLAVOR= ${FLAVORS:[1]} . endif # defined(EMACS_DEFAULT) . endif # !defined(_EMACS_NOFLAVORS) && defined(_EMACS_RUN_DEP) && empty(FLAVOR) -. if !empty(FLAVOR) -EMACS_FLAVOR= ${FLAVOR} -. else -EMACS_FLAVOR= full -. endif +EMACS_FLAVOR= nox -. if ${FLAVOR:Mdevel*} -EMACS_VER= 31.0.50 -EMACS_PORTDIR= editors/emacs-devel -. else EMACS_VER= 30.1 EMACS_PORTDIR= editors/emacs -. endif EMACS_MAJOR_VER= ${EMACS_VER:C/\..*//} EMACS_LIBDIR= share/emacs EMACS_LIBDIR_WITH_VER= share/emacs/${EMACS_VER} EMACS_PORT_NAME= emacs${EMACS_MAJOR_VER} -. if ${EMACS_FLAVOR} == "full" EMACS_PKGNAMESUFFIX= -. else -EMACS_PKGNAMESUFFIX= -emacs_${EMACS_FLAVOR} -. endif EMACS_CMD= ${PREFIX}/bin/emacs-${EMACS_VER} EMACS_SITE_LISPDIR= ${EMACS_LIBDIR}/site-lisp diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index 445ae700a94a..b6e563b9a4af 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -15,10 +15,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libgmp.so:math/gmp -FLAVORS= full nox -full_CONFLICTS_INSTALL= emacs-nox +FLAVORS= nox nox_PKGNAMESUFFIX= -nox -nox_CONFLICTS_INSTALL= emacs USES= cpe gmake localbase:ldflags ncurses pkgconfig tar:xz CPE_VENDOR= gnu @@ -29,7 +27,6 @@ CONFIGURE_ARGS= --disable-build-details \ --without-gconf \ --without-libsystemd \ --without-selinux -.if ${FLAVOR:U} == nox CONFIGURE_ARGS+= --with-sound=no \ --with-x-toolkit=no \ --without-cairo \ @@ -52,14 +49,9 @@ CONFIGURE_ARGS+= --with-sound=no \ --without-xim \ --without-xpm \ --without-xwidgets -.else -CONFIGURE_ARGS+= --with-x -.endif # See r468320 to determine if/when the next line can be removed CONFIGURE_ENV= ac_cv_header_sys_sysinfo_h=no -CONFLICTS_INSTALL= emacs-devel emacs-devel-nox - BINARY_ALIAS= makeinfo=true SUB_FILES= sources.el SUB_LIST= EMACS_VER=${DISTVERSION} \ @@ -78,141 +70,49 @@ INFO_PATH= ${DATADIR_REL}/info PLIST_SUB= EMACS_VER=${DISTVERSION} \ GNU_HOST=${CONFIGURE_TARGET} -OPTIONS_DEFINE= ACL DBUS GNUTLS GSETTINGS HARFBUZZ LCMS2 M17N \ - MAILUTILS MODULES NATIVECOMP OTF \ - SCROLLBARS SOURCES SQLITE3 THREADS TREESITTER \ - XFT XIM XML XWIDGETS -OPTIONS_DEFAULT= ACL CAIRO DBUS GIF GNUTLS GSETTINGS GTK3 \ - HARFBUZZ JPEG KQUEUE LCMS2 MAILUTILS MODULES \ - NATIVECOMP OSS PNG SCROLLBARS SOURCES SQLITE3 \ - SVG THREADS TIFF TREESITTER WEBP XIM XML XPM -OPTIONS_GROUP= GRAPHICS -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 -OPTIONS_RADIO_X11TOOLKIT= GTK2 GTK3 MOTIF XAW XAW3D -.if ${FLAVOR:U} == nox -OPTIONS_EXCLUDE+= ALSA CAIRO DBUS GFILE GIF GSETTINGS GTK2 GTK3 \ - HARFBUZZ JPEG LCMS2 M17N MAGICK MOTIF OSS OTF \ - PNG SCROLLBARS SVG TIFF WEBP XAW XAW3D XFT \ - XIM XPM XWIDGETS -.endif +OPTIONS_DEFINE= ACL GNUTLS \ + MAILUTILS MODULES NATIVECOMP \ + SOURCES SQLITE3 THREADS TREESITTER \ + XML +OPTIONS_DEFAULT= ACL GNUTLS \ + KQUEUE MAILUTILS MODULES \ + NATIVECOMP SOURCES SQLITE3 \ + THREADS TREESITTER XML +OPTIONS_RADIO= FILENOTIFY +OPTIONS_RADIO_FILENOTIFY= KQUEUE OPTIONS_SUB= YES ACL_DESC= Access control list support -CAIRO_DESC= Cairo graphics library support [implies PNG, prevents XFT] FILENOTIFY_DESC= File notification support -GFILE_DESC= File notification via gfile -GRAPHICS_DESC= Graphics support -GSETTINGS_DESC= GSettings API for application settings -HARFBUZZ_DESC= HarfBuzz for text shaping KQUEUE_DESC= File notification via kqueue -M17N_DESC= M17N support for text-shaping [implies XFT] -MAGICK_DESC= ImageMagick image processing support (deprecated) MAILUTILS_DESC= Mail framework via GNU Mailutils MODULES_DESC= Dynamic modules support NATIVECOMP_DESC= Emacs Lisp native compiler support -OTF_DESC= Opentype fonts -SCROLLBARS_DESC= Toolkit scroll-bars SOURCES_DESC= Install sources -SVG_DESC= Scalable vector graphics support [implies PNG] TREESITTER_DESC= tree-sitter support -X11TOOLKIT_DESC= X11 toolkit -XAW3D_DESC= Athena3D widgets -XAW_DESC= Athena widgets -XIM_DESC= X Input Method -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 -CAIRO_PREVENTS= XFT -CAIRO_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 -CAIRO_USE= GNOME=cairo -CAIRO_CONFIGURE_WITH= cairo -DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus -DBUS_CONFIGURE_WITH= dbus -GFILE_USE= GNOME=glib20 -GFILE_CONFIGURE_ON= --with-file-notification=gfile -GIF_LIB_DEPENDS= libgif.so:graphics/giflib -GIF_CONFIGURE_WITH= gif GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls GNUTLS_CONFIGURE_WITH= gnutls -GSETTINGS_USE= GNOME=glib20 -GSETTINGS_CONFIGURE_WITH= gsettings -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 -HARFBUZZ_CONFIGURE_WITH= harfbuzz -JPEG_USES= jpeg -JPEG_CONFIGURE_WITH= jpeg KQUEUE_CONFIGURE_ON= --with-file-notification=kqueue -LCMS2_LIB_DEPENDS= liblcms2.so:graphics/lcms2 -LCMS2_CONFIGURE_WITH= lcms2 #LTO_CONFIGURE_ON= --enable-link-time-optimization -M17N_IMPLIES= XFT -M17N_LIB_DEPENDS= libm17n.so:devel/m17n-lib -M17N_CONFIGURE_WITH= m17n-flt -MAGICK_USES= magick:7 -MAGICK_CONFIGURE_WITH= imagemagick MAILUTILS_RUN_DEPENDS= mailutils:mail/mailutils MAILUTILS_CONFIGURE_WITH= mailutils MAILUTILS_CONFIGURE_ENV_OFF= ac_cv_lib_lockfile_maillock=no \ ac_cv_prog_liblockfile=no MODULES_CONFIGURE_WITH= modules -MOTIF_USES= motif -MOTIF_CONFIGURE_ON= --with-x-toolkit=motif NATIVECOMP_USE= GCC=yes NATIVECOMP_CONFIGURE_WITH= native-compilation=aot -OSS_CONFIGURE_ON= --with-sound=oss -OTF_LIB_DEPENDS= libotf.so:print/libotf -OTF_CONFIGURE_WITH= libotf -PNG_LIB_DEPENDS= libpng16.so:graphics/png -PNG_CONFIGURE_WITH= png -SCROLLBARS_CONFIGURE_WITH= toolkit-scroll-bars SQLITE3_USES= sqlite:3 SQLITE3_CONFIGURE_WITH= sqlite3 -SVG_IMPLIES= PNG -SVG_USE= GNOME=cairo,librsvg2 -SVG_CONFIGURE_WITH= rsvg THREADS_CONFIGURE_WITH= threads -TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff -TIFF_CONFIGURE_WITH= tiff TREESITTER_IMPLIES= MODULES TREESITTER_LIB_DEPENDS= libtree-sitter.so:devel/tree-sitter TREESITTER_CONFIGURE_WITH= tree-sitter -WEBP_LIB_DEPENDS= libwebpdemux.so:graphics/webp -WEBP_CONFIGURE_WITH= webp -XAW3D_LIB_DEPENDS= libXaw3d.so:x11-toolkits/libXaw3d -XAW3D_CONFIGURE_ON= --with-x-toolkit=athena -XAW_USE= XORG=xaw -XAW_CONFIGURE_ON= --with-x-toolkit=athena \ - --without-xaw3d -XFT_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 -XFT_USE= XORG=xft,xrender -XFT_CONFIGURE_WITH= xft -XIM_CONFIGURE_WITH= xim # keep XML_USES=gnome, because nox flavor does not have USES=gnome XML_USES= gnome XML_USE= GNOME=libxml2 XML_CONFIGURE_WITH= xml2 -XPM_USE= XORG=xpm -XPM_CONFIGURE_WITH= xpm -XWIDGETS_IMPLIES= GTK3 -XWIDGETS_LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \ - libwebkit2gtk-4.0.so:www/webkit2-gtk@40 -XWIDGETS_USE= XORG=xcomposite -XWIDGETS_CONFIGURE_WITH= xwidgets .include @@ -231,10 +131,7 @@ USE_XORG+= ice sm x11 xcb xcomposite xext xfixes xi xinerama xmu xrandr \ xrender xt .endif -.if !${PORT_OPTIONS:MGTK2} && !${PORT_OPTIONS:MGTK3} && !${PORT_OPTIONS:MMOTIF} && \ - !${PORT_OPTIONS:MXAW} && !${PORT_OPTIONS:MXAW3D} CONFIGURE_ARGS+= --with-x-toolkit=no -.endif .if ${FLAVOR} == nox # With a desktop entry stage-qa will give a warning about requiring