[100520] trunk/dports/multimedia/mplayer2
cal at macports.org
cal at macports.org
Fri Dec 14 10:22:49 PST 2012
Revision: 100520
https://trac.macports.org/changeset/100520
Author: cal at macports.org
Date: 2012-12-14 10:22:49 -0800 (Fri, 14 Dec 2012)
Log Message:
-----------
mplayer2: update to current, closes #37306
Modified Paths:
--------------
trunk/dports/multimedia/mplayer2/Portfile
Added Paths:
-----------
trunk/dports/multimedia/mplayer2/files/patch-configure.diff
Removed Paths:
-------------
trunk/dports/multimedia/mplayer2/files/patch-Makefile.diff
Modified: trunk/dports/multimedia/mplayer2/Portfile
===================================================================
--- trunk/dports/multimedia/mplayer2/Portfile 2012-12-14 17:39:24 UTC (rev 100519)
+++ trunk/dports/multimedia/mplayer2/Portfile 2012-12-14 18:22:49 UTC (rev 100520)
@@ -14,10 +14,10 @@
long_description ${description}
homepage http://www.mplayer2.org/
-version 2.0-20121108
+version 2.0-20121128
fetch.type git
git.url git://git.mplayer2.org/mplayer2.git
-git.branch b5349bb946d481e0f74449960b8f81839b47bd3c
+git.branch 661a3500796f4dc2c4c0a9b074ce698f7a0987a1
# disable livecheck, because it seems upstream isn't going to do any releases
livecheck.type none
@@ -63,7 +63,7 @@
universal_variant no
-patchfiles patch-Makefile.diff
+patchfiles patch-configure.diff
post-patch {
reinplace "s|#!/usr/bin/env python3|#!$prefix/bin/python3.2|g" \
Deleted: trunk/dports/multimedia/mplayer2/files/patch-Makefile.diff
===================================================================
--- trunk/dports/multimedia/mplayer2/files/patch-Makefile.diff 2012-12-14 17:39:24 UTC (rev 100519)
+++ trunk/dports/multimedia/mplayer2/files/patch-Makefile.diff 2012-12-14 18:22:49 UTC (rev 100520)
@@ -1,13 +0,0 @@
---- Makefile.orig 2012-11-13 23:34:32.000000000 -0600
-+++ Makefile 2012-11-13 23:47:27.000000000 -0600
-@@ -535,8 +535,8 @@
- all: mplayer$(EXESUF) locales
-
- %.1: %.rst
-- @which rst2man >/dev/null 2>&1 || (printf "\n\trst2man not found. You need the Docutils system to generate the manpages (preferably version >= 0.9; 0.8 and older are known to corrupt the arguments shown in some option descriptions). Alternatively you can use 'install-no-man' rule.\n\n" && exit 1)
-- rst2man $< $@
-+ @which rst2man-2.7.py >/dev/null 2>&1 || (printf "\n\trst2man-2.7.py not found. You need the Docutils system to generate the manpages (preferably version >= 0.9; 0.8 and older are known to corrupt the arguments shown in some option descriptions). Alternatively you can use 'install-no-man' rule.\n\n" && exit 1)
-+ rst2man-2.7.py $< $@
-
- %.o: %.S
- $(CC) $(DEPFLAGS) $(CFLAGS) -c -o $@ $<
Added: trunk/dports/multimedia/mplayer2/files/patch-configure.diff
===================================================================
--- trunk/dports/multimedia/mplayer2/files/patch-configure.diff (rev 0)
+++ trunk/dports/multimedia/mplayer2/files/patch-configure.diff 2012-12-14 18:22:49 UTC (rev 100520)
@@ -0,0 +1,15 @@
+--- configure.orig 2012-12-14 08:38:09.000000000 -0600
++++ configure 2012-12-14 08:43:10.000000000 -0600
+@@ -1274,9 +1274,9 @@
+ die "Runtime CPU detection only works for x86, x86-64 and PPC!"
+ fi
+
+-_rst2man=rst2man
+-if [ -f "$(which rst2man.py)" ] ; then
+- _rst2man=rst2man.py
++_rst2man=rst2man-2.7
++if [ -f "$(which rst2man-2.7.py)" ] ; then
++ _rst2man=rst2man-2.7.py
+ fi
+
+ # Checking CC version...
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121214/8cc556a6/attachment.html>
More information about the macports-changes
mailing list