diff options
| author | Tilman Keskinoz <arved@FreeBSD.org> | 2003-02-22 17:11:09 +0000 |
|---|---|---|
| committer | Tilman Keskinoz <arved@FreeBSD.org> | 2003-02-22 17:11:09 +0000 |
| commit | 23b9c3bd1a90631685e2021e22c94fd5f07be9eb (patch) | |
| tree | f34cc5a0618ba62cb4bd4114c2fc0fa3919a77da /security | |
| parent | a1898cd9f5c861fd937b19b4f0e14496443352fa (diff) | |
Fix pinentry-qt and enable build.[1]
Use new AUTO* Rules
Use GNOMENG.
PR: 48548[1]
Submitted by: maintainer[1]
Notes
Notes:
svn path=/head/; revision=76179
Diffstat (limited to 'security')
| -rw-r--r-- | security/pinentry/Makefile | 23 | ||||
| -rw-r--r-- | security/pinentry/files/patch-qt::pinentrycontroller.cpp | 13 | ||||
| -rw-r--r-- | security/pinentry/pkg-plist | 2 |
3 files changed, 30 insertions, 8 deletions
diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile index a97a9f37bddb..73b2ef4a421e 100644 --- a/security/pinentry/Makefile +++ b/security/pinentry/Makefile @@ -7,6 +7,7 @@ PORTNAME= pinentry PORTVERSION= 0.6.8 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_GNUPG} \ http://tigress.com/lofi/:lofi @@ -18,13 +19,12 @@ DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz \ MAINTAINER= michaelnottebrock@gmx.net COMMENT= A collection of simple PIN or passphrase entry dialogs -BUILD_DEPENDS= autoconf:${PORTSDIR}/devel/autoconf \ - automake:${PORTSDIR}/devel/automake LIB_DEPENDS= gcrypt.6:${PORTSDIR}/security/libgcrypt \ gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \ ksba.7:${PORTSDIR}/security/libksba -WANT_GTK= yes +USE_AUTOMAKE_VER= 15 +USE_GNOMENG= yes USE_LIBTOOL= yes USE_GMAKE= yes INSTALLS_SHLIB= yes @@ -37,15 +37,24 @@ CONFIGURE_ARGS+=--with-included-gettext=no .include <bsd.port.pre.mk> +.if exists(${X11BASE}/bin/moc) +WITH_QT=yes +.endif + .if defined(WITH_QT) -#USE_QT_VER= 3 -BROKEN= The QT pinentry-helper is currently non-functional +USE_QT_VER= 3 +PLIST_SUB+= WITH_QT="" .else CONFIGURE_ARGS+=--disable-pinentry-qt +PLIST_SUB+=WITH_QT="@comment " .endif -.if defined(HAVE_GTK) -USE_GTK= yes +.if !defined(WITHOUT_GTK) +USE_GNOME+= gtk12 +PLIST_SUB+=WITH_GTK="" +.else +CONFIGURE_ARGS+=--disable-pinentry-gtk +PLIST_SUB+=WITH_GTK="@comment " .endif post-extract: diff --git a/security/pinentry/files/patch-qt::pinentrycontroller.cpp b/security/pinentry/files/patch-qt::pinentrycontroller.cpp new file mode 100644 index 000000000000..361749040e70 --- /dev/null +++ b/security/pinentry/files/patch-qt::pinentrycontroller.cpp @@ -0,0 +1,13 @@ +--- qt/pinentrycontroller.cpp.orig Thu Feb 13 00:20:44 2003 ++++ qt/pinentrycontroller.cpp Thu Feb 13 00:21:32 2003 +@@ -256,9 +256,8 @@ + connect( _pinentry, SIGNAL( rejected() ), + this, SLOT( slotRejected() ) ); + bool ret = _pinentry->exec(); +- FILE* fp = assuan_get_data_fp( _ctx ); + if( ret ) { +- fputs( static_cast<const char*>(_pinentry->text().utf8()), fp ); ++ assuan_send_data ( _ctx, static_cast<const void*>(_pinentry->text().utf8()), _pinentry->text().utf8().length() ); + return 0; + } else { + assuan_set_error( _ctx, ASSUAN_Canceled, "Dialog cancelled by user" ); diff --git a/security/pinentry/pkg-plist b/security/pinentry/pkg-plist index d698934d4a72..3ed168b6108e 100644 --- a/security/pinentry/pkg-plist +++ b/security/pinentry/pkg-plist @@ -1,5 +1,5 @@ bin/pinentry-curses -bin/pinentry-gtk +%%WITH_GTK%%bin/pinentry-gtk %%WITH_QT%%bin/pinentry-qt @unexec install-info --delete %D/info/pinentry.info %D/info/dir info/pinentry.info |