From 0a5c4fcccf64c493abc8c295f26d95a4b2e4377f Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Sat, 8 Sep 2018 20:44:54 +0200 Subject: [PATCH] hxtools, bump version (#2924) --- ...0150304.recipe => hxtools-20180301.recipe} | 82 ++++++++----- ...304.patchset => hxtools-20180301.patchset} | 112 ++++++++++-------- 2 files changed, 113 insertions(+), 81 deletions(-) rename dev-util/hxtools/{hxtools-20150304.recipe => hxtools-20180301.recipe} (71%) rename dev-util/hxtools/patches/{hxtools-20150304.patchset => hxtools-20180301.patchset} (52%) diff --git a/dev-util/hxtools/hxtools-20150304.recipe b/dev-util/hxtools/hxtools-20180301.recipe similarity index 71% rename from dev-util/hxtools/hxtools-20150304.recipe rename to dev-util/hxtools/hxtools-20180301.recipe index 1c4cc569a..02b8c1653 100644 --- a/dev-util/hxtools/hxtools-20150304.recipe +++ b/dev-util/hxtools/hxtools-20180301.recipe @@ -1,6 +1,7 @@ SUMMARY="Tools and scripts too small to warrant their own packages" DESCRIPTION="A collection of tools and scripts that have accumulated over the \ years, and each of which seems to be too small to warrants its own project. +- aumeta(1) — move seek index and adjust metadata of audio files - bsvplay(1) — convert BASICA music files to PCM - cctypeinfo(1) – show sizes of C types on the implementation it was compiled with - checkbrack(1) — check parenthesis and bracket count @@ -29,6 +30,7 @@ years, and each of which seems to be too small to warrants its own project. - gpsh(1) — grep in tracklists and play audio files - graph-fanout(1) – fan a tree (for graphviz) - graph-lchain(1) – remove circles in graphs using longest-chaining method +- gxxdm — explains libstdc++v3 mangled names in detail. (Not feature-complete.) - logontime(8) — show cumulative logon time from wtmp - mailsplit(1) — split an mbox into single files - man2html(1) — convert nroff manpages to HTML @@ -37,14 +39,17 @@ years, and each of which seems to be too small to warrants its own project. - netload(8) — show utilization of network interface - newns(8) — clone current filesystem namespace and start a process - ofl(1) — open file lister (replaces fuser and lsof -m) +- mkvappend — concatenate multiple files into one Matroska container file - paddrspacesize(1) – print size of processes' address spaces - pesubst(1) — perl-regexp stream substitution (replaces sed for sub‐ stitutions) +- pegrep(1) — multi-line perl-regexp grep - pmap_dirty(1) — display amount of RAM a process uses hard - png2wx.pl(1) — transform arbitrary files into C++ files for wxWidgets - printcaps(1) — print currently active process capabilities - proc_iomem_count(1) – show MMIO region sizes - proc_stat_signal(1) – decode /proc/self/stat for signal status - pshtreads(1) – alternative experiment to ps(1) involving thread display +- qpdecode — quoted-printable filter - qplay(1) — convert QBASIC play strings to PCM - qtar(1) – faster interface to tar with file ordering - raregetty(8) — local login program for remote hosts @@ -62,8 +67,8 @@ years, and each of which seems to be too small to warrants its own project. - wavdiff(1) — proof-of-concept raw PCM deltifier - wktimer(1) — work timer " -HOMEPAGE="http://inai.de/projects/hxtools/" -COPYRIGHT="2014 Developer Name" +HOMEPAGE="https://inai.de/projects/hxtools/" +COPYRIGHT="2018 Developer Name" LICENSE=" GNU GPL v2 GNU GPL v3 @@ -71,53 +76,70 @@ LICENSE=" " REVISION="1" SOURCE_URI="http://jftp.inai.de/hxtools/hxtools-$portVersion.tar.xz" -CHECKSUM_SHA256="55265b16191831c4e332b0235b057e3f1e952298abf34734a8fa2ee9bb7be382" +CHECKSUM_SHA256="92cf002d1375acc3e995206a5096391d2ee2a714a9e59f01aab19c3cdcfa428a" PATCHES="hxtools-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64" SECONDARY_ARCHITECTURES="x86" +# On x86_gcc2 we don't want to install the commands in bin//, but in bin/. +commandSuffix=$secondaryArchSuffix +commandBinDir=$binDir +if [ "$targetArchitecture" = x86_gcc2 ]; then + commandSuffix= + commandBinDir=$prefix/bin +fi + GLOBAL_WRITABLE_FILES=" settings/hxloginpref.conf keep-old " PROVIDES=" hxtools$secondaryArchSuffix = $portVersion - cmd:bin2c$secondaryArchSuffix - cmd:checkbrack$secondaryArchSuffix - cmd:clock_info$secondaryArchSuffix - cmd:clt2bdf$secondaryArchSuffix - cmd:cwdiff$secondaryArchSuffix - cmd:declone$secondaryArchSuffix - cmd:fxterm$secondaryArchSuffix - cmd:git_author_stat$secondaryArchSuffix - cmd:git_export_patch$secondaryArchSuffix - cmd:git_forest$secondaryArchSuffix - cmd:git_track$secondaryArchSuffix - cmd:googtts$secondaryArchSuffix - cmd:gpsh$secondaryArchSuffix - cmd:man2html$secondaryArchSuffix - cmd:move_moov$secondaryArchSuffix - cmd:ofl$secondaryArchSuffix - cmd:pesubst$secondaryArchSuffix - cmd:pmap_dirty$secondaryArchSuffix - cmd:qtar$secondaryArchSuffix - cmd:rot13$secondaryArchSuffix - cmd:spec_beautifier$secondaryArchSuffix - cmd:ssa2srt$secondaryArchSuffix - cmd:su1$secondaryArchSuffix - cmd:sysinfo$secondaryArchSuffix - cmd:tailhex$secondaryArchSuffix - cmd:wktimer$secondaryArchSuffix + cmd:aumeta$commandSuffix + cmd:bin2c$commandSuffix + cmd:checkbrack$commandSuffix + cmd:clock_info$commandSuffix + cmd:clt2bdf$commandSuffix + cmd:cwdiff$commandSuffix + cmd:declone$commandSuffix + cmd:fxterm$commandSuffix + cmd:git_author_stat$commandSuffix + cmd:git_export_patch$commandSuffix + cmd:git_forest$commandSuffix + cmd:git_track$commandSuffix + cmd:googtts$commandSuffix + cmd:gpsh$commandSuffix + cmd:gxxdm$commandSuffix + cmd:man2html$commandSuffix + cmd:mkvappend$commandSuffix + cmd:move_moov$commandSuffix + cmd:ofl$commandSuffix + cmd:pesubst$commandSuffix + cmd:pegrep$commandSuffix + cmd:pmap_dirty$commandSuffix + cmd:qpdecode$commandSuffix + cmd:qtar$commandSuffix + cmd:rot13$commandSuffix + cmd:spec_beautifier$commandSuffix + cmd:ssa2srt$commandSuffix + cmd:su1$commandSuffix + cmd:sysinfo$commandSuffix + cmd:tailhex$commandSuffix + cmd:wktimer$commandSuffix " REQUIRES=" haiku$secondaryArchSuffix lib:libHX$secondaryArchSuffix + lib:libpci$secondaryArchSuffix + lib:libXcb$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libHX$secondaryArchSuffix + devel:libpci$secondaryArchSuffix + devel:libXcb$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:aclocal @@ -130,7 +152,7 @@ BUILD_PREREQUIRES=" BUILD() { sh autogen.sh - runConfigure ./configure + runConfigure --omit-dirs binDir ./configure --bindir="$commandBinDir" make $jobArgs } diff --git a/dev-util/hxtools/patches/hxtools-20150304.patchset b/dev-util/hxtools/patches/hxtools-20180301.patchset similarity index 52% rename from dev-util/hxtools/patches/hxtools-20150304.patchset rename to dev-util/hxtools/patches/hxtools-20180301.patchset index 0862bcaea..8cec7a16e 100644 --- a/dev-util/hxtools/patches/hxtools-20150304.patchset +++ b/dev-util/hxtools/patches/hxtools-20180301.patchset @@ -1,11 +1,11 @@ -From 4ca0152e3d8233bddfc206ed5de088f769c74c40 Mon Sep 17 00:00:00 2001 +From aa135d9e1266204e085fdf638c673a34d2a8db4d Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 7 Feb 2016 16:48:26 +0100 Subject: Haiku hacks. diff --git a/sadmin/Makefile.am b/sadmin/Makefile.am -index a5fd009..108163f 100644 +index 7905782..f478500 100644 --- a/sadmin/Makefile.am +++ b/sadmin/Makefile.am @@ -15,8 +15,8 @@ pkglibexec_PROGRAMS = \ @@ -16,10 +16,10 @@ index a5fd009..108163f 100644 - utmp_register + psthreads +# utmp_register - if HAVE_LIBCAP - pkglibexec_PROGRAMS += printcaps - endif -@@ -27,15 +27,15 @@ dist_pkglibexec_SCRIPTS = \ + + dist_pkglibexec_SCRIPTS = \ + logontime \ +@@ -26,15 +26,15 @@ dist_pkglibexec_SCRIPTS = \ recursive_lower \ vcsaview @@ -36,8 +36,8 @@ index a5fd009..108163f 100644 -clock_info_LDADD = -lrt +#clock_info_LDADD = -lrt ofl_LDADD = ${libHX_LIBS} - printcaps_LDADD = ${libHX_LIBS} ${libcap_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 @@ -54,63 +54,29 @@ index f0f27e2..66954ed 100644 struct x16 { uint8_t a; diff --git a/smm/Makefile.am b/smm/Makefile.am -index d8099d6..1bf4d3d 100644 +index ec025ce..c8dc700 100644 --- a/smm/Makefile.am +++ b/smm/Makefile.am -@@ -6,7 +6,7 @@ AM_CXXFLAGS = ${regular_CXXFLAGS} - CLEANFILES = omixer orec +@@ -4,7 +4,7 @@ AM_CPPFLAGS = ${regular_CPPFLAGS} ${libHX_CFLAGS} + AM_CFLAGS = ${regular_CFLAGS} + AM_CXXFLAGS = ${regular_CXXFLAGS} - bin_PROGRAMS = \ -- clt2bdf hcdplay oplay -+ clt2bdf #hcdplay oplay +-bin_PROGRAMS = clt2bdf hcdplay ++bin_PROGRAMS = clt2bdf #hcdplay if HAVE_XBRZ bin_PROGRAMS += cltxscale endif -@@ -32,29 +32,29 @@ dist_pkglibexec_SCRIPTS = \ - stxdb - - bsvplay_SOURCES = bsvplay.c pcspkr_pcm.c --bsvplay_LDADD = ${libHX_LIBS} -lm -+bsvplay_LDADD = ${libHX_LIBS} #-lm - clt2bdf_LDADD = ${libHX_LIBS} +@@ -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} --oplay_LDADD = ${libHX_LIBS} +#hcdplay_LDADD = ${libHX_LIBS} -+#oplay_LDADD = ${libHX_LIBS} pcmdiff_LDADD = ${libHX_LIBS} qplay_SOURCES = qplay.c pcspkr_pcm.c --qplay_LDADD = ${libHX_LIBS} -lm -+qplay_LDADD = ${libHX_LIBS} #-lm - vfontas_LDADD = ${libHX_LIBS} - - EXTRA_DIST = pcspkr.h - --omixer${EXEEXT}: oplay${EXEEXT} -- if [ ! -e omixer ]; then ln -s oplay omixer; fi; -+#omixer${EXEEXT}: oplay${EXEEXT} -+# if [ ! -e omixer ]; then ln -s oplay omixer; fi; - --orec${EXEEXT}: oplay${EXEEXT} -- if [ ! -e orec ]; then ln -s oplay orec; fi; -+#orec${EXEEXT}: oplay${EXEEXT} -+# if [ ! -e orec ]; then ln -s oplay orec; fi; - --all-local: omixer${EXEEXT} orec${EXEEXT} -+#all-local: omixer${EXEEXT} orec${EXEEXT} - --install-exec-local: -- test -z "${bindir}" || ${MKDIR_P} "${DESTDIR}${bindir}"; -- ln -s "oplay${EXEEXT}" "${DESTDIR}${bindir}/orec${EXEEXT}"; -- ln -s "oplay${EXEEXT}" "${DESTDIR}${bindir}/omixer${EXEEXT}"; -+#install-exec-local: -+# test -z "${bindir}" || ${MKDIR_P} "${DESTDIR}${bindir}"; -+# ln -s "oplay${EXEEXT}" "${DESTDIR}${bindir}/orec${EXEEXT}"; -+# ln -s "oplay${EXEEXT}" "${DESTDIR}${bindir}/omixer${EXEEXT}"; + qplay_LDADD = ${libHX_LIBS} -lm diff --git a/suser/Makefile.am b/suser/Makefile.am -index 2c973a1..88d3a73 100644 +index 7a21012..b72da2b 100644 --- a/suser/Makefile.am +++ b/suser/Makefile.am @@ -7,8 +7,8 @@ AM_CFLAGS = ${regular_CFLAGS} @@ -131,5 +97,49 @@ index 2c973a1..88d3a73 100644 -xcp_LDADD = ${libHX_LIBS} +#xcp_LDADD = ${libHX_LIBS} -- -2.7.0 +2.16.4 + + +From 809a9f9f08af7485402f2e270621f8a06f46c22a Mon Sep 17 00:00:00 2001 +From: begasus +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