Revision: 25316
http://sourceforge.net/p/gar/code/25316
Author: dmichelsen
Date: 2015-10-26 12:43:13 +0000 (Mon, 26 Oct 2015)
Log Message:
-----------
meld/trunk: Update to 3.14.1
Modified Paths:
--------------
csw/mgar/pkg/meld/trunk/Makefile
csw/mgar/pkg/meld/trunk/checksums
Modified: csw/mgar/pkg/meld/trunk/Makefile
===================================================================
--- csw/mgar/pkg/meld/trunk/Makefile 2015-10-26 12:41:30 UTC (rev 25315)
+++ csw/mgar/pkg/meld/trunk/Makefile 2015-10-26 12:43:13 UTC (rev 25316)
@@ -2,7 +2,8 @@
# TODO (release-critical prefixed with !, non release-critical with *)
#
NAME = meld
-VERSION = 1.8.6
+VERSION = 3.14.1
+CATEGORIES = python
GARTYPE = v2
DESCRIPTION = Visual diff and merge tool
@@ -14,43 +15,37 @@
systems.
endef
-MASTER_SITES = http://ftp.gnome.org/pub/GNOME/sources/meld/$(basename
$(VERSION))/
+MASTER_SITES = https://download.gnome.org/sources/meld/$(shell echo $(VERSION)
| cut -d. -f1).$(shell echo $(VERSION) | cut -d. -f2)/
DISTFILES = $(DISTNAME).tar.xz
-# PATCHFILES += 0001-Allow-to-use-a-different-install-utility.patch
-PATCHFILES += 0001-Use-conditionals-for-installation-places.patch
+VENDOR_URL = http://meldmerge.org
-REINPLACEMENTS += python
-REINPLACE_MATCH_python = \#!.*python.*
-REINPLACE_WITH_python = \#!$(bindir)/python
-REINPLACE_FILES_python += bin/meld
+BUILD_DEP_PKGS += CSWitstool
-CONFIGURE_SCRIPTS =
-BUILD_SCRIPTS =
-INSTALL_SCRIPTS = meld
-TEST_SCRIPTS =
+PACKAGES += CSWmeld
+SPKG_DESC_CSWmeld = Visual diff and merge tool
+# PKGFILES is catchall
+ARCHALL_CSWmeld = 1
+RUNTIME_DEP_PKGS_CSWmeld += CSWpy-gtk
+RUNTIME_DEP_PKGS_CSWmeld += CSWpy-gobject
-EXTRA_MERGE_EXCLUDE_FILES = .*\.py[co]
+# This is ok as it is an addition to /opt/csw/share
+CHECKPKG_OVERRIDES_CSWmeld +=
file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/meld/conf.py
-ARCHALL_CSWmeld = 1
-RUNTIME_DEP_PKGS_CSWmeld += CSWpy-gtk CSWpy-gobject
-
CHECKPKG_OVERRIDES_CSWmeld += surplus-dependency|CSWpy-gobject
CHECKPKG_OVERRIDES_CSWmeld += surplus-dependency|CSWpy-gtk
CHECKPKG_OVERRIDES_CSWmeld += pkgname-does-not-start-with-CSWpy-
CHECKPKG_OVERRIDES_CSWmeld += catalogname-does-not-start-with-py_
-include gar/category.mk
+MODULATIONS_PYTHON_VERSION = 2_7
-install-meld:
- cd $(WORKSRC) && gmake \
- prefix=$(prefix) \
- localstatedir=$(localstatedir) \
- sysconfdir=$(sysconfdir) \
- DESTDIR=$(DESTDIR) \
- libdir_=$(libdir)/python/site-packages \
- install
- @$(MAKECOOKIE)
+REINPLACE_USRLOCAL += meld/conf.py
-# msgfmt, install
-PATH := /opt/csw/gnu:$(PATH)
+# For msgfmt, install
+BUILD_ENV_PATH = /opt/csw/gnu:$(PATH)
+INSTALL_ENV_PATH = /opt/csw/gnu:$(PATH)
+
+# This file is also in CSWglib2
+EXTRA_MERGE_EXCLUDE_FILES += $(prefix)/share/glib-2.0/schemas/gschemas.compiled
+
+include gar/category.mk
Modified: csw/mgar/pkg/meld/trunk/checksums
===================================================================
--- csw/mgar/pkg/meld/trunk/checksums 2015-10-26 12:41:30 UTC (rev 25315)
+++ csw/mgar/pkg/meld/trunk/checksums 2015-10-26 12:43:13 UTC (rev 25316)
@@ -1 +1 @@
-872e6c28a7913f1eab1cacf27d6d1e5a meld-1.8.6.tar.xz
+820c5c4dc59faa51fa65c47b0fef6247 meld-3.14.1.tar.xz
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
