 @@ -1,32 +1,31 @@
-# $NetBSD: Makefile,v 1.64 2011/04/22 13:42:47 obache Exp $
+# $NetBSD: Makefile,v 1.65 2011/08/11 11:15:00 adam Exp $
-DISTNAME=	gpgme-1.3.0
+DISTNAME=	gpgme-1.3.1
 PKGREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/gpgme/
 EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnupg.org/related_software/gpgme/
 COMMENT=	GnuPG Made Easy
 LICENSE=	gnu-gpl-v2
 PKG_DESTDIR_SUPPORT=	user-destdir
-USE_LIBTOOL=		YES
+USE_LIBTOOL=		yes
-GNU_CONFIGURE=		YES
+GNU_CONFIGURE=		yes
 PTHREAD_OPTS+=		require
-INFO_FILES=		YES
+INFO_FILES=		yes
 SUBST_CLASSES+=		pthread
 SUBST_FILES.pthread=	src/gpgme-config.in
 SUBST_SED.pthread+=	-e 's,@PTHREAD_LIBS@,${PTHREAD_LDFLAGS} ${PTHREAD_LIBS},g'
 SUBST_SED.pthread+=	-e 's,@PTHREAD_CFLAGS@,${PTHREAD_CFLAGS},g'
 SUBST_STAGE.pthread=	post-patch
 LIBS.SunOS+=		-lnsl -lsocket
 # getenv_r is not detected correctly. It will be found
 # in either base system or librfuncs
 CONFIGURE_ENV+=		ac_cv_func_getenv_r=yes

 @@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.29 2011/03/04 11:34:12 obache Exp $
+$NetBSD: distinfo,v 1.30 2011/08/11 11:15:00 adam Exp $
-SHA1 (gpgme-1.3.0.tar.bz2) = 0db69082abfbbbaf86c3ab0906f5137de900da73
+SHA1 (gpgme-1.3.1.tar.bz2) = 7d19a95a2239da13764dad7f97541be884ec5a37
-RMD160 (gpgme-1.3.0.tar.bz2) = 9699ba5cb991459e41af46112914cac221a9b69d
+RMD160 (gpgme-1.3.1.tar.bz2) = 95354069b515ef9aa80e9722645e908b10ea6dca
-Size (gpgme-1.3.0.tar.bz2) = 869470 bytes
+Size (gpgme-1.3.1.tar.bz2) = 841093 bytes
-SHA1 (patch-aa) = 3ebd77d5a3b6a000528fad2b4e23d15d5618bbda
+SHA1 (patch-aa) = ff9d08d2897c183c8cb2ce85f4d29b59d80919e2
-SHA1 (patch-ab) = fc89b2512777afa10ab27490717a2675a2f545b2
+SHA1 (patch-ac) = 6ce21be79271f1ee018afe49eba7d103e6d793e3
-SHA1 (patch-ac) = 40ccfed6418f2593bfaa72454acc53304b6d72e6
+SHA1 (patch-ae) = 1259739c4690db656bc5b6113842b1d5c4623616
 SHA1 (patch-ae) = b2e193ec6bb21f11f00ce4cb1dd44027346ab613
 SHA1 (patch-af) = 99787938b677f291a84eae57fa29be60890f444b
-SHA1 (patch-ag) = 9d6116da7edc727a4011bf8a5dc8d5ff2a902924
+SHA1 (patch-ag) = c45777a312bb5ed7f57852e9410270a4fafee9f8
 SHA1 (patch-ah) = 84c9ad8c0c0e16584261cbb9c92e3073ce94da48
-SHA1 (patch-aj) = 9d90e26e5ed233977d6dc9505be8e7665dec3c64
+SHA1 (patch-aj) = 080a3549162d85df2e390892b14c3372a35ce18f

 @@ -1,24 +1,15 @@
-$NetBSD: patch-aa,v 1.9 2011/03/03 11:39:47 adam Exp $
+$NetBSD: patch-aa,v 1.10 2011/08/11 11:15:00 adam Exp $
 --- src/gpgme-config.in.orig	2009-10-23 13:44:56.000000000 +0000
 +++ src/gpgme-config.in
 @@ -35,8 +35,8 @@ libs_pth="@PTH_LDFLAGS@ @PTH_LIBS@"
  cflags_pth="@PTH_CFLAGS@"
  @HAVE_PTHREAD_TRUE@thread_modules="$thread_modules pthread"
 -libs_pthread="-lpthread"
 -cflags_pthread=""
 +libs_pthread="@PTHREAD_LIBS@"
 +cflags_pthread="@PTHREAD_CFLAGS@"
  # Configure glib.
  libs_glib="@GLIB_LIBS@"
@@ -120,7 +120,7 @@ while test $# -gt 0; do
  	    ;;
  	--libs)
  	    if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/lib"; then
 -		output="$output -L$libdir"
 +		output="$output -Wl,-R$libdir -L$libdir"
  	    fi
  	    case "$thread_module" in
  		pthread)

 @@ -1,40 +1,40 @@
