Index: head/www/tidy-html5/Makefile =================================================================== --- head/www/tidy-html5/Makefile (revision 391006) +++ head/www/tidy-html5/Makefile (revision 391007) @@ -1,33 +1,38 @@ # Created by: Thierry Thomas # $FreeBSD$ PORTNAME= tidy-html5 -PORTVERSION= 4.9.36 +PORTVERSION= 5.0.0 CATEGORIES= www MAINTAINER= thierry@FreeBSD.org COMMENT= Tidy tidies HTML and XML documents LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.md USE_GITHUB= yes GH_ACCOUNT= htacg GH_PROJECT= ${PORTNAME} -GH_TAGNAME= b65988c +GH_TAGNAME= 1e70fc6 USES= cmake USE_GNOME= libxslt USE_LDCONFIG= yes CMAKE_ARGS= -DBUILD_SHARED_LIB:BOOL=ON PLIST_SUB= VER=${PORTVERSION} pre-configure: ${REINPLACE_CMD} -e 's|build/cmake/||' ${WRKSRC}/test/testone.sh + +post-install: + # To avoid conflict ATM - to be removed later + ${MV} ${STAGEDIR}${PREFIX}/bin/tidy ${STAGEDIR}${PREFIX}/bin/tidy5 + ${MV} ${STAGEDIR}${PREFIX}/lib/libtidy.so ${STAGEDIR}${PREFIX}/lib/libtidy5.so regression-test: (cd ${WRKSRC}/test && ./testall.sh) .include Index: head/www/tidy-html5/distinfo =================================================================== --- head/www/tidy-html5/distinfo (revision 391006) +++ head/www/tidy-html5/distinfo (revision 391007) @@ -1,2 +1,2 @@ -SHA256 (htacg-tidy-html5-4.9.36-b65988c_GH0.tar.gz) = dd4221eeb5bfcbd842126a583b0a27cc3a1550e59ddf2857caa44fdfced53792 -SIZE (htacg-tidy-html5-4.9.36-b65988c_GH0.tar.gz) = 680205 +SHA256 (htacg-tidy-html5-5.0.0-1e70fc6_GH0.tar.gz) = cf9bf72c49776c585ae85d4cea3dc5863c925852c69804c1189691e5751cd875 +SIZE (htacg-tidy-html5-5.0.0-1e70fc6_GH0.tar.gz) = 680570 Index: head/www/tidy-html5/files/patch-CMakeLists.txt =================================================================== --- head/www/tidy-html5/files/patch-CMakeLists.txt (revision 391006) +++ head/www/tidy-html5/files/patch-CMakeLists.txt (revision 391007) @@ -1,11 +1,11 @@ ---- CMakeLists.txt.orig 2015-05-20 18:09:57 UTC +--- CMakeLists.txt.orig 2015-06-30 18:06:02 UTC +++ CMakeLists.txt -@@ -24,7 +24,7 @@ option( BUILD_SHARED_LIB "Set ON to buil +@@ -42,7 +42,7 @@ option( BUILD_SHARED_LIB "Set OFF to NOT option( BUILD_TAB2SPACE "Set ON to build utility app, tab2space" OFF ) option( BUILD_SAMPLE_CODE "Set ON to build the sample code" OFF ) if (NOT MAN_INSTALL_DIR) - set(MAN_INSTALL_DIR share/man/man1) + set(MAN_INSTALL_DIR man/man1) endif () option( BUILD_DOCUMENTATION "Set ON to build the documentation" OFF ) Index: head/www/tidy-html5/files/patch-test_testone.sh =================================================================== --- head/www/tidy-html5/files/patch-test_testone.sh (nonexistent) +++ head/www/tidy-html5/files/patch-test_testone.sh (revision 391007) @@ -0,0 +1,11 @@ +--- test/testone.sh.orig 2015-06-30 18:06:02 UTC ++++ test/testone.sh +@@ -19,7 +19,7 @@ set +f + TESTNO=$1 + EXPECTED=$2 + #TIDY=../bin/tidy +-TIDY=../build/cmake/tidy5 ++TIDY=../build/cmake/tidy + if [ ! -f "$TIDY" ]; then + echo "$BN: Can NOT locate binary '$TIDY'!" + echo "$BN: Fix me with the correct location of the binary to run." Property changes on: head/www/tidy-html5/files/patch-test_testone.sh ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/tidy-html5/pkg-plist =================================================================== --- head/www/tidy-html5/pkg-plist (revision 391006) +++ head/www/tidy-html5/pkg-plist (revision 391007) @@ -1,10 +1,10 @@ bin/tidy5 -include/buffio.h -include/platform.h include/tidy.h +include/tidybuffio.h include/tidyenum.h -lib/libtidy5s.a +include/tidyplatform.h lib/libtidy5.so -lib/libtidy5.so.4 -lib/libtidy5.so.%%VER%% -man/man1/tidy5.1.gz +lib/libtidy.so.5 +lib/libtidy.so.%%VER%% +lib/libtidys.a +man/man1/tidy.1.gz