mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-09 05:10:05 +02:00
85 lines
2.2 KiB
Plaintext
85 lines
2.2 KiB
Plaintext
From fb23681de30df94c26aff58522b505782e8718a9 Mon Sep 17 00:00:00 2001
|
|
From: Peter van Dijk <peter@7bits.nl>
|
|
Date: Tue, 7 Mar 2023 21:26:30 +0000
|
|
Subject: change share/ path to data/
|
|
|
|
|
|
diff --git a/Makefile.pl b/Makefile.pl
|
|
index a484883..f7fe23d 100644
|
|
--- a/Makefile.pl
|
|
+++ b/Makefile.pl
|
|
@@ -148,8 +148,8 @@ sub scenario()
|
|
|
|
# paths
|
|
my $EXE_PATH = "$PREFIX/bin";
|
|
- my $MODULES_PATH = "$PREFIX/share/$TOOL_SNAME";
|
|
- my $REL_PATH = "../share/$TOOL_SNAME";
|
|
+ my $MODULES_PATH = "$PREFIX/data/$TOOL_SNAME";
|
|
+ my $REL_PATH = "../data/$TOOL_SNAME";
|
|
|
|
if(not -w $PREFIX)
|
|
{
|
|
diff --git a/pkgdiff.pl b/pkgdiff.pl
|
|
index a56cf98..f9e7443 100644
|
|
--- a/pkgdiff.pl
|
|
+++ b/pkgdiff.pl
|
|
@@ -483,7 +483,7 @@ sub get_Modules()
|
|
# tool's directory
|
|
abs_path($TOOL_DIR),
|
|
# relative path to modules
|
|
- abs_path($TOOL_DIR)."/../share/pkgdiff",
|
|
+ abs_path($TOOL_DIR)."/../data/pkgdiff",
|
|
# system directory
|
|
'MODULES_INSTALL_PATH'
|
|
);
|
|
--
|
|
2.37.3
|
|
|
|
|
|
From 03828d10ff151633414b90849a052b40423115f6 Mon Sep 17 00:00:00 2001
|
|
From: Peter van Dijk <peter@7bits.nl>
|
|
Date: Tue, 7 Mar 2023 21:38:00 +0000
|
|
Subject: add support for diffing haiku .hpkg
|
|
|
|
(upstreamed for master instead of 1.7.2 at https://github.com/lvc/pkgdiff/pull/58)
|
|
|
|
diff --git a/modules/FileType.xml b/modules/FileType.xml
|
|
index 59e4882..f29981c 100644
|
|
--- a/modules/FileType.xml
|
|
+++ b/modules/FileType.xml
|
|
@@ -3780,6 +3780,7 @@
|
|
tar.lz, tlz, zip, zae, tar, lzma, gz
|
|
jar, war, ear, xz, 7z, rar, sfx, ace
|
|
bz, bz2, zipx
|
|
+ hpkg
|
|
</extensions>
|
|
<weight>
|
|
10
|
|
diff --git a/pkgdiff.pl b/pkgdiff.pl
|
|
index f9e7443..d451ed7 100644
|
|
--- a/pkgdiff.pl
|
|
+++ b/pkgdiff.pl
|
|
@@ -468,7 +468,8 @@ my %ArchiveFormats = (
|
|
"XZ" => ["xz"],
|
|
|
|
"JAR" => ["jar", "war",
|
|
- "ear"]
|
|
+ "ear"],
|
|
+ "HPKG" => ["hpkg"]
|
|
);
|
|
|
|
my $ARCHIVE_EXT = getArchivePattern();
|
|
@@ -2909,6 +2910,9 @@ sub unpackArchive($$)
|
|
elsif($Format eq "JAR") {
|
|
$Cmd = "cd \"$OutDir\" && jar -xf \"$Pkg\"";
|
|
}
|
|
+ elsif($Format eq "HPKG") {
|
|
+ $Cmd = "cd \"$OutDir\" && package extract \"$Pkg\"";
|
|
+ }
|
|
else {
|
|
return "";
|
|
}
|
|
--
|
|
2.37.3
|
|
|