summaryrefslogtreecommitdiff
path: root/devel/meld
diff options
context:
space:
mode:
authorabs <abs>2008-07-21 07:53:13 +0000
committerabs <abs>2008-07-21 07:53:13 +0000
commit28e58704173a65d74fbdcd2bd4cfea6f2a37c5e7 (patch)
tree59dcc78f5eb3b659d4363010a1f2d0468b3daa7c /devel/meld
parentecdf5a5339614a66f3cc8649c8ac8b044cd4d4ed (diff)
downloadpkgsrc-28e58704173a65d74fbdcd2bd4cfea6f2a37c5e7.tar.gz
update meld to 1.2nb1:
Remove part of patch-aa so the installdir for help/fr/GNUmakefile is still created.
Diffstat (limited to 'devel/meld')
-rw-r--r--devel/meld/Makefile3
-rw-r--r--devel/meld/distinfo4
-rw-r--r--devel/meld/patches/patch-aa7
3 files changed, 8 insertions, 6 deletions
diff --git a/devel/meld/Makefile b/devel/meld/Makefile
index 0ad7d67880b..3edcd00b5c5 100644
--- a/devel/meld/Makefile
+++ b/devel/meld/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2008/07/18 09:43:57 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2008/07/21 07:53:13 abs Exp $
#
DISTNAME= meld-1.2
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/meld/1.2/}
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/meld/distinfo b/devel/meld/distinfo
index d56880ce696..2934c619e9a 100644
--- a/devel/meld/distinfo
+++ b/devel/meld/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2008/07/18 09:43:57 wiz Exp $
+$NetBSD: distinfo,v 1.4 2008/07/21 07:53:13 abs Exp $
SHA1 (meld-1.2.tar.bz2) = aa246307226332b865216d139c10de4c73562fc1
RMD160 (meld-1.2.tar.bz2) = a06fee2f8f882a1edba329bd0be7797f89852920
Size (meld-1.2.tar.bz2) = 616975 bytes
-SHA1 (patch-aa) = 6028b73c128ae38c34b1009a1a13de53d0ff61d6
+SHA1 (patch-aa) = 49ff28a613055ead56f63e8dd5df09b986bcbea1
diff --git a/devel/meld/patches/patch-aa b/devel/meld/patches/patch-aa
index 874bc52e2e8..99170ab34aa 100644
--- a/devel/meld/patches/patch-aa
+++ b/devel/meld/patches/patch-aa
@@ -1,12 +1,13 @@
-$NetBSD: patch-aa,v 1.1 2008/07/18 09:43:57 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2008/07/21 07:53:13 abs Exp $
---- help/fr/GNUmakefile.orig 2008-03-31 20:44:53.000000000 +0000
+--- help/fr/GNUmakefile.orig 2008-03-31 21:44:53.000000000 +0100
+++ help/fr/GNUmakefile
-@@ -15,9 +15,7 @@ all $(OMF_NAME).install : $(OMF_NAME)
+@@ -15,9 +15,8 @@ all $(OMF_NAME).install : $(OMF_NAME)
.PHONY : install
install : $(OMF_NAME).install
- -mkdir -m 755 -p $(OMF_DIR_) $(XML_DIR_) $(XML_DIR_)/figures
++ -mkdir -m 755 -p $(OMF_DIR_) $(XML_DIR_)
install -m 644 meld.$(LANG).xml $(XML_DIR_)/meld.xml
- install -m 644 figures/*.png $(XML_DIR_)/figures
-install -m 644 $< $(OMF_DIR_)/$(OMF_NAME)