From d8f4036a0035109060dc86439e9b9f4a31dad356 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Sat, 23 Mar 2013 13:38:06 +0000 Subject: [PATCH] Update to libgpg-error-1.11. --- security/libgpg-error/Makefile | 10 ++++------ security/libgpg-error/distinfo | 7 ++----- .../patches/patch-src_gpg-error-config_in | 18 +++++++++--------- .../patches/patch-tests_Makefile_in | 8 ++++---- security/libgpg-error/pkg/PFRAG.shared | 2 -- security/libgpg-error/pkg/PLIST | 8 ++++++-- 6 files changed, 25 insertions(+), 28 deletions(-) delete mode 100644 security/libgpg-error/pkg/PFRAG.shared diff --git a/security/libgpg-error/Makefile b/security/libgpg-error/Makefile index 33d369cd78f..e9fbbf1dfe9 100644 --- a/security/libgpg-error/Makefile +++ b/security/libgpg-error/Makefile @@ -1,28 +1,26 @@ -# $OpenBSD: Makefile,v 1.15 2013/03/21 08:48:53 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.16 2013/03/23 13:38:06 ajacoutot Exp $ COMMENT= error codes for GnuPG related software -DISTNAME= libgpg-error-1.10 +DISTNAME= libgpg-error-1.11 CATEGORIES= security devel -SHARED_LIBS= gpg-error 3.1 # .7.0 +SHARED_LIBS += gpg-error 3.2 # 9.0 HOMEPAGE= http://www.gnupg.org/related_software/libgpg-error.en.html # GPLv2 - LGPLv2 PERMIT_PACKAGE_CDROM= Yes -WANTLIB= c +WANTLIB += c MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/libgpg-error/ \ ftp://gd.tuwien.ac.at/privacy/gnupg/libgpg-error/ \ http://sunsite.dk/pub/security/gcrypt/libgpg-error/ \ http://ftp.linux.it/pub/mirrors/gnupg/libgpg-error/ -EXTRACT_SUFX= .tar.bz2 MODULES= devel/gettext - SEPARATE_BUILD= Yes CONFIGURE_STYLE=gnu diff --git a/security/libgpg-error/distinfo b/security/libgpg-error/distinfo index b001c8ec417..c2605515088 100644 --- a/security/libgpg-error/distinfo +++ b/security/libgpg-error/distinfo @@ -1,5 +1,2 @@ -MD5 (libgpg-error-1.10.tar.bz2) = c2oD2qncWHMEfU60qcIqFg== -RMD160 (libgpg-error-1.10.tar.bz2) = Q1/PHHSK5od7XefxM6dBzVXcEUA= -SHA1 (libgpg-error-1.10.tar.bz2) = lbMkNZYn+8t2JIerYJGvvlmCOyk= -SHA256 (libgpg-error-1.10.tar.bz2) = UgYptFaLXCmxmRyP/CZ8i97l8iPHMzxCplG1b5scVDE= -SIZE (libgpg-error-1.10.tar.bz2) = 439213 +SHA256 (libgpg-error-1.11.tar.gz) = OcF88FE+oih+F/e7+/6JsmFvrpddioOVrjcFwaXfqnw= +SIZE (libgpg-error-1.11.tar.gz) = 638947 diff --git a/security/libgpg-error/patches/patch-src_gpg-error-config_in b/security/libgpg-error/patches/patch-src_gpg-error-config_in index d4367dbb4bb..5149fedc24b 100644 --- a/security/libgpg-error/patches/patch-src_gpg-error-config_in +++ b/security/libgpg-error/patches/patch-src_gpg-error-config_in @@ -1,12 +1,12 @@ -$OpenBSD: patch-src_gpg-error-config_in,v 1.2 2010/07/27 21:45:06 ajacoutot Exp $ ---- src/gpg-error-config.in.orig Thu Jan 14 10:18:30 2010 -+++ src/gpg-error-config.in Tue Jul 27 23:32:48 2010 -@@ -72,7 +72,7 @@ while test $# -gt 0; do - if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/lib"; then - output="$output -L$libdir" - fi +$OpenBSD: patch-src_gpg-error-config_in,v 1.3 2013/03/23 13:38:06 ajacoutot Exp $ +--- src/gpg-error-config.in.orig Sat Feb 23 17:38:49 2013 ++++ src/gpg-error-config.in Sat Mar 23 14:35:35 2013 +@@ -75,7 +75,7 @@ while test $# -gt 0; do + output="$output -L$libdir" + ;; + esac - output="$output @GPG_ERROR_CONFIG_LIBS@" + output="$output @GPG_ERROR_CONFIG_LIBS@ @LTLIBINTL@" ;; - *) - usage 1 1>&2 + --host) + echo "@GPG_ERROR_CONFIG_HOST@" diff --git a/security/libgpg-error/patches/patch-tests_Makefile_in b/security/libgpg-error/patches/patch-tests_Makefile_in index 477fb724c0b..3f4f3fb428e 100644 --- a/security/libgpg-error/patches/patch-tests_Makefile_in +++ b/security/libgpg-error/patches/patch-tests_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-tests_Makefile_in,v 1.5 2010/07/27 21:45:06 ajacoutot Exp $ ---- tests/Makefile.in.orig Wed Jul 21 10:00:00 2010 -+++ tests/Makefile.in Tue Jul 27 23:31:52 2010 -@@ -73,7 +73,7 @@ am__EXEEXT_1 = t-strerror$(EXEEXT) t-syserror$(EXEEXT) +$OpenBSD: patch-tests_Makefile_in,v 1.6 2013/03/23 13:38:06 ajacoutot Exp $ +--- tests/Makefile.in.orig Mon Feb 25 10:27:23 2013 ++++ tests/Makefile.in Sat Mar 23 14:35:05 2013 +@@ -94,7 +94,7 @@ am__EXEEXT_1 = t-version$(EXEEXT) t-strerror$(EXEEXT) PROGRAMS = $(noinst_PROGRAMS) t_strerror_SOURCES = t-strerror.c t_strerror_OBJECTS = t-strerror.$(OBJEXT) diff --git a/security/libgpg-error/pkg/PFRAG.shared b/security/libgpg-error/pkg/PFRAG.shared deleted file mode 100644 index f898ed5baf5..00000000000 --- a/security/libgpg-error/pkg/PFRAG.shared +++ /dev/null @@ -1,2 +0,0 @@ -@comment $OpenBSD: PFRAG.shared,v 1.4 2005/12/24 22:32:53 sturm Exp $ -@lib lib/libgpg-error.so.${LIBgpg-error_VERSION} diff --git a/security/libgpg-error/pkg/PLIST b/security/libgpg-error/pkg/PLIST index e0d63ded2b8..76b18d4116c 100644 --- a/security/libgpg-error/pkg/PLIST +++ b/security/libgpg-error/pkg/PLIST @@ -1,9 +1,10 @@ -@comment $OpenBSD: PLIST,v 1.5 2010/07/27 21:45:06 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.6 2013/03/23 13:38:06 ajacoutot Exp $ @bin bin/gpg-error bin/gpg-error-config include/gpg-error.h lib/libgpg-error.a lib/libgpg-error.la +@lib lib/libgpg-error.so.${LIBgpg-error_VERSION} share/aclocal/gpg-error.m4 share/common-lisp/ share/common-lisp/source/ @@ -13,13 +14,16 @@ share/common-lisp/source/gpg-error/gpg-error-package.lisp share/common-lisp/source/gpg-error/gpg-error.asd share/common-lisp/source/gpg-error/gpg-error.lisp share/locale/cs/LC_MESSAGES/libgpg-error.mo +share/locale/da/LC_MESSAGES/libgpg-error.mo share/locale/de/LC_MESSAGES/libgpg-error.mo +share/locale/eo/LC_MESSAGES/libgpg-error.mo share/locale/fr/LC_MESSAGES/libgpg-error.mo share/locale/it/LC_MESSAGES/libgpg-error.mo +share/locale/ja/LC_MESSAGES/libgpg-error.mo share/locale/nl/LC_MESSAGES/libgpg-error.mo share/locale/pl/LC_MESSAGES/libgpg-error.mo share/locale/ro/LC_MESSAGES/libgpg-error.mo share/locale/sv/LC_MESSAGES/libgpg-error.mo +share/locale/uk/LC_MESSAGES/libgpg-error.mo share/locale/vi/LC_MESSAGES/libgpg-error.mo -%%SHARED%% share/locale/zh_CN/LC_MESSAGES/libgpg-error.mo