sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 09:49:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix pinentry-qt and enable build.[1]

Browse source 
Use new AUTO* Rules
Use GNOMENG.

PR:		48548[1]
Submitted by:	maintainer[1]
This commit is contained in:
Tilman Keskinoz 2003-02-22 17:11:09 +00:00
parent a1898cd9f5
commit 23b9c3bd1a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=76179
3 changed files with 33 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
security/pinentry/Makefile
View file

@ -7,6 +7,7 @@
PORTNAME= pinentry PORTNAME= pinentry
PORTVERSION= 0.6.8 PORTVERSION= 0.6.8
PORTREVISION= 1
CATEGORIES= security CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_GNUPG} \ MASTER_SITES= ${MASTER_SITE_GNUPG} \
http://tigress.com/lofi/:lofi http://tigress.com/lofi/:lofi
@ -18,13 +19,12 @@ DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz \
MAINTAINER= michaelnottebrock@gmx.net MAINTAINER= michaelnottebrock@gmx.net
COMMENT= A collection of simple PIN or passphrase entry dialogs 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 \ LIB_DEPENDS= gcrypt.6:${PORTSDIR}/security/libgcrypt \
gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \ gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
ksba.7:${PORTSDIR}/security/libksba ksba.7:${PORTSDIR}/security/libksba
WANT_GTK= yes USE_AUTOMAKE_VER= 15
USE_GNOMENG= yes
USE_LIBTOOL= yes USE_LIBTOOL= yes
USE_GMAKE= yes USE_GMAKE= yes
INSTALLS_SHLIB= yes INSTALLS_SHLIB= yes
@ -37,15 +37,24 @@ CONFIGURE_ARGS+=--with-included-gettext=no
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.if defined(WITH_QT) .if exists(${X11BASE}/bin/moc)
#USE_QT_VER= 3 WITH_QT=yes
BROKEN= The QT pinentry-helper is currently non-functional
.else
CONFIGURE_ARGS+=--disable-pinentry-qt
.endif .endif
.if defined(HAVE_GTK) .if defined(WITH_QT)
USE_GTK= yes USE_QT_VER= 3
PLIST_SUB+= WITH_QT=""
.else
CONFIGURE_ARGS+=--disable-pinentry-qt
PLIST_SUB+=WITH_QT="@comment "
.endif
.if !defined(WITHOUT_GTK)
USE_GNOME+= gtk12
PLIST_SUB+=WITH_GTK=""
.else
CONFIGURE_ARGS+=--disable-pinentry-gtk
PLIST_SUB+=WITH_GTK="@comment "
.endif .endif
post-extract: post-extract:

13
security/pinentry/files/patch-qt::pinentrycontroller.cpp Normal file
View file

@ -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" );

2
security/pinentry/pkg-plist
View file

@ -1,5 +1,5 @@
bin/pinentry-curses bin/pinentry-curses
bin/pinentry-gtk %%WITH_GTK%%bin/pinentry-gtk
%%WITH_QT%%bin/pinentry-qt %%WITH_QT%%bin/pinentry-qt
@unexec install-info --delete %D/info/pinentry.info %D/info/dir @unexec install-info --delete %D/info/pinentry.info %D/info/dir
info/pinentry.info info/pinentry.info