diff options
| -rw-r--r-- | textproc/yelp-xsl/Makefile | 4 | ||||
| -rw-r--r-- | textproc/yelp-xsl/PLIST | 5 | ||||
| -rw-r--r-- | textproc/yelp-xsl/distinfo | 9 | ||||
| -rw-r--r-- | textproc/yelp-xsl/patches/patch-configure | 145 |
4 files changed, 8 insertions, 155 deletions
diff --git a/textproc/yelp-xsl/Makefile b/textproc/yelp-xsl/Makefile index 1dd274f51f8..60877e5bb5d 100644 --- a/textproc/yelp-xsl/Makefile +++ b/textproc/yelp-xsl/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.7 2013/05/20 21:20:23 prlw1 Exp $ +# $NetBSD: Makefile,v 1.8 2014/04/29 16:00:59 wiz Exp $ -DISTNAME= yelp-xsl-3.8.1 +DISTNAME= yelp-xsl-3.12.0 CATEGORIES= textproc gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/yelp-xsl/${PKGVERSION_NOREV:R}/} EXTRACT_SUFX= .tar.xz diff --git a/textproc/yelp-xsl/PLIST b/textproc/yelp-xsl/PLIST index c7be79573ad..1d0a95caf28 100644 --- a/textproc/yelp-xsl/PLIST +++ b/textproc/yelp-xsl/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2013/05/20 00:01:10 prlw1 Exp $ +@comment $NetBSD: PLIST,v 1.4 2014/04/29 16:00:59 wiz Exp $ share/pkgconfig/yelp-xsl.pc share/yelp-xsl/icons/hicolor/24x24/status/yelp-note-bug.png share/yelp-xsl/icons/hicolor/24x24/status/yelp-note-important.png @@ -15,8 +15,6 @@ share/yelp-xsl/icons/hicolor/scalable/status/yelp-note-important.svg share/yelp-xsl/icons/hicolor/scalable/status/yelp-note-tip.svg share/yelp-xsl/icons/hicolor/scalable/status/yelp-note-warning.svg share/yelp-xsl/icons/hicolor/scalable/status/yelp-note.svg -share/yelp-xsl/icons/hicolor/watermarks/yelp-code-python.png -share/yelp-xsl/icons/hicolor/watermarks/yelp-code.png share/yelp-xsl/js/jquery.js share/yelp-xsl/js/jquery.syntax.brush.apache.js share/yelp-xsl/js/jquery.syntax.brush.applescript.js @@ -66,6 +64,7 @@ share/yelp-xsl/xslt/common/ttml.xsl share/yelp-xsl/xslt/common/utils.xsl share/yelp-xsl/xslt/docbook/common/db-chunk.xsl share/yelp-xsl/xslt/docbook/common/db-common.xsl +share/yelp-xsl/xslt/docbook/common/db-profile.xsl share/yelp-xsl/xslt/docbook/common/db-title.xsl share/yelp-xsl/xslt/docbook/common/db-xref.xsl share/yelp-xsl/xslt/docbook/html/db2html-bibliography.xsl diff --git a/textproc/yelp-xsl/distinfo b/textproc/yelp-xsl/distinfo index 21f569bb53b..69bfbea049d 100644 --- a/textproc/yelp-xsl/distinfo +++ b/textproc/yelp-xsl/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.4 2013/05/20 00:01:10 prlw1 Exp $ +$NetBSD: distinfo,v 1.5 2014/04/29 16:00:59 wiz Exp $ -SHA1 (yelp-xsl-3.8.1.tar.xz) = 6be682f13f9f0921978968ee1f46b488d19e8fc8 -RMD160 (yelp-xsl-3.8.1.tar.xz) = b732e1c55d87250abf1beea5b67cd6fbf27e639d -Size (yelp-xsl-3.8.1.tar.xz) = 590760 bytes -SHA1 (patch-configure) = a44ae1e9ec2d23824b6410adc9581f0fbb4b1c74 +SHA1 (yelp-xsl-3.12.0.tar.xz) = d06b3c5bd8e30fa83e8cc887b43825640533f2f5 +RMD160 (yelp-xsl-3.12.0.tar.xz) = ab9a15d37ee31f25547943ee9d7a92193c528ff6 +Size (yelp-xsl-3.12.0.tar.xz) = 564456 bytes diff --git a/textproc/yelp-xsl/patches/patch-configure b/textproc/yelp-xsl/patches/patch-configure deleted file mode 100644 index 85ed0f882b5..00000000000 --- a/textproc/yelp-xsl/patches/patch-configure +++ /dev/null @@ -1,145 +0,0 @@ -$NetBSD: patch-configure,v 1.2 2013/05/20 00:01:10 prlw1 Exp $ - -Remove dependencies on libxml-2.0 and libxslt shared libraries. -configure.ac equivalent of: - - -# Dependecies - -PKG_CHECK_MODULES(YELP_XSL, - -[ - - libxml-2.0 >= 2.6.12 - - libxslt >= 1.1.8 - -]) - -There are no C programs, so we don't need compile flags for the -above libraries. The dependency on libxml2 is present indirectly -in the dependency on itstool. I should be able to install yelp-xsl -without having the above shared libraries. - -https://bugzilla.gnome.org/show_bug.cgi?id=700670 - ---- configure.orig 2012-01-07 10:04:25.000000000 +0000 -+++ configure -@@ -2645,123 +2645,6 @@ $as_echo "no" >&6; } - fi - fi - --pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for YELP_XSL" >&5 --$as_echo_n "checking for YELP_XSL... " >&6; } -- --if test -n "$YELP_XSL_CFLAGS"; then -- pkg_cv_YELP_XSL_CFLAGS="$YELP_XSL_CFLAGS" -- elif test -n "$PKG_CONFIG"; then -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" -- libxml-2.0 >= 2.6.12 -- libxslt >= 1.1.8 --\""; } >&5 -- ($PKG_CONFIG --exists --print-errors " -- libxml-2.0 >= 2.6.12 -- libxslt >= 1.1.8 --") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_YELP_XSL_CFLAGS=`$PKG_CONFIG --cflags " -- libxml-2.0 >= 2.6.12 -- libxslt >= 1.1.8 --" 2>/dev/null` --else -- pkg_failed=yes --fi -- else -- pkg_failed=untried --fi --if test -n "$YELP_XSL_LIBS"; then -- pkg_cv_YELP_XSL_LIBS="$YELP_XSL_LIBS" -- elif test -n "$PKG_CONFIG"; then -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" -- libxml-2.0 >= 2.6.12 -- libxslt >= 1.1.8 --\""; } >&5 -- ($PKG_CONFIG --exists --print-errors " -- libxml-2.0 >= 2.6.12 -- libxslt >= 1.1.8 --") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_YELP_XSL_LIBS=`$PKG_CONFIG --libs " -- libxml-2.0 >= 2.6.12 -- libxslt >= 1.1.8 --" 2>/dev/null` --else -- pkg_failed=yes --fi -- else -- pkg_failed=untried --fi -- -- -- --if test $pkg_failed = yes; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- --if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -- _pkg_short_errors_supported=yes --else -- _pkg_short_errors_supported=no --fi -- if test $_pkg_short_errors_supported = yes; then -- YELP_XSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " -- libxml-2.0 >= 2.6.12 -- libxslt >= 1.1.8 --" 2>&1` -- else -- YELP_XSL_PKG_ERRORS=`$PKG_CONFIG --print-errors " -- libxml-2.0 >= 2.6.12 -- libxslt >= 1.1.8 --" 2>&1` -- fi -- # Put the nasty error message in config.log where it belongs -- echo "$YELP_XSL_PKG_ERRORS" >&5 -- -- as_fn_error $? "Package requirements ( -- libxml-2.0 >= 2.6.12 -- libxslt >= 1.1.8 --) were not met: -- --$YELP_XSL_PKG_ERRORS -- --Consider adjusting the PKG_CONFIG_PATH environment variable if you --installed software in a non-standard prefix. -- --Alternatively, you may set the environment variables YELP_XSL_CFLAGS --and YELP_XSL_LIBS to avoid the need to call pkg-config. --See the pkg-config man page for more details." "$LINENO" 5 -- --elif test $pkg_failed = untried; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it --is in your PATH or set the PKG_CONFIG environment variable to the full --path to pkg-config. -- --Alternatively, you may set the environment variables YELP_XSL_CFLAGS --and YELP_XSL_LIBS to avoid the need to call pkg-config. --See the pkg-config man page for more details. -- --To get pkg-config, see <http://pkg-config.freedesktop.org/>. --See \`config.log' for more details" "$LINENO" 5; } -- --else -- YELP_XSL_CFLAGS=$pkg_cv_YELP_XSL_CFLAGS -- YELP_XSL_LIBS=$pkg_cv_YELP_XSL_LIBS -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } -- --fi - - # i18n stuff - GETTEXT_PACKAGE=yelp-xsl |