From owner-svn-ports-all@FreeBSD.ORG  Mon Mar 25 06:06:57 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 13C0E90A;
 Mon, 25 Mar 2013 06:06:57 +0000 (UTC)
 (envelope-from miwi@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id EC7CEC38;
 Mon, 25 Mar 2013 06:06:56 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2P66u0Z091771;
 Mon, 25 Mar 2013 06:06:56 GMT (envelope-from miwi@svn.freebsd.org)
Received: (from miwi@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2P66uVi091769;
 Mon, 25 Mar 2013 06:06:56 GMT (envelope-from miwi@svn.freebsd.org)
Message-Id: <201303250606.r2P66uVi091769@svn.freebsd.org>
From: Martin Wilke <miwi@FreeBSD.org>
Date: Mon, 25 Mar 2013 06:06:56 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r315195 - head/editors/mp
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 25 Mar 2013 06:06:57 -0000

Author: miwi
Date: Mon Mar 25 06:06:56 2013
New Revision: 315195
URL: http://svnweb.freebsd.org/changeset/ports/315195

Log:
  - Update to version 5.2.5
  
  PR:		177249
  Submitted by:	Ports Fury

Modified:
  head/editors/mp/Makefile
  head/editors/mp/distinfo   (contents, props changed)

Modified: head/editors/mp/Makefile
==============================================================================
--- head/editors/mp/Makefile	Mon Mar 25 06:06:11 2013	(r315194)
+++ head/editors/mp/Makefile	Mon Mar 25 06:06:56 2013	(r315195)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mp
-PORTVERSION=	5.2.4
-PORTREVISION=	1
+PORTVERSION=	5.2.5
 CATEGORIES=	editors
 MASTER_SITES=	http://triptico.com/download/mp/
 
@@ -14,7 +13,7 @@ LICENSE=	GPLv2 # (or later)
 
 OPTIONS_DEFINE=	NLS PCRE DOCS
 OPTIONS_RADIO=	GUI
-OPTIONS_RADIO_GUI=	GTK2 QT4
+OPTIONS_RADIO_GUI=	GTK3 GTK2 QT4
 OPTIONS_DEFAULT=	PCRE
 
 USE_NCURSES=	yes
@@ -37,10 +36,19 @@ CONFIGURE_ARGS+=	--without-gettext
 PLIST_SUB+=	NLS="@comment "
 .endif
 
+.if ${PORT_OPTIONS:MGTK3}
+USE_GNOME+=	gtk30
+CONFOPT_GTK=	3
+.endif
+
 .if ${PORT_OPTIONS:MGTK2}
 USE_GNOME+=	gtk20
-.else
+CONFOPT_GTK=	2
+.endif
+
+.if empty(PORT_OPTIONS:MGTK3) && empty(PORT_OPTIONS:MGTK2)
 CONFIGURE_ARGS+=	--without-gtk
+CONFOPT_GTK=	0
 .endif
 
 .if ${PORT_OPTIONS:MQT4}
@@ -56,14 +64,20 @@ LIB_DEPENDS+=	pcre:${PORTSDIR}/devel/pcr
 CONFIGURE_ARGS+=	--with-pcre
 .endif
 
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
+BROKEN=		Does not compile on ia64, powerpc, or sparc64
+.endif
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|<ncursesw/|<|g ; \
-		 s|-I/usr/local/include||g ; \
-		 s|-L/usr/local/lib||g ; \
-		 /gtk+/s|3.0|2.0|g ; \
-		 /OK/s|3.0|2.0|g ; \
-		 /CONFOPT_GTK/s|3|2|g ; \
-		 s|-lX11||g' ${WRKSRC}/config.sh
+	@${REINPLACE_CMD} -e 's|<ncursesw/|<| ; \
+		 s|-I/usr/local/include|| ; \
+		 s|-L/usr/local/lib|| ; \
+		 s|-lX11|| ; \
+		 /gtk+/s|3.0|${CONFOPT_GTK}.0| ; \
+		 /OK/s|3.0|${CONFOPT_GTK}.0| ; \
+		 /CONFOPT_GTK/s|3|${CONFOPT_GTK}|' ${WRKSRC}/config.sh
 	@${REINPLACE_CMD} -e 's|<ncursesw/|<|g' ${WRKSRC}/mpv_curses.c
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/mpdm/config.sh
 .for i in mpdm/mpdm.h mpdm/mpdm_s.c mpsl/mpsl_d.c
@@ -87,15 +101,9 @@ do-install:
 .endif
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
-.for file in AUTHORS README RELEASE_NOTES mp_templates.sample doc/*.*
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.for doc in AUTHORS README RELEASE_NOTES mp_templates.sample doc/*.*
+	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
 .endfor
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
-BROKEN=		Does not compile on ia64, powerpc, or sparc64
-.endif
-
 .include <bsd.port.post.mk>

Modified: head/editors/mp/distinfo
==============================================================================
--- head/editors/mp/distinfo	Mon Mar 25 06:06:11 2013	(r315194)
+++ head/editors/mp/distinfo	Mon Mar 25 06:06:56 2013	(r315195)
@@ -1,2 +1,2 @@
-SHA256 (mp-5.2.4.tar.gz) = 958c0e01afedc8a21767174a23515710d1a9bb9195ec742a9e087a6b967f9af2
-SIZE (mp-5.2.4.tar.gz) = 544849
+SHA256 (mp-5.2.5.tar.gz) = 180a7639d94c903f5572e6a214ad264a8cb05634519a02d4cf4bfbc5385ad6c1
+SIZE (mp-5.2.5.tar.gz) = 546439