Attachment 113107 Details for Bug 154640 – 2011-02-08-ruby-gpgme.diff

[patch] 2011-02-08-ruby-gpgme.diff

2011-02-08-ruby-gpgme.diff (text/plain), 4.25 KB, created by Jason E. Hale on 2011-02-10 07:50:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jason E. Hale

Created: 2011-02-10 07:50:08 UTC

Size: 4.25 KB

patch

obsolete

>diff -ruN ruby-gpgme.orig/Makefile ruby-gpgme/Makefile
>--- ruby-gpgme.orig/Makefile	2011-02-08 07:14:19.000000000 -0500
>+++ ruby-gpgme/Makefile	2011-02-08 07:24:29.000000000 -0500
>@@ -6,10 +6,10 @@
> #
> 
> PORTNAME=	gpgme
>-PORTVERSION=	0.2
>-PORTREVISION=	1
>+PORTVERSION=	1.0.8
> CATEGORIES=	security ruby
>-MASTER_SITES=	http://deisui.org/~ueno/ruby/ruby-gpgme/
>+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
>+MASTER_SITE_SUBDIR=	ruby-gpgme
> PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
> DISTNAME=	ruby-${PORTNAME}-${PORTVERSION}
> DIST_SUBDIR=	ruby
>@@ -17,7 +17,7 @@
> MAINTAINER=	ruby@FreeBSD.org
> COMMENT=	A Ruby interface to GnuPG Made Easy (GPGME)
> 
>-LIB_DEPENDS=	gpgme03.9:${PORTSDIR}/security/gpgme03
>+LIB_DEPENDS=	gpgme.18:${PORTSDIR}/security/gpgme
> 
> USE_RUBY=	yes
> USE_RUBY_EXTCONF=	yes
>@@ -28,6 +28,9 @@
> DOCS=		doc
> EXAMPLES=	examples/*
> 
>+LICENSE=	LGPL21
>+LICENSE_FILE=	${WRKSRC}/COPYING.LESSER
>+
> post-build:
> .if !defined(NOPORTDOCS)
> 	cd ${BUILD_WRKSRC}; ${RUBY_RDOC} lib
>diff -ruN ruby-gpgme.orig/distinfo ruby-gpgme/distinfo
>--- ruby-gpgme.orig/distinfo	2011-02-08 07:14:19.000000000 -0500
>+++ ruby-gpgme/distinfo	2011-02-08 07:16:19.000000000 -0500
>@@ -1,3 +1,2 @@
>-MD5 (ruby/ruby-gpgme-0.2.tar.gz) = 93c2765ef4c74329524ad781163e9f3e
>-SHA256 (ruby/ruby-gpgme-0.2.tar.gz) = a73cea0b7c1b3859a6ef6526e0dbcd9a82b0853c5c9303858407fbd62dc7ed5b
>-SIZE (ruby/ruby-gpgme-0.2.tar.gz) = 18518
>+SHA256 (ruby/ruby-gpgme-1.0.8.tar.gz) = d67532d8cfc469810af4a412c91b90141d2c9871e32fd3fb321e48ca1262fe10
>+SIZE (ruby/ruby-gpgme-1.0.8.tar.gz) = 43676
>diff -ruN ruby-gpgme.orig/files/patch-extconf.rb ruby-gpgme/files/patch-extconf.rb
>--- ruby-gpgme.orig/files/patch-extconf.rb	2011-02-08 07:14:19.000000000 -0500
>+++ ruby-gpgme/files/patch-extconf.rb	1969-12-31 19:00:00.000000000 -0500
>@@ -1,9 +0,0 @@
>---- extconf.rb.orig	Mon Dec 20 21:35:54 2004
>-+++ extconf.rb	Mon Dec 20 21:36:21 2004
>-@@ -1,5 +1,5 @@
>- require 'mkmf'
>- 
>--if have_library('gpgme', 'gpgme_check_version') and have_header('gpgme.h')
>-+if have_library('gpgme03', 'gpgme_check_version') and have_header('gpgme03/gpgme.h')
>-   create_makefile ('gpgme_n')
>- end
>diff -ruN ruby-gpgme.orig/files/patch-gpgme_n.c ruby-gpgme/files/patch-gpgme_n.c
>--- ruby-gpgme.orig/files/patch-gpgme_n.c	2011-02-08 07:14:19.000000000 -0500
>+++ ruby-gpgme/files/patch-gpgme_n.c	2011-02-08 07:14:34.000000000 -0500
>@@ -1,11 +1,11 @@
>---- gpgme_n.c.orig	Mon Dec 20 21:38:14 2004
>-+++ gpgme_n.c	Mon Sep 29 21:35:59 2003
>-@@ -34,7 +34,7 @@
>-    this purpose.  */
>+--- ./gpgme_n.c.orig	2009-09-16 00:00:05.000000000 -0400
>++++ ./gpgme_n.c	2010-10-13 08:09:19.000000000 -0400
>+@@ -411,6 +411,8 @@
>+ static VALUE
>+ rb_s_gpgme_new (VALUE dummy, VALUE rctx)
>+ {
>++  gpgme_check_version(NULL);
>++
>+   gpgme_ctx_t ctx;
>+   gpgme_error_t err = gpgme_new (&ctx);
>  
>- #include "ruby.h"
>--#include "gpgme.h"
>-+#include "gpgme03/gpgme.h"
>- 
>- /* StringValuePtr is not available in 1.6. */
>- #ifndef StringValuePtr
>diff -ruN ruby-gpgme.orig/pkg-descr ruby-gpgme/pkg-descr
>--- ruby-gpgme.orig/pkg-descr	2011-02-08 07:14:19.000000000 -0500
>+++ ruby-gpgme/pkg-descr	2011-02-08 07:14:34.000000000 -0500
>@@ -1,12 +1,14 @@
> Ruby-GPGME is a ruby interface to GnuPG Made Easy (GPGME).
> 
>-- Provides high-level and low-level API.
>+- Provides three levels of API.
> 
> - The low-level API allows direct access to about 94% of C functions
>   provided by GPGME.
> 
>+- The mid-level API looks object-oriented (or rubyish).
>+
> - The high-level API provides a convenient class-based interface to
>   frequently used GPGME functions.
> 
>-WWW:	http://deisui.org/~ueno/ruby/ruby-gpgme/index.html.en
>+WWW:	http://ruby-gpgme.rubyforge.org/
> Author:	Daiki Ueno
>diff -ruN ruby-gpgme.orig/pkg-plist ruby-gpgme/pkg-plist
>--- ruby-gpgme.orig/pkg-plist	2011-02-08 07:14:19.000000000 -0500
>+++ ruby-gpgme/pkg-plist	2011-02-08 07:14:34.000000000 -0500
>@@ -1,7 +1,12 @@
> %%RUBY_SITEARCHLIBDIR%%/gpgme_n.so
> %%RUBY_SITELIBDIR%%/gpgme.rb
>+%%RUBY_SITELIBDIR%%/gpgme/compat.rb
>+%%RUBY_SITELIBDIR%%/gpgme/constants.rb
>+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/edit.rb
> %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/genkey.rb
> %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/keylist.rb
> %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/roundtrip.rb
> %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sign.rb
>+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/verify.rb
> %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
>+@dirrm %%RUBY_SITELIBDIR%%/gpgme

Actions: View | Diff

Attachments on bug 154640: 113107