svn commit: r384222 - head/news/husky-fidoconf

[John Marino]

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>