From owner-svn-ports-all@FreeBSD.ORG  Wed Jan 15 23:55:57 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 912BBB0C;
 Wed, 15 Jan 2014 23:55:57 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7CB4814CB;
 Wed, 15 Jan 2014 23:55:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0FNtvmr092488;
 Wed, 15 Jan 2014 23:55:57 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0FNtvXj092487;
 Wed, 15 Jan 2014 23:55:57 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201401152355.s0FNtvXj092487@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Wed, 15 Jan 2014 23:55:57 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r339874 - head/deskutils/tine20
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.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 15 Jan 2014 23:55:57 -0000

Author: bapt
Date: Wed Jan 15 23:55:57 2014
New Revision: 339874
URL: http://svnweb.freebsd.org/changeset/ports/339874
QAT: https://qat.redports.org/buildarchive/r339874/

Log:
  Reduce over inclusion of bsd.port.mk
  Use options helpers

Modified:
  head/deskutils/tine20/Makefile

Modified: head/deskutils/tine20/Makefile
==============================================================================
--- head/deskutils/tine20/Makefile	Wed Jan 15 23:52:25 2014	(r339873)
+++ head/deskutils/tine20/Makefile	Wed Jan 15 23:55:57 2014	(r339874)
@@ -29,21 +29,10 @@ USE_MYSQL=	yes
 USE_PHP=	ctype dom gd iconv json mcrypt mysql pdo_mysql simplexml spl xml zip
 WANT_PHP_WEB=	yes
 
-.include <bsd.port.options.mk>
+APC_USE=	php=apc
+LDAP_USE=	php=ldap
+MEMCACHE_USE=	php=memcache
 
-.if ${PORT_OPTIONS:MAPC}
-USE_PHP+=	apc
-.endif
-
-.if ${PORT_OPTIONS:MLDAP}
-USE_PHP+=	ldap
-.endif
-
-.if ${PORT_OPTIONS:MMEMCACHE}
-USE_PHP+=	memcache
-.endif
-
-.include <bsd.port.pre.mk>
 do-extract:
 	@${RM} -rf ${WRKDIR}
 	@${MKDIR} ${WRKDIR}/${PORTNAME}
@@ -56,4 +45,4 @@ do-install:
 post-install:
 	${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>