Index: head/security/pinentry/Makefile =================================================================== --- head/security/pinentry/Makefile (revision 325272) +++ head/security/pinentry/Makefile (revision 325273) @@ -1,85 +1,83 @@ # Created by: Michael Nottebrock # $FreeBSD$ PORTNAME= pinentry -PORTVERSION= 0.8.1 -PORTREVISION?= 4 +PORTVERSION= 0.8.3 +PORTREVISION?= 0 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_GNUPG} MASTER_SITE_SUBDIR= pinentry MAINTAINER= makc@FreeBSD.org COMMENT?= Collection of simple PIN or passphrase entry dialogs LIB_DEPENDS= gcrypt:${PORTSDIR}/security/libgcrypt \ ksba.19:${PORTSDIR}/security/libksba CONFLICTS_INSTALL?= pinentry-[a-z]* +USE_BZIP2= yes USES= iconv gmake GNU_CONFIGURE= yes CONFIGURE_ARGS+=--disable-pinentry-qt INFO= pinentry CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib .if !defined(PINENTRY_SLAVE) OPTIONS_MULTI= FRONTEND OPTIONS_MULTI_FRONTEND= NCURSES GTK GTK2 QT4 OPTIONS_DEFAULT= ${OPTIONS_MULTI_FRONTEND} NCURSES_DESC= Curses frontend GTK_DESC= Gtk+ 1 frontend GTK2_DESC= Gtk+ 2 frontend QT4_DESC= Qt 4 frontend .else PKGNAMESUFFIX= ${PINENTRY_SLAVE} .endif .include .if ${PORT_OPTIONS:MQT4} USE_QT4= gui moc_build PLIST_SUB+= WITH_QT4="" MOC4= ${LOCALBASE}/bin/moc-qt4 -LDFLAGS+= ${PTHREAD_LIBS} .else CONFIGURE_ARGS+=--disable-pinentry-qt4 PLIST_SUB+= WITH_QT4="@comment " .endif .if ${PORT_OPTIONS:MGTK} USE_GNOME+= gtk12 PLIST_SUB+= WITH_GTK="" .else CONFIGURE_ARGS+=--disable-pinentry-gtk PLIST_SUB+= WITH_GTK="@comment " .endif .if ${PORT_OPTIONS:MGTK2} USE_GNOME+= gtk20 PLIST_SUB+= WITH_GTK2="" .else CONFIGURE_ARGS+=--disable-pinentry-gtk2 PLIST_SUB+= WITH_GTK2="@comment " .endif .if ${PORT_OPTIONS:MNCURSES} USES+= ncurses PLIST_SUB+= WITH_NCURSES="" .else CONFIGURE_ARGS+=--disable-pinentry-curses PLIST_SUB+= WITH_NCURSES="@comment " .endif pre-configure: - ${REINPLACE_CMD} -e "s@-lpthread@${PTHREAD_LIBS}@g" \ - ${WRKSRC}/m4/qt.m4 ${WRKSRC}/configure .if ${PORT_OPTIONS:MQT4} cd ${WRKSRC}/qt4 && \ ${MOC4} pinentrydialog.h > pinentrydialog.moc && \ ${MOC4} qsecurelineedit.h > qsecurelineedit.moc .endif .include Index: head/security/pinentry/distinfo =================================================================== --- head/security/pinentry/distinfo (revision 325272) +++ head/security/pinentry/distinfo (revision 325273) @@ -1,2 +1,2 @@ -SHA256 (pinentry-0.8.1.tar.gz) = 3e17e1d410686d197f96b61b04e3fad28bd6bcb029077bdfd902780934de9132 -SIZE (pinentry-0.8.1.tar.gz) = 504101 +SHA256 (pinentry-0.8.3.tar.bz2) = 568b0b09b50b2388a4f94d704d5bcb28718ecd4654ed1acc43ab1f97d921a0ad +SIZE (pinentry-0.8.3.tar.bz2) = 430753 Property changes on: head/security/pinentry/distinfo ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/pinentry/files/patch-curses-utf =================================================================== --- head/security/pinentry/files/patch-curses-utf (revision 325272) +++ head/security/pinentry/files/patch-curses-utf (nonexistent) @@ -1,40 +0,0 @@ ---- m4/curses.m4.orig 2005-09-08 21:25:01.000000000 +0600 -+++ m4/curses.m4 2008-02-17 22:23:32.000000000 +0500 -@@ -28,7 +28,7 @@ - AC_ARG_ENABLE(ncurses, [ --disable-ncurses don't prefer -lncurses over -lcurses], - , enable_ncurses=yes) - if test "$enable_ncurses" = yes; then -- AC_CHECK_LIB(ncurses, initscr, LIBNCURSES="-lncurses") -+ AC_CHECK_LIB(ncurses, initscr, LIBNCURSES="-lncursesw") - if test "$LIBNCURSES"; then - # Use ncurses header files instead of the ordinary ones, if possible; - # is there a better way of doing this, that avoids looking in specific ---- pinentry/pinentry-curses.c.orig 2007-06-15 17:36:39.000000000 +0600 -+++ pinentry/pinentry-curses.c 2008-02-17 22:28:40.000000000 +0500 -@@ -587,6 +587,13 @@ - SCREEN *screen = 0; - int done = 0; - char *pin_utf8; -+ char *old_ctype = NULL; -+ -+ if (pinentry->lc_ctype) -+ { -+ old_ctype = strdup (setlocale (LC_CTYPE, NULL)); -+ setlocale (LC_CTYPE, pinentry->lc_ctype); -+ } - - /* Open the desired terminal if necessary. */ - if (tty_name) -@@ -739,6 +746,12 @@ - if (screen) - delscreen (screen); - -+ if (old_ctype) -+ { -+ setlocale (LC_CTYPE, old_ctype); -+ free(old_ctype); -+ } -+ - if (ttyfi) - fclose (ttyfi); - if (ttyfo) Property changes on: head/security/pinentry/files/patch-curses-utf ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/security/pinentry-curses/Makefile =================================================================== --- head/security/pinentry-curses/Makefile (revision 325272) +++ head/security/pinentry-curses/Makefile (revision 325273) @@ -1,17 +1,17 @@ # Created by: Michael Nottebrock # $FreeBSD$ PORTNAME= pinentry -PORTREVISION= 3 +PORTREVISION= 0 COMMENT= Curses version of the gnupg password dialog CONFLICTS_INSTALL= pinentry-[0-9]* pinentry-gtk-* \ pinentry-gtk2-* pinentry-qt-* pinentry-qt4-* PINENTRY_SLAVE= -curses PORT_OPTIONS+= NCURSES MASTERDIR= ${.CURDIR}/../pinentry .include "${MASTERDIR}/Makefile" Index: head/security/pinentry-gtk/Makefile =================================================================== --- head/security/pinentry-gtk/Makefile (revision 325272) +++ head/security/pinentry-gtk/Makefile (revision 325273) @@ -1,17 +1,17 @@ # Created by: Michael Nottebrock # $FreeBSD$ PORTNAME= pinentry -PORTREVISION= 3 +PORTREVISION= 0 COMMENT= GTK version of the gnupg password dialog CONFLICTS_INSTALL= pinentry-[0-9]* pinentry-curses-* \ pinentry-gtk2-* pinentry-qt-* pinentry-qt4-* PINENTRY_SLAVE= -gtk PORT_OPTIONS+= GTK MASTERDIR= ${.CURDIR}/../pinentry .include "${MASTERDIR}/Makefile" Index: head/security/pinentry-gtk2/Makefile =================================================================== --- head/security/pinentry-gtk2/Makefile (revision 325272) +++ head/security/pinentry-gtk2/Makefile (revision 325273) @@ -1,17 +1,17 @@ # Created by: Jean-Yves Lefort # $FreeBSD$ PORTNAME= pinentry -PORTREVISION= 3 +PORTREVISION= 0 COMMENT= GTK+ 2.0 version of the GnuPG password dialog CONFLICTS_INSTALL= pinentry-[0-9]* pinentry-curses-* pinentry-gtk-* \ pinentry-qt-* pinentry-qt4-* PINENTRY_SLAVE= -gtk2 PORT_OPTIONS+= GTK2 MASTERDIR= ${.CURDIR}/../pinentry .include "${MASTERDIR}/Makefile" Index: head/security/pinentry-qt4/Makefile =================================================================== --- head/security/pinentry-qt4/Makefile (revision 325272) +++ head/security/pinentry-qt4/Makefile (revision 325273) @@ -1,16 +1,16 @@ # $FreeBSD$ PORTNAME= pinentry -PORTREVISION= 3 +PORTREVISION= 0 COMMENT= Qt 4 version of the gnupg password dialog CONFLICTS_INSTALL= pinentry-[0-9]* pinentry-curses-* pinentry-gtk-* \ pinentry-gtk2-* pinentry-qt-* PINENTRY_SLAVE= -qt4 PORT_OPTIONS+= QT4 MASTERDIR= ${.CURDIR}/../pinentry .include "${MASTERDIR}/Makefile"