From aa135d9e1266204e085fdf638c673a34d2a8db4d 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 7905782..f478500 100644
--- a/sadmin/Makefile.am
+++ b/sadmin/Makefile.am
@@ -15,8 +15,8 @@ pkglibexec_PROGRAMS = \
 	fd0ssh \
 	proc_iomem_count \
 	proc_stat_parse \
-	psthreads \
-	utmp_register
+	psthreads
+#	utmp_register
 
 dist_pkglibexec_SCRIPTS = \
 	logontime \
@@ -26,15 +26,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 f0f27e2..66954ed 100644
--- a/sdevel/cctypeinfo.c
+++ b/sdevel/cctypeinfo.c
@@ -18,8 +18,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 ec025ce..c8dc700 100644
--- a/smm/Makefile.am
+++ b/smm/Makefile.am
@@ -4,7 +4,7 @@ AM_CPPFLAGS = ${regular_CPPFLAGS} ${libHX_CFLAGS}
 AM_CFLAGS   = ${regular_CFLAGS}
 AM_CXXFLAGS = ${regular_CXXFLAGS}
 
-bin_PROGRAMS = clt2bdf hcdplay
+bin_PROGRAMS = clt2bdf #hcdplay
 if HAVE_XBRZ
 bin_PROGRAMS += cltxscale
 endif
@@ -34,7 +34,7 @@ clt2bdf_LDADD   = ${libHX_LIBS}
 clt2pbm_LDADD   = ${libHX_LIBS}
 cltxscale_SOURCES = cltxscale.c xbrz_call.cpp
 cltxscale_LDADD   = -lxbrz ${libHX_LIBS}
-hcdplay_LDADD   = ${libHX_LIBS}
+#hcdplay_LDADD   = ${libHX_LIBS}
 pcmdiff_LDADD   = ${libHX_LIBS}
 qplay_SOURCES   = qplay.c pcspkr_pcm.c
 qplay_LDADD     = ${libHX_LIBS} -lm
diff --git a/suser/Makefile.am b/suser/Makefile.am
index 7a21012..b72da2b 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 \
@@ -23,4 +23,4 @@ dist_pkglibexec_SCRIPTS = \
 
 sysinfo_LDADD = ${libHX_LIBS} ${libmount_LIBS} ${libpci_LIBS} ${libxcb_LIBS}
 tailhex_LDADD = ${libHX_LIBS}
-xcp_LDADD     = ${libHX_LIBS}
+#xcp_LDADD     = ${libHX_LIBS}
-- 
2.16.4


From 809a9f9f08af7485402f2e270621f8a06f46c22a Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Thu, 16 Aug 2018 11:01:34 +0200
Subject: Use correct path to perl


diff --git a/smm/aumeta b/smm/aumeta
old mode 100755
new mode 100644
index 2b6959d..af76eac
--- a/smm/aumeta
+++ b/smm/aumeta
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 #
 #	Move seek index and add metadata
 #	written by Jan Engelhardt, 2014–2015
diff --git a/suser/pegrep b/suser/pegrep
old mode 100755
new mode 100644
index 83889da..ef73206
--- a/suser/pegrep
+++ b/suser/pegrep
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/suser/qpdecode b/suser/qpdecode
old mode 100755
new mode 100644
index d7c283b..41ffadd
--- a/suser/qpdecode
+++ b/suser/qpdecode
@@ -1,2 +1,2 @@
-#!/usr/bin/perl -lp
+#!/usr/bin/env perl -lp
 s{=(..)}{pack("H*",$1)}egs;
-- 
2.16.4