head 1.8; access; symbols pkgsrc-2014Q3:1.7.0.2 pkgsrc-2014Q3-base:1.7 pkgsrc-2014Q2:1.5.0.2 pkgsrc-2014Q2-base:1.5 pkgsrc-2014Q1:1.2.0.2 pkgsrc-2014Q1-base:1.2; locks; strict; comment @# @; 1.8 date 2014.10.01.09.44.26; author wiz; state dead; branches; next 1.7; commitid 5rcKwZc8BwlwStSx; 1.7 date 2014.08.23.05.24.25; author wiz; state Exp; branches; next 1.6; commitid iQ95xP95P1Y2HrNx; 1.6 date 2014.07.12.14.34.37; author wiz; state Exp; branches; next 1.5; commitid xXzlHizB8TSu56Ix; 1.5 date 2014.05.27.18.10.52; author wiz; state Exp; branches; next 1.4; commitid jMzItAcpKcLmLcCx; 1.4 date 2014.05.09.07.37.00; author wiz; state Exp; branches; next 1.3; commitid wfzXpL2biguCPPzx; 1.3 date 2014.05.05.00.47.45; author ryoon; state Exp; branches; next 1.2; commitid wo9GYk7Q0VneHhzx; 1.2 date 2014.02.24.21.04.41; author wiz; state Exp; branches; next 1.1; commitid TNI60e2GmkwbGoqx; 1.1 date 2014.02.24.12.24.11; author wiz; state Exp; branches; next ; commitid F00J9LJr9OVMNlqx; desc @@ 1.8 log @Remove meld-devel, meld is now newer again. @ text @# $NetBSD: Makefile,v 1.7 2014/08/23 05:24:25 wiz Exp $ DISTNAME= meld-3.11.3 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME:=sources/meld/3.11/} EXTRACT_SUFX= .tar.xz MAINTAINER= wiz@@NetBSD.org HOMEPAGE= http://meldmerge.org/ COMMENT= Visual diff and merge tool (GTK3 version) LICENSE= gnu-gpl-v2 BUILD_DEPENDS+= itstool-[0-9]*:../../textproc/itstool DEPENDS+= ${PYPKGPREFIX}-gobject3>=3.8:../../devel/py-gobject3 DEPENDS+= gsettings-desktop-schemas-[0-9]*:../../sysutils/gsettings-desktop-schemas USE_TOOLS+= intltool msgfmt PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # not yet ported as of 3.11; 3.12 will probably require 33+ SUBST_CLASSES+= man SUBST_FILES.man= setup.py SUBST_SED.man+= -e "s,share/man/man1,${PKGMANDIR}/man1," SUBST_STAGE.man= pre-build SUBST_MESSAGE.man= Fixing man page installation path. .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../lang/python/distutils.mk" BUILDLINK_API_DEPENDS.glib2+= glib2>=2.34.0 .include "../../devel/glib2/buildlink3.mk" .include "../../devel/glib2/schemas.mk" BUILDLINK_API_DEPENDS.gtk3+= gtk3+>=3.6 .include "../../x11/gtk3/buildlink3.mk" BUILDLINK_API_DEPENDS.gtksourceview3+= gtksourceview3>=3.6 .include "../../x11/gtksourceview3/buildlink3.mk" .include "../../mk/bsd.pkg.mk" @ 1.7 log @Update to 3.11.3: 2014-08-23 meld 3.11.3 ====================== Features: * Manually handle app menu fallback for non-Gnome shells (Kai Willadsen) * Save and restore window maximisation state (Kai Willadsen) Fixes: * Add missing/incomplete "Language" entries (Lars Wendler) * Miscellaneous code cleanups (Christoph Brill) * Handle broken locale settings better (Kai Willadsen) * Fix size allocation issues in preferences UI (Kai Willadsen) * Update shebang for environments with Python 3 as default (Kai Willadsen) Translations: * Daniel Mustieles (es) * Marek Černocký (cs) * Piotr Drąg (pl) * Rafael Ferreira (pt_BR) @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.6 2014/07/12 14:34:37 wiz Exp $ @ 1.6 log @Update to 3.11.2: 2014-7-12 meld 3.11.2 ===================== Features: * File and folder comparison panes can now be resized (Marco Brito) * Folder comparisons now support scrolling between chunks using the mouse wheel in the link map, like file comparisons (Kai Willadsen) Fixes: * Don't draw spurious actions for equal chunks (Kai Willadsen) * Remove default sourceview behaviour for Alt+Left/Right (Kai Willadsen) * Fix storing translated column names in configuration (Kai Willadsen) * Several fixes for multiple windows in single-instance handling: * Resolve relative paths relative to the correct instance (Kai Willadsen) * Don't create windows in the original instance when the calling instance errors out (Kai Willadsen) * Raise the correct window for new windows in the same instance (Kai Willadsen) * Exit correctly for command line errors in the calling instance (Kai Willadsen) * Fix display of unicode paths in repositories (Kai Willadsen) * Fix handling of unicode paths in recent files store (Kai Willadsen) * Improve behaviour of Open External action, and handle spaces in filenames for the custom editor option (Kai Willadsen) * Improve support custom installation prefixes (Kai Willadsen) Translations: * Benjamin Steinwender (de) * Daniel Mustieles (es) * Lasse Liehu (fi) * Marek Černocký (cs) * Matej Urbančič (sl) * Piotr Drąg (pl) * Rafael Ferreira (pt_BR) * Yuri Myasoedov (ru) @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.5 2014/05/27 18:10:52 wiz Exp $ d3 1 a3 1 DISTNAME= meld-3.11.2 @ 1.5 log @Update to 3.11.1: 2014-5-26 meld 3.11.1 ===================== Features: * New (alpha) infrastructure for stand-alone Windows builds (Kai Willadsen) * Display renames and metadata in Bazaar repositories (Louis des Landes) * Improved tab labels in version control comparisons (Kai Willadsen) * New merge-order preference to accompany comparison-order (Kai Willadsen) * Added a prompt to mark a conflict as resolved from file comparison (Kai Willadsen) Fixes: * Fix filtering for shallow folder comparisons (Casey) * Several install and distribution fixes (Kai Willadsen) * Sundry bug fixes (Dominique Leuenberger, Thomas Klausner, Louis des Landes, Kai Willadsen) Translations: * Andika Triwidada (id) * Benjamin Steinwender (de) * Daniel Mustieles (es) * Facundo Dario Illanes (es) * Inaki Larranaga Murgoitio (eu) * Jiri Grönroos (fi) * Marek Černocký (cs) * Milo Casagrande (it) * Piotr Drąg (pl) * Rafael Ferreira (pt_BR) * Tom Tryfonidis (el) * Ville-Pekka Vainio (fi) * Мирослав Николић (sr, sr@@latin) @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.4 2014/05/09 07:37:00 wiz Exp $ d3 1 a3 1 DISTNAME= meld-3.11.1 @ 1.4 log @Mark packages that are not ready for python-3.3 also not ready for 3.4, until proven otherwise. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.3 2014/05/05 00:47:45 ryoon Exp $ d3 1 a3 2 DISTNAME= meld-3.11.0 PKGREVISION= 2 @ 1.3 log @Recursive revbump from x11/pixman Fix PR pkg/48777 @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.2 2014/02/24 21:04:41 wiz Exp $ d20 1 a20 1 PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 3.11; 3.12 will probably require 33+ @ 1.2 log @Mark as not ready for python-3.x, as discussed with upstream. 3.12 will probably be python-3.x only. Bump PKGREVISION. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.1 2014/02/24 12:24:11 wiz Exp $ d4 1 a4 1 PKGREVISION= 1 @ 1.1 log @Import meld-3.11.0 as devel/meld-devel. Meld is a visual diff and merge tool. You can compare two or three files and edit them in place (diffs update dynamically). You can compare two or three folders and launch file comparisons. You can browse and view a working copy from popular version control systems such such as CVS, Subversion, Bazaar-ng and Mercurial. This is the development version based on GTK 3. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.48 2014/01/27 20:04:40 wiz Exp $ d4 1 d20 2 @