From owner-svn-ports-head@FreeBSD.ORG Thu Jan 23 20:55:24 2014 Return-Path: Delivered-To: svn-ports-head@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 F0875281; Thu, 23 Jan 2014 20:55:24 +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 C31EE19E3; Thu, 23 Jan 2014 20:55:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0NKtOd1024781; Thu, 23 Jan 2014 20:55:24 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0NKtOr8024778; Thu, 23 Jan 2014 20:55:24 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201401232055.s0NKtOr8024778@svn.freebsd.org> From: Pawel Pekala Date: Thu, 23 Jan 2014 20:55:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r340861 - head/textproc/meld 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.17 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: Thu, 23 Jan 2014 20:55:25 -0000 Author: pawel Date: Thu Jan 23 20:55:24 2014 New Revision: 340861 URL: http://svnweb.freebsd.org/changeset/ports/340861 QAT: https://qat.redports.org/buildarchive/r340861/ Log: - Update to version 1.8.4 - Fix shebang line - Remove cruft not needed when staged Fixes: * Fix crash when scanning CVS-only folders (Kai Willadsen) * Fix crash on Windows when missing cdll.intl (Bartosz Dziewonski) * Fix crash with Italian (it_IT.utf8) locale (Balint Reczey) Translations: * Andika Triwidada (id) * Benjamin Steinwender (de) * Daniel Mustieles (es) Modified: head/textproc/meld/Makefile head/textproc/meld/distinfo Modified: head/textproc/meld/Makefile ============================================================================== --- head/textproc/meld/Makefile Thu Jan 23 20:46:14 2014 (r340860) +++ head/textproc/meld/Makefile Thu Jan 23 20:55:24 2014 (r340861) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= meld -PORTVERSION= 1.8.3 +PORTVERSION= 1.8.4 CATEGORIES= textproc devel python MASTER_SITES= GNOME @@ -13,7 +13,10 @@ LICENSE= GPLv2 USE_XZ= yes USE_GNOME= pygnome2 -USES= desktop-file-utils gmake shared-mime-info +USES= desktop-file-utils gmake shared-mime-info shebangfix +python_OLD_CMD= ${SETENV} python +python_CMD= ${PYTHON_CMD} +SHEBANG_FILES= bin/meld USE_PYTHON= 2 MAKE_ARGS= prefix=${PREFIX} INSTALLS_ICONS= yes @@ -25,21 +28,12 @@ OPTIONS_SUB= yes NLS_USES= gettext PYGNOMEDESKTOP_DESC= Code syntax highlighting (many dependencies) -PYGNOMEDESKTOP_USE= gnome=pygnomedesktop - -.include +PYGNOMEDESKTOP_USE= GNOME=pygnomedesktop post-patch: - @${REINPLACE_CMD} '/docdir_/d' ${WRKSRC}/Makefile -.if !${PORT_OPTIONS:MNLS} - @${REINPLACE_CMD} '/po install/d' ${WRKSRC}/Makefile -.endif - -.for file in help/C/Makefile help/es/Makefile help/fr/Makefile - @${REINPLACE_CMD} -e \ - 's|$$(localstatedir)/lib/scrollkeeper|/var/db/scrollkeeper|g ; \ - s|^LANG :=|LANG_ :=|g ; \ - s|$$(LANG)|$$(LANG_)|g' ${WRKSRC}/${file} -.endfor + @${REINPLACE_CMD} -e 's|^LANG :=|LANG_ :=|g ; s|$$(LANG)|$$(LANG_)|g ; \ + s|$$(localstatedir)/lib/scrollkeeper|/var/db/scrollkeeper|g' \ + ${WRKSRC}/help/C/Makefile ${WRKSRC}/help/es/Makefile \ + ${WRKSRC}/help/fr/Makefile .include Modified: head/textproc/meld/distinfo ============================================================================== --- head/textproc/meld/distinfo Thu Jan 23 20:46:14 2014 (r340860) +++ head/textproc/meld/distinfo Thu Jan 23 20:55:24 2014 (r340861) @@ -1,2 +1,2 @@ -SHA256 (meld-1.8.3.tar.xz) = 42ba344cacfe4c5afaf5db8a43df2c877ec9e5b8e66621b92f2f9e0dcbf6fed7 -SIZE (meld-1.8.3.tar.xz) = 415704 +SHA256 (meld-1.8.4.tar.xz) = b46e5786343f236d203037a7ace8f1b28145a51a3f84fa527efcf62f47b5b8de +SIZE (meld-1.8.4.tar.xz) = 421332