From owner-svn-ports-head@freebsd.org Fri Oct 16 16:51:14 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 870EBA163C0; Fri, 16 Oct 2015 16:51:14 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 430951C4B; Fri, 16 Oct 2015 16:51:14 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9GGpDc6096216; Fri, 16 Oct 2015 16:51:13 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9GGpCx6096211; Fri, 16 Oct 2015 16:51:12 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201510161651.t9GGpCx6096211@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Fri, 16 Oct 2015 16:51:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r399491 - in head/editors/mp: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Oct 2015 16:51:14 -0000 Author: marino Date: Fri Oct 16 16:51:12 2015 New Revision: 399491 URL: https://svnweb.freebsd.org/changeset/ports/399491 Log: editors/mp: Upgrade version 5.2.9 => 5.2.10 PR: 201840 Submitted by: ports fury Modified: head/editors/mp/Makefile head/editors/mp/distinfo head/editors/mp/files/patch-mpdn__config.sh head/editors/mp/pkg-plist Modified: head/editors/mp/Makefile ============================================================================== --- head/editors/mp/Makefile Fri Oct 16 16:44:03 2015 (r399490) +++ head/editors/mp/Makefile Fri Oct 16 16:51:12 2015 (r399491) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mp -PORTVERSION= 5.2.9 +PORTVERSION= 5.2.10 CATEGORIES= editors MASTER_SITES= http://triptico.com/download/mp/ @@ -10,6 +10,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Programming text editor LICENSE= GPLv2 # (or later) +LICENSE_FILE= ${WRKSRC}/COPYING USES= iconv ncurses HAS_CONFIGURE= yes @@ -18,40 +19,48 @@ CONFIGURE_ARGS= --prefix=${PREFIX} --wit DATADIR= ${PREFIX}/share/mp-5 -OPTIONS_DEFINE= NLS PCRE DOCS -OPTIONS_RADIO= GUI -OPTIONS_RADIO_GUI= GTK3 GTK2 QT4 +OPTIONS_DEFINE= DOCS NLS PCRE +OPTIONS_RADIO= GUI +OPTIONS_RADIO_GUI= GTK2 GTK3 QT4 OPTIONS_DEFAULT= PCRE -OPTIONS_SUB= yes +OPTIONS_SUB= yes -NLS_USES= gettext +NLS_USES= gettext NLS_CONFIGURE_WITH= gettext - +GTK2_USE= gnome=gtk20 +GTK3_USE= gnome=gtk30 PCRE_LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre PCRE_CONFIGURE_WITH= pcre - -QT4_USE= QT4=corelib,gui,moc_build +QT4_USE= qt4=corelib,gui,moc_build QT4_CONFIGURE_ENV= CPP="${CXX}" CCLINK="${CXX}" QT4_CONFIGURE_WITH= qt4 .include -.if ${PORT_OPTIONS:MGTK3} -USE_GNOME+= gtk30 -CONFOPT_GTK= 3 +.if ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MGTK3} || ${PORT_OPTIONS:MQT4} +USES+= pkgconfig +PLIST_SUB+= GUI="" +.else +PLIST_SUB+= GUI="@comment " +.endif + +.if ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MGTK3} +DESKTOP_ENTRIES="Minimum Profit" "" "mp-5" "mp" "Develpment;TextEditor;GTK;" "" +.else +CONFIGURE_ARGS+= --without-gtk +CONFOPT_GTK= 0 .endif .if ${PORT_OPTIONS:MGTK2} -USE_GNOME+= gtk20 CONFOPT_GTK= 2 .endif -.if empty(PORT_OPTIONS:MGTK3) && empty(PORT_OPTIONS:MGTK2) -CONFIGURE_ARGS+= --without-gtk -CONFOPT_GTK= 0 +.if ${PORT_OPTIONS:MGTK3} +CONFOPT_GTK= 3 .endif .if ${PORT_OPTIONS:MQT4} +DESKTOP_ENTRIES="Minimum Profit" "" "mp-5" "mp" "Development;TextEditor;Qt;" "" QT_NONSTANDARD= yes .endif @@ -60,7 +69,6 @@ post-patch: 's|> config.h else # try now with -lintl @@ -18,7 +18,7 @@ echo "$TMP_LDFLAGS" >> config.ldflags else echo "No" -@@ -342,13 +344,15 @@ +@@ -403,13 +405,15 @@ else echo "#define CONFOPT_ICONV 1" >> config.h else # try now with -liconv Modified: head/editors/mp/pkg-plist ============================================================================== --- head/editors/mp/pkg-plist Fri Oct 16 16:44:03 2015 (r399490) +++ head/editors/mp/pkg-plist Fri Oct 16 16:51:12 2015 (r399491) @@ -6,8 +6,6 @@ man/man1/mp-5.1.gz %%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES %%PORTDOCS%%%%DOCSDIR%%/mp_actions.html %%PORTDOCS%%%%DOCSDIR%%/mp_actions.txt -%%PORTDOCS%%%%DOCSDIR%%/mp_api.html -%%PORTDOCS%%%%DOCSDIR%%/mp_api.txt %%PORTDOCS%%%%DOCSDIR%%/mp_configuration.html %%PORTDOCS%%%%DOCSDIR%%/mp_configuration.txt %%PORTDOCS%%%%DOCSDIR%%/mp_cookbook.html @@ -62,3 +60,4 @@ man/man1/mp-5.1.gz %%DATADIR%%/mp_tui.mpsl %%DATADIR%%/mp_vcs.mpsl %%DATADIR%%/mp_writing.mpsl +%%GUI%%share/pixmaps/mp.png