diff options
| author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2017-05-22 14:32:25 +0000 |
|---|---|---|
| committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2017-05-22 14:32:25 +0000 |
| commit | 3f01520eafc36209f29f5c3758bbaf622abf29f7 (patch) | |
| tree | be6b87f3b5e222ad50ef855dc5a9b241325f1824 /textproc/uncrustify | |
| parent | 94f9029a617399c49b8bfaccbad8e6a3b71e3e32 (diff) | |
| download | ports-3f01520eafc36209f29f5c3758bbaf622abf29f7.tar.gz ports-3f01520eafc36209f29f5c3758bbaf622abf29f7.zip | |
- Update to 0.65
Notes
Notes:
svn path=/head/; revision=441462
Diffstat (limited to 'textproc/uncrustify')
| -rw-r--r-- | textproc/uncrustify/Makefile | 3 | ||||
| -rw-r--r-- | textproc/uncrustify/distinfo | 6 | ||||
| -rw-r--r-- | textproc/uncrustify/files/patch-CMakeLists.txt | 35 | ||||
| -rw-r--r-- | textproc/uncrustify/pkg-plist | 2 |
4 files changed, 42 insertions, 4 deletions
diff --git a/textproc/uncrustify/Makefile b/textproc/uncrustify/Makefile index 606a4f5daff9..32cb36e566d4 100644 --- a/textproc/uncrustify/Makefile +++ b/textproc/uncrustify/Makefile @@ -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= * diff --git a/textproc/uncrustify/distinfo b/textproc/uncrustify/distinfo index 2941a5d50eb3..11afa5eda89c 100644 --- a/textproc/uncrustify/distinfo +++ b/textproc/uncrustify/distinfo @@ -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 diff --git a/textproc/uncrustify/files/patch-CMakeLists.txt b/textproc/uncrustify/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..309d7f5bbaa7 --- /dev/null +++ b/textproc/uncrustify/files/patch-CMakeLists.txt @@ -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) + + # diff --git a/textproc/uncrustify/pkg-plist b/textproc/uncrustify/pkg-plist index 35951e8a4622..6c0d30d5d327 100644 --- a/textproc/uncrustify/pkg-plist +++ b/textproc/uncrustify/pkg-plist @@ -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 |