[140482] trunk/dports

ryandesign at macports.org ryandesign at macports.org
Sun Sep 20 01:33:09 PDT 2015


Revision: 140482
          https://trac.macports.org/changeset/140482
Author:   ryandesign at macports.org
Date:     2015-09-20 01:33:08 -0700 (Sun, 20 Sep 2015)
Log Message:
-----------
tidy: update to 5.0.0 (#48838)

Modified Paths:
--------------
    trunk/dports/devel/libextractor/Portfile
    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/www/tidy/Portfile

Added Paths:
-----------
    trunk/dports/devel/libextractor/files/
    trunk/dports/devel/libextractor/files/patch-configure.diff
    trunk/dports/devel/libextractor/files/patch-src-plugins-html_extractor.c.diff
    trunk/dports/kde/kde4-baseapps/files/patch-konq-plugins-validators-tidy_validator.cpp.diff
    trunk/dports/lang/php/files/patch-php52-ext-tidy-tidy.c.diff
    trunk/dports/lang/php/files/patch-php53-ext-tidy-tidy.c.diff
    trunk/dports/lang/php/files/patch-php54-ext-tidy-tidy.c.diff
    trunk/dports/lang/php/files/patch-php55-ext-tidy-tidy.c.diff
    trunk/dports/lang/php/files/patch-php56-ext-tidy-tidy.c.diff
    trunk/dports/lang/php/files/patch-php70-ext-tidy-tidy.c.diff
    trunk/dports/textproc/xqilla/files/
    trunk/dports/textproc/xqilla/files/patch-src-functions-FunctionParseHTML.cpp.diff

Removed Paths:
-------------
    trunk/dports/www/tidy/files/

Modified: trunk/dports/devel/libextractor/Portfile
===================================================================
--- trunk/dports/devel/libextractor/Portfile	2015-09-20 07:35:11 UTC (rev 140481)
+++ trunk/dports/devel/libextractor/Portfile	2015-09-20 08:33:08 UTC (rev 140482)
@@ -5,6 +5,7 @@
 
 name                libextractor
 version             1.3
+revision            1
 categories          devel
 license             GPL-3+
 maintainers         ryandesign openmaintainer
@@ -50,6 +51,9 @@
                     port:tiff \
                     port:zlib
 
+patchfiles          patch-configure.diff \
+                    patch-src-plugins-html_extractor.c.diff
+
 configure.args      --enable-ffmpeg \
                     --enable-glib \
                     --enable-gsf \

Added: trunk/dports/devel/libextractor/files/patch-configure.diff
===================================================================
--- trunk/dports/devel/libextractor/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/devel/libextractor/files/patch-configure.diff	2015-09-20 08:33:08 UTC (rev 140482)
@@ -0,0 +1,11 @@
+--- configure.orig	2013-12-23 05:15:28.000000000 -0600
++++ configure	2015-09-19 14:44:37.000000000 -0500
+@@ -19774,7 +19774,7 @@
+ LIBS="$LIBS -ltidy"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-#include <tidy/tidy.h>
++#include <tidy.h>
+ int
+ main ()
+ {

Added: trunk/dports/devel/libextractor/files/patch-src-plugins-html_extractor.c.diff
===================================================================
--- trunk/dports/devel/libextractor/files/patch-src-plugins-html_extractor.c.diff	                        (rev 0)
+++ trunk/dports/devel/libextractor/files/patch-src-plugins-html_extractor.c.diff	2015-09-20 08:33:08 UTC (rev 140482)
@@ -0,0 +1,13 @@
+--- src/plugins/html_extractor.c.orig	2012-08-27 14:09:42.000000000 -0500
++++ src/plugins/html_extractor.c	2015-09-19 14:38:35.000000000 -0500
+@@ -26,8 +26,8 @@
+ #include "platform.h"
+ #include "extractor.h"
+ #include <magic.h>
+-#include <tidy/tidy.h>
+-#include <tidy/buffio.h>
++#include <tidy.h>
++#include <tidybuffio.h>
+ 
+ /**
+  * Mapping of HTML META names to LE types.

Modified: trunk/dports/kde/kde4-baseapps/Portfile
===================================================================
--- trunk/dports/kde/kde4-baseapps/Portfile	2015-09-20 07:35:11 UTC (rev 140481)
+++ trunk/dports/kde/kde4-baseapps/Portfile	2015-09-20 08:33:08 UTC (rev 140482)
@@ -6,7 +6,7 @@
 
 name                kde4-baseapps
 version             4.14.3
-revision            1
+revision            2
 categories          kde kde4
 maintainers         nicos
 license             GPL-2+ LGPL-2+ GFDL-1.2
@@ -35,6 +35,7 @@
                     port:perl5
 
 patchfiles-append   patch-cmake-baloo.diff
+patchfiles-append   patch-konq-plugins-validators-tidy_validator.cpp.diff
 
 configure.args-append   -DWITH_XKB=OFF
 

Added: trunk/dports/kde/kde4-baseapps/files/patch-konq-plugins-validators-tidy_validator.cpp.diff
===================================================================
--- trunk/dports/kde/kde4-baseapps/files/patch-konq-plugins-validators-tidy_validator.cpp.diff	                        (rev 0)
+++ trunk/dports/kde/kde4-baseapps/files/patch-konq-plugins-validators-tidy_validator.cpp.diff	2015-09-20 08:33:08 UTC (rev 140482)
@@ -0,0 +1,12 @@
+--- konq-plugins/validators/tidy_validator.cpp.orig	2014-11-11 05:22:05.000000000 -0600
++++ konq-plugins/validators/tidy_validator.cpp	2015-09-20 03:20:33.000000000 -0500
+@@ -25,8 +25,8 @@
+ 
+ #include <kdebug.h>
+ 
+-#include <buffio.h>
+ #include <tidy.h>
++#include <tidybuffio.h>
+ 
+ #include <config-konq-validator.h>
+ 

Modified: trunk/dports/lang/php/Portfile
===================================================================
--- trunk/dports/lang/php/Portfile	2015-09-20 07:35:11 UTC (rev 140481)
+++ trunk/dports/lang/php/Portfile	2015-09-20 08:33:08 UTC (rev 140482)
@@ -1210,8 +1210,12 @@
 
 subport ${php}-tidy {
     switch -- ${version} {
-        5.2.17              {revision 1}
-        5.3.29              {revision 1}
+        5.2.17              {revision 2}
+        5.3.29              {revision 2}
+        5.4.45              {revision 1}
+        5.5.29              {revision 1}
+        5.6.13              {revision 1}
+        7.0.0RC3            {revision 1}
     }
     
     categories-append       www
@@ -1223,6 +1227,10 @@
     
     depends_lib-append      port:tidy
     
+    if {[vercmp ${branch} 7.0] <= 0} {
+        patchfiles-append   patch-${php}-ext-tidy-tidy.c.diff
+    }
+    
     configure.args-append   --with-tidy=${prefix}
 }
 

Added: trunk/dports/lang/php/files/patch-php52-ext-tidy-tidy.c.diff
===================================================================
--- trunk/dports/lang/php/files/patch-php52-ext-tidy-tidy.c.diff	                        (rev 0)
+++ trunk/dports/lang/php/files/patch-php52-ext-tidy-tidy.c.diff	2015-09-20 08:33:08 UTC (rev 140482)
@@ -0,0 +1,11 @@
+--- ext/tidy/tidy.c.orig	2010-01-03 03:23:27.000000000 -0600
++++ ext/tidy/tidy.c	2015-09-19 14:17:15.000000000 -0500
+@@ -32,7 +32,7 @@
+ #include "safe_mode.h"
+ 
+ #include "tidy.h"
+-#include "buffio.h"
++#include "tidybuffio.h"
+ 
+ /* compatibility with older versions of libtidy */
+ #ifndef TIDY_CALL

Added: trunk/dports/lang/php/files/patch-php53-ext-tidy-tidy.c.diff
===================================================================
--- trunk/dports/lang/php/files/patch-php53-ext-tidy-tidy.c.diff	                        (rev 0)
+++ trunk/dports/lang/php/files/patch-php53-ext-tidy-tidy.c.diff	2015-09-20 08:33:08 UTC (rev 140482)
@@ -0,0 +1,11 @@
+--- ext/tidy/tidy.c.orig	2014-08-13 14:22:50.000000000 -0500
++++ ext/tidy/tidy.c	2015-09-19 14:17:30.000000000 -0500
+@@ -32,7 +32,7 @@
+ #include "safe_mode.h"
+ 
+ #include "tidy.h"
+-#include "buffio.h"
++#include "tidybuffio.h"
+ 
+ /* compatibility with older versions of libtidy */
+ #ifndef TIDY_CALL

Added: trunk/dports/lang/php/files/patch-php54-ext-tidy-tidy.c.diff
===================================================================
--- trunk/dports/lang/php/files/patch-php54-ext-tidy-tidy.c.diff	                        (rev 0)
+++ trunk/dports/lang/php/files/patch-php54-ext-tidy-tidy.c.diff	2015-09-20 08:33:08 UTC (rev 140482)
@@ -0,0 +1,11 @@
+--- ext/tidy/tidy.c.orig	2015-09-01 15:09:37.000000000 -0500
++++ ext/tidy/tidy.c	2015-09-19 14:17:39.000000000 -0500
+@@ -31,7 +31,7 @@
+ #include "ext/standard/info.h"
+ 
+ #include "tidy.h"
+-#include "buffio.h"
++#include "tidybuffio.h"
+ 
+ /* compatibility with older versions of libtidy */
+ #ifndef TIDY_CALL

Added: trunk/dports/lang/php/files/patch-php55-ext-tidy-tidy.c.diff
===================================================================
--- trunk/dports/lang/php/files/patch-php55-ext-tidy-tidy.c.diff	                        (rev 0)
+++ trunk/dports/lang/php/files/patch-php55-ext-tidy-tidy.c.diff	2015-09-20 08:33:08 UTC (rev 140482)
@@ -0,0 +1,11 @@
+--- ext/tidy/tidy.c.orig	2015-09-02 11:00:35.000000000 -0500
++++ ext/tidy/tidy.c	2015-09-19 14:17:50.000000000 -0500
+@@ -31,7 +31,7 @@
+ #include "ext/standard/info.h"
+ 
+ #include "tidy.h"
+-#include "buffio.h"
++#include "tidybuffio.h"
+ 
+ /* compatibility with older versions of libtidy */
+ #ifndef TIDY_CALL

Added: trunk/dports/lang/php/files/patch-php56-ext-tidy-tidy.c.diff
===================================================================
--- trunk/dports/lang/php/files/patch-php56-ext-tidy-tidy.c.diff	                        (rev 0)
+++ trunk/dports/lang/php/files/patch-php56-ext-tidy-tidy.c.diff	2015-09-20 08:33:08 UTC (rev 140482)
@@ -0,0 +1,11 @@
+--- ext/tidy/tidy.c.orig	2015-09-02 19:02:45.000000000 -0500
++++ ext/tidy/tidy.c	2015-09-19 14:18:00.000000000 -0500
+@@ -31,7 +31,7 @@
+ #include "ext/standard/info.h"
+ 
+ #include "tidy.h"
+-#include "buffio.h"
++#include "tidybuffio.h"
+ 
+ /* compatibility with older versions of libtidy */
+ #ifndef TIDY_CALL

Added: trunk/dports/lang/php/files/patch-php70-ext-tidy-tidy.c.diff
===================================================================
--- trunk/dports/lang/php/files/patch-php70-ext-tidy-tidy.c.diff	                        (rev 0)
+++ trunk/dports/lang/php/files/patch-php70-ext-tidy-tidy.c.diff	2015-09-20 08:33:08 UTC (rev 140482)
@@ -0,0 +1,11 @@
+--- ext/tidy/tidy.c.orig	2015-09-16 07:49:50.000000000 -0500
++++ ext/tidy/tidy.c	2015-09-19 14:18:11.000000000 -0500
+@@ -31,7 +31,7 @@
+ #include "ext/standard/info.h"
+ 
+ #include "tidy.h"
+-#include "buffio.h"
++#include "tidybuffio.h"
+ 
+ /* compatibility with older versions of libtidy */
+ #ifndef TIDY_CALL

Modified: trunk/dports/python/py-mx-experimental/Portfile
===================================================================
--- trunk/dports/python/py-mx-experimental/Portfile	2015-09-20 07:35:11 UTC (rev 140481)
+++ trunk/dports/python/py-mx-experimental/Portfile	2015-09-20 08:33:08 UTC (rev 140482)
@@ -5,7 +5,7 @@
 
 name			py-mx-experimental
 version			3.0.0
-revision		2
+revision		3
 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-09-20 07:35:11 UTC (rev 140481)
+++ trunk/dports/textproc/xqilla/Portfile	2015-09-20 08:33:08 UTC (rev 140482)
@@ -5,7 +5,7 @@
 
 name            xqilla
 version         2.3.0
-revision        1
+revision        2
 license         Apache-2
 categories      textproc devel
 platforms       darwin
@@ -27,6 +27,8 @@
     port:xercesc3 \
     port:tidy
 
+patchfiles      patch-src-functions-FunctionParseHTML.cpp.diff
+
 configure.cppflags  -isystem${prefix}/include
 
 configure.args \

Added: trunk/dports/textproc/xqilla/files/patch-src-functions-FunctionParseHTML.cpp.diff
===================================================================
--- trunk/dports/textproc/xqilla/files/patch-src-functions-FunctionParseHTML.cpp.diff	                        (rev 0)
+++ trunk/dports/textproc/xqilla/files/patch-src-functions-FunctionParseHTML.cpp.diff	2015-09-20 08:33:08 UTC (rev 140482)
@@ -0,0 +1,11 @@
+--- src/functions/FunctionParseHTML.cpp.orig	2011-10-31 13:39:15.000000000 -0500
++++ src/functions/FunctionParseHTML.cpp	2015-09-19 14:34:36.000000000 -0500
+@@ -30,7 +30,7 @@
+ 
+ #ifdef HAVE_LIBTIDY
+ #include <tidy.h>
+-#include <buffio.h>
++#include <tidybuffio.h>
+ #endif
+ 
+ #include <xercesc/util/XMLString.hpp>

Modified: trunk/dports/www/tidy/Portfile
===================================================================
--- trunk/dports/www/tidy/Portfile	2015-09-20 07:35:11 UTC (rev 140481)
+++ trunk/dports/www/tidy/Portfile	2015-09-20 08:33:08 UTC (rev 140482)
@@ -6,7 +6,7 @@
 PortGroup               github 1.0
 
 epoch                   1
-github.setup            htacg tidy-html5 4.9.36
+github.setup            htacg tidy-html5 5.0.0
 name                    tidy
 categories              www
 platforms               darwin
@@ -19,13 +19,11 @@
 
 homepage                http://www.htacg.org/tidy-html5/
 
-checksums               rmd160  8af148098ea536e780d2539bee11db4105101091 \
-                        sha256  bb2024aae08815741242fdf6b39e6f404dbcb81e7ae7e1087b846defe22866b4
+checksums               rmd160  d0233f5e8194966677eede80f2a8f3153b3ff829 \
+                        sha256  80e7770ef2d9674342d41f223b702def8482892844d16d428d7272b850b1d6b1
 
 depends_build-append    port:libxslt
 
-patchfiles-append       patch-CMakeLists.txt.diff
-
 cmake.out_of_source     yes
 cmake.build_dir         ${worksrcpath}/build/cmake
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150920/8dac84cb/attachment.html>


More information about the macports-changes mailing list