diff options
| author | marino <marino@FreeBSD.org> | 2015-04-18 10:59:35 +0000 |
|---|---|---|
| committer | marino <marino@FreeBSD.org> | 2015-04-18 10:59:35 +0000 |
| commit | 47b21642a9dcc496445d608059d2c431b45fbc2b (patch) | |
| tree | bdfd70245bc3188833897ad7b2d05e94559a41d1 | |
| parent | 8fcd3b12575b4dd4ef4b3bf86935f3b2fe8e504a (diff) | |
| download | FreeBSD-ports-47b21642a9dcc496445d608059d2c431b45fbc2b.zip FreeBSD-ports-47b21642a9dcc496445d608059d2c431b45fbc2b.tar.gz | |
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.
| -rw-r--r-- | news/husky-fidoconf/Makefile | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/news/husky-fidoconf/Makefile b/news/husky-fidoconf/Makefile index de2b813..6d665fd 100644 --- a/news/husky-fidoconf/Makefile +++ b/news/husky-fidoconf/Makefile @@ -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> |
