Index: head/lang/php-mode.el/Makefile =================================================================== --- head/lang/php-mode.el/Makefile (revision 517302) +++ head/lang/php-mode.el/Makefile (revision 517303) @@ -1,38 +1,37 @@ # Created by: Dmitry Sivachenko # $FreeBSD$ PORTNAME= php-mode.el -PORTVERSION= 1.22.0 +PORTVERSION= 1.22.1 DISTVERSIONPREFIX= v -PORTREVISION= 1 CATEGORIES= lang elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} MAINTAINER= yasu@utahime.org COMMENT= PHP mode for GNU Emacs LICENSE= GPLv3 USES= emacs gmake USE_GITHUB= yes GH_ACCOUNT= emacs-php GH_PROJECT= ${PORTNAME:S/.el$//} NO_ARCH= yes do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} ${INSTALL_DATA} \ ${WRKSRC}/php-face.el \ ${WRKSRC}/php-face.elc \ ${WRKSRC}/php-mode-debug.el \ ${WRKSRC}/php-mode-debug.elc \ ${WRKSRC}/php-mode.el \ ${WRKSRC}/php-mode.elc \ ${WRKSRC}/php-project.el \ ${WRKSRC}/php-project.elc \ ${WRKSRC}/php.el \ ${WRKSRC}/php.elc \ ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} .include Index: head/lang/php-mode.el/distinfo =================================================================== --- head/lang/php-mode.el/distinfo (revision 517302) +++ head/lang/php-mode.el/distinfo (revision 517303) @@ -1,3 +1,3 @@ -TIMESTAMP = 1570063790 -SHA256 (emacs-php-php-mode-v1.22.0_GH0.tar.gz) = 8127f4ac6d7425a584bf50f2e3611aae4661c026a2f59aa06e1251ba690d57e8 -SIZE (emacs-php-php-mode-v1.22.0_GH0.tar.gz) = 90211 +TIMESTAMP = 1573417507 +SHA256 (emacs-php-php-mode-v1.22.1_GH0.tar.gz) = 6c4e366be6004e52ca6afe41e2fd90ab747ef8cd564dfd18ac5dc3364060b3de +SIZE (emacs-php-php-mode-v1.22.1_GH0.tar.gz) = 90539 Index: head/lang/php-mode.el/files/patch-75d3ee1ead7557175e6aeb2ad8efdd73ee3c9332 =================================================================== --- head/lang/php-mode.el/files/patch-75d3ee1ead7557175e6aeb2ad8efdd73ee3c9332 (revision 517302) +++ head/lang/php-mode.el/files/patch-75d3ee1ead7557175e6aeb2ad8efdd73ee3c9332 (nonexistent) @@ -1,61 +0,0 @@ -From 75d3ee1ead7557175e6aeb2ad8efdd73ee3c9332 Mon Sep 17 00:00:00 2001 -From: Charlie McMackin -Date: Sun, 29 Sep 2019 11:52:54 -0500 -Subject: [PATCH] Replace rx-form with rx-to-string - -`rx-form` is being removed in an upcoming version of Emacs and its rewrite of -`rx`. Replacing it with `rx-to-string` is backwards and future compatible. ---- - php.el | 36 ++++++++++++++++++------------------ - 1 file changed, 18 insertions(+), 18 deletions(-) - -diff --git php.el php.el -index 64286da..ea36fc3 100644 ---- php.el -+++ php.el -@@ -177,24 +177,24 @@ keywords that can appear in method signatures, e.g. 'final' and - which will be the name of the method." - (when (stringp visibility) - (setq visibility (list visibility))) -- (rx-form `(: line-start -- (* (syntax whitespace)) -- ,@(if visibility -- `((* (or "abstract" "final" "static") -- (+ (syntax whitespace))) -- (or ,@visibility) -- (+ (syntax whitespace)) -- (* (or "abstract" "final" "static") -- (+ (syntax whitespace)))) -- '((* (* (or "abstract" "final" "static" -- "private" "protected" "public") -- (+ (syntax whitespace)))))) -- "function" -- (+ (syntax whitespace)) -- (? "&" (* (syntax whitespace))) -- (group (+ (or (syntax word) (syntax symbol)))) -- (* (syntax whitespace)) -- "("))) -+ (rx-to-string `(: line-start -+ (* (syntax whitespace)) -+ ,@(if visibility -+ `((* (or "abstract" "final" "static") -+ (+ (syntax whitespace))) -+ (or ,@visibility) -+ (+ (syntax whitespace)) -+ (* (or "abstract" "final" "static") -+ (+ (syntax whitespace)))) -+ '((* (* (or "abstract" "final" "static" -+ "private" "protected" "public") -+ (+ (syntax whitespace)))))) -+ "function" -+ (+ (syntax whitespace)) -+ (? "&" (* (syntax whitespace))) -+ (group (+ (or (syntax word) (syntax symbol)))) -+ (* (syntax whitespace)) -+ "("))) - - (defun php-create-regexp-for-classlike (type) - "Accepts a `TYPE' of a 'classlike' object as a string, such as --- -2.23.0 - Property changes on: head/lang/php-mode.el/files/patch-75d3ee1ead7557175e6aeb2ad8efdd73ee3c9332 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property