[135021] trunk/dports/www/tidy

[ryandesign at macports.org]

Revision: 135021
          https://trac.macports.org/changeset/135021
Author:   ryandesign at macports.org
Date:     2015-04-13 05:34:39 -0700 (Mon, 13 Apr 2015)
Log Message:
-----------
tidy: update to 4.9.25; don't use muniversal portgroup which turns out not to be necessary per upstream

Modified Paths:
--------------
    trunk/dports/www/tidy/Portfile
    trunk/dports/www/tidy/files/patch-CMakeLists.txt.diff

Modified: trunk/dports/www/tidy/Portfile
===================================================================
--- trunk/dports/www/tidy/Portfile	2015-04-13 12:07:08 UTC (rev 135020)
+++ trunk/dports/www/tidy/Portfile	2015-04-13 12:34:39 UTC (rev 135021)
@@ -5,13 +5,10 @@
 PortGroup               cmake 1.0
 PortGroup               github 1.0
 
-# https://github.com/htacg/tidy-html5/issues/192
-PortGroup               muniversal 1.0
-
-github.setup            htacg tidy-html5 ca06201c3abb3829d6be6465e433ac72c8b15449
+github.setup            htacg tidy-html5 f5eb2cf26a8b69b12f4918ca669bbe7a014e6470
 name                    tidy
 epoch                   1
-version                 4.9.24
+version                 4.9.25
 categories              www
 platforms               darwin
 maintainers             ryandesign openmaintainer
@@ -23,8 +20,8 @@
 
 homepage                http://${github.author}.github.io/${github.project}/
 
-checksums               rmd160  da99f6e368ef1f36c3dcc77f7443fd48da928fc2 \
-                        sha256  44dad7ccd027dfd574c081c7614753749961404654356d5a008bacb9677e842b
+checksums               rmd160  dc7b6996158bdbf500e822e07f60fa07b95c7db4 \
+                        sha256  9bcf7cf58ce643b64271291ec9545f5c63dfe777e72bc91c443e9514af7c2bd9
 
 depends_build-append    port:libxslt
 
@@ -33,23 +30,13 @@
 cmake.out_of_source     yes
 cmake.build_dir         ${worksrcpath}/build/cmake
 
-configure.args-append   -DBUILD_SHARED_LIB:BOOL=ON \
-                        -DLIB_NAME=tidy
+configure.args-append   -DBUILD_SHARED_LIB:BOOL=ON
 
 use_parallel_build      yes
 
 # https://github.com/htacg/tidy-html5/issues/194
-if {[variant_isset universal]} {
-    foreach arch ${configure.universal_archs} {
-        set merger_build_env($arch) \
-                        DYLD_LIBRARY_PATH=${worksrcpath}-${arch}/build/cmake
-        set merger_destroot_env($arch) \
-                        DYLD_LIBRARY_PATH=${worksrcpath}-${arch}/build/cmake
-    }
-} else {
-    build.env-append    DYLD_LIBRARY_PATH=${cmake.build_dir}
-    destroot.env-append DYLD_LIBRARY_PATH=${cmake.build_dir}
-}
+build.env-append        DYLD_LIBRARY_PATH=${cmake.build_dir}
+destroot.env-append     DYLD_LIBRARY_PATH=${cmake.build_dir}
 
 livecheck.type          regex
 livecheck.url           ${github.raw}/master/version.txt

Modified: trunk/dports/www/tidy/files/patch-CMakeLists.txt.diff
===================================================================
--- trunk/dports/www/tidy/files/patch-CMakeLists.txt.diff	2015-04-13 12:07:08 UTC (rev 135020)
+++ trunk/dports/www/tidy/files/patch-CMakeLists.txt.diff	2015-04-13 12:34:39 UTC (rev 135021)
@@ -1,10 +1,13 @@
 Change the name from tidy5 back to tidy.
 https://github.com/htacg/tidy-html5/issues/46
 
+Don't run bitness check which isn't needed except on Windows.
+https://github.com/htacg/tidy-html5/issues/192
+
 Change the mandir from man to share/man.
 https://github.com/htacg/tidy-html5/issues/193
---- CMakeLists.txt.orig	2015-04-08 11:54:30.000000000 -0500
-+++ CMakeLists.txt	2015-04-09 15:36:38.000000000 -0500
+--- CMakeLists.txt.orig	2015-04-11 08:25:07.000000000 -0500
++++ CMakeLists.txt	2015-04-13 07:29:39.000000000 -0500
 @@ -2,7 +2,7 @@
  # Prepare for changing the name to 'tidy'
  cmake_minimum_required (VERSION 2.8.8)
@@ -14,7 +17,22 @@
  
  project (${LIB_NAME})
  
-@@ -223,7 +223,7 @@
+@@ -24,12 +24,14 @@
+ option( BUILD_TAB2SPACE  "Set ON to build utility app, tab2space" OFF )
+ option( BUILD_SAMPLE_CODE "Set ON to build the sample code"       OFF )
+ 
++if(WIN32 AND MSVC)
+ if (CMAKE_SIZEOF_VOID_P EQUAL 8)
+     message(STATUS "*** Have SIZEOF void * = 8, so 64-bit")
+     set( IS_64_BIT 1 )
+ else ()
+     message(STATUS "*** SIZEOF void * != 8, so not 64-bit")
+ endif ()
++endif()
+ 
+ if(CMAKE_COMPILER_IS_GNUCXX)
+     set( WARNING_FLAGS -Wall )
+@@ -223,7 +225,7 @@
              VERBATIM
          )
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150413/ee4e23c1/attachment.html>