summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarino <marino@FreeBSD.org>2015-04-18 10:53:31 +0000
committermarino <marino@FreeBSD.org>2015-04-18 10:53:31 +0000
commit8fcd3b12575b4dd4ef4b3bf86935f3b2fe8e504a (patch)
treec7340ccd94c4a98b5b9a088c4c7fbb462044e596
parent40aede00504f2d3fc80d8aa7ccc96ed28beceae7 (diff)
downloadFreeBSD-ports-8fcd3b12575b4dd4ef4b3bf86935f3b2fe8e504a.zip
FreeBSD-ports-8fcd3b12575b4dd4ef4b3bf86935f3b2fe8e504a.tar.gz
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)
-rw-r--r--news/husky-htick/Makefile20
-rw-r--r--news/husky-htick/pkg-plist3
2 files changed, 17 insertions, 6 deletions
diff --git a/news/husky-htick/Makefile b/news/husky-htick/Makefile
index 2b59471..9eee49c 100644
--- a/news/husky-htick/Makefile
+++ b/news/husky-htick/Makefile
@@ -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
diff --git a/news/husky-htick/pkg-plist b/news/husky-htick/pkg-plist
deleted file mode 100644
index 4cb3715..0000000
--- a/news/husky-htick/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/htick
-%%PORTDOCS%%man/man1/htick.1.gz
-%%PORTDOCS%%share/doc/husky/htick.html
OpenPOWER on IntegriCloud