Page MenuHomeFreeBSD
Files F153211219

D21524.id61656.diff
No OneTemporary
Actions

D21524.id61656.diff
View Options

Index: editors/emacs-devel/Makefile
===================================================================
--- editors/emacs-devel/Makefile
+++ editors/emacs-devel/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= emacs
-DISTVERSION= ${EMACS_VER}.${EMACS_REV}
+DISTVERSION= 27.0.50.${EMACS_REV}
PORTEPOCH= 2
CATEGORIES= editors ipv6
PKGNAMESUFFIX= -devel
@@ -26,7 +26,8 @@
USES= autoreconf:build cpe gmake localbase:ldflags ncurses pkgconfig
.if ${FLAVOR:U} != nox
-USES+= desktop-file-utils xorg
+USES+= desktop-file-utils gnome xorg
+INSTALLS_ICONS= yes
USE_XORG= ice sm x11 xcb xext xfixes xinerama xmu xrandr xrender xt
.endif
CPE_VENDOR= gnu
@@ -61,18 +62,16 @@
sasl sc semantic ses sieve smtpmail speedbar srecode todo-mode \
tramp url vhdl-mode vip viper widget wisent woman
INFO_PATH= ${DATADIR_REL}/info
-.if ${FLAVOR:U} != nox
-INSTALLS_ICONS= yes
-.endif
-PLIST_SUB= EMACS_VER=${EMACS_VER} GNU_HOST=${CONFIGURE_TARGET}
+PLIST_SUB= EMACS_VER=${DISTVERSION:R} GNU_HOST=${CONFIGURE_TARGET}
SUB_FILES= sources.el
-SUB_LIST= EMACS_VER=${EMACS_VER} # sources.el
+SUB_LIST= EMACS_VER=${DISTVERSION:R} # sources.el
OPTIONS_DEFINE= ACL DBUS GCONF GNUTLS GSETTINGS HARFBUZZ JSON LCMS2 M17N \
- MAILUTILS MODULES OTF SCROLLBARS SOURCES THREADS XFT XIM XML XWIDGETS
-OPTIONS_DEFAULT= ACL DBUS GIF GNUTLS GSETTINGS GTK3 HARFBUZZ JPEG JSON KQUEUE \
- LCMS2 M17N MAGICK MAILUTILS MODULES OSS OTF PNG SCROLLBARS \
- SOURCES SVG THREADS TIFF XFT XIM XML XPM
+ MAILUTILS MODULES OTF SCROLLBARS SOURCES THREADS XFT XIM XML \
+ XWIDGETS
+OPTIONS_DEFAULT= ACL DBUS GIF GNUTLS GSETTINGS GTK3 HARFBUZZ JPEG JSON \
+ KQUEUE LCMS2 M17N MAGICK MAILUTILS MODULES OSS OTF PNG \
+ SCROLLBARS SOURCES SVG THREADS TIFF XFT XIM XML XPM
OPTIONS_GROUP= GRAPHICS
OPTIONS_GROUP_GRAPHICS= CAIRO GIF JPEG MAGICK PNG SVG TIFF XPM
OPTIONS_RADIO= FILENOTIFY SOUND X11TOOLKIT
@@ -81,9 +80,9 @@
OPTIONS_RADIO_X11TOOLKIT= GTK2 GTK3 MOTIF XAW XAW3D
.if ${FLAVOR:U} == nox
-OPTIONS_EXCLUDE= ALSA CAIRO DBUS GCONF GFILE GIF GSETTINGS GTK2 GTK3 HARFBUZZ \
- JPEG LCMS2 M17N MAGICK MOTIF OSS OTF PNG SCROLLBARS SVG \
- TIFF XAW XAW3D XFT XIM XPM XWIDGETS
+OPTIONS_EXCLUDE= ALSA CAIRO DBUS GCONF GFILE GIF GSETTINGS GTK2 GTK3 \
+ HARFBUZZ JPEG LCMS2 M17N MAGICK MOTIF OSS OTF PNG \
+ SCROLLBARS SVG TIFF XAW XAW3D XFT XIM XPM XWIDGETS
.endif
OPTIONS_SUB= YES
@@ -113,32 +112,26 @@
ACL_CONFIGURE_ENABLE= acl
ALSA_CONFIGURE_ON= --with-sound=alsa
ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
-CAIRO_USES= gnome
CAIRO_USE= GNOME=cairo
CAIRO_CONFIGURE_WITH= cairo
CAIRO_IMPLIES= PNG XFT
DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus
DBUS_CONFIGURE_WITH= dbus
-GCONF_USES= gnome
GCONF_USE= GNOME=gconf2
GCONF_CONFIGURE_WITH= gconf
GFILE_CONFIGURE_ON= --with-file-notification=gfile
-GFILE_USES= gnome
GFILE_USE= GNOME=glib20
GIF_LIB_DEPENDS= libgif.so:graphics/giflib
GIF_CONFIGURE_WITH= gif
GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls
GNUTLS_CONFIGURE_WITH= gnutls
-GSETTINGS_USES= gnome
GSETTINGS_USE= GNOME=glib20
GSETTINGS_CONFIGURE_WITH= gsettings
GSETTINGS_IMPLIES= DBUS
-GTK2_USES= gnome
GTK2_USE= GNOME=cairo,gtk20
GTK2_CONFIGURE_ON= --with-x-toolkit=gtk2
GTK2_LIB_DEPENDS= libfreetype.so:print/freetype2 \
libfontconfig.so:x11-fonts/fontconfig
-GTK3_USES= gnome
GTK3_USE= GNOME=cairo,gtk30
GTK3_CONFIGURE_ON= --with-x-toolkit=gtk3
HARFBUZZ_CONFIGURE_WITH= harfbuzz
@@ -170,7 +163,6 @@
PNG_LIB_DEPENDS= libpng.so:graphics/png
PNG_CONFIGURE_WITH= png
SCROLLBARS_CONFIGURE_WITH= toolkit-scroll-bars
-SVG_USES= gnome
SVG_USE= GNOME=cairo,librsvg2
SVG_CONFIGURE_WITH= rsvg
SVG_IMPLIES= PNG
@@ -186,7 +178,7 @@
XFT_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
XIM_CONFIGURE_WITH= xim
-XML_USES= gnome
+XML_USES= gnome # portlint complains, but necessary for nox flavor
XML_USE= GNOME=libxml2
XML_CONFIGURE_WITH= xml2
XPM_USE= XORG=xpm
@@ -197,7 +189,6 @@
libsoup-2.4.so:devel/libsoup
XWIDGETS_IMPLIES= GTK3
-EMACS_VER= 27.0.50
EMACS_REV= 20190903
.include <bsd.port.options.mk>
@@ -229,12 +220,12 @@
post-install-MAILUTILS-on:
${LN} -sf ${PREFIX}/bin/movemail \
- ${STAGEDIR}${PREFIX}/libexec/emacs/${EMACS_VER}/${CONFIGURE_TARGET}
+ ${STAGEDIR}${PREFIX}/libexec/emacs/${DISTVERSION:R}/${CONFIGURE_TARGET}
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
+ @${MKDIR} ${STAGEDIR}${DATADIR}/${DISTVERSION:R}/src
+ ${INSTALL_DATA} ${WRKSRC}/src/*.[ch] ${STAGEDIR}${DATADIR}/${DISTVERSION:R}/src
+ ${INSTALL_DATA} ${WRKDIR}/sources.el ${STAGEDIR}${DATADIR}/${DISTVERSION:R}/site-lisp/site-start.el
post-install:
@${RM} -r ${STAGEDIR}${PREFIX}/lib/systemd
Index: editors/emacs/Makefile
===================================================================
--- editors/emacs/Makefile
+++ editors/emacs/Makefile
@@ -35,7 +35,8 @@
USES= cpe gmake localbase:ldflags makeinfo ncurses pkgconfig tar:xz
.if ${FLAVOR:U} != nox
-USES+= desktop-file-utils xorg
+USES+= desktop-file-utils gnome xorg
+INSTALLS_ICONS= yes
USE_XORG= ice sm x11 xcb xext xfixes xinerama xmu xrandr xt
.endif
CPE_VENDOR= gnu
@@ -70,10 +71,6 @@
sasl sc semantic ses sieve smtpmail speedbar srecode todo-mode \
tramp url vhdl-mode vip viper widget wisent woman
INFO_PATH= ${DATADIR_REL}/info
-.if ${FLAVOR:U} != nox
-INSTALLS_ICONS= yes
-USES+= gnome
-.endif
.if ${FLAVOR:U} == canna
PLIST_FILES+= ${DATADIR}/${DISTVERSION}/lisp/canna.el.gz \
${DATADIR}/${DISTVERSION}/lisp/canna.elc \
@@ -193,7 +190,7 @@
XFT_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
XIM_CONFIGURE_WITH= xim
-XML_USES= gnome
+XML_USES= gnome # portlint complains, but necessary for nox flavor
XML_USE= GNOME=libxml2
XML_CONFIGURE_WITH= xml2
XPM_USE= XORG=xpm

File Metadata

Mime Type
text/plain
Expires
Mon, Apr 20, 8:17 PM (19 h, 5 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31862260
Default Alt Text
D21524.id61656.diff (5 KB)

Event Timeline