From a6bc50adc765227a7827e56a1b095407698b2c2e Mon Sep 17 00:00:00 2001 From: PktSurf Date: Tue, 29 Oct 2024 15:25:51 +0530 Subject: [PATCH] Added elfutils and fuse to base Removed build options that placed elf binaries in /bin Removed executable bit from some build files --- base/bash/bash.SMBuild | 3 +- base/bison/bison.SMBuild | 1 - base/boost/boost.SMBuild | 6 +- base/brotli/brotli.SMBuild | 1 - base/bubblewrap/bubblewrap.SMBuild | 1 - base/busybox/busybox.SMBuild | 6 +- base/bzip2/bzip2.SMBuild | 12 +-- base/c-ares/c-ares.SMBuild | 0 base/ca-certificates/ca-certificates.SMBuild | 6 +- base/ca-certificates/setup.11.cacerts | 2 +- base/cbindgen/cbindgen.SMBuild | 0 base/ccache/ccache.SMBuild | 6 +- base/chrony/chrony.SMBuild | 3 +- base/chrpath/chrpath.SMBuild | 3 +- base/cmake/cmake.SMBuild | 1 - base/coreutils/coreutils.SMBuild | 3 +- base/cpio/cpio.SMBuild | 1 - base/crda/crda.SMBuild | 4 +- base/cryptsetup/cryptsetup.SMBuild | 2 +- base/curl/curl.SMBuild | 1 - base/cython/cython.SMBuild | 10 +-- base/db/db.SMBuild | 1 - base/dcron/dcron.SMBuild | 8 +- .../desktop-file-utils.SMBuild | 3 +- base/dialog/dialog.SMBuild | 4 +- base/diffutils/diffutils.SMBuild | 3 +- base/dmidecode/dmidecode.SMBuild | 2 +- base/docbook/docbook.SMBuild | 0 base/dosfstools/dosfstools.SMBuild | 2 +- base/ed/ed.SMBuild | 1 - base/elfutils/elfutils.SMBuild | 51 ++++++++++++ base/elfutils/fix-uninitialized.patch | 17 ++++ base/elfutils/musl-asm-ptrace-h.patch | 10 +++ base/elfutils/musl-macros.patch | 78 +++++++++++++++++++ base/enchant/enchant.SMBuild | 5 +- base/enet/enet.SMBuild | 0 base/eudev/eudev.SMBuild | 3 +- base/exfat-utils/exfat-utils.SMBuild | 3 +- base/exiv2/exiv2.SMBuild | 1 - base/expat/expat.SMBuild | 1 - base/faad2/faad2.SMBuild | 1 - base/fdk-aac/fdk-aac.SMBuild | 0 base/fftw/fftw.SMBuild | 1 - base/file/file.SMBuild | 1 - base/findutils/findutils.SMBuild | 3 +- base/flac/flac.SMBuild | 1 - base/flex/flex.SMBuild | 1 - base/fmt/fmt.SMBuild | 0 base/fribidi/fribidi.SMBuild | 1 - base/ftjam/ftjam.SMBuild | 3 +- base/fuse/doinst.sh | 23 ++++++ base/fuse/fuse.SMBuild | 39 ++++++++++ base/fuse2/fuse2.SMBuild | 0 base/fuse3/fuse3.SMBuild | 0 base/gawk/gawk.SMBuild | 3 +- base/gdb/gdb.SMBuild | 1 - base/gdbm/gdbm.SMBuild | 1 - base/gettext/gettext.SMBuild | 1 - base/giflib/giflib.SMBuild | 2 +- base/glib/glib.SMBuild | 1 - base/gloox/gloox.SMBuild | 1 - base/gnupg2/gnupg2.SMBuild | 3 +- base/gperf/gperf.SMBuild | 3 +- base/gpgme/gpgme.SMBuild | 1 - base/gptfdisk/gptfdisk.SMBuild | 2 +- base/grep/grep.SMBuild | 3 +- base/groff/groff.SMBuild | 1 - base/gsl/gsl.SMBuild | 1 - base/gstreamer/gstreamer.SMBuild | 1 - base/gyp/gyp.SMBuild | 2 - base/gzip/gzip.SMBuild | 3 +- base/hdparm/hdparm.SMBuild | 2 +- base/htop/htop.SMBuild | 1 - base/hunspell/hunspell.SMBuild | 1 - base/hyphen/hyphen.SMBuild | 1 - base/i2c-tools/i2c-tools.SMBuild | 2 +- base/icu/icu.SMBuild | 3 +- base/ijs/ijs.SMBuild | 1 - base/intltool/intltool.SMBuild | 3 +- base/iptables/iptables.SMBuild | 5 +- xorg/at-spi2-core/at-spi2-core.SMBuild | 0 xorg/bdftopcf/bdftopcf.SMBuild | 0 xorg/dbus/dbus.SMBuild | 5 +- xorg/dconf/dconf.SMBuild | 0 .../dejavu-fonts-ttf/dejavu-fonts-ttf.SMBuild | 0 xorg/font-util/font-util.SMBuild | 0 xorg/fontconfig/fontconfig.SMBuild | 1 - xorg/freeglut/freeglut.SMBuild | 0 xorg/freetype/freetype.SMBuild | 3 +- .../glslang-vulkan-sdk.SMBuild | 1 - xorg/glslang/glslang.SMBuild | 0 xorg/glu/glu.SMBuild | 0 xorg/iceauth/iceauth.SMBuild | 0 xorg/imake/imake.SMBuild | 0 xorg/imlib2/imlib2.SMBuild | 0 xorg/jasper/jasper.SMBuild | 0 xorg/libx11/libx11.SMBuild | 0 xorg/libxau/libxau.SMBuild | 0 xorg/libxaw/libxaw.SMBuild | 0 xorg/libxaw3d/libxaw3d.SMBuild | 0 xorg/libxaw3dxft/libxaw3dxft.SMBuild | 0 xorg/libxcb/libxcb.SMBuild | 0 xorg/libxcomposite/libxcomposite.SMBuild | 0 xorg/libxcursor/libxcursor.SMBuild | 0 xorg/libxdamage/libxdamage.SMBuild | 0 xorg/libxdmcp/libxdmcp.SMBuild | 0 xorg/libxext/libxext.SMBuild | 0 xorg/libxfixes/libxfixes.SMBuild | 0 xorg/libxfont2/libxfont2.SMBuild | 0 xorg/libxft/libxft.SMBuild | 0 xorg/libxi/libxi.SMBuild | 0 xorg/libxinerama/libxinerama.SMBuild | 0 xorg/libxkbcommon/libxkbcommon.SMBuild | 0 xorg/libxkbfile/libxkbfile.SMBuild | 0 xorg/libxklavier/libxklavier.SMBuild | 0 xorg/libxmu/libxmu.SMBuild | 0 xorg/libxpm/libxpm.SMBuild | 1 - xorg/libxpresent/libxpresent.SMBuild | 0 xorg/libxrandr/libxrandr.SMBuild | 0 xorg/libxrender/libxrender.SMBuild | 0 xorg/libxscrnsaver/libxscrnsaver.SMBuild | 0 xorg/libxshmfence/libxshmfence.SMBuild | 0 xorg/libxt/libxt.SMBuild | 0 xorg/libxtst/libxtst.SMBuild | 0 xorg/libxv/libxv.SMBuild | 0 xorg/libxxf86vm/libxxf86vm.SMBuild | 0 xorg/mtdev/mtdev.SMBuild | 1 - xorg/numlockx/numlockx.SMBuild | 2 +- xorg/xcalc/xcalc.SMBuild | 0 xorg/xcb-proto/xcb-proto.SMBuild | 0 xorg/xcb-util-cursor/xcb-util-cursor.SMBuild | 0 xorg/xcb-util-image/xcb-util-image.SMBuild | 0 .../xcb-util-keysyms/xcb-util-keysyms.SMBuild | 0 .../xcb-util-renderutil.SMBuild | 0 xorg/xcb-util-wm/xcb-util-wm.SMBuild | 0 xorg/xcb-util/xcb-util.SMBuild | 0 xorg/xclipboard/xclipboard.SMBuild | 0 xorg/xclock/xclock.SMBuild | 0 xorg/xf86-video-vesa/xf86-video-vesa.SMBuild | 0 xorg/xfontsel/xfontsel.SMBuild | 0 xorg/xhost/xhost.SMBuild | 0 xorg/xinit/xinit.SMBuild | 0 xorg/xinput/xinput.SMBuild | 0 xorg/xkbcomp/xkbcomp.SMBuild | 0 .../xkeyboard-config/xkeyboard-config.SMBuild | 0 xorg/xmodmap/xmodmap.SMBuild | 0 xorg/xorg-cf-files/xorg-cf-files.SMBuild | 0 xorg/xorg-fonts/xorg-fonts.SMBuild | 0 xorg/xorg-macros/xorg-macros.SMBuild | 0 xorg/xorg-server/xorg-server.SMBuild | 0 xorg/xorgproto/xorgproto.SMBuild | 0 xorg/xrandr/xrandr.SMBuild | 0 xorg/xrdb/xrdb.SMBuild | 0 xorg/xset/xset.SMBuild | 0 xorg/xsetroot/xsetroot.SMBuild | 0 xorg/xtrans/xtrans.SMBuild | 0 xorg/xvinfo/xvinfo.SMBuild | 0 xorg/xwd/xwd.SMBuild | 0 158 files changed, 279 insertions(+), 123 deletions(-) mode change 100755 => 100644 base/bash/bash.SMBuild mode change 100755 => 100644 base/bison/bison.SMBuild mode change 100755 => 100644 base/boost/boost.SMBuild mode change 100755 => 100644 base/brotli/brotli.SMBuild mode change 100755 => 100644 base/bubblewrap/bubblewrap.SMBuild mode change 100755 => 100644 base/busybox/busybox.SMBuild mode change 100755 => 100644 base/bzip2/bzip2.SMBuild mode change 100755 => 100644 base/c-ares/c-ares.SMBuild mode change 100755 => 100644 base/ca-certificates/ca-certificates.SMBuild mode change 100755 => 100644 base/cbindgen/cbindgen.SMBuild mode change 100755 => 100644 base/ccache/ccache.SMBuild mode change 100755 => 100644 base/chrony/chrony.SMBuild mode change 100755 => 100644 base/chrpath/chrpath.SMBuild mode change 100755 => 100644 base/cmake/cmake.SMBuild mode change 100755 => 100644 base/coreutils/coreutils.SMBuild mode change 100755 => 100644 base/cpio/cpio.SMBuild mode change 100755 => 100644 base/crda/crda.SMBuild mode change 100755 => 100644 base/cryptsetup/cryptsetup.SMBuild mode change 100755 => 100644 base/curl/curl.SMBuild mode change 100755 => 100644 base/cython/cython.SMBuild mode change 100755 => 100644 base/db/db.SMBuild mode change 100755 => 100644 base/dcron/dcron.SMBuild mode change 100755 => 100644 base/desktop-file-utils/desktop-file-utils.SMBuild mode change 100755 => 100644 base/dialog/dialog.SMBuild mode change 100755 => 100644 base/diffutils/diffutils.SMBuild mode change 100755 => 100644 base/dmidecode/dmidecode.SMBuild mode change 100755 => 100644 base/docbook/docbook.SMBuild mode change 100755 => 100644 base/dosfstools/dosfstools.SMBuild mode change 100755 => 100644 base/ed/ed.SMBuild create mode 100644 base/elfutils/elfutils.SMBuild create mode 100644 base/elfutils/fix-uninitialized.patch create mode 100644 base/elfutils/musl-asm-ptrace-h.patch create mode 100644 base/elfutils/musl-macros.patch mode change 100755 => 100644 base/enchant/enchant.SMBuild mode change 100755 => 100644 base/enet/enet.SMBuild mode change 100755 => 100644 base/eudev/eudev.SMBuild mode change 100755 => 100644 base/exfat-utils/exfat-utils.SMBuild mode change 100755 => 100644 base/exiv2/exiv2.SMBuild mode change 100755 => 100644 base/expat/expat.SMBuild mode change 100755 => 100644 base/faad2/faad2.SMBuild mode change 100755 => 100644 base/fdk-aac/fdk-aac.SMBuild mode change 100755 => 100644 base/fftw/fftw.SMBuild mode change 100755 => 100644 base/file/file.SMBuild mode change 100755 => 100644 base/findutils/findutils.SMBuild mode change 100755 => 100644 base/flac/flac.SMBuild mode change 100755 => 100644 base/flex/flex.SMBuild mode change 100755 => 100644 base/fmt/fmt.SMBuild mode change 100755 => 100644 base/fribidi/fribidi.SMBuild mode change 100755 => 100644 base/ftjam/ftjam.SMBuild create mode 100644 base/fuse/doinst.sh create mode 100644 base/fuse/fuse.SMBuild mode change 100755 => 100644 base/fuse2/fuse2.SMBuild mode change 100755 => 100644 base/fuse3/fuse3.SMBuild mode change 100755 => 100644 base/gawk/gawk.SMBuild mode change 100755 => 100644 base/gdb/gdb.SMBuild mode change 100755 => 100644 base/gdbm/gdbm.SMBuild mode change 100755 => 100644 base/gettext/gettext.SMBuild mode change 100755 => 100644 base/giflib/giflib.SMBuild mode change 100755 => 100644 base/glib/glib.SMBuild mode change 100755 => 100644 base/gloox/gloox.SMBuild mode change 100755 => 100644 base/gnupg2/gnupg2.SMBuild mode change 100755 => 100644 base/gperf/gperf.SMBuild mode change 100755 => 100644 base/gpgme/gpgme.SMBuild mode change 100755 => 100644 base/gptfdisk/gptfdisk.SMBuild mode change 100755 => 100644 base/grep/grep.SMBuild mode change 100755 => 100644 base/groff/groff.SMBuild mode change 100755 => 100644 base/gsl/gsl.SMBuild mode change 100755 => 100644 base/gstreamer/gstreamer.SMBuild mode change 100755 => 100644 base/gyp/gyp.SMBuild mode change 100755 => 100644 base/gzip/gzip.SMBuild mode change 100755 => 100644 base/hdparm/hdparm.SMBuild mode change 100755 => 100644 base/htop/htop.SMBuild mode change 100755 => 100644 base/hunspell/hunspell.SMBuild mode change 100755 => 100644 base/hyphen/hyphen.SMBuild mode change 100755 => 100644 base/i2c-tools/i2c-tools.SMBuild mode change 100755 => 100644 base/icu/icu.SMBuild mode change 100755 => 100644 base/ijs/ijs.SMBuild mode change 100755 => 100644 base/intltool/intltool.SMBuild mode change 100755 => 100644 base/iptables/iptables.SMBuild mode change 100755 => 100644 xorg/at-spi2-core/at-spi2-core.SMBuild mode change 100755 => 100644 xorg/bdftopcf/bdftopcf.SMBuild mode change 100755 => 100644 xorg/dbus/dbus.SMBuild mode change 100755 => 100644 xorg/dconf/dconf.SMBuild mode change 100755 => 100644 xorg/dejavu-fonts-ttf/dejavu-fonts-ttf.SMBuild mode change 100755 => 100644 xorg/font-util/font-util.SMBuild mode change 100755 => 100644 xorg/fontconfig/fontconfig.SMBuild mode change 100755 => 100644 xorg/freeglut/freeglut.SMBuild mode change 100755 => 100644 xorg/freetype/freetype.SMBuild mode change 100755 => 100644 xorg/glslang-vulkan-sdk/glslang-vulkan-sdk.SMBuild mode change 100755 => 100644 xorg/glslang/glslang.SMBuild mode change 100755 => 100644 xorg/glu/glu.SMBuild mode change 100755 => 100644 xorg/iceauth/iceauth.SMBuild mode change 100755 => 100644 xorg/imake/imake.SMBuild mode change 100755 => 100644 xorg/imlib2/imlib2.SMBuild mode change 100755 => 100644 xorg/jasper/jasper.SMBuild mode change 100755 => 100644 xorg/libx11/libx11.SMBuild mode change 100755 => 100644 xorg/libxau/libxau.SMBuild mode change 100755 => 100644 xorg/libxaw/libxaw.SMBuild mode change 100755 => 100644 xorg/libxaw3d/libxaw3d.SMBuild mode change 100755 => 100644 xorg/libxaw3dxft/libxaw3dxft.SMBuild mode change 100755 => 100644 xorg/libxcb/libxcb.SMBuild mode change 100755 => 100644 xorg/libxcomposite/libxcomposite.SMBuild mode change 100755 => 100644 xorg/libxcursor/libxcursor.SMBuild mode change 100755 => 100644 xorg/libxdamage/libxdamage.SMBuild mode change 100755 => 100644 xorg/libxdmcp/libxdmcp.SMBuild mode change 100755 => 100644 xorg/libxext/libxext.SMBuild mode change 100755 => 100644 xorg/libxfixes/libxfixes.SMBuild mode change 100755 => 100644 xorg/libxfont2/libxfont2.SMBuild mode change 100755 => 100644 xorg/libxft/libxft.SMBuild mode change 100755 => 100644 xorg/libxi/libxi.SMBuild mode change 100755 => 100644 xorg/libxinerama/libxinerama.SMBuild mode change 100755 => 100644 xorg/libxkbcommon/libxkbcommon.SMBuild mode change 100755 => 100644 xorg/libxkbfile/libxkbfile.SMBuild mode change 100755 => 100644 xorg/libxklavier/libxklavier.SMBuild mode change 100755 => 100644 xorg/libxmu/libxmu.SMBuild mode change 100755 => 100644 xorg/libxpm/libxpm.SMBuild mode change 100755 => 100644 xorg/libxpresent/libxpresent.SMBuild mode change 100755 => 100644 xorg/libxrandr/libxrandr.SMBuild mode change 100755 => 100644 xorg/libxrender/libxrender.SMBuild mode change 100755 => 100644 xorg/libxscrnsaver/libxscrnsaver.SMBuild mode change 100755 => 100644 xorg/libxshmfence/libxshmfence.SMBuild mode change 100755 => 100644 xorg/libxt/libxt.SMBuild mode change 100755 => 100644 xorg/libxtst/libxtst.SMBuild mode change 100755 => 100644 xorg/libxv/libxv.SMBuild mode change 100755 => 100644 xorg/libxxf86vm/libxxf86vm.SMBuild mode change 100755 => 100644 xorg/mtdev/mtdev.SMBuild mode change 100755 => 100644 xorg/numlockx/numlockx.SMBuild mode change 100755 => 100644 xorg/xcalc/xcalc.SMBuild mode change 100755 => 100644 xorg/xcb-proto/xcb-proto.SMBuild mode change 100755 => 100644 xorg/xcb-util-cursor/xcb-util-cursor.SMBuild mode change 100755 => 100644 xorg/xcb-util-image/xcb-util-image.SMBuild mode change 100755 => 100644 xorg/xcb-util-keysyms/xcb-util-keysyms.SMBuild mode change 100755 => 100644 xorg/xcb-util-renderutil/xcb-util-renderutil.SMBuild mode change 100755 => 100644 xorg/xcb-util-wm/xcb-util-wm.SMBuild mode change 100755 => 100644 xorg/xcb-util/xcb-util.SMBuild mode change 100755 => 100644 xorg/xclipboard/xclipboard.SMBuild mode change 100755 => 100644 xorg/xclock/xclock.SMBuild mode change 100755 => 100644 xorg/xf86-video-vesa/xf86-video-vesa.SMBuild mode change 100755 => 100644 xorg/xfontsel/xfontsel.SMBuild mode change 100755 => 100644 xorg/xhost/xhost.SMBuild mode change 100755 => 100644 xorg/xinit/xinit.SMBuild mode change 100755 => 100644 xorg/xinput/xinput.SMBuild mode change 100755 => 100644 xorg/xkbcomp/xkbcomp.SMBuild mode change 100755 => 100644 xorg/xkeyboard-config/xkeyboard-config.SMBuild mode change 100755 => 100644 xorg/xmodmap/xmodmap.SMBuild mode change 100755 => 100644 xorg/xorg-cf-files/xorg-cf-files.SMBuild mode change 100755 => 100644 xorg/xorg-fonts/xorg-fonts.SMBuild mode change 100755 => 100644 xorg/xorg-macros/xorg-macros.SMBuild mode change 100755 => 100644 xorg/xorg-server/xorg-server.SMBuild mode change 100755 => 100644 xorg/xorgproto/xorgproto.SMBuild mode change 100755 => 100644 xorg/xrandr/xrandr.SMBuild mode change 100755 => 100644 xorg/xrdb/xrdb.SMBuild mode change 100755 => 100644 xorg/xset/xset.SMBuild mode change 100755 => 100644 xorg/xsetroot/xsetroot.SMBuild mode change 100755 => 100644 xorg/xtrans/xtrans.SMBuild mode change 100755 => 100644 xorg/xvinfo/xvinfo.SMBuild mode change 100755 => 100644 xorg/xwd/xwd.SMBuild diff --git a/base/bash/bash.SMBuild b/base/bash/bash.SMBuild old mode 100755 new mode 100644 index 14c7828..854c354 --- a/base/bash/bash.SMBuild +++ b/base/bash/bash.SMBuild @@ -19,7 +19,6 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --without-bash-malloc \ --disable-rpath \ --enable-history \ @@ -31,7 +30,7 @@ build() { cp COPYING $pkgdocs/ - ( cd $pkg/bin ; ln -s bash sh ) + ( cd $pkg/usr/bin ; ln -s bash sh ) mkfinalpkg } diff --git a/base/bison/bison.SMBuild b/base/bison/bison.SMBuild old mode 100755 new mode 100644 index 109df15..d679ffe --- a/base/bison/bison.SMBuild +++ b/base/bison/bison.SMBuild @@ -19,7 +19,6 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --disable-nls make diff --git a/base/boost/boost.SMBuild b/base/boost/boost.SMBuild old mode 100755 new mode 100644 index 7619a7e..b376539 --- a/base/boost/boost.SMBuild +++ b/base/boost/boost.SMBuild @@ -27,10 +27,10 @@ build() { cflags=-fno-strict-aliasing --without-graph_parallel --without-mpi" ./b2 $build_options - ./b2 $build_options --bindir="$pkg"/bin --includedir="$pkg"/usr/include --libdir="$pkg"/usr/lib install + ./b2 $build_options --bindir="$pkg/usr/bin" --includedir="$pkg/usr/include" --libdir="$pkg/usr/lib" install - install -Dm 755 b2 $pkg/bin/b2 - ( cd $pkg/bin ; ln -s b2 bjam ) + install -Dm 755 b2 $pkg/usr/bin/b2 + ( cd $pkg/usr/bin ; ln -s b2 bjam ) cp LICENSE_1_0.txt $pkgdocs/LICENSE diff --git a/base/brotli/brotli.SMBuild b/base/brotli/brotli.SMBuild old mode 100755 new mode 100644 index 7708c5e..3416496 --- a/base/brotli/brotli.SMBuild +++ b/base/brotli/brotli.SMBuild @@ -21,7 +21,6 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --disable-static make diff --git a/base/bubblewrap/bubblewrap.SMBuild b/base/bubblewrap/bubblewrap.SMBuild old mode 100755 new mode 100644 index d33b0a6..7fc6ba9 --- a/base/bubblewrap/bubblewrap.SMBuild +++ b/base/bubblewrap/bubblewrap.SMBuild @@ -21,7 +21,6 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --with-priv-mode=setuid \ --disable-man diff --git a/base/busybox/busybox.SMBuild b/base/busybox/busybox.SMBuild old mode 100755 new mode 100644 index f3148e4..5b40749 --- a/base/busybox/busybox.SMBuild +++ b/base/busybox/busybox.SMBuild @@ -26,12 +26,12 @@ build() { cp $srcdir/busybox.config .config make CC="$CC" - install -Dm 755 busybox $pkg/bin/busybox + install -Dm 755 busybox $pkg/usr/bin/busybox cp LICENSE $pkgdocs/ ( - cd $pkg/bin + cd $pkg/usr/bin for f in ntpd passwd udhcpc udhcpd route ifconfig \ telnet telnetd tftp microcom netstat killall5 setfont \ @@ -43,7 +43,7 @@ build() { ) install -Dm 755 $srcdir/udhcpc-script $pkg/etc/udhcpc-script - install -Dm 755 $srcdir/dhclient $pkg/bin/dhclient + install -Dm 755 $srcdir/dhclient $pkg/usr/bin/dhclient mkdir -p $pkg/usr/share/man/man8 for f in sv runsvchdir chpst runsvdir runit runsv runit ; diff --git a/base/bzip2/bzip2.SMBuild b/base/bzip2/bzip2.SMBuild old mode 100755 new mode 100644 index 10a607c..df4709c --- a/base/bzip2/bzip2.SMBuild +++ b/base/bzip2/bzip2.SMBuild @@ -29,11 +29,11 @@ build() { install -Dm 755 libbz2.so.$version $pkg/usr/lib/libbz2.so.$version # Copy binaries - install -Dm 755 bzdiff $pkg/bin/bzdiff - install -Dm 755 bzgrep $pkg/bin/bzgrep - install -Dm 755 bzmore $pkg/bin/bzmore - install -Dm 755 bzip2-shared $pkg/bin/bzip2 - install -Dm 755 bzip2recover $pkg/bin/bzip2recover + install -Dm 755 bzdiff $pkg/usr/bin/bzdiff + install -Dm 755 bzgrep $pkg/usr/bin/bzgrep + install -Dm 755 bzmore $pkg/usr/bin/bzmore + install -Dm 755 bzip2-shared $pkg/usr/bin/bzip2 + install -Dm 755 bzip2recover $pkg/usr/bin/bzip2recover # And man pages mkdir -p $pkg/usr/share/man/man1 @@ -48,7 +48,7 @@ build() { ln -sf libbz2.so.$version libbz2.so.1.0 ln -sf libbz2.so.$version libbz2.so - cd $pkg/bin + cd $pkg/usr/bin ln -sf bzip2 bunzip2 ln -sf bzip2 bzcat ln -sf bzmore bzless diff --git a/base/c-ares/c-ares.SMBuild b/base/c-ares/c-ares.SMBuild old mode 100755 new mode 100644 diff --git a/base/ca-certificates/ca-certificates.SMBuild b/base/ca-certificates/ca-certificates.SMBuild old mode 100755 new mode 100644 index 04428e3..87caae4 --- a/base/ca-certificates/ca-certificates.SMBuild +++ b/base/ca-certificates/ca-certificates.SMBuild @@ -21,10 +21,10 @@ build() { # Update to certdata.txt from $srcdir: xzcat $srcdir/certdata-${version}.txt.xz > mozilla/certdata.txt - mkdir -p $pkg/usr/share/ca-certificates $pkg/bin $pkg/usr/sbin + mkdir -p $pkg/usr/share/ca-certificates $pkg/usr/bin $pkg/usr/sbin make - make install DESTDIR=$pkg CERTSDIR=/usr/share/ca-certificates + make install DESTDIR=$pkg BINDIR=/usr/bin CERTSDIR=/usr/share/ca-certificates cp docs/copyright $pkgdocs/COPYRIGHT mkdir -p $pkg/etc/ca-certificates/update.d @@ -38,7 +38,7 @@ build() { install -Dm 644 sbin/update-ca-certificates.8 $pkg/usr/share/man/man8/update-ca-certificates.8 # Why do people hardcode paths in Makefiles! - mv $pkg/usr/sbin/* $pkg/bin/ + mv $pkg/usr/sbin/* $pkg/usr/bin/ rmdir $pkg/usr/sbin mkfinalpkg diff --git a/base/ca-certificates/setup.11.cacerts b/base/ca-certificates/setup.11.cacerts index 328b61c..8e1929a 100644 --- a/base/ca-certificates/setup.11.cacerts +++ b/base/ca-certificates/setup.11.cacerts @@ -1,3 +1,3 @@ #!/bin/sh #BLURB="Rebuild SSL certificate database." -chroot . usr/sbin/update-ca-certificates --fresh 1> /dev/null 2> /dev/null +chroot . usr/bin/update-ca-certificates --fresh 1> /dev/null 2> /dev/null diff --git a/base/cbindgen/cbindgen.SMBuild b/base/cbindgen/cbindgen.SMBuild old mode 100755 new mode 100644 diff --git a/base/ccache/ccache.SMBuild b/base/ccache/ccache.SMBuild old mode 100755 new mode 100644 index 78065b9..70e47bb --- a/base/ccache/ccache.SMBuild +++ b/base/ccache/ccache.SMBuild @@ -20,7 +20,7 @@ build() { ./configure \ --prefix=/usr \ --sysconfdir=/etc \ - --bindir=/bin + --libdir=/usr/lib make make install DESTDIR=$pkg @@ -28,9 +28,9 @@ build() { cp GPL* $pkgdocs/ # Make some necessary symlinks - mkdir -p $pkg/lib/ccache + mkdir -p $pkg/usr/lib/ccache ( - cd $pkg/lib/ccache + cd $pkg/usr/lib/ccache ln -sf ../../bin/ccache gcc ln -sf ../../bin/ccache g++ ln -sf ../../bin/ccache cc diff --git a/base/chrony/chrony.SMBuild b/base/chrony/chrony.SMBuild old mode 100755 new mode 100644 index c06f747..b089d64 --- a/base/chrony/chrony.SMBuild +++ b/base/chrony/chrony.SMBuild @@ -19,8 +19,7 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ - --sbindir=/bin \ + --sbindir=/usr/bin \ --with-user=chrony make $MAKEFLAGS diff --git a/base/chrpath/chrpath.SMBuild b/base/chrpath/chrpath.SMBuild old mode 100755 new mode 100644 index 7ea9aef..f853ab7 --- a/base/chrpath/chrpath.SMBuild +++ b/base/chrpath/chrpath.SMBuild @@ -18,8 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix=/usr \ - --bindir=/bin + --prefix=/usr make make install DESTDIR=$pkg diff --git a/base/cmake/cmake.SMBuild b/base/cmake/cmake.SMBuild old mode 100755 new mode 100644 index 4d2d912..4175d64 --- a/base/cmake/cmake.SMBuild +++ b/base/cmake/cmake.SMBuild @@ -6,7 +6,6 @@ homepage="http://www.cmake.org" download="https://github.com/Kitware/CMake/releases/download/v$version/cmake-$version.tar.gz" desc="Cross-platform, open-source make system" requires="gcc-libs openssl libunistring libidn2" -ignoreusrbin=1 prepbuilddir() { mkandenterbuilddir diff --git a/base/coreutils/coreutils.SMBuild b/base/coreutils/coreutils.SMBuild old mode 100755 new mode 100644 index 1f2462b..4e3e69b --- a/base/coreutils/coreutils.SMBuild +++ b/base/coreutils/coreutils.SMBuild @@ -23,8 +23,7 @@ build() { LDFLAGS="-static" \ ./configure \ --prefix=/usr \ - --bindir=/bin \ - --libexecdir=/lib \ + --libexecdir=/usr/libexec \ --without-gmp make diff --git a/base/cpio/cpio.SMBuild b/base/cpio/cpio.SMBuild old mode 100755 new mode 100644 index a8d4a9e..3d6f712 --- a/base/cpio/cpio.SMBuild +++ b/base/cpio/cpio.SMBuild @@ -20,7 +20,6 @@ build() { CFLAGS+=" -fcommon" \ ./configure \ --prefix=/usr \ - --bindir=/bin \ --disable-nls make diff --git a/base/crda/crda.SMBuild b/base/crda/crda.SMBuild old mode 100755 new mode 100644 index 2daa2c4..70d3aee --- a/base/crda/crda.SMBuild +++ b/base/crda/crda.SMBuild @@ -24,8 +24,8 @@ prepbuilddir() { } build() { - make PREFIX="/usr" SBINDIR="/bin" - make PREFIX="/usr" SBINDIR="/bin" install DESTDIR=$pkg + make PREFIX="/usr" SBINDIR="/usr/bin" + make PREFIX="/usr" SBINDIR="/usr/bin" UDEV_RULE_DIR="/usr/lib/udev/rules.d" install DESTDIR=$pkg cp LICENSE $pkgdocs/ diff --git a/base/cryptsetup/cryptsetup.SMBuild b/base/cryptsetup/cryptsetup.SMBuild old mode 100755 new mode 100644 index d41cbbc..f9e2bff --- a/base/cryptsetup/cryptsetup.SMBuild +++ b/base/cryptsetup/cryptsetup.SMBuild @@ -21,7 +21,7 @@ build() { ./configure \ --prefix=/usr \ --sysconfdir=/etc \ - --sbindir=/bin + --sbindir=/usr/bin make make install DESTDIR=$pkg diff --git a/base/curl/curl.SMBuild b/base/curl/curl.SMBuild old mode 100755 new mode 100644 index 062086e..4a1b98f --- a/base/curl/curl.SMBuild +++ b/base/curl/curl.SMBuild @@ -21,7 +21,6 @@ build() { ./configure \ --prefix=/usr \ --sysconfdir=/etc \ - --bindir=/bin \ --with-libssh2 \ --without-ca-bundle \ --with-ca-path=/etc/ssl/certs \ diff --git a/base/cython/cython.SMBuild b/base/cython/cython.SMBuild old mode 100755 new mode 100644 index a9f63fd..3e0a4df --- a/base/cython/cython.SMBuild +++ b/base/cython/cython.SMBuild @@ -8,10 +8,10 @@ desc="C-Extensions for Python3" prepbuilddir() { mkandenterbuilddir - rm -rf Cython-$version + rm -rf $app-$version - tar xf $srcdir/Cython-$version.tar.?z* - cd Cython-$version + tar xf $srcdir/$app-$version.tar.?z* + cd $app-$version fixbuilddirpermissions } @@ -20,11 +20,9 @@ build() { cp COPYING.txt LICENSE.txt $pkgdocs/ - mv $pkg/usr/bin $pkg/ - mkfinalpkg } sha512sums=" -6216e63996e83b887cdcee6cd912d42e7da853640336b9190f5115d687848a902ee5a8edd6bfaef645c066b89e17dcd80ca1387688eb80a527ec23a0a4636e8f Cython-0.29.21.tar.gz +7f5998024f307b91fdea33348e0314a241f27791aec7db915fb5f502a9cbaa12e635a814d53f318d393369f03db78064940c54071746bf095a324e3a986e13f2 cython-0.29.21.tar.lz " diff --git a/base/db/db.SMBuild b/base/db/db.SMBuild old mode 100755 new mode 100644 index 29d2dae..069d7ed --- a/base/db/db.SMBuild +++ b/base/db/db.SMBuild @@ -29,7 +29,6 @@ build() { db_cv_atomic="$db_atomic" \ ../dist/configure \ --prefix=/usr \ - --bindir=/bin \ --enable-shared \ --disable-static \ --enable-dbm \ diff --git a/base/dcron/dcron.SMBuild b/base/dcron/dcron.SMBuild old mode 100755 new mode 100644 index 134fcb1..5c92084 --- a/base/dcron/dcron.SMBuild +++ b/base/dcron/dcron.SMBuild @@ -22,11 +22,11 @@ prepbuilddir() { } build() { - make PREFIX=/ BINDIR=/bin SBINDIR=/bin CRONTAB_GROUP=root + make PREFIX=/usr SBINDIR=/usr/bin CRONTAB_GROUP=root - install -Dm 755 crond $pkg/bin/crond - install -Dm 4711 crontab $pkg/bin/crontab - install -Dm 755 $srcdir/run-parts $pkg/bin/run-parts + install -Dm 755 crond $pkg/usr/bin/crond + install -Dm 4711 crontab $pkg/usr/bin/crontab + install -Dm 755 $srcdir/run-parts $pkg/usr/bin/run-parts install -Dm 644 crontab.1 $pkg/usr/share/man/man1/crontab.1 install -Dm 644 crond.8 $pkg/usr/share/man/man8/crond.8 diff --git a/base/desktop-file-utils/desktop-file-utils.SMBuild b/base/desktop-file-utils/desktop-file-utils.SMBuild old mode 100755 new mode 100644 index 4d82e8d..1a31e31 --- a/base/desktop-file-utils/desktop-file-utils.SMBuild +++ b/base/desktop-file-utils/desktop-file-utils.SMBuild @@ -20,8 +20,7 @@ prepbuilddir() { build() { ./configure \ - --prefix=/usr \ - --bindir=/bin + --prefix=/usr make make install DESTDIR=$pkg diff --git a/base/dialog/dialog.SMBuild b/base/dialog/dialog.SMBuild old mode 100755 new mode 100644 index 7e9bfa2..526c26b --- a/base/dialog/dialog.SMBuild +++ b/base/dialog/dialog.SMBuild @@ -19,7 +19,6 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --with-shared \ --without-x @@ -32,6 +31,5 @@ build() { } sha512sums=" -0cfdef91212009306101a91745183639a103d5b07d33d47601197fd95431ed9187eb38b0cd75537a91d98d35c9be0c92655e33ec4670d496bf9f6cc17701ee87 dialog-1.3-20170509.tar.lz 12f68bf7ed42452c4ee3e9a763b7f4b9d7fc04d36cc4a1f4f66e3b2050f92b141f16ebcb05d16e520a20e1d2067ae55fa08f747efedbd77370455f4ad180dc63 dialog-1.3-20240619.tar.lz -" +" \ No newline at end of file diff --git a/base/diffutils/diffutils.SMBuild b/base/diffutils/diffutils.SMBuild old mode 100755 new mode 100644 index fca976a..cd2c97d --- a/base/diffutils/diffutils.SMBuild +++ b/base/diffutils/diffutils.SMBuild @@ -19,8 +19,7 @@ prepbuilddir() { build() { LDFLAGS="-static" \ ./configure \ - --prefix=/usr \ - --bindir=/bin + --prefix=/usr make make install DESTDIR=$pkg diff --git a/base/dmidecode/dmidecode.SMBuild b/base/dmidecode/dmidecode.SMBuild old mode 100755 new mode 100644 index 05a72cc..41977ed --- a/base/dmidecode/dmidecode.SMBuild +++ b/base/dmidecode/dmidecode.SMBuild @@ -19,7 +19,7 @@ prepbuilddir() { build() { make - make install DESTDIR=$pkg prefix=/usr sbindir=/bin mandir="/usr/share/man" + make install DESTDIR=$pkg prefix=/usr sbindir=/usr/bin mandir="/usr/share/man" cp LICENSE $pkgdocs/ diff --git a/base/docbook/docbook.SMBuild b/base/docbook/docbook.SMBuild old mode 100755 new mode 100644 diff --git a/base/dosfstools/dosfstools.SMBuild b/base/dosfstools/dosfstools.SMBuild old mode 100755 new mode 100644 index e917b7a..97b5833 --- a/base/dosfstools/dosfstools.SMBuild +++ b/base/dosfstools/dosfstools.SMBuild @@ -19,7 +19,7 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --sbindir=/bin + --sbindir=/usr/bin make make install DESTDIR=$pkg diff --git a/base/ed/ed.SMBuild b/base/ed/ed.SMBuild old mode 100755 new mode 100644 index 494a2ae..10637a2 --- a/base/ed/ed.SMBuild +++ b/base/ed/ed.SMBuild @@ -19,7 +19,6 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin make CFLAGS="$CFLAGS" make install DESTDIR=$pkg diff --git a/base/elfutils/elfutils.SMBuild b/base/elfutils/elfutils.SMBuild new file mode 100644 index 0000000..c50e9b0 --- /dev/null +++ b/base/elfutils/elfutils.SMBuild @@ -0,0 +1,51 @@ +# Maintainer: PktSurf +# Generated by mksm SMLinux build file generator version 0.101 +app=elfutils +version=0.191 +build=1sml +homepage="https://sourceware.org/elfutils/" +download="https://sourceware.org/elfutils/ftp/$version/elfutils-$version.tar.bz2" +desc="Tools to manipulate ELF binary files" +requires="bzip2 curl" +noautoconfsite=1 + +prepbuilddir() { + mkandenterbuilddir + rm -rf $app-$version + + tar xf $srcdir/$app-$version.tar.?z* + cd $app-$version + fixbuilddirpermissions + applypatch $srcdir/fix-uninitialized.patch + applypatch $srcdir/musl-asm-ptrace-h.patch + applypatch $srcdir/musl-macros.patch +} + +build() { + sed -i 's:-Werror::' */Makefile.in + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/share/man \ + --program-prefix=eu- \ + --disable-debuginfod \ + --disable-libdebuginfod \ + --disable-nls \ + --enable-deterministic-archives + + make + make install DESTDIR=$pkg + + cp COPYING $pkgdocs/ + + mkfinalpkg +} + + +sha512sums=" +f44ba2c36bdf3019a61a35418f05cf138c68eab8fa258a5a74b8517a5d99841f3f92d32dd6d7d6f4d68f7d050768d915833353a21e2c811f029c2988373fa0f9 elfutils-0.191.tar.lz +b9ba55e1b56a8abf694b6d02f022d9a3a0ae6ab53a8c4a71e49552e32411ef410d3a7512fbd1a729696bc2046ac11586829816f0fa3b8226ee77c9dc4b741e58 fix-uninitialized.patch +7c529f88dc248f657a8d690044560c20a222c5b37d0d7dcb057bf2eea8938c406cccd6129bce19542088511a026b233234c9a83933a525c4691810be9ca712bf musl-asm-ptrace-h.patch +792be4a38b55d20a320605ab340357ad55dc295ab241af86cd3edf4ec84b0122e91ebcf78d8d6a0f926104b5eb22306be1356b0892f71ee3ba27ae38e9130aab musl-macros.patch +" diff --git a/base/elfutils/fix-uninitialized.patch b/base/elfutils/fix-uninitialized.patch new file mode 100644 index 0000000..31ecd9e --- /dev/null +++ b/base/elfutils/fix-uninitialized.patch @@ -0,0 +1,17 @@ + +--- a/libcpu/i386_disasm.c 2015-08-21 14:22:37.000000000 +0200 ++++ b/libcpu/i386_disasm.c 2015-11-20 06:30:59.250629957 +0100 +@@ -1,4 +1,4 @@ +-/* Disassembler for x86. ++/* Disassembler for x86. + Copyright (C) 2007, 2008, 2009, 2011 Red Hat, Inc. + This file is part of elfutils. + Written by Ulrich Drepper , 2007. +@@ -710,6 +710,7 @@ + + case 'm': + /* Mnemonic. */ ++ str = mnebuf; + + if (unlikely (instrtab[cnt].mnemonic == MNE_INVALID)) + { diff --git a/base/elfutils/musl-asm-ptrace-h.patch b/base/elfutils/musl-asm-ptrace-h.patch new file mode 100644 index 0000000..fc14686 --- /dev/null +++ b/base/elfutils/musl-asm-ptrace-h.patch @@ -0,0 +1,10 @@ +--- a/backends/ppc_initreg.c 2019-11-26 23:48:42.000000000 +0100 ++++ b/backends/ppc_initreg.c 2019-12-08 16:57:58.334872602 +0100 +@@ -32,6 +32,7 @@ + + #include + #if defined(__powerpc__) && defined(__linux__) ++# include + # include + # include + #endif diff --git a/base/elfutils/musl-macros.patch b/base/elfutils/musl-macros.patch new file mode 100644 index 0000000..d1bf92e --- /dev/null +++ b/base/elfutils/musl-macros.patch @@ -0,0 +1,78 @@ +diff -ur elfutils-0.187.orig/lib/libeu.h elfutils-0.187/lib/libeu.h +--- elfutils-0.187.orig/lib/libeu.h 2022-06-16 18:48:12.916472948 +0200 ++++ elfutils-0.187/lib/libeu.h 2022-06-16 18:48:54.219839323 +0200 +@@ -31,6 +31,18 @@ + + #include + #include ++#include ++#include ++#include ++ ++#ifndef TEMP_FAILURE_RETRY ++#define TEMP_FAILURE_RETRY(expression) \ ++ (__extension__ \ ++ ({ long int __result; \ ++ do __result = (long int) (expression); \ ++ while (__result == -1L && errno == EINTR); \ ++ __result; })) ++#endif + + extern void *xmalloc (size_t) __attribute__ ((__malloc__)); + extern void *xcalloc (size_t, size_t) __attribute__ ((__malloc__)); +diff -ur elfutils-0.187.orig/src/arlib.h elfutils-0.187/src/arlib.h +--- elfutils-0.187.orig/src/arlib.h 2022-06-16 18:48:12.919806284 +0200 ++++ elfutils-0.187/src/arlib.h 2022-06-16 18:48:18.879811052 +0200 +@@ -29,6 +29,16 @@ + #include + #include + ++#if !defined(ACCESSPERMS) ++# define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO) /* 0777 */ ++#endif ++#if !defined(ALLPERMS) ++# define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO) /* 07777 */ ++#endif ++#if !defined(DEFFILEMODE) ++# define DEFFILEMODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)/* 0666*/ ++#endif ++ + + /* State of -D/-U flags. */ + extern bool arlib_deterministic_output; +diff -ur elfutils-0.187.orig/src/elfcompress.c elfutils-0.187/src/elfcompress.c +--- elfutils-0.187.orig/src/elfcompress.c 2022-06-16 18:48:12.919806284 +0200 ++++ elfutils-0.187/src/elfcompress.c 2022-06-16 18:48:18.879811052 +0200 +@@ -37,6 +37,14 @@ + #include "libeu.h" + #include "printversion.h" + ++#if !defined(FNM_EXTMATCH) ++# define FNM_EXTMATCH 0 ++#endif ++ ++#if !defined(ALLPERMS) ++# define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO) /* 07777 */ ++#endif ++ + /* Name and version of program. */ + ARGP_PROGRAM_VERSION_HOOK_DEF = print_version; + +diff -ur elfutils-0.187.orig/src/strip.c elfutils-0.187/src/strip.c +--- elfutils-0.187.orig/src/strip.c 2022-06-16 18:48:12.919806284 +0200 ++++ elfutils-0.187/src/strip.c 2022-06-16 18:48:18.879811052 +0200 +@@ -46,6 +46,14 @@ + #include + #include + ++#if !defined(FNM_EXTMATCH) ++# define FNM_EXTMATCH 0 ++#endif ++ ++#if !defined(ACCESSPERMS) ++#define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO) ++#endif ++ + typedef uint8_t GElf_Byte; + + /* Name and version of program. */ diff --git a/base/enchant/enchant.SMBuild b/base/enchant/enchant.SMBuild old mode 100755 new mode 100644 index c08be48..d420a53 --- a/base/enchant/enchant.SMBuild +++ b/base/enchant/enchant.SMBuild @@ -19,7 +19,6 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --disable-static make @@ -30,8 +29,8 @@ build() { ( cd $pkg cd usr/include ; ln -sfv enchant-2 enchant - cd ../../bin ; ln -sfv enchant-2 enchant - cd ../usr/lib ; ln -sfv libenchant-2.so libenchant.so + cd ../bin ; ln -sfv enchant-2 enchant + cd ../lib ; ln -sfv libenchant-2.so libenchant.so cd pkgconfig ; ln -sfv enchant-2.pc enchant.pc ) diff --git a/base/enet/enet.SMBuild b/base/enet/enet.SMBuild old mode 100755 new mode 100644 diff --git a/base/eudev/eudev.SMBuild b/base/eudev/eudev.SMBuild old mode 100755 new mode 100644 index 3006e68..b4ed11c --- a/base/eudev/eudev.SMBuild +++ b/base/eudev/eudev.SMBuild @@ -19,8 +19,7 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ - --sbindir=/bin \ + --sbindir=/usr/bin \ --sysconfdir=/etc \ --disable-introspection diff --git a/base/exfat-utils/exfat-utils.SMBuild b/base/exfat-utils/exfat-utils.SMBuild old mode 100755 new mode 100644 index 044ad88..15c6477 --- a/base/exfat-utils/exfat-utils.SMBuild +++ b/base/exfat-utils/exfat-utils.SMBuild @@ -20,8 +20,7 @@ build() { CFLAGS+=" -std=c99" \ ./configure \ --prefix=/usr \ - --bindir=/bin \ - --sbindir=/bin + --sbindir=/usr/bin make make install DESTDIR=$pkg diff --git a/base/exiv2/exiv2.SMBuild b/base/exiv2/exiv2.SMBuild old mode 100755 new mode 100644 index 43c4832..87bb735 --- a/base/exiv2/exiv2.SMBuild +++ b/base/exiv2/exiv2.SMBuild @@ -20,7 +20,6 @@ build() { mkdir -p smbuild && cd smbuild cmake .. \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_BINDIR=/bin \ -DCMAKE_INSTALL_LIBDIR=lib make diff --git a/base/expat/expat.SMBuild b/base/expat/expat.SMBuild old mode 100755 new mode 100644 index cfb3fad..b17a2f5 --- a/base/expat/expat.SMBuild +++ b/base/expat/expat.SMBuild @@ -19,7 +19,6 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --disable-static make diff --git a/base/faad2/faad2.SMBuild b/base/faad2/faad2.SMBuild old mode 100755 new mode 100644 index a708f24..bfef1e9 --- a/base/faad2/faad2.SMBuild +++ b/base/faad2/faad2.SMBuild @@ -20,7 +20,6 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --disable-static make diff --git a/base/fdk-aac/fdk-aac.SMBuild b/base/fdk-aac/fdk-aac.SMBuild old mode 100755 new mode 100644 diff --git a/base/fftw/fftw.SMBuild b/base/fftw/fftw.SMBuild old mode 100755 new mode 100644 index be16c7c..d0ecc8a --- a/base/fftw/fftw.SMBuild +++ b/base/fftw/fftw.SMBuild @@ -23,7 +23,6 @@ build() { defconfopts() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --enable-shared \ --disable-static \ --enable-threads \ diff --git a/base/file/file.SMBuild b/base/file/file.SMBuild old mode 100755 new mode 100644 index 66f8065..2c95224 --- a/base/file/file.SMBuild +++ b/base/file/file.SMBuild @@ -21,7 +21,6 @@ build() { CFLAGS+=" --std=c99" \ ./configure \ --prefix=/usr \ - --bindir=/bin \ --datadir=/etc \ --enable-fsect-man5 \ --disable-libseccomp diff --git a/base/findutils/findutils.SMBuild b/base/findutils/findutils.SMBuild old mode 100755 new mode 100644 index ab1398e..b3fefb8 --- a/base/findutils/findutils.SMBuild +++ b/base/findutils/findutils.SMBuild @@ -23,8 +23,7 @@ build() { LDFLAGS="-static" \ ./configure \ --prefix=/usr \ - --bindir=/bin \ - --libexecdir=/libexec + --libexecdir=/usr/libexec make make install DESTDIR=$pkg diff --git a/base/flac/flac.SMBuild b/base/flac/flac.SMBuild old mode 100755 new mode 100644 index 4bc211a..5b96149 --- a/base/flac/flac.SMBuild +++ b/base/flac/flac.SMBuild @@ -19,7 +19,6 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --enable-sse make diff --git a/base/flex/flex.SMBuild b/base/flex/flex.SMBuild old mode 100755 new mode 100644 index eed4361..7928bf8 --- a/base/flex/flex.SMBuild +++ b/base/flex/flex.SMBuild @@ -20,7 +20,6 @@ build() { CPPFLAGS="$CFLAGS -DSTDC_HEADERS" \ ./configure \ --prefix=/usr \ - --bindir=/bin \ --disable-static \ --disable-nls diff --git a/base/fmt/fmt.SMBuild b/base/fmt/fmt.SMBuild old mode 100755 new mode 100644 diff --git a/base/fribidi/fribidi.SMBuild b/base/fribidi/fribidi.SMBuild old mode 100755 new mode 100644 index a70c892..2d11ad2 --- a/base/fribidi/fribidi.SMBuild +++ b/base/fribidi/fribidi.SMBuild @@ -19,7 +19,6 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --disable-static make diff --git a/base/ftjam/ftjam.SMBuild b/base/ftjam/ftjam.SMBuild old mode 100755 new mode 100644 index 07fac23..324bc3b --- a/base/ftjam/ftjam.SMBuild +++ b/base/ftjam/ftjam.SMBuild @@ -22,8 +22,7 @@ prepbuilddir() { build() { ./configure \ - --prefix=/usr \ - --bindir=/bin + --prefix=/usr make make install DESTDIR="$pkg" diff --git a/base/fuse/doinst.sh b/base/fuse/doinst.sh new file mode 100644 index 0000000..6a589fa --- /dev/null +++ b/base/fuse/doinst.sh @@ -0,0 +1,23 @@ +#!/bin/sh + +config() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + # If there's no config file by that name, mv it over: + if [ ! -r $OLD ]; then + mv $NEW $OLD + elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then + # toss the redundant copy + rm $NEW + fi + # Otherwise, we leave the .new copy for the admin to consider... +} + +# Keep same perms on rc.fuse3.new: +if [ -e etc/rc.d/rc.fuse3 ]; then + cp -a etc/rc.d/rc.fuse3 etc/rc.d/rc.fuse3.new.incoming + cat etc/rc.d/rc.fuse3.new > etc/rc.d/rc.fuse3.new.incoming + mv etc/rc.d/rc.fuse3.new.incoming etc/rc.d/rc.fuse3.new +fi + +config etc/rc.d/rc.fuse.new diff --git a/base/fuse/fuse.SMBuild b/base/fuse/fuse.SMBuild new file mode 100644 index 0000000..acf85ce --- /dev/null +++ b/base/fuse/fuse.SMBuild @@ -0,0 +1,39 @@ +# Maintainer: PktSurf +app=fuse +version=3.10.5 +build=1sml +homepage="https://github.com/libfuse/libfuse" +download="https://github.com/libfuse/libfuse/archive/refs/tags/fuse3-$version.tar.gz" +desc="Filesystem in Userspace v3" +requires="udev" + +prepbuilddir() { + mkandenterbuilddir + rm -rf $app-$version + + tar xf $srcdir/$app-$version.tar.?z* + cd $app-$version + fixbuilddirpermissions +} + +build() { + mkdir -p smbuild && cd smbuild + sed -i 's@/etc/init.d/fuse3@/etc/rc.d/rc.fuse.new@g' ../util/install_helper.sh + meson .. \ + --prefix=/usr \ + --sbindir=/usr/bin \ + -Dexamples=false + + ninja + DESTDIR="$pkg" ninja install + + cp ../LICENSE $pkgdocs + + rm -rv $pkg/dev + + mkfinalpkg +} + +sha512sums=" +d4c397ae6522cc841099e76bb1e11493555e1f2767169cd6980aa64eed6f41a27f19d1282d6f521e1602c533f58ef90af5b1b4bdf86dc032d7316cceba57ead1 fuse-3.10.5.tar.lz +" diff --git a/base/fuse2/fuse2.SMBuild b/base/fuse2/fuse2.SMBuild old mode 100755 new mode 100644 diff --git a/base/fuse3/fuse3.SMBuild b/base/fuse3/fuse3.SMBuild old mode 100755 new mode 100644 diff --git a/base/gawk/gawk.SMBuild b/base/gawk/gawk.SMBuild old mode 100755 new mode 100644 index 31110bc..a0e9987 --- a/base/gawk/gawk.SMBuild +++ b/base/gawk/gawk.SMBuild @@ -20,7 +20,6 @@ build() { LDFLAGS="-static" \ ./configure \ --prefix=/usr \ - --bindir=/bin \ --sysconfdir=/etc \ --libexecdir=/usr/lib \ --without-mpfr \ @@ -37,4 +36,4 @@ build() { sha512sums=" b96e82265115800e703d3e2860f7d3463a827cf7e661d6227e8c5e711abeef63af3641cc411423f517d8a43c43be7ad68dd1ef3d7d90bceb6799b57746c9318f gawk-5.2.2.tar.lz -" \ No newline at end of file +" diff --git a/base/gdb/gdb.SMBuild b/base/gdb/gdb.SMBuild old mode 100755 new mode 100644 index 7e777e2..fddb26f --- a/base/gdb/gdb.SMBuild +++ b/base/gdb/gdb.SMBuild @@ -20,7 +20,6 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --disable-werror \ --with-system-zlib \ --disable-sim \ diff --git a/base/gdbm/gdbm.SMBuild b/base/gdbm/gdbm.SMBuild old mode 100755 new mode 100644 index bc56f1e..8f1a603 --- a/base/gdbm/gdbm.SMBuild +++ b/base/gdbm/gdbm.SMBuild @@ -19,7 +19,6 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --disable-static \ --disable-nls diff --git a/base/gettext/gettext.SMBuild b/base/gettext/gettext.SMBuild old mode 100755 new mode 100644 index 613a137..63993d6 --- a/base/gettext/gettext.SMBuild +++ b/base/gettext/gettext.SMBuild @@ -19,7 +19,6 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --disable-java \ --disable-static \ --disable-nls diff --git a/base/giflib/giflib.SMBuild b/base/giflib/giflib.SMBuild old mode 100755 new mode 100644 index 9ccd0b4..700e985 --- a/base/giflib/giflib.SMBuild +++ b/base/giflib/giflib.SMBuild @@ -20,7 +20,7 @@ prepbuilddir() { build() { make CFLAGS="$CFLAGS" - make install DESTDIR="$pkg" PREFIX=/usr BINDIR=/bin + make install DESTDIR="$pkg" PREFIX=/usr cp COPYING $pkgdocs/ diff --git a/base/glib/glib.SMBuild b/base/glib/glib.SMBuild old mode 100755 new mode 100644 index faf1390..145e66e --- a/base/glib/glib.SMBuild +++ b/base/glib/glib.SMBuild @@ -20,7 +20,6 @@ build() { mkdir -p smbuild && cd smbuild meson .. --prefix=/usr \ - --bindir=/bin \ -Dman=false \ -Dgtk_doc=false \ -Dselinux=disabled \ diff --git a/base/gloox/gloox.SMBuild b/base/gloox/gloox.SMBuild old mode 100755 new mode 100644 index 327fd43..1238506 --- a/base/gloox/gloox.SMBuild +++ b/base/gloox/gloox.SMBuild @@ -21,7 +21,6 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --enable-shared \ --disable-static \ --without-tests \ diff --git a/base/gnupg2/gnupg2.SMBuild b/base/gnupg2/gnupg2.SMBuild old mode 100755 new mode 100644 index 791a0b0..19ed4de --- a/base/gnupg2/gnupg2.SMBuild +++ b/base/gnupg2/gnupg2.SMBuild @@ -19,8 +19,7 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ - --sbindir=/bin + --sbindir=/usr/bin make make install DESTDIR=$pkg diff --git a/base/gperf/gperf.SMBuild b/base/gperf/gperf.SMBuild old mode 100755 new mode 100644 index 59cc8fc..1436e06 --- a/base/gperf/gperf.SMBuild +++ b/base/gperf/gperf.SMBuild @@ -18,8 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix=/usr \ - --bindir=/bin + --prefix=/usr make make install DESTDIR=$pkg diff --git a/base/gpgme/gpgme.SMBuild b/base/gpgme/gpgme.SMBuild old mode 100755 new mode 100644 index 58ca227..074ded1 --- a/base/gpgme/gpgme.SMBuild +++ b/base/gpgme/gpgme.SMBuild @@ -21,7 +21,6 @@ build() { # TODO: disable linking against qt5 ./configure \ --prefix=/usr \ - --bindir=/bin \ --disable-static \ --disable-gpg-test \ --enable-languages="cl cpp" \ diff --git a/base/gptfdisk/gptfdisk.SMBuild b/base/gptfdisk/gptfdisk.SMBuild old mode 100755 new mode 100644 index daf9269..51dd2bf --- a/base/gptfdisk/gptfdisk.SMBuild +++ b/base/gptfdisk/gptfdisk.SMBuild @@ -21,7 +21,7 @@ build() { make for f in cgdisk gdisk sgdisk fixparts ; do - install -Dm 755 $f $pkg/bin/$f + install -Dm 755 $f $pkg/usr/bin/$f install -Dm 644 $f.8 $pkg/usr/share/man/man8/$f.8 done diff --git a/base/grep/grep.SMBuild b/base/grep/grep.SMBuild old mode 100755 new mode 100644 index 8f07e45..bcb3778 --- a/base/grep/grep.SMBuild +++ b/base/grep/grep.SMBuild @@ -19,8 +19,7 @@ prepbuilddir() { build() { LDFLAGS="-static" \ ./configure \ - --prefix=/usr \ - --bindir=/bin + --prefix=/usr make make install DESTDIR=$pkg diff --git a/base/groff/groff.SMBuild b/base/groff/groff.SMBuild old mode 100755 new mode 100644 index d29d69d..131f3e9 --- a/base/groff/groff.SMBuild +++ b/base/groff/groff.SMBuild @@ -19,7 +19,6 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --without-x make diff --git a/base/gsl/gsl.SMBuild b/base/gsl/gsl.SMBuild old mode 100755 new mode 100644 index ce0e6bf..93f68e6 --- a/base/gsl/gsl.SMBuild +++ b/base/gsl/gsl.SMBuild @@ -19,7 +19,6 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --disable-static make diff --git a/base/gstreamer/gstreamer.SMBuild b/base/gstreamer/gstreamer.SMBuild old mode 100755 new mode 100644 index 48be2b5..657a7dc --- a/base/gstreamer/gstreamer.SMBuild +++ b/base/gstreamer/gstreamer.SMBuild @@ -21,7 +21,6 @@ build() { meson .. \ --prefix=/usr \ - --bindir=/bin \ --buildtype=plain \ -Dintrospection=disabled diff --git a/base/gyp/gyp.SMBuild b/base/gyp/gyp.SMBuild old mode 100755 new mode 100644 index eda76d3..f718ee5 --- a/base/gyp/gyp.SMBuild +++ b/base/gyp/gyp.SMBuild @@ -26,8 +26,6 @@ build() { cp LICENSE $pkgdocs/ - mv $pkg/usr/bin $pkg/ - mkfinalpkg } diff --git a/base/gzip/gzip.SMBuild b/base/gzip/gzip.SMBuild old mode 100755 new mode 100644 index 3d0264c..c36c7c7 --- a/base/gzip/gzip.SMBuild +++ b/base/gzip/gzip.SMBuild @@ -18,8 +18,7 @@ prepbuilddir() { build() { ./configure \ - --prefix=/usr \ - --bindir=/bin + --prefix=/usr make make install DESTDIR=$pkg diff --git a/base/hdparm/hdparm.SMBuild b/base/hdparm/hdparm.SMBuild old mode 100755 new mode 100644 index fa572ba..59ed373 --- a/base/hdparm/hdparm.SMBuild +++ b/base/hdparm/hdparm.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { make - make install prefix="/usr" mandir="/usr/share/man" sbindir="/bin" DESTDIR="$pkg" + make install prefix="/usr" mandir="/usr/share/man" sbindir="/usr/bin" DESTDIR="$pkg" cp LICENSE.TXT $pkgdocs/ diff --git a/base/htop/htop.SMBuild b/base/htop/htop.SMBuild old mode 100755 new mode 100644 index 66586b3..13fa7a3 --- a/base/htop/htop.SMBuild +++ b/base/htop/htop.SMBuild @@ -22,7 +22,6 @@ build() { # Meter.c:415:54: error: 'cchar_t' {aka 'const struct '} has no member named 'attr' ./configure \ --prefix=/usr \ - --bindir=/bin \ --disable-unicode \ --enable-sensors \ --enable-capabilities diff --git a/base/hunspell/hunspell.SMBuild b/base/hunspell/hunspell.SMBuild old mode 100755 new mode 100644 index c3beea5..033d407 --- a/base/hunspell/hunspell.SMBuild +++ b/base/hunspell/hunspell.SMBuild @@ -19,7 +19,6 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --disable-static make diff --git a/base/hyphen/hyphen.SMBuild b/base/hyphen/hyphen.SMBuild old mode 100755 new mode 100644 index 9279e3d..b798782 --- a/base/hyphen/hyphen.SMBuild +++ b/base/hyphen/hyphen.SMBuild @@ -19,7 +19,6 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --disable-static make diff --git a/base/i2c-tools/i2c-tools.SMBuild b/base/i2c-tools/i2c-tools.SMBuild old mode 100755 new mode 100644 index bf1c414..a0cbad8 --- a/base/i2c-tools/i2c-tools.SMBuild +++ b/base/i2c-tools/i2c-tools.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { make - make install PREFIX="/usr" mandir="/usr/share/man" DESTDIR="$pkg" bindir="/bin" sbindir="/bin" + make install PREFIX="/usr" mandir="/usr/share/man" DESTDIR="$pkg" sbindir="/usr/bin" cp COPYING* $pkgdocs/ diff --git a/base/icu/icu.SMBuild b/base/icu/icu.SMBuild old mode 100755 new mode 100644 index 463dbb9..1f94d15 --- a/base/icu/icu.SMBuild +++ b/base/icu/icu.SMBuild @@ -20,8 +20,7 @@ build() { cd source ./configure \ --prefix=/usr \ - --bindir=/bin \ - --sbindir=/bin \ + --sbindir=/usr/bin \ --docdir="/usr/share/doc/$app-$version" \ --disable-tests \ --disable-samples \ diff --git a/base/ijs/ijs.SMBuild b/base/ijs/ijs.SMBuild old mode 100755 new mode 100644 index b1bd006..05d9826 --- a/base/ijs/ijs.SMBuild +++ b/base/ijs/ijs.SMBuild @@ -19,7 +19,6 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --mandir=/usr/share/man \ --enable-shared \ --disable-static diff --git a/base/intltool/intltool.SMBuild b/base/intltool/intltool.SMBuild old mode 100755 new mode 100644 index af20daa..d541beb --- a/base/intltool/intltool.SMBuild +++ b/base/intltool/intltool.SMBuild @@ -20,8 +20,7 @@ prepbuilddir() { build() { ./configure \ - --prefix=/usr \ - --bindir=/bin + --prefix=/usr make make install DESTDIR=$pkg diff --git a/base/iptables/iptables.SMBuild b/base/iptables/iptables.SMBuild old mode 100755 new mode 100644 index 60650c0..6f0c969 --- a/base/iptables/iptables.SMBuild +++ b/base/iptables/iptables.SMBuild @@ -19,8 +19,7 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ - --sbindir=/bin \ + --sbindir=/usr/bin \ --disable-nftables make @@ -30,7 +29,7 @@ build() { # Fix awkward symlinking ( - cd $pkg/bin + cd $pkg/usr/bin rm iptables-xml ln -sf xtables-legacy-multi iptables-xml ) diff --git a/xorg/at-spi2-core/at-spi2-core.SMBuild b/xorg/at-spi2-core/at-spi2-core.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/bdftopcf/bdftopcf.SMBuild b/xorg/bdftopcf/bdftopcf.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/dbus/dbus.SMBuild b/xorg/dbus/dbus.SMBuild old mode 100755 new mode 100644 index fedfdc9..9d099fa --- a/xorg/dbus/dbus.SMBuild +++ b/xorg/dbus/dbus.SMBuild @@ -21,8 +21,7 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ - --sbindir=/bin \ + --sbindir=/usr/bin \ --sysconfdir=/etc \ --libexecdir=/usr/lib \ --localstatedir=/var \ @@ -47,8 +46,6 @@ build() { make make install DESTDIR=$pkg - mv $pkg/lib/dbus-1.0/include/dbus/dbus-arch-deps.h $pkg/include/dbus-1.0/dbus/ - install -Dm 755 $srcdir/rc.messagebus $pkg/etc/rc.d/rc.messagebus cp COPYING $pkgdocs/ diff --git a/xorg/dconf/dconf.SMBuild b/xorg/dconf/dconf.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/dejavu-fonts-ttf/dejavu-fonts-ttf.SMBuild b/xorg/dejavu-fonts-ttf/dejavu-fonts-ttf.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/font-util/font-util.SMBuild b/xorg/font-util/font-util.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/fontconfig/fontconfig.SMBuild b/xorg/fontconfig/fontconfig.SMBuild old mode 100755 new mode 100644 index d372746..3de3a42 --- a/xorg/fontconfig/fontconfig.SMBuild +++ b/xorg/fontconfig/fontconfig.SMBuild @@ -22,7 +22,6 @@ build() { ./configure \ --prefix=/usr \ --sysconfdir=/etc \ - --bindir=/bin \ --localstatedir=/var \ --disable-docs diff --git a/xorg/freeglut/freeglut.SMBuild b/xorg/freeglut/freeglut.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/freetype/freetype.SMBuild b/xorg/freetype/freetype.SMBuild old mode 100755 new mode 100644 index b6d584a..84967af --- a/xorg/freetype/freetype.SMBuild +++ b/xorg/freetype/freetype.SMBuild @@ -19,7 +19,6 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --disable-static \ --with-harfbuzz=no @@ -27,7 +26,7 @@ build() { make install DESTDIR=$pkg # For some reason, freetype-config is not installed, which breaks builds like dia - install -Dm 755 builds/unix/freetype-config $pkg/bin/freetype-config + install -Dm 755 builds/unix/freetype-config $pkg/usr/bin/freetype-config cp docs/GPLv2.TXT $pkgdocs/ diff --git a/xorg/glslang-vulkan-sdk/glslang-vulkan-sdk.SMBuild b/xorg/glslang-vulkan-sdk/glslang-vulkan-sdk.SMBuild old mode 100755 new mode 100644 index 59680e4..4905c7d --- a/xorg/glslang-vulkan-sdk/glslang-vulkan-sdk.SMBuild +++ b/xorg/glslang-vulkan-sdk/glslang-vulkan-sdk.SMBuild @@ -21,7 +21,6 @@ build() { cmake .. \ -DCMAKE_BUILD_TYPE=None \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_BINDIR=/bin \ -DCMAKE_INSTALL_LIBDIR=lib \ -DBUILD_SHARED_LIBS=On \ -DENABLE_OPT=0 diff --git a/xorg/glslang/glslang.SMBuild b/xorg/glslang/glslang.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/glu/glu.SMBuild b/xorg/glu/glu.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/iceauth/iceauth.SMBuild b/xorg/iceauth/iceauth.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/imake/imake.SMBuild b/xorg/imake/imake.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/imlib2/imlib2.SMBuild b/xorg/imlib2/imlib2.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/jasper/jasper.SMBuild b/xorg/jasper/jasper.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/libx11/libx11.SMBuild b/xorg/libx11/libx11.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/libxau/libxau.SMBuild b/xorg/libxau/libxau.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/libxaw/libxaw.SMBuild b/xorg/libxaw/libxaw.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/libxaw3d/libxaw3d.SMBuild b/xorg/libxaw3d/libxaw3d.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/libxaw3dxft/libxaw3dxft.SMBuild b/xorg/libxaw3dxft/libxaw3dxft.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/libxcb/libxcb.SMBuild b/xorg/libxcb/libxcb.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/libxcomposite/libxcomposite.SMBuild b/xorg/libxcomposite/libxcomposite.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/libxcursor/libxcursor.SMBuild b/xorg/libxcursor/libxcursor.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/libxdamage/libxdamage.SMBuild b/xorg/libxdamage/libxdamage.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/libxdmcp/libxdmcp.SMBuild b/xorg/libxdmcp/libxdmcp.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/libxext/libxext.SMBuild b/xorg/libxext/libxext.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/libxfixes/libxfixes.SMBuild b/xorg/libxfixes/libxfixes.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/libxfont2/libxfont2.SMBuild b/xorg/libxfont2/libxfont2.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/libxft/libxft.SMBuild b/xorg/libxft/libxft.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/libxi/libxi.SMBuild b/xorg/libxi/libxi.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/libxinerama/libxinerama.SMBuild b/xorg/libxinerama/libxinerama.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/libxkbcommon/libxkbcommon.SMBuild b/xorg/libxkbcommon/libxkbcommon.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/libxkbfile/libxkbfile.SMBuild b/xorg/libxkbfile/libxkbfile.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/libxklavier/libxklavier.SMBuild b/xorg/libxklavier/libxklavier.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/libxmu/libxmu.SMBuild b/xorg/libxmu/libxmu.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/libxpm/libxpm.SMBuild b/xorg/libxpm/libxpm.SMBuild old mode 100755 new mode 100644 index e04327b..0b04f99 --- a/xorg/libxpm/libxpm.SMBuild +++ b/xorg/libxpm/libxpm.SMBuild @@ -19,7 +19,6 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --disable-static make diff --git a/xorg/libxpresent/libxpresent.SMBuild b/xorg/libxpresent/libxpresent.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/libxrandr/libxrandr.SMBuild b/xorg/libxrandr/libxrandr.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/libxrender/libxrender.SMBuild b/xorg/libxrender/libxrender.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/libxscrnsaver/libxscrnsaver.SMBuild b/xorg/libxscrnsaver/libxscrnsaver.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/libxshmfence/libxshmfence.SMBuild b/xorg/libxshmfence/libxshmfence.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/libxt/libxt.SMBuild b/xorg/libxt/libxt.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/libxtst/libxtst.SMBuild b/xorg/libxtst/libxtst.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/libxv/libxv.SMBuild b/xorg/libxv/libxv.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/libxxf86vm/libxxf86vm.SMBuild b/xorg/libxxf86vm/libxxf86vm.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/mtdev/mtdev.SMBuild b/xorg/mtdev/mtdev.SMBuild old mode 100755 new mode 100644 index c91ca1a..5a15368 --- a/xorg/mtdev/mtdev.SMBuild +++ b/xorg/mtdev/mtdev.SMBuild @@ -19,7 +19,6 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --bindir=/bin \ --disable-static make diff --git a/xorg/numlockx/numlockx.SMBuild b/xorg/numlockx/numlockx.SMBuild old mode 100755 new mode 100644 index d0ea5a3..a786a0a --- a/xorg/numlockx/numlockx.SMBuild +++ b/xorg/numlockx/numlockx.SMBuild @@ -24,7 +24,7 @@ build() { make install DESTDIR=$pkg cp LICENSE $pkgdocs/ - install -Dm 644 $srcdir/numlockx.1 $pkg/share/man/man1/numlockx.1 + install -Dm 644 $srcdir/numlockx.1 $pkg/usr/share/man/man1/numlockx.1 mkfinalpkg } diff --git a/xorg/xcalc/xcalc.SMBuild b/xorg/xcalc/xcalc.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/xcb-proto/xcb-proto.SMBuild b/xorg/xcb-proto/xcb-proto.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/xcb-util-cursor/xcb-util-cursor.SMBuild b/xorg/xcb-util-cursor/xcb-util-cursor.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/xcb-util-image/xcb-util-image.SMBuild b/xorg/xcb-util-image/xcb-util-image.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/xcb-util-keysyms/xcb-util-keysyms.SMBuild b/xorg/xcb-util-keysyms/xcb-util-keysyms.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/xcb-util-renderutil/xcb-util-renderutil.SMBuild b/xorg/xcb-util-renderutil/xcb-util-renderutil.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/xcb-util-wm/xcb-util-wm.SMBuild b/xorg/xcb-util-wm/xcb-util-wm.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/xcb-util/xcb-util.SMBuild b/xorg/xcb-util/xcb-util.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/xclipboard/xclipboard.SMBuild b/xorg/xclipboard/xclipboard.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/xclock/xclock.SMBuild b/xorg/xclock/xclock.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/xf86-video-vesa/xf86-video-vesa.SMBuild b/xorg/xf86-video-vesa/xf86-video-vesa.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/xfontsel/xfontsel.SMBuild b/xorg/xfontsel/xfontsel.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/xhost/xhost.SMBuild b/xorg/xhost/xhost.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/xinit/xinit.SMBuild b/xorg/xinit/xinit.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/xinput/xinput.SMBuild b/xorg/xinput/xinput.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/xkbcomp/xkbcomp.SMBuild b/xorg/xkbcomp/xkbcomp.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/xkeyboard-config/xkeyboard-config.SMBuild b/xorg/xkeyboard-config/xkeyboard-config.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/xmodmap/xmodmap.SMBuild b/xorg/xmodmap/xmodmap.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/xorg-cf-files/xorg-cf-files.SMBuild b/xorg/xorg-cf-files/xorg-cf-files.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/xorg-fonts/xorg-fonts.SMBuild b/xorg/xorg-fonts/xorg-fonts.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/xorg-macros/xorg-macros.SMBuild b/xorg/xorg-macros/xorg-macros.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/xorg-server/xorg-server.SMBuild b/xorg/xorg-server/xorg-server.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/xorgproto/xorgproto.SMBuild b/xorg/xorgproto/xorgproto.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/xrandr/xrandr.SMBuild b/xorg/xrandr/xrandr.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/xrdb/xrdb.SMBuild b/xorg/xrdb/xrdb.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/xset/xset.SMBuild b/xorg/xset/xset.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/xsetroot/xsetroot.SMBuild b/xorg/xsetroot/xsetroot.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/xtrans/xtrans.SMBuild b/xorg/xtrans/xtrans.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/xvinfo/xvinfo.SMBuild b/xorg/xvinfo/xvinfo.SMBuild old mode 100755 new mode 100644 diff --git a/xorg/xwd/xwd.SMBuild b/xorg/xwd/xwd.SMBuild old mode 100755 new mode 100644