Page MenuHomeFreeBSD
Files F149676865

D14233.id38984.diff
No OneTemporary
Actions

D14233.id38984.diff
View Options

Index: editors/emacs-devel/Makefile
===================================================================
--- editors/emacs-devel/Makefile
+++ editors/emacs-devel/Makefile
@@ -46,14 +46,14 @@
rcirc reftex remember sasl sc semantic ses sieve smtpmail speedbar \
srecode todo-mode tramp url vhdl-mode vip viper widget wisent woman
-OPTIONS_DEFINE= ACL DBUS GNUTLS LCMS2 LLDB MODULES SOURCES THREADS X11 XML
+OPTIONS_DEFINE= ACL DBUS GCONF GNUTLS GSETTINGS LCMS2 LLDB M17N MODULES OTF \
+ SCROLLBARS SOURCES THREADS XFT XIM XML XWIDGETS
OPTIONS_DEFAULT= ACL DBUS FREEDESKTOP GCONF GIF GNUTLS GSETTINGS GTK3 \
- JPEG KQUEUE LCMS2 M17N MAGICK MODULES OSS OTF PNG \
- SCROLLBARS SOURCES SVG THREADS TIFF X11 XFT XIM XML XPM
+ JPEG KQUEUE LCMS2 M17N MAGICK MODULES OSS OTF PNG \
+ SCROLLBARS SOURCES SVG THREADS TIFF XFT XIM XML XPM
OPTIONS_SUB= YES
-OPTIONS_GROUP= GRAPHICS NEEDX11
+OPTIONS_GROUP= GRAPHICS
OPTIONS_GROUP_GRAPHICS= CAIRO GIF JPEG MAGICK PNG SVG TIFF XPM
-OPTIONS_GROUP_NEEDX11= GCONF GSETTINGS M17N OTF SCROLLBARS XFT XIM XWIDGETS
OPTIONS_RADIO= FILENOTIFY SOUND X11TOOLKIT
OPTIONS_RADIO_FILENOTIFY= GFILE KQUEUE
OPTIONS_RADIO_SOUND= ALSA OSS
@@ -64,7 +64,7 @@
FILENOTIFY_DESC= File notification support
GCONF_DESC= GConf configuration support
GFILE_DESC= File notification via gfile
-GRAPHICS_DESC= Graphics support (each implies X11)
+GRAPHICS_DESC= Graphics support
GSETTINGS_DESC= GSettings support (implies DBUS)
KQUEUE_DESC= File notification via kqueue
LLDB_DESC= Enable LLDB support for GUD
@@ -72,14 +72,12 @@
MAGICK_DESC= ImageMagick support
M17N_DESC= M17N support for text-shaping (implies XFT)
MODULES_DESC= Dynamic modules support
-NEEDX11_DESC= Other X11-dependent (each implies X11)
OTF_DESC= Opentype fonts support (implies XFT)
SCROLLBARS_DESC=Toolkit scroll-bars
SOURCES_DESC= Install sources
SVG_DESC= SVG support (implies PNG)
THREADS_DESC= Emacs Lisp threading support
-X11_DESC= X11 support
-X11TOOLKIT_DESC=X11 toolkit (each implies X11)
+X11TOOLKIT_DESC=X11 toolkit
XAW3D_DESC= Athena3D widgets
XAW_DESC= Athena widgets
XIM_DESC= X Input Method Support
@@ -90,34 +88,29 @@
ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
CAIRO_USE= GNOME=cairo
CAIRO_CONFIGURE_WITH= cairo
-CAIRO_IMPLIES= PNG XFT X11
+CAIRO_IMPLIES= PNG XFT
DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus
DBUS_CONFIGURE_WITH= dbus
GCONF_USE= GNOME=gconf2
GCONF_CONFIGURE_WITH= gconf
-GCONF_IMPLIES= X11
GFILE_CONFIGURE_ON= --with-file-notification=gfile
GIF_LIB_DEPENDS= libgif.so:graphics/giflib
GIF_CONFIGURE_WITH= gif
-GIF_IMPLIES= X11
GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls
GNUTLS_CONFIGURE_WITH= gnutls
GSETTINGS_USE= GNOME=glib20
GSETTINGS_CONFIGURE_WITH= gsettings
-GSETTINGS_IMPLIES= DBUS X11
+GSETTINGS_IMPLIES= DBUS
GTK2_USE= GNOME=cairo,gtk20
GTK2_USES= gettext
GTK2_CONFIGURE_ON= --with-x-toolkit=gtk2
-GTK2_IMPLIES= X11
GTK2_LIB_DEPENDS= libfreetype.so:print/freetype2 \
libfontconfig.so:x11-fonts/fontconfig
GTK3_USE= GNOME=cairo,gtk30
GTK3_USES= gettext
GTK3_CONFIGURE_ON= --with-x-toolkit=gtk3
-GTK3_IMPLIES= X11
JPEG_USES= jpeg
JPEG_CONFIGURE_WITH= jpeg
-JPEG_IMPLIES= X11
KQUEUE_CONFIGURE_ON= --with-file-notification=kqueue
LCMS2_CONFIGURE_WITH= lcms2
LCMS2_LIB_DEPENDS= liblcms2.so:graphics/lcms2
@@ -125,65 +118,52 @@
#LTO_CONFIGURE_ON= --enable-link-time-optimization
M17N_LIB_DEPENDS= libm17n.so:devel/m17n-lib
M17N_CONFIGURE_WITH= m17n-flt
-M17N_IMPLIES= XFT X11
+M17N_IMPLIES= XFT
MAGICK_LIB_DEPENDS= libMagickCore-6.so:graphics/ImageMagick
MAGICK_CONFIGURE_WITH= imagemagick
-MAGICK_IMPLIES= X11
MODULES_CONFIGURE_WITH= modules
MOTIF_USES= motif
MOTIF_CONFIGURE_ON= --with-x-toolkit=motif
-MOTIF_IMPLIES= X11
MOTIF_LIB_DEPENDS= libXp.so:x11/libXp
OSS_CONFIGURE_ON= --with-sound=oss
OTF_LIB_DEPENDS= libotf.so:print/libotf
OTF_CONFIGURE_WITH= libotf
-OTF_IMPLIES= X11 XFT
+OTF_IMPLIES= XFT
PNG_LIB_DEPENDS= libpng.so:graphics/png
PNG_CONFIGURE_WITH= png
-PNG_IMPLIES= X11
SCROLLBARS_CONFIGURE_WITH= toolkit-scroll-bars
-SCROLLBARS_IMPLIES= X11
SVG_USE= GNOME=cairo,librsvg2
SVG_CONFIGURE_WITH= rsvg
-SVG_IMPLIES= X11 PNG
+SVG_IMPLIES= PNG
SVG_USES= gettext
THREADS_CONFIGURE_WITH= threads
TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff
TIFF_CONFIGURE_WITH= tiff
-TIFF_IMPLIES= X11
-X11_CONFIGURE_OFF= --without-x --with-x-toolkit=no
-X11_CONFIGURE_ON= --with-x
-X11_USE= XORG=ice,sm,x11,xcb,xext,xfixes,xinerama,xmu,xrandr,xt
-X11_USES= desktop-file-utils
-X11_VARS= installs_icons=yes
-X11_VARS_OFF= without_x11=yes
XAW_USE= XORG=xaw
XAW_CONFIGURE_ON= --with-x-toolkit=athena --without-xaw3d
-XAW_IMPLIES= X11
XAW3D_LIB_DEPENDS= libXaw3d.so:x11-toolkits/Xaw3d
XAW3D_CONFIGURE_ON= --with-x-toolkit=athena
-XAW3D_IMPLIES= X11
XFT_USE= XORG=xft,xrender
XFT_CONFIGURE_WITH= xft
-XFT_IMPLIES= X11
XFT_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
XIM_CONFIGURE_WITH= xim
-XIM_IMPLIES= X11
XML_USE= GNOME=libxml2
XML_CONFIGURE_WITH= xml2
XPM_USE= XORG=xpm
XPM_CONFIGURE_WITH= xpm
-XPM_IMPLIES= X11
XWIDGETS_USE= XORG=xcomposite
XWIDGETS_CONFIGURE_WITH= xwidgets
XWIDGETS_LIB_DEPENDS= libwebkit2gtk-4.0.so:www/webkit2-gtk3
XWIDGETS_IMPLIES= GTK3
-.if ${FLAVOR:U} == nox
-OPTIONS_EXCLUDE= ALSA CAIRO DBUS GCONF GIF GSETTINGS GTK2 GTK3 JPEG \
- LCMS2 M17N MAGICK MOTIF OSS OTF PNG SCROLLBARS SVG TIFF \
- XAW XAW3D X11 XFT XIM XPM XWIDGETS
+
+.if ${FLAVOR:U} == full
+CONFIGURE_ARGS+= --with-x
+INSTALLS_ICONS= yes
+USE_XORG= ice sm x11 xcb xext xfixes xinerama xmu xrandr xt
+USES+= desktop-file-utils
+.else # nox flavor
CONFIGURE_ARGS+= --with-sound=no --without-cairo --without-dbus \
--without-gconf --without-gif --without-gsettings \
--with-x-toolkit=no --without-jpeg --without-lcms2 \
@@ -192,16 +172,16 @@
--without-toolkit-scroll-bars --without-rsvg \
--without-tiff --without-xim --without-xpm \
--without-xwidgets
+OPTIONS_EXCLUDE= ALSA CAIRO DBUS GCONF GIF GSETTINGS GTK2 GTK3 JPEG \
+ LCMS2 M17N MAGICK MOTIF OSS OTF PNG SCROLLBARS SVG TIFF \
+ XAW XAW3D XFT XIM XPM XWIDGETS
+WITHOUT_X11= yes
.endif
.include <bsd.port.options.mk>
# has graphics/ImageMagick been compiled with OPENMP?
.if ${PORT_OPTIONS:MMAGICK} && ${:!${GREP} -sc " \-fopenmp " ${LOCALBASE}/libdata/pkgconfig/ImageMagick.pc || true!} == "1"
-_MAGICK_WITH_OPENMP= true
-.endif
-
-.ifdef _MAGICK_WITH_OPENMP
USES+= compiler:openmp
.endif
@@ -210,16 +190,15 @@
# With a desktop entry stage-qa will give a warning about requiring
# desktop-file-utils and portlint -C will give a warning about INSTALL_ICONS,
-# but don't pull in those dependencies when X11 is off.
-post-patch-X11-off:
- @${REINPLACE_CMD} -e 's/^Terminal=.*$$/Terminal=true/' \
- ${WRKSRC}/etc/emacs.desktop
+# but don't pull in those dependencies with the nox flavor.
+.if ${FLAVOR} == nox
+post-patch:
+ @${REINPLACE_CMD} -e 's/^Terminal=.*$$/Terminal=true/' ${WRKSRC}/etc/emacs.desktop
+.endif
post-install-SOURCES-on:
@${MKDIR} ${STAGEDIR}${DATADIR}/${EMACS_VER}/src
- ${INSTALL_DATA} ${WRKSRC}/src/*.[ch] \
- ${STAGEDIR}${DATADIR}/${EMACS_VER}/src
- ${INSTALL_DATA} ${WRKDIR}/sources.el \
- ${STAGEDIR}${DATADIR}/${EMACS_VER}/site-lisp/site-start.el
+ ${INSTALL_DATA} ${WRKSRC}/src/*.[ch] ${STAGEDIR}${DATADIR}/${EMACS_VER}/src
+ ${INSTALL_DATA} ${WRKDIR}/sources.el ${STAGEDIR}${DATADIR}/${EMACS_VER}/site-lisp/site-start.el
.include <bsd.port.mk>
Index: editors/emacs/Makefile
===================================================================
--- editors/emacs/Makefile
+++ editors/emacs/Makefile
@@ -49,14 +49,14 @@
rcirc reftex remember sasl sc semantic ses sieve smtpmail speedbar \
srecode todo-mode tramp url vhdl-mode vip viper widget wisent woman
-OPTIONS_DEFINE= ACL DBUS GNUTLS LLDB MODULES SOURCES X11 XML
+OPTIONS_DEFINE= ACL DBUS GCONF GNUTLS GSETTINGS LLDB M17N MODULES OTF SCROLLBARS\
+ SOURCES X11 XFT XIM XML XWIDGETS
OPTIONS_DEFAULT= ACL DBUS GCONF GIF GNUTLS GSETTINGS GTK3 JPEG KQUEUE \
- M17N MAGICK MODULES OSS OTF PNG SCROLLBARS SOURCES SVG \
- TIFF X11 XFT XIM XML XPM
+ M17N MAGICK MODULES OSS OTF PNG SCROLLBARS SOURCES SVG \
+ TIFF X11 XFT XIM XML XPM
OPTIONS_SUB= YES
-OPTIONS_GROUP= GRAPHICS NEEDX11
+OPTIONS_GROUP= GRAPHICS
OPTIONS_GROUP_GRAPHICS= CAIRO GIF JPEG MAGICK PNG SVG TIFF XPM
-OPTIONS_GROUP_NEEDX11= GCONF GSETTINGS M17N OTF SCROLLBARS XFT XIM XWIDGETS
OPTIONS_RADIO= FILENOTIFY SOUND X11TOOLKIT
OPTIONS_RADIO_FILENOTIFY= GFILE KQUEUE
OPTIONS_RADIO_SOUND= ALSA OSS
@@ -67,7 +67,7 @@
CANNA_DESC= Japanese input support
FILENOTIFY_DESC= File notification support
GFILE_DESC= File notification via gfile
-GRAPHICS_DESC= Graphics support (each implies X11)
+GRAPHICS_DESC= Graphics support
GSETTINGS_DESC= GSettings API for application settings
KQUEUE_DESC= File notification via kqueue
LLDB_DESC= LLDB support for GUD
@@ -75,13 +75,11 @@
MAGICK_DESC= ImageMagick image processing support
M17N_DESC= M17N for text-shaping (implies XFT)
MODULES_DESC= Dynamic modules support
-NEEDX11_DESC= Other X11-dependent (each implies X11)
OTF_DESC= Opentype fonts (implies XFT)
SCROLLBARS_DESC= Toolkit scroll-bars
SOURCES_DESC= Install sources
SVG_DESC= Scalable vector graphics support (implies PNG)
-X11_DESC= X window system support
-X11TOOLKIT_DESC= X11 toolkit (each implies X11)
+X11TOOLKIT_DESC= X11 toolkit
XAW3D_DESC= Athena3D widgets
XAW_DESC= Athena widgets
XIM_DESC= X Input Method
@@ -92,93 +90,76 @@
ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
CAIRO_USE= GNOME=cairo
CAIRO_CONFIGURE_WITH= cairo
-CAIRO_IMPLIES= PNG XFT X11
+CAIRO_IMPLIES= PNG XFT
DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus
DBUS_CONFIGURE_WITH= dbus
GCONF_USE= GNOME=gconf2
GCONF_CONFIGURE_WITH= gconf
-GCONF_IMPLIES= X11
GFILE_CONFIGURE_ON= --with-file-notification=gfile
GIF_LIB_DEPENDS= libgif.so:graphics/giflib
GIF_CONFIGURE_WITH= gif
-GIF_IMPLIES= X11
GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls
GNUTLS_CONFIGURE_WITH= gnutls
GSETTINGS_USE= GNOME=glib20
GSETTINGS_CONFIGURE_WITH= gsettings
-GSETTINGS_IMPLIES= DBUS X11
+GSETTINGS_IMPLIES= DBUS
GTK2_USE= GNOME=cairo,gtk20
GTK2_USES= gettext-runtime
GTK2_CONFIGURE_ON= --with-x-toolkit=gtk2
-GTK2_IMPLIES= X11
GTK2_LIB_DEPENDS= libfreetype.so:print/freetype2 \
libfontconfig.so:x11-fonts/fontconfig
GTK3_USE= GNOME=cairo,gtk30
GTK3_USES= gettext-runtime
GTK3_CONFIGURE_ON= --with-x-toolkit=gtk3
-GTK3_IMPLIES= X11
JPEG_USES= jpeg
JPEG_CONFIGURE_WITH= jpeg
-JPEG_IMPLIES= X11
KQUEUE_CONFIGURE_ON= --with-file-notification=kqueue
LLDB_EXTRA_PATCHES= ${PATCHDIR}/extrapatch-lldb-gud.el
#LTO_CONFIGURE_ON= --enable-link-time-optimization
M17N_LIB_DEPENDS= libm17n.so:devel/m17n-lib
M17N_CONFIGURE_WITH= m17n-flt
-M17N_IMPLIES= XFT X11
MAGICK_LIB_DEPENDS= libMagickCore-6.so:graphics/ImageMagick
MAGICK_CONFIGURE_WITH= imagemagick
-MAGICK_IMPLIES= X11
MODULES_CONFIGURE_WITH= modules
MOTIF_USES= motif
MOTIF_CONFIGURE_ON= --with-x-toolkit=motif
-MOTIF_IMPLIES= X11
MOTIF_LIB_DEPENDS= libXp.so:x11/libXp
OSS_CONFIGURE_ON= --with-sound=oss
OTF_LIB_DEPENDS= libotf.so:print/libotf
OTF_CONFIGURE_WITH= libotf
-OTF_IMPLIES= X11 XFT
PNG_LIB_DEPENDS= libpng.so:graphics/png
PNG_CONFIGURE_WITH= png
-PNG_IMPLIES= X11
SCROLLBARS_CONFIGURE_WITH= toolkit-scroll-bars
-SCROLLBARS_IMPLIES= X11
SVG_USE= GNOME=cairo,librsvg2
SVG_CONFIGURE_WITH= rsvg
-SVG_IMPLIES= X11 PNG
+SVG_IMPLIES= PNG
SVG_USES= gettext-runtime
TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff
TIFF_CONFIGURE_WITH= tiff
-TIFF_IMPLIES= X11
-X11_CONFIGURE_OFF= --without-x --with-x-toolkit=no
-X11_CONFIGURE_ON= --with-x
-X11_USE= XORG=ice,sm,x11,xcb,xext,xfixes,xinerama,xmu,xrandr,xt
-X11_USES= desktop-file-utils
-X11_VARS= installs_icons=yes
-X11_VARS_OFF= without_x11=yes
XAW_USE= XORG=xaw
XAW_CONFIGURE_ON= --with-x-toolkit=athena --without-xaw3d
-XAW_IMPLIES= X11
XAW3D_LIB_DEPENDS= libXaw3d.so:x11-toolkits/Xaw3d
XAW3D_CONFIGURE_ON= --with-x-toolkit=athena
-XAW3D_IMPLIES= X11
XFT_USE= XORG=xft,xrender
XFT_CONFIGURE_WITH= xft
-XFT_IMPLIES= X11
XFT_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
XIM_CONFIGURE_WITH= xim
-XIM_IMPLIES= X11
XML_USE= GNOME=libxml2
XML_CONFIGURE_WITH= xml2
XPM_USE= XORG=xpm
XPM_CONFIGURE_WITH= xpm
-XPM_IMPLIES= X11
XWIDGETS_USE= XORG=xcomposite
XWIDGETS_CONFIGURE_WITH= xwidgets
XWIDGETS_LIB_DEPENDS= libwebkitgtk-3.0.so:www/webkit-gtk3
XWIDGETS_IMPLIES= GTK3
+.if ${FLAVOR:U} == full || ${FLAVOR:U} == canna
+CONFIGURE_ARGS+= --with-x
+INSTALLS_ICONS= yes
+USE_XORG= ice sm x11 xcb xext xfixes xinerama xmu xrandr xt
+USES+= desktop-file-utils
+.endif
.if ${FLAVOR:U} == canna
CONFIGURE_WITH= canna
PATCH_DIST_STRIP= -p1
@@ -191,35 +172,35 @@
${DATADIR}/${EMACS_VER}/lisp/isearch-ext.el.gz \
${DATADIR}/${EMACS_VER}/lisp/isearch-ext.elc \
${SOURCES}${DATADIR}/${EMACS_VER}/src/canna.c
-.elif ${FLAVOR:U} == nox
-OPTIONS_EXCLUDE= ALSA CAIRO DBUS GCONF GIF GSETTINGS GTK2 GTK3 JPEG \
- M17N MAGICK MOTIF OSS OTF PNG SCROLLBARS SVG TIFF XAW \
- XAW3D X11 XFT XIM XPM XWIDGETS
+.endif
+.if ${FLAVOR:U} == nox
CONFIGURE_ARGS+= --with-sound=no --without-cairo --without-dbus \
--without-gconf --without-gif --without-gsettings \
--with-x-toolkit=no --without-jpeg --without-m17n-flt \
--without-imagemagick --without-libotf --without-png \
--without-toolkit-scroll-bars --without-rsvg \
- --without-tiff --without-xim --without-xpm \
+ --without-tiff --without-x --without-xim --without-xpm \
--without-xwidgets
+OPTIONS_EXCLUDE= ALSA CAIRO DBUS GCONF GIF GSETTINGS GTK2 GTK3 JPEG \
+ M17N MAGICK MOTIF OSS OTF PNG SCROLLBARS SVG TIFF XAW \
+ XAW3D X11 XFT XIM XPM XWIDGETS
+WITHOUT_X11= yes
.endif
.include <bsd.port.options.mk>
# has graphics/ImageMagick been compiled with OPENMP?
.if ${PORT_OPTIONS:MMAGICK} && ${:!${GREP} -sc " \-fopenmp " ${LOCALBASE}/libdata/pkgconfig/ImageMagick.pc || true!} == "1"
-_MAGICK_WITH_OPENMP= true
-.endif
-
-.ifdef _MAGICK_WITH_OPENMP
USES+= compiler:openmp
.endif
# With a desktop entry stage-qa will give a warning about requiring
# desktop-file-utils and portlint -C will give a warning about INSTALL_ICONS,
-# but don't pull in those dependencies when X11 is off.
-post-patch-X11-off:
+# but don't pull in those dependencies with the nox flavor.
+.if ${FLAVOR} == nox
+post-patch:
@${REINPLACE_CMD} -e 's/^Terminal=.*$$/Terminal=true/' ${WRKSRC}/etc/emacs.desktop
+.endif
post-install-SOURCES-on:
@${MKDIR} ${STAGEDIR}${DATADIR}/${EMACS_VER}/src

File Metadata

Mime Type
text/plain
Expires
Fri, Mar 27, 4:59 AM (14 h, 7 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30387278
Default Alt Text
D14233.id38984.diff (14 KB)

Event Timeline