From owner-svn-ports-all@FreeBSD.ORG Wed Feb 6 12:00:31 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 5436230A; Wed, 6 Feb 2013 12:00:31 +0000 (UTC) (envelope-from makc@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 46A663A7; Wed, 6 Feb 2013 12:00:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r16C0V7W002631; Wed, 6 Feb 2013 12:00:31 GMT (envelope-from makc@svn.freebsd.org) Received: (from makc@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r16C0Uf3002623; Wed, 6 Feb 2013 12:00:30 GMT (envelope-from makc@svn.freebsd.org) Message-Id: <201302061200.r16C0Uf3002623@svn.freebsd.org> From: Max Brazhnikov Date: Wed, 6 Feb 2013 12:00:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r311760 - in head/security: pinentry pinentry-curses pinentry-gtk pinentry-gtk2 pinentry-qt pinentry-qt4 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Feb 2013 12:00:31 -0000 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 -# +# Created by: Michael Nottebrock # $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 -# +# Created by: Michael Nottebrock # $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 -# +# Created by: Jean-Yves Lefort # $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 -# +# Created by: Michael Nottebrock # $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 -# # $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@gmx.net -# +# Created by: Michael Nottebrock # $FreeBSD$ -# PORTNAME= pinentry PORTVERSION= 0.8.1 @@ -13,7 +9,7 @@ MASTER_SITES= ${MASTER_SITE_GNUPG} MASTER_SITE_SUBDIR= pinentry MAINTAINER= makc@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}