kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Remove security/pinentry-qt: Qt3 ports are deprecated.

Browse source 
- minor fixes/changes.
This commit is contained in:
Max Brazhnikov 2013-07-09 13:37:13 +00:00
parent 63cbaaa4df
commit 4206b47dfc
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=322559
9 changed files with 16 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
MOVED
View file

@ -4420,3 +4420,4 @@ graphics/linux-dri74||2013-07-03|Removed
games/gnomememoryblocks||2013-07-04|Has expired: Unsupported upstream games/gnomememoryblocks||2013-07-04|Has expired: Unsupported upstream
devel/py-reddit||2013-07-07|Has been removed from PyPI, Use www/py-praw 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 games/speakinghangman||2013-07-07|Has expired: No more public distfiles
security/pinentry-qt||2013-07-09|Removed: Qt3 ports have expired

1
security/Makefile
View file

@ -709,7 +709,6 @@
SUBDIR += pinentry-curses SUBDIR += pinentry-curses
SUBDIR += pinentry-gtk SUBDIR += pinentry-gtk
SUBDIR += pinentry-gtk2 SUBDIR += pinentry-gtk2
SUBDIR += pinentry-qt
SUBDIR += pinentry-qt4 SUBDIR += pinentry-qt4
SUBDIR += pkcrack SUBDIR += pkcrack
SUBDIR += pkcs11-dump SUBDIR += pkcs11-dump

1
security/pinentry-curses/Makefile
View file

@ -2,6 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= pinentry PORTNAME= pinentry
PORTREVISION= 3
COMMENT= Curses version of the gnupg password dialog COMMENT= Curses version of the gnupg password dialog

1
security/pinentry-gtk/Makefile
View file

@ -2,6 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= pinentry PORTNAME= pinentry
PORTREVISION= 3
COMMENT= GTK version of the gnupg password dialog COMMENT= GTK version of the gnupg password dialog

1
security/pinentry-gtk2/Makefile
View file

@ -2,6 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= pinentry PORTNAME= pinentry
PORTREVISION= 3
COMMENT= GTK+ 2.0 version of the GnuPG password dialog COMMENT= GTK+ 2.0 version of the GnuPG password dialog

16
security/pinentry-qt/Makefile
View file

@ -1,16 +0,0 @@
# Created by: Michael Nottebrock <lofi@freebsd.org>
# $FreeBSD$
PORTNAME= pinentry
COMMENT= QT3 version of the gnupg password dialog
CONFLICTS_INSTALL= pinentry-[0-9]* pinentry-curses-* pinentry-gtk-* \
pinentry-gtk2-* pinentry-qt4-*
PINENTRY_SLAVE= -qt3
PORT_OPTIONS+= QT3
MASTERDIR= ${.CURDIR}/../pinentry
.include "${MASTERDIR}/Makefile"

3
security/pinentry-qt4/Makefile
View file

@ -1,8 +1,9 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= pinentry 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-* \ CONFLICTS_INSTALL= pinentry-[0-9]* pinentry-curses-* pinentry-gtk-* \
pinentry-gtk2-* pinentry-qt-* pinentry-gtk2-* pinentry-qt-*

36
security/pinentry/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= pinentry PORTNAME= pinentry
PORTVERSION= 0.8.1 PORTVERSION= 0.8.1
PORTREVISION?= 3 PORTREVISION?= 4
CATEGORIES= security CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_GNUPG} MASTER_SITES= ${MASTER_SITE_GNUPG}
MASTER_SITE_SUBDIR= pinentry MASTER_SITE_SUBDIR= pinentry
@ -14,11 +14,11 @@ COMMENT?= Collection of simple PIN or passphrase entry dialogs
LIB_DEPENDS= gcrypt:${PORTSDIR}/security/libgcrypt \ LIB_DEPENDS= gcrypt:${PORTSDIR}/security/libgcrypt \
ksba.19:${PORTSDIR}/security/libksba 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 GNU_CONFIGURE= yes
USE_GMAKE= yes CONFIGURE_ARGS+=--disable-pinentry-qt
INFO= pinentry INFO= pinentry
CFLAGS+= -I${LOCALBASE}/include CFLAGS+= -I${LOCALBASE}/include
@ -26,33 +26,21 @@ LDFLAGS+= -L${LOCALBASE}/lib
.if !defined(PINENTRY_SLAVE) .if !defined(PINENTRY_SLAVE)
OPTIONS_MULTI= FRONTEND OPTIONS_MULTI= FRONTEND
OPTIONS_MULTI_FRONTEND= NCURSES GTK GTK2 QT3 QT4 OPTIONS_MULTI_FRONTEND= NCURSES GTK GTK2 QT4
OPTIONS_DEFAULT= ${OPTIONS_MULTI_FRONTEND:NQT3} OPTIONS_DEFAULT= ${OPTIONS_MULTI_FRONTEND}
NCURSES_DESC= Curses frontend NCURSES_DESC= Curses frontend
GTK_DESC= Gtk+1 frontend GTK_DESC= Gtk+ 1 frontend
GTK2_DESC= Gtk+2 frontend GTK2_DESC= Gtk+ 2 frontend
QT3_DESC= Qt3 frontend QT4_DESC= Qt 4 frontend
QT4_DESC= Qt4 frontend
.else .else
PKGNAMESUFFIX= ${PINENTRY_SLAVE} PKGNAMESUFFIX= ${PINENTRY_SLAVE}
.endif .endif
.include <bsd.port.options.mk> .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} .if ${PORT_OPTIONS:MQT4}
# bsd.kde.mk overrides MOC from bsd.qt.mk USE_QT4= gui moc_build
USE_QT4= gui # moc_build
BUILD_DEPENDS+= ${MOC4}:${PORTSDIR}/devel/qt4-moc
PLIST_SUB+= WITH_QT4="" PLIST_SUB+= WITH_QT4=""
MOC4= ${LOCALBASE}/bin/moc-qt4 MOC4= ${LOCALBASE}/bin/moc-qt4
LDFLAGS+= ${PTHREAD_LIBS} LDFLAGS+= ${PTHREAD_LIBS}
@ -88,10 +76,6 @@ PLIST_SUB+= WITH_NCURSES="@comment "
pre-configure: pre-configure:
${REINPLACE_CMD} -e "s@-lpthread@${PTHREAD_LIBS}@g" \ ${REINPLACE_CMD} -e "s@-lpthread@${PTHREAD_LIBS}@g" \
${WRKSRC}/m4/qt.m4 ${WRKSRC}/configure ${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} .if ${PORT_OPTIONS:MQT4}
cd ${WRKSRC}/qt4 && \ cd ${WRKSRC}/qt4 && \
${MOC4} pinentrydialog.h > pinentrydialog.moc && \ ${MOC4} pinentrydialog.h > pinentrydialog.moc && \

1
security/pinentry/pkg-plist
View file

@ -2,5 +2,4 @@ bin/pinentry
%%WITH_NCURSES%%bin/pinentry-curses %%WITH_NCURSES%%bin/pinentry-curses
%%WITH_GTK%%bin/pinentry-gtk %%WITH_GTK%%bin/pinentry-gtk
%%WITH_GTK2%%bin/pinentry-gtk-2 %%WITH_GTK2%%bin/pinentry-gtk-2
%%WITH_QT3%%bin/pinentry-qt
%%WITH_QT4%%bin/pinentry-qt4 %%WITH_QT4%%bin/pinentry-qt4