Merge branch 'dev' of github.com:plk/biber into dev

plk · Mar 29, 2024 · 80c0477 · 80c0477
2 parents 62a1a9b + 1ffa6f3
commit 80c0477
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 42 deletions.
diff --git a/dist/freebsd_amd64/biber.files b/dist/freebsd_amd64/biber.files
@@ -5,11 +5,11 @@
 ../../data/schemata/bcf.rng;lib/Biber/bcf.rng
 ../../lib/Biber/LaTeX/recode_data.xml;lib/Biber/LaTeX/recode_data.xml
 ../../data/bcf.xsl;lib/Biber/bcf.xsl
-/usr/local/lib/perl5/site_perl/5.26.1/amd64-freebsd/Unicode/Collate/Locale;lib/Unicode/Collate/Locale
-/usr/local/lib/perl5/site_perl/5.26.1/amd64-freebsd/Unicode/Collate/CJK;lib/Unicode/Collate/CJK
-/usr/local/lib/perl5/site_perl/5.26.1/amd64-freebsd/Unicode/Collate/allkeys.txt;lib/Unicode/Collate/allkeys.txt
-/usr/local/lib/perl5/site_perl/5.26.1/amd64-freebsd/Unicode/Collate/keys.txt;lib/Unicode/Collate/keys.txt
-/usr/local/lib/perl5/site_perl/5.26.1/Mozilla/CA/cacert.pem;lib/Mozilla/CA/cacert.pem
-/usr/local/lib/perl5/5.26.1/amd64-freebsd/PerlIO;lib/PerlIO
-/usr/local/lib/perl5/5.26.1/amd64-freebsd/auto/PerlIO;lib/auto/PerlIO
-/usr/local/lib/perl5/site_perl/5.26.1/Business/ISBN/RangeMessage.xml;lib/Business/ISBN/RangeMessage.xml
+/usr/local/lib/perl5/5.36.0/Unicode/Collate/Locale;lib/Unicode/Collate/Locale
+/usr/local/lib/perl5/5.36.0/Unicode/Collate/CJK;lib/Unicode/Collate/CJK
+/usr/local/lib/perl5/5.36.0/Unicode/Collate/allkeys.txt;lib/Unicode/Collate/allkeys.txt
+/usr/local/lib/perl5/5.36.0/Unicode/Collate/keys.txt;lib/Unicode/Collate/keys.txt
+/usr/local/lib/perl5/site_perl/5.36.0/Mozilla/CA/cacert.pem;lib/Mozilla/CA/cacert.pem
+/usr/local/lib/perl5/5.36.0/amd64-freebsd/PerlIO;lib/PerlIO
+/usr/local/lib/perl5/5.36.0/amd64-freebsd/auto/PerlIO;lib/auto/PerlIO
+/usr/local/lib/perl5/site_perl/5.36.0/Business/ISBN/RangeMessage.xml;lib/Business/ISBN/RangeMessage.xml
diff --git a/dist/freebsd_amd64/build.sh b/dist/freebsd_amd64/build.sh
@@ -1,14 +1,5 @@
 #!/bin/sh
 
-# For some reason, PAR::Packer on linux is clever and when processing link lines
-# resolves any symlinks but names the packed lib the same as the link name. This is
-# a good thing.
-
-# Have to explicitly include the Input* modules as the names of these are dynamically
-# constructed in the code so Par::Packer can't auto-detect them
-
-# -----------------------------------------------------------------------------
-
 PAR_VERBATIM=1
 export PAR_VERBATIM
 
@@ -44,13 +35,12 @@ export PAR_VERBATIM
   --link=/usr/local/lib/libxml2.so.5 \
   --link=/usr/local/lib/libxslt.so.2 \
   --link=/usr/local/lib/libexslt.so.8 \
-  --link=/usr/local/lib/libgdbm.so.4 \
-  --link=`ls /lib/libz.so.*` \
+  --link=/lib/libz.so.5 \
   --link=`ls /lib/libcrypt.so.*` \
   --link=`ls /lib/libutil.so.*` \
   --link=`ls /lib/libcrypto.so.*` \
   --link=`ls /usr/lib/libssl.so.*` \
   --addlist=biber.files \
   --cachedeps=scancache \
