From owner-svn-ports-all@freebsd.org Thu Apr 26 13:49:10 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4C2CDFAD885; Thu, 26 Apr 2018 13:49:10 +0000 (UTC) (envelope-from jrm@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id EDFCD6850E; Thu, 26 Apr 2018 13:49:09 +0000 (UTC) (envelope-from jrm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CA50918DFD; Thu, 26 Apr 2018 13:49:09 +0000 (UTC) (envelope-from jrm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3QDn9Zb083962; Thu, 26 Apr 2018 13:49:09 GMT (envelope-from jrm@FreeBSD.org) Received: (from jrm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3QDn9IR083960; Thu, 26 Apr 2018 13:49:09 GMT (envelope-from jrm@FreeBSD.org) Message-Id: <201804261349.w3QDn9IR083960@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jrm set sender to jrm@FreeBSD.org using -f From: Joseph Mingrone Date: Thu, 26 Apr 2018 13:49:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r468348 - in head/editors: emacs emacs-devel X-SVN-Group: ports-head X-SVN-Commit-Author: jrm X-SVN-Commit-Paths: in head/editors: emacs emacs-devel X-SVN-Commit-Revision: 468348 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Apr 2018 13:49:10 -0000 Author: jrm Date: Thu Apr 26 13:49:09 2018 New Revision: 468348 URL: https://svnweb.freebsd.org/changeset/ports/468348 Log: Emacs ports: Conform to 'Order of Variables in Port Makefiles' in PH Modified: head/editors/emacs-devel/Makefile (contents, props changed) head/editors/emacs/Makefile (contents, props changed) Modified: head/editors/emacs-devel/Makefile ============================================================================== --- head/editors/emacs-devel/Makefile Thu Apr 26 11:47:30 2018 (r468347) +++ head/editors/emacs-devel/Makefile Thu Apr 26 13:49:09 2018 (r468348) @@ -24,33 +24,27 @@ nox_PKGNAMESUFFIX= -devel_nox USES= autoreconf:build cpe gmake localbase:ldflags makeinfo ncurses \ pkgconfig +CPE_VENDOR= gnu USE_GITHUB= yes GH_ACCOUNT= emacs-mirror GH_TAGNAME= d599dce -CPE_VENDOR= gnu -EMACS_VER= 27.0.50 -EMACS_REV= 20180220 GNU_CONFIGURE= yes +CONFIGURE_ARGS= --with-gameuser=games:games +CONFIGURE_ENV= ac_cv_header_sys_sysinfo_h=no \ + ac_cv_prog_liblockfile=no +INFO= ada-mode auth autotype bovine calc ccmode cl dbus dired-x \ + ebrowse ede ediff edt efaq eieio eintr elisp emacs emacs-gnutls \ + emacs-mime epa erc ert eshell eudc eww flymake forms gnus \ + htmlfontify idlwave ido info mairix-el message mh-e newsticker \ + nxml-mode octave-mode org pcl-cvs pgg rcirc reftex remember \ + sasl sc semantic ses sieve smtpmail speedbar srecode todo-mode \ + tramp url vhdl-mode vip viper widget wisent woman INFO_PATH= ${DATADIR_REL}/info - +PLIST_SUB= EMACS_VER=${EMACS_VER} GNU_HOST=${CONFIGURE_TARGET} SUB_FILES= sources.el SUB_LIST= EMACS_VER=${EMACS_VER} -CONFIGURE_ARGS= --with-gameuser=games:games -CONFIGURE_ENV= ac_cv_prog_liblockfile=no - -PLIST_SUB= EMACS_VER=${EMACS_VER} GNU_HOST=${CONFIGURE_TARGET} - -CONFIGURE_ENV= ac_cv_header_sys_sysinfo_h=no \ - ac_cv_prog_liblockfile=no -INFO= ada-mode auth autotype bovine calc ccmode cl dbus dired-x ebrowse ede \ - ediff edt efaq eieio eintr elisp emacs emacs-gnutls emacs-mime epa erc \ - ert eshell eudc eww flymake forms gnus htmlfontify idlwave ido info \ - mairix-el message mh-e newsticker nxml-mode octave-mode org pcl-cvs pgg \ - 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 GCONF GNUTLS GSETTINGS LCMS2 LLDB M17N MAILUTILS \ MODULES OTF SCROLLBARS SOURCES THREADS XFT XIM XML XWIDGETS OPTIONS_DEFAULT= ACL DBUS FREEDESKTOP GCONF GIF GNUTLS GSETTINGS GTK3 \ @@ -165,7 +159,6 @@ XWIDGETS_CONFIGURE_WITH= xwidgets XWIDGETS_LIB_DEPENDS= libwebkit2gtk-4.0.so:www/webkit2-gtk3 XWIDGETS_IMPLIES= GTK3 - .if ${FLAVOR:U} == nox CONFIGURE_ARGS+= --with-sound=no --without-cairo --without-dbus \ --without-gconf --without-gif --without-gsettings \ @@ -184,6 +177,9 @@ INSTALLS_ICONS= yes USE_XORG= ice sm x11 xcb xext xfixes xinerama xmu xrandr xt USES+= desktop-file-utils .endif + +EMACS_VER= 27.0.50 +EMACS_REV= 20180220 .include Modified: head/editors/emacs/Makefile ============================================================================== --- head/editors/emacs/Makefile Thu Apr 26 11:47:30 2018 (r468347) +++ head/editors/emacs/Makefile Thu Apr 26 13:49:09 2018 (r468348) @@ -27,31 +27,26 @@ nox_CONFLICTS_INSTALL= emacs emacs-canna nox_PKGNAMESUFFIX= -nox USES= cpe gmake localbase:ldflags makeinfo ncurses pkgconfig tar:xz - CPE_VENDOR= gnu -EMACS_VER= 25.3 + GNU_CONFIGURE= yes +CONFIGURE_ARGS= --localstatedir=/var \ + --with-gameuser=games:games +CONFIGURE_ENV= ac_cv_header_sys_sysinfo_h=no \ + ac_cv_prog_liblockfile=no +INFO= ada-mode auth autotype bovine calc ccmode cl dbus dired-x \ + ebrowse ede ediff edt efaq eieio eintr elisp emacs emacs-gnutls \ + emacs-mime epa erc ert eshell eudc eww flymake forms gnus \ + htmlfontify idlwave ido info mairix-el message mh-e newsticker \ + nxml-mode octave-mode org pcl-cvs pgg rcirc reftex remember \ + sasl sc semantic ses sieve smtpmail speedbar srecode todo-mode \ + tramp url vhdl-mode vip viper widget wisent woman INFO_PATH= ${DATADIR_REL}/info - +PLIST_SUB= EMACS_VER=${EMACS_VER} GNU_HOST=${CONFIGURE_TARGET} SUB_FILES= sources.el SUB_LIST= ARCHLIBDIR=${PREFIX}/libexec/emacs/${EMACS_VER}/${CONFIGURE_TARGET} \ EMACS_VER=${EMACS_VER} # sources.el -CONFIGURE_ARGS= --localstatedir=/var \ - --with-gameuser=games:games -CONFIGURE_ENV= ac_cv_prog_liblockfile=no - -PLIST_SUB= EMACS_VER=${EMACS_VER} GNU_HOST=${CONFIGURE_TARGET} - -CONFIGURE_ENV= ac_cv_header_sys_sysinfo_h=no \ - ac_cv_prog_liblockfile=no -INFO= ada-mode auth autotype bovine calc ccmode cl dbus dired-x ebrowse ede \ - ediff edt efaq eieio eintr elisp emacs emacs-gnutls emacs-mime epa erc \ - ert eshell eudc eww flymake forms gnus htmlfontify idlwave ido info \ - mairix-el message mh-e newsticker nxml-mode octave-mode org pcl-cvs pgg \ - 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 GCONF GNUTLS GSETTINGS LLDB M17N MAILUTILS MODULES OTF \ SCROLLBARS SOURCES XFT XIM XML XWIDGETS OPTIONS_DEFAULT= ACL DBUS GCONF GIF GNUTLS GSETTINGS GTK3 JPEG KQUEUE \ @@ -189,6 +184,8 @@ INSTALLS_ICONS= yes USE_XORG= ice sm x11 xcb xext xfixes xinerama xmu xrandr xt USES+= desktop-file-utils .endif + +EMACS_VER= 25.3 .include