Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 18 Apr 2015 10:53:32 +0000 (UTC)
From:      John Marino <marino@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r384221 - head/news/husky-htick
Message-ID:  <201504181053.t3IArWqp030075@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marino
Date: Sat Apr 18 10:53:31 2015
New Revision: 384221
URL: https://svnweb.freebsd.org/changeset/ports/384221

Log:
  news/husky-(hpt|htick): Restore build on FreeBSD 11 and DF
  
  The husky-htp texi file can still be processed by the latest texinfo
  programs, so all it needed was USES+= makeinfo to fix FreeBSD 11.
  
  However, the husky-htick texi file is too old, so the makefile was
  adjusted to not install info if the base texinfo isn't available.
  While here, use PORTDOCS and remove very short pkg-plist file.
  The maintainer will be notified so he can restore the info page
  on all platforms.
  
  Approved by:	blanket (restores build on FreeBSD 11)

Deleted:
  head/news/husky-htick/pkg-plist
Modified:
  head/news/husky-htick/Makefile

Modified: head/news/husky-htick/Makefile
==============================================================================
--- head/news/husky-htick/Makefile	Sat Apr 18 10:48:59 2015	(r384220)
+++ head/news/husky-htick/Makefile	Sat Apr 18 10:53:31 2015	(r384221)
@@ -9,14 +9,28 @@ COMMENT=	Husky FTN file ticker
 LIB_DEPENDS=	libfidoconfig.so:${PORTSDIR}/news/husky-fidoconf \
 		libareafix.so:${PORTSDIR}/news/husky-areafix
 
-ALL_TARGET=	all doc
-INSTALL_TARGET=	install install-doc
-INFO=		htick
+ALL_TARGET=	all
+INSTALL_TARGET=	install
 USE_LDCONFIG=   yes
+PLIST_FILES=	bin/htick man/man1/htick.1.gz
 
 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
+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^' \
 		${WRKSRC}/man/htick.1



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504181053.t3IArWqp030075>