Page MenuHomeFreeBSD
Files F162931581

D33714.id100830.diff
No OneTemporary
Actions

D33714.id100830.diff
View Options

Index: editors/emacs-devel/Makefile
===================================================================
--- editors/emacs-devel/Makefile
+++ editors/emacs-devel/Makefile
@@ -1,7 +1,7 @@
# Created by: Kenneth Vestergaard Schmidt <kvs@pil.dk>
PORTNAME= emacs
-DISTVERSION= 29.0.50.20220101
+DISTVERSION= 29.0.50.20220102
PORTEPOCH= 2
CATEGORIES= editors
PKGNAMESUFFIX= -devel
@@ -25,12 +25,7 @@
CPE_VENDOR= gnu
USE_GITHUB= yes
GH_ACCOUNT= emacs-mirror
-GH_TAGNAME= 4d1968b
-
-.if ${FLAVOR:U} != nox
-USES+= desktop-file-utils gnome xorg
-USE_XORG= ice sm x11 xcb xext xfixes xinerama xmu xrandr xrender xt
-.endif
+GH_TAGNAME= b2167d9
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-build-details \
@@ -86,9 +81,9 @@
PGTK SCROLLBARS SOURCES SQLITE3 THREADS XFT XIM \
XML XWIDGETS
OPTIONS_DEFAULT= ACL CAIRO DBUS GIF GNUTLS GSETTINGS GTK3 \
- HARFBUZZ JPEG JSON KQUEUE LCMS2 M17N MAILUTILS \
- MODULES OSS OTF PNG SCROLLBARS SOURCES SQLITE3 \
- SVG THREADS TIFF WEBP XFT XIM XML XPM
+ HARFBUZZ JPEG JSON KQUEUE LCMS2 MAILUTILS \
+ MODULES OSS PGTK PNG SCROLLBARS SOURCES SQLITE3 \
+ SVG THREADS TIFF WEBP XML XPM
OPTIONS_GROUP= GRAPHICS
OPTIONS_GROUP_GRAPHICS= CAIRO GIF JPEG MAGICK PNG SVG TIFF WEBP XPM
OPTIONS_RADIO= FILENOTIFY SOUND X11TOOLKIT
@@ -98,13 +93,13 @@
.if ${FLAVOR:U} == nox
OPTIONS_EXCLUDE= ALSA CAIRO DBUS GCONF GFILE GIF GSETTINGS GTK2 \
GTK3 HARFBUZZ JPEG LCMS2 M17N MAGICK OSS OTF \
- PNG PGTK SCROLLBARS SVG TIFF WEBP XAW XAW3D XFT \
+ PGTK PNG SCROLLBARS SVG TIFF WEBP XAW XAW3D XFT \
XIM XPM XWIDGETS
.endif
OPTIONS_SUB= YES
ACL_DESC= Access control list support
-CAIRO_DESC= Cairo graphics library support [implies PNG, XFT]
+CAIRO_DESC= Cairo graphics library support [implies PNG]
FILENOTIFY_DESC= File notification support
GFILE_DESC= File notification via gfile
GRAPHICS_DESC= Graphics support
@@ -130,7 +125,7 @@
ACL_CONFIGURE_ENABLE= acl
ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
ALSA_CONFIGURE_ON= --with-sound=alsa
-CAIRO_IMPLIES= PNG XFT
+CAIRO_IMPLIES= PNG
CAIRO_USE= GNOME=cairo
CAIRO_CONFIGURE_WITH= cairo
DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus
@@ -149,6 +144,8 @@
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
@@ -176,7 +173,6 @@
NATIVECOMP_MAKE_ARGS= NATIVE_FULL_AOT=1
NATIVECOMP_LDFLAGS= -L${LOCALBASE}/lib/${_GCC_PORT}
OSS_CONFIGURE_ON= --with-sound=oss
-OTF_IMPLIES= XFT
OTF_LIB_DEPENDS= libotf.so:print/libotf
OTF_CONFIGURE_WITH= libotf
PGTK_IMPLIES= CAIRO GTK3
@@ -218,16 +214,24 @@
.include <bsd.port.options.mk>
+.if ${ARCH:Mpowerpc64*}
+USE_GCC= yes
+.endif
+
.if ${PORT_OPTIONS:MNATIVECOMP} && !defined(_GCC_PORT_CHOSEN)
_GCC_PORT!= ${BSDMAKE} -V_GCC_PORT USE_GCC=11+ _GCC_PORT_CHOSEN=yes
.endif
-.if ${ARCH:Mpowerpc64*}
-USE_GCC= yes
+.if ${FLAVOR:U} != nox
+USES+= desktop-file-utils gnome
+.if !${PORT_OPTIONS:MPGTK}
+USES+= xorg
+USE_XORG= ice sm x11 xcb xext xfixes xinerama xmu xrandr xrender xt
+.endif
.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
Index: editors/emacs-devel/distinfo
===================================================================
--- editors/emacs-devel/distinfo
+++ editors/emacs-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1641004289
-SHA256 (emacs-mirror-emacs-29.0.50.20220101-4d1968b_GH0.tar.gz) = b4a8cfaee14298cfeb4fe1abc04724cbb9d3a20d0cdf2907d7b0802b5e1ae4a0
-SIZE (emacs-mirror-emacs-29.0.50.20220101-4d1968b_GH0.tar.gz) = 44706883
+TIMESTAMP = 1641138105
+SHA256 (emacs-mirror-emacs-29.0.50.20220102-b2167d9_GH0.tar.gz) = 0fb8b9120c09094d943624cc9b0cc9310bdc207d2f4853f4aee1f0d24f948a26
+SIZE (emacs-mirror-emacs-29.0.50.20220102-b2167d9_GH0.tar.gz) = 44707649

File Metadata

Mime Type
text/plain
Expires
Sun, Jul 19, 10:33 AM (20 h, 3 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35231131
Default Alt Text
D33714.id100830.diff (4 KB)

Event Timeline