Date: Thu, 24 Sep 2015 18:08:16 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r397700 - head/graphics/waifu2x-converter-cpp Message-ID: <201509241808.t8OI8Grs059775@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Thu Sep 24 18:08:15 2015 New Revision: 397700 URL: https://svnweb.freebsd.org/changeset/ports/397700 Log: graphics/waifu2x-converter-cpp: - Fix overly eager substitution in manpage - Wrap long lines Modified: head/graphics/waifu2x-converter-cpp/Makefile (contents, props changed) Modified: head/graphics/waifu2x-converter-cpp/Makefile ============================================================================== --- head/graphics/waifu2x-converter-cpp/Makefile Thu Sep 24 17:18:13 2015 (r397699) +++ head/graphics/waifu2x-converter-cpp/Makefile Thu Sep 24 18:08:15 2015 (r397700) @@ -3,7 +3,7 @@ PORTNAME= waifu2x-converter-cpp DISTVERSION= 1.0.0-237 DISTVERSIONSUFFIX= -gca65c93 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= https://aur.archlinux.org/cgit/aur.git/plain/:manpage DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ @@ -56,8 +56,10 @@ post-patch: @${REINPLACE_CMD} -e '/"models/s,","${DATADIR}/,' \ -e '/CmdLine/s,[^"]*"),${DISTVERSIONFULL}"),' \ ${WRKSRC}/src/main.cpp - @${REINPLACE_CMD} -e 's,${PORTNAME:C/-.*//},${PORTNAME},' \ - -e 's,\(version\) [^"]*,\1 ${DISTVERSIONFULL},' \ +# Undo AUR rename and use version from |git describe --tags| + @${REINPLACE_CMD} -e '/AUTHORS/,$$! { /\.B mai/! \ + s,${PORTNAME:C/-.*//},${PORTNAME},; }' \ + -e '1s,\(version\) [^"]*,\1 ${DISTVERSIONFULL},' \ ${WRKDIR}/${PORTNAME}.1 pre-install: @@ -69,7 +71,8 @@ do-install: ${INSTALL_MAN} ${WRKDIR}/${PORTNAME}.1 \ ${STAGEDIR}${MAN1PREFIX}/man/man1 ${INSTALL_LIB} ${WRKSRC}/libw2xc.so ${STAGEDIR}${PREFIX}/lib - ${INSTALL_DATA} -p ${WRKSRC}/src/w2xconv.h ${STAGEDIR}${PREFIX}/include + ${INSTALL_DATA} -p ${WRKSRC}/src/w2xconv.h \ + ${STAGEDIR}${PREFIX}/include (cd ${WRKSRC} && ${COPYTREE_SHARE} \ "${PORTDATA}" ${STAGEDIR}${DATADIR})
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509241808.t8OI8Grs059775>