ports

morpheus ports
git clone git://git.2f30.org/ports.git
Log | Files | Refs | LICENSE

commit a3c320e48724991e0fa53408d48443379feef55d
parent 76d4bddfe4ad18902916ccbea2faab65659d913a
Author: Hiltjo Posthuma <hiltjo@codemadness.org>
Date:   Sat Jun  7 16:11:41 +0200

style fixes, use mkbuild patch functionality

Signed-off-by: Hiltjo Posthuma <hiltjo@codemadness.org>

Diffstat:
curl/curl.mk | 5-----
curl/mkfile | 5+++++
elinks/elinks.mk | 4++--
expat/expat.mk | 3++-
jupp/jupp.mk | 3++-
ncurses/ncurses.mk | 3++-
openssh/mkfile | 5+++++
openssh/openssh.mk | 8++------
openssl/openssl.mk | 3++-
xorginputproto/xorginputproto.mk | 5+++--
xorgkbproto/xorgkbproto.mk | 5+++--
xorglibpciaccess/libpciaccess-limits.patch | 10++++++++++
xorglibpciaccess/limits.patch | 10----------
xorglibpciaccess/mkfile | 4++++
xorglibpciaccess/xorglibpciaccess.mk | 4+---
xorglibx11/xorglibx11.mk | 7+++----
xorglibxfont/mkfile | 4++++
xorglibxfont/xorglibxfont.mk | 4----
xorgrenderproto/xorgrenderproto.mk | 5+++--
xorgxf86bigfontproto/xorgxf86bigfontproto.mk | 5+++--
xorgxineramaproto/xorgxineramaproto.mk | 5+++--
xorgxinit/xorgxinit.mk | 7++++---
22 files changed, 63 insertions(+), 51 deletions(-)
diff --git a/curl/curl.mk b/curl/curl.mk @@ -10,11 +10,6 @@ INSTALL_MAN1 = \ <$mkbuild/mk.common curl:QV: - # fix: hugehelp is not defined because we use --disable-manual. - # in src/tool_operate.c this is used though, so it's a bug. - patch --silent --dry-run -N -p0 < ../curl-fix-hugehelp.patch && \ - patch -p0 < ../curl-fix-hugehelp.patch - # export CFLAGS="$CFLAGS $DEPS_CFLAGS" export LDFLAGS="$LDFLAGS $DEPS_LDFLAGS" CC="$CC -static" ./configure \ diff --git a/curl/mkfile b/curl/mkfile @@ -4,3 +4,8 @@ src = curl-$v url = http://curl.haxx.se/download/curl-$v.tar.gz mkfile = ../curl.mk + +# fix: hugehelp is not defined because we use --disable-manual. +# in src/tool_operate.c this is used though, so it's a bug. +patches = \ + "0" ../curl-fix-hugehelp.patch diff --git a/elinks/elinks.mk b/elinks/elinks.mk @@ -37,8 +37,8 @@ elinks:QV: # NOTES: # - LD is set to "ld", not gcc, because Makefile.lib specifies: # ld -r -o ... - # - X_CFLAGS is set to blank, it's set to "/usr/include" which breaks builds - # outside emul. + # - X_CFLAGS is set to blank, it's set to "-I/usr/include" which breaks + # builds outside emul. make -j$nprocs \ V="1" CC="${CC} -static" \ X_CFLAGS=" " \ diff --git a/expat/expat.mk b/expat/expat.mk @@ -3,7 +3,8 @@ TARG = expat <$mkbuild/mk.common-noinst expat:QV: - ./configure --prefix="$PREFIX" \ + ./configure \ + --prefix="$PREFIX" \ --mandir="$ROOT/share/man" \ --disable-shared \ --enable-static diff --git a/jupp/jupp.mk b/jupp/jupp.mk @@ -14,6 +14,7 @@ INSTALL_SYMLINK = joe /bin/jmacs \ joe.1 $MANDIR/man1/jmacs.1 jupp:QV: - sh configure --prefix="$PREFIX" + sh configure \ + --prefix="$PREFIX" make -j$nprocs diff --git a/ncurses/ncurses.mk b/ncurses/ncurses.mk @@ -7,7 +7,8 @@ INSTALL_MAN5 = man/terminfo.5 libncurses:QV: cp ../ncurses-fallback.c ncurses/fallback.c - CC="$CC -static" ./configure --prefix="$PREFIX" --mandir="$MANDIR" \ + CC="$CC -static" ./configure \ + --prefix="$PREFIX" --mandir="$MANDIR" \ --datadir="$PREFIX/share" --without-tests \ --with-normal --enable-sigwinch --disable-nls --without-dlsym \ --without-cxx-binding --enable-widec \ diff --git a/openssh/mkfile b/openssh/mkfile @@ -4,3 +4,8 @@ src = openssh-$v url = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-$v.tar.gz mkfile = ../openssh.mk + +# fix implicit declarations. +patches = \ + ../openssh-configure.patch \ + ../openssh-sys_param.patch diff --git a/openssh/openssh.mk b/openssh/openssh.mk @@ -6,11 +6,6 @@ DEPS = zlib openssl openssh:QV: export CFLAGS="$CFLAGS $DEPS_CFLAGS" export LDFLAGS="$LDFLAGS $DEPS_LDFLAGS" - # fix implicit declarations - patch --silent --dry-run -N -p1 < ../openssh-configure.patch && \ - patch -p1 < ../openssh-configure.patch - patch --silent --dry-run -N -p1 < ../openssh-sys_param.patch && \ - patch -p1 < ../openssh-sys_param.patch # prevent from installing some things (keysign and maybe others) setuid. sed -i 's@-m 4711@-m 0750@g' Makefile.in # work around for issue #104 until we come up with a proper patch @@ -18,7 +13,8 @@ openssh:QV: CC="${CC} -static" \ ac_cv_path_AR="${AR}" \ CFLAGS="$issue104cflags -D_BSD_SOURCE -DMISSING_FD_MASK -DMISSING_NFDBITS $CFLAGS" \ - ./configure -C --prefix="$PREFIX" \ + ./configure -C \ + --prefix="$PREFIX" \ --sbindir="$PREFIX"/bin --libexecdir="$PREFIX"/lib/ssh \ --sysconfdir="$PREFIX"/etc/ssh \ --with-privsep-user=nobody \ diff --git a/openssl/openssl.mk b/openssl/openssl.mk @@ -43,7 +43,8 @@ openssl:QV: sslarch="arm" ;; esac - ./Configure "${sslarch}" --prefix="$PREFIX" --openssldir="$PREFIX"/etc/ssl \ + ./Configure "${sslarch}" \ + --prefix="$PREFIX" --openssldir="$PREFIX"/etc/ssl \ --libdir="$PREFIX"/lib no-dso no-asm zlib enable-md2 $CFLAGS # Clean out hardcoded flags that openssl uses CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \ diff --git a/xorginputproto/xorginputproto.mk b/xorginputproto/xorginputproto.mk @@ -3,7 +3,8 @@ TARG = xorgkbproto <$mkbuild/mk.common-noinst xorgkbproto:QV: - ./configure --prefix="$PREFIX" \ - --mandir="$ROOT/share/man" + ./configure \ + --prefix="$PREFIX" \ + --mandir="$ROOT/share/man" make -j$nprocs make install DESTDIR="`pwd`/lib" diff --git a/xorgkbproto/xorgkbproto.mk b/xorgkbproto/xorgkbproto.mk @@ -3,7 +3,8 @@ TARG = xorgkbproto <$mkbuild/mk.common-noinst xorgkbproto:QV: - ./configure --prefix="$PREFIX" \ - --mandir="$ROOT/share/man" + ./configure \ + --prefix="$PREFIX" \ + --mandir="$ROOT/share/man" make -j$nprocs make install DESTDIR="`pwd`/lib" diff --git a/xorglibpciaccess/libpciaccess-limits.patch b/xorglibpciaccess/libpciaccess-limits.patch @@ -0,0 +1,10 @@ +--- src/linux_sysfs.old 2014-05-14 15:00:00.932500323 +0200 ++++ src/linux_sysfs.c 2014-05-14 15:00:57.252498017 +0200 +@@ -44,6 +44,7 @@ + #include <sys/mman.h> + #include <dirent.h> + #include <errno.h> ++#include <limits.h> + + #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) + #include <sys/io.h> diff --git a/xorglibpciaccess/limits.patch b/xorglibpciaccess/limits.patch @@ -1,10 +0,0 @@ ---- src/linux_sysfs.old 2014-05-14 15:00:00.932500323 +0200 -+++ src/linux_sysfs.c 2014-05-14 15:00:57.252498017 +0200 -@@ -44,6 +44,7 @@ - #include <sys/mman.h> - #include <dirent.h> - #include <errno.h> -+#include <limits.h> - - #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) - #include <sys/io.h> diff --git a/xorglibpciaccess/mkfile b/xorglibpciaccess/mkfile @@ -4,3 +4,7 @@ src = libpciaccess-$v url = http://xorg.freedesktop.org/releases/individual/lib/libpciaccess-$v.tar.bz2 mkfile = ../xorglibpciaccess.mk + +# fix missing include for limits.h (PATH_MAX). +patches = \ + "0" ../libpciaccess-limits.patch diff --git a/xorglibpciaccess/xorglibpciaccess.mk b/xorglibpciaccess/xorglibpciaccess.mk @@ -6,9 +6,7 @@ DEPS = zlib xorglibpciaccess:QV: export CFLAGS="$CFLAGS $DEPS_CFLAGS" export LDFLAGS="$LDFLAGS $DEPS_LDFLAGS" - # fix missing include for limits.h (PATH_MAX). - patch --silent --dry-run -N -p0 < ../limits.patch && \ - patch -p0 < ../limits.patch + # CC="$CC" ./configure \ --prefix="$PREFIX" \ --mandir="$ROOT/share/man" \ diff --git a/xorglibx11/xorglibx11.mk b/xorglibx11/xorglibx11.mk @@ -11,10 +11,9 @@ xorglibx11:QV: export BIGFONT_LIBS="-L${xorgxf86bigfontproto_libdir}" export X11_CFLAGS="${CFLAGS}" export X11_LIBS="${LDFLAGS}" - #TODO: more detailed flags -# export X11_CFLAGS="-I${xorgxproto_includedir}" -# export X11_LIBS="-L${xorgxproto_libdir}" - ./configure --prefix="$PREFIX" \ + # + ./configure \ + --prefix="$PREFIX" \ --mandir="$ROOT/share/man" \ --with-keysymdefdir="${xorgxproto_includedir}/X11" \ --disable-shared \ diff --git a/xorglibxfont/mkfile b/xorglibxfont/mkfile @@ -4,3 +4,7 @@ src = libXfont-$v url = http://xorg.freedesktop.org/releases/individual/lib/libXfont-$v.tar.bz2 mkfile = ../xorglibxfont.mk + +# patch "error: conflicting types for ‘CacheFontPattern’" +patches = \ + ../xorg-libxfont-const.diff diff --git a/xorglibxfont/xorglibxfont.mk b/xorglibxfont/xorglibxfont.mk @@ -4,10 +4,6 @@ DEPS = freetype zlib xorgxproto xorglibfontenc xorgxtrans xorgfontsproto <$mkbuild/mk.common-noinst xorglibxfont:QV: - # patch "error: conflicting types for ‘CacheFontPattern’" - patch -p1 -N --silent --dry-run < ../xorg-libxfont-const.diff && \ - patch -p1 < ../xorg-libxfont-const.diff - # export CFLAGS="$CFLAGS $DEPS_CFLAGS" export LDFLAGS="$LDFLAGS $DEPS_LDFLAGS" export FREETYPE_CFLAGS="-I${freetype_includedir}" diff --git a/xorgrenderproto/xorgrenderproto.mk b/xorgrenderproto/xorgrenderproto.mk @@ -3,6 +3,7 @@ TARG = xorgrenderproto <$mkbuild/mk.common-noinst xorgrenderproto:QV: - ./configure --prefix="$PREFIX" \ - --mandir="$ROOT/share/man" + ./configure \ + --prefix="$PREFIX" \ + --mandir="$ROOT/share/man" make -j$nprocs install DESTDIR="`pwd`/lib" diff --git a/xorgxf86bigfontproto/xorgxf86bigfontproto.mk b/xorgxf86bigfontproto/xorgxf86bigfontproto.mk @@ -3,6 +3,7 @@ TARG = xorgxf86bigfontproto <$mkbuild/mk.common-noinst xorgxf86bigfontproto:QV: - ./configure --prefix="$PREFIX" \ - --mandir="$ROOT/share/man" + ./configure \ + --prefix="$PREFIX" \ + --mandir="$ROOT/share/man" make -j$nprocs install DESTDIR="`pwd`/lib" diff --git a/xorgxineramaproto/xorgxineramaproto.mk b/xorgxineramaproto/xorgxineramaproto.mk @@ -3,6 +3,7 @@ TARG = xorgxextproto <$mkbuild/mk.common-noinst xorgxextproto:QV: - ./configure --prefix="$PREFIX" \ - --mandir="$ROOT/share/man" + ./configure \ + --prefix="$PREFIX" \ + --mandir="$ROOT/share/man" make -j$nprocs install DESTDIR="`pwd`/lib" diff --git a/xorgxinit/xorgxinit.mk b/xorgxinit/xorgxinit.mk @@ -8,8 +8,9 @@ xorgxinit:QV: export LDFLAGS="$LDFLAGS $DEPS_LDFLAGS" export XINIT_CFLAGS="${CFLAGS}" export XINIT_LIBS="${LDFLAGS}" - CC="$CC" ./configure --prefix="$PREFIX" - make LIBS="-lX11 -lxcb -lXau -lXdmcp" + CC="$CC" ./configure \ + --prefix="$PREFIX" + make -j$nprocs LIBS="-lX11 -lxcb -lXau -lXdmcp" install:QV: - make DESTDIR="$ROOT" install + make install DESTDIR="$ROOT"