svn commit: r311760 - in head/security: pinentry pinentry-curses pinentry-gtk pinentry-gtk2 pinentry-qt pinentry-qt4
Max Brazhnikov
makc at FreeBSD.org
Wed Feb 6 12:00:31 UTC 2013
Author: makc
Date: Wed Feb 6 12:00:29 2013
New Revision: 311760
URL: http://svnweb.freebsd.org/changeset/ports/311760
Log:
- Fix regression introduced in my previous commit [1]
- Trim Makefile header
- Adjust comment
Reported by: bapt
Modified:
head/security/pinentry-curses/Makefile
head/security/pinentry-gtk/Makefile
head/security/pinentry-gtk2/Makefile
head/security/pinentry-qt/Makefile
head/security/pinentry-qt4/Makefile
head/security/pinentry/Makefile
Modified: head/security/pinentry-curses/Makefile
==============================================================================
--- head/security/pinentry-curses/Makefile Wed Feb 6 11:40:58 2013 (r311759)
+++ head/security/pinentry-curses/Makefile Wed Feb 6 12:00:29 2013 (r311760)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: pinentry-curses
-# Date created: 03 May 2004
-# Whom: Michael Nottebrock <lofi at freebsd.org>
-#
+# Created by: Michael Nottebrock <lofi at freebsd.org>
# $FreeBSD$
-#
PORTNAME= pinentry
Modified: head/security/pinentry-gtk/Makefile
==============================================================================
--- head/security/pinentry-gtk/Makefile Wed Feb 6 11:40:58 2013 (r311759)
+++ head/security/pinentry-gtk/Makefile Wed Feb 6 12:00:29 2013 (r311760)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: pinentry-gtk
-# Date created: 03 May 2004
-# Whom: Michael Nottebrock <lofi at freebsd.org>
-#
+# Created by: Michael Nottebrock <lofi at freebsd.org>
# $FreeBSD$
-#
PORTNAME= pinentry
Modified: head/security/pinentry-gtk2/Makefile
==============================================================================
--- head/security/pinentry-gtk2/Makefile Wed Feb 6 11:40:58 2013 (r311759)
+++ head/security/pinentry-gtk2/Makefile Wed Feb 6 12:00:29 2013 (r311760)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: pinentry-gtk2
-# Date created: 27 Oct 2004
-# Whom: Jean-Yves Lefort <jylefort at brutele.be>
-#
+# Created by: Jean-Yves Lefort <jylefort at brutele.be>
# $FreeBSD$
-#
PORTNAME= pinentry
Modified: head/security/pinentry-qt/Makefile
==============================================================================
--- head/security/pinentry-qt/Makefile Wed Feb 6 11:40:58 2013 (r311759)
+++ head/security/pinentry-qt/Makefile Wed Feb 6 12:00:29 2013 (r311760)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: pinentry-qt
-# Date created: 03 May 2004
-# Whom: Michael Nottebrock <lofi at freebsd.org>
-#
+# Created by: Michael Nottebrock <lofi at freebsd.org>
# $FreeBSD$
-#
PORTNAME= pinentry
Modified: head/security/pinentry-qt4/Makefile
==============================================================================
--- head/security/pinentry-qt4/Makefile Wed Feb 6 11:40:58 2013 (r311759)
+++ head/security/pinentry-qt4/Makefile Wed Feb 6 12:00:29 2013 (r311760)
@@ -1,9 +1,4 @@
-# New ports collection makefile for: pinentry-qt4
-# Date created: 2009-06-23
-# Whom: Max Brazhnikov <makc at FreeBSD.org>
-#
# $FreeBSD$
-#
PORTNAME= pinentry
Modified: head/security/pinentry/Makefile
==============================================================================
--- head/security/pinentry/Makefile Wed Feb 6 11:40:58 2013 (r311759)
+++ head/security/pinentry/Makefile Wed Feb 6 12:00:29 2013 (r311760)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: pinentry
-# Date created: 29 Jan 2003
-# Whom: michaelnottebrock at gmx.net
-#
+# Created by: Michael Nottebrock <lofi at freebsd.org>
# $FreeBSD$
-#
PORTNAME= pinentry
PORTVERSION= 0.8.1
@@ -13,7 +9,7 @@ MASTER_SITES= ${MASTER_SITE_GNUPG}
MASTER_SITE_SUBDIR= pinentry
MAINTAINER= makc at FreeBSD.org
-COMMENT?= A collection of simple PIN or passphrase entry dialogs
+COMMENT?= Collection of simple PIN or passphrase entry dialogs
LIB_DEPENDS= gcrypt.18:${PORTSDIR}/security/libgcrypt \
ksba.19:${PORTSDIR}/security/libksba
@@ -54,7 +50,9 @@ PLIST_SUB+= WITH_QT3="@comment "
.endif
.if ${PORT_OPTIONS:MQT4}
-USE_QT4= gui moc_build
+# bsd.kde.mk overrides MOC from bsd.qt.mk
+USE_QT4= gui # moc_build
+BUILD_DEPENDS+= ${MOC4}:${PORTSDIR}/devel/qt4-moc
PLIST_SUB+= WITH_QT4=""
MOC4= ${LOCALBASE}/bin/moc-qt4
LDFLAGS+= ${PTHREAD_LIBS}
More information about the svn-ports-head
mailing list