From owner-svn-ports-head@FreeBSD.ORG Wed Dec 24 22:33:59 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9DFF050E; Wed, 24 Dec 2014 22:33:59 +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 7EA4364EE0; Wed, 24 Dec 2014 22:33:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBOMXxqP090848; Wed, 24 Dec 2014 22:33:59 GMT (envelope-from makc@FreeBSD.org) Received: (from makc@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBOMXvns090839; Wed, 24 Dec 2014 22:33:57 GMT (envelope-from makc@FreeBSD.org) Message-Id: <201412242233.sBOMXvns090839@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: makc set sender to makc@FreeBSD.org using -f From: Max Brazhnikov Date: Wed, 24 Dec 2014 22:33:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r375494 - in head/security: . pinentry pinentry-curses pinentry-gtk2 pinentry-qt4 pinentry-tty 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: Wed, 24 Dec 2014 22:33:59 -0000 Author: makc Date: Wed Dec 24 22:33:57 2014 New Revision: 375494 URL: https://svnweb.freebsd.org/changeset/ports/375494 QAT: https://qat.redports.org/buildarchive/r375494/ Log: security/pinentry: - Resolve mutual conflict for security/pinentry-* ports - Add new port security/pinentry-tty for pure console version of pinentry - Convert security/pinentry to meta-alike port that depends on pinentry-tty by default and installs commons files (documentation). Mark it architecture independent. Added: head/security/pinentry-tty/ head/security/pinentry-tty/Makefile (contents, props changed) Deleted: head/security/pinentry/pkg-plist Modified: head/security/Makefile head/security/pinentry-curses/Makefile head/security/pinentry-gtk2/Makefile head/security/pinentry-qt4/Makefile head/security/pinentry/Makefile Modified: head/security/Makefile ============================================================================== --- head/security/Makefile Wed Dec 24 22:30:42 2014 (r375493) +++ head/security/Makefile Wed Dec 24 22:33:57 2014 (r375494) @@ -725,6 +725,7 @@ SUBDIR += pinentry-curses SUBDIR += pinentry-gtk2 SUBDIR += pinentry-qt4 + SUBDIR += pinentry-tty SUBDIR += pkcrack SUBDIR += pkcs11-dump SUBDIR += pkcs11-gateway Modified: head/security/pinentry-curses/Makefile ============================================================================== --- head/security/pinentry-curses/Makefile Wed Dec 24 22:30:42 2014 (r375493) +++ head/security/pinentry-curses/Makefile Wed Dec 24 22:33:57 2014 (r375494) @@ -2,15 +2,11 @@ # $FreeBSD$ PORTNAME= pinentry -PORTREVISION= 0 +PORTREVISION= 1 -COMMENT= Curses version of the gnupg password dialog +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 +PINENTRY_GUI= curses MASTERDIR= ${.CURDIR}/../pinentry Modified: head/security/pinentry-gtk2/Makefile ============================================================================== --- head/security/pinentry-gtk2/Makefile Wed Dec 24 22:30:42 2014 (r375493) +++ head/security/pinentry-gtk2/Makefile Wed Dec 24 22:33:57 2014 (r375494) @@ -2,15 +2,11 @@ # $FreeBSD$ PORTNAME= pinentry -PORTREVISION= 0 +PORTREVISION= 1 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 +PINENTRY_GUI= gtk2 MASTERDIR= ${.CURDIR}/../pinentry Modified: head/security/pinentry-qt4/Makefile ============================================================================== --- head/security/pinentry-qt4/Makefile Wed Dec 24 22:30:42 2014 (r375493) +++ head/security/pinentry-qt4/Makefile Wed Dec 24 22:33:57 2014 (r375494) @@ -1,15 +1,11 @@ # $FreeBSD$ PORTNAME= pinentry -PORTREVISION= 0 +PORTREVISION= 1 -COMMENT= Qt 4 version of the gnupg password dialog +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 +PINENTRY_GUI= qt4 MASTERDIR= ${.CURDIR}/../pinentry Added: head/security/pinentry-tty/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/pinentry-tty/Makefile Wed Dec 24 22:33:57 2014 (r375494) @@ -0,0 +1,12 @@ +# $FreeBSD$ + +PORTNAME= pinentry +PORTREVISION= 0 + +COMMENT= Console version of the GnuPG password dialog + +PINENTRY_GUI= tty + +MASTERDIR= ${.CURDIR}/../pinentry + +.include "${MASTERDIR}/Makefile" Modified: head/security/pinentry/Makefile ============================================================================== --- head/security/pinentry/Makefile Wed Dec 24 22:30:42 2014 (r375493) +++ head/security/pinentry/Makefile Wed Dec 24 22:33:57 2014 (r375494) @@ -3,77 +3,109 @@ PORTNAME= pinentry PORTVERSION= 0.9.0 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= security MASTER_SITES= GNUPG/pinentry MAINTAINER= makc@FreeBSD.org COMMENT?= Collection of simple PIN or passphrase entry dialogs -LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt \ - libksba.so:${PORTSDIR}/security/libksba +USES= tar:bzip2 -CONFLICTS_INSTALL?= pinentry-[a-z]* - -USES= iconv gmake pkgconfig tar:bzip2 -GNU_CONFIGURE= yes +.if !defined(PINENTRY_GUI) INFO= pinentry - -CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib - -.if !defined(PINENTRY_SLAVE) -OPTIONS_MULTI= FRONTEND -OPTIONS_MULTI_FRONTEND= NCURSES GTK2 QT4 -OPTIONS_DEFAULT= ${OPTIONS_MULTI_FRONTEND} +NO_ARCH= yes +NO_BUILD= yes +PLIST_FILES= bin/pinentry + +OPTIONS_SINGLE= FRONTEND +OPTIONS_SINGLE_FRONTEND= TTY NCURSES GTK2 QT4 +OPTIONS_DEFAULT= TTY + +FRONTEND_DESC= Default frontend + +TTY_DESC= Console version +PINENTRY_TTY= pinentry-tty +TTY_RUN_DEPENDS= ${PINENTRY_TTY}:${PORTSDIR}/security/pinentry-tty NCURSES_DESC= Curses frontend +PINENTRY_NCURSES= pinentry-curses +NCURSES_RUN_DEPENDS= ${PINENTRY_NCURSES}:${PORTSDIR}/security/pinentry-curses + GTK2_DESC= Gtk+ 2 frontend +PINENTRY_GTK2= pinentry-gtk-2 +GTK2_RUN_DEPENDS= ${PINENTRY_GTK2}:${PORTSDIR}/security/pinentry-gtk2 + QT4_DESC= Qt 4 frontend +PINENTRY_QT4= pinentry-qt4 +QT4_RUN_DEPENDS= ${PINENTRY_QT4}:${PORTSDIR}/security/pinentry-qt4 -. if exists(/usr/lib/libc++.so) -OPTIONS_DEFAULT:= ${OPTIONS_DEFAULT:NQT4} -QT4_DESC= Qt 4 frontend (broken) +.include + +.for gui in ${OPTIONS_SINGLE_FRONTEND} +. if ${PORT_OPTIONS:M${gui}} +PINENTRY_BIN= ${PINENTRY_${gui}} . endif -.else -PKGNAMESUFFIX= ${PINENTRY_SLAVE} -.endif +.endfor -.include +do-install: + ${LN} -sf ${PINENTRY_BIN} ${STAGEDIR}${PREFIX}/bin/pinentry + ${INSTALL_DATA} ${WRKSRC}/doc/pinentry.info ${STAGEDIR}${PREFIX}/${INFO_PATH} + +.else # !defined(PINENTRY_GUI) +PKGNAMESUFFIX= -${PINENTRY_GUI} +LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt \ + libksba.so:${PORTSDIR}/security/libksba + +USES+= iconv gmake pkgconfig +GNU_CONFIGURE= yes + +CFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -.if ${PORT_OPTIONS:MQT4} +.if ${PINENTRY_GUI} == "qt4" . if exists(/usr/lib/libc++.so) -IGNORE= with Qt 4 frontend does not compile with libc++ +IGNORE= does not compile with libc++ . endif USE_QT4= gui moc_build -PLIST_SUB+= WITH_QT4="" +PLIST_FILES= bin/pinentry-qt4 .else CONFIGURE_ARGS+=--disable-pinentry-qt4 -PLIST_SUB+= WITH_QT4="@comment " .endif -.if ${PORT_OPTIONS:MGTK2} +.if ${PINENTRY_GUI} == "gtk2" USE_GNOME+= gtk20 -PLIST_SUB+= WITH_GTK2="" +PLIST_FILES= bin/pinentry-gtk-2 .else CONFIGURE_ARGS+=--disable-pinentry-gtk2 -PLIST_SUB+= WITH_GTK2="@comment " .endif -.if ${PORT_OPTIONS:MNCURSES} +.if ${PINENTRY_GUI} == "curses" USES+= ncurses -PLIST_SUB+= WITH_NCURSES="" +PLIST_FILES= bin/pinentry-curses .else CONFIGURE_ARGS+=--disable-pinentry-curses -PLIST_SUB+= WITH_NCURSES="@comment " +.endif + +.if ${PINENTRY_GUI} == "tty" +PLIST_FILES= bin/pinentry-tty +CONFIGURE_ARGS+=--enable-pinentry-tty +.else +CONFIGURE_ARGS+=--disable-pinentry-tty .endif pre-configure: -.if ${PORT_OPTIONS:MQT4} +.if ${PINENTRY_GUI} == "qt4" cd ${WRKSRC}/qt4 && \ ${MOC} pinentrydialog.h > pinentrydialog.moc && \ ${MOC} qsecurelineedit.h > qsecurelineedit.moc && \ ${MOC} pinentryconfirm.h > pinentryconfirm.moc .endif +post-install: + ${RM} ${STAGEDIR}${PREFIX}/bin/pinentry \ + ${STAGEDIR}${PREFIX}/info/pinentry.info + +.endif # !defined(PINENTRY_GUI) + .include