summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorjoerg <joerg>2011-12-28 21:23:17 +0000
committerjoerg <joerg>2011-12-28 21:23:17 +0000
commit907bc6fb81cd6a473d5cfb18fa8fef8f79311cde (patch)
tree6b670223e570adfdbfcfabf0d0ad70e7be5fc445 /security
parentb08ed8d631930a61fa7270f00a39c4d59025a147 (diff)
downloadpkgsrc-907bc6fb81cd6a473d5cfb18fa8fef8f79311cde.tar.gz
Drop the sed calls that want to be gsed specific, since they don't
actually seem to change anything (with gsed).
Diffstat (limited to 'security')
-rw-r--r--security/gnome-keyring/Makefile4
-rw-r--r--security/gnome-keyring/distinfo3
-rw-r--r--security/gnome-keyring/patches/patch-configure24
3 files changed, 28 insertions, 3 deletions
diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index 4e0d414ec3f..d795d0b0517 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2011/12/28 01:32:25 sbd Exp $
+# $NetBSD: Makefile,v 1.67 2011/12/28 21:23:17 joerg Exp $
DISTNAME= gnome-keyring-2.32.1
PKGREVISION= 4
@@ -12,7 +12,7 @@ COMMENT= GNOME password and secret manager
PKG_DESTDIR_SUPPORT= user-destdir
-USE_TOOLS+= gmake intltool msgfmt pkg-config gsed
+USE_TOOLS+= gmake intltool msgfmt pkg-config
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
diff --git a/security/gnome-keyring/distinfo b/security/gnome-keyring/distinfo
index cbbe61e8e79..72879c85449 100644
--- a/security/gnome-keyring/distinfo
+++ b/security/gnome-keyring/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.41 2011/12/28 01:32:25 sbd Exp $
+$NetBSD: distinfo,v 1.42 2011/12/28 21:23:17 joerg Exp $
SHA1 (gnome-keyring-2.32.1.tar.bz2) = 3d0ecc3e29f426ecfcaa488ea17d3e330fe34eb6
RMD160 (gnome-keyring-2.32.1.tar.bz2) = cb72f171f5918ff26f40feb7bba90dc7e2e120ec
@@ -7,3 +7,4 @@ SHA1 (patch-ad) = d49bc78227646b3de3c357cd0f1e90cd38862ee4
SHA1 (patch-ae) = a4e6fabd0534a56b974ec799539ce93df6580ff1
SHA1 (patch-af) = f89bc8980fd966f330c67907b4534ba01f2591f9
SHA1 (patch-ag) = ab3e02f84cbfc80eba1483e0cc69c13d8beb6d01
+SHA1 (patch-configure) = de2997d31a79ac573e4c5e339b9817f6cb84e2f0
diff --git a/security/gnome-keyring/patches/patch-configure b/security/gnome-keyring/patches/patch-configure
new file mode 100644
index 00000000000..d73158dfd1f
--- /dev/null
+++ b/security/gnome-keyring/patches/patch-configure
@@ -0,0 +1,24 @@
+$NetBSD: patch-configure,v 1.1 2011/12/28 21:23:17 joerg Exp $
+
+--- configure.orig 2010-10-25 22:47:44.000000000 +0000
++++ configure
+@@ -14453,10 +14453,6 @@ install-data-am: install-gsettings-schem
+
+ .SECONDARY: $(gsettings_SCHEMAS)
+
+-gsettings__base_list = \
+- sed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \
+- sed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g"
+-
+ install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
+ @$(NORMAL_INSTALL)
+ test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"
+@@ -14464,7 +14460,7 @@ install-gsettings-schemas: $(gsettings_S
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+- done | $(gsettings__base_list) | \
++ done | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '\''$(DESTDIR)$(gsettingsschemadir)'\''"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(gsettingsschemadir)" || exit $$?; \