svn commit: r398558 - in head/graphics/waifu2x-converter-cpp: . files

[Jan Beich]

Author: jbeich
Date: Sat Oct  3 22:17:15 2015
New Revision: 398558
URL: https://svnweb.freebsd.org/changeset/ports/398558

Log:
  graphics/waifu2x-converter-cpp: update to 1.0.0.249
  
  - Convert to the new testing framework
  - Convert to vendor install target
  
  No vendor changes except for upstreaming the port's changes.

Deleted:
  head/graphics/waifu2x-converter-cpp/files/
Modified:
  head/graphics/waifu2x-converter-cpp/Makefile   (contents, props changed)
  head/graphics/waifu2x-converter-cpp/distinfo   (contents, props changed)

Modified: head/graphics/waifu2x-converter-cpp/Makefile
==============================================================================
--- head/graphics/waifu2x-converter-cpp/Makefile	Sat Oct  3 21:03:11 2015	(r398557)
+++ head/graphics/waifu2x-converter-cpp/Makefile	Sat Oct  3 22:17:15 2015	(r398558)
@@ -1,9 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	waifu2x-converter-cpp
-DISTVERSION=	1.0.0-237
-DISTVERSIONSUFFIX=	-gca65c93
-PORTREVISION=	3
+DISTVERSION=	1.0.0-249
+DISTVERSIONSUFFIX=	-g6f0fdc6
 CATEGORIES=	graphics
 MASTER_SITES=	https://aur.archlinux.org/cgit/aur.git/plain/:manpage
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
@@ -29,21 +28,23 @@ USES=		cmake compiler:c++11-lib dos2unix
 DOS2UNIX_GLOB=	*.cpp *.hpp
 CMAKE_ARGS=	-DOPENCV_PREFIX="${LOCALBASE}" \
 		-DOpenCL_LIBRARY="${LOCALBASE}/lib/libOpenCL.so" \
-		-DCMAKE_SKIP_RPATH=on # XXX use cmake install() instead
+		-DINSTALL_MODELS=on
 CFLAGS+=	-D_GLIBCXX_USE_C99 -D_GLIBCXX_USE_C99_MATH_TR1 \
 		-D_DECLARE_C99_LDBL_MATH # XXX ports/193528
 LDFLAGS+=	-Wl,--as-needed # avoid overlinking (opencv deps)
+TEST_TARGET=	test ARGS="-V"
 USE_LDCONFIG=	yes
 PLIST_FILES=	bin/${PORTNAME} \
 		man/man1/${PORTNAME}.1.gz \
 		include/w2xconv.h \
 		lib/libw2xc.so
-PORTDATA=	models_rgb
+PORTDATA=	*
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS SIMD
 OPTIONS_DEFAULT=SIMD
 
+DOCS_CMAKE_ON=	-DINSTALL_DOCS=on
 SIMD_CMAKE_OFF=	-DX86OPT=off
 
 post-extract:
@@ -53,7 +54,7 @@ post-extract:
 post-patch:
 	@${REINPLACE_CMD} -e 's,-O2,,; /SYMBOL/s,-s,,' \
 		${WRKSRC}/CMakeLists.txt
-	@${REINPLACE_CMD} -e '/"models/s,","${DATADIR}/,' \
+	@${REINPLACE_CMD} \
 		-e '/CmdLine/s,[^"]*"),${DISTVERSIONFULL}"),' \
 		${WRKSRC}/src/main.cpp
 # Undo AUR rename and use version from |git describe --tags|
@@ -62,23 +63,8 @@ post-patch:
 		-e '1s,\(version\) [^"]*,\1 ${DISTVERSIONFULL},' \
 		${WRKDIR}/${PORTNAME}.1
 
-pre-install:
-# XXX Fails on 9.x with error code 10
-	-(cd ${WRKSRC} && LD_LIBRARY_PATH=. ./runtest)
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+post-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
-	(cd ${WRKSRC} && ${COPYTREE_SHARE} \
-		"${PORTDATA}" ${STAGEDIR}${DATADIR})
-
-post-install-DOCS-on:
-	(cd ${WRKSRC} && ${COPYTREE_SHARE} "appendix" ${STAGEDIR}${DOCSDIR})
-	(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} \
-		"internals" ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>

Modified: head/graphics/waifu2x-converter-cpp/distinfo
==============================================================================
--- head/graphics/waifu2x-converter-cpp/distinfo	Sat Oct  3 21:03:11 2015	(r398557)
+++ head/graphics/waifu2x-converter-cpp/distinfo	Sat Oct  3 22:17:15 2015	(r398558)
@@ -1,4 +1,4 @@
-SHA256 (tanakamura-waifu2x-converter-cpp-1.0.0-237-gca65c93_GH0.tar.gz) = 5b34ecc43a9c9f976ab92c72b1ba6f45b8470ea05bb976738e732c3c01290c8e
-SIZE (tanakamura-waifu2x-converter-cpp-1.0.0-237-gca65c93_GH0.tar.gz) = 14848013
+SHA256 (tanakamura-waifu2x-converter-cpp-1.0.0-249-g6f0fdc6_GH0.tar.gz) = 1eca7db107b20d27ccea49ffe075a80c9b4b8219245e1584920a0ef83fab7725
+SIZE (tanakamura-waifu2x-converter-cpp-1.0.0-249-g6f0fdc6_GH0.tar.gz) = 14848498
 SHA256 (waifu2x.1.gz?h=waifu2x-git&id=5c150a5) = bfad3e87e43f20573ab068c386e150f93fb4cc37400b8f4aaf4734c9afbd1489
 SIZE (waifu2x.1.gz?h=waifu2x-git&id=5c150a5) = 1242