From owner-svn-ports-all@FreeBSD.ORG  Sun Jul  7 12:04:47 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 03650108;
 Sun,  7 Jul 2013 12:04:47 +0000 (UTC)
 (envelope-from bapt@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 E914811D8;
 Sun,  7 Jul 2013 12:04:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r67C4k24073708;
 Sun, 7 Jul 2013 12:04:46 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r67C4kN4073707;
 Sun, 7 Jul 2013 12:04:46 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201307071204.r67C4kN4073707@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sun, 7 Jul 2013 12:04:46 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r322430 - head/editors/softmaker-office
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 <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: Sun, 07 Jul 2013 12:04:47 -0000

Author: bapt
Date: Sun Jul  7 12:04:46 2013
New Revision: 322430
URL: http://svnweb.freebsd.org/changeset/ports/322430

Log:
  Remove usage of X_FONTSERVER_PORT while here use options helpers

Modified:
  head/editors/softmaker-office/Makefile

Modified: head/editors/softmaker-office/Makefile
==============================================================================
--- head/editors/softmaker-office/Makefile	Sun Jul  7 12:01:34 2013	(r322429)
+++ head/editors/softmaker-office/Makefile	Sun Jul  7 12:04:46 2013	(r322430)
@@ -11,7 +11,7 @@ DISTFILES=	ofb06trial.tgz
 MAINTAINER=	itetcu@FreeBSD.org
 COMMENT=	Microsoft Word/Excel OpenDocument and OpenOffice.org editor
 
-RUN_DEPENDS=	${LOCALBASE}/bin/xfs:${X_FONTSERVER_PORT}
+RUN_DEPENDS=	${LOCALBASE}/bin/xfs:${PORTSDIR}/x11-fonts/xfs
 
 USE_XORG=	x11
 
@@ -29,11 +29,7 @@ NO_PACKAGE=	distribution with other prod
 
 ONLY_FOR_ARCHS=	i386
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MALL_DICTS}
-DISTFILES+=	sml06dict.tgz
-.endif
+ALL_DICTS_DISTFILES=	sml06dict.tgz
 
 post-extract:
 	cd ${WRKSRC} && ${FIND} . -type f -execdir ${CHMOD} ${SHAREMODE} \{\} \; && \