mkports

recipes for building multiple softwares with mk(1)
git clone git://z3bra.org/mkports
Log | Files | Refs

commit 117341348352660579a37dcf31ccb05b85509353
parent 21c6e328cf7966d299339049f9dad7cf8a9e6222
Author: z3bra <contactatz3bradotorg>
Date:   Wed Nov 30 08:44:29 +0100

update some port versions

Diffstat:
deps.mk | 3++-
git/mkfile | 8+-------
libacl/mkfile | 24++++++++++++++++++++++++
libacl/patches/config.sub-musl.diff | 21+++++++++++++++++++++
libacl/patches/fix-buildmacros-static.diff | 13+++++++++++++
libattr/mkfile | 24++++++++++++++++++++++++
libattr/patches/config.sub-musl.diff | 21+++++++++++++++++++++
libattr/patches/fix-buildmacros-static.diff | 13+++++++++++++
libattr/patches/fix-headers.diff | 54++++++++++++++++++++++++++++++++++++++++++++++++++++++
libgmp/mkfile | 2+-
libmpfr/mkfile | 2+-
mk/mkfile | 1+
mk/patches/makefile-ldflags.diff | 10++++++++++
pm/mkfile | 4++--
14 files changed, 188 insertions(+), 12 deletions(-)
diff --git a/deps.mk b/deps.mk @@ -9,4 +9,5 @@ libmpfr:V: libgmp libmpc:V: libgmp libmpfr libregexp9:V: libutf libfmt mk:V: libutf libfmt libbio libregexp9 -pm:V: libarchive libz bzip2 +pm:V: libarchive libz bzip2 libattr libacl xz +libacl:V: libattr diff --git a/git/mkfile b/git/mkfile @@ -1,5 +1,5 @@ pkg = git -ver = 2.7.0 +ver = 2.10.1 url = https://www.kernel.org/pub/software/scm/git/$pkg-$ver.tar.xz <../default.mk @@ -12,10 +12,4 @@ MAKEFLAGS = ${MAKEFLAGS} \ NO_GETTEXT=1 \ INSTALLMAN3DIR=/man/man3 \ gitexecdir=/lib/git-core \ - V=1 \ all - -cleanup:QV: install - mv $destdir/usr/lib/perl5 $destdir/lib/ - rm -r $destdir/share - rm -r $destdir/usr diff --git a/libacl/mkfile b/libacl/mkfile @@ -0,0 +1,24 @@ +pkg = libacl +ver = 2.2.52 +url = http://download-mirror.savannah.gnu.org/releases/acl/acl-$ver.src.tar.gz + +<../config.mk +<../default.mk + +CFLAGS = ${CFLAGS} -I$WORK/$pkg-$ver/include +OPTIMIZER = $CFLAGS +DEBUG = -DNDEBUG +CONFIGURE = $CONFIGURE \ + --exec-prefix=/ \ + --libexecdir=/lib \ + --disable-gettext + +build:QV: fetch patch + cd $WORK/$pkg-$ver + test -f configure && ./configure $CONFIGURE + make CC="$CC" + +install:QV: build + mkdir -p $destdir + cd $WORK/$pkg-$ver + make DIST_ROOT=$destdir install install-lib install-dev diff --git a/libacl/patches/config.sub-musl.diff b/libacl/patches/config.sub-musl.diff @@ -0,0 +1,21 @@ +diff -urN a/config.sub b/config.sub +--- a/config.sub 2013-05-19 07:51:14.000000000 +0200 ++++ b/config.sub 2016-11-30 08:43:18.811577351 +0100 +@@ -122,7 +122,7 @@ + # Here we must recognize all the valid KERNEL-OS combinations. + maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` + case $maybe_os in +- nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ ++ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | linux-musl* | \ + linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ +@@ -1360,7 +1360,7 @@ + | -chorusos* | -chorusrdb* | -cegcc* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-android* \ +- | -linux-newlib* | -linux-uclibc* \ ++ | -linux-newlib* | -linux-uclibc* | -linux-musl* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ diff --git a/libacl/patches/fix-buildmacros-static.diff b/libacl/patches/fix-buildmacros-static.diff @@ -0,0 +1,13 @@ +diff -urN a/include/buildmacros b/include/buildmacros +--- a/include/buildmacros 2013-05-19 07:07:22.000000000 +0200 ++++ b/include/buildmacros 2016-10-24 08:51:19.334082460 +0200 +@@ -97,7 +97,8 @@ + + INSTALL_LTLIB_STATIC = \ + cd $(TOPDIR)/$(LIBNAME)/.libs; \ +- ../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); ++ ../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \ ++ ../$(INSTALL) -m 644 $(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; + + INSTALL_MAN = \ + @for d in $(MAN_PAGES); do \ diff --git a/libattr/mkfile b/libattr/mkfile @@ -0,0 +1,24 @@ +pkg = libattr +ver = 2.4.47 +url = http://download-mirror.savannah.gnu.org/releases/attr/attr-$ver.src.tar.gz + +<../config.mk +<../default.mk + +CFLAGS = ${CFLAGS} -I$WORK/$pkg-$ver/include +OPTIMIZER = $CFLAGS +DEBUG = -DNDEBUG +CONFIGURE = $CONFIGURE \ + --exec-prefix=/ \ + --libexecdir=/lib \ + --disable-gettext + +build:QV: fetch patch + cd $WORK/$pkg-$ver + test -f configure && ./configure $CONFIGURE + make CC="$CC" + +install:QV: build + mkdir -p $destdir + cd $WORK/$pkg-$ver + make DIST_ROOT=$destdir install install-lib install-dev diff --git a/libattr/patches/config.sub-musl.diff b/libattr/patches/config.sub-musl.diff @@ -0,0 +1,21 @@ +diff -urN a/config.sub b/config.sub +--- a/config.sub 2013-05-19 16:15:03.000000000 +0200 ++++ b/config.sub 2016-11-30 08:39:28.314082214 +0100 +@@ -122,7 +122,7 @@ + # Here we must recognize all the valid KERNEL-OS combinations. + maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` + case $maybe_os in +- nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ ++ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | linux-musl* | \ + linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ +@@ -1360,7 +1360,7 @@ + | -chorusos* | -chorusrdb* | -cegcc* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-android* \ +- | -linux-newlib* | -linux-uclibc* \ ++ | -linux-newlib* | -linux-uclibc* | -linux-musl* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ diff --git a/libattr/patches/fix-buildmacros-static.diff b/libattr/patches/fix-buildmacros-static.diff @@ -0,0 +1,13 @@ +diff -urN a/include/buildmacros b/include/buildmacros +--- a/include/buildmacros 2013-05-19 07:07:22.000000000 +0200 ++++ b/include/buildmacros 2016-10-24 08:51:19.334082460 +0200 +@@ -97,7 +97,8 @@ + + INSTALL_LTLIB_STATIC = \ + cd $(TOPDIR)/$(LIBNAME)/.libs; \ +- ../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); ++ ../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \ ++ ../$(INSTALL) -m 644 $(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; + + INSTALL_MAN = \ + @for d in $(MAN_PAGES); do \ diff --git a/libattr/patches/fix-headers.diff b/libattr/patches/fix-headers.diff @@ -0,0 +1,54 @@ +--- attr-2.4.47/include/xattr.h ++++ attr-2.4.47/include/xattr.h +@@ -31,33 +31,37 @@ + #define XATTR_REPLACE 0x2 /* set value, fail if attr does not exist */ + + +-__BEGIN_DECLS ++#ifdef __cplusplus ++extern "C" { ++#endif + + extern int setxattr (const char *__path, const char *__name, +- const void *__value, size_t __size, int __flags) __THROW; ++ const void *__value, size_t __size, int __flags); + extern int lsetxattr (const char *__path, const char *__name, +- const void *__value, size_t __size, int __flags) __THROW; ++ const void *__value, size_t __size, int __flags); + extern int fsetxattr (int __filedes, const char *__name, +- const void *__value, size_t __size, int __flags) __THROW; ++ const void *__value, size_t __size, int __flags); + + extern ssize_t getxattr (const char *__path, const char *__name, +- void *__value, size_t __size) __THROW; ++ void *__value, size_t __size); + extern ssize_t lgetxattr (const char *__path, const char *__name, +- void *__value, size_t __size) __THROW; ++ void *__value, size_t __size); + extern ssize_t fgetxattr (int __filedes, const char *__name, +- void *__value, size_t __size) __THROW; ++ void *__value, size_t __size); + + extern ssize_t listxattr (const char *__path, char *__list, +- size_t __size) __THROW; ++ size_t __size); + extern ssize_t llistxattr (const char *__path, char *__list, +- size_t __size) __THROW; ++ size_t __size); + extern ssize_t flistxattr (int __filedes, char *__list, +- size_t __size) __THROW; ++ size_t __size); + +-extern int removexattr (const char *__path, const char *__name) __THROW; +-extern int lremovexattr (const char *__path, const char *__name) __THROW; +-extern int fremovexattr (int __filedes, const char *__name) __THROW; ++extern int removexattr (const char *__path, const char *__name); ++extern int lremovexattr (const char *__path, const char *__name); ++extern int fremovexattr (int __filedes, const char *__name); + +-__END_DECLS ++#ifdef __cplusplus ++} ++#endif + + #endif /* __XATTR_H__ */ diff --git a/libgmp/mkfile b/libgmp/mkfile @@ -1,5 +1,5 @@ pkg = libgmp -ver = 6.1.0 +ver = 6.1.1 url = http://gmplib.org/download/gmp/gmp-$ver.tar.xz <../default.mk diff --git a/libmpfr/mkfile b/libmpfr/mkfile @@ -1,5 +1,5 @@ pkg = libmpfr -ver = 3.1.3 +ver = 3.1.5 url = http://www.mpfr.org/mpfr-$ver/mpfr-$ver.tar.xz <../default.mk diff --git a/mk/mkfile b/mk/mkfile @@ -2,6 +2,7 @@ pkg = mk ver = 0.1 url = http://swtch.com/plan9port/unix/$pkg.tgz +<../config.mk <../default.mk CFLAGS = $CFLAGS -c -I. $LDFLAGS diff --git a/mk/patches/makefile-ldflags.diff b/mk/patches/makefile-ldflags.diff @@ -0,0 +1,10 @@ +diff -urN a/Makefile b/Makefile +--- a/Makefile 2011-01-02 21:52:48.000000000 +0100 ++++ b/Makefile 2016-10-25 11:02:27.079660855 +0200 +@@ -125,5 +125,5 @@ + .phony: all clean nuke install tgz rpm ports + + $(TARG): $(OFILES) +- $(CC) -o $(TARG) $(OFILES) -L$(PREFIX)/lib -L../libutf -L../libfmt -L../libbio -L../libregexp -lregexp9 -lbio -lfmt -lutf ++ $(CC) -o $(TARG) $(OFILES) $(LDFLAGS) -L$(PREFIX)/lib -L../libutf -L../libfmt -L../libbio -L../libregexp -lregexp9 -lbio -lfmt -lutf + diff --git a/pm/mkfile b/pm/mkfile @@ -1,5 +1,5 @@ pkg = pm -ver = 9a34970 -git = git://z3bra.org/$pkg +ver = 1.1 +url = http://dl.z3bra.org/releases/$pkg-$ver.tar.bz2 <../default.mk