haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-13 15:20:07 +02:00
Code Issues Packages Projects Releases Wiki Activity
Files
d1494deec257e85a72c54c623d0d43fc58eacf10
haikuports/dev-util/hxtools/patches/hxtools-20221119.patchset
Schrijvers Luc 91f1008e14 hxtools, bump version (#8584)
2023-05-04 14:35:29 +02:00

457 lines
12 KiB
Plaintext
Raw Blame History

From 6b19203f24e175b0a5d5672d5c9cec00e402e12a Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 7 Feb 2016 16:48:26 +0100
Subject: Haiku hacks.
diff --git a/sadmin/Makefile.am b/sadmin/Makefile.am
index f854a8d..e95309c 100644
--- a/sadmin/Makefile.am
+++ b/sadmin/Makefile.am
@@ -9,7 +9,7 @@ dist_bin_SCRIPTS = \
pmap_dirty \
su1
-pkglibexec_PROGRAMS = clock_info fd0ssh psthreads utmp_register
+pkglibexec_PROGRAMS = clock_info fd0ssh psthreads # utmp_register
dist_pkglibexec_SCRIPTS = \
logontime \
@@ -19,15 +19,15 @@ dist_pkglibexec_SCRIPTS = \
recursive_lower \
vcsaview
-noinst_PROGRAMS = \
- xfs_irecover
+# noinst_PROGRAMS = \
+# xfs_irecover
dist_noinst_SCRIPTS = \
filenameconv \
raregetty \
rpmdep.pl
-clock_info_LDADD = -lrt
+# clock_info_LDADD = -lrt
ofl_LDADD = ${libHX_LIBS}
proc_iomem_count_LDADD = ${libHX_LIBS}
proc_stat_parse_LDADD = ${libHX_LIBS}
diff --git a/sdevel/cctypeinfo.c b/sdevel/cctypeinfo.c
index f810354..17d1fd9 100644
--- a/sdevel/cctypeinfo.c
+++ b/sdevel/cctypeinfo.c
@@ -15,8 +15,10 @@
#else
# include <netinet/in.h>
# define SIZET_FMT "z"
+#ifndef __HAIKU__
# define HAVE_LOFF_T 1
#endif
+#endif
struct x16 {
uint8_t a;
diff --git a/smm/Makefile.am b/smm/Makefile.am
index eaafff1..219863b 100644
--- a/smm/Makefile.am
+++ b/smm/Makefile.am
@@ -4,13 +4,13 @@ AM_CPPFLAGS = ${regular_CPPFLAGS} ${libHX_CFLAGS}
AM_CFLAGS = ${regular_CFLAGS}
AM_CXXFLAGS = ${regular_CXXFLAGS}
-bin_PROGRAMS = bsvplay hcdplay palcomp pcmdiff pcmmix qplay vfontas
+bin_PROGRAMS = bsvplay palcomp pcmdiff pcmmix qplay vfontas # hcdplay
dist_bin_SCRIPTS = aumeta extract_d3pkg extract_dxhog extract_f3pod \
extract_qupak extract_dfqshared.pm gpsh mod2opus mkvappend ssa2srt
bsvplay_SOURCES = bsvplay.c pcspkr_pcm.c
bsvplay_LDADD = ${libHX_LIBS} -lm
-hcdplay_LDADD = ${libHX_LIBS}
+# hcdplay_LDADD = ${libHX_LIBS}
palcomp_SOURCES = palcomp.cpp
palcomp_LDADD = -lm
pcmdiff_LDADD = ${libHX_LIBS}
diff --git a/suser/Makefile.am b/suser/Makefile.am
index b3a6646..57e537f 100644
--- a/suser/Makefile.am
+++ b/suser/Makefile.am
@@ -7,8 +7,8 @@ AM_CFLAGS = ${regular_CFLAGS}
bin_PROGRAMS = \
declone \
sysinfo \
- tailhex \
- xcp
+ tailhex
+# xcp
dist_bin_SCRIPTS = \
fxterm \
@@ -24,4 +24,4 @@ dist_pkglibexec_SCRIPTS = \
declone_LDADD = ${libHX_LIBS}
sysinfo_LDADD = ${libHX_LIBS} ${libmount_LIBS} ${libpci_LIBS} ${libxcb_LIBS}
tailhex_LDADD = ${libHX_LIBS}
-xcp_LDADD = ${libHX_LIBS}
+# xcp_LDADD = ${libHX_LIBS}
--
2.37.3
From 0498938645290f527455b3a55108832d3fa15abe Mon Sep 17 00:00:00 2001
From: Begasus <begasus@gmail.com>
Date: Thu, 4 May 2023 14:20:03 +0200
Subject: Fix path to perl
diff --git a/sadmin/filenameconv b/sadmin/filenameconv
index 3ad76a8..10d8bfd 100755
--- a/sadmin/filenameconv
+++ b/sadmin/filenameconv
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
# SPDX-License-Identifier: MIT
# SPDX-FileCopyrightText: 2004-2007 Jan Engelhardt
#
diff --git a/sadmin/ldif-duplicate-attrs b/sadmin/ldif-duplicate-attrs
index 965767c..a43b909 100755
--- a/sadmin/ldif-duplicate-attrs
+++ b/sadmin/ldif-duplicate-attrs
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
# SPDX-License-Identifier: MIT
#
# Check for multi-value attributes in LDIF file
diff --git a/sadmin/ldif-leading-spaces b/sadmin/ldif-leading-spaces
index 1c0087e..c4afd87 100755
--- a/sadmin/ldif-leading-spaces
+++ b/sadmin/ldif-leading-spaces
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
# SPDX-License-Identifier: MIT
#
# Detect questionable values for LDAP attributes
diff --git a/sadmin/logontime b/sadmin/logontime
index 26df37e..1574de0 100755
--- a/sadmin/logontime
+++ b/sadmin/logontime
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
# SPDX-License-Identifier: MIT
#
# longontime - simple wtmp analyzer
diff --git a/sadmin/pmap_dirty b/sadmin/pmap_dirty
index 31851a5..0ca30d3 100755
--- a/sadmin/pmap_dirty
+++ b/sadmin/pmap_dirty
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl -w
# SPDX-License-Identifier: MIT
#
# pmap_dirty
diff --git a/sadmin/raregetty b/sadmin/raregetty
index 6f9c520..f416893 100755
--- a/sadmin/raregetty
+++ b/sadmin/raregetty
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
# SPDX-License-Identifier: MIT
#
# raregetty
diff --git a/sadmin/rpmdep.pl b/sadmin/rpmdep.pl
index d5438ee..1011b98 100755
--- a/sadmin/rpmdep.pl
+++ b/sadmin/rpmdep.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
# SPDX-License-Identifier: GPL-2.0-or-later
# SPDX-FileCopyrightText: 2005-2007 Jan Engelhardt
#
diff --git a/sadmin/vcsaview b/sadmin/vcsaview
index dbe6b5a..659aa40 100755
--- a/sadmin/vcsaview
+++ b/sadmin/vcsaview
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
# SPDX-License-Identifier: MIT
# SPDX-FileCopyrightText: 2004-2007 Jan Engelhardt
#
diff --git a/sdevel/checkbrack b/sdevel/checkbrack
index 8085dd9..bec29dd 100755
--- a/sdevel/checkbrack
+++ b/sdevel/checkbrack
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
# SPDX-License-Identifier: MIT
use Getopt::Long;
diff --git a/sdevel/diff2php b/sdevel/diff2php
index 0947216..6457f68 100755
--- a/sdevel/diff2php
+++ b/sdevel/diff2php
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
# SPDX-License-Identifier: MIT
#
# diff2php - turn a .diff into a multi-purpose PHP script
diff --git a/sdevel/doxygen-kerneldoc-filter b/sdevel/doxygen-kerneldoc-filter
index 1cfb728..81c2567 100755
--- a/sdevel/doxygen-kerneldoc-filter
+++ b/sdevel/doxygen-kerneldoc-filter
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
# SPDX-License-Identifier: MIT
#
# A filter script for doxygen to make it understand kerneldoc
diff --git a/sdevel/git-blame-stats b/sdevel/git-blame-stats
index fcbc699..bb01547 100755
--- a/sdevel/git-blame-stats
+++ b/sdevel/git-blame-stats
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
# SPDX-License-Identifier: MIT
#
# git-blame based authoring statistics
diff --git a/sdevel/git-forest b/sdevel/git-forest
index d5faab7..9a91c6f 100755
--- a/sdevel/git-forest
+++ b/sdevel/git-forest
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
# SPDX-License-Identifier: GPL-2.0-or-later
# SPDX-FileCopyrightText: 2008 Jan Engelhardt
#
diff --git a/sdevel/git-revert-stats b/sdevel/git-revert-stats
index 015e5b9..2894351 100755
--- a/sdevel/git-revert-stats
+++ b/sdevel/git-revert-stats
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
# SPDX-License-Identifier: MIT
#
# git-revert statistics
diff --git a/sdevel/man2html b/sdevel/man2html
index 3075711..359aa70 100755
--- a/sdevel/man2html
+++ b/sdevel/man2html
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
# SPDX-License-Identifier: MIT
#
# man2html (yet another one)
diff --git a/sdevel/paddrspacesize b/sdevel/paddrspacesize
index a7b2f2d..42b2d50 100755
--- a/sdevel/paddrspacesize
+++ b/sdevel/paddrspacesize
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
# SPDX-License-Identifier: MIT
#
# Print size of adress space
diff --git a/sdevel/proc_stat_signal_decode b/sdevel/proc_stat_signal_decode
index a67913c..117c36a 100755
--- a/sdevel/proc_stat_signal_decode
+++ b/sdevel/proc_stat_signal_decode
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
# SPDX-License-Identifier: MIT
#
# proc_stat_signal_decode - read /proc/stat signal status
diff --git a/sdevel/sourcefuncsize b/sdevel/sourcefuncsize
index aabfe89..a2ecd57 100755
--- a/sdevel/sourcefuncsize
+++ b/sdevel/sourcefuncsize
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
# SPDX-License-Identifier: GPL-2.0-or-later
# SPDX-FileCopyrightText: 2005-2007 Jan Engelhardt
#
diff --git a/sdevel/spec-beautifier b/sdevel/spec-beautifier
index ad7dae1..83b5b03 100755
--- a/sdevel/spec-beautifier
+++ b/sdevel/spec-beautifier
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
# SPDX-License-Identifier: GPL-2.0-or-later
# SPDX-FileCopyrightText: 2010-2011 Jan Engelhardt
#
diff --git a/smm/aumeta b/smm/aumeta
index 465d034..adc205c 100755
--- a/smm/aumeta
+++ b/smm/aumeta
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
# SPDX-License-Identifier: MIT
#
# Move seek index and add metadata
diff --git a/smm/extract_d3pkg b/smm/extract_d3pkg
index 7ddf80c..6953034 100755
--- a/smm/extract_d3pkg
+++ b/smm/extract_d3pkg
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
# SPDX-License-Identifier: MIT
#
# extract_d3pkg - extract Descent3 PKG files
diff --git a/smm/extract_dfqshared.pm b/smm/extract_dfqshared.pm
index c6d5971..cfe1b65 100644
--- a/smm/extract_dfqshared.pm
+++ b/smm/extract_dfqshared.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
# SPDX-License-Identifier: MIT
use strict;
diff --git a/smm/extract_dxhog b/smm/extract_dxhog
index a0b7802..c89735e 100755
--- a/smm/extract_dxhog
+++ b/smm/extract_dxhog
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
# SPDX-License-Identifier: MIT
#
# extract_d3hog - extract Descent3 HOG files
diff --git a/smm/extract_f3pod b/smm/extract_f3pod
index f92d7e2..b876689 100755
--- a/smm/extract_f3pod
+++ b/smm/extract_f3pod
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
# SPDX-License-Identifier: MIT
#
# extract_f3pod - extract Fury3 POD files
diff --git a/smm/extract_qupak b/smm/extract_qupak
index 46b8d06..4eccdde 100755
--- a/smm/extract_qupak
+++ b/smm/extract_qupak
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
# SPDX-License-Identifier: MIT
#
# extract_q2pak - extract Quake1/Quake2 PAK files
diff --git a/smm/gpsh b/smm/gpsh
index b01d168..ebb3570 100755
--- a/smm/gpsh
+++ b/smm/gpsh
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
# SPDX-License-Identifier: MIT
# SPDX-FileCopyrightText: 2010 Jan Engelhardt
#
diff --git a/smm/ssa2srt b/smm/ssa2srt
index 0b9806e..e65020f 100755
--- a/smm/ssa2srt
+++ b/smm/ssa2srt
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
# SPDX-License-Identifier: MIT
#
# Rudimentary script to reduce SSA subtitles to SRT format
diff --git a/suser/mailsplit b/suser/mailsplit
index adf8834..b5736a6 100755
--- a/suser/mailsplit
+++ b/suser/mailsplit
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
# SPDX-License-Identifier: MIT
#
# written by Jan Engelhardt, 2007-2008
diff --git a/suser/pegrep b/suser/pegrep
index 3e243d9..1993606 100755
--- a/suser/pegrep
+++ b/suser/pegrep
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
# SPDX-License-Identifier: MIT
use strict;
diff --git a/suser/pesubst b/suser/pesubst
index 423eafb..b442698 100755
--- a/suser/pesubst
+++ b/suser/pesubst
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
# SPDX-License-Identifier: MIT
#
# pesubst - replace strings in files
diff --git a/suser/qpdecode b/suser/qpdecode
index a7d567b..0e65cef 100755
--- a/suser/qpdecode
+++ b/suser/qpdecode
@@ -1,3 +1,3 @@
-#!/usr/bin/perl -lp
+#!/usr/bin/env perl -lp
# SPDX-License-Identifier: MIT
s{=(..)}{pack("H*",$1)}egs;
diff --git a/suser/qtar b/suser/qtar
index ee12465..908972f 100755
--- a/suser/qtar
+++ b/suser/qtar
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
# SPDX-License-Identifier: MIT
#
# quicker tar + better defaults
diff --git a/suser/settime.pl b/suser/settime.pl
index 3505212..388a2ed 100755
--- a/suser/settime.pl
+++ b/suser/settime.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
# SPDX-License-Identifier: MIT
use strict;
diff --git a/suser/wktimer b/suser/wktimer
index e6bff9c..a203b9c 100755
--- a/suser/wktimer
+++ b/suser/wktimer
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
# SPDX-License-Identifier: GPL-2.0-or-later
# SPDX-FileCopyrightText: 2004-2007 Jan Engelhardt
#
diff --git a/suser/xmlformat b/suser/xmlformat
index 54d84be..38c84b2 100755
--- a/suser/xmlformat
+++ b/suser/xmlformat
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
use strict;
use warnings;
--
2.37.3
Reference in New Issue View Git Blame Copy Permalink