Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 22 May 2017 14:32:25 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r441462 - in head/textproc/uncrustify: . files
Message-ID:  <201705221432.v4MEWPwn045790@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Mon May 22 14:32:25 2017
New Revision: 441462
URL: https://svnweb.freebsd.org/changeset/ports/441462

Log:
  - Update to 0.65

Added:
  head/textproc/uncrustify/files/
  head/textproc/uncrustify/files/patch-CMakeLists.txt   (contents, props changed)
Modified:
  head/textproc/uncrustify/Makefile
  head/textproc/uncrustify/distinfo
  head/textproc/uncrustify/pkg-plist

Modified: head/textproc/uncrustify/Makefile
==============================================================================
--- head/textproc/uncrustify/Makefile	Mon May 22 14:02:04 2017	(r441461)
+++ head/textproc/uncrustify/Makefile	Mon May 22 14:32:25 2017	(r441462)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	uncrustify
-PORTVERSION=	0.64
+PORTVERSION=	0.65
 CATEGORIES=	textproc
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
@@ -14,6 +14,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 NO_WRKSUBDIR=	yes
 USES=		cmake:outsource
+CMAKE_ARGS=	-DCURRENT_VERSION="${PORTVERSION}"
 TEST_TARGET=	test
 
 PORTDOCS=	*

Modified: head/textproc/uncrustify/distinfo
==============================================================================
--- head/textproc/uncrustify/distinfo	Mon May 22 14:02:04 2017	(r441461)
+++ head/textproc/uncrustify/distinfo	Mon May 22 14:32:25 2017	(r441462)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1476796552
-SHA256 (uncrustify-0.64.tar.gz) = 0fca05fe8bac2cd80bf3ed77378c82ffe365f37a3f80b8e0ca2dbb3c6e25f3d7
-SIZE (uncrustify-0.64.tar.gz) = 1178137
+TIMESTAMP = 1495202939
+SHA256 (uncrustify-0.65.tar.gz) = 7f7afc2ecbaf9dab3c460da39bb97a77c199e62a1dd8bd26300ef5679a789d76
+SIZE (uncrustify-0.65.tar.gz) = 1377090

Added: head/textproc/uncrustify/files/patch-CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/uncrustify/files/patch-CMakeLists.txt	Mon May 22 14:32:25 2017	(r441462)
@@ -0,0 +1,35 @@
+--- CMakeLists.txt.orig	2017-05-18 15:15:24 UTC
++++ CMakeLists.txt
+@@ -116,32 +116,6 @@ endif()
+ #
+ # Generate uncrustify_version.h
+ #
+-
+-# FIXME: checking for CMAKE_BUILD_TYPE and passing it to make_version.py
+-# does not work with VS .sln projects
+-if(NOT CMAKE_BUILD_TYPE)
+-  set(CMAKE_BUILD_TYPE Release)
+-endif()
+-# FIXME: the version number should be automatically integrated
+-set(FALLBACK_VERSION "Uncrustify-0.65_f")
+-
+-find_package(PythonInterp REQUIRED)
+-execute_process(
+-  COMMAND ${PYTHON_EXECUTABLE} scripts/make_version.py ${CMAKE_BUILD_TYPE}
+-  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+-  RESULT_VARIABLE make_version_error
+-  OUTPUT_VARIABLE make_version_output
+-)
+-
+-message(STATUS )
+-if (make_version_error)
+-    message(WARNING "scripts/make_version.py exited with code ${make_version_error}: ${make_version_output}\n"
+-                    "As a fallback, version '${FALLBACK_VERSION}' will be used.")
+-    set( CURRENT_VERSION ${FALLBACK_VERSION} )
+-else()
+-    string(STRIP ${make_version_output} CURRENT_VERSION)
+-endif()
+-
+ configure_file(src/uncrustify_version.h.in uncrustify_version.h @ONLY)
+ 
+ #

Modified: head/textproc/uncrustify/pkg-plist
==============================================================================
--- head/textproc/uncrustify/pkg-plist	Mon May 22 14:02:04 2017	(r441461)
+++ head/textproc/uncrustify/pkg-plist	Mon May 22 14:32:25 2017	(r441462)
@@ -1,4 +1,5 @@
 bin/uncrustify
+%%ETCDIR%%/MS-calling_conventions.cfg
 %%ETCDIR%%/amxmodx.cfg
 %%ETCDIR%%/ben.cfg
 %%ETCDIR%%/ben2.cfg
@@ -11,6 +12,7 @@ bin/uncrustify
 %%ETCDIR%%/linux-indent.cfg
 %%ETCDIR%%/linux.cfg
 %%ETCDIR%%/mono.cfg
+%%ETCDIR%%/msvc.cfg
 %%ETCDIR%%/objc.cfg
 %%ETCDIR%%/sun.cfg
 %%ETCDIR%%/xsupplicant.cfg



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