Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 17 Feb 2014 22:34:41 +0000 (UTC)
From:      Thomas Zander <riggs@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r344827 - in head/multimedia: mencoder mplayer mplayer/files
Message-ID:  <201402172234.s1HMYfmp085637@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: riggs
Date: Mon Feb 17 22:34:40 2014
New Revision: 344827
URL: http://svnweb.freebsd.org/changeset/ports/344827
QAT: https://qat.redports.org/buildarchive/r344827/

Log:
  - Drop support for pre-8.3 systems
  - Convert old LIB_DEPENDS to new format
  - Fix staging breakage for PREFIX!=LOCALBASE
  - Fix bug passing wrong CONFIGURE_ARGS when using DEBUG
    (causes dangling dependencies in debug builds)
  - Bump PORTREVISION
  - Update maintainer e-mail address
  
  Approved by:	thierry (mentor)
  MFH:		2014Q1

Deleted:
  head/multimedia/mplayer/files/extra-patch-base_system_log2f
Modified:
  head/multimedia/mencoder/Makefile
  head/multimedia/mplayer/Makefile
  head/multimedia/mplayer/Makefile.options
  head/multimedia/mplayer/Makefile.shared

Modified: head/multimedia/mencoder/Makefile
==============================================================================
--- head/multimedia/mencoder/Makefile	Mon Feb 17 22:19:02 2014	(r344826)
+++ head/multimedia/mencoder/Makefile	Mon Feb 17 22:34:40 2014	(r344827)
@@ -3,7 +3,7 @@
 
 PORTNAME=	mencoder
 PORTVERSION=	${MPLAYER_PORT_VERSION}
-PORTREVISION=	0
+PORTREVISION=	1
 
 COMMENT=	Convenient video file and movie encoder
 

Modified: head/multimedia/mplayer/Makefile
==============================================================================
--- head/multimedia/mplayer/Makefile	Mon Feb 17 22:19:02 2014	(r344826)
+++ head/multimedia/mplayer/Makefile	Mon Feb 17 22:34:40 2014	(r344827)
@@ -3,7 +3,7 @@
 
 PORTNAME=	mplayer
 PORTVERSION=	${MPLAYER_PORT_VERSION}
-PORTREVISION=	0
+PORTREVISION=	1
 
 COMMENT=	High performance media player supporting many formats
 
@@ -37,8 +37,6 @@ WIN32_DESC?=	Install win32 binary codecs
 X11DGA_DESC?=	X11 DGA video driver support
 X11VM_DESC?=	X11 VidMode support
 
-#MANCOMPRESSED=	no
-
 SUB_FILES=	pkg-message
 
 CONFFILES=	example.conf input.conf menu.conf dvb-menu.conf
@@ -96,7 +94,7 @@ CONFIGURE_ARGS+=--disable-dga1 --disable
 .endif
 .if ${PORT_OPTIONS:MOPENGL}
 USE_XORG+=	glproto
-LIB_DEPENDS+=	GL:${PORTSDIR}/graphics/libGL
+LIB_DEPENDS+=	libGL.so:${PORTSDIR}/graphics/libGL
 .else
 CONFIGURE_ARGS+=--disable-gl
 .endif
@@ -178,7 +176,7 @@ post-install:
 .if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MX11}
 	@${LN} -sf ${PREFIX}/bin/mplayer ${STAGEDIR}${PREFIX}/bin/gmplayer
 	@(cd ${STAGEDIR}${MAN1PREFIX}/man/man1 && ${LN} -sf mplayer.1.gz gmplayer.1.gz)
-	${CP} -f ${WRKSRC}/etc/mplayer256x256.png ${STAGEDIR}${LOCALBASE}/share/pixmaps/mplayer.png
+	${CP} -f ${WRKSRC}/etc/mplayer256x256.png ${STAGEDIR}${PREFIX}/share/pixmaps/mplayer.png
 .endif
 
 .include <bsd.port.post.mk>

Modified: head/multimedia/mplayer/Makefile.options
==============================================================================
--- head/multimedia/mplayer/Makefile.options	Mon Feb 17 22:19:02 2014	(r344826)
+++ head/multimedia/mplayer/Makefile.options	Mon Feb 17 22:34:40 2014	(r344827)
@@ -99,15 +99,11 @@ CONFIGURE_ARGS+=	--disable-tv-v4l1 \
 # Build system handling (including OPTIONS)
 # =========================================
 
-.if ${OSVERSION} < 802502
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-base_system_log2f
-.endif
-
 #On i386, gcc runs out of general purpose registers when
 #trying to compile a debug version with the default flags.
 .if ${PORT_OPTIONS:MDEBUG}
 WITH_DEBUG=	yes
-CONFIGURE_ARGS=+	--enable-debug
+CONFIGURE_ARGS+=	--enable-debug
 .if ${ARCH} == "i386"
 DEBUG_FLAGS=	-g -fomit-frame-pointer
 .endif

Modified: head/multimedia/mplayer/Makefile.shared
==============================================================================
--- head/multimedia/mplayer/Makefile.shared	Mon Feb 17 22:19:02 2014	(r344826)
+++ head/multimedia/mplayer/Makefile.shared	Mon Feb 17 22:34:40 2014	(r344827)
@@ -13,7 +13,7 @@ WRKSRC=		${WRKDIR}/mplayer-export-${MPLA
 
 PROJECTHOST=	bsdistfiles
 
-MAINTAINER?=	thomas.e.zander@googlemail.com
+MAINTAINER?=	riggs@FreeBSD.org
 
 LICENSE=	GPLv2
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402172234.s1HMYfmp085637>