summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xPorts/SDL2_gfx/package.sh2
-rwxr-xr-xPorts/SDL2_image/package.sh3
-rwxr-xr-xPorts/SDL2_mixer/package.sh3
-rwxr-xr-xPorts/SDL2_ttf/package.sh2
-rw-r--r--Ports/emu2/patches/install-prefix.patch12
-rwxr-xr-xPorts/neofetch/package.sh4
-rwxr-xr-xPorts/nesalizer/package.sh2
-rw-r--r--Ports/nethack/patches/install-path.patch2
-rw-r--r--Ports/nethack/patches/serenity-hints.patch6
-rw-r--r--Ports/nyancat/patches/serenity-changes.patch8
-rwxr-xr-xPorts/scummvm/package.sh3
-rw-r--r--Ports/sl/patches/serenity-changes.patch8
-rwxr-xr-xPorts/stress-ng/package.sh1
-rw-r--r--Ports/stress-ng/patches/install-prefix.patch18
-rwxr-xr-xPorts/termcap/package.sh2
-rw-r--r--Toolchain/CMake/CMakeToolchain.txt6
16 files changed, 57 insertions, 25 deletions
diff --git a/Ports/SDL2_gfx/package.sh b/Ports/SDL2_gfx/package.sh
index 982050a2ae..5a4fa235d7 100755
--- a/Ports/SDL2_gfx/package.sh
+++ b/Ports/SDL2_gfx/package.sh
@@ -5,4 +5,4 @@ version=1.0.4
files="https://downloads.sourceforge.net/project/sdl2gfx/SDL2_gfx-${version}.tar.gz SDL2_gfx-${version}.tar.gz"
depends="SDL2"
useconfigure=true
-configopts="--with-sdl-prefix=${SERENITY_BUILD_DIR}/Root/usr"
+configopts="--with-sdl-prefix=${SERENITY_BUILD_DIR}/Root/usr/local"
diff --git a/Ports/SDL2_image/package.sh b/Ports/SDL2_image/package.sh
index 72e02d385e..4078ec4c2f 100755
--- a/Ports/SDL2_image/package.sh
+++ b/Ports/SDL2_image/package.sh
@@ -8,8 +8,7 @@ files="https://www.libsdl.org/projects/SDL_image/release/SDL2_image-${version}.t
configure() {
run ./configure \
--host="${SERENITY_ARCH}-pc-serenity" \
- --with-sdl-prefix="${SERENITY_BUILD_DIR}/Root/usr" \
- --prefix="/usr" \
+ --with-sdl-prefix="${SERENITY_BUILD_DIR}/Root/usr/local" \
--enable-webp=false --enable-webp-shared=false \
LDFLAGS="-lgui -lgfx -lipc -lcore -lm"
}
diff --git a/Ports/SDL2_mixer/package.sh b/Ports/SDL2_mixer/package.sh
index ffbeb31379..7d53e83ced 100755
--- a/Ports/SDL2_mixer/package.sh
+++ b/Ports/SDL2_mixer/package.sh
@@ -8,8 +8,7 @@ depends="SDL2 libvorbis"
configure() {
run ./configure \
--host="${SERENITY_ARCH}-pc-serenity" \
- --with-sdl-prefix="${SERENITY_BUILD_DIR}/Root/usr" \
- --prefix="/usr" \
+ --with-sdl-prefix="${SERENITY_BUILD_DIR}/Root/usr/local" \
--enable-music-opus=false --enable-music-opus-shared=false \
--enable-music-mod-modplug=false --enable-music-mod-modplug-shared=false \
EXTRA_LDFLAGS="-lgui -lgfx -lipc -lcore -lcompression"
diff --git a/Ports/SDL2_ttf/package.sh b/Ports/SDL2_ttf/package.sh
index e2e626f96d..08a3bdcd3c 100755
--- a/Ports/SDL2_ttf/package.sh
+++ b/Ports/SDL2_ttf/package.sh
@@ -8,7 +8,7 @@ depends="SDL2 freetype"
configure() {
run ./configure \
--host="${SERENITY_ARCH}-pc-serenity" \
- --with-sdl-prefix="${SERENITY_BUILD_DIR}/Root/usr" \
+ --with-sdl-prefix="${SERENITY_BUILD_DIR}/Root/usr/local" \
--with-x=no \
FT2_CFLAGS="-I${SERENITY_BUILD_DIR}/Root/usr/local/include/freetype2" \
LIBS="-lgui -lgfx -lipc -lcore -lcompress"
diff --git a/Ports/emu2/patches/install-prefix.patch b/Ports/emu2/patches/install-prefix.patch
new file mode 100644
index 0000000000..320892d739
--- /dev/null
+++ b/Ports/emu2/patches/install-prefix.patch
@@ -0,0 +1,12 @@
+diff -Naur emu2-ff276eb0a755a3e784f73da00b5db6c1b25c1f83/Makefile emu2-ff276eb0a755a3e784f73da00b5db6c1b25c1f83.serenity/Makefile
+--- emu2-ff276eb0a755a3e784f73da00b5db6c1b25c1f83/Makefile 2021-04-14 15:58:46.000000000 +0200
++++ emu2-ff276eb0a755a3e784f73da00b5db6c1b25c1f83.serenity/Makefile 2021-04-16 00:42:15.680769941 +0200
+@@ -2,7 +2,7 @@
+ CFLAGS=-O3 -flto -Wall -g -Werror=implicit-function-declaration -Werror=int-conversion
+ LDLIBS=-lm
+ INSTALL=install
+-PREFIX=/usr
++PREFIX=/usr/local
+
+ OBJS=\
+ cpu.o\
diff --git a/Ports/neofetch/package.sh b/Ports/neofetch/package.sh
index 3ad678dda6..0aea86032e 100755
--- a/Ports/neofetch/package.sh
+++ b/Ports/neofetch/package.sh
@@ -5,3 +5,7 @@ version=7.1.0
useconfigure=false
depends="bash jq"
files="https://github.com/dylanaraps/neofetch/archive/${version}.tar.gz neofetch-${version}.tar.gz"
+
+install() {
+ run make DESTDIR=$DESTDIR PREFIX=/usr/local $installopts install
+}
diff --git a/Ports/nesalizer/package.sh b/Ports/nesalizer/package.sh
index 3ce4a20967..3ea5157f84 100755
--- a/Ports/nesalizer/package.sh
+++ b/Ports/nesalizer/package.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env -S bash ../.port_include.sh
port=nesalizer
version=master
-makeopts="CONF=release EXTRA=-I${SERENITY_ROOT}/Build/i686/Root/usr/include/SDL2"
+makeopts="CONF=release EXTRA=-I${SERENITY_ROOT}/Build/i686/Root/usr/local/include/SDL2"
files="https://github.com/SerenityOS/nesalizer/archive/master.zip nesalizer-master.zip"
depends=SDL2
diff --git a/Ports/nethack/patches/install-path.patch b/Ports/nethack/patches/install-path.patch
index feb981fcaf..77ff043345 100644
--- a/Ports/nethack/patches/install-path.patch
+++ b/Ports/nethack/patches/install-path.patch
@@ -12,7 +12,7 @@ diff -Naur NetHack-NetHack-3.6.6_Released/sys/unix/nethack.sh NetHack-NetHack-3.
+HACKDIR=/var/games/nethack/
export HACKDIR
-HACK=$HACKDIR/nethack
-+HACK=/usr/lib/nethack/nethack
++HACK=/usr/local/lib/nethack/nethack
# Since Nethack.ad is installed in HACKDIR, add it to XUSERFILESEARCHPATH
case "x$XUSERFILESEARCHPATH" in
diff --git a/Ports/nethack/patches/serenity-hints.patch b/Ports/nethack/patches/serenity-hints.patch
index 3d5b4117a3..03d7b9b0ac 100644
--- a/Ports/nethack/patches/serenity-hints.patch
+++ b/Ports/nethack/patches/serenity-hints.patch
@@ -13,10 +13,10 @@ diff -Naur NetHack-NetHack-3.6.6_Released/sys/unix/hints/serenity NetHack-NetHac
+
+
+#PREFIX=/usr
-+PREFIX=/usr
++PREFIX=/usr/local
+HACKDIR=/var/games/nethack
-+SHELLDIR = $(SERENITY_BUILD_DIR)/Root/usr/bin
-+INSTDIR=$(SERENITY_BUILD_DIR)/Root/usr/lib/nethack
++SHELLDIR = $(SERENITY_BUILD_DIR)/Root/usr/local/bin
++INSTDIR=$(SERENITY_BUILD_DIR)/Root/usr/local/lib/nethack
+VARDIR = $(SERENITY_BUILD_DIR)/Root$(HACKDIR)
+
+
diff --git a/Ports/nyancat/patches/serenity-changes.patch b/Ports/nyancat/patches/serenity-changes.patch
index 0a54a900eb..a18eefb061 100644
--- a/Ports/nyancat/patches/serenity-changes.patch
+++ b/Ports/nyancat/patches/serenity-changes.patch
@@ -8,10 +8,10 @@ index 1dd50ef..e435044 100644
install: all
- install src/nyancat /usr/bin/${package}
- gzip -9 -c < nyancat.1 > /usr/share/man/man1/nyancat.1.gz
-+ mkdir -p ${DESTDIR}/usr/bin
-+ install src/nyancat ${DESTDIR}/usr/bin/${package}
-+ mkdir -p ${DESTDIR}/usr/share/man/man1
-+ gzip -9 -c < nyancat.1 > ${DESTDIR}/usr/share/man/man1/nyancat.1.gz
++ mkdir -p ${DESTDIR}/usr/local/bin
++ install src/nyancat ${DESTDIR}/usr/local/bin/${package}
++ mkdir -p ${DESTDIR}/usr/local/share/man/man1
++ gzip -9 -c < nyancat.1 > ${DESTDIR}/usr/local/share/man/man1/nyancat.1.gz
.PHONY: FORCE all clean check dist distcheck install
diff --git a/src/nyancat.c b/src/nyancat.c
diff --git a/Ports/scummvm/package.sh b/Ports/scummvm/package.sh
index 580231582f..9b4cae641a 100755
--- a/Ports/scummvm/package.sh
+++ b/Ports/scummvm/package.sh
@@ -9,7 +9,6 @@ configure() {
export LIBS="-lgui -lgfx -lcore"
run ./configure \
--host="${SERENITY_ARCH}-pc-serenity" \
- --prefix=/usr \
--opengl-mode=none \
- --with-sdl-prefix="${SERENITY_BUILD_DIR}/Root/usr"
+ --with-sdl-prefix="${SERENITY_BUILD_DIR}/Root/usr/local"
}
diff --git a/Ports/sl/patches/serenity-changes.patch b/Ports/sl/patches/serenity-changes.patch
index 5ac5f251aa..2a1ed1074f 100644
--- a/Ports/sl/patches/serenity-changes.patch
+++ b/Ports/sl/patches/serenity-changes.patch
@@ -8,7 +8,7 @@ index c3005d2..e071fc9 100644
distclean: clean
+
+install: all
-+ mkdir -p ${DESTDIR}/usr/bin
-+ install sl ${DESTDIR}/usr/bin/sl
-+ mkdir -p ${DESTDIR}/usr/share/man/man1
-+ gzip -9 -c < sl.1 > ${DESTDIR}/usr/share/man/man1/sl.1.gz
++ mkdir -p ${DESTDIR}/usr/local/bin
++ install sl ${DESTDIR}/usr/local/bin/sl
++ mkdir -p ${DESTDIR}/usr/local/share/man/man1
++ gzip -9 -c < sl.1 > ${DESTDIR}/usr/local/share/man/man1/sl.1.gz
diff --git a/Ports/stress-ng/package.sh b/Ports/stress-ng/package.sh
index 0a9257410d..22b260cabc 100755
--- a/Ports/stress-ng/package.sh
+++ b/Ports/stress-ng/package.sh
@@ -7,4 +7,5 @@ depends=zlib
pre_configure() {
export CFLAGS="-I${SERENITY_BUILD_DIR}/Root/usr/local/include"
export LDFLAGS="-L${SERENITY_BUILD_DIR}/Root/usr/local/lib -lzlib"
+
}
diff --git a/Ports/stress-ng/patches/install-prefix.patch b/Ports/stress-ng/patches/install-prefix.patch
new file mode 100644
index 0000000000..dc1be665e0
--- /dev/null
+++ b/Ports/stress-ng/patches/install-prefix.patch
@@ -0,0 +1,18 @@
+diff -Naur stress-ng-0.11.23/Makefile stress-ng-0.11.23.serenity/Makefile
+--- stress-ng-0.11.23/Makefile 2021-04-16 00:30:33.161310251 +0200
++++ stress-ng-0.11.23.serenity/Makefile 2021-04-16 00:33:59.731692012 +0200
+@@ -53,10 +53,10 @@
+ CFLAGS += -DBUILD_STATIC
+ endif
+
+-BINDIR=/usr/bin
+-MANDIR=/usr/share/man/man1
+-JOBDIR=/usr/share/stress-ng/example-jobs
+-BASHDIR=/usr/share/bash-completion/completions
++BINDIR=/usr/local/bin
++MANDIR=/usr/local/share/man/man1
++JOBDIR=/usr/local/share/stress-ng/example-jobs
++BASHDIR=/usr/local/share/bash-completion/completions
+
+ #
+ # Stressors
diff --git a/Ports/termcap/package.sh b/Ports/termcap/package.sh
index f1bd79599e..0f6e0ccd02 100755
--- a/Ports/termcap/package.sh
+++ b/Ports/termcap/package.sh
@@ -2,5 +2,5 @@
port=termcap
version=1.3.1
useconfigure=true
-configopts="--prefix=${SERENITY_BUILD_DIR}/Root/usr"
+configopts="--prefix=${SERENITY_BUILD_DIR}/Root/usr/local"
files="https://ftpmirror.gnu.org/gnu/termcap/termcap-${version}.tar.gz termcap-${version}.tar.gz"
diff --git a/Toolchain/CMake/CMakeToolchain.txt b/Toolchain/CMake/CMakeToolchain.txt
index 43d0538a9c..108f6897a4 100644
--- a/Toolchain/CMake/CMakeToolchain.txt
+++ b/Toolchain/CMake/CMakeToolchain.txt
@@ -18,9 +18,9 @@ set(SERENITY_BUILD_DIR $ENV{SERENITY_ROOT}/Build/$ENV{SERENITY_ARCH})
# where to read from/write to
set(CMAKE_SYSROOT ${SERENITY_BUILD_DIR}/Root)
-set(CMAKE_STAGING_PREFIX ${SERENITY_BUILD_DIR}/Root/usr)
-set(CMAKE_INSTALL_PREFIX ${SERENITY_BUILD_DIR}/Root/usr)
-set(CMAKE_INSTALL_DATAROOTDIR ${SERENITY_BUILD_DIR}/Root/usr/share)
+set(CMAKE_STAGING_PREFIX ${SERENITY_BUILD_DIR}/Root/usr/local)
+set(CMAKE_INSTALL_PREFIX ${SERENITY_BUILD_DIR}/Root/usr/local)
+set(CMAKE_INSTALL_DATAROOTDIR ${SERENITY_BUILD_DIR}/Root/usr/local/share)
set(CMAKE_C_COMPILER $ENV{SERENITY_ARCH}-pc-serenity-gcc)
set(CMAKE_CXX_COMPILER $ENV{SERENITY_ARCH}-pc-serenity-g++)
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-27 01:38:08 +0000