summaryrefslogtreecommitdiff
path: root/dev-util/dirdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util/dirdiff')
-rw-r--r--dev-util/dirdiff/Manifest9
-rw-r--r--dev-util/dirdiff/dirdiff-2.1-r2.ebuild39
-rw-r--r--dev-util/dirdiff/dirdiff-2.1-r3.ebuild43
-rw-r--r--dev-util/dirdiff/files/dirdiff-2.1-build.patch28
-rw-r--r--dev-util/dirdiff/files/dirdiff-2.1-funky-chars.patch201
-rw-r--r--dev-util/dirdiff/files/dirdiff-2.1-include.patch10
-rw-r--r--dev-util/dirdiff/files/dirdiff-2.1-tcl8.6.patch16
-rw-r--r--dev-util/dirdiff/files/dirdiff-2.1-vcs.patch16
-rw-r--r--dev-util/dirdiff/metadata.xml5
9 files changed, 367 insertions, 0 deletions
diff --git a/dev-util/dirdiff/Manifest b/dev-util/dirdiff/Manifest
new file mode 100644
index 000000000000..8386d8c3b27b
--- /dev/null
+++ b/dev-util/dirdiff/Manifest
@@ -0,0 +1,9 @@
+AUX dirdiff-2.1-build.patch 764 BLAKE2B e91b9e0c5ac370dbc3434015581e7574facdfd94ea782a5b82a9bfe6ef98c589322a7e8f0d2c419afd97101e005288a7a1f7f0350dc4d7ae897790321a4c109f SHA512 7b192071c14fd72733fe250f7ee5fa651f98238eb3238a584039b2f39537f04ed4b1940e2dbfceedc81df6933504c275a9b635d02b34b44186ff73c9e909d077
+AUX dirdiff-2.1-funky-chars.patch 7075 BLAKE2B e0f5a4ab6e4460f982ee9305a7b1f5d47429fd4d9e1b7bc4610c4b3fbb746817d77f06c4fa9fcce5ee919d751081b78a7fbc3e789cc86974b41a7eb6f93c6521 SHA512 966e33714e7bfdf5ea1cd893c07e7305220282543a28bc7054fb59fb75f595ec50a5a4ac81ce3ff49b0bf4877de17075c575fb3ba9e7766f199dcdfc7e52f766
+AUX dirdiff-2.1-include.patch 314 BLAKE2B 379a842839e5ae329fe61b8584204c206ce816cf2c808b1c44e4e8478cfcce9ffa445872170dc80a0e790c0510efd27a2fbe90bbdf830f1caa11087d4e117100 SHA512 a9fb10e5878f07d1f558810a0d34ba423f49c463f0ecf14ad5833b1ec1519ac0b467e387977a6da1bf48794a5dc3522c31f78b34731e61e39331d30c251da0bb
+AUX dirdiff-2.1-tcl8.6.patch 397 BLAKE2B 28ccdc2f87fcb3dda8191710efcc62c5c794bc734fbbe2470e40fa7f7f1337a677e3411b437aefca46afafaab3a94c011603632a26f47c9703668c9c679e8577 SHA512 938c6cf4f815f58f0de2c12b5bd19e8128615aba278c91e9c7a8e462f822b79d22f7d50ff331e095ff77ec979c9fc1a1a3a8bfd80f23c2f0e252a1e05098888e
+AUX dirdiff-2.1-vcs.patch 497 BLAKE2B 1dc187e73fb345074bfda218736137c2b34212186903870b780536ac3023e274a7eb26123deffb121dd153fa0ef00afc46f962a18932318ddd241375b204f517 SHA512 27baa8b3e0710db7ae9b01c1c132681ee71e96e4d19585fe0bdd9584e182ff96e7358df6607a40af054fdb536275b9c5a49581cde2fa934d6cf7f39489eb3a98
+DIST dirdiff-2.1.tar.gz 43105 BLAKE2B 5c9f49cb6b74434482d7d37935d47e235a46e83152d576ff83201c1dd663a101e70f853166624daaea413d9926107b7407790dceca0fbfbf3784fe6999735750 SHA512 826d5a7a633921bec7043c89ccdadff19b4a6328efd09913932b306a48242203fbf6b5bac69d72660acf2c76ce6c8c5e53be62c2e69bbf3e3717e21c544ca261
+EBUILD dirdiff-2.1-r2.ebuild 923 BLAKE2B 7836fdfeecea3fced5d7e8a032fdb454149b8d95b582810245c4d2b0476097bee70bc5c5622b4853640a3a990deaff9ba3e7582694b3bbae8c9ccf2683380f3d SHA512 5ec22626ef3f18f445ccbcc552fa328f59200bb853cc6cd7670be59a8d6a30e612508e9b48380ba146269e05c94e2c4be389fb842e1fb3162779589a120bb240
+EBUILD dirdiff-2.1-r3.ebuild 927 BLAKE2B 64fa1b792664ab953f81df1c19f3923a295abc49e0bce7d9b73b1638b3542fadf6168f07a60d4d54274f70944f3a4631e9d3d2681ecdf7341c7ef0fc8d0609f1 SHA512 97c4df7d6ef588b6a72501e42a88b6efcc32d5e14b7ebae08fefc8d150d777534b2a89dbedb5ba6f988c703aee740c86c94875344d945465aa04792533ddb6ac
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/dirdiff/dirdiff-2.1-r2.ebuild b/dev-util/dirdiff/dirdiff-2.1-r2.ebuild
new file mode 100644
index 000000000000..c739a93df91f
--- /dev/null
+++ b/dev-util/dirdiff/dirdiff-2.1-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="A tool for differing and merging directories"
+SRC_URI="https://www.samba.org/ftp/paulus/${P}.tar.gz"
+HOMEPAGE="https://www.samba.org/ftp/paulus/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~mips ppc x86"
+IUSE=""
+
+DEPEND="
+ dev-lang/tk:0=
+ dev-lang/tcl:0="
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${P}-include.patch \
+ "${FILESDIR}"/${P}-build.patch \
+ "${FILESDIR}"/${P}-vcs.patch \
+ "${FILESDIR}"/${P}-tcl8.6.patch \
+ "${FILESDIR}"/${P}-funky-chars.patch
+ tc-export CC
+ append-cppflags -I"${EPREFIX}"/usr/include/tcl
+}
+
+src_install() {
+ dobin dirdiff
+ dolib.so libfilecmp.so.0.0
+ dosym libfilecmp.so.0.0 /usr/$(get_libdir)/libfilecmp.so.0
+ dosym libfilecmp.so.0.0 /usr/$(get_libdir)/libfilecmp.so
+ dodoc README
+}
diff --git a/dev-util/dirdiff/dirdiff-2.1-r3.ebuild b/dev-util/dirdiff/dirdiff-2.1-r3.ebuild
new file mode 100644
index 000000000000..9c9f48067a95
--- /dev/null
+++ b/dev-util/dirdiff/dirdiff-2.1-r3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="A tool for differing and merging directories"
+SRC_URI="https://www.samba.org/ftp/paulus/${P}.tar.gz"
+HOMEPAGE="https://www.samba.org/ftp/paulus/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~x86"
+
+DEPEND="
+ dev-lang/tk:0=
+ dev-lang/tcl:0="
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-include.patch"
+ "${FILESDIR}/${P}-build.patch"
+ "${FILESDIR}/${P}-vcs.patch"
+ "${FILESDIR}/${P}-tcl8.6.patch"
+ "${FILESDIR}/${P}-funky-chars.patch"
+)
+
+DOCS=( README )
+
+src_prepare() {
+ default
+ tc-export CC
+ append-cppflags -I"${EPREFIX}"/usr/include/tcl
+}
+
+src_install() {
+ dobin "${PN}"
+ dolib.so libfilecmp.so.0.0
+ dosym libfilecmp.so.0.0 /usr/$(get_libdir)/libfilecmp.so.0
+ dosym libfilecmp.so.0.0 /usr/$(get_libdir)/libfilecmp.so
+ einstalldocs
+}
diff --git a/dev-util/dirdiff/files/dirdiff-2.1-build.patch b/dev-util/dirdiff/files/dirdiff-2.1-build.patch
new file mode 100644
index 000000000000..bb5010265196
--- /dev/null
+++ b/dev-util/dirdiff/files/dirdiff-2.1-build.patch
@@ -0,0 +1,28 @@
+ Makefile | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index b4a49f8..410e018 100644
+--- a/Makefile
++++ b/Makefile
+@@ -7,12 +7,17 @@ LIBDIR=$(DESTDIR)/usr/lib
+ INSTALL=install
+
+ # You may need to change the -I arguments depending on your system
+-CFLAGS=-O3 -I/usr/include/tcl8.3/ -I/usr/include/tcl
++#CFLAGS=-O3 -I/usr/include/tcl8.3/ -I/usr/include/tcl
++
++LIBS = -ltcl
+
+ all: libfilecmp.so.0.0
+
+-libfilecmp.so.0.0: filecmp.c
+- $(CC) $(CFLAGS) -shared -o $@ filecmp.c
++.c.o:
++ $(CC) $(CPPFLAGS) $(CFLAGS) -fPIC -c $< -o $@
++
++libfilecmp.so.0.0: filecmp.o
++ $(CC) $(LDFLAGS) -shared -Wl,-soname,libfilecmp.so.0 -o $@ filecmp.o $(LIBS)
+
+ install: dirdiff libfilecmp.so.0.0
+ $(INSTALL) -c dirdiff $(BINDIR)
diff --git a/dev-util/dirdiff/files/dirdiff-2.1-funky-chars.patch b/dev-util/dirdiff/files/dirdiff-2.1-funky-chars.patch
new file mode 100644
index 000000000000..1d4f715ac167
--- /dev/null
+++ b/dev-util/dirdiff/files/dirdiff-2.1-funky-chars.patch
@@ -0,0 +1,201 @@
+--- cvs-local.orig/dirdiff
++++ cvs-local/dirdiff
+@@ -563,7 +563,7 @@
+ if {$d1 == $d2} continue
+ set any 1
+ $base.p.$sub1 add command -label "$d2" \
+- -command "makepatch \"$d1\" \"$d2\""
++ -command [list makepatch $d1 $d2]
+ }
+ if {$any} {
+ $base.p add cascade -label "$d1 ->" -menu $base.p.$sub1
+@@ -579,7 +579,7 @@
+ set i 0
+ foreach d $dirs {
+ if {!$dirreadonly($i)} {
+- $base.t add command -label $d -command "touchfiles \"$d\""
++ $base.t add command -label $d -command [list touchfiles $d]
+ }
+ incr i
+ }
+@@ -677,7 +677,7 @@
+ set i 0
+ foreach d $dirs {
+ .bar.options add checkbutton -label "Read-only $d" \
+- -variable dirreadonly($i) -command "readonlychange $i"
++ -variable dirreadonly($i) -command [list readonlychange $i]
+ incr i
+ }
+
+@@ -1153,7 +1153,7 @@
+ if {$xi != ""} {
+ set x [lindex $dirs $xi]
+ $diffbut add command -label "Show $x" \
+- -command "showfile \"$x\" \"$selfile\""
++ -command [list showfile $x $selfile]
+ }
+ } elseif {$numgroups > 1} {
+ if {$numgroups > 2} {
+@@ -1163,7 +1163,7 @@
+ lappend x [lindex $dirs $i]
+ }
+ $diffbut add command -label "$numgroups-way diff" \
+- -command "diffn {$x} {$selfile}"
++ -command [list diffn $x $selfile]
+ }
+ for {set gn 1} {$gn < $numgroups} {incr gn} {
+ set yi [lindex $groupelts($gn) 0]
+@@ -1184,7 +1184,7 @@
+ set xi [lindex $groupelts($go) 0]
+ if {$xi == ""} continue
+ set x [lindex $dirs $xi]
+- set cmd "diff2 \"$x\" \"$y\" \"$selfile\""
++ set cmd [list diff2 $x $y $selfile]
+ if {$numgroups <= 3} {
+ if {$compound_ok} {
+ $diffbut add command -label "$x vs. $y" \
+@@ -1283,7 +1283,7 @@
+ set cl2 [lindex $bgcolors($ng) $age]
+ if {$im2 == "ex"} {set im2 ""}
+ set y [lindex $dirs $dst]
+- set cmd "copyselfile \"$src\" \"$dst\" \"$selfile\" 0"
++ set cmd [list copyselfile $src $dst $selfile 0]
+ if {$any == 1} {
+ if {$compound_ok} {
+ $copybut add command -label "$x -> $y" \
+@@ -1346,7 +1346,7 @@
+ set im2 [lindex $agecolors($ng) $age]
+ set cl2 [lindex $bgcolors($ng) $age]
+ set y [lindex $dirs $dst]
+- set cmd "copyselfile \"$src\" \"$dst\" \"$selfile\" 1"
++ set cmd [list copyselfile $src $dst $selfile 1]
+ if {$any == 1} {
+ if {$compound_ok} {
+ $copybut add command -label "$x -> $y" \
+@@ -1392,10 +1392,10 @@
+ if {$compound_ok} {
+ $copybut add command -label "Remove from $x" \
+ -image ex -compound left \
+- -command "removeselfile \"$dst\" \"$selfile\""
++ -command [list removeselfile $dst $selfile]
+ } else {
+ $copybut add command -label "Remove from $x" \
+- -command "removeselfile \"$dst\" \"$selfile\""
++ -command [list removeselfile $dst $selfile]
+ }
+ }
+ }
+@@ -1415,7 +1415,7 @@
+ if {$dirreadonly($d)} continue
+ set y [lindex $dirs $d]
+ $copybut add command -label "$x -> $y" \
+- -command "copyselfile \"$s\" \"$d\" \"$selfile\" 0"
++ -command [list copyselfile $s $d $selfile 0]
+ }
+ }
+ set needsep 1
+@@ -1429,10 +1429,10 @@
+ if {$compound_ok} {
+ $copybut add command -label "Remove from $x" \
+ -image ex -compound left \
+- -command "removeselfile \"$s\" \"$selfile\""
++ -command [list removeselfile $s $selfile]
+ } else {
+ $copybut add command -label "Remove from $x" \
+- -command "removeselfile \"$s\" \"$selfile\""
++ -command [list removeselfile $s $selfile]
+ }
+ }
+ }
+@@ -1469,7 +1469,7 @@
+
+ # Show the file in an external viewer
+ if { [llength $showprogram] > 0} {
+- eval "exec $showprogram \"$fn\" &"
++ exec $showprogram $fn &
+ return
+ }
+ # Or make our own viewer
+@@ -1569,7 +1569,7 @@
+ set diffopts "-U $ctxlines $diffiflag $diffwflag $diffbflag $diffBflag $diffdflag"
+
+ if { [llength $diffprogram] > 0} {
+- eval "exec $diffprogram \"$path1\" \"$path2\" &"
++ exec $diffprogram $path1 $path2 &
+ return
+ }
+ # If we used an external diff program, its options are used. If we didn't,
+@@ -1750,7 +1750,7 @@
+ if {$gx == $g && !$dirreadonly($k)} {
+ set f [lindex $dirs $k]
+ $mergebut.m add command -label "update $f" \
+- -command "diffmerge $i \"$f\""
++ -command [list diffmerge $i $f]
+ set path [joinname $f $difffile]
+ set diffmtime($path) [file mtime $path]
+ }
+@@ -1770,7 +1770,7 @@
+ if {$gx == $g && !$dirreadonly($k)} {
+ set f [lindex $dirs $k]
+ $mpatchbut.m add command -label "for $f" \
+- -command "diffmpatch $i \"$f\""
++ -command [list diffmpatch $i $f]
+ }
+ incr k
+ }
+@@ -3424,7 +3424,7 @@
+ $w.bar.edit.m add command -label Copy -command "tk_textCopy $w.t"
+ $w.bar.edit.m add command -label Paste -command "tk_textPaste $w.t"
+ $w.bar.edit.m add command -label Find \
+- -command "difffind :merge:$di:$fi $w.t"
++ -command [list difffind :merge:$di:$fi $w.t]
+ pack $w.bar.edit -side left
+ frame $w.f -relief sunk -border 2
+ entry $w.f.filename
+@@ -3533,7 +3533,7 @@
+ $w.bar.edit.m add command -label Copy -command "tk_textCopy $w.t"
+ $w.bar.edit.m add command -label Paste -command "tk_textPaste $w.t"
+ $w.bar.edit.m add command -label Find \
+- -command "difffind :mpatch:$fi $w.t"
++ -command [list difffind :mpatch:$fi $w.t]
+ pack $w.bar.edit -side left
+ frame $w.f -relief sunk -border 2
+ entry $w.f.filename
+@@ -3993,7 +3993,7 @@
+ $w.bar.edit.m add command -label Copy -command "tk_textCopy $w.t"
+ $w.bar.edit.m add command -label Paste -command "tk_textPaste $w.t"
+ $w.bar.edit.m add command -label Find \
+- -command "difffind :patch:$patchnum $w.t"
++ -command [list difffind :patch:$patchnum $w.t]
+ pack $w.bar.edit -side left
+ frame $w.f -relief sunk -border 2
+ label $w.f.l -text "Filename: "
+@@ -4032,23 +4032,23 @@
+ set p1 [joinname $d1 $f]
+ set p2 [joinname $d2 $f]
+ if {[file exists $p1] && [file exists $p2]} {
+- set fh [open "|diff $contextopt $p1 $p2" r]
++ set fh [open [list |diff $contextopt $p1 $p2] r]
+ } elseif {[file exists $p1] && ! [file exists $p2]} {
+- set fh [open "|diff $contextopt $p1 $nullfile" r]
++ set fh [open [list |diff $contextopt $p1 $nullfile] r]
+ } elseif {! [file exists $p1] && [file exists $p2]} {
+- set fh [open "|diff $contextopt $nullfile $p2" r]
++ set fh [open [list |diff $contextopt $nullfile $p2] r]
+ } else {
+ continue
+ }
+ fconfigure $fh -blocking 0
+- fileevent $fh readable "readpatch $fh $pnum $w $d1 $d2 $i \"$f\""
++ fileevent $fh readable [list readpatch $fh $pnum $w $d1 $d2 $i $f]
+ return
+ }
+ if {[string match ".*" $w]} {
+ $w.t delete "end - 1c" end
+ } else {
+ close $w
+- eval "exec $showprogram \"$patch_outfile\" &"
++ exec $showprogram $patch_outfile &
+ # Should we remove the tempfile here? We don't have it if we used
+ # the internal viewer
+ }
diff --git a/dev-util/dirdiff/files/dirdiff-2.1-include.patch b/dev-util/dirdiff/files/dirdiff-2.1-include.patch
new file mode 100644
index 000000000000..acaed3cf8026
--- /dev/null
+++ b/dev-util/dirdiff/files/dirdiff-2.1-include.patch
@@ -0,0 +1,10 @@
+--- a/filecmp.c 2005-04-19 12:22:01.000000000 +0200
++++ b/filecmp.c 2010-12-30 20:23:24.000000000 +0100
+@@ -11,6 +11,7 @@
+ #include <ctype.h>
+ #include <tcl.h>
+ #include <sys/fcntl.h>
++#include <unistd.h> /* close() read() */
+
+ #define BSIZE 32768
+ #define MAXTAGLEN 512 /* max tag length for sanity, < BSIZE */
diff --git a/dev-util/dirdiff/files/dirdiff-2.1-tcl8.6.patch b/dev-util/dirdiff/files/dirdiff-2.1-tcl8.6.patch
new file mode 100644
index 000000000000..39d930a51724
--- /dev/null
+++ b/dev-util/dirdiff/files/dirdiff-2.1-tcl8.6.patch
@@ -0,0 +1,16 @@
+ filecmp.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/filecmp.c b/filecmp.c
+index 673c1a8..fd4c6e5 100644
+--- a/filecmp.c
++++ b/filecmp.c
+@@ -341,7 +341,7 @@ FileCmpCmd(clientData, interp, argc, argv)
+ if (n1 < 0 || n2 < 0)
+ return TCL_ERROR;
+
+- sprintf(interp->result, "%d", same);
++ sprintf(Tcl_GetStringResult(interp), "%d", same);
+ return TCL_OK;
+ }
+
diff --git a/dev-util/dirdiff/files/dirdiff-2.1-vcs.patch b/dev-util/dirdiff/files/dirdiff-2.1-vcs.patch
new file mode 100644
index 000000000000..b8db24509eaa
--- /dev/null
+++ b/dev-util/dirdiff/files/dirdiff-2.1-vcs.patch
@@ -0,0 +1,16 @@
+ dirdiff | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dirdiff b/dirdiff
+index c5522b6..f470348 100755
+--- a/dirdiff
++++ b/dirdiff
+@@ -37,7 +37,7 @@ set nxdirmode 0
+ set docvsignore 0
+
+ set defaultcvsignore {
+- RCS SCCS CVS CVS.adm RCSLOG cvslog.* tags TAGS
++ RCS SCCS CVS CVS.adm RCSLOG cvslog.* .svn .git tags TAGS
+ .make.state .nse_depinfo *~ \#* .\#* ,* _$* *$
+ *.old *.bak *.BAK *.orig *.rej .del-* *.a *.olb
+ *.o *.obj *.so *.exe *.Z *.elc *.ln core
diff --git a/dev-util/dirdiff/metadata.xml b/dev-util/dirdiff/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/dev-util/dirdiff/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-05 16:01:50 +0000