CVS commit: pkgsrc/www/ikiwiki

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Tue Mar 19 14:08:24 UTC 2024

Modified Files:
        pkgsrc/www/ikiwiki: Makefile distinfo
        pkgsrc/www/ikiwiki/patches: patch-IkiWiki_Plugin_highlight.pm
            patch-Makefile.PL
Removed Files:
        pkgsrc/www/ikiwiki: MESSAGE
        pkgsrc/www/ikiwiki/patches: patch-ikiwiki.in

Log Message:
ikiwiki: update to 3.20200202.4. Changes:

* build: Don't install an empty share/ikiwiki/examples/doc/examples
* aggregate: When a feed has an enclosure that is an image, audio, or
  video, include the enclosure in the generated page.
* aggregate: Also support feeds with media:content tags.
* git: Pass --no-rebase when pulling, to avoid git warning messages
  about pull.rebase.
* highlight: Adapt to API change in highlight >= 4.0
* Avoid 'Duplicate specification' for option "s"
* html5: Switch from pubdate=pubdate to class=dt-published
* mdwn: debug() which implementation is chosen
* recentchanges: support non-CGI links
* add geo: scheme
* pass PAGE variable to templates
* po: fix support for UTF-8 with po4a 0.58+

pkgsrc changes:

* Drop MESSAGE.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r0 pkgsrc/www/ikiwiki/MESSAGE
cvs rdiff -u -r1.181 -r1.182 pkgsrc/www/ikiwiki/Makefile
cvs rdiff -u -r1.142 -r1.143 pkgsrc/www/ikiwiki/distinfo
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/www/ikiwiki/patches/patch-IkiWiki_Plugin_highlight.pm
cvs rdiff -u -r1.6 -r1.7 pkgsrc/www/ikiwiki/patches/patch-Makefile.PL
cvs rdiff -u -r1.1 -r0 pkgsrc/www/ikiwiki/patches/patch-ikiwiki.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/ikiwiki/Makefile
diff -u pkgsrc/www/ikiwiki/Makefile:1.181 pkgsrc/www/ikiwiki/Makefile:1.182
--- pkgsrc/www/ikiwiki/Makefile:1.181   Mon Aug 14 05:25:29 2023
+++ pkgsrc/www/ikiwiki/Makefile Tue Mar 19 14:08:23 2024
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.181 2023/08/14 05:25:29 wiz Exp $
+# $NetBSD: Makefile,v 1.182 2024/03/19 14:08:23 schmonz Exp $
 
