Date: Mon, 17 Aug 2015 15:33:07 +0300 From: Dmitry Marakasov <amdmi3@amdmi3.ru> To: cyberbotx@cyberbotx.com Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r394456 - head/devel/doxygen Message-ID: <20150817123307.GA17641@hades.panopticon> In-Reply-To: <201508171226.t7HCQ8bY077008@repo.freebsd.org> References: <201508171226.t7HCQ8bY077008@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
* Dmitry Marakasov (amdmi3@FreeBSD.org) wrote: I'm sorry, on the second though this should've been discussed before. The problem: doxygen generated Doxyfiles list perl path in them as /usr/bin/perl, while on FreeBSD perl resides in /usr/local/bin/perl. However, doxyfiles are used on other systems as well, and /usr/bin/perl seems to me more widely used path. Imo this should not ever be hardcoded. > Author: amdmi3 > Date: Mon Aug 17 12:26:07 2015 > New Revision: 394456 > URL: https://svnweb.freebsd.org/changeset/ports/394456 > > Log: > - Fix perl path in generated files > > Approved by: portmgr blanket > MFH: 2015Q3 (blanket) > > Modified: > head/devel/doxygen/Makefile > > Modified: head/devel/doxygen/Makefile > ============================================================================== > --- head/devel/doxygen/Makefile Mon Aug 17 12:22:30 2015 (r394455) > +++ head/devel/doxygen/Makefile Mon Aug 17 12:26:07 2015 (r394456) > @@ -4,6 +4,7 @@ > PORTNAME= doxygen > PORTVERSION= 1.8.10 > PORTEPOCH= 2 > +PORTREVISION= 1 > CATEGORIES= devel > MASTER_SITES= ftp://ftp.stack.nl/pub/users/dimitri/ \ > http://ftp.stack.nl/pub/users/dimitri/ > @@ -15,7 +16,7 @@ COMMENT= Documentation system for C, C++ > LICENSE= GPLv2 > LICENSE_FILE= ${WRKSRC}/LICENSE > > -USES= bison cmake:outsource iconv python:2 > +USES= bison cmake:outsource iconv python:2 shebangfix > ALL_TARGET= all > CMAKE_ARGS+= -DDOC_INSTALL_DIR:PATH=${DOCSDIR_REL} > REINPLACE_ARGS= -i '' > @@ -61,4 +62,8 @@ BUILD_DEPENDS+= ${LOCALBASE}/bin/flex:${ > CMAKE_ARGS+= -DFLEX_EXECUTABLE=${LOCALBASE}/bin/flex > .endif > > +post-patch: > + @${REINPLACE_CMD} -e '/PERL_PATH/ s|${perl_OLD_CMD}|${perl_CMD}|' \ > + ${WRKSRC}/src/config.xml > + > .include <bsd.port.mk> > > -- Dmitry Marakasov . 55B5 0596 FF1E 8D84 5F56 9510 D35A 80DD F9D2 F77D amdmi3@amdmi3.ru ..: jabber: amdmi3@jabber.ru http://amdmi3.ru
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20150817123307.GA17641>