From owner-svn-ports-all@FreeBSD.ORG Sat Apr 18 10:28:55 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DCC16869; Sat, 18 Apr 2015 10:28:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BDC44B2D; Sat, 18 Apr 2015 10:28:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3IAStiq005772; Sat, 18 Apr 2015 10:28:55 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3IAStv4005766; Sat, 18 Apr 2015 10:28:55 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201504181028.t3IAStv4005766@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Sat, 18 Apr 2015 10:28:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r384218 - in head/news: husky husky-fidoconf X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Apr 2015 10:28:56 -0000 Author: marino Date: Sat Apr 18 10:28:54 2015 New Revision: 384218 URL: https://svnweb.freebsd.org/changeset/ports/384218 Log: news/husky(-fidoconf): Unbreak F11 and DragonFly (old texi files) The reason all husky ports were bumped is because the -devel package suffix was not removed as intended. It's been removed now so all husky packages have different names. The fidoconf package uses texi files to build an info page and an html page. It appears there is no man page equivalent. I couldn't find a patch to fix the old-format texi files that the latest texinfo programs can read, so I blocked them from building on FreeBSD 11 and DragonFly where the port was broken. While here, I removed %%PORTDOCS%% from man pages. There were installed unconditionally (as they should be), so setting DOCS option to off would have broken the port as well. Also use the INFO definition as it should be rather than hardcoding the pkg-plist. The maintainer will be notified so he can prepare a patch for texi or update the port. Approved by: blanket (unbreaks F11) Modified: head/news/husky-fidoconf/Makefile head/news/husky-fidoconf/pkg-plist head/news/husky/Makefile.local Modified: head/news/husky-fidoconf/Makefile ============================================================================== --- head/news/husky-fidoconf/Makefile Sat Apr 18 10:17:25 2015 (r384217) +++ head/news/husky-fidoconf/Makefile Sat Apr 18 10:28:54 2015 (r384218) @@ -8,7 +8,7 @@ COMMENT= Husky FTN configuration library LIB_DEPENDS= libsmapi.so:${PORTSDIR}/news/husky-smapi -USES+= perl5 shebangfix makeinfo +USES+= perl5 shebangfix SHEBANG_FILES= util/fconf2areasbbs.pl util/fconf2na.pl util/sq2fc.pl USE_LDCONFIG= yes INSTALL_TARGET= install install-man @@ -16,10 +16,25 @@ INSTALL_TARGET= install install-man MASTERDIR= ${.CURDIR}/../husky COMPONENT_SUBDIR= fidoconf +.include + 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 ${OPSYS} == DragonFly || (${OPSYS} == FreeBSD && ${OSVERSION} > 1100000) + ${REINPLACE_CMD} -e '/cd doc /d' ${WRKSRC}/Makefile +.else +USES+= makeinfo +PORTDOCS= fidoconfig.html +DOCSDIR= ${PREFIX}/share/doc/husky +INFO= fidoconfig +.endif + post-install: ${LN} -sf fconf2.1 ${STAGEDIR}${PREFIX}/man/man1/fconf2aquaed.1 ${LN} -sf fconf2.1 ${STAGEDIR}${PREFIX}/man/man1/fconf2areasbbs.1 @@ -33,4 +48,4 @@ post-install: ${LN} -sf fconf2.1 ${STAGEDIR}${PREFIX}/man/man1/fconf2tornado.1 ${LN} -sf fconf2.1 ${STAGEDIR}${PREFIX}/man/man1/fecfg2fconf.1 -.include +.include Modified: head/news/husky-fidoconf/pkg-plist ============================================================================== --- head/news/husky-fidoconf/pkg-plist Sat Apr 18 10:17:25 2015 (r384217) +++ head/news/husky-fidoconf/pkg-plist Sat Apr 18 10:28:54 2015 (r384218) @@ -22,24 +22,22 @@ include/fidoconf/findtok.h include/fidoconf/grptree.h include/fidoconf/stat.h include/fidoconf/version.h -%%PORTDOCS%%info/fidoconfig.info lib/libfidoconfig.a lib/libfidoconfig.so lib/libfidoconfig.so.1 -%%PORTDOCS%%man/man1/dumpfcfg.1.gz -%%PORTDOCS%%man/man1/fconf2.1.gz -%%PORTDOCS%%man/man1/fconf2aquaed.1.gz -%%PORTDOCS%%man/man1/fconf2areasbbs.1.gz -%%PORTDOCS%%man/man1/fconf2binkd.1.gz -%%PORTDOCS%%man/man1/fconf2dir.1.gz -%%PORTDOCS%%man/man1/fconf2fidogate.1.gz -%%PORTDOCS%%man/man1/fconf2golded.1.gz -%%PORTDOCS%%man/man1/fconf2msged.1.gz -%%PORTDOCS%%man/man1/fconf2na.pl.1.gz -%%PORTDOCS%%man/man1/fconf2squish.1.gz -%%PORTDOCS%%man/man1/fconf2tornado.1.gz -%%PORTDOCS%%man/man1/fecfg2fconf.1.gz -%%PORTDOCS%%man/man1/linked.1.gz -%%PORTDOCS%%man/man1/linkedto.1.gz -%%PORTDOCS%%man/man1/tparser.1.gz -%%PORTDOCS%%share/doc/husky/fidoconfig.html +man/man1/dumpfcfg.1.gz +man/man1/fconf2.1.gz +man/man1/fconf2aquaed.1.gz +man/man1/fconf2areasbbs.1.gz +man/man1/fconf2binkd.1.gz +man/man1/fconf2dir.1.gz +man/man1/fconf2fidogate.1.gz +man/man1/fconf2golded.1.gz +man/man1/fconf2msged.1.gz +man/man1/fconf2na.pl.1.gz +man/man1/fconf2squish.1.gz +man/man1/fconf2tornado.1.gz +man/man1/fecfg2fconf.1.gz +man/man1/linked.1.gz +man/man1/linkedto.1.gz +man/man1/tparser.1.gz Modified: head/news/husky/Makefile.local ============================================================================== --- head/news/husky/Makefile.local Sat Apr 18 10:17:25 2015 (r384217) +++ head/news/husky/Makefile.local Sat Apr 18 10:28:54 2015 (r384218) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTVERSION= 1.9.20140519 +PORTREVISION= 1 CATEGORIES= news mail -PKGNAMESUFFIX= -devel .if ${PORTNAME} == "husky-smapi" PORTEPOCH= 1 @@ -14,7 +14,6 @@ MAINTAINER= osharoiko@gmail.com MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= husky/husky/1.9-current/2014.05.19 DISTNAME= husky-all-1.9-source-20140519 -EXTRACT_SUFX= .tgz HUSKY_ROOTDIR= ${WRKDIR}/husky PATCH_WRKSRC= ${HUSKY_ROOTDIR} @@ -26,7 +25,7 @@ CONFLICTS= ${PORTNAME}-[0-9]* USERS= fido GROUPS= fido -USES+= alias gmake +USES+= alias gmake tar:tgz pre-build: ${LN} -sf ${HUSKY_ROOTDIR}/huskybse/huskymak.cfg ${HUSKY_ROOTDIR}