multimedia/(mencoder|mplayer): Update to recent upstream snapshot.

6 files changed, 22 insertions, 15 deletions

diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile
index 28b5c8eaadcd..2df6b5c12581 100644
--- a/multimedia/mencoder/Makefile
+++ b/multimedia/mencoder/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	mencoder
 PORTVERSION=	${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g}
-PORTREVISION=	1
 CATEGORIES=	multimedia audio
 
 MAINTAINER=	riggs@FreeBSD.org
diff --git a/multimedia/mencoder/distinfo b/multimedia/mencoder/distinfo
index 1e75807866db..fbf33c51259e 100644
--- a/multimedia/mencoder/distinfo
+++ b/multimedia/mencoder/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1625393918
-SHA256 (mplayer-1.4.0.20210703.tar.xz) = 7c81c590215436d2365b98324e3903e92958722e06eb7ebc9f20192e8a99a6ab
-SIZE (mplayer-1.4.0.20210703.tar.xz) = 5195192
+TIMESTAMP = 1632995931
+SHA256 (mplayer-1.4.0.20210929.tar.xz) = c9155371b2de03af4a3fdf79fc526a523d40882e60e97e4f4880365cc7928c87
+SIZE (mplayer-1.4.0.20210929.tar.xz) = 5195616
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index d9cb87a4df7d..09ddd828f6a4 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	mplayer
 PORTVERSION=	${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g}
-PORTREVISION=	1
 CATEGORIES=	multimedia audio
 
 MAINTAINER=	riggs@FreeBSD.org
diff --git a/multimedia/mplayer/Makefile.common b/multimedia/mplayer/Makefile.common
index dd35b9a35e45..5ed4aaf15377 100644
--- a/multimedia/mplayer/Makefile.common
+++ b/multimedia/mplayer/Makefile.common
@@ -3,7 +3,7 @@
 # before we include bsd.port.pre.mk
 
 MPLAYER_PORT_VERSION=	1.4.0
-MPLAYER_SNAPSHOT_DATE=	2021-07-03
+MPLAYER_SNAPSHOT_DATE=	2021-09-29
 MASTER_SITES=	LOCAL/riggs/mplayer
 DISTNAME=	mplayer-${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g}
 WRKSRC=		${WRKDIR}/mplayer-export-${MPLAYER_SNAPSHOT_DATE}
diff --git a/multimedia/mplayer/distinfo b/multimedia/mplayer/distinfo
index 3933f63c3152..1dede39c0019 100644
--- a/multimedia/mplayer/distinfo
+++ b/multimedia/mplayer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1625328221
-SHA256 (mplayer-1.4.0.20210703.tar.xz) = 7c81c590215436d2365b98324e3903e92958722e06eb7ebc9f20192e8a99a6ab
-SIZE (mplayer-1.4.0.20210703.tar.xz) = 5195192
+TIMESTAMP = 1632953998
+SHA256 (mplayer-1.4.0.20210929.tar.xz) = c9155371b2de03af4a3fdf79fc526a523d40882e60e97e4f4880365cc7928c87
+SIZE (mplayer-1.4.0.20210929.tar.xz) = 5195616
diff --git a/multimedia/mplayer/files/patch-Makefile b/multimedia/mplayer/files/patch-Makefile
index 9977ae9615ee..fe4d63a722ef 100644
--- a/multimedia/mplayer/files/patch-Makefile
+++ b/multimedia/mplayer/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2021-03-04 14:43:07 UTC
+--- Makefile.orig	2021-05-01 17:45:31 UTC
 +++ Makefile
-@@ -751,7 +751,7 @@ mencoder$(EXESUF) mplayer$(EXESUF):
+@@ -753,7 +753,7 @@ mencoder$(EXESUF) mplayer$(EXESUF):
  codec-cfg-test$(EXESUF): HOSTCFLAGS := $(HOSTCFLAGS) -DTESTING
  codec-cfg$(EXESUF) codecs2html$(EXESUF):  HOSTCFLAGS := $(HOSTCFLAGS) -DCODECS2HTML
  codec-cfg$(EXESUF) codec-cfg-test$(EXESUF) codecs2html$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h
@@ -9,13 +9,13 @@
  
  codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf
  	./$^ > $@
-@@ -865,19 +865,17 @@ install: $(INSTALL_TARGETS-yes)
+@@ -867,19 +867,16 @@ install: $(INSTALL_TARGETS-yes)
  install-dirs:
  	$(INSTALL) -d $(BINDIR) $(CONFDIR) $(LIBDIR)
  
 -install-%: %$(EXESUF) install-dirs
 -	$(INSTALL) -m 755 $(INSTALLSTRIP) $< $(BINDIR)
-+install-mplayer: mplayer$(EXESUF) install-dirs
++install-mplayer: mplayer$(EXESUF)
 +	@${BSD_INSTALL_PROGRAM} mplayer$(EXESUF) $(BINDIR)
  
 -install-gui: install-mplayer install-gui-icons install-gui-msg
@@ -29,8 +29,17 @@
  install-gui-msg:      $(foreach lang,$(filter-out $(firstword $(MSG_LANGS)),$(MSG_LANGS)),install-gui-msg-$(lang))
  install-mencoder-man: $(foreach lang,$(MAN_LANGS),install-mencoder-man-$(lang))
 -install-mplayer-man:  $(foreach lang,$(MAN_LANGS),install-mplayer-man-$(lang))
-+install-mplayer-man:
-+	@${BSD_INSTALL_MAN} DOCS/man/en/mplayer.1 $(MANDIR)/man1/mplayer.1
++install-mplayer-man: install-mplayer-man-en
  
  install-gui-man-en: install-mplayer-man-en
  	cd $(MANDIR)/man1/ && ln -sf mplayer.1 gmplayer.1
+@@ -888,8 +885,7 @@ install-mencoder-man-en: install-mplayer-man-en
+ 	cd $(MANDIR)/man1 && ln -sf mplayer.1 mencoder.1
+ 
+ install-mplayer-man-en:
+-	$(INSTALL) -d $(MANDIR)/man1
+-	$(INSTALL) -m 644 DOCS/man/en/mplayer.1 $(MANDIR)/man1/
++	@${BSD_INSTALL_MAN} DOCS/man/en/mplayer.1 $(MANDIR)/man1/mplayer.1
+ 
+ define GUI_ICON_RULE
+ install-gui-icon-$(size):