diff options
author | drochner <drochner@pkgsrc.org> | 2006-03-14 15:00:57 +0000 |
---|---|---|
committer | drochner <drochner@pkgsrc.org> | 2006-03-14 15:00:57 +0000 |
commit | bee397dfa7bad22348df50f56ed742dc0460cccc (patch) | |
tree | 298df9a552aeb5f4610941ba0d96eb4c0a4a48a1 /security/seahorse | |
parent | 50272f865e88335b2631410c571af391152b65d2 (diff) | |
download | pkgsrc-bee397dfa7bad22348df50f56ed742dc0460cccc.tar.gz |
update to 0.8.1
changes:
* Better HKP support for strange key servers.
* Updated gedit plugin to work with gedit 2.14
* Fixed signing of keys with GPG 1.4.2 [Daniel Rodriguez Garcia]
* Fixed some minor packaging and build problems.
* Many smaller fixes.
pkgsrc changes:
-don't build nautilus plugin to limit dependencies
(will be provided in a separate pkg)
-remove some more unneeded dependencies
-prepare for the gedit plugin as a separate pkg
Diffstat (limited to 'security/seahorse')
-rw-r--r-- | security/seahorse/Makefile | 12 | ||||
-rw-r--r-- | security/seahorse/PLIST | 4 | ||||
-rw-r--r-- | security/seahorse/buildlink3.mk | 42 | ||||
-rw-r--r-- | security/seahorse/distinfo | 11 | ||||
-rw-r--r-- | security/seahorse/patches/patch-ab | 10 | ||||
-rw-r--r-- | security/seahorse/patches/patch-af | 22 |
6 files changed, 81 insertions, 20 deletions
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile index 4f2e184a8be..6f396aee2e4 100644 --- a/security/seahorse/Makefile +++ b/security/seahorse/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.50 2006/03/06 00:18:24 wiz Exp $ +# $NetBSD: Makefile,v 1.51 2006/03/14 15:00:57 drochner Exp $ -DISTNAME= seahorse-0.8 -PKGREVISION= 5 +DISTNAME= seahorse-0.8.1 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_GNOME:=sources/seahorse/0.8/} EXTRACT_SUFX= .tar.bz2 @@ -20,7 +19,8 @@ USE_LIBTOOL= yes USE_MSGFMT_PLURALS= yes USE_PKGLOCALEDIR= yes -CONFIGURE_ARGS+= --disable-gedit +CONFIGURE_ARGS+= --disable-gedit +CONFIGURE_ARGS+= --disable-nautilus GCONF2_SCHEMAS= seahorse.schemas @@ -28,16 +28,12 @@ BUILDLINK_DEPENDS.gpgme+= gpgme>=1.0.1nb2 .include "../../databases/gnome-mime-data/buildlink3.mk" .include "../../databases/shared-mime-info/mimedb.mk" -.include "../../devel/eel2/buildlink3.mk" .include "../../devel/GConf2/schemas.mk" -.include "../../devel/libbonobo/buildlink3.mk" -.include "../../devel/libbonoboui/buildlink3.mk" .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" .include "../../net/libsoup-devel/buildlink3.mk" .include "../../security/gpgme/buildlink3.mk" .include "../../sysutils/gnome-vfs2/buildlink3.mk" -.include "../../sysutils/nautilus/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/security/seahorse/PLIST b/security/seahorse/PLIST index 34e99dac7c8..caf29829734 100644 --- a/security/seahorse/PLIST +++ b/security/seahorse/PLIST @@ -1,9 +1,8 @@ -@comment $NetBSD: PLIST,v 1.12 2005/10/25 17:43:19 drochner Exp $ +@comment $NetBSD: PLIST,v 1.13 2006/03/14 15:00:57 drochner Exp $ bin/seahorse bin/seahorse-agent bin/seahorse-pgp-preferences lib/libseahorse-internal.la -lib/nautilus/extensions-1.0/libnautilus-seahorse.la share/applications/seahorse-pgp-encrypted.desktop share/applications/seahorse-pgp-keys.desktop share/applications/seahorse-pgp-preferences.desktop @@ -109,4 +108,3 @@ share/seahorse/glade/seahorse-signer.glade @comment in GConf2: @dirrm share/gconf/schemas @comment in gnome2-dirs: @dirrm share/control-center-2.0/capplets @comment in xdg-dirs: @dirrm share/applications -@comment in nautilus: @dirrm lib/nautilus/extensions-1.0 diff --git a/security/seahorse/buildlink3.mk b/security/seahorse/buildlink3.mk new file mode 100644 index 00000000000..463085b061a --- /dev/null +++ b/security/seahorse/buildlink3.mk @@ -0,0 +1,42 @@ +# $NetBSD: buildlink3.mk,v 1.1 2006/03/14 15:00:57 drochner Exp $ +# XXX +# XXX This file was created automatically using createbuildlink-3.10. +# XXX After this file has been verified as correct, the comment lines +# XXX beginning with "XXX" should be removed. Please do not commit +# XXX unverified buildlink3.mk files. +# XXX +# XXX Packages that only install static libraries or headers should +# XXX include the following line: +# XXX +# XXX BUILDLINK_DEPMETHOD.seahorse?= build + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +SEAHORSE_BUILDLINK3_MK:= ${SEAHORSE_BUILDLINK3_MK}+ + +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= seahorse +.endif + +BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nseahorse} +BUILDLINK_PACKAGES+= seahorse + +.if !empty(SEAHORSE_BUILDLINK3_MK:M+) +BUILDLINK_DEPENDS.seahorse+= seahorse>=0.8.1 +BUILDLINK_PKGSRCDIR.seahorse?= ../../security/seahorse +.endif # SEAHORSE_BUILDLINK3_MK + +# XXX +# XXX Uncomment and keep only the buildlink3 lines below which are directly +# XXX needed for dependencies to compile, link, and run. If this package +# XXX provides a wrappered API or otherwise does not expose the APIs of the +# XXX buildlink3 lines below to dependencies, remove them. +# XXX +#.include "../../databases/gnome-mime-data/buildlink3.mk" +#.include "../../devel/libglade2/buildlink3.mk" +#.include "../../devel/libgnomeui/buildlink3.mk" +#.include "../../net/libsoup-devel/buildlink3.mk" +#.include "../../security/gpgme/buildlink3.mk" +#.include "../../sysutils/gnome-vfs2/buildlink3.mk" +#.include "../../x11/gtk2/buildlink3.mk" + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/security/seahorse/distinfo b/security/seahorse/distinfo index f726916ac3c..9aac639d462 100644 --- a/security/seahorse/distinfo +++ b/security/seahorse/distinfo @@ -1,10 +1,11 @@ -$NetBSD: distinfo,v 1.15 2005/10/25 17:43:19 drochner Exp $ +$NetBSD: distinfo,v 1.16 2006/03/14 15:00:57 drochner Exp $ -SHA1 (seahorse-0.8.tar.bz2) = 9a354cb655a4ac70b15730b77d8cf164d1ba4359 -RMD160 (seahorse-0.8.tar.bz2) = f6e02ebef8f4e26ff64890e551dc6f35c0442007 -Size (seahorse-0.8.tar.bz2) = 946453 bytes +SHA1 (seahorse-0.8.1.tar.bz2) = 43b91153c708e536e00ef38aa12f33eff524b0f7 +RMD160 (seahorse-0.8.1.tar.bz2) = 1442bf55617a08e7357d1b40e64f4d3d3c777bdc +Size (seahorse-0.8.1.tar.bz2) = 971378 bytes SHA1 (patch-aa) = b7dbb53b1a012345b13426f50f76a523ff839536 -SHA1 (patch-ab) = 38d3f9ab9a46209f363d2b772d079cde1af83ed2 +SHA1 (patch-ab) = 6312a6d2ee767f2432d9a8e91d800649124b7bce SHA1 (patch-ac) = a17c31e312b10d7ba781289b70060ed34a1c006b SHA1 (patch-ad) = a7abc7a29a422ec229545f626f37ae173ba56db7 SHA1 (patch-ae) = cb7e6555d94adc9d2d6a4e0250bd7717c8207f87 +SHA1 (patch-af) = 33876b96f74591ff85e3244ee2070ee12b88a502 diff --git a/security/seahorse/patches/patch-ab b/security/seahorse/patches/patch-ab index 4f770c20f08..39e9dcd3880 100644 --- a/security/seahorse/patches/patch-ab +++ b/security/seahorse/patches/patch-ab @@ -1,14 +1,16 @@ -$NetBSD: patch-ab,v 1.4 2005/05/19 21:14:11 jmmv Exp $ +$NetBSD: patch-ab,v 1.5 2006/03/14 15:00:57 drochner Exp $ ---- configure.orig 2005-05-07 17:08:51.000000000 +0000 +--- configure.orig 2006-02-25 23:22:46.000000000 +0100 +++ configure -@@ -19614,6 +19614,9 @@ echo $ECHO_N "checking for GPGME - versi +@@ -19762,7 +19762,10 @@ echo $ECHO_N "checking for GPGME - versi sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\3/'` if test "$major" -eq "$req_major"; then +- if test "$minor" -ge "$req_minor"; then + if test "$minor" -gt "$req_minor"; then + ok="yes" + fi - if test "$minor" -eq "$req_minor"; then ++ if test "$minor" -eq "$req_minor"; then if test "$micro" -ge "$req_micro"; then ok="yes" + fi diff --git a/security/seahorse/patches/patch-af b/security/seahorse/patches/patch-af new file mode 100644 index 00000000000..54769dafd7c --- /dev/null +++ b/security/seahorse/patches/patch-af @@ -0,0 +1,22 @@ +$NetBSD: patch-af,v 1.1 2006/03/14 15:00:57 drochner Exp $ + +--- plugins/gedit/Makefile.in.orig 2006-03-11 19:14:15.000000000 +0100 ++++ plugins/gedit/Makefile.in +@@ -58,7 +58,7 @@ pluginLTLIBRARIES_INSTALL = $(INSTALL) + LTLIBRARIES = $(plugin_LTLIBRARIES) + am__DEPENDENCIES_1 = + libseahorse_pgp_la_DEPENDENCIES = \ +- $(top_builddir)/libseahorse/libseahorse-internal.la \ ++ $(LOCALBASE)/lib/libseahorse-internal.la \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + am__libseahorse_pgp_la_SOURCES_DIST = seahorse-gedit.c \ + seahorse-gedit.h seahorse-gedit-plugin.c \ +@@ -286,7 +286,7 @@ plugin_LTLIBRARIES = libseahorse-pgp.la + libseahorse_pgp_la_SOURCES = seahorse-gedit.c seahorse-gedit.h $(PLUGIN_SRCS) + libseahorse_pgp_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) + libseahorse_pgp_la_LIBADD = \ +- $(top_builddir)/libseahorse/libseahorse-internal.la \ ++ $(LOCALBASE)/lib/libseahorse-internal.la \ + $(SEAHORSE_LIBS) \ + $(GEDIT_LIBS) + |