From 1e6ddceb8318d413745ca1c9d91fde01b1e0364b Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 12 Feb 2023 01:00:00 +0100
Subject: gnu: Use HTTPS package home pages wherever possible.

* gnu/packages/accessibility.scm (florence)[home-page]: Use HTTPS.
* gnu/packages/admin.scm (netcat, nmon)[home-page]: Likewise.
* gnu/packages/algebra.scm (mpfrcx, cm, flint, fftw, r-dtt)[home-page]:
Likewise.
* gnu/packages/apr.scm (apr, apr-util)[home-page]: Likewise.
* gnu/packages/aspell.scm (aspell-dict-it)[home-page]: Likewise.
* gnu/packages/astronomy.scm (casacore, sextractor, libnova)
(xplanet)[home-page]: Likewise.
* gnu/packages/audio.scm (libtimidity, alsa-modular-synth, azr3, tao)
(freepats, rakarrack, liblo, libshout-idjc, timidity++, libsbsms)
(libmodplug, libxmp, xmp, sox, drc, gsm, gnaural)
(streamripper)[home-page]: Likewise.
* gnu/packages/authentication.scm (pamtester)[home-page]: Likewise.
* gnu/packages/backup.scm (grsync)[home-page]: Likewise.
* gnu/packages/bioconductor.scm (r-nmf, r-edger, r-limma)
(r-plgem)[home-page]: Likewise.
* gnu/packages/bioinformatics.scm (python-biom-format, bowtie, bowtie1)
(bwa, crossmap, java-htsjdk, java-htsjdk-latest, java-picard)
(java-picard-2.10.3, kaiju, proteinortho, rsem, rseqc, seek, samtools)
(snap-aligner, subread, stringtie, r-centipede, prinseq, emboss, phylip)
(libsbml)[home-page]: Likewise.
* gnu/packages/build-tools.scm (tup)[home-page]: Likewise.
* gnu/packages/cdrom.scm (libcddb, cdrdao, cdrtools)
(cd-discid)[home-page]: Likewise.
* gnu/packages/check.scm (cunit, python-nose)
(python-pyhamcrest)[home-page]: Likewise.
* gnu/packages/chemistry.scm (gromacs)[home-page]: Likewise.
* gnu/packages/chez.scm (chez-fmt)[home-page]: Likewise.
* gnu/packages/code.scm (lcov, uncrustify, cscope)[home-page]: Likewise.
* gnu/packages/compression.scm (p7zip)[home-page]: Likewise.
* gnu/packages/cran.scm (r-emdist, r-proj4, r-zoo, r-ggalluvial)
(r-orgmassspecr, r-polychrome, r-partykit, r-rcpp, r-ff, r-emdbook)
(r-fitdistrplus, r-linprog, r-geometry, r-dtw, r-fst, r-rjags)
(r-intergraph, r-qualv, r-labelled, r-survey, r-coin, r-fmsb, r-tm)
(r-corpcor, r-rmpfr, r-spatialextremes, r-longitudinal, r-genenet)
(r-bayesm, r-seqinr, r-mpm, r-text2vec, r-rgdal, r-seewave, r-hdrcde)
(r-shapes, r-anytime, r-stm, r-d3network, r-tam, r-directlabels)
(r-spatstat-utils, r-spatstat-sparse, r-spatstat-data, r-spatstat-geom)
(r-spatstat-core, r-spatstat-linnet, r-spatstat-random, r-spatstat)
(r-rcpptoml, r-mlecens, r-seurat, r-mlearning, r-zooimage)[home-page]:
Likewise.
* gnu/packages/crates-io.scm (rust-nickel-0.11, rust-thrift-0.13)
(rust-trust-dns-https-0.20, rust-trust-dns-native-tls-0.20)
(rust-trust-dns-openssl-0.20, rust-trust-dns-proto-0.20)
(rust-trust-dns-resolver-0.20, rust-trust-dns-rustls-0.20)
(rust-uint-0.9, rust-yaml-rust-0.4)[home-page]: Likewise.
* gnu/packages/crypto.scm (libdecaf, ccrypt)[home-page]: Likewise.
* gnu/packages/curl.scm (curlpp)[home-page]: Likewise.
* gnu/packages/databases.scm (python-pylibmc, unixodbc, wiredtiger)
(libpqxx, mdbtools, virtuoso-ose, libdbi, libdbi-drivers)
(soci)[home-page]: Likewise.
* gnu/packages/debian.scm (apt-mirror)[home-page]: Likewise.
* gnu/packages/debug.scm (remake)[home-page]: Likewise.
* gnu/packages/disk.scm (sdparm, idle3-tools, duc)[home-page]: Likewise.
* gnu/packages/django.scm (python-django-haystack)[home-page]: Likewise.
* gnu/packages/djvu.scm (djvulibre, djview)[home-page]: Likewise.
* gnu/packages/dns.scm (dnsmasq)[home-page]: Likewise.
* gnu/packages/docbook.scm (dblatex, docbook2x)[home-page]: Likewise.
* gnu/packages/documentation.scm (scrollkeeper)[home-page]: Likewise.
* gnu/packages/ebook.scm (liblinebreak)[home-page]: Likewise.
* gnu/packages/electronics.scm (xoscope)[home-page]: Likewise.
* gnu/packages/emacs-xyz.scm (emacs-bbdb, emacs-caps-lock, emacs-djvu)
(emacs-pabbrev, emacs-twittering-mode, emacs-filladapt, emacs-rudel)
(emacs-stream, emacspeak, emacs-cc-mode, emacs-eldoc, emacs-jsonrpc)
(emacs-gtk-look, emacs-xclip, emacs-slime-volleyball, emacs-minimap)
(emacs-auto-dictionary-mode, emacs-persist, emacs-shell-command+)
(emacs-map, emacs-xref, emacs-dictionary)[home-page]: Likewise.
* gnu/packages/embedded.scm (sdcc)[home-page]: Likewise.
* gnu/packages/engineering.scm (asco, libngspice, libspnav)
(openctm)[home-page]: Likewise.
* gnu/packages/erlang.scm (erlang-erlware-commons)[home-page]: Likewise.
* gnu/packages/file-systems.scm (jfsutils, curlftpfs)[home-page]:
Likewise.
* gnu/packages/finance.scm (gbonds)[home-page]: Likewise.
* gnu/packages/flashing-tools.scm (dfu-util, srecord)[home-page]:
Likewise.
* gnu/packages/fltk.scm (ntk)[home-page]: Likewise.
* gnu/packages/fonts.scm (font-terminus, font-tex-gyre)
(font-comic-neue)[home-page]: Likewise.
* gnu/packages/fontutils.scm (ttf2pt1, potrace, libspiro)[home-page]:
Likewise.
* gnu/packages/fpga.scm (icestorm, gtkwave, gtkwave)
(python-myhdl)[home-page]: Likewise.
* gnu/packages/freedesktop.scm (libatasmart)[home-page]: Likewise.
* gnu/packages/ftp.scm (weex)[home-page]: Likewise.
* gnu/packages/game-development.scm (dds, python-tmx, sfxr, quesoglc)
(eureka, plib)[home-page]: Likewise.
* gnu/packages/games.scm (abe, alex4, armagetronad, barony)
(foobillard++, golly, ltris, pipewalker, prboom-plus, trigger-rally)
(cmatrix, pinball, pioneers, tennix, chromium-bsu, freeciv, kiki)
(quakespasm, frotz, frotz-dumb-terminal, frotz-sdl, btanks)
(flare-engine, chessx, barrage, cgoban, passage)[home-page]: Likewise.
* gnu/packages/geo.scm (python-geopandas, saga)[home-page]: Likewise.
* gnu/packages/gl.scm (freeglut, gl2ps)[home-page]: Likewise.
* gnu/packages/gnome.scm (cogl, clutter-gtk, clutter-gst, bluefish)
(workrave)[home-page]: Likewise.
* gnu/packages/gnustep.scm (wmnd, wmfire, wmfire)[home-page]: Likewise.
* gnu/packages/graph.scm (mscgen)[home-page]: Likewise.
* gnu/packages/graphics.scm (assimp, alembic, ctl, agg)
(opencsg)[home-page]: Likewise.
* gnu/packages/graphviz.scm (gts)[home-page]: Likewise.
* gnu/packages/gtk.scm (gtkspell3)[home-page]: Likewise.
* gnu/packages/guile-xyz.scm (guile-irregex)[home-page]: Likewise.
* gnu/packages/haskell-apps.scm (cpphs)[home-page]: Likewise.
* gnu/packages/haskell-check.scm (ghc-hunit)[home-page]: Likewise.
* gnu/packages/haskell-web.scm (ghc-http-client-restricted)
(ghc-blaze-html, ghc-happstack-server, ghc-sourcemap)[home-page]:
Likewise.
* gnu/packages/haskell-xyz.scm (ghc-assoc, ghc-cairo, ghc-cborg)
(ghc-csv, ghc-glob, ghc-gtk2hs-buildtools, ghc-hmatrix-gsl-stats)
(ghc-intervalmap, ghc-lens-family-core, ghc-managed, ghc-mountpoints)
(ghc-network-multicast, ghc-optional-args, ghc-regex, ghc-spoon)
(ghc-transformers, ghc-turtle, ghc-utf8-light, ghc-wizards)
(ghc-template-haskell, ghc-boot-th, ghc-binary-orphans)
(ghc-postgresql-simple)[home-page]: Likewise.
* gnu/packages/hexedit.scm (ht, bvi)[home-page]: Likewise.
* gnu/packages/hunspell.scm (hunspell-dict-hu)[home-page]: Likewise.
* gnu/packages/image-processing.scm (mia)[home-page]: Likewise.
* gnu/packages/image-viewers.scm (geeqie, gpicview, luminance-hdr)
(qiv)[home-page]: Likewise.
* gnu/packages/image.scm (libuemf, devil, steghide, optipng, niftilib)
(sng, mtpaint)[home-page]: Likewise.
* gnu/packages/java-xml.scm (java-simple-xml, java-jaxp)
(java-apache-xml-commons-resolver)[home-page]: Likewise.
* gnu/packages/java.scm (java-cisd-base, java-cisd-args4j)
(java-hamcrest-core, java-jsr305, java-eclipse-osgi)
(java-eclipse-equinox-common, java-eclipse-core-jobs)
(java-eclipse-equinox-registry, java-eclipse-equinox-app)
(java-eclipse-equinox-preferences, java-eclipse-core-contenttype)
(java-eclipse-text, java-treelayout, java-aopalliance, java-jeromq)
(java-cdi-api)[home-page]: Likewise.
* gnu/packages/jemalloc.scm (jemalloc-4.5.0)[home-page]: Likewise.
* gnu/packages/julia-xyz.scm (julia-recipespipeline)[home-page]:
Likewise.
* gnu/packages/kde-internet.scm (kget)[home-page]: Likewise.
* gnu/packages/kde-systemtools.scm (dolphin-plugins)
(konsole)[home-page]: Likewise.
* gnu/packages/kodi.scm (fstrcmp)[home-page]: Likewise.
* gnu/packages/language.scm (hime, libchewing)[home-page]: Likewise.
* gnu/packages/lego.scm (nqc)[home-page]: Likewise.
* gnu/packages/lesstif.scm (lesstif)[home-page]: Likewise.
* gnu/packages/libcanberra.scm (libcanberra)[home-page]: Likewise.
* gnu/packages/libdaemon.scm (libdaemon)[home-page]: Likewise.
* gnu/packages/libffi.scm (libffi)[home-page]: Likewise.
* gnu/packages/libreoffice.scm (libwpd, libwpg, libwps)[home-page]:
Likewise.
* gnu/packages/libusb.scm (libmtp, gmtp)[home-page]: Likewise.
* gnu/packages/linux.scm (e2fsprogs, extundelete, lsscsi, net-tools)
(kbd, sysfsutils, cpuid, libpfm4)[home-page]: Likewise.
* gnu/packages/lisp-check.scm (sbcl-ptester, sbcl-xlunit)[home-page]:
Likewise.
* gnu/packages/lisp-xyz.scm (sbcl-html-encode, sbcl-py-configparser)
(sbcl-cl-utilities, sbcl-series, sbcl-uffi, sbcl-clsql, sbcl-sycamore)
(sbcl-osicat, sbcl-hu.dwim.common, sbcl-caveman, sbcl-trivial-shell)
(sbcl-trivial-benchmark, sbcl-screamer, sbcl-smug)[home-page]: Likewise.
* gnu/packages/lisp.scm (lush2)[home-page]: Likewise.
* gnu/packages/logging.scm (log4cpp)[home-page]: Likewise.
* gnu/packages/lua.scm (lua-ldoc)[home-page]: Likewise.
* gnu/packages/machine-learning.scm (mcl, openfst, rxcpp)[home-page]:
Likewise.
* gnu/packages/mail.scm (muchsync, procmail, sendmail)
(opensmtpd-filter-dkimsign, crm114)[home-page]: Likewise.
* gnu/packages/man.scm (libpipeline, man-db)[home-page]: Likewise.
* gnu/packages/maths.scm (lapack, scalapack, hdf-eos5, itpp, gmsh)
(metamath, p4est, armadillo, suitesparse, atlas, lpsolve, wcalc, why3)
(frama-c)[home-page]: Likewise.
* gnu/packages/mcrypt.scm (mcrypt, libmcrypt, libmhash)[home-page]:
Likewise.
* gnu/packages/minetest.scm (minetest-advtrains)[home-page]: Likewise.
* gnu/packages/monitoring.scm (python-whisper, python-carbon)
(hostscope)[home-page]: Likewise.
* gnu/packages/mp3.scm (id3lib, libmp3splt, mp3splt, mpg321)
(lame)[home-page]: Likewise.
* gnu/packages/multiprecision.scm (mpc)[home-page]: Likewise.
* gnu/packages/music.scm (aria-maestosa, lingot, setbfree, bristol)
(portmidi, python-pyportmidi, zynaddsubfx, yoshimi, aj-snapshot)
(schismtracker, midicsv, midicsv, qmidiarp, qmidiroute, dssi, tap-lv2)
(shiru-lv2)[home-page]: Likewise.
* gnu/packages/ncurses.scm (stfl)[home-page]: Likewise.
* gnu/packages/networking.scm (lksctp-tools, mbuffer, ifstatus, bird)
(tunctl, traceroute)[home-page]: Likewise.
* gnu/packages/node-xyz.scm (node-mersenne)[home-page]: Likewise.
* gnu/packages/ntp.scm (openntpd)[home-page]: Likewise.
* gnu/packages/ocaml.scm (opam, hevea, ocaml-menhir, ocaml-piqilib)
(ocaml-graph, cubicle)[home-page]: Likewise.
* gnu/packages/opencl.scm (python-pyopencl)[home-page]: Likewise.
* gnu/packages/package-management.scm (xstow, modules)[home-page]:
Likewise.
* gnu/packages/parallel.scm (xjobs)[home-page]: Likewise.
* gnu/packages/pdf.scm (podofo, qpdf, xournal, impressive)[home-page]:
Likewise.
* gnu/packages/perl.scm (perl-math-vecstat, perltidy)[home-page]:
Likewise.
* gnu/packages/photo.scm (libpano13, enblend-enfuse, hugin)[home-page]:
Likewise.
* gnu/packages/plan9.scm (drawterm)[home-page]: Likewise.
* gnu/packages/plotutils.scm (guile-charting, ploticus)[home-page]:
Likewise.
* gnu/packages/popt.scm (argtable, popt)[home-page]: Likewise.
* gnu/packages/profiling.scm (otf2)[home-page]: Likewise.
* gnu/packages/pulseaudio.scm (pulseaudio)[home-page]: Likewise.
* gnu/packages/python-check.scm (python-mypy)[home-page]: Likewise.
* gnu/packages/python-web.scm (python-cssutils)
(python-translationstring)[home-page]: Likewise.
* gnu/packages/python-xyz.scm (python-diskcache, python-doxyqml)
(python-docutils, python-pexpect, python-importlib-resources)
(python-simplegeneric, python-urwid, python-xlrd, python-xlwt)
(python-pyasn1, python-pythondialog, python-tftpy, python-random2)
(python-arcp, python-pyopengl, python-sortedcollections)
(python-sortedcontainers, python-yapsy, python-pydispatcher)
(python-posix-ipc)[home-page]: Likewise.
* gnu/packages/qt.scm (qwt, libqglviewer, signond)[home-page]: Likewise.
* gnu/packages/radio.scm (unixcw, gnuais)[home-page]: Likewise.
* gnu/packages/raspberry-pi.scm (bcm2835)[home-page]: Likewise.
* gnu/packages/rdf.scm (clucene, rasqal, redland)[home-page]: Likewise.
* gnu/packages/regex.scm (tre)[home-page]: Likewise.
* gnu/packages/rsync.scm (librsync)[home-page]: Likewise.
* gnu/packages/ruby.scm (ruby-packnga, ruby-nokogiri, ruby-oj, ruby-ox)
(ruby-sinatra, ruby-citrus, ruby-cbor, ruby-roda)[home-page]: Likewise.
* gnu/packages/scheme.scm (scheme48, tinyscheme)[home-page]: Likewise.
* gnu/packages/screen.scm (dtach)[home-page]: Likewise.
* gnu/packages/scsi.scm (sg3-utils)[home-page]: Likewise.
* gnu/packages/sdl.scm (libmikmod, sdl-pango)[home-page]: Likewise.
* gnu/packages/shellutils.scm (hstr, rig)[home-page]: Likewise.
* gnu/packages/simulation.scm (python-dolfin-adjoint)[home-page]:
Likewise.
* gnu/packages/smalltalk.scm (smalltalk)[home-page]: Likewise.
* gnu/packages/speech.scm (espeak)[home-page]: Likewise.
* gnu/packages/stalonetray.scm (stalonetray)[home-page]: Likewise.
* gnu/packages/statistics.scm (jags, r-mass, r-class, r-lattice)
(r-matrix, r-nnet, r-spatial, r-bit, r-bit64, r-digest, r-xtable)
(python-statsmodels, r-ade4, r-latticeextra, r-rcurl, r-xml, r-mvtnorm)
(r-robustbase, r-minqa, r-fdrtool, java-jdistlib, xlispstat)[home-page]:
Likewise.
* gnu/packages/swig.scm (swig)[home-page]: Likewise.
* gnu/packages/task-management.scm (wtime)[home-page]: Likewise.
* gnu/packages/tcl.scm (itcl, tclxml, tclx)[home-page]: Likewise.
* gnu/packages/terminals.scm (libtermkey, mlterm, libvterm)
(libvterm)[home-page]: Likewise.
* gnu/packages/tex.scm (texlive-lm, texlive-lm-math, texlive-cs)
(texlive-csplain, biber, texmaker)[home-page]: Likewise.
* gnu/packages/text-editors.scm (joe)[home-page]: Likewise.
* gnu/packages/textutils.scm (drm-tools, docx2txt)[home-page]: Likewise.
* gnu/packages/tv.scm (tvtime)[home-page]: Likewise.
* gnu/packages/unicode.scm (libunibreak)[home-page]: Likewise.
* gnu/packages/upnp.scm (libupnp)[home-page]: Likewise.
* gnu/packages/version-control.scm (cvs)[home-page]: Likewise.
* gnu/packages/video.scm (transcode, libquicktime, mjpegtools, aalib)
(liba52, libmpeg2, x265, libdv, dvdauthor, aegisub, pitivi, gavl)
(dvdbackup, guvcview, video-contact-sheet)[home-page]: Likewise.
* gnu/packages/virtualization.scm (bochs)[home-page]: Likewise.
* gnu/packages/w3m.scm (w3m)[home-page]: Likewise.
* gnu/packages/web.scm (qjson, libquvi-scripts, libquvi, quvi)
(tidy-html, htmlcxx)[home-page]: Likewise.
* gnu/packages/wm.scm (evilwm, menumaker)[home-page]: Likewise.
* gnu/packages/wv.scm (wv)[home-page]: Likewise.
* gnu/packages/wxwidgets.scm (wxsvg)[home-page]: Likewise.
* gnu/packages/xdisorg.scm (mtdev, xsel)[home-page]: Likewise.
* gnu/packages/xfig.scm (xfig, transfig)[home-page]: Likewise.
* gnu/packages/xml.scm (openjade, python-pyxb, xmlstarlet, xmlrpc-c)
(opensp)[home-page]: Likewise.
* gnu/packages/xorg.scm (xf86-video-qxl)[home-page]: Likewise.
---
 gnu/packages/textutils.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/textutils.scm')

diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index 151add964e..aeff4593a8 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -852,7 +852,7 @@ (define-public drm-tools
                             (invoke "sh" "test_all.sh")))))))))
     (native-inputs (list which)) ;for tests
     (inputs (list pcre))
-    (home-page "http://drmtools.sourceforge.net/")
+    (home-page "https://drmtools.sourceforge.net/")
     (synopsis "Utilities to manipulate text and binary files")
     (description "The drm_tools package contains the following commands:
 @table @command
@@ -1082,7 +1082,7 @@ (define-public docx2txt
 @item Handling (bullet, decimal, letter, roman) lists along with (attempt at)
 indentation.
 @end itemize\n")
-    (home-page "http://docx2txt.sourceforge.net")
+    (home-page "https://docx2txt.sourceforge.net")
     (license license:gpl3+)))
 
 (define-public html2text
-- 
cgit v1.2.3


From 66e677f58eea6db97eeb14b08c2a9feb74f1d220 Mon Sep 17 00:00:00 2001
From: Timotej Lazar <timotej.lazar@araneo.si>
Date: Fri, 24 Feb 2023 15:15:24 +0100
Subject: gnu: dos2unix: Update to 7.4.4.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/textutils.scm (dos2unix): Update to 7.4.4.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
---
 gnu/packages/textutils.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/textutils.scm')

diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index aeff4593a8..9efcda688b 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -79,14 +79,14 @@ (define-module (gnu packages textutils)
 (define-public dos2unix
   (package
     (name "dos2unix")
-    (version "7.4.3")
+    (version "7.4.4")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://waterlan.home.xs4all.nl/dos2unix/"
                            "dos2unix-" version ".tar.gz"))
        (sha256
-        (base32 "0wnacvz99rnlx0ayf5jrxwljvh801r8k1ai3hj137yfsaqcv93dn"))))
+        (base32 "0vj3wix17vl7a85hg673qqyrhw9sbq0xiadbbij7v0nm1gdl3a18"))))
     (build-system gnu-build-system)
     (arguments
      `(#:make-flags
-- 
cgit v1.2.3


From ad82d834f63aa24199d67a060864c1a620c3a6e1 Mon Sep 17 00:00:00 2001
From: Timotej Lazar <timotej.lazar@araneo.si>
Date: Fri, 24 Feb 2023 15:15:25 +0100
Subject: gnu: dos2unix: Use new package style.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/textutils.scm (dos2unix)[arguments]: Use gexps.
[native-inputs]: Drop labels.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
---
 gnu/packages/textutils.scm | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'gnu/packages/textutils.scm')

diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index 9efcda688b..e5d3a0efc0 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -89,15 +89,14 @@ (define-public dos2unix
         (base32 "0vj3wix17vl7a85hg673qqyrhw9sbq0xiadbbij7v0nm1gdl3a18"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:make-flags
-       (list (string-append "CC=" ,(cc-for-target))
-             (string-append "prefix=" (assoc-ref %outputs "out")))
-       #:phases
-       (modify-phases %standard-phases
-         (delete 'configure)))) ; no configure script
+     (list #:make-flags
+           #~(list (string-append "CC=" #$(cc-for-target))
+                   (string-append "prefix=" #$output))
+           #:phases
+           #~(modify-phases %standard-phases
+               (delete 'configure)))) ; no configure script
     (native-inputs
-     `(("gettext" ,gettext-minimal)
-       ("perl" ,perl)))
+     (list gettext-minimal perl))
     (home-page "https://waterlan.home.xs4all.nl/dos2unix.html")
     (synopsis "DOS/Mac to Unix and vice versa text file format converter")
     (description
-- 
cgit v1.2.3


From 03ab1a27620d18f7e09ef7cc28f62d0a0c78b186 Mon Sep 17 00:00:00 2001
From: Danny O'Brien <danny@fil.org>
Date: Sat, 4 Mar 2023 23:24:37 -0800
Subject: gnu: dbacl: Fix failing check phase.

* gnu/packages/patches/dbacl-icheck-multiple-definitions.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/textutils.scm (dbacl) [source]: Apply patch.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
---
 gnu/local.mk                                       |  1 +
 .../dbacl-icheck-multiple-definitions.patch        | 33 ++++++++++++++++++++++
 gnu/packages/textutils.scm                         |  3 +-
 3 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/patches/dbacl-icheck-multiple-definitions.patch

(limited to 'gnu/packages/textutils.scm')

diff --git a/gnu/local.mk b/gnu/local.mk
index 2abece0d2f..186d82a8ab 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1035,6 +1035,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/date-output-pkg-config-files.patch	\
   %D%/packages/patches/datefudge-gettimeofday.patch		\
   %D%/packages/patches/dbacl-include-locale.h.patch		\
+  %D%/packages/patches/dbacl-icheck-multiple-definitions.patch		\
   %D%/packages/patches/dbus-helper-search-path.patch		\
   %D%/packages/patches/dbus-c++-gcc-compat.patch		\
   %D%/packages/patches/dbus-c++-threading-mutex.patch		\
diff --git a/gnu/packages/patches/dbacl-icheck-multiple-definitions.patch b/gnu/packages/patches/dbacl-icheck-multiple-definitions.patch
new file mode 100644
index 0000000000..e82d0819bb
--- /dev/null
+++ b/gnu/packages/patches/dbacl-icheck-multiple-definitions.patch
@@ -0,0 +1,33 @@
+From f5df6813e305372e25b8a2124c491293a176e115 Mon Sep 17 00:00:00 2001
+From: Danny O'Brien <danny@spesh.com>
+Date: Fri, 3 Feb 2023 16:48:59 -0800
+Subject: [PATCH] Fix failing build of icheck.
+
+Building icheck fails with a duplicate symbol definition 
+error. This allows the icheck executable to compile.
+
+Submitted upstream[1] but not yet moderated/accepted.
+
+[1] https://sourceforge.net/p/dbacl/discussion/239876/thread/87636b0114/
+
+---
+ src/icheck.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/src/icheck.c b/src/icheck.c
+index efbb6a5..12a3b7a 100644
+--- a/src/icheck.c
++++ b/src/icheck.c
+@@ -39,9 +39,6 @@ extern regex_count_t regex_count;
+ extern empirical_t empirical;
+ 
+ extern int cmd;
+-char *progname = "icheck";
+-char *inputfile = "";
+-long inputline = 0;
+ 
+ extern long system_pagesize;
+ extern void *in_iobuf;
+-- 
+2.39.1
+
diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index e5d3a0efc0..fb8bc7e868 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -711,7 +711,8 @@ (define-public dbacl
                            "dbacl-" version ".tar.gz"))
        (sha256
         (base32 "1gas0112wqjvwn9qg3hxnawk7h3prr0w9b2h68f3p1ifd1kzn3gz"))
-       (patches (search-patches "dbacl-include-locale.h.patch"))))
+       (patches (search-patches "dbacl-include-locale.h.patch"
+                                "dbacl-icheck-multiple-definitions.patch"))))
     (build-system gnu-build-system)
     (arguments
      `(#:make-flags
-- 
cgit v1.2.3