summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsbd <sbd>2011-12-28 01:32:25 +0000
committersbd <sbd>2011-12-28 01:32:25 +0000
commitda188f5d1d9fb3e114f44b57931a50b8078e0ebc (patch)
tree474ce95a8f4e2c53c0e780314f20586d9fc304d4
parentf8ddd75c826751ce14624b5d96213f5608fd9d4b (diff)
downloadpkgsrc-da188f5d1d9fb3e114f44b57931a50b8078e0ebc.tar.gz
Because of adding gsed to USE_TOOLS there's no need for patch-ah or having a
build dependence on gsed. Bump PKGREVISION.
-rw-r--r--security/gnome-keyring/Makefile6
-rw-r--r--security/gnome-keyring/distinfo3
-rw-r--r--security/gnome-keyring/patches/patch-ah15
3 files changed, 3 insertions, 21 deletions
diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index 79a62cddf88..4e0d414ec3f 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.65 2011/12/26 07:24:35 sbd Exp $
+# $NetBSD: Makefile,v 1.66 2011/12/28 01:32:25 sbd Exp $
DISTNAME= gnome-keyring-2.32.1
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= security gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-keyring/2.32/}
EXTRACT_SUFX= .tar.bz2
@@ -36,8 +36,6 @@ CONFIGURE_ENV+= ac_cv_header_security_pam_modules_h=yes
BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:M*}
-BUILD_DEPENDS+= gsed-[0-9]*:../../textproc/gsed
-
BUILDLINK_API_DEPENDS.glib2+= glib2>=2.26.0
.include "../../devel/glib2/schemas.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/security/gnome-keyring/distinfo b/security/gnome-keyring/distinfo
index 121434c8806..cbbe61e8e79 100644
--- a/security/gnome-keyring/distinfo
+++ b/security/gnome-keyring/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.40 2011/05/12 12:54:17 adam Exp $
+$NetBSD: distinfo,v 1.41 2011/12/28 01:32:25 sbd Exp $
SHA1 (gnome-keyring-2.32.1.tar.bz2) = 3d0ecc3e29f426ecfcaa488ea17d3e330fe34eb6
RMD160 (gnome-keyring-2.32.1.tar.bz2) = cb72f171f5918ff26f40feb7bba90dc7e2e120ec
@@ -7,4 +7,3 @@ SHA1 (patch-ad) = d49bc78227646b3de3c357cd0f1e90cd38862ee4
SHA1 (patch-ae) = a4e6fabd0534a56b974ec799539ce93df6580ff1
SHA1 (patch-af) = f89bc8980fd966f330c67907b4534ba01f2591f9
SHA1 (patch-ag) = ab3e02f84cbfc80eba1483e0cc69c13d8beb6d01
-SHA1 (patch-ah) = 59f37786e06e197a726a32e8fc76b0b064259e1d
diff --git a/security/gnome-keyring/patches/patch-ah b/security/gnome-keyring/patches/patch-ah
deleted file mode 100644
index 419615c777c..00000000000
--- a/security/gnome-keyring/patches/patch-ah
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2011/04/13 16:39:14 drochner Exp $
-
---- configure.orig 2010-10-25 22:47:44.000000000 +0000
-+++ configure
-@@ -14454,8 +14454,8 @@ 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"
-+ gsed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \
-+ gsed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g"
-
- install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
- @$(NORMAL_INSTALL)