[csw-devel] SF.net SVN: gar:[17725] csw/mgar/pkg

wahwah at users.sourceforge.net wahwah at users.sourceforge.net
Tue Apr 17 18:40:49 CEST 2012 

Revision: 17725
          http://gar.svn.sourceforge.net/gar/?rev=17725&view=rev
Author:   wahwah
Date:     2012-04-17 16:40:49 +0000 (Tue, 17 Apr 2012)
Log Message:
-----------
meld/trunk: initial commit

Added Paths:
-----------
    csw/mgar/pkg/meld/
    csw/mgar/pkg/meld/Makefile
    csw/mgar/pkg/meld/branches/
    csw/mgar/pkg/meld/tags/
    csw/mgar/pkg/meld/trunk/
    csw/mgar/pkg/meld/trunk/Makefile
    csw/mgar/pkg/meld/trunk/checksums
    csw/mgar/pkg/meld/trunk/files/
    csw/mgar/pkg/meld/trunk/files/0001-Allow-to-use-a-different-install-utility.patch
    csw/mgar/pkg/meld/trunk/files/0001-Use-conditionals-for-installation-places.patch

Added: csw/mgar/pkg/meld/Makefile
===================================================================
--- csw/mgar/pkg/meld/Makefile	                        (rev 0)
+++ csw/mgar/pkg/meld/Makefile	2012-04-17 16:40:49 UTC (rev 17725)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*


Property changes on: csw/mgar/pkg/meld/trunk
___________________________________________________________________
Added: svn:ignore
   + cookies
download
work


Added: svn:externals
   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Added: csw/mgar/pkg/meld/trunk/Makefile
===================================================================
--- csw/mgar/pkg/meld/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/meld/trunk/Makefile	2012-04-17 16:40:49 UTC (rev 17725)
@@ -0,0 +1,59 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = meld
+VERSION = 1.5.4
+GARTYPE = v2
+CATEGORIES = apps
+
+DESCRIPTION = Visual diff and merge tool
+define BLURB
+  Long description
+endef
+
+MASTER_SITES = http://ftp.gnome.org/pub/GNOME/sources/meld/1.5/
+DISTFILES  = $(DISTNAME).tar.xz
+
+# PATCHFILES += 0001-Allow-to-use-a-different-install-utility.patch
+PATCHFILES += 0001-Use-conditionals-for-installation-places.patch
+
+CONFIGURE_SCRIPTS =
+BUILD_SCRIPTS =
+INSTALL_SCRIPTS = meld
+TEST_SCRIPTS =
+
+EXTRA_MERGE_EXCLUDE_FILES = .*\.py[co]
+
+ARCHALL_CSWmeld = 1
+RUNTIME_DEP_PKGS_CSWmeld += CSWpython
+
+CHECKPKG_OVERRIDES_CSWmeld += file-with-bad-content|/usr/local|root/opt/csw/bin/meld
+CHECKPKG_OVERRIDES_CSWmeld += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/meld/paths.py
+CHECKPKG_OVERRIDES_CSWmeld += file-with-bad-content|/usr/local|root/opt/csw/lib/meld/meld/paths.py
+CHECKPKG_OVERRIDES_CSWmeld += file-with-bad-content|/usr/local|root/opt/csw/share/omf/meld/meld-fr.omf
+CHECKPKG_OVERRIDES_CSWmeld += file-with-bad-content|/usr/local|root/opt/csw/share/omf/meld/meld-C.omf
+CHECKPKG_OVERRIDES_CSWmeld += file-with-bad-content|/usr/local|root/opt/csw/share/omf/meld/meld-es.omf
+CHECKPKG_OVERRIDES_CSWmeld += file-with-bad-content|/usr/local|root/var/opt/csw/lib/scrollkeeper/scrollkeeper_docs
+CHECKPKG_OVERRIDES_CSWmeld += file-with-bad-content|/usr/local|root/var/opt/csw/lib/scrollkeeper/fr/scrollkeeper_cl.xml
+CHECKPKG_OVERRIDES_CSWmeld += file-with-bad-content|/usr/local|root/var/opt/csw/lib/scrollkeeper/fr/scrollkeeper_extended_cl.xml
+CHECKPKG_OVERRIDES_CSWmeld += file-with-bad-content|/usr/local|root/var/opt/csw/lib/scrollkeeper/es/scrollkeeper_cl.xml
+CHECKPKG_OVERRIDES_CSWmeld += file-with-bad-content|/usr/local|root/var/opt/csw/lib/scrollkeeper/es/scrollkeeper_extended_cl.xml
+CHECKPKG_OVERRIDES_CSWmeld += file-with-bad-content|/usr/local|root/var/opt/csw/lib/scrollkeeper/C/scrollkeeper_extended_cl.xml
+CHECKPKG_OVERRIDES_CSWmeld += file-with-bad-content|/usr/local|root/var/opt/csw/lib/scrollkeeper/C/scrollkeeper_cl.xml
+CHECKPKG_OVERRIDES_CSWmeld += pkgname-does-not-start-with-CSWpy-
+CHECKPKG_OVERRIDES_CSWmeld += catalogname-does-not-start-with-py_
+
+include gar/category.mk
+
+install-meld:
+	cd $(WORKSRC) && gmake \
+		prefix=$(prefix) \
+		localstatedir=$(localstatedir) \
+		sysconfdir=$(sysconfdir) \
+		DESTDIR=$(DESTDIR) \
+		libdir_=$(libdir)/python/site-packages \
+		install
+	@$(MAKECOOKIE)
+
+# msgfmt, install
+PATH := /opt/csw/gnu:$(PATH)