-$NetBSD: patch-ac,v 1.8 2011/03/04 11:34:12 obache Exp $
+$NetBSD: patch-ac,v 1.9 2011/08/11 11:15:00 adam Exp $
---- configure.orig	2010-01-11 11:06:55.000000000 +0000
+--- configure.orig	2011-06-16 12:44:52.000000000 +0000
 +++ configure
-@@ -16809,7 +16809,7 @@ if test "${ac_cv_lib_pthread_pthread_cre
+@@ -16866,7 +16866,7 @@ if test "${ac_cv_lib_pthread_pthread_cre
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lpthread  $LIBS"
 +LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
-@@ -16921,7 +16921,7 @@ fi
+@@ -17020,7 +17020,7 @@ fi
  done
  # Checks for header files.
 -for ac_header in sys/select.h
 +for ac_header in rfuncs.h sys/select.h
  do :
    ac_fn_c_check_header_mongrel "$LINENO" "sys/select.h" "ac_cv_header_sys_select_h" "$ac_includes_default"
  if test "x$ac_cv_header_sys_select_h" = x""yes; then :
-@@ -17302,7 +17302,7 @@ else
+@@ -17417,7 +17417,7 @@ else
  /* end confdefs.h.  */
  __thread int foo;
  _ACEOF
 -if ac_fn_c_try_compile "$LINENO"; then :
 +if ac_fn_c_try_link "$LINENO"; then :
    gpgme_cv_tls_works=yes
  else
    gpgme_cv_tls_works=no
-@@ -18105,7 +18105,7 @@ IFS=$as_save_IFS
+@@ -18342,7 +18342,7 @@ IFS=$as_save_IFS
  esac
  fi
  GPGSM=$ac_cv_path_GPGSM
 -if test -n "$GPGSM"; then
 +if test "$GPGSM" != no; then
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GPGSM" >&5
  $as_echo "$GPGSM" >&6; }
  else

 @@ -1,14 +1,14 @@
-$NetBSD: patch-ae,v 1.5 2011/03/03 11:39:48 adam Exp $
+$NetBSD: patch-ae,v 1.6 2011/08/11 11:15:00 adam Exp $
---- src/engine-gpgsm.c.orig	2008-11-03 17:50:12.000000000 +0100
+--- src/engine-gpgsm.c.orig	2011-01-19 11:37:44.000000000 +0000
 +++ src/engine-gpgsm.c
-@@ -29,6 +29,9 @@
+@@ -33,6 +33,9 @@
- #include <sys/types.h>
+ #ifdef HAVE_UNISTD_H
- #include <assert.h>
+ # include <unistd.h>
- #include <unistd.h>
+ #endif
 +#if HAVE_RFUNCS_H
-+#include <rfuncs.h>
++# include <rfuncs.h>
 +#endif
  #ifdef HAVE_LOCALE_H
  #include <locale.h>
- #include <fcntl.h> /* FIXME */
+ #endif
  #include <errno.h>

 @@ -1,13 +1,13 @@
-$NetBSD: patch-aj,v 1.5 2011/03/03 11:39:48 adam Exp $
+$NetBSD: patch-aj,v 1.6 2011/08/11 11:15:00 adam Exp $
 --- src/Makefile.in.orig	2010-01-11 11:06:54.000000000 +0000
 +++ src/Makefile.in
-@@ -544,7 +544,7 @@ libgpgme_pthread_la_LDFLAGS = $(no_undef
+@@ -558,7 +558,7 @@ libgpgme_pthread_la_LDFLAGS = $(no_undef
  libgpgme_pthread_la_DEPENDENCIES = @LTLIBOBJS@ $(srcdir)/libgpgme.vers
  libgpgme_pthread_la_LIBADD = $(gpgme_res) @LIBASSUAN_LIBS@ @LTLIBOBJS@ \
 -	-lpthread @GPG_ERROR_LIBS@
 +	$(PTHREAD_LDFLAGS) $(PTHREAD_LIBS) @GPG_ERROR_LIBS@
  libgpgme_pth_la_LDFLAGS = @PTH_LDFLAGS@ $(no_undefined) $(export_symbols) \
  	$(libgpgme_version_script_cmd) -version-info \

 @@ -1,14 +1,14 @@
-$NetBSD: patch-ag,v 1.3 2011/03/03 11:39:48 adam Exp $
+$NetBSD: patch-ag,v 1.4 2011/08/11 11:15:00 adam Exp $
 --- config.h.in.orig	2010-01-11 11:06:53.000000000 +0000
 +++ config.h.in
-@@ -70,6 +70,9 @@
+@@ -76,6 +76,9 @@
  /* Define if we have pthread. */
  #undef HAVE_PTHREAD
 +/* Define to 1 if you have the <rfuncs.h> header file. */
 +#undef HAVE_RFUNCS_H
++
  /* Define to 1 if you have the `setenv' function. */
  #undef HAVE_SETENV