-  --output=biber-2.8.`uname -m`-freebsd`uname -r | sed 's/\..*//' | sed 's/8/8,9,10,11,12/'` \
-  /usr/local/bin/biber
+  --output=biber-2.20.`uname -m`-freebsd`uname -r | sed 's/\..*//' | sed 's/8/8,9,10,11,12,13,14/'` \
+  /usr/local/bin/biber
diff --git a/dist/freebsd_i386/biber.files b/dist/freebsd_i386/biber.files
@@ -5,11 +5,11 @@
 ../../data/schemata/bcf.rng;lib/Biber/bcf.rng
 ../../lib/Biber/LaTeX/recode_data.xml;lib/Biber/LaTeX/recode_data.xml
 ../../data/bcf.xsl;lib/Biber/bcf.xsl
-/usr/local/lib/perl5/site_perl/5.26.1/i386-freebsd/Unicode/Collate/Locale;lib/Unicode/Collate/Locale
-/usr/local/lib/perl5/site_perl/5.26.1/i386-freebsd/Unicode/Collate/CJK;lib/Unicode/Collate/CJK
-/usr/local/lib/perl5/site_perl/5.26.1/i386-freebsd/Unicode/Collate/allkeys.txt;lib/Unicode/Collate/allkeys.txt
-/usr/local/lib/perl5/site_perl/5.26.1/i386-freebsd/Unicode/Collate/keys.txt;lib/Unicode/Collate/keys.txt
-/usr/local/lib/perl5/site_perl/5.26.1/Mozilla/CA/cacert.pem;lib/Mozilla/CA/cacert.pem
-/usr/local/lib/perl5/5.26.1/i386-freebsd/PerlIO;lib/PerlIO
-/usr/local/lib/perl5/5.26.1/i386-freebsd/auto/PerlIO;lib/auto/PerlIO
-/usr/local/lib/perl5/site_perl/5.26.1/Business/ISBN/RangeMessage.xml;lib/Business/ISBN/RangeMessage.xml
+/usr/local/lib/perl5/5.36.0/Unicode/Collate/Locale;lib/Unicode/Collate/Locale
+/usr/local/lib/perl5/5.36.0/Unicode/Collate/CJK;lib/Unicode/Collate/CJK
+/usr/local/lib/perl5/5.36.0/Unicode/Collate/allkeys.txt;lib/Unicode/Collate/allkeys.txt
+/usr/local/lib/perl5/5.36.0/Unicode/Collate/keys.txt;lib/Unicode/Collate/keys.txt
+/usr/local/lib/perl5/site_perl/5.36.0/Mozilla/CA/cacert.pem;lib/Mozilla/CA/cacert.pem
+/usr/local/lib/perl5/5.36.0/i386-freebsd/PerlIO;lib/PerlIO
+/usr/local/lib/perl5/5.36.0/i386-freebsd/auto/PerlIO;lib/auto/PerlIO
+/usr/local/lib/perl5/site_perl/5.36.0/Business/ISBN/RangeMessage.xml;lib/Business/ISBN/RangeMessage.xml
diff --git a/dist/freebsd_i386/build.sh b/dist/freebsd_i386/build.sh
@@ -1,14 +1,5 @@
 #!/bin/sh
 
-# For some reason, PAR::Packer on linux is clever and when processing link lines
-# resolves any symlinks but names the packed lib the same as the link name. This is
-# a good thing.
-
-# Have to explicitly include the Input* modules as the names of these are dynamically
-# constructed in the code so Par::Packer can't auto-detect them
-
-# -----------------------------------------------------------------------------
-
 PAR_VERBATIM=1
 export PAR_VERBATIM
 
@@ -44,13 +35,12 @@ export PAR_VERBATIM
   --link=/usr/local/lib/libxml2.so.5 \
   --link=/usr/local/lib/libxslt.so.2 \
   --link=/usr/local/lib/libexslt.so.8 \
-  --link=/usr/local/lib/libgdbm.so.4 \
-  --link=`ls /lib/libz.so.*` \
+  --link=/lib/libz.so.5 \
   --link=`ls /lib/libcrypt.so.*` \
   --link=`ls /lib/libutil.so.*` \
   --link=`ls /lib/libcrypto.so.*` \
   --link=`ls /usr/lib/libssl.so.*` \
   --addlist=biber.files \
   --cachedeps=scancache \
-  --output=biber-2.8.`uname -m`-freebsd`uname -r | sed 's/\..*//' | sed 's/8/8,9,10,11,12/'` \
-  /usr/local/bin/biber
+  --output=biber-2.20.`uname -m`-freebsd`uname -r | sed 's/\..*//' | sed 's/8/8,9,10,11,12,13,14/'` \
+  /usr/local/bin/biber