-DISTNAME=              ikiwiki_3.20200202.3.orig
+DISTNAME=              ikiwiki_3.20200202.4.orig
 PKGNAME=               ${DISTNAME:S/_/-/:S/.orig//}
-PKGREVISION=           10
 CATEGORIES=            www textproc
 MASTER_SITES=          ${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/}
 EXTRACT_SUFX=          .tar.xz
@@ -67,6 +66,9 @@ CONF_FILES+=          ${EGDIR}/${f} ${PKG_SYSCON
 
 .include "options.mk"
 
+post-extract:
+       rm ${WRKSRC}/doc/examples/blog/posts/A_new_title*The_US_and_the_global_economic_developement___40__by_Stanley_Fisher__41__.mdwn
+
 pre-configure:
        find ${WRKSRC} -type f -name '*.orig' -print | xargs rm -f
 

Index: pkgsrc/www/ikiwiki/distinfo
diff -u pkgsrc/www/ikiwiki/distinfo:1.142 pkgsrc/www/ikiwiki/distinfo:1.143
--- pkgsrc/www/ikiwiki/distinfo:1.142   Mon Feb  5 06:13:43 2024
+++ pkgsrc/www/ikiwiki/distinfo Tue Mar 19 14:08:23 2024
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.142 2024/02/05 06:13:43 schmonz Exp $
+$NetBSD: distinfo,v 1.143 2024/03/19 14:08:23 schmonz Exp $
 
-BLAKE2s (ikiwiki_3.20200202.3.orig.tar.xz) = 2a29fcde488ca19f3977450b73e423808568cb65938a4ad7ffd4ff5abd64a5b5
-SHA512 (ikiwiki_3.20200202.3.orig.tar.xz) = a1d89ccc0d02cddb3ef53c4c4a4a3349139d558fd4eb418263551a48cb635ed29ef430f8276ef6b42486a9232706908752e15e88590e919db6665e1a8844a4e5
-Size (ikiwiki_3.20200202.3.orig.tar.xz) = 2689636 bytes
-SHA1 (patch-IkiWiki_Plugin_highlight.pm) = a2b1d84472f9b452d60b781f9a9951f5741673f3
+BLAKE2s (ikiwiki_3.20200202.4.orig.tar.xz) = 1408b690c9553387f79a0381e51fb4a286ee92fd707660e05b43e3208f76b14a
+SHA512 (ikiwiki_3.20200202.4.orig.tar.xz) = 2ed7084a0e4eee3360aca23be24ed1ba0b7d52d1c716379442ded67a408de3b628cd92d1112fc0b277f24c7fe5a9cd35f4b20924427f79afb1e631a98f0e0fab
+Size (ikiwiki_3.20200202.4.orig.tar.xz) = 2733060 bytes
+SHA1 (patch-IkiWiki_Plugin_highlight.pm) = 451762e67156c4970bc4a59fb909304929b9cbe1
 SHA1 (patch-IkiWiki_Plugin_polygen.pm) = 232c48aac1c0ab538b380def2b8a4b42373a3582
-SHA1 (patch-Makefile.PL) = 44324917c22ec3cd2aa216439e2ae5a3dc2f9787
+SHA1 (patch-Makefile.PL) = 52a1bde3301ccb60eede6ca3f18472e729b7508d
 SHA1 (patch-ikiwiki-mass-rebuild) = eb03ac0ec83078be593f76968f5a1f9080ea50b9
-SHA1 (patch-ikiwiki.in) = c45552b89ad10df949bc21ab6154997cb0153eb9
 SHA1 (patch-po_Makefile) = 468b500da41c606c6af6b65c8080d692acb69336

Index: pkgsrc/www/ikiwiki/patches/patch-IkiWiki_Plugin_highlight.pm
diff -u pkgsrc/www/ikiwiki/patches/patch-IkiWiki_Plugin_highlight.pm:1.4 pkgsrc/www/ikiwiki/patches/patch-IkiWiki_Plugin_highlight.pm:1.5
--- pkgsrc/www/ikiwiki/patches/patch-IkiWiki_Plugin_highlight.pm:1.4    Tue Nov  2 09:44:48 2021
+++ pkgsrc/www/ikiwiki/patches/patch-IkiWiki_Plugin_highlight.pm        Tue Mar 19 14:08:24 2024
@@ -1,9 +1,9 @@
-$NetBSD: patch-IkiWiki_Plugin_highlight.pm,v 1.4 2021/11/02 09:44:48 schmonz Exp $
+$NetBSD: patch-IkiWiki_Plugin_highlight.pm,v 1.5 2024/03/19 14:08:24 schmonz Exp $
 
 Apply upstream patch 9ea3f9d to catch up to highlight 4.0 API change.
 Use pkgsrc paths.
 
---- IkiWiki/Plugin/highlight.pm.orig   2020-02-02 20:23:50.000000000 +0000
+--- IkiWiki/Plugin/highlight.pm.orig   2024-03-18 16:42:55.000000000 +0000
 +++ IkiWiki/Plugin/highlight.pm
 @@ -36,14 +36,14 @@ sub getsetup () {
                },
@@ -22,21 +22,7 @@ Use pkgsrc paths.
                        description => "location of highlight's langDefs directory",
                        safe => 0,
                        rebuild => undef,
-@@ -54,14 +54,20 @@ sub checkconfig () {
-       eval q{use highlight};
-       if (highlight::DataDir->can('new')) {
-               $data_dir=new highlight::DataDir();
--              $data_dir->searchDataDir("");
-+              if ( $data_dir->can('initSearchDirectories') ) {
-+                      # 4.0+
-+                      $data_dir -> initSearchDirectories("");
-+              } else {
-+                      # pre-4.0
-+                      $data_dir -> searchDataDir("");
-+              }
-       } else {
-               $data_dir=undef;
-       }
+@@ -67,7 +67,7 @@ sub checkconfig () {
  
        if (! exists $config{filetypes_conf}) {
          if (! $data_dir ) {
@@ -45,7 +31,7 @@ Use pkgsrc paths.
              } elsif ( $data_dir -> can('getFiletypesConfPath') ) {
                # 3.14 +
                $config{filetypes_conf}=
-@@ -75,7 +81,7 @@ sub checkconfig () {
+@@ -81,7 +81,7 @@ sub checkconfig () {
        # note that this is only used for old versions of highlight
        # where $data_dir will not be defined.
        if (! exists $config{langdefdir}) {

Index: pkgsrc/www/ikiwiki/patches/patch-Makefile.PL
diff -u pkgsrc/www/ikiwiki/patches/patch-Makefile.PL:1.6 pkgsrc/www/ikiwiki/patches/patch-Makefile.PL:1.7
--- pkgsrc/www/ikiwiki/patches/patch-Makefile.PL:1.6    Sat Aug 31 21:32:13 2019
+++ pkgsrc/www/ikiwiki/patches/patch-Makefile.PL        Tue Mar 19 14:08:24 2024
@@ -1,9 +1,9 @@
-$NetBSD: patch-Makefile.PL,v 1.6 2019/08/31 21:32:13 schmonz Exp $
+$NetBSD: patch-Makefile.PL,v 1.7 2024/03/19 14:08:24 schmonz Exp $
 
 Avoid -regex, not available in OpenBSD find(1).
 Set example SYSCONFDIR separately.
 
---- Makefile.PL.orig   2019-02-26 23:01:54.000000000 +0000
+--- Makefile.PL.orig   2024-03-18 16:42:55.000000000 +0000
 +++ Makefile.PL
 @@ -20,6 +20,7 @@ SED?=sed
  # Additional configurable path variables.
@@ -17,13 +17,13 @@ Set example SYSCONFDIR separately.
  extra_install: underlay_install
        # Install example sites.
        set -e; \
--      for dir in `$(FIND) doc/examples -type d ! -regex '.*discussion.*' | $(SED) -e 's|^doc/examples/||'`; do \
-+      for dir in `$(FIND) doc/examples -type d ! -name discussion | $(SED) -e 's|^doc/examples/||'`; do \
+-      for dir in `$(FIND) doc/examples -type d ! -regex '.*discussion.*' | $(SED) -ne 's|^doc/examples/||p'`; do \
++      for dir in `$(FIND) doc/examples -type d ! -name discussion | $(SED) -ne 's|^doc/examples/||p'`; do \
                install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$dir; \
        done
        set -e; \
--      for file in `$(FIND) doc/examples -type f ! -regex '.*discussion.*' | $(SED) -e 's|^doc/examples/||'`; do \
-+      for file in `$(FIND) doc/examples -type f ! -name discussion.mdwn | $(SED) -e 's|^doc/examples/||'`; do \
+-      for file in `$(FIND) doc/examples -type f ! -regex '.*discussion.*' | $(SED) -ne 's|^doc/examples/||p'`; do \
++      for file in `$(FIND) doc/examples -type f ! -name discussion.mdwn | $(SED) -ne 's|^doc/examples/||p'`; do \
                if ! cp -pRL doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file 2>/dev/null; then \
                        install -m 644 doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file; \
                fi; \