Property changes on: csw/mgar/pkg/meld/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
   + Id

Added: csw/mgar/pkg/meld/trunk/checksums
===================================================================
--- csw/mgar/pkg/meld/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/meld/trunk/checksums	2012-04-17 16:40:49 UTC (rev 17725)
@@ -0,0 +1 @@
+2f3929551d876ff45acf21b2c1e3e71a  meld-1.5.4.tar.xz

Added: csw/mgar/pkg/meld/trunk/files/0001-Allow-to-use-a-different-install-utility.patch
===================================================================
--- csw/mgar/pkg/meld/trunk/files/0001-Allow-to-use-a-different-install-utility.patch	                        (rev 0)
+++ csw/mgar/pkg/meld/trunk/files/0001-Allow-to-use-a-different-install-utility.patch	2012-04-17 16:40:49 UTC (rev 17725)
@@ -0,0 +1,73 @@
+From b297bc4c5f1c87088840f18e0a128b6cb32825ad Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Tue, 17 Apr 2012 15:06:41 +0200
+Subject: [PATCH] Allow to use a different install utility
+
+---
+ Makefile |   30 +++++++++++++++---------------
+ 1 file changed, 15 insertions(+), 15 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 2dd6e7a..6ab615f 100644
+--- a/Makefile
++++ b/Makefile
+@@ -45,41 +45,41 @@ install: $(addsuffix .install,$(SPECIALS)) meld.desktop
+ 		$(DESTDIR)$(sharedir)/icons/hicolor/48x48/apps \
+ 		$(DESTDIR)$(sharedir)/icons/hicolor/scalable/apps \
+ 		$(DESTDIR)$(helpdir_)
+-	install -m 755 bin/meld.install \
++	$(INSTALL) -m 755 bin/meld.install \
+ 		$(DESTDIR)$(bindir)/meld
+-	install -m 644 meld/*.py \
++	$(INSTALL) -m 644 meld/*.py \
+ 		$(DESTDIR)$(libdir_)/meld
+-	install -m 644 meld/ui/*.py \
++	$(INSTALL) -m 644 meld/ui/*.py \
+ 		$(DESTDIR)$(libdir_)/meld/ui
+-	install -m 644 meld/util/*.py \
++	$(INSTALL) -m 644 meld/util/*.py \
+ 		$(DESTDIR)$(libdir_)/meld/util
+-	install -m 644 meld/vc/*.py \
++	$(INSTALL) -m 644 meld/vc/*.py \
+ 		$(DESTDIR)$(libdir_)/meld/vc
+-	install -m 644 meld/paths.py.install \
++	$(INSTALL) -m 644 meld/paths.py.install \
+ 		$(DESTDIR)$(libdir_)/meld/paths.py
+-	install -m 644 data/meld.desktop \
++	$(INSTALL) -m 644 data/meld.desktop \
+ 		$(DESTDIR)$(sharedir)/applications
+ 	$(PYTHON)    -c 'import compileall; compileall.compile_dir("$(DESTDIR)$(libdir_)",10,"$(libdir_)")'
+ 	$(PYTHON) -O -c 'import compileall; compileall.compile_dir("$(DESTDIR)$(libdir_)",10,"$(libdir_)")'
+-	install -m 644 \
++	$(INSTALL) -m 644 \
+ 		data/ui/*.ui \
+ 		$(DESTDIR)$(sharedir_)/ui
+-	install -m 644 \
++	$(INSTALL) -m 644 \
+ 		data/ui/*.xml \
+ 		$(DESTDIR)$(sharedir_)/ui
+-	install -m 644 \
++	$(INSTALL) -m 644 \
+ 		data/icons/*.xpm \
+ 		data/icons/*.png \
+ 		$(DESTDIR)$(sharedir_)/icons
+-	install -m 644 data/icons/hicolor/16x16/apps/meld.png \
++	$(INSTALL) -m 644 data/icons/hicolor/16x16/apps/meld.png \
+ 		$(DESTDIR)$(sharedir)/icons/hicolor/16x16/apps/meld.png
+-	install -m 644 data/icons/hicolor/22x22/apps/meld.png \
++	$(INSTALL) -m 644 data/icons/hicolor/22x22/apps/meld.png \
+ 		$(DESTDIR)$(sharedir)/icons/hicolor/22x22/apps/meld.png
+-	install -m 644 data/icons/hicolor/32x32/apps/meld.png \
++	$(INSTALL) -m 644 data/icons/hicolor/32x32/apps/meld.png \
+ 		$(DESTDIR)$(sharedir)/icons/hicolor/32x32/apps/meld.png
+-	install -m 644 data/icons/hicolor/48x48/apps/meld.png \
++	$(INSTALL) -m 644 data/icons/hicolor/48x48/apps/meld.png \
+ 		$(DESTDIR)$(sharedir)/icons/hicolor/48x48/apps/meld.png
+-	install -m 644 data/icons/hicolor/scalable/apps/meld.svg \
++	$(INSTALL) -m 644 data/icons/hicolor/scalable/apps/meld.svg \
+ 		$(DESTDIR)$(sharedir)/icons/hicolor/scalable/apps/meld.svg
+ 	$(MAKE) -C po install
+ 	$(MAKE) -C help install
+-- 
+1.7.10
+

Added: csw/mgar/pkg/meld/trunk/files/0001-Use-conditionals-for-installation-places.patch
===================================================================
--- csw/mgar/pkg/meld/trunk/files/0001-Use-conditionals-for-installation-places.patch	                        (rev 0)
+++ csw/mgar/pkg/meld/trunk/files/0001-Use-conditionals-for-installation-places.patch	2012-04-17 16:40:49 UTC (rev 17725)
@@ -0,0 +1,47 @@
+From 31e237b7e89875429013490c5750e86efdf7958e Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Tue, 17 Apr 2012 17:56:42 +0200
+Subject: [PATCH] Use conditionals for installation places.
+
+---
+ INSTALL |   24 ++++++++++++------------
+ 1 file changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/INSTALL b/INSTALL
+index 30f150a..fe65279 100644
+--- a/INSTALL
++++ b/INSTALL
+@@ -34,18 +34,18 @@
+ ## If you need to, you can customise the install paths used here:
+ ##
+ PYTHON ?= python
+-prefix := /usr/local
+-bindir := $(prefix)/bin
+-libdir := $(prefix)/lib
+-docdir := $(prefix)/share/doc
+-sharedir := $(prefix)/share
+-helpdir := $(sharedir)/gnome/help
+-localedir := $(prefix)/share/locale
+-localstatedir := $(prefix)/var
+-libdir_ := $(libdir)/meld
+-docdir_ := $(docdir)/meld
+-sharedir_ := $(sharedir)/meld
+-helpdir_ := $(helpdir)/meld
++prefix ?= /usr/local
++bindir ?= $(prefix)/bin
++libdir ?= $(prefix)/lib
++docdir ?= $(prefix)/share/doc
++sharedir ?= $(prefix)/share
++helpdir ?= $(sharedir)/gnome/help
++localedir ?= $(prefix)/share/locale
++localstatedir ?= $(prefix)/var
++libdir_ ?= $(libdir)/meld
++docdir_ ?= $(docdir)/meld
++sharedir_ ?= $(sharedir)/meld
++helpdir_ ?= $(helpdir)/meld
+ ## 
+ ## Python Version
+ ## **************
+-- 
+1.7.10
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

More information about the devel mailing list