From 81b5edce656f3f385e3359fc0f440f7bd574c330 Mon Sep 17 00:00:00 2001 From: Mid Favila Date: Fri, 24 Dec 2021 03:47:26 +0000 Subject: [PATCH] many changes some breaking --- banished/gcc9/depends | 2 +- banished/python2/depends | 2 +- community-mod/stable/aria2/depends | 2 +- community-mod/stable/azpainter/depends | 2 +- community-mod/stable/bind/depends | 2 +- community-mod/stable/coreutils/build | 5 ++ community-mod/stable/dosbox/depends | 2 +- community-mod/stable/emacs/depends | 2 +- community-mod/stable/flashrom/depends | 2 +- community-mod/stable/fltk/depends | 2 +- community-mod/stable/fuse/build | 3 + community-mod/stable/gdb/build | 3 + community-mod/stable/kmod/depends | 2 +- community-mod/stable/libisoburn/depends | 2 +- community-mod/stable/libisofs/depends | 2 +- community-mod/stable/libsoup/depends | 2 +- community-mod/stable/libxml2/depends | 2 +- community-mod/stable/lynx/depends | 2 +- community-mod/stable/mutt/depends | 2 +- community-mod/stable/nano/depends | 2 +- community-mod/stable/neomutt/depends | 2 +- community-mod/stable/nss/depends | 2 +- community-mod/stable/openjpeg2/depends | 2 +- community-mod/stable/optipng/depends | 2 +- community-mod/stable/postgresql/depends | 2 +- community-mod/stable/python2/depends | 2 +- community-mod/stable/qpdf/depends | 2 +- community-mod/stable/ruby/depends | 2 +- community-mod/stable/sdcv/depends | 2 +- community-mod/stable/tor/depends | 2 +- community-mod/stable/weechat/depends | 2 +- core-mod/core/atto-git/build | 2 + core-mod/core/atto-git/checksums | 1 + core-mod/core/atto-git/files/makefile.mid | 68 +++++++++++++++++++++++ core-mod/core/atto-git/sources | 1 + core-mod/core/binutils/build | 5 +- core-mod/core/binutils/depends | 2 +- core-mod/core/curl/depends | 2 +- core-mod/core/file/depends | 2 +- core-mod/core/gcc/depends | 2 +- core-mod/core/git/depends | 2 +- core-mod/core/libarchive/depends | 2 +- core-mod/core/{zlib => libz}/build | 1 - core-mod/core/libz/checksums | 1 + core-mod/core/libz/sources | 1 + core-mod/core/{zlib => libz}/version | 0 core-mod/core/mandoc/depends | 2 +- core-mod/core/pciutils/depends | 2 +- core-mod/core/shared-mime-info/depends | 2 +- core-mod/core/zlib/checksums | 1 - core-mod/core/zlib/sources | 1 - core-mod/extra/atk/build | 3 + core-mod/extra/cairo/depends | 2 +- core-mod/extra/cmake/depends | 2 +- core-mod/extra/ffmpeg/build | 3 + core-mod/extra/freetype-harfbuzz/build | 7 ++- core-mod/extra/freetype-harfbuzz/depends | 2 +- core-mod/extra/gdk-pixbuf/build | 3 + core-mod/extra/giflib/build | 3 + core-mod/extra/glib/build | 3 + core-mod/extra/glib/depends | 2 +- core-mod/extra/gnupg1/depends | 2 +- core-mod/extra/libelf/depends | 2 +- core-mod/extra/libpng/depends | 2 +- core-mod/extra/llvm/depends | 2 +- core-mod/extra/mesa/depends | 2 +- core-mod/extra/openssh/depends | 2 +- core-mod/extra/perl/depends | 2 +- core-mod/extra/python/depends | 2 +- core-mod/extra/rsync/depends | 2 +- core-mod/extra/sqlite/depends | 2 +- core-mod/extra/tiff/depends | 2 +- core-mod/extra/util-linux/depends | 2 +- core-mod/xorg/libfontenc/depends | 2 +- core-mod/xorg/xorg-server/depends | 2 +- core-mod/xorg/xterm/depends | 2 +- emacs-beta/depends | 2 +- ports/9base-git-mod/build | 4 +- ports/atto-git/build | 4 -- ports/atto-git/depends | 1 - ports/atto-git/manifest | 13 ----- ports/atto-git/sources | 1 - ports/atto-git/version | 1 - ports/browser/build | 2 + ports/browser/checksums | 2 +- ports/browser/sources | 2 +- ports/cataclysm-dda-git/depends | 2 +- ports/deadbeef/depends | 2 +- ports/ecl/build | 5 +- ports/emacs-mod/depends | 2 +- ports/file/depends | 2 +- ports/freetype-harfbuzz | 1 - ports/freetype-harfbuzz-mod/depends | 2 +- ports/gdb/build | 20 ------- ports/gdb/checksums | 1 - ports/gdb/depends | 1 - ports/gdb/sources | 1 - ports/gdb/version | 1 - ports/links2-mod/depends | 2 +- ports/mtpaint-git/depends | 2 +- ports/musl-compat-git/build | 2 +- ports/pcc-libs/build | 3 + ports/pcc/checksums | 2 +- ports/pcc/depends | 1 + ports/pciutils/depends | 2 +- ports/rdrview-git/depends | 2 +- ports/tcl/depends | 2 +- ports/tk/depends | 2 +- ports/util-linux/depends | 2 +- ports/xterm/depends | 2 +- testing/transmission-gtk2/depends | 2 +- testing/xterm/depends | 2 +- 112 files changed, 193 insertions(+), 134 deletions(-) create mode 100644 core-mod/core/atto-git/checksums create mode 100644 core-mod/core/atto-git/files/makefile.mid rename core-mod/core/{zlib => libz}/build (91%) create mode 100644 core-mod/core/libz/checksums create mode 100644 core-mod/core/libz/sources rename core-mod/core/{zlib => libz}/version (100%) delete mode 100644 core-mod/core/zlib/checksums delete mode 100644 core-mod/core/zlib/sources delete mode 100755 ports/atto-git/build delete mode 100644 ports/atto-git/depends delete mode 100644 ports/atto-git/manifest delete mode 100644 ports/atto-git/sources delete mode 100644 ports/atto-git/version delete mode 120000 ports/freetype-harfbuzz delete mode 100755 ports/gdb/build delete mode 100644 ports/gdb/checksums delete mode 100644 ports/gdb/depends delete mode 100644 ports/gdb/sources delete mode 100644 ports/gdb/version create mode 100644 ports/pcc/depends diff --git a/banished/gcc9/depends b/banished/gcc9/depends index 11c8476..0895b29 100644 --- a/banished/gcc9/depends +++ b/banished/gcc9/depends @@ -2,4 +2,4 @@ binutils bison flex linux-headers -zlib + diff --git a/banished/python2/depends b/banished/python2/depends index 4711f7d..82f0c2d 100644 --- a/banished/python2/depends +++ b/banished/python2/depends @@ -1,3 +1,3 @@ bzip2 sqlite -zlib + diff --git a/community-mod/stable/aria2/depends b/community-mod/stable/aria2/depends index f8df7bb..cb1b678 100644 --- a/community-mod/stable/aria2/depends +++ b/community-mod/stable/aria2/depends @@ -1,3 +1,3 @@ libressl xz -zlib + diff --git a/community-mod/stable/azpainter/depends b/community-mod/stable/azpainter/depends index b20789c..c7f4da4 100644 --- a/community-mod/stable/azpainter/depends +++ b/community-mod/stable/azpainter/depends @@ -4,4 +4,4 @@ libpng libX11 libXext libXi -zlib + diff --git a/community-mod/stable/bind/depends b/community-mod/stable/bind/depends index 702fcb4..8e9175a 100644 --- a/community-mod/stable/bind/depends +++ b/community-mod/stable/bind/depends @@ -6,4 +6,4 @@ libuv perl make pkgconf make xz -zlib + diff --git a/community-mod/stable/coreutils/build b/community-mod/stable/coreutils/build index 0973beb..e3ee1b7 100755 --- a/community-mod/stable/coreutils/build +++ b/community-mod/stable/coreutils/build @@ -1,5 +1,10 @@ #!/bin/sh -e +# If the user has -pie in their LDFLAGS, remove it; it breaks the build. +printf "\n\n\nHey, boss. We're gonna be removing -pie from your LDFLAGS if it's there, to make sure the build succeeds.\n\n\n" +sleep 3 + +LDFLAGS=$(echo $LDFLAGS|sed 's/-pie//') export FORCE_UNSAFE_CONFIGURE=1 export CFLAGS="$CFLAGS -static" diff --git a/community-mod/stable/dosbox/depends b/community-mod/stable/dosbox/depends index e01033c..b82e6b9 100644 --- a/community-mod/stable/dosbox/depends +++ b/community-mod/stable/dosbox/depends @@ -12,4 +12,4 @@ libXxf86vm libxshmfence mesa sdl -zlib + diff --git a/community-mod/stable/emacs/depends b/community-mod/stable/emacs/depends index 5ebc241..64e76e7 100644 --- a/community-mod/stable/emacs/depends +++ b/community-mod/stable/emacs/depends @@ -1,3 +1,3 @@ libxml2 ncurses -zlib + diff --git a/community-mod/stable/flashrom/depends b/community-mod/stable/flashrom/depends index 378a327..3418b3b 100644 --- a/community-mod/stable/flashrom/depends +++ b/community-mod/stable/flashrom/depends @@ -1,2 +1,2 @@ pciutils -zlib + diff --git a/community-mod/stable/fltk/depends b/community-mod/stable/fltk/depends index d8ba834..07a9f9a 100644 --- a/community-mod/stable/fltk/depends +++ b/community-mod/stable/fltk/depends @@ -14,4 +14,4 @@ libXrender libjpeg-turbo libpng libxcb -zlib + diff --git a/community-mod/stable/fuse/build b/community-mod/stable/fuse/build index 2024e5f..689ae45 100755 --- a/community-mod/stable/fuse/build +++ b/community-mod/stable/fuse/build @@ -1,5 +1,8 @@ #!/bin/sh -e +# Can't build with -pie. +LDFLAGS="$(echo $LDFLAGS|sed 's/-pie//')" + sed -i "28s|.*|chmod u+s \"\${DESTDIR}\${bindir}/fusermount3\"|" \ util/install_helper.sh diff --git a/community-mod/stable/gdb/build b/community-mod/stable/gdb/build index 66017cb..d7e57a8 100755 --- a/community-mod/stable/gdb/build +++ b/community-mod/stable/gdb/build @@ -1,5 +1,8 @@ #!/bin/sh -e +# Remove -pie from ldflags to prevent build breakage. +LDFLAGS="$(echo $LDFLAGS|sed 's/-pie//')" + cat > makeinfo < makeinfo < make mv make Makefile make diff --git a/ports/pcc-libs/build b/ports/pcc-libs/build index 6daf22f..1d497df 100755 --- a/ports/pcc-libs/build +++ b/ports/pcc-libs/build @@ -1,5 +1,8 @@ #!/bin/sh -e +CFLAGS='-O2 -w -pipe' +CXXFLAGS=$CFLAGS + ./configure \ --prefix=/usr diff --git a/ports/pcc/checksums b/ports/pcc/checksums index 3168067..c3c7cb3 100644 --- a/ports/pcc/checksums +++ b/ports/pcc/checksums @@ -1 +1 @@ -cf5c8119cb4560b7dfcffbf88e0544b66deee30bb0f2a2c2b30eec800a8a8c19 +cb4a74f1c52532c531aa6656fe855b068297ceaef0513b292322320bee91274f diff --git a/ports/pcc/depends b/ports/pcc/depends new file mode 100644 index 0000000..fa5c206 --- /dev/null +++ b/ports/pcc/depends @@ -0,0 +1 @@ +pcc-libs \ No newline at end of file diff --git a/ports/pciutils/depends b/ports/pciutils/depends index f22003e..8b13789 100644 --- a/ports/pciutils/depends +++ b/ports/pciutils/depends @@ -1 +1 @@ -zlib + diff --git a/ports/rdrview-git/depends b/ports/rdrview-git/depends index 8764528..fb7aa83 100644 --- a/ports/rdrview-git/depends +++ b/ports/rdrview-git/depends @@ -2,4 +2,4 @@ curl libseccomp libxml2 xz -zlib + diff --git a/ports/tcl/depends b/ports/tcl/depends index 6be6f07..6ae08ac 100644 --- a/ports/tcl/depends +++ b/ports/tcl/depends @@ -1,2 +1,2 @@ sqlite -zlib + diff --git a/ports/tk/depends b/ports/tk/depends index 39ab694..277e2d7 100644 --- a/ports/tk/depends +++ b/ports/tk/depends @@ -2,4 +2,4 @@ libXScrnSaver libXext libXft tcl -zlib + diff --git a/ports/util-linux/depends b/ports/util-linux/depends index 709a840..fa3ea98 100644 --- a/ports/util-linux/depends +++ b/ports/util-linux/depends @@ -1,2 +1,2 @@ linux-headers make -zlib + diff --git a/ports/xterm/depends b/ports/xterm/depends index a821fe9..dfc123d 100644 --- a/ports/xterm/depends +++ b/ports/xterm/depends @@ -18,4 +18,4 @@ libXt libpng libxcb ncurses -zlib + diff --git a/testing/transmission-gtk2/depends b/testing/transmission-gtk2/depends index 179558c..da551c2 100644 --- a/testing/transmission-gtk2/depends +++ b/testing/transmission-gtk2/depends @@ -10,4 +10,4 @@ intltool make libevent libressl pango -zlib + diff --git a/testing/xterm/depends b/testing/xterm/depends index 4ce1e47..8f825ab 100644 --- a/testing/xterm/depends +++ b/testing/xterm/depends @@ -17,4 +17,4 @@ libXt libpng libxcb ncurses -zlib +