Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 23 Sep 2015 18:27:50 +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: r397630 - head/graphics/waifu2x-converter-cpp
Message-ID:  <201509231827.t8NIRoKw069396@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Wed Sep 23 18:27:50 2015
New Revision: 397630
URL: https://svnweb.freebsd.org/changeset/ports/397630

Log:
  graphics/waifu2x-converter-cpp: use proper regexp
  
  Applying changes to the wrong line caused a regression.

Modified:
  head/graphics/waifu2x-converter-cpp/Makefile

Modified: head/graphics/waifu2x-converter-cpp/Makefile
==============================================================================
--- head/graphics/waifu2x-converter-cpp/Makefile	Wed Sep 23 18:14:16 2015	(r397629)
+++ head/graphics/waifu2x-converter-cpp/Makefile	Wed Sep 23 18:27:50 2015	(r397630)
@@ -3,7 +3,7 @@
 PORTNAME=	waifu2x-converter-cpp
 DISTVERSION=	1.0.0-237
 DISTVERSIONSUFFIX=	-gca65c93
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	https://aur.archlinux.org/cgit/aur.git/plain/:manpage
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
@@ -54,9 +54,9 @@ post-patch:
 	@${REINPLACE_CMD} -e 's,-O2,,; /SYMBOL/s,-s,,' \
 		${WRKSRC}/CMakeLists.txt
 	@${REINPLACE_CMD} -e '/"models/s,","${DATADIR}/,' \
-		-e '/CmdLine/s,${PORTVERSION:R},${DISTVERSIONFULL},' \
+		-e '/CmdLine/s,[^"]*"),${DISTVERSIONFULL}"),' \
 		${WRKSRC}/src/main.cpp
-	@${REINPLACE_CMD} -e 's,[^"]*"),${PORTNAME}"),' \
+	@${REINPLACE_CMD} -e 's,${PORTNAME:C/-.*//},${PORTNAME},' \
 		-e 's,\(version\) [^"]*,\1 ${DISTVERSIONFULL},' \
 		${WRKDIR}/${PORTNAME}.1
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509231827.t8NIRoKw069396>