svn commit: r384264 - in head/news: husky-fidoconf husky-hpt husky-htick

[John Marino]

Author: marino
Date: Sun Apr 19 06:24:33 2015
New Revision: 384264
URL: https://svnweb.freebsd.org/changeset/ports/384264

Log:
  news/husky-(fidoconf|htick|hpt) : builds INFO pages everywhere again
  
  Jan Beich fixed the info pages (thanks Jan!) so this enables their
  building for htick and fidoconf of FreeBSD 11 and DragonFly.  While here,
  commit USES+=makeinfo to -hpt that went uncommitted accidently yesterday.

Modified:
  head/news/husky-fidoconf/Makefile
  head/news/husky-hpt/Makefile
  head/news/husky-htick/Makefile

Modified: head/news/husky-fidoconf/Makefile
==============================================================================
--- head/news/husky-fidoconf/Makefile	Sun Apr 19 06:02:40 2015	(r384263)
+++ head/news/husky-fidoconf/Makefile	Sun Apr 19 06:24:33 2015	(r384264)
@@ -16,22 +16,15 @@ INSTALL_TARGET=	install install-man
 MASTERDIR=      ${.CURDIR}/../husky
 COMPONENT_SUBDIR=       fidoconf
 
-post-patch:
-	${REINPLACE_CMD} -e 's^/path/to/config^${PREFIX}/etc/fido/config^' \
-		${WRKSRC}/man/linkedto.1
-
-# The texi files are too old for the ports texinfo
-# 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 !exists(/usr/bin/makeinfo)
-	${REINPLACE_CMD} -e '/cd doc /d' ${WRKSRC}/Makefile
-.else
+# Settings below are required to handle texi output (html, INFO page)
 USES+=		makeinfo
 PORTDOCS=	fidoconfig.html
 DOCSDIR=	${PREFIX}/share/doc/husky
 INFO=		fidoconfig
-.endif
+
+post-patch:
+	${REINPLACE_CMD} -e 's^/path/to/config^${PREFIX}/etc/fido/config^' \
+		${WRKSRC}/man/linkedto.1
 
 post-install:
 	${LN} -sf fconf2.1 ${STAGEDIR}${PREFIX}/man/man1/fconf2aquaed.1

Modified: head/news/husky-hpt/Makefile
==============================================================================
--- head/news/husky-hpt/Makefile	Sun Apr 19 06:02:40 2015	(r384263)
+++ head/news/husky-hpt/Makefile	Sun Apr 19 06:24:33 2015	(r384264)
@@ -9,6 +9,7 @@ COMMENT=	Husky FTN tosser
 LIB_DEPENDS=	libfidoconfig.so:${PORTSDIR}/news/husky-fidoconf \
 		libareafix.so:${PORTSDIR}/news/husky-areafix
 
+USES+=		makeinfo
 ALL_TARGET=	all doc
 INSTALL_TARGET=	install install-doc
 INFO=		hpt

Modified: head/news/husky-htick/Makefile
==============================================================================
--- head/news/husky-htick/Makefile	Sun Apr 19 06:02:40 2015	(r384263)
+++ head/news/husky-htick/Makefile	Sun Apr 19 06:24:33 2015	(r384264)
@@ -17,19 +17,13 @@ PLIST_FILES=	bin/htick man/man1/htick.1.
 MASTERDIR=      ${.CURDIR}/../husky
 COMPONENT_SUBDIR=       htick
 
-# The texi files are too old for the ports texinfo
-# 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 !exists(/usr/bin/makeinfo)
-.else
+# Settings below are required to handle texi output (html, INFO page)
 USES+=			makeinfo
 ALL_TARGET+=		doc
 INSTALL_TARGET+=	install-doc
 PORTDOCS=		htick.html
 DOCSDIR=		${PREFIX}/share/doc/husky
 INFO=			htick
-.endif
 
 post-patch:
 	${REINPLACE_CMD} -e 's^/fido/etc/config^${PREFIX}/etc/fido/config^' \