git: de2bb076488c - main - audio/mpg123.el: update to 1.65 and change maintainer

The branch main has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=de2bb076488cc1f990b33d90d78e99e1672ee0f7

commit de2bb076488cc1f990b33d90d78e99e1672ee0f7
Author:     mew14930xvi <mew14930xvi@inbox.lv>
AuthorDate: 2024-03-27 20:15:20 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2024-03-27 20:20:22 +0000

    audio/mpg123.el: update to 1.65 and change maintainer
    
    Changelog:
    * Support emacs-28
    * Workaround for recent mpg123 output of status line
    * Default audio player now switched to MPlayer
    * Instant Forward/Backward by setting mpg123-time-slide-instant-seek
    
    New maintainer: mew14930xvi <mew14930xvi@inbox.lv>
    
    PR:             277985
    Approved by:    arrowd (mentor, implicit)
---
 audio/mpg123.el/Makefile                           | 35 ++++++++++++++++------
 audio/mpg123.el/distinfo                           |  6 ++--
 audio/mpg123.el/files/extra-mpg123-patch-mpg123.el | 16 ++++++++++
 audio/mpg123.el/pkg-descr                          | 12 +++-----
 audio/mpg123.el/pkg-plist                          |  1 -
 5 files changed, 49 insertions(+), 21 deletions(-)

diff --git a/audio/mpg123.el/Makefile b/audio/mpg123.el/Makefile
index 74185ad245be..3438bb88aa26 100644
--- a/audio/mpg123.el/Makefile
+++ b/audio/mpg123.el/Makefile
@@ -1,28 +1,45 @@
 PORTNAME=	mpg123.el
-PORTVERSION=	1.60
-PORTREVISION=	1
+PORTVERSION=	1.65
 CATEGORIES=	audio elisp
 MASTER_SITES=	http://www.gentei.org/~yuuji/software/mpg123el/
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
+DISTNAME=	mpg123el.cgi?${PORTVERSION}
 EXTRACT_SUFX=	# empty
 EXTRACT_ONLY=	# empty
-DISTFILES=	mpg123el.cgi?${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	mew14930xvi@inbox.lv
 COMMENT=	Front-end to mpg123/ogg123 audio player for Emacsen
 WWW=		http://www.gentei.org/~yuuji/software/mpg123el/
 
-RUN_DEPENDS=	mpg123:audio/mpg123
+LICENSE=	BSD2CLAUSE
+
+USES=		emacs
+
+OPTIONS_SINGLE=		PLAYER
+OPTIONS_SINGLE_PLAYER=	MPG123 MPLAYER
+OPTIONS_DEFAULT=	MPLAYER
+MPG123_DESC=		Use mpg123/ogg123 as audio player
+MPLAYER_DESC=		Use mplayer as audio player
+PLAYER_DESC=		Default audio player
+MPLAYER_RUN_DEPENDS=	mplayer:multimedia/mplayer
+MPG123_RUN_DEPENDS=	mpg123:audio/mpg123 \
+			ogg123:audio/vorbis-tools
+MPG123_EXTRA_PATCHES=	${FILESDIR}/extra-mpg123-patch-mpg123.el
+
+CONFLICTS=	mpg123-emacs
 
 NO_WRKSUBDIR=	yes
+NO_ARCH=	yes
 NO_BUILD=	yes
-
-ELISPDIR=	${PREFIX}/share/emacs/site-lisp
+PLIST_FILES=	${EMACS_SITE_LISPDIR}/mpg123.el
 
 FETCH_ARGS=	-AR
 FETCH_BEFORE_ARGS=	-o mpg123el.cgi?${PORTVERSION}
 
+do-extract:
+	${CP} ${DISTDIR}/mpg123el.cgi?${PORTVERSION} ${EXTRACT_WRKDIR}/${PORTNAME}
+
 do-install:
-	@${MKDIR} ${STAGEDIR}${ELISPDIR}
-	${INSTALL_DATA} ${DISTDIR}/mpg123el.cgi?${PORTVERSION} ${STAGEDIR}${ELISPDIR}/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}
 
 .include <bsd.port.mk>
diff --git a/audio/mpg123.el/distinfo b/audio/mpg123.el/distinfo
index c29001512938..c4bb0269c313 100644
--- a/audio/mpg123.el/distinfo
+++ b/audio/mpg123.el/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1490565400
-SHA256 (mpg123el.cgi?1.60) = 1ac60da5b73999a70e90d93e996705cb6881a340523a947c6d3355498c4b5e3a
-SIZE (mpg123el.cgi?1.60) = 112627
+TIMESTAMP = 1711530475
+SHA256 (mpg123el.cgi?1.65) = a9b1b08f3dfd26c29d200617bf2f882b9f1b77a92597bb553ba7a4b533866e31
+SIZE (mpg123el.cgi?1.65) = 119398
diff --git a/audio/mpg123.el/files/extra-mpg123-patch-mpg123.el b/audio/mpg123.el/files/extra-mpg123-patch-mpg123.el
new file mode 100644
index 000000000000..0bb7b7b87935
--- /dev/null
+++ b/audio/mpg123.el/files/extra-mpg123-patch-mpg123.el
@@ -0,0 +1,16 @@
+--- mpg123.el.orig	2024-03-27 15:59:38 UTC
++++ mpg123.el
+@@ -608,12 +608,7 @@
+ 
+ ;;; Code:
+ 
+-(defvar mpg123-use-mplayer
+-  (or (and (fboundp 'executable-find)
+-	     (executable-find "mplayer"))
+-	(and (featurep 'xemacs)
+-	     (fboundp 'exec-installed-p)
+-	     (exec-installed-p "mplayer")))
++(defvar mpg123-use-mplayer nil
+   "*Use mplayer command instead of mp123/ogg123.")
+ ;; Linux users still using OSS rather than ALSA may wish to use
+ ;; (setq mpg123-mixer-type 'aumix) before loading mpg123.el
diff --git a/audio/mpg123.el/pkg-descr b/audio/mpg123.el/pkg-descr
index 5dbfc2188edf..84bcbf3f1078 100644
--- a/audio/mpg123.el/pkg-descr
+++ b/audio/mpg123.el/pkg-descr
@@ -1,9 +1,5 @@
-The mpg123.el Emacs-Lisp program is a front-end to mpg123/ogg123 audio player.
-You can select and play an mp3 file from the list in your Emacs's buffer with
-familiar interface.
+The mpg123.el Emacs-Lisp program is a front-end to mpg123 audio player
+and OggVorbis audio player. You can select and play an music files
+from the list in your Emacs's buffer with familiar interface.
 
-Because mpg123.el is an Emacs-Lisp program and is written carefully to
-preserve portability, it must run on almost all variant of Emacs, especially
-recent one. Here is the list of environment where mpg123.el is reported to be
-available. If you find mpg123 running on other platforms than below, please
-tell me your environment.
+Default audio player now switched to MPlayer (2023-05-05).
diff --git a/audio/mpg123.el/pkg-plist b/audio/mpg123.el/pkg-plist
deleted file mode 100644
index 18ef54f64f7c..000000000000
--- a/audio/mpg123.el/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-share/emacs/site-lisp/mpg123.el