From owner-svn-ports-head@FreeBSD.ORG Thu Nov 13 14:42:32 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E280B5F4; Thu, 13 Nov 2014 14:42:32 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C35E5263; Thu, 13 Nov 2014 14:42:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sADEgW27096319; Thu, 13 Nov 2014 14:42:32 GMT (envelope-from makc@FreeBSD.org) Received: (from makc@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sADEgVgl096307; Thu, 13 Nov 2014 14:42:31 GMT (envelope-from makc@FreeBSD.org) Message-Id: <201411131442.sADEgVgl096307@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: makc set sender to makc@FreeBSD.org using -f From: Max Brazhnikov Date: Thu, 13 Nov 2014 14:42:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r372524 - in head: . security security/pinentry security/pinentry-gtk X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Nov 2014 14:42:33 -0000 Author: makc Date: Thu Nov 13 14:42:30 2014 New Revision: 372524 URL: https://svnweb.freebsd.org/changeset/ports/372524 QAT: https://qat.redports.org/buildarchive/r372524/ Log: security/pinentry: - Update to 0.9.0 - Remove pinentry-gtk port (GTK+ 1 support is discontinued upstream) - Ignore Qt 4 frontend on 10 and greater, it fails to build with clang/libc++ Deleted: head/security/pinentry-gtk/ Modified: head/MOVED head/security/Makefile head/security/pinentry/Makefile head/security/pinentry/distinfo head/security/pinentry/pkg-plist Modified: head/MOVED ============================================================================== --- head/MOVED Thu Nov 13 14:32:39 2014 (r372523) +++ head/MOVED Thu Nov 13 14:42:30 2014 (r372524) @@ -7181,3 +7181,4 @@ science/elmer-eio|cad/elmerfem|2014-11-0 science/elmer-matc|cad/elmerfem|2014-11-07|Has expired: Obsoleted by cad/elmerfem science/elmer-meshgen2d|cad/elmerfem|2014-11-07|Has expired: Obsoleted by cad/elmerfem science/elmergrid|cad/elmerfem|2014-11-07|Has expired: Obsoleted by cad/elmerfem +security/pinentry-gtk||2014-11-13|Removed: upstream ended support for GTK+ 1 Modified: head/security/Makefile ============================================================================== --- head/security/Makefile Thu Nov 13 14:32:39 2014 (r372523) +++ head/security/Makefile Thu Nov 13 14:42:30 2014 (r372524) @@ -716,7 +716,6 @@ SUBDIR += pidgin-otr SUBDIR += pinentry SUBDIR += pinentry-curses - SUBDIR += pinentry-gtk SUBDIR += pinentry-gtk2 SUBDIR += pinentry-qt4 SUBDIR += pkcrack Modified: head/security/pinentry/Makefile ============================================================================== --- head/security/pinentry/Makefile Thu Nov 13 14:32:39 2014 (r372523) +++ head/security/pinentry/Makefile Thu Nov 13 14:42:30 2014 (r372524) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= pinentry -PORTVERSION= 0.8.3 -PORTREVISION?= 3 +PORTVERSION= 0.9.0 +PORTREVISION?= 0 CATEGORIES= security MASTER_SITES= GNUPG/pinentry @@ -17,7 +17,6 @@ CONFLICTS_INSTALL?= pinentry-[a-z]* USES= iconv gmake pkgconfig tar:bzip2 GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--disable-pinentry-qt INFO= pinentry CFLAGS+= -I${LOCALBASE}/include @@ -25,11 +24,10 @@ LDFLAGS+= -L${LOCALBASE}/lib .if !defined(PINENTRY_SLAVE) OPTIONS_MULTI= FRONTEND -OPTIONS_MULTI_FRONTEND= NCURSES GTK GTK2 QT4 -OPTIONS_DEFAULT= ${OPTIONS_MULTI_FRONTEND} +OPTIONS_MULTI_FRONTEND= NCURSES GTK2 QT4 +OPTIONS_DEFAULT= ${PINENTRY_DEFAULT} NCURSES_DESC= Curses frontend -GTK_DESC= Gtk+ 1 frontend GTK2_DESC= Gtk+ 2 frontend QT4_DESC= Qt 4 frontend .else @@ -38,8 +36,19 @@ PKGNAMESUFFIX= ${PINENTRY_SLAVE} .include +.if !defined(PINENTRY_SLAVE) +. if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000 +PINENTRY_DEFAULT= ${OPTIONS_MULTI_FRONTEND:NQT4} +QT4_DESC= Qt 4 frontend (broken) +. else +PINENTRY_DEFAULT= ${OPTIONS_MULTI_FRONTEND} +. endif +.endif + .if ${PORT_OPTIONS:MQT4} -USE_GCC= any +. if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000 +IGNORE= with Qt 4 frontend does not compile with libc++ +. endif USE_QT4= gui moc_build PLIST_SUB+= WITH_QT4="" MOC4= ${LOCALBASE}/bin/moc-qt4 @@ -48,14 +57,6 @@ 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="" @@ -76,7 +77,8 @@ pre-configure: .if ${PORT_OPTIONS:MQT4} cd ${WRKSRC}/qt4 && \ ${MOC4} pinentrydialog.h > pinentrydialog.moc && \ - ${MOC4} qsecurelineedit.h > qsecurelineedit.moc + ${MOC4} qsecurelineedit.h > qsecurelineedit.moc && \ + ${MOC4} pinentryconfirm.h > pinentryconfirm.moc .endif .include Modified: head/security/pinentry/distinfo ============================================================================== --- head/security/pinentry/distinfo Thu Nov 13 14:32:39 2014 (r372523) +++ head/security/pinentry/distinfo Thu Nov 13 14:42:30 2014 (r372524) @@ -1,2 +1,2 @@ -SHA256 (pinentry-0.8.3.tar.bz2) = 568b0b09b50b2388a4f94d704d5bcb28718ecd4654ed1acc43ab1f97d921a0ad -SIZE (pinentry-0.8.3.tar.bz2) = 430753 +SHA256 (pinentry-0.9.0.tar.bz2) = 90045a07ab8e1a8e1ecf5d19b51691f195525e579fa5d71d7e92c120b05490ab +SIZE (pinentry-0.9.0.tar.bz2) = 464272 Modified: head/security/pinentry/pkg-plist ============================================================================== --- head/security/pinentry/pkg-plist Thu Nov 13 14:32:39 2014 (r372523) +++ head/security/pinentry/pkg-plist Thu Nov 13 14:42:30 2014 (r372524) @@ -1,5 +1,4 @@ bin/pinentry %%WITH_NCURSES%%bin/pinentry-curses -%%WITH_GTK%%bin/pinentry-gtk %%WITH_GTK2%%bin/pinentry-gtk-2 %%WITH_QT4%%bin/pinentry-qt4