From owner-svn-ports-all@FreeBSD.ORG Fri Jan 3 23:42:12 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 00619481; Fri, 3 Jan 2014 23:42:11 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id DFE8D1D67; Fri, 3 Jan 2014 23:42:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s03NgBKG006702; Fri, 3 Jan 2014 23:42:11 GMT (envelope-from danilo@svn.freebsd.org) Received: (from danilo@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s03NgBNb006698; Fri, 3 Jan 2014 23:42:11 GMT (envelope-from danilo@svn.freebsd.org) Message-Id: <201401032342.s03NgBNb006698@svn.freebsd.org> From: Danilo Egea Gondolfo Date: Fri, 3 Jan 2014 23:42:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r338597 - 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-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Jan 2014 23:42:12 -0000 Author: danilo Date: Fri Jan 3 23:42:10 2014 New Revision: 338597 URL: http://svnweb.freebsd.org/changeset/ports/338597 Log: - Update from 5.2.6 to 5.2.7 - Add stage support while here - Convert some "if's" to options helpers PR: ports/185331 Submitted by: KATO Tsuguru Modified: head/editors/mp/Makefile head/editors/mp/distinfo head/editors/mp/files/patch-mpdn__config.sh (contents, props changed) head/editors/mp/pkg-plist (contents, props changed) Modified: head/editors/mp/Makefile ============================================================================== --- head/editors/mp/Makefile Fri Jan 3 23:22:48 2014 (r338596) +++ head/editors/mp/Makefile Fri Jan 3 23:42:10 2014 (r338597) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mp -PORTVERSION= 5.2.6 +PORTVERSION= 5.2.7 CATEGORIES= editors MASTER_SITES= http://triptico.com/download/mp/ @@ -15,26 +15,26 @@ OPTIONS_DEFINE= NLS PCRE DOCS OPTIONS_RADIO= GUI OPTIONS_RADIO_GUI= GTK3 GTK2 QT4 OPTIONS_DEFAULT= PCRE +OPTIONS_SUB= yes USES= iconv ncurses HAS_CONFIGURE= yes CONFIGURE_SCRIPT= config.sh CONFIGURE_ARGS= --prefix=${PREFIX} --without-win32 --without-kde4 -MAN1= mp-5.1 - DATADIR= ${PREFIX}/share/mp-5 -NO_STAGE= yes -.include +NLS_USES= gettext +NLS_CONFIGURE_WITH= gettext -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+= --without-gettext -PLIST_SUB+= NLS="@comment " -.endif +PCRE_LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre +PCRE_CONFIGURE_WITH= pcre + +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 @@ -52,16 +52,7 @@ CONFOPT_GTK= 0 .endif .if ${PORT_OPTIONS:MQT4} -USE_QT4= corelib gui moc_build QT_NONSTANDARD= yes -CONFIGURE_ENV+= CPP="${CXX}" CCLINK="${CXX}" -.else -CONFIGURE_ARGS+= --without-qt4 -.endif - -.if ${PORT_OPTIONS:MPCRE} -LIB_DEPENDS+= pcre:${PORTSDIR}/devel/pcre -CONFIGURE_ARGS+= --with-pcre .endif .include @@ -71,39 +62,43 @@ BROKEN= Does not compile on ia64, power .endif post-patch: - @${REINPLACE_CMD} -e 's|||g' ${WRKSRC}/${i} + @${REINPLACE_CMD} -e \ + 's|||g' ${WRKSRC}/${i} .endfor do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/mp-5 ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/mpsl/mpsl2 ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/mp-5.1 ${MANPREFIX}/man/man1 - @${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/mp_*.mpsl ${DATADIR} - @${MKDIR} ${DATADIR}/lang - ${INSTALL_DATA} ${WRKSRC}/lang/*.mpsl ${DATADIR}/lang + (cd ${WRKSRC} && ${INSTALL_PROGRAM} mp-5 ${STAGEDIR}${PREFIX}/bin) + (cd ${WRKSRC}/mpsl && ${INSTALL_PROGRAM} mpsl ${STAGEDIR}${PREFIX}/bin) + (cd ${WRKSRC} && ${INSTALL_MAN} mp-5.1 ${STAGEDIR}${MANPREFIX}/man/man1) + @${MKDIR} ${STAGEDIR}${DATADIR} + (cd ${WRKSRC} && ${INSTALL_DATA} mp_*.mpsl ${STAGEDIR}${DATADIR}) + @${MKDIR} ${STAGEDIR}${DATADIR}/lang + (cd ${WRKSRC}/lang && ${INSTALL_DATA} *.mpsl ${STAGEDIR}${DATADIR}/lang) .if ${PORT_OPTIONS:MNLS} .for lang in de es it nl ru sv - @${MKDIR} ${PREFIX}/share/locale/${lang}/LC_MESSAGES - ${INSTALL_DATA} ${WRKSRC}/po/${lang}.mo \ - ${PREFIX}/share/locale/${lang}/LC_MESSAGES/minimum-profit.mo + @${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/${lang}/LC_MESSAGES + (cd ${WRKSRC}/po && ${INSTALL_DATA} ${lang}.mo \ + ${STAGEDIR}${PREFIX}/share/locale/${lang}/LC_MESSAGES/minimum-profit.mo) .endfor .endif -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for doc in AUTHORS README RELEASE_NOTES mp_templates.sample doc/*.* - ${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} ${doc} ${STAGEDIR}${DOCSDIR}) .endfor -.endif .include Modified: head/editors/mp/distinfo ============================================================================== --- head/editors/mp/distinfo Fri Jan 3 23:22:48 2014 (r338596) +++ head/editors/mp/distinfo Fri Jan 3 23:42:10 2014 (r338597) @@ -1,2 +1,2 @@ -SHA256 (mp-5.2.6.tar.gz) = e516a02ae2539bb72c3fcf64a7cbc9e1f3108fbb526500d22da63a11afcd3d59 -SIZE (mp-5.2.6.tar.gz) = 546674 +SHA256 (mp-5.2.7.tar.gz) = 3721eaaf5c1fa327ea597d599cab14b728b73c62b56df14a42eca0c7908218f3 +SIZE (mp-5.2.7.tar.gz) = 552142 Modified: head/editors/mp/files/patch-mpdn__config.sh ============================================================================== --- head/editors/mp/files/patch-mpdn__config.sh Fri Jan 3 23:22:48 2014 (r338596) +++ head/editors/mp/files/patch-mpdn__config.sh Fri Jan 3 23:42:10 2014 (r338597) @@ -23,8 +23,8 @@ else # try now with -liconv - TMP_LDFLAGS="-liconv" -+ TMP_CFLAGS="-I%%LOCALBASE%%/include" -+ TMP_LDFLAGS="-L%%LOCALBASE%%/lib -liconv" ++ TMP_CFLAGS="-I%%ICONV_PREFIX%%/include" ++ TMP_LDFLAGS="-L%%ICONV_PREFIX%%/lib %%ICONV_LIB%%" - $CC .tmp.c $TMP_LDFLAGS -o .tmp.o 2>> .config.log + $CC $TMP_CFLAGS .tmp.c $TMP_LDFLAGS -o .tmp.o 2>> .config.log Modified: head/editors/mp/pkg-plist ============================================================================== --- head/editors/mp/pkg-plist Fri Jan 3 23:22:48 2014 (r338596) +++ head/editors/mp/pkg-plist Fri Jan 3 23:42:10 2014 (r338597) @@ -1,5 +1,6 @@ bin/mp-5 -bin/mpsl2 +bin/mpsl +man/man1/mp-5.1.gz %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES