[135020] trunk/dports
ryandesign at macports.org
ryandesign at macports.org
Mon Apr 13 05:07:08 PDT 2015
Revision: 135020
https://trac.macports.org/changeset/135020
Author: ryandesign at macports.org
Date: 2015-04-13 05:07:08 -0700 (Mon, 13 Apr 2015)
Log Message:
-----------
tidy: update to 4.9.24 and revbump dependents for new libtidy version number (#47387)
Modified Paths:
--------------
trunk/dports/kde/kde4-baseapps/Portfile
trunk/dports/lang/php/Portfile
trunk/dports/python/py-mx-experimental/Portfile
trunk/dports/textproc/xqilla/Portfile
trunk/dports/textproc/zorba/Portfile
trunk/dports/www/tidy/Portfile
Added Paths:
-----------
trunk/dports/www/tidy/files/
trunk/dports/www/tidy/files/patch-CMakeLists.txt.diff
Modified: trunk/dports/kde/kde4-baseapps/Portfile
===================================================================
--- trunk/dports/kde/kde4-baseapps/Portfile 2015-04-13 11:56:03 UTC (rev 135019)
+++ trunk/dports/kde/kde4-baseapps/Portfile 2015-04-13 12:07:08 UTC (rev 135020)
@@ -6,6 +6,7 @@
name kde4-baseapps
version 4.14.3
+revision 1
categories kde kde4
maintainers nicos
license GPL-2+ LGPL-2+ GFDL-1.2
Modified: trunk/dports/lang/php/Portfile
===================================================================
--- trunk/dports/lang/php/Portfile 2015-04-13 11:56:03 UTC (rev 135019)
+++ trunk/dports/lang/php/Portfile 2015-04-13 12:07:08 UTC (rev 135020)
@@ -1190,6 +1190,8 @@
}
subport ${php}-tidy {
+ revision 1
+
categories-append www
description a PHP interface to tidy, the HTML cleaning and \
Modified: trunk/dports/python/py-mx-experimental/Portfile
===================================================================
--- trunk/dports/python/py-mx-experimental/Portfile 2015-04-13 11:56:03 UTC (rev 135019)
+++ trunk/dports/python/py-mx-experimental/Portfile 2015-04-13 12:07:08 UTC (rev 135020)
@@ -5,7 +5,7 @@
name py-mx-experimental
version 3.0.0
-revision 1
+revision 2
license Permissive GPLConflict zlib
# GPL-conflicting due to choice of law clause.
#http://www.egenix.com/products/python/mxExperimental/eGenix.com-Public-License-1.1.0.pdf
Modified: trunk/dports/textproc/xqilla/Portfile
===================================================================
--- trunk/dports/textproc/xqilla/Portfile 2015-04-13 11:56:03 UTC (rev 135019)
+++ trunk/dports/textproc/xqilla/Portfile 2015-04-13 12:07:08 UTC (rev 135020)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -4,6 +5,7 @@
name xqilla
version 2.3.0
+revision 1
license Apache-2
categories textproc devel
platforms darwin
Modified: trunk/dports/textproc/zorba/Portfile
===================================================================
--- trunk/dports/textproc/zorba/Portfile 2015-04-13 11:56:03 UTC (rev 135019)
+++ trunk/dports/textproc/zorba/Portfile 2015-04-13 12:07:08 UTC (rev 135020)
@@ -6,7 +6,7 @@
name zorba
version 3.0
-revision 1
+revision 2
set branch [join [lrange [split ${version} .] 0 1] .]
license Apache-2
categories textproc devel
Modified: trunk/dports/www/tidy/Portfile
===================================================================
--- trunk/dports/www/tidy/Portfile 2015-04-13 11:56:03 UTC (rev 135019)
+++ trunk/dports/www/tidy/Portfile 2015-04-13 12:07:08 UTC (rev 135020)
@@ -2,11 +2,16 @@
# $Id$
PortSystem 1.0
+PortGroup cmake 1.0
PortGroup github 1.0
-github.setup htacg tidy-html5 0cf6d998431a61f1bd630e7883d4d43df4ad8ccc
+# https://github.com/htacg/tidy-html5/issues/192
+PortGroup muniversal 1.0
+
+github.setup htacg tidy-html5 ca06201c3abb3829d6be6465e433ac72c8b15449
name tidy
-version 20120821
+epoch 1
+version 4.9.24
categories www
platforms darwin
maintainers ryandesign openmaintainer
@@ -18,19 +23,35 @@
homepage http://${github.author}.github.io/${github.project}/
-fetch.type git
+checksums rmd160 da99f6e368ef1f36c3dcc77f7443fd48da928fc2 \
+ sha256 44dad7ccd027dfd574c081c7614753749961404654356d5a008bacb9677e842b
-depends_build port:autoconf \
- port:automake \
- port:libtool
+depends_build-append port:libxslt
-pre-configure {
- system -W ${worksrcpath} "/bin/sh ${worksrcpath}/build/gnuauto/setup.sh"
-}
+patchfiles-append patch-CMakeLists.txt.diff
+cmake.out_of_source yes
+cmake.build_dir ${worksrcpath}/build/cmake
+
+configure.args-append -DBUILD_SHARED_LIB:BOOL=ON \
+ -DLIB_NAME=tidy
+
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}
+}
+
livecheck.type regex
-livecheck.url ${github.raw}/master/src/version.h
-livecheck.regex {tree/(.*)"}
-livecheck.version [string range ${git.branch} 0 6]
+livecheck.url ${github.raw}/master/version.txt
+livecheck.version ${version}
+livecheck.regex {^([0-9.]+)$}
Added: trunk/dports/www/tidy/files/patch-CMakeLists.txt.diff
===================================================================
--- trunk/dports/www/tidy/files/patch-CMakeLists.txt.diff (rev 0)
+++ trunk/dports/www/tidy/files/patch-CMakeLists.txt.diff 2015-04-13 12:07:08 UTC (rev 135020)
@@ -0,0 +1,25 @@
+Change the name from tidy5 back to tidy.
+https://github.com/htacg/tidy-html5/issues/46
+
+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
+@@ -2,7 +2,7 @@
+ # Prepare for changing the name to 'tidy'
+ cmake_minimum_required (VERSION 2.8.8)
+
+-set(LIB_NAME tidy5)
++set(LIB_NAME tidy)
+
+ project (${LIB_NAME})
+
+@@ -223,7 +223,7 @@
+ VERBATIM
+ )
+
+- install(FILES ${CMAKE_BINARY_DIR}/${TIDY_MANFILE} DESTINATION man/man1)
++ install(FILES ${CMAKE_BINARY_DIR}/${TIDY_MANFILE} DESTINATION share/man/man1)
+ endif ()
+ endif ()
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150413/50a5bdc4/attachment.html>
More information about the macports-changes
mailing list