Date: Tue, 9 Jul 2013 13:37:14 +0000 (UTC) From: Max Brazhnikov <makc@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r322559 - in head: . security security/pinentry security/pinentry-curses security/pinentry-gtk security/pinentry-gtk2 security/pinentry-qt security/pinentry-qt4 Message-ID: <201307091337.r69DbEsh005987@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: makc Date: Tue Jul 9 13:37:13 2013 New Revision: 322559 URL: http://svnweb.freebsd.org/changeset/ports/322559 Log: - Remove security/pinentry-qt: Qt3 ports are deprecated. - minor fixes/changes. Deleted: head/security/pinentry-qt/ Modified: head/MOVED head/security/Makefile head/security/pinentry-curses/Makefile head/security/pinentry-gtk/Makefile head/security/pinentry-gtk2/Makefile head/security/pinentry-qt4/Makefile head/security/pinentry/Makefile head/security/pinentry/pkg-plist (contents, props changed) Modified: head/MOVED ============================================================================== --- head/MOVED Tue Jul 9 13:08:53 2013 (r322558) +++ head/MOVED Tue Jul 9 13:37:13 2013 (r322559) @@ -4420,3 +4420,4 @@ graphics/linux-dri74||2013-07-03|Removed games/gnomememoryblocks||2013-07-04|Has expired: Unsupported upstream devel/py-reddit||2013-07-07|Has been removed from PyPI, Use www/py-praw games/speakinghangman||2013-07-07|Has expired: No more public distfiles +security/pinentry-qt||2013-07-09|Removed: Qt3 ports have expired Modified: head/security/Makefile ============================================================================== --- head/security/Makefile Tue Jul 9 13:08:53 2013 (r322558) +++ head/security/Makefile Tue Jul 9 13:37:13 2013 (r322559) @@ -709,7 +709,6 @@ SUBDIR += pinentry-curses SUBDIR += pinentry-gtk SUBDIR += pinentry-gtk2 - SUBDIR += pinentry-qt SUBDIR += pinentry-qt4 SUBDIR += pkcrack SUBDIR += pkcs11-dump Modified: head/security/pinentry-curses/Makefile ============================================================================== --- head/security/pinentry-curses/Makefile Tue Jul 9 13:08:53 2013 (r322558) +++ head/security/pinentry-curses/Makefile Tue Jul 9 13:37:13 2013 (r322559) @@ -2,6 +2,7 @@ # $FreeBSD$ PORTNAME= pinentry +PORTREVISION= 3 COMMENT= Curses version of the gnupg password dialog Modified: head/security/pinentry-gtk/Makefile ============================================================================== --- head/security/pinentry-gtk/Makefile Tue Jul 9 13:08:53 2013 (r322558) +++ head/security/pinentry-gtk/Makefile Tue Jul 9 13:37:13 2013 (r322559) @@ -2,6 +2,7 @@ # $FreeBSD$ PORTNAME= pinentry +PORTREVISION= 3 COMMENT= GTK version of the gnupg password dialog Modified: head/security/pinentry-gtk2/Makefile ============================================================================== --- head/security/pinentry-gtk2/Makefile Tue Jul 9 13:08:53 2013 (r322558) +++ head/security/pinentry-gtk2/Makefile Tue Jul 9 13:37:13 2013 (r322559) @@ -2,6 +2,7 @@ # $FreeBSD$ PORTNAME= pinentry +PORTREVISION= 3 COMMENT= GTK+ 2.0 version of the GnuPG password dialog Modified: head/security/pinentry-qt4/Makefile ============================================================================== --- head/security/pinentry-qt4/Makefile Tue Jul 9 13:08:53 2013 (r322558) +++ head/security/pinentry-qt4/Makefile Tue Jul 9 13:37:13 2013 (r322559) @@ -1,8 +1,9 @@ # $FreeBSD$ PORTNAME= pinentry +PORTREVISION= 3 -COMMENT= QT4 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-* Modified: head/security/pinentry/Makefile ============================================================================== --- head/security/pinentry/Makefile Tue Jul 9 13:08:53 2013 (r322558) +++ head/security/pinentry/Makefile Tue Jul 9 13:37:13 2013 (r322559) @@ -3,7 +3,7 @@ PORTNAME= pinentry PORTVERSION= 0.8.1 -PORTREVISION?= 3 +PORTREVISION?= 4 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_GNUPG} MASTER_SITE_SUBDIR= pinentry @@ -14,11 +14,11 @@ COMMENT?= Collection of simple PIN or pa LIB_DEPENDS= gcrypt:${PORTSDIR}/security/libgcrypt \ ksba.19:${PORTSDIR}/security/libksba -CONFLICTS_INSTALL?= pinentry-[a-z]*-[0.9]* +CONFLICTS_INSTALL?= pinentry-[a-z]* -USES= iconv +USES= iconv gmake GNU_CONFIGURE= yes -USE_GMAKE= yes +CONFIGURE_ARGS+=--disable-pinentry-qt INFO= pinentry CFLAGS+= -I${LOCALBASE}/include @@ -26,33 +26,21 @@ LDFLAGS+= -L${LOCALBASE}/lib .if !defined(PINENTRY_SLAVE) OPTIONS_MULTI= FRONTEND -OPTIONS_MULTI_FRONTEND= NCURSES GTK GTK2 QT3 QT4 -OPTIONS_DEFAULT= ${OPTIONS_MULTI_FRONTEND:NQT3} +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 -QT3_DESC= Qt3 frontend -QT4_DESC= Qt4 frontend +GTK_DESC= Gtk+ 1 frontend +GTK2_DESC= Gtk+ 2 frontend +QT4_DESC= Qt 4 frontend .else PKGNAMESUFFIX= ${PINENTRY_SLAVE} .endif .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MQT3} -USE_QT_VER= 3 -PLIST_SUB+= WITH_QT3="" -MOC3= ${LOCALBASE}/bin/moc -.else -CONFIGURE_ARGS+=--disable-pinentry-qt -PLIST_SUB+= WITH_QT3="@comment " -.endif - .if ${PORT_OPTIONS:MQT4} -# bsd.kde.mk overrides MOC from bsd.qt.mk -USE_QT4= gui # moc_build -BUILD_DEPENDS+= ${MOC4}:${PORTSDIR}/devel/qt4-moc +USE_QT4= gui moc_build PLIST_SUB+= WITH_QT4="" MOC4= ${LOCALBASE}/bin/moc-qt4 LDFLAGS+= ${PTHREAD_LIBS} @@ -88,10 +76,6 @@ PLIST_SUB+= WITH_NCURSES="@comment " pre-configure: ${REINPLACE_CMD} -e "s@-lpthread@${PTHREAD_LIBS}@g" \ ${WRKSRC}/m4/qt.m4 ${WRKSRC}/configure -.if ${PORT_OPTIONS:MQT3} - ${REINPLACE_CMD} -e "/^MOC/s,@MOC@,${MOC3}," \ - ${WRKSRC}/qt/Makefile.in -.endif .if ${PORT_OPTIONS:MQT4} cd ${WRKSRC}/qt4 && \ ${MOC4} pinentrydialog.h > pinentrydialog.moc && \ Modified: head/security/pinentry/pkg-plist ============================================================================== --- head/security/pinentry/pkg-plist Tue Jul 9 13:08:53 2013 (r322558) +++ head/security/pinentry/pkg-plist Tue Jul 9 13:37:13 2013 (r322559) @@ -2,5 +2,4 @@ bin/pinentry %%WITH_NCURSES%%bin/pinentry-curses %%WITH_GTK%%bin/pinentry-gtk %%WITH_GTK2%%bin/pinentry-gtk-2 -%%WITH_QT3%%bin/pinentry-qt %%WITH_QT4%%bin/pinentry-qt4
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307091337.r69DbEsh005987>