From owner-svn-ports-all@FreeBSD.ORG  Sat Apr 18 10:59:36 2015
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])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 6ECB5EE9;
 Sat, 18 Apr 2015 10:59:36 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5D593DE7;
 Sat, 18 Apr 2015 10:59:36 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3IAxaS7033782;
 Sat, 18 Apr 2015 10:59:36 GMT (envelope-from marino@FreeBSD.org)
Received: (from marino@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3IAxaFN033780;
 Sat, 18 Apr 2015 10:59:36 GMT (envelope-from marino@FreeBSD.org)
Message-Id: <201504181059.t3IAxaFN033780@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: marino set sender to
 marino@FreeBSD.org using -f
From: John Marino <marino@FreeBSD.org>
Date: Sat, 18 Apr 2015 10:59:36 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r384222 - head/news/husky-fidoconf
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.20
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: Sat, 18 Apr 2015 10:59:36 -0000

Author: marino
Date: Sat Apr 18 10:59:35 2015
New Revision: 384222
URL: https://svnweb.freebsd.org/changeset/ports/384222

Log:
  news/husky-fidoconf: Test feature rather than OPSYS/OSVERSION
  
  Testing for OPSYS/OSVERSION requires <pre> and <post> inclusions and
  isn't necessary.  All we need is the same logic that USES=makeinfo uses.
  This simplifies previous commit.

Modified:
  head/news/husky-fidoconf/Makefile

Modified: head/news/husky-fidoconf/Makefile
==============================================================================
--- head/news/husky-fidoconf/Makefile	Sat Apr 18 10:53:31 2015	(r384221)
+++ head/news/husky-fidoconf/Makefile	Sat Apr 18 10:59:35 2015	(r384222)
@@ -16,8 +16,6 @@ INSTALL_TARGET=	install install-man
 MASTERDIR=      ${.CURDIR}/../husky
 COMPONENT_SUBDIR=       fidoconf
 
-.include <bsd.port.pre.mk>
-
 post-patch:
 	${REINPLACE_CMD} -e 's^/path/to/config^${PREFIX}/etc/fido/config^' \
 		${WRKSRC}/man/linkedto.1
@@ -26,7 +24,7 @@ post-patch:
 # The correct fix is to update the texi file so modern texinfo can use it
 # Until then, disable installation of info page on FreeBSD 11 and DragonFly
 # to unbreak the build on those platforms.
-.if ${OPSYS} == DragonFly || (${OPSYS} == FreeBSD && ${OSVERSION} > 1100000)
+.if !exists(/usr/bin/makeinfo)
 	${REINPLACE_CMD} -e '/cd doc /d' ${WRKSRC}/Makefile
 .else
 USES+=		makeinfo
@@ -48,4 +46,4 @@ post-install:
 	${LN} -sf fconf2.1 ${STAGEDIR}${PREFIX}/man/man1/fconf2tornado.1
 	${LN} -sf fconf2.1 ${STAGEDIR}${PREFIX}/man/man1/fecfg2fconf.1
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>