Changeset View
Changeset View
Standalone View
Standalone View
editors/emacs-devel/Makefile
| # Created by: Kenneth Vestergaard Schmidt <kvs@pil.dk> | # Created by: Kenneth Vestergaard Schmidt <kvs@pil.dk> | ||||
| # $FreeBSD$ | # $FreeBSD$ | ||||
| PORTNAME= emacs | PORTNAME= emacs | ||||
| DISTVERSION= ${EMACS_VER}.${EMACS_REV} | DISTVERSION= 27.0.50.20190903 | ||||
| PORTEPOCH= 2 | PORTEPOCH= 2 | ||||
| CATEGORIES= editors ipv6 | CATEGORIES= editors ipv6 | ||||
| PKGNAMESUFFIX= -devel | PKGNAMESUFFIX= -devel | ||||
| MAINTAINER= emacs@FreeBSD.org | MAINTAINER= emacs@FreeBSD.org | ||||
| COMMENT= GNU editing macros | COMMENT= GNU editing macros | ||||
| .if ${FLAVOR:U} == nox | .if ${FLAVOR:U} == nox | ||||
| COMMENT+= (No X flavor) | COMMENT+= (No X flavor) | ||||
| .endif | .endif | ||||
| LICENSE= GPLv3+ | LICENSE= GPLv3+ | ||||
| LICENSE_FILE= ${WRKSRC}/COPYING | LICENSE_FILE= ${WRKSRC}/COPYING | ||||
| BUILD_DEPENDS= texinfo>=6.5,1:print/texinfo | BUILD_DEPENDS= texinfo>=6.5,1:print/texinfo | ||||
| LIB_DEPENDS= libgmp.so:math/gmp | LIB_DEPENDS= libgmp.so:math/gmp | ||||
| FLAVORS= full nox | FLAVORS= full nox | ||||
| full_CONFLICTS_INSTALL= emacs-devel-nox | full_CONFLICTS_INSTALL= emacs-devel-nox | ||||
| nox_CONFLICTS_INSTALL= emacs-devel | nox_CONFLICTS_INSTALL= emacs-devel | ||||
| nox_PKGNAMESUFFIX= -devel-nox | nox_PKGNAMESUFFIX= -devel-nox | ||||
| USES= autoreconf:build cpe gmake localbase:ldflags ncurses pkgconfig | USES= autoreconf:build cpe gmake localbase:ldflags ncurses pkgconfig | ||||
| .if ${FLAVOR:U} != nox | .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 | USE_XORG= ice sm x11 xcb xext xfixes xinerama xmu xrandr xrender xt | ||||
| .endif | .endif | ||||
| CPE_VENDOR= gnu | CPE_VENDOR= gnu | ||||
| USE_GITHUB= yes | USE_GITHUB= yes | ||||
| GH_ACCOUNT= emacs-mirror | GH_ACCOUNT= emacs-mirror | ||||
| GH_TAGNAME= 5f089ac | GH_TAGNAME= 5f089ac | ||||
| CONFIGURE_ARGS= --disable-build-details \ | CONFIGURE_ARGS= --disable-build-details \ | ||||
| Show All 18 Lines | |||||
| INFO= auth autotype bovine calc ccmode cl dbus dired-x \ | INFO= auth autotype bovine calc ccmode cl dbus dired-x \ | ||||
| ebrowse ede ediff edt efaq eieio eintr elisp emacs emacs-gnutls \ | ebrowse ede ediff edt efaq eieio eintr elisp emacs emacs-gnutls \ | ||||
| emacs-mime epa erc ert eshell eudc eww flymake forms gnus \ | emacs-mime epa erc ert eshell eudc eww flymake forms gnus \ | ||||
| htmlfontify idlwave ido info mairix-el message mh-e newsticker \ | htmlfontify idlwave ido info mairix-el message mh-e newsticker \ | ||||
| nxml-mode octave-mode org pcl-cvs pgg rcirc reftex remember \ | nxml-mode octave-mode org pcl-cvs pgg rcirc reftex remember \ | ||||
| sasl sc semantic ses sieve smtpmail speedbar srecode todo-mode \ | sasl sc semantic ses sieve smtpmail speedbar srecode todo-mode \ | ||||
| tramp url vhdl-mode vip viper widget wisent woman | tramp url vhdl-mode vip viper widget wisent woman | ||||
| INFO_PATH= ${DATADIR_REL}/info | INFO_PATH= ${DATADIR_REL}/info | ||||
| .if ${FLAVOR:U} != nox | PLIST_SUB= EMACS_VER=${DISTVERSION:R} GNU_HOST=${CONFIGURE_TARGET} | ||||
| INSTALLS_ICONS= yes | |||||
| .endif | |||||
| PLIST_SUB= EMACS_VER=${EMACS_VER} GNU_HOST=${CONFIGURE_TARGET} | |||||
| SUB_FILES= sources.el | 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 \ | OPTIONS_DEFINE= ACL DBUS GCONF GNUTLS GSETTINGS HARFBUZZ JSON LCMS2 M17N \ | ||||
| MAILUTILS MODULES OTF SCROLLBARS SOURCES THREADS XFT XIM XML XWIDGETS | MAILUTILS MODULES OTF SCROLLBARS SOURCES THREADS XFT XIM XML \ | ||||
| OPTIONS_DEFAULT= ACL DBUS GIF GNUTLS GSETTINGS GTK3 HARFBUZZ JPEG JSON KQUEUE \ | XWIDGETS | ||||
| LCMS2 M17N MAGICK MAILUTILS MODULES OSS OTF PNG SCROLLBARS \ | OPTIONS_DEFAULT= ACL DBUS GIF GNUTLS GSETTINGS GTK3 HARFBUZZ JPEG JSON \ | ||||
| SOURCES SVG THREADS TIFF XFT XIM XML XPM | KQUEUE LCMS2 M17N MAGICK MAILUTILS MODULES OSS OTF PNG \ | ||||
| SCROLLBARS SOURCES SVG THREADS TIFF XFT XIM XML XPM | |||||
| OPTIONS_GROUP= GRAPHICS | OPTIONS_GROUP= GRAPHICS | ||||
| OPTIONS_GROUP_GRAPHICS= CAIRO GIF JPEG MAGICK PNG SVG TIFF XPM | OPTIONS_GROUP_GRAPHICS= CAIRO GIF JPEG MAGICK PNG SVG TIFF XPM | ||||
| OPTIONS_RADIO= FILENOTIFY SOUND X11TOOLKIT | OPTIONS_RADIO= FILENOTIFY SOUND X11TOOLKIT | ||||
| OPTIONS_RADIO_FILENOTIFY= GFILE KQUEUE | OPTIONS_RADIO_FILENOTIFY= GFILE KQUEUE | ||||
| OPTIONS_RADIO_SOUND= ALSA OSS | OPTIONS_RADIO_SOUND= ALSA OSS | ||||
| OPTIONS_RADIO_X11TOOLKIT= GTK2 GTK3 MOTIF XAW XAW3D | OPTIONS_RADIO_X11TOOLKIT= GTK2 GTK3 MOTIF XAW XAW3D | ||||
| .if ${FLAVOR:U} == nox | .if ${FLAVOR:U} == nox | ||||
| OPTIONS_EXCLUDE= ALSA CAIRO DBUS GCONF GFILE GIF GSETTINGS GTK2 GTK3 HARFBUZZ \ | OPTIONS_EXCLUDE= ALSA CAIRO DBUS GCONF GFILE GIF GSETTINGS GTK2 GTK3 \ | ||||
| JPEG LCMS2 M17N MAGICK MOTIF OSS OTF PNG SCROLLBARS SVG \ | HARFBUZZ JPEG LCMS2 M17N MAGICK MOTIF OSS OTF PNG \ | ||||
| TIFF XAW XAW3D XFT XIM XPM XWIDGETS | SCROLLBARS SVG TIFF XAW XAW3D XFT XIM XPM XWIDGETS | ||||
| .endif | .endif | ||||
| OPTIONS_SUB= YES | OPTIONS_SUB= YES | ||||
| ACL_DESC= Access control list support | ACL_DESC= Access control list support | ||||
| CAIRO_DESC= Experimental Cairo library support (implies PNG, XFT) | CAIRO_DESC= Experimental Cairo library support (implies PNG, XFT) | ||||
| FILENOTIFY_DESC= File notification support | FILENOTIFY_DESC= File notification support | ||||
| GFILE_DESC= File notification via gfile | GFILE_DESC= File notification via gfile | ||||
| GRAPHICS_DESC= Graphics support | GRAPHICS_DESC= Graphics support | ||||
| Show All 13 Lines | |||||
| XAW3D_DESC= Athena3D widgets | XAW3D_DESC= Athena3D widgets | ||||
| XAW_DESC= Athena widgets | XAW_DESC= Athena widgets | ||||
| XIM_DESC= X Input Method | XIM_DESC= X Input Method | ||||
| XWIDGETS_DESC= Experimental GTK widgets (requires GTK3) | XWIDGETS_DESC= Experimental GTK widgets (requires GTK3) | ||||
| ACL_CONFIGURE_ENABLE= acl | ACL_CONFIGURE_ENABLE= acl | ||||
| ALSA_CONFIGURE_ON= --with-sound=alsa | ALSA_CONFIGURE_ON= --with-sound=alsa | ||||
| ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib | ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib | ||||
| CAIRO_USES= gnome | |||||
| CAIRO_USE= GNOME=cairo | CAIRO_USE= GNOME=cairo | ||||
| CAIRO_CONFIGURE_WITH= cairo | CAIRO_CONFIGURE_WITH= cairo | ||||
| CAIRO_IMPLIES= PNG XFT | CAIRO_IMPLIES= PNG XFT | ||||
| DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus | DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus | ||||
| DBUS_CONFIGURE_WITH= dbus | DBUS_CONFIGURE_WITH= dbus | ||||
| GCONF_USES= gnome | |||||
| GCONF_USE= GNOME=gconf2 | GCONF_USE= GNOME=gconf2 | ||||
| GCONF_CONFIGURE_WITH= gconf | GCONF_CONFIGURE_WITH= gconf | ||||
| GFILE_CONFIGURE_ON= --with-file-notification=gfile | GFILE_CONFIGURE_ON= --with-file-notification=gfile | ||||
| GFILE_USES= gnome | |||||
| GFILE_USE= GNOME=glib20 | GFILE_USE= GNOME=glib20 | ||||
| GIF_LIB_DEPENDS= libgif.so:graphics/giflib | GIF_LIB_DEPENDS= libgif.so:graphics/giflib | ||||
| GIF_CONFIGURE_WITH= gif | GIF_CONFIGURE_WITH= gif | ||||
| GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls | GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls | ||||
| GNUTLS_CONFIGURE_WITH= gnutls | GNUTLS_CONFIGURE_WITH= gnutls | ||||
| GSETTINGS_USES= gnome | |||||
| GSETTINGS_USE= GNOME=glib20 | GSETTINGS_USE= GNOME=glib20 | ||||
| GSETTINGS_CONFIGURE_WITH= gsettings | GSETTINGS_CONFIGURE_WITH= gsettings | ||||
| GSETTINGS_IMPLIES= DBUS | GSETTINGS_IMPLIES= DBUS | ||||
| GTK2_USES= gnome | |||||
| GTK2_USE= GNOME=cairo,gtk20 | GTK2_USE= GNOME=cairo,gtk20 | ||||
| GTK2_CONFIGURE_ON= --with-x-toolkit=gtk2 | GTK2_CONFIGURE_ON= --with-x-toolkit=gtk2 | ||||
| GTK2_LIB_DEPENDS= libfreetype.so:print/freetype2 \ | GTK2_LIB_DEPENDS= libfreetype.so:print/freetype2 \ | ||||
| libfontconfig.so:x11-fonts/fontconfig | libfontconfig.so:x11-fonts/fontconfig | ||||
| GTK3_USES= gnome | |||||
| GTK3_USE= GNOME=cairo,gtk30 | GTK3_USE= GNOME=cairo,gtk30 | ||||
| GTK3_CONFIGURE_ON= --with-x-toolkit=gtk3 | GTK3_CONFIGURE_ON= --with-x-toolkit=gtk3 | ||||
| HARFBUZZ_CONFIGURE_WITH= harfbuzz | HARFBUZZ_CONFIGURE_WITH= harfbuzz | ||||
| HARFBUZZ_LIB_DEPENDS= libharfbuzz.so:print/harfbuzz | HARFBUZZ_LIB_DEPENDS= libharfbuzz.so:print/harfbuzz | ||||
| JPEG_USES= jpeg | JPEG_USES= jpeg | ||||
| JPEG_CONFIGURE_WITH= jpeg | JPEG_CONFIGURE_WITH= jpeg | ||||
| JSON_CONFIGURE_WITH= json | JSON_CONFIGURE_WITH= json | ||||
| JSON_LIB_DEPENDS= libjansson.so:devel/jansson | JSON_LIB_DEPENDS= libjansson.so:devel/jansson | ||||
| Show All 15 Lines | |||||
| MOTIF_LIB_DEPENDS= libXp.so:x11/libXp | MOTIF_LIB_DEPENDS= libXp.so:x11/libXp | ||||
| OSS_CONFIGURE_ON= --with-sound=oss | OSS_CONFIGURE_ON= --with-sound=oss | ||||
| OTF_LIB_DEPENDS= libotf.so:print/libotf | OTF_LIB_DEPENDS= libotf.so:print/libotf | ||||
| OTF_CONFIGURE_WITH= libotf | OTF_CONFIGURE_WITH= libotf | ||||
| OTF_IMPLIES= XFT | OTF_IMPLIES= XFT | ||||
| PNG_LIB_DEPENDS= libpng.so:graphics/png | PNG_LIB_DEPENDS= libpng.so:graphics/png | ||||
| PNG_CONFIGURE_WITH= png | PNG_CONFIGURE_WITH= png | ||||
| SCROLLBARS_CONFIGURE_WITH= toolkit-scroll-bars | SCROLLBARS_CONFIGURE_WITH= toolkit-scroll-bars | ||||
| SVG_USES= gnome | |||||
| SVG_USE= GNOME=cairo,librsvg2 | SVG_USE= GNOME=cairo,librsvg2 | ||||
| SVG_CONFIGURE_WITH= rsvg | SVG_CONFIGURE_WITH= rsvg | ||||
| SVG_IMPLIES= PNG | SVG_IMPLIES= PNG | ||||
| THREADS_CONFIGURE_WITH= threads | THREADS_CONFIGURE_WITH= threads | ||||
| TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff | TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff | ||||
| TIFF_CONFIGURE_WITH= tiff | TIFF_CONFIGURE_WITH= tiff | ||||
| XAW_USE= XORG=xaw | XAW_USE= XORG=xaw | ||||
| XAW_CONFIGURE_ON= --with-x-toolkit=athena --without-xaw3d | XAW_CONFIGURE_ON= --with-x-toolkit=athena --without-xaw3d | ||||
| XAW3D_LIB_DEPENDS= libXaw3d.so:x11-toolkits/Xaw3d | XAW3D_LIB_DEPENDS= libXaw3d.so:x11-toolkits/Xaw3d | ||||
| XAW3D_CONFIGURE_ON= --with-x-toolkit=athena | XAW3D_CONFIGURE_ON= --with-x-toolkit=athena | ||||
| XFT_USE= XORG=xft,xrender | XFT_USE= XORG=xft,xrender | ||||
| XFT_CONFIGURE_WITH= xft | XFT_CONFIGURE_WITH= xft | ||||
| XFT_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ | XFT_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ | ||||
| libfreetype.so:print/freetype2 | libfreetype.so:print/freetype2 | ||||
| XIM_CONFIGURE_WITH= xim | XIM_CONFIGURE_WITH= xim | ||||
| XML_USES= gnome | XML_USES= gnome # portlint complains, but necessary for nox flavor | ||||
| XML_USE= GNOME=libxml2 | XML_USE= GNOME=libxml2 | ||||
| XML_CONFIGURE_WITH= xml2 | XML_CONFIGURE_WITH= xml2 | ||||
| XPM_USE= XORG=xpm | XPM_USE= XORG=xpm | ||||
| XPM_CONFIGURE_WITH= xpm | XPM_CONFIGURE_WITH= xpm | ||||
| XWIDGETS_USE= XORG=xcomposite | XWIDGETS_USE= XORG=xcomposite | ||||
| XWIDGETS_CONFIGURE_WITH= xwidgets | XWIDGETS_CONFIGURE_WITH= xwidgets | ||||
| XWIDGETS_LIB_DEPENDS= libwebkit2gtk-4.0.so:www/webkit2-gtk3 \ | XWIDGETS_LIB_DEPENDS= libwebkit2gtk-4.0.so:www/webkit2-gtk3 \ | ||||
| libsoup-2.4.so:devel/libsoup | libsoup-2.4.so:devel/libsoup | ||||
| XWIDGETS_IMPLIES= GTK3 | XWIDGETS_IMPLIES= GTK3 | ||||
| EMACS_VER= 27.0.50 | |||||
ashish: Also, as I see that you have replaced all occurences `EMACS_VER` with `DISTVERSION:R`, which… | |||||
jrmAuthorUnsubmitted Done Inline ActionsMy motivation was to reduce the diff between editors/emacs and editors/emacs-devel. In editors/emacs DISTVERSION is used because it would be the same as EMACS_VER. In editors/emacs-devel DISTVERSION is the same as EMACS_VER, except without the revision date, which is what ${DISTVERSION:R} sort of means. Even with these changes, a diff would still flag these lines as different, just less different, plus there would be one less line in the diff for defining EMACS_VER. Putting my silly obsessions aside, it's not so important to me either way, so if this motivation does not seem useful, I will follow your suggestion. jrm: My motivation was to reduce the diff between editors/emacs and editors/emacs-devel. In… | |||||
ashishUnsubmitted Not Done Inline ActionsI haven't looked at these changes from the that perspective, and do not think it's a silly obsession. I think from maintenance point of view, your initiative is a good one, less chances of human errors. I made this diff implying what I think should happen, w.r.t. EMACS_VER. And also created a diff to illustrate differences between emacs, and emacs-devel ports. Let me know what you think. ashish: I haven't looked at these changes from the that perspective, and do not think it's a silly… | |||||
ashishUnsubmitted Not Done Inline Actionsashish: Sorry, ignore the diffs in previous comment, right diffs are below:
* [[ https://hasteb. | |||||
| EMACS_REV= 20190903 | |||||
| .include <bsd.port.options.mk> | .include <bsd.port.options.mk> | ||||
| # has graphics/ImageMagick been compiled with OPENMP? | # has graphics/ImageMagick been compiled with OPENMP? | ||||
| .if ${PORT_OPTIONS:MMAGICK} && ${:!${GREP} -sc " \-fopenmp " ${LOCALBASE}/libdata/pkgconfig/ImageMagick.pc || true!} == "1" | .if ${PORT_OPTIONS:MMAGICK} && ${:!${GREP} -sc " \-fopenmp " ${LOCALBASE}/libdata/pkgconfig/ImageMagick.pc || true!} == "1" | ||||
| USES+= compiler:openmp | USES+= compiler:openmp | ||||
| .endif | .endif | ||||
| .if !${PORT_OPTIONS:MGTK2} && !${PORT_OPTIONS:MGTK3} && !${PORT_OPTIONS:MMOTIF} \ | .if !${PORT_OPTIONS:MGTK2} && !${PORT_OPTIONS:MGTK3} && !${PORT_OPTIONS:MMOTIF} \ | ||||
| Show All 13 Lines | |||||
| # desktop-file-utils and portlint -C will give a warning about INSTALLS_ICONS, | # desktop-file-utils and portlint -C will give a warning about INSTALLS_ICONS, | ||||
| # but don't pull in those dependencies with the nox flavor. | # but don't pull in those dependencies with the nox flavor. | ||||
| post-patch: | post-patch: | ||||
| @${REINPLACE_CMD} -e 's/^Terminal=.*$$/Terminal=true/' ${WRKSRC}/etc/emacs.desktop | @${REINPLACE_CMD} -e 's/^Terminal=.*$$/Terminal=true/' ${WRKSRC}/etc/emacs.desktop | ||||
| .endif | .endif | ||||
| post-install-MAILUTILS-on: | post-install-MAILUTILS-on: | ||||
| ${LN} -sf ${PREFIX}/bin/movemail \ | ${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: | post-install-SOURCES-on: | ||||
| @${MKDIR} ${STAGEDIR}${DATADIR}/${EMACS_VER}/src | @${MKDIR} ${STAGEDIR}${DATADIR}/${DISTVERSION:R}/src | ||||
| ${INSTALL_DATA} ${WRKSRC}/src/*.[ch] ${STAGEDIR}${DATADIR}/${EMACS_VER}/src | ${INSTALL_DATA} ${WRKSRC}/src/*.[ch] ${STAGEDIR}${DATADIR}/${DISTVERSION:R}/src | ||||
| ${INSTALL_DATA} ${WRKDIR}/sources.el ${STAGEDIR}${DATADIR}/${EMACS_VER}/site-lisp/site-start.el | ${INSTALL_DATA} ${WRKDIR}/sources.el ${STAGEDIR}${DATADIR}/${DISTVERSION:R}/site-lisp/site-start.el | ||||
| post-install: | post-install: | ||||
| @${RM} -r ${STAGEDIR}${PREFIX}/lib/systemd | @${RM} -r ${STAGEDIR}${PREFIX}/lib/systemd | ||||
| .include <bsd.port.mk> | .include <bsd.port.mk> | ||||
Also, as I see that you have replaced all occurences EMACS_VER with DISTVERSION:R, which IMHO looks ugly. If you'd rather see Emacs version at the top of the file (easy to locate which sounds fair to me), then maybe initialize EMACS_VER as ${DISTVERSION:R}, while keeping everything that includes EMACS_VER as is ?