Wed Dec 10 10:24:21 2014 UTC ()
Update security/pinentry* from 0.8.3 to 0.8.4
The second part of the commit after Makefile.common updated
This is the last version pinentry-{qt,gtk} are available.


(mef)
diff -r1.41 -r1.42 pkgsrc/security/pinentry/Makefile
diff -r1.13 -r1.14 pkgsrc/security/pinentry/distinfo
diff -r1.12 -r1.13 pkgsrc/security/pinentry-gtk/Makefile
diff -r1.31 -r1.32 pkgsrc/security/pinentry-gtk2/Makefile
diff -r1.21 -r1.22 pkgsrc/security/pinentry-qt/Makefile
diff -r1.30 -r1.31 pkgsrc/security/pinentry-qt4/Makefile
diff -r0 -r1.1 pkgsrc/security/pinentry/patches/patch-qt4_pinentryconfirm_moc
cvs diff -r1.41 -r1.42 pkgsrc/security/pinentry/Makefile (expand / switch to unified diff)

--- pkgsrc/security/pinentry/Makefile 2014/12/10 02:27:43 1.41
+++ pkgsrc/security/pinentry/Makefile 2014/12/10 10:24:21 1.42
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.41 2014/12/10 02:27:43 mef Exp $ 1# $NetBSD: Makefile,v 1.42 2014/12/10 10:24:21 mef Exp $
2# 2#
3#PKGNAME= ${DISTNAME} 3#PKGNAME= ${DISTNAME}
4PKGREVISION= 2 
5COMMENT= Applications for entering PINs or Passphrases 4COMMENT= Applications for entering PINs or Passphrases
6 5
7.include "../../security/pinentry/Makefile.common" 6.include "../../security/pinentry/Makefile.common"
8 7
9.include "options.mk" 8.include "options.mk"
10 9
11.if defined(PINENTRY_DEFAULT) 10.if defined(PINENTRY_DEFAULT)
12post-install: 11post-install:
13 cd ${DESTDIR}${PREFIX}/bin && \ 12 cd ${DESTDIR}${PREFIX}/bin && \
14 ${LN} -sf pinentry-${PINENTRY_DEFAULT} pinentry 13 ${LN} -sf pinentry-${PINENTRY_DEFAULT} pinentry
15.endif 14.endif
16 15
17BUILDLINK_API_DEPENDS.libgpg-error+= libgpg-error>=1.0.0 16BUILDLINK_API_DEPENDS.libgpg-error+= libgpg-error>=1.0.0
cvs diff -r1.13 -r1.14 pkgsrc/security/pinentry/distinfo (expand / switch to unified diff)

--- pkgsrc/security/pinentry/distinfo 2013/07/04 17:04:58 1.13
+++ pkgsrc/security/pinentry/distinfo 2014/12/10 10:24:21 1.14
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1$NetBSD: distinfo,v 1.13 2013/07/04 17:04:58 wiz Exp $ 1$NetBSD: distinfo,v 1.14 2014/12/10 10:24:21 mef Exp $
2 2
3SHA1 (pinentry-0.8.3.tar.bz2) = fc0efe5d375568f90ddbb23ee68e173411a49d4a 3SHA1 (pinentry-0.8.4.tar.bz2) = 36c94980ceab5c15e188de121f7ab4c7ee6b3521
4RMD160 (pinentry-0.8.3.tar.bz2) = c081810a8cb7a281098625b3ac621ae3ae2acf7b 4RMD160 (pinentry-0.8.4.tar.bz2) = fa2b9a3df9390b3a20ae1ea6ee229d59cedd42a7
5Size (pinentry-0.8.3.tar.bz2) = 430753 bytes 5Size (pinentry-0.8.4.tar.bz2) = 516975 bytes
 6SHA1 (patch-qt4_pinentryconfirm_moc) = b48ed080f78a4a465d3e56139d69c9fbfcb8fcc2
cvs diff -r1.12 -r1.13 pkgsrc/security/pinentry-gtk/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/security/pinentry-gtk/Attic/Makefile 2014/12/10 02:27:43 1.12
+++ pkgsrc/security/pinentry-gtk/Attic/Makefile 2014/12/10 10:24:21 1.13
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile,v 1.12 2014/12/10 02:27:43 mef Exp $ 1# $NetBSD: Makefile,v 1.13 2014/12/10 10:24:21 mef Exp $
2# 2#
3 3
4PKGNAME= ${DISTNAME:S/pinentry-/pinentry-gtk-/} 4PKGNAME= ${DISTNAME:S/pinentry-/pinentry-gtk-/}
5PKGREVISION= 1 
6COMMENT= Applications for entering PINs or Passphrases, gtk enabled 5COMMENT= Applications for entering PINs or Passphrases, gtk enabled
7 6
8.include "../../security/pinentry/Makefile.common" 7.include "../../security/pinentry/Makefile.common"
9 8
10CONFIGURE_ARGS+= --enable-pinentry-gtk 9CONFIGURE_ARGS+= --enable-pinentry-gtk
11CONFIGURE_ARGS+= --disable-pinentry-curses 10CONFIGURE_ARGS+= --disable-pinentry-curses
12#CONFIGURE_ARGS+= --disable-fallback-curses 11#CONFIGURE_ARGS+= --disable-fallback-curses
13CONFIGURE_ARGS+= --disable-pinentry-gtk2 12CONFIGURE_ARGS+= --disable-pinentry-gtk2
14CONFIGURE_ARGS+= --disable-pinentry-qt 13CONFIGURE_ARGS+= --disable-pinentry-qt
15CONFIGURE_ARGS+= --disable-pinentry-qt4 14CONFIGURE_ARGS+= --disable-pinentry-qt4
16 15
17INSTALL_DIRS= gtk 16INSTALL_DIRS= gtk
18 17
cvs diff -r1.31 -r1.32 pkgsrc/security/pinentry-gtk2/Makefile (expand / switch to unified diff)

--- pkgsrc/security/pinentry-gtk2/Makefile 2014/12/10 02:27:44 1.31
+++ pkgsrc/security/pinentry-gtk2/Makefile 2014/12/10 10:24:21 1.32
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile,v 1.31 2014/12/10 02:27:44 mef Exp $ 1# $NetBSD: Makefile,v 1.32 2014/12/10 10:24:21 mef Exp $
2# 2#
3 3
4PKGNAME= ${DISTNAME:S/pinentry-/pinentry-gtk2-/} 4PKGNAME= ${DISTNAME:S/pinentry-/pinentry-gtk2-/}
5PKGREVISION= 4 
6COMMENT= Applications for entering PINs or Passphrases, gtk2 enabled 5COMMENT= Applications for entering PINs or Passphrases, gtk2 enabled
7 6
8.include "../../security/pinentry/Makefile.common" 7.include "../../security/pinentry/Makefile.common"
9 8
10USE_TOOLS+= pkg-config 9USE_TOOLS+= pkg-config
11CONFIGURE_ARGS+= --enable-pinentry-gtk2 10CONFIGURE_ARGS+= --enable-pinentry-gtk2
12CONFIGURE_ARGS+= --disable-pinentry-curses 11CONFIGURE_ARGS+= --disable-pinentry-curses
13#CONFIGURE_ARGS+= --disable-fallback-curses 12#CONFIGURE_ARGS+= --disable-fallback-curses
14CONFIGURE_ARGS+= --disable-pinentry-gtk 13CONFIGURE_ARGS+= --disable-pinentry-gtk
15CONFIGURE_ARGS+= --disable-pinentry-qt 14CONFIGURE_ARGS+= --disable-pinentry-qt
16CONFIGURE_ARGS+= --disable-pinentry-qt4 15CONFIGURE_ARGS+= --disable-pinentry-qt4
17 16
18INSTALL_DIRS= gtk+-2 17INSTALL_DIRS= gtk+-2
cvs diff -r1.21 -r1.22 pkgsrc/security/pinentry-qt/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/security/pinentry-qt/Attic/Makefile 2014/12/10 02:27:44 1.21
+++ pkgsrc/security/pinentry-qt/Attic/Makefile 2014/12/10 10:24:21 1.22
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile,v 1.21 2014/12/10 02:27:44 mef Exp $ 1# $NetBSD: Makefile,v 1.22 2014/12/10 10:24:21 mef Exp $
2# 2#
3 3
4PKGNAME= ${DISTNAME:S/pinentry-/pinentry-qt-/} 4PKGNAME= ${DISTNAME:S/pinentry-/pinentry-qt-/}
5PKGREVISION= 2 
6COMMENT= Applications for entering PINs or Passphrases, qt3 enabled 5COMMENT= Applications for entering PINs or Passphrases, qt3 enabled
7 6
8.include "../../security/pinentry/Makefile.common" 7.include "../../security/pinentry/Makefile.common"
9 8
10CONFIGURE_ARGS+= --enable-pinentry-qt 9CONFIGURE_ARGS+= --enable-pinentry-qt
11CONFIGURE_ARGS+= --with-qt-dir=${QTDIR:Q} 10CONFIGURE_ARGS+= --with-qt-dir=${QTDIR:Q}
12CONFIGURE_ARGS+= --with-qt-includes=${BUILDLINK_PREFIX.qt3-libs}/qt3/include 11CONFIGURE_ARGS+= --with-qt-includes=${BUILDLINK_PREFIX.qt3-libs}/qt3/include
13CONFIGURE_ARGS+= --with-qt-libraries=${BUILDLINK_PREFIX.qt3-libs}/qt3/lib 12CONFIGURE_ARGS+= --with-qt-libraries=${BUILDLINK_PREFIX.qt3-libs}/qt3/lib
14CONFIGURE_ARGS+= --disable-pinentry-curses 13CONFIGURE_ARGS+= --disable-pinentry-curses
15#CONFIGURE_ARGS+= --disable-fallback-curses 14#CONFIGURE_ARGS+= --disable-fallback-curses
16CONFIGURE_ARGS+= --disable-pinentry-gtk 15CONFIGURE_ARGS+= --disable-pinentry-gtk
17CONFIGURE_ARGS+= --disable-pinentry-gtk2 16CONFIGURE_ARGS+= --disable-pinentry-gtk2
18CONFIGURE_ARGS+= --disable-pinentry-qt4 17CONFIGURE_ARGS+= --disable-pinentry-qt4
cvs diff -r1.30 -r1.31 pkgsrc/security/pinentry-qt4/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/security/pinentry-qt4/Attic/Makefile 2014/12/10 02:27:44 1.30
+++ pkgsrc/security/pinentry-qt4/Attic/Makefile 2014/12/10 10:24:21 1.31
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile,v 1.30 2014/12/10 02:27:44 mef Exp $ 1# $NetBSD: Makefile,v 1.31 2014/12/10 10:24:21 mef Exp $
2# 2#
3 3
4PKGNAME= ${DISTNAME:S/pinentry-/pinentry-qt4-/} 4PKGNAME= ${DISTNAME:S/pinentry-/pinentry-qt4-/}
5PKGREVISION= 2 
6COMMENT= Applications for entering PINs or Passphrases, qt4 enabled 5COMMENT= Applications for entering PINs or Passphrases, qt4 enabled
7 6
8.include "../../security/pinentry/Makefile.common" 7.include "../../security/pinentry/Makefile.common"
9 8
10CONFIGURE_ARGS+= --enable-pinentry-qt4 9CONFIGURE_ARGS+= --enable-pinentry-qt4
11CONFIGURE_ARGS+= --with-qt-dir=${QTDIR:Q} 10CONFIGURE_ARGS+= --with-qt-dir=${QTDIR:Q}
12CONFIGURE_ARGS+= --with-qt-includes=${BUILDLINK_PREFIX.qt4-libs}/qt4/include 11CONFIGURE_ARGS+= --with-qt-includes=${BUILDLINK_PREFIX.qt4-libs}/qt4/include
13CONFIGURE_ARGS+= --with-qt-libraries=${BUILDLINK_PREFIX.qt4-libs}/qt4/lib 12CONFIGURE_ARGS+= --with-qt-libraries=${BUILDLINK_PREFIX.qt4-libs}/qt4/lib
14CONFIGURE_ARGS+= --disable-pinentry-curses 13CONFIGURE_ARGS+= --disable-pinentry-curses
15#CONFIGURE_ARGS+= --disable-fallback-curses 14#CONFIGURE_ARGS+= --disable-fallback-curses
16CONFIGURE_ARGS+= --disable-pinentry-gtk 15CONFIGURE_ARGS+= --disable-pinentry-gtk
17CONFIGURE_ARGS+= --disable-pinentry-gtk2 16CONFIGURE_ARGS+= --disable-pinentry-gtk2
18CONFIGURE_ARGS+= --disable-pinentry-qt 17CONFIGURE_ARGS+= --disable-pinentry-qt
File Added: pkgsrc/security/pinentry/patches/Attic/patch-qt4_pinentryconfirm_moc
$NetBSD: patch-qt4_pinentryconfirm_moc,v 1.1 2014/12/10 10:24:21 mef Exp $

Although, this is said generated file, it seems to me the path is 
wrong. (only pinentry-qt4 needs this patch)

--- qt4/pinentryconfirm.moc~	2014-12-10 17:40:26.000000000 +0900
+++ qt4/pinentryconfirm.moc	2014-12-10 17:41:41.000000000 +0900
@@ -6,7 +6,7 @@
 ** WARNING! All changes made in this file will be lost!
 *****************************************************************************/
 
-#include "../../../s/pinentry/qt4/pinentryconfirm.h"
+#include "../qt4/pinentryconfirm.h"
 #if !defined(Q_MOC_OUTPUT_REVISION)
 #error "The header file 'pinentryconfirm.h' doesn't include <QObject>."
 #elif Q_MOC_OUTPUT_REVISION != 63