From owner-svn-ports-all@freebsd.org  Thu Sep 24 18:08:16 2015
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id BED4BA0752B;
 Thu, 24 Sep 2015 18:08:16 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org (repo.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 AED9F15C9;
 Thu, 24 Sep 2015 18:08:16 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8OI8Grd059776;
 Thu, 24 Sep 2015 18:08:16 GMT (envelope-from jbeich@FreeBSD.org)
Received: (from jbeich@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8OI8Grs059775;
 Thu, 24 Sep 2015 18:08:16 GMT (envelope-from jbeich@FreeBSD.org)
Message-Id: <201509241808.t8OI8Grs059775@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jbeich set sender to
 jbeich@FreeBSD.org using -f
From: Jan Beich <jbeich@FreeBSD.org>
Date: Thu, 24 Sep 2015 18:08:16 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r397700 - head/graphics/waifu2x-converter-cpp
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 <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 24 Sep 2015 18:08:16 -0000

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})