svn commit: r313329 - head/Mk

[Martin Wilke]

Author: miwi
Date: Sun Mar  3 06:53:34 2013
New Revision: 313329
URL: http://svnweb.freebsd.org/changeset/ports/313329

Log:
  - Drop obsoleted USE_QT_VER=4 [1]
  - Add auditdistd user to the blacklist [2]
  
  PR:		171797 [1]
  		176276 [2]
  Submitted by:	makc@ [1]
  		"John W. O'Brien" <john at saltant.com> [2]

Modified:
  head/Mk/bsd.port.mk

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Sun Mar  3 05:15:16 2013	(r313328)
+++ head/Mk/bsd.port.mk	Sun Mar  3 06:53:34 2013	(r313329)
@@ -1280,7 +1280,7 @@ GID_OFFSET?=	0
 
 # predefined accounts from src/etc/master.passwd
 # alpha numeric sort order
-USERS_BLACKLIST=	_dhcp _pflogd bin bind daemon games hast kmem mailnull man news nobody operator pop proxy root smmsp sshd toor tty uucp www
+USERS_BLACKLIST=	_dhcp _pflogd auditdistd bin bind daemon games hast kmem mailnull man news nobody operator pop proxy root smmsp sshd toor tty uucp www
 
 LDCONFIG_DIR=	libdata/ldconfig
 LDCONFIG32_DIR=	libdata/ldconfig32
@@ -1463,7 +1463,7 @@ PKGCOMPATDIR?=		${LOCALBASE}/lib/compat/
 .include "${PORTSDIR}/Mk/bsd.kde.mk"
 .endif
 
-.if defined(USE_QT_VER) && ${USE_QT_VER:L} == 4 || defined(USE_QT4)
+.if defined(USE_QT4)
 .include "${PORTSDIR}/Mk/bsd.qt.mk"
 .endif
 
@@ -2059,7 +2059,7 @@ IGNORE=	uses unknown USE_BISON construct
 .include "${PORTSDIR}/Mk/bsd.linux-apps.mk"
 .endif
 
-.if defined(USE_QT_VER) && ${USE_QT_VER:L} == 4 || defined(USE_QT4)
+.if defined(USE_QT4)
 .include "${PORTSDIR}/Mk/bsd.qt.mk"
 .endif