From 85a2ebc1c441f3a0bd1c0b9cc364605db2e183fb Mon Sep 17 00:00:00 2001 From: Norman Feske Date: Wed, 7 May 2014 23:52:52 +0200 Subject: [PATCH] libports: migrate to new ports mechanism Issue #1082 --- .gitignore | 114 ---- .../{src/lib/sdl => include/SDL}/SDL_config.h | 0 .../sdl => include/SDL}/SDL_config_genode.h | 0 repos/libports/include/ncurses/ncurses.h | 1 + .../include/{stdcxx-genode => stdcxx}/README | 0 .../libports/include/stdcxx/bits/basic_file.h | 1 + .../include/stdcxx/bits/c++allocator.h | 1 + .../bits/c++config.h | 0 repos/libports/include/stdcxx/bits/c++io.h | 1 + .../libports/include/stdcxx/bits/c++locale.h | 1 + .../{stdcxx-genode => stdcxx}/bits/gstdint.h | 0 .../{stdcxx-genode => stdcxx}/bits/gthr.h | 0 repos/libports/include/x86emu/stdint.h | 1 + repos/libports/include/x86emu/stdio.h | 1 + repos/libports/include/x86emu/stdlib.h | 1 + repos/libports/include/x86emu/string.h | 1 + repos/libports/lib/import/import-av.inc | 3 +- repos/libports/lib/import/import-avcodec.mk | 2 +- repos/libports/lib/import/import-avutil.mk | 4 +- repos/libports/lib/import/import-curl.mk | 2 +- repos/libports/lib/import/import-expat.mk | 5 +- .../libports/lib/import/import-ffat_block.mk | 1 + repos/libports/lib/import/import-freetype.mk | 1 + repos/libports/lib/import/import-gallium.mk | 1 + repos/libports/lib/import/import-gmp.mk | 10 +- repos/libports/lib/import/import-history.mk | 1 + repos/libports/lib/import/import-icu.mk | 6 +- repos/libports/lib/import/import-jbig2dec.mk | 2 +- repos/libports/lib/import/import-jpeg.mk | 5 +- repos/libports/lib/import/import-libc.mk | 15 +- repos/libports/lib/import/import-libcrypto.mk | 2 +- repos/libports/lib/import/import-libexfat.mk | 2 +- repos/libports/lib/import/import-libext2fs.mk | 2 +- repos/libports/lib/import/import-libiconv.mk | 2 +- .../libports/lib/import/import-libntfs-3g.mk | 2 +- repos/libports/lib/import/import-libpng.mk | 3 +- repos/libports/lib/import/import-libssh.mk | 1 + repos/libports/lib/import/import-libssl.mk | 11 +- repos/libports/lib/import/import-lua.mk | 2 +- repos/libports/lib/import/import-luacxx.mk | 2 +- repos/libports/lib/import/import-lwip.mk | 3 +- repos/libports/lib/import/import-mpc.mk | 3 +- repos/libports/lib/import/import-mpfr.mk | 1 + repos/libports/lib/import/import-mupdf.mk | 3 +- repos/libports/lib/import/import-ncurses.mk | 1 + repos/libports/lib/import/import-openjpeg.mk | 2 +- repos/libports/lib/import/import-pcre.mk | 2 +- repos/libports/lib/import/import-python.mk | 1 + repos/libports/lib/import/import-qoost.mk | 1 + repos/libports/lib/import/import-qt5.inc | 3 +- repos/libports/lib/import/import-readline.mk | 1 + repos/libports/lib/import/import-sdl.mk | 5 +- repos/libports/lib/import/import-sdl_image.mk | 1 + repos/libports/lib/import/import-sdl_mixer.mk | 1 + repos/libports/lib/import/import-sdl_net.mk | 2 + repos/libports/lib/import/import-sdl_ttf.mk | 1 + repos/libports/lib/import/import-stdcxx.mk | 17 +- repos/libports/lib/import/import-x86emu.mk | 1 + repos/libports/lib/import/import-zlib.mk | 2 +- repos/libports/lib/mk/arm/gmp-mpn.mk | 9 +- repos/libports/lib/mk/arm/libc-gen.mk | 4 +- repos/libports/lib/mk/arm/libc-setjmp.mk | 2 +- repos/libports/lib/mk/avcodec.inc | 7 +- repos/libports/lib/mk/avfilter.mk | 2 +- repos/libports/lib/mk/avformat.mk | 2 +- repos/libports/lib/mk/avutil.inc | 2 +- repos/libports/lib/mk/curl.mk | 6 +- repos/libports/lib/mk/expat.mk | 4 +- repos/libports/lib/mk/ffat_block.mk | 10 +- repos/libports/lib/mk/freetype.mk | 8 +- repos/libports/lib/mk/fribidi.mk | 8 +- repos/libports/lib/mk/gallium-egl.mk | 14 +- repos/libports/lib/mk/gallium-i915.mk | 2 +- repos/libports/lib/mk/gallium.inc | 18 +- repos/libports/lib/mk/gmp.inc | 8 +- repos/libports/lib/mk/history.mk | 8 +- repos/libports/lib/mk/icu.mk | 2 +- repos/libports/lib/mk/jbig2dec.mk | 3 +- repos/libports/lib/mk/jpeg.mk | 2 +- repos/libports/lib/mk/libc-common.inc | 15 +- repos/libports/lib/mk/libc-compat.mk | 2 +- repos/libports/lib/mk/libc-gdtoa.mk | 4 +- repos/libports/lib/mk/libc-gen.inc | 2 +- repos/libports/lib/mk/libc-inet.mk | 2 +- repos/libports/lib/mk/libc-isc.mk | 4 +- repos/libports/lib/mk/libc-locale.mk | 2 +- repos/libports/lib/mk/libc-nameser.mk | 2 +- repos/libports/lib/mk/libc-net.mk | 5 +- repos/libports/lib/mk/libc-regex.mk | 2 +- repos/libports/lib/mk/libc-resolv.mk | 2 +- repos/libports/lib/mk/libc-rpc.mk | 3 +- repos/libports/lib/mk/libc-stdio.mk | 2 +- repos/libports/lib/mk/libc-stdlib.mk | 2 +- repos/libports/lib/mk/libc-stdtime.mk | 2 +- repos/libports/lib/mk/libc-string.mk | 2 +- repos/libports/lib/mk/libc.mk | 2 +- repos/libports/lib/mk/libc_ffat.mk | 10 +- repos/libports/lib/mk/libc_fuse_exfat.mk | 3 +- repos/libports/lib/mk/libc_fuse_ext2.mk | 7 +- repos/libports/lib/mk/libc_fuse_ntfs-3g.mk | 7 +- repos/libports/lib/mk/libcrypto.mk | 8 +- repos/libports/lib/mk/libdrm.mk | 2 +- repos/libports/lib/mk/libexfat.mk | 3 +- repos/libports/lib/mk/libext2fs.mk | 11 +- repos/libports/lib/mk/libiconv.mk | 20 +- repos/libports/lib/mk/libm.mk | 8 +- repos/libports/lib/mk/libntfs-3g.mk | 7 +- repos/libports/lib/mk/libpng.mk | 7 +- repos/libports/lib/mk/libssh.mk | 8 +- repos/libports/lib/mk/libssl.mk | 14 +- repos/libports/lib/mk/libutil.mk | 2 +- repos/libports/lib/mk/lua.inc | 3 +- repos/libports/lib/mk/lwip.mk | 6 +- repos/libports/lib/mk/mesa-egl.mk | 4 +- repos/libports/lib/mk/mesa.inc | 18 +- repos/libports/lib/mk/mesa.mk | 6 +- repos/libports/lib/mk/mesa_host_tools.mk | 21 + repos/libports/lib/mk/mpc.mk | 8 +- repos/libports/lib/mk/mpfr.mk | 12 +- repos/libports/lib/mk/mupdf.mk | 41 +- repos/libports/lib/mk/mupdf_host_tools.mk | 15 + repos/libports/lib/mk/ncurses.mk | 10 +- repos/libports/lib/mk/openjpeg.mk | 2 +- repos/libports/lib/mk/pcre.mk | 11 +- repos/libports/lib/mk/python.inc | 8 +- repos/libports/lib/mk/qoost.mk | 1 + .../lib/mk/qt5_qnitpickerviewwidget.mk | 2 +- repos/libports/lib/mk/qt5_qpa_nitpicker.mk | 2 +- repos/libports/lib/mk/readline.mk | 8 +- repos/libports/lib/mk/sdl.mk | 8 +- repos/libports/lib/mk/sdl_image.mk | 7 +- repos/libports/lib/mk/sdl_mixer.mk | 6 +- repos/libports/lib/mk/sdl_net.mk | 10 +- repos/libports/lib/mk/sdl_ttf.mk | 4 +- repos/libports/lib/mk/stdcxx.mk | 13 +- repos/libports/lib/mk/swscale.mk | 2 +- repos/libports/lib/mk/x86_32/gmp-mpn.mk | 1 - repos/libports/lib/mk/x86_32/libc-gen.mk | 2 +- repos/libports/lib/mk/x86_32/libc-setjmp.mk | 2 +- repos/libports/lib/mk/x86_64/gmp-mpn.mk | 14 +- repos/libports/lib/mk/x86_64/libc-gen.mk | 2 +- repos/libports/lib/mk/x86_64/libc-setjmp.mk | 2 +- repos/libports/lib/mk/x86emu.mk | 3 +- repos/libports/lib/mk/zlib.mk | 3 +- repos/libports/ports/curl.hash | 1 + repos/libports/ports/curl.inc | 2 - repos/libports/ports/curl.mk | 46 -- repos/libports/ports/curl.port | 27 + repos/libports/ports/exfat.hash | 1 + repos/libports/ports/exfat.inc | 2 - repos/libports/ports/exfat.mk | 35 - repos/libports/ports/exfat.port | 12 + repos/libports/ports/expat.hash | 1 + repos/libports/ports/expat.mk | 25 - repos/libports/ports/expat.port | 10 + repos/libports/ports/ffat.hash | 1 + repos/libports/ports/ffat.mk | 48 -- repos/libports/ports/ffat.port | 18 + repos/libports/ports/freetype.hash | 1 + repos/libports/ports/freetype.mk | 43 -- repos/libports/ports/freetype.port | 17 + repos/libports/ports/fribidi.hash | 1 + repos/libports/ports/fribidi.inc | 2 - repos/libports/ports/fribidi.mk | 58 -- repos/libports/ports/fribidi.port | 12 + repos/libports/ports/fuse-ext2.hash | 1 + repos/libports/ports/fuse-ext2.inc | 4 - repos/libports/ports/fuse-ext2.mk | 36 -- repos/libports/ports/fuse-ext2.port | 16 + repos/libports/ports/gmp.hash | 1 + repos/libports/ports/gmp.mk | 101 --- repos/libports/ports/gmp.port | 17 + repos/libports/ports/icu.hash | 1 + repos/libports/ports/icu.mk | 36 -- repos/libports/ports/icu.port | 11 + repos/libports/ports/jbig2dec.hash | 1 + repos/libports/ports/jbig2dec.mk | 40 -- repos/libports/ports/jbig2dec.port | 10 + repos/libports/ports/jpeg.hash | 1 + repos/libports/ports/jpeg.mk | 24 - repos/libports/ports/jpeg.port | 10 + repos/libports/ports/libav.hash | 1 + repos/libports/ports/libav.mk | 52 -- repos/libports/ports/libav.port | 18 + repos/libports/ports/libc.hash | 1 + repos/libports/ports/libc.mk | 602 ------------------ repos/libports/ports/libc.port | 234 +++++++ repos/libports/ports/libdrm.hash | 1 + repos/libports/ports/libdrm.mk | 27 - repos/libports/ports/libdrm.port | 7 + repos/libports/ports/libiconv.hash | 1 + repos/libports/ports/libiconv.inc | 2 - repos/libports/ports/libiconv.mk | 43 -- repos/libports/ports/libiconv.port | 29 + repos/libports/ports/libpng.hash | 1 + repos/libports/ports/libpng.mk | 32 - repos/libports/ports/libpng.port | 10 + repos/libports/ports/libssh.hash | 1 + repos/libports/ports/libssh.inc | 2 - repos/libports/ports/libssh.mk | 49 -- repos/libports/ports/libssh.port | 11 + repos/libports/ports/lua.hash | 1 + repos/libports/ports/lua.mk | 39 -- repos/libports/ports/lua.port | 11 + repos/libports/ports/lwip.hash | 1 + repos/libports/ports/lwip.inc | 2 - repos/libports/ports/lwip.mk | 54 -- repos/libports/ports/lwip.port | 27 + repos/libports/ports/mesa.hash | 1 + repos/libports/ports/mesa.mk | 49 -- repos/libports/ports/mesa.port | 12 + repos/libports/ports/mpc.hash | 1 + repos/libports/ports/mpc.mk | 46 -- repos/libports/ports/mpc.port | 12 + repos/libports/ports/mpfr.hash | 1 + repos/libports/ports/mpfr.mk | 47 -- repos/libports/ports/mpfr.port | 19 + repos/libports/ports/mupdf.hash | 1 + repos/libports/ports/mupdf.mk | 98 --- repos/libports/ports/mupdf.port | 17 + repos/libports/ports/ncurses.hash | 1 + repos/libports/ports/ncurses.mk | 205 ------ repos/libports/ports/ncurses.port | 173 +++++ repos/libports/ports/ntfs-3g.hash | 1 + repos/libports/ports/ntfs-3g.inc | 2 - repos/libports/ports/ntfs-3g.mk | 36 -- repos/libports/ports/ntfs-3g.port | 13 + repos/libports/ports/openjpeg.hash | 1 + repos/libports/ports/openjpeg.mk | 29 - repos/libports/ports/openjpeg.port | 10 + repos/libports/ports/openssl.hash | 1 + repos/libports/ports/openssl.mk | 70 -- repos/libports/ports/openssl.port | 39 ++ repos/libports/ports/pcre.hash | 1 + repos/libports/ports/pcre.inc | 2 - repos/libports/ports/pcre.mk | 42 -- repos/libports/ports/pcre.port | 26 + repos/libports/ports/python.hash | 1 + repos/libports/ports/python.mk | 49 -- repos/libports/ports/python.port | 14 + repos/libports/ports/qoost.hash | 1 + repos/libports/ports/qoost.mk | 31 - repos/libports/ports/qoost.port | 10 + repos/libports/ports/readline.hash | 1 + repos/libports/ports/readline.mk | 42 -- repos/libports/ports/readline.port | 13 + repos/libports/ports/sdl.hash | 1 + repos/libports/ports/sdl.inc | 2 - repos/libports/ports/sdl.mk | 60 -- repos/libports/ports/sdl.port | 19 + repos/libports/ports/sdl_image.hash | 1 + repos/libports/ports/sdl_image.inc | 2 - repos/libports/ports/sdl_image.mk | 40 -- repos/libports/ports/sdl_image.port | 10 + repos/libports/ports/sdl_mixer.hash | 1 + repos/libports/ports/sdl_mixer.inc | 2 - repos/libports/ports/sdl_mixer.mk | 38 -- repos/libports/ports/sdl_mixer.port | 10 + repos/libports/ports/sdl_net.hash | 1 + repos/libports/ports/sdl_net.inc | 2 - repos/libports/ports/sdl_net.mk | 42 -- repos/libports/ports/sdl_net.port | 12 + repos/libports/ports/sdl_ttf.hash | 1 + repos/libports/ports/sdl_ttf.inc | 2 - repos/libports/ports/sdl_ttf.mk | 40 -- repos/libports/ports/sdl_ttf.port | 10 + repos/libports/ports/stdcxx.hash | 1 + repos/libports/ports/stdcxx.inc | 2 - repos/libports/ports/stdcxx.mk | 114 ---- repos/libports/ports/stdcxx.port | 45 ++ repos/libports/ports/x86emu.hash | 1 + repos/libports/ports/x86emu.mk | 62 -- repos/libports/ports/x86emu.port | 22 + repos/libports/ports/zlib.hash | 1 + repos/libports/ports/zlib.mk | 38 -- repos/libports/ports/zlib.port | 10 + repos/libports/src/app/avplay/avplay.patch | 4 +- repos/libports/src/app/avplay/target.mk | 7 +- repos/libports/src/app/avplay/version.h | 0 repos/libports/src/app/mupdf/target.mk | 12 +- .../libports/src/app/qt5/qt_avplay/target.mk | 2 +- repos/libports/src/lib/curl/configure.patch | 3 +- repos/libports/src/lib/curl/curl_h.patch | 3 +- repos/libports/src/lib/exfat/main.c.patch | 4 +- repos/libports/src/lib/ffat/config.patch | 4 +- .../src/lib/fuse-ext2/patches/bitops.h.patch | 3 +- .../src/lib/fuse-ext2/patches/closefs.c.patch | 3 +- .../src/lib/fuse-ext2/patches/com_err.c.patch | 3 +- .../fuse-ext2/patches/error_message.c.patch | 3 +- .../src/lib/fuse-ext2/patches/ext2fs.h.patch | 3 +- .../lib/fuse-ext2/patches/fuse-ext2.c.patch | 3 +- .../lib/fuse-ext2/patches/fuse-ext2.h.patch | 3 +- .../fuse-ext2/patches/gen_bitmap64.c.patch | 3 +- .../src/lib/fuse-ext2/patches/icount.c.patch | 3 +- .../src/lib/fuse-ext2/patches/init_et.c.patch | 3 +- .../lib/fuse-ext2/patches/op_access.c.patch | 3 +- .../lib/fuse-ext2/patches/op_statfs.c.patch | 3 +- .../src/lib/fuse-ext2/patches/res_gdt.c.patch | 3 +- .../lib/fuse-ext2/patches/rw_bitmaps.c.patch | 3 +- .../src/lib/fuse-ext2/patches/tdb.c.patch | 3 +- .../src/lib/fuse-ext2/patches/test_io.c.patch | 3 +- .../src/lib/fuse-ext2/patches/unix_io.c.patch | 3 +- .../src/lib/libc/patches/getaddrinfo_c.patch | 3 +- .../libports/src/lib/libc/patches/log2.patch | 4 +- .../src/lib/libc/patches/malloc_c.patch | 3 +- .../src/lib/libc/patches/math_private.patch | 3 +- .../libports/src/lib/libc/patches/nis_x.patch | 3 +- .../src/lib/libc/patches/pthread_cancel.patch | 3 +- .../patches/pthread_not_implemented.patch | 8 +- .../src/lib/libc/patches/res_send_c.patch | 9 +- .../lib/libc/patches/vfwprintf_c_warn.patch | 3 +- repos/libports/src/lib/libiconv/iconv.h | 248 -------- repos/libports/src/lib/lwip/errno.patch | 3 +- .../src/lib/lwip/libc_select_notify.patch | 3 +- .../src/lib/lwip/sockets_c_errno.patch | 3 +- .../src/lib/lwip/sol_socket_definition.patch | 3 +- .../libports/src/lib/ntfs-3g/ntfs-3g.c.patch | 3 +- repos/libports/src/lib/pcre/include/pcre.h | 503 --------------- .../libports/src/lib/python/posixmodule.patch | 4 +- repos/libports/src/lib/sdl/SDL_audio.patch | 8 +- repos/libports/src/lib/sdl/SDL_video.patch | 6 +- .../libports/src/lib/sdl_net/SDL_net.h.patch | 3 +- repos/libports/src/lib/sdl_net/SDLnet.patch | 3 +- .../src/server/fuse_fs/exfat/target.mk | 5 +- .../src/server/fuse_fs/ext2/target.mk | 3 +- .../src/server/fuse_fs/ntfs-3g/target.mk | 14 +- .../src/test/qt5/qpluginwidget/target.mk | 2 +- repos/libports/tool/mesa/Makefile | 18 - repos/ports/lib/mk/seoul_libc_support.mk | 2 +- .../ports/lib/mk/virtualbox_libc_support.inc | 14 +- .../lib/mk/x86_32/virtualbox_libc_support.mk | 2 +- .../lib/mk/x86_64/virtualbox_libc_support.mk | 2 +- tool/prepare.mk | 24 +- 333 files changed, 1535 insertions(+), 3923 deletions(-) rename repos/libports/{src/lib/sdl => include/SDL}/SDL_config.h (100%) rename repos/libports/{src/lib/sdl => include/SDL}/SDL_config_genode.h (100%) create mode 100644 repos/libports/include/ncurses/ncurses.h rename repos/libports/include/{stdcxx-genode => stdcxx}/README (100%) create mode 100644 repos/libports/include/stdcxx/bits/basic_file.h create mode 100644 repos/libports/include/stdcxx/bits/c++allocator.h rename repos/libports/include/{stdcxx-genode => stdcxx}/bits/c++config.h (100%) create mode 100644 repos/libports/include/stdcxx/bits/c++io.h create mode 100644 repos/libports/include/stdcxx/bits/c++locale.h rename repos/libports/include/{stdcxx-genode => stdcxx}/bits/gstdint.h (100%) rename repos/libports/include/{stdcxx-genode => stdcxx}/bits/gthr.h (100%) create mode 100644 repos/libports/include/x86emu/stdint.h create mode 100644 repos/libports/include/x86emu/stdio.h create mode 100644 repos/libports/include/x86emu/stdlib.h create mode 100644 repos/libports/include/x86emu/string.h create mode 100644 repos/libports/lib/import/import-ffat_block.mk create mode 100644 repos/libports/lib/import/import-freetype.mk create mode 100644 repos/libports/lib/import/import-gallium.mk create mode 100644 repos/libports/lib/import/import-history.mk create mode 100644 repos/libports/lib/import/import-qoost.mk create mode 100644 repos/libports/lib/import/import-readline.mk create mode 100644 repos/libports/lib/import/import-sdl_image.mk create mode 100644 repos/libports/lib/import/import-sdl_mixer.mk create mode 100644 repos/libports/lib/import/import-sdl_net.mk create mode 100644 repos/libports/lib/import/import-sdl_ttf.mk create mode 100644 repos/libports/lib/import/import-x86emu.mk create mode 100644 repos/libports/lib/mk/mesa_host_tools.mk create mode 100644 repos/libports/lib/mk/mupdf_host_tools.mk create mode 100644 repos/libports/lib/mk/qoost.mk create mode 100644 repos/libports/ports/curl.hash delete mode 100644 repos/libports/ports/curl.inc delete mode 100644 repos/libports/ports/curl.mk create mode 100644 repos/libports/ports/curl.port create mode 100644 repos/libports/ports/exfat.hash delete mode 100644 repos/libports/ports/exfat.inc delete mode 100644 repos/libports/ports/exfat.mk create mode 100644 repos/libports/ports/exfat.port create mode 100644 repos/libports/ports/expat.hash delete mode 100644 repos/libports/ports/expat.mk create mode 100644 repos/libports/ports/expat.port create mode 100644 repos/libports/ports/ffat.hash delete mode 100644 repos/libports/ports/ffat.mk create mode 100644 repos/libports/ports/ffat.port create mode 100644 repos/libports/ports/freetype.hash delete mode 100644 repos/libports/ports/freetype.mk create mode 100644 repos/libports/ports/freetype.port create mode 100644 repos/libports/ports/fribidi.hash delete mode 100644 repos/libports/ports/fribidi.inc delete mode 100644 repos/libports/ports/fribidi.mk create mode 100644 repos/libports/ports/fribidi.port create mode 100644 repos/libports/ports/fuse-ext2.hash delete mode 100644 repos/libports/ports/fuse-ext2.inc delete mode 100644 repos/libports/ports/fuse-ext2.mk create mode 100644 repos/libports/ports/fuse-ext2.port create mode 100644 repos/libports/ports/gmp.hash delete mode 100644 repos/libports/ports/gmp.mk create mode 100644 repos/libports/ports/gmp.port create mode 100644 repos/libports/ports/icu.hash delete mode 100644 repos/libports/ports/icu.mk create mode 100644 repos/libports/ports/icu.port create mode 100644 repos/libports/ports/jbig2dec.hash delete mode 100644 repos/libports/ports/jbig2dec.mk create mode 100644 repos/libports/ports/jbig2dec.port create mode 100644 repos/libports/ports/jpeg.hash delete mode 100644 repos/libports/ports/jpeg.mk create mode 100644 repos/libports/ports/jpeg.port create mode 100644 repos/libports/ports/libav.hash delete mode 100644 repos/libports/ports/libav.mk create mode 100644 repos/libports/ports/libav.port create mode 100644 repos/libports/ports/libc.hash delete mode 100644 repos/libports/ports/libc.mk create mode 100644 repos/libports/ports/libc.port create mode 100644 repos/libports/ports/libdrm.hash delete mode 100644 repos/libports/ports/libdrm.mk create mode 100644 repos/libports/ports/libdrm.port create mode 100644 repos/libports/ports/libiconv.hash delete mode 100644 repos/libports/ports/libiconv.inc delete mode 100644 repos/libports/ports/libiconv.mk create mode 100644 repos/libports/ports/libiconv.port create mode 100644 repos/libports/ports/libpng.hash delete mode 100644 repos/libports/ports/libpng.mk create mode 100644 repos/libports/ports/libpng.port create mode 100644 repos/libports/ports/libssh.hash delete mode 100644 repos/libports/ports/libssh.inc delete mode 100644 repos/libports/ports/libssh.mk create mode 100644 repos/libports/ports/libssh.port create mode 100644 repos/libports/ports/lua.hash delete mode 100644 repos/libports/ports/lua.mk create mode 100644 repos/libports/ports/lua.port create mode 100644 repos/libports/ports/lwip.hash delete mode 100644 repos/libports/ports/lwip.inc delete mode 100644 repos/libports/ports/lwip.mk create mode 100644 repos/libports/ports/lwip.port create mode 100644 repos/libports/ports/mesa.hash delete mode 100644 repos/libports/ports/mesa.mk create mode 100644 repos/libports/ports/mesa.port create mode 100644 repos/libports/ports/mpc.hash delete mode 100644 repos/libports/ports/mpc.mk create mode 100644 repos/libports/ports/mpc.port create mode 100644 repos/libports/ports/mpfr.hash delete mode 100644 repos/libports/ports/mpfr.mk create mode 100644 repos/libports/ports/mpfr.port create mode 100644 repos/libports/ports/mupdf.hash delete mode 100644 repos/libports/ports/mupdf.mk create mode 100644 repos/libports/ports/mupdf.port create mode 100644 repos/libports/ports/ncurses.hash delete mode 100644 repos/libports/ports/ncurses.mk create mode 100644 repos/libports/ports/ncurses.port create mode 100644 repos/libports/ports/ntfs-3g.hash delete mode 100644 repos/libports/ports/ntfs-3g.inc delete mode 100644 repos/libports/ports/ntfs-3g.mk create mode 100644 repos/libports/ports/ntfs-3g.port create mode 100644 repos/libports/ports/openjpeg.hash delete mode 100644 repos/libports/ports/openjpeg.mk create mode 100644 repos/libports/ports/openjpeg.port create mode 100644 repos/libports/ports/openssl.hash delete mode 100644 repos/libports/ports/openssl.mk create mode 100644 repos/libports/ports/openssl.port create mode 100644 repos/libports/ports/pcre.hash delete mode 100644 repos/libports/ports/pcre.inc delete mode 100644 repos/libports/ports/pcre.mk create mode 100644 repos/libports/ports/pcre.port create mode 100644 repos/libports/ports/python.hash delete mode 100644 repos/libports/ports/python.mk create mode 100644 repos/libports/ports/python.port create mode 100644 repos/libports/ports/qoost.hash delete mode 100644 repos/libports/ports/qoost.mk create mode 100644 repos/libports/ports/qoost.port create mode 100644 repos/libports/ports/readline.hash delete mode 100644 repos/libports/ports/readline.mk create mode 100644 repos/libports/ports/readline.port create mode 100644 repos/libports/ports/sdl.hash delete mode 100644 repos/libports/ports/sdl.inc delete mode 100644 repos/libports/ports/sdl.mk create mode 100644 repos/libports/ports/sdl.port create mode 100644 repos/libports/ports/sdl_image.hash delete mode 100644 repos/libports/ports/sdl_image.inc delete mode 100644 repos/libports/ports/sdl_image.mk create mode 100644 repos/libports/ports/sdl_image.port create mode 100644 repos/libports/ports/sdl_mixer.hash delete mode 100644 repos/libports/ports/sdl_mixer.inc delete mode 100644 repos/libports/ports/sdl_mixer.mk create mode 100644 repos/libports/ports/sdl_mixer.port create mode 100644 repos/libports/ports/sdl_net.hash delete mode 100644 repos/libports/ports/sdl_net.inc delete mode 100644 repos/libports/ports/sdl_net.mk create mode 100644 repos/libports/ports/sdl_net.port create mode 100644 repos/libports/ports/sdl_ttf.hash delete mode 100644 repos/libports/ports/sdl_ttf.inc delete mode 100644 repos/libports/ports/sdl_ttf.mk create mode 100644 repos/libports/ports/sdl_ttf.port create mode 100644 repos/libports/ports/stdcxx.hash delete mode 100644 repos/libports/ports/stdcxx.inc delete mode 100644 repos/libports/ports/stdcxx.mk create mode 100644 repos/libports/ports/stdcxx.port create mode 100644 repos/libports/ports/x86emu.hash delete mode 100644 repos/libports/ports/x86emu.mk create mode 100644 repos/libports/ports/x86emu.port create mode 100644 repos/libports/ports/zlib.hash delete mode 100644 repos/libports/ports/zlib.mk create mode 100644 repos/libports/ports/zlib.port create mode 100644 repos/libports/src/app/avplay/version.h delete mode 100644 repos/libports/src/lib/libiconv/iconv.h delete mode 100644 repos/libports/src/lib/pcre/include/pcre.h delete mode 100644 repos/libports/tool/mesa/Makefile diff --git a/.gitignore b/.gitignore index 9f346504df..fc13b6194b 100644 --- a/.gitignore +++ b/.gitignore @@ -23,123 +23,9 @@ /repos/dde_rump/include/rump /repos/libports/contrib /repos/libports/download -/repos/libports/include/curl/ -/repos/libports/include/EGL/egl.h -/repos/libports/include/EGL/eglext.h -/repos/libports/include/GL -/repos/libports/include/KHR -/repos/libports/include/SDL -/repos/libports/include/exfat -/repos/libports/include/ffat -/repos/libports/include/fribidi -/repos/libports/include/freetype -/repos/libports/include/ft2build.h -/repos/libports/include/fuse-ext2 -/repos/libports/include/iconv/ -/repos/libports/include/icu/ -/repos/libports/include/jbig2dec -/repos/libports/include/libc-amd64/ -/repos/libports/include/libc-arm/ -/repos/libports/include/libc-i386/ -/repos/libports/include/libc/ -/repos/libports/include/libpng -/repos/libports/include/libssh/ -/repos/libports/include/lua -/repos/libports/include/lwip/lwip -/repos/libports/include/lwip/netif -/repos/libports/include/mupdf -/repos/libports/include/ncurses/MKterm.h.awk -/repos/libports/include/ncurses/capdefaults.c -/repos/libports/include/ncurses/curses.h -/repos/libports/include/ncurses/ncurses.h -/repos/libports/include/ncurses/hashed_db.h -/repos/libports/include/ncurses/hashsize.h -/repos/libports/include/ncurses/init_keytry.h -/repos/libports/include/ncurses/keys.list -/repos/libports/include/ncurses/nc_alloc.h -/repos/libports/include/ncurses/nc_panel.h -/repos/libports/include/ncurses/nc_tparm.h -/repos/libports/include/ncurses/ncurses_def.h -/repos/libports/include/ncurses/ncurses_dll.h -/repos/libports/include/ncurses/parametrized.h -/repos/libports/include/ncurses/term.h -/repos/libports/include/ncurses/term_entry.h -/repos/libports/include/ncurses/termcap.h -/repos/libports/include/ncurses/tic.h -/repos/libports/include/ncurses/unctrl.h -/repos/libports/include/openjpeg -/repos/libports/include/openssl -/repos/libports/src/lib/openssl/x86_32/aes_enc.s -/repos/libports/src/lib/openssl/x86_32/cpuid.s -/repos/libports/src/lib/openssl/x86_64/aes_enc.s -/repos/libports/src/lib/openssl/x86_64/cpuid.s -/repos/libports/src/lib/openssl/x86_64/modexp512.s -/repos/libports/src/lib/openssl/x86_64/rc4_md5.s -/repos/libports/include/pcre -/repos/libports/include/python2.6 -/repos/libports/include/qoost -/repos/libports/include/readline/keymaps.h -/repos/libports/include/readline/rlstdc.h -/repos/libports/include/readline/rltypedefs.h -/repos/libports/include/readline/tilde.h -/repos/libports/include/stdcxx -/repos/libports/include/zlib -/repos/libports/include/gmp/gmp-impl.h -/repos/libports/include/gmp/arm/gmp-mparam.h -/repos/libports/include/gmp/x86_32/gmp-mparam.h -/repos/libports/include/gmp/x86_64/gmp-mparam.h -/repos/libports/include/mpc/ -/repos/libports/include/mpfr/ -/repos/libports/include/stdcxx-genode/bits/atomic_lockfree_defines.h -/repos/libports/include/stdcxx-genode/bits/atomic_word.h -/repos/libports/include/stdcxx-genode/bits/basic_file.h -/repos/libports/include/stdcxx-genode/bits/c++allocator.h -/repos/libports/include/stdcxx-genode/bits/c++io.h -/repos/libports/include/stdcxx-genode/bits/c++locale.h -/repos/libports/include/stdcxx-genode/bits/cpu_defines.h -/repos/libports/include/stdcxx-genode/bits/cxxabi_tweaks.h -/repos/libports/include/stdcxx-genode/bits/ctype_base.h -/repos/libports/include/stdcxx-genode/bits/ctype_inline.h -/repos/libports/include/stdcxx-genode/bits/cxxabi_forced.h -/repos/libports/include/stdcxx-genode/bits/error_constants.h -/repos/libports/include/stdcxx-genode/bits/exception_defines.h -/repos/libports/include/stdcxx-genode/bits/hash_bytes.h -/repos/libports/include/stdcxx-genode/bits/messages_members.h -/repos/libports/include/stdcxx-genode/bits/os_defines.h -/repos/libports/include/stdcxx-genode/bits/time_members.h -/repos/libports/include/stdcxx-genode/bits/exception_ptr.h -/repos/libports/include/stdcxx-genode/bits/nested_exception.h -/repos/libports/include/stdcxx-genode/exception -/repos/libports/include/stdcxx-genode/new -/repos/libports/include/stdcxx-genode/typeinfo -/repos/libports/include/stdcxx-genode/initializer_list -/repos/libports/include/x86emu/stdint.h -/repos/libports/include/x86emu/stdio.h -/repos/libports/include/x86emu/stdlib.h -/repos/libports/include/x86emu/string.h -/repos/libports/include/x86emu/x86emu.h -/repos/libports/include/x86emu/x86emu/ -/repos/libports/src/lib/gmp/mpn/asm-defs.m4 -/repos/libports/src/lib/gmp/mpn/arm/hamdist.c -/repos/libports/src/lib/gmp/mpn/arm/popcount.c -/repos/libports/src/lib/gmp/mpn/x86_32/add_n.asm -/repos/libports/src/lib/gmp/mpn/x86_32/sub_n.asm -/repos/libports/src/lib/gmp/mpn/x86_64/add_n.asm -/repos/libports/src/lib/gmp/mpn/x86_64/hamdist.asm -/repos/libports/src/lib/gmp/mpn/x86_64/popcount.asm -/repos/libports/src/lib/gmp/mpn/x86_64/sub_n.asm -/repos/libports/src/lib/ncurses/codes.c -/repos/libports/src/lib/ncurses/comp_captab.c -/repos/libports/src/lib/ncurses/fallback.c -/repos/libports/src/lib/ncurses/make_hash -/repos/libports/src/lib/ncurses/make_keys -/repos/libports/src/lib/ncurses/names.c -/repos/libports/src/lib/ncurses/unctrl.c /repos/libports/src/lib/qt5/qtjsbackend /repos/libports/src/lib/qt5/qtwebkit/Source/JavaScriptCore /repos/libports/src/lib/qt5/qtwebkit/Source/WebCore/generated -/repos/libports/tool/mesa/glsl -/repos/libports/tool/mupdf /repos/libports/tool/qt5/bootstrap /repos/libports/tool/qt5/misc/var /repos/libports/tool/qt5/moc diff --git a/repos/libports/src/lib/sdl/SDL_config.h b/repos/libports/include/SDL/SDL_config.h similarity index 100% rename from repos/libports/src/lib/sdl/SDL_config.h rename to repos/libports/include/SDL/SDL_config.h diff --git a/repos/libports/src/lib/sdl/SDL_config_genode.h b/repos/libports/include/SDL/SDL_config_genode.h similarity index 100% rename from repos/libports/src/lib/sdl/SDL_config_genode.h rename to repos/libports/include/SDL/SDL_config_genode.h diff --git a/repos/libports/include/ncurses/ncurses.h b/repos/libports/include/ncurses/ncurses.h new file mode 100644 index 0000000000..2e7d131f7c --- /dev/null +++ b/repos/libports/include/ncurses/ncurses.h @@ -0,0 +1 @@ +#include diff --git a/repos/libports/include/stdcxx-genode/README b/repos/libports/include/stdcxx/README similarity index 100% rename from repos/libports/include/stdcxx-genode/README rename to repos/libports/include/stdcxx/README diff --git a/repos/libports/include/stdcxx/bits/basic_file.h b/repos/libports/include/stdcxx/bits/basic_file.h new file mode 100644 index 0000000000..6c8b4d1b72 --- /dev/null +++ b/repos/libports/include/stdcxx/bits/basic_file.h @@ -0,0 +1 @@ +#include diff --git a/repos/libports/include/stdcxx/bits/c++allocator.h b/repos/libports/include/stdcxx/bits/c++allocator.h new file mode 100644 index 0000000000..af7a845e9a --- /dev/null +++ b/repos/libports/include/stdcxx/bits/c++allocator.h @@ -0,0 +1 @@ +#include diff --git a/repos/libports/include/stdcxx-genode/bits/c++config.h b/repos/libports/include/stdcxx/bits/c++config.h similarity index 100% rename from repos/libports/include/stdcxx-genode/bits/c++config.h rename to repos/libports/include/stdcxx/bits/c++config.h diff --git a/repos/libports/include/stdcxx/bits/c++io.h b/repos/libports/include/stdcxx/bits/c++io.h new file mode 100644 index 0000000000..a8ee90def6 --- /dev/null +++ b/repos/libports/include/stdcxx/bits/c++io.h @@ -0,0 +1 @@ +#include diff --git a/repos/libports/include/stdcxx/bits/c++locale.h b/repos/libports/include/stdcxx/bits/c++locale.h new file mode 100644 index 0000000000..90cdc1918f --- /dev/null +++ b/repos/libports/include/stdcxx/bits/c++locale.h @@ -0,0 +1 @@ +#include diff --git a/repos/libports/include/stdcxx-genode/bits/gstdint.h b/repos/libports/include/stdcxx/bits/gstdint.h similarity index 100% rename from repos/libports/include/stdcxx-genode/bits/gstdint.h rename to repos/libports/include/stdcxx/bits/gstdint.h diff --git a/repos/libports/include/stdcxx-genode/bits/gthr.h b/repos/libports/include/stdcxx/bits/gthr.h similarity index 100% rename from repos/libports/include/stdcxx-genode/bits/gthr.h rename to repos/libports/include/stdcxx/bits/gthr.h diff --git a/repos/libports/include/x86emu/stdint.h b/repos/libports/include/x86emu/stdint.h new file mode 100644 index 0000000000..a12c43b15a --- /dev/null +++ b/repos/libports/include/x86emu/stdint.h @@ -0,0 +1 @@ +#include diff --git a/repos/libports/include/x86emu/stdio.h b/repos/libports/include/x86emu/stdio.h new file mode 100644 index 0000000000..a12c43b15a --- /dev/null +++ b/repos/libports/include/x86emu/stdio.h @@ -0,0 +1 @@ +#include diff --git a/repos/libports/include/x86emu/stdlib.h b/repos/libports/include/x86emu/stdlib.h new file mode 100644 index 0000000000..a12c43b15a --- /dev/null +++ b/repos/libports/include/x86emu/stdlib.h @@ -0,0 +1 @@ +#include diff --git a/repos/libports/include/x86emu/string.h b/repos/libports/include/x86emu/string.h new file mode 100644 index 0000000000..a12c43b15a --- /dev/null +++ b/repos/libports/include/x86emu/string.h @@ -0,0 +1 @@ +#include diff --git a/repos/libports/lib/import/import-av.inc b/repos/libports/lib/import/import-av.inc index 26d1a14577..8ddd0d8d43 100644 --- a/repos/libports/lib/import/import-av.inc +++ b/repos/libports/lib/import/import-av.inc @@ -1,2 +1 @@ -LIBAV := libav-0.8.2 -REP_INC_DIR += contrib/$(LIBAV) +INC_DIR += $(call select_from_ports,libav)/include/libav diff --git a/repos/libports/lib/import/import-avcodec.mk b/repos/libports/lib/import/import-avcodec.mk index 6f174bd81f..1406146a76 100644 --- a/repos/libports/lib/import/import-avcodec.mk +++ b/repos/libports/lib/import/import-avcodec.mk @@ -1,3 +1,3 @@ include $(call select_from_repositories,lib/import/import-av.inc) -REP_INC_DIR += contrib/$(LIBAV)/libavcodec +INC_DIR += $(call select_from_ports,libav)/include/libav/libavcodec diff --git a/repos/libports/lib/import/import-avutil.mk b/repos/libports/lib/import/import-avutil.mk index 073b8ea47f..ee4c89ac6f 100644 --- a/repos/libports/lib/import/import-avutil.mk +++ b/repos/libports/lib/import/import-avutil.mk @@ -1,4 +1,4 @@ include $(call select_from_repositories,lib/import/import-av.inc) -REP_INC_DIR += contrib/$(LIBAV)/libavutil \ - include/libavutil +REP_INC_DIR += include/libavutil +INC_DIR += $(call select_from_ports,libav)/include/libav/libavutil diff --git a/repos/libports/lib/import/import-curl.mk b/repos/libports/lib/import/import-curl.mk index ae08fb65fb..fd65a929ec 100644 --- a/repos/libports/lib/import/import-curl.mk +++ b/repos/libports/lib/import/import-curl.mk @@ -1,4 +1,4 @@ -REP_INC_DIR += include/curl +INC_DIR += $(call select_from_ports,curl)/include ifeq ($(filter-out $(SPECS),x86_32),) TARGET_CPUARCH=x86_32 diff --git a/repos/libports/lib/import/import-expat.mk b/repos/libports/lib/import/import-expat.mk index 199a14e66b..df9ebc1579 100644 --- a/repos/libports/lib/import/import-expat.mk +++ b/repos/libports/lib/import/import-expat.mk @@ -1,4 +1 @@ -EXPAT_VER = 2.1.0 -EXPAT = expat-$(EXPAT_VER) - -REP_INC_DIR += contrib/$(EXPAT)/lib +INC_DIR += $(call select_from_ports,expat)/include diff --git a/repos/libports/lib/import/import-ffat_block.mk b/repos/libports/lib/import/import-ffat_block.mk new file mode 100644 index 0000000000..5385449547 --- /dev/null +++ b/repos/libports/lib/import/import-ffat_block.mk @@ -0,0 +1 @@ +INC_DIR += $(call select_from_ports,ffat)/include diff --git a/repos/libports/lib/import/import-freetype.mk b/repos/libports/lib/import/import-freetype.mk new file mode 100644 index 0000000000..845fe1374e --- /dev/null +++ b/repos/libports/lib/import/import-freetype.mk @@ -0,0 +1 @@ +INC_DIR += $(call select_from_ports,freetype)/include diff --git a/repos/libports/lib/import/import-gallium.mk b/repos/libports/lib/import/import-gallium.mk new file mode 100644 index 0000000000..46de2e1e97 --- /dev/null +++ b/repos/libports/lib/import/import-gallium.mk @@ -0,0 +1 @@ +INC_DIR += $(call select_from_ports,mesa)/include diff --git a/repos/libports/lib/import/import-gmp.mk b/repos/libports/lib/import/import-gmp.mk index a7bf2cd01c..1d213c7b5d 100644 --- a/repos/libports/lib/import/import-gmp.mk +++ b/repos/libports/lib/import/import-gmp.mk @@ -1,16 +1,20 @@ +GMP_PORT_DIR := $(call select_from_ports,gmp) + REP_INC_DIR += include/gmp +INC_DIR += $(GMP_PORT_DIR)/include + ifeq ($(filter-out $(SPECS),arm),) REP_INC_DIR += include/gmp/32bit - REP_INC_DIR += include/gmp/arm + INC_DIR += $(GMP_PORT_DIR)/include/arm endif ifeq ($(filter-out $(SPECS),x86_32),) REP_INC_DIR += include/gmp/32bit - REP_INC_DIR += include/gmp/x86_32 + INC_DIR += $(GMP_PORT_DIR)/include/x86_32 endif ifeq ($(filter-out $(SPECS),x86_64),) REP_INC_DIR += include/gmp/64bit - REP_INC_DIR += include/gmp/x86_64 + INC_DIR += $(GMP_PORT_DIR)/include/x86_64 endif diff --git a/repos/libports/lib/import/import-history.mk b/repos/libports/lib/import/import-history.mk new file mode 100644 index 0000000000..34d520ab26 --- /dev/null +++ b/repos/libports/lib/import/import-history.mk @@ -0,0 +1 @@ +include $(call select_from_repositories,lib/import/import-readline.mk) diff --git a/repos/libports/lib/import/import-icu.mk b/repos/libports/lib/import/import-icu.mk index 46fec1a53b..19af943269 100644 --- a/repos/libports/lib/import/import-icu.mk +++ b/repos/libports/lib/import/import-icu.mk @@ -1,2 +1,4 @@ -REP_INC_DIR += include/icu/common -REP_INC_DIR += include/icu/i18n +ICU_PORT_DIR := $(call select_from_ports,icu) + +INC_DIR += $(ICU_PORT_DIR)/include/icu/common +INC_DIR += $(ICU_PORT_DIR)/include/icu/i18n diff --git a/repos/libports/lib/import/import-jbig2dec.mk b/repos/libports/lib/import/import-jbig2dec.mk index cdd042f5a9..41fe1a6b0a 100644 --- a/repos/libports/lib/import/import-jbig2dec.mk +++ b/repos/libports/lib/import/import-jbig2dec.mk @@ -1 +1 @@ -REP_INC_DIR += include/jbig2dec +INC_DIR += $(call select_from_ports,jbig2dec)/include/jbig2dec diff --git a/repos/libports/lib/import/import-jpeg.mk b/repos/libports/lib/import/import-jpeg.mk index 93a3ca5be1..06627b79fc 100644 --- a/repos/libports/lib/import/import-jpeg.mk +++ b/repos/libports/lib/import/import-jpeg.mk @@ -1,3 +1,2 @@ -JPEG = jpeg-7 -REP_INC_DIR += contrib/$(JPEG) \ - include/jpeg +INC_DIR += $(call select_from_ports,jpeg)/include/jpeg +REP_INC_DIR += include/jpeg diff --git a/repos/libports/lib/import/import-libc.mk b/repos/libports/lib/import/import-libc.mk index 8dd614f79c..eac3c43a18 100644 --- a/repos/libports/lib/import/import-libc.mk +++ b/repos/libports/lib/import/import-libc.mk @@ -1,7 +1,9 @@ +LIBC_PORT_DIR := $(call select_from_ports,libc) + # # Add generic libc headers to standard include search paths # -REP_INC_DIR += include/libc +INC_DIR += $(LIBC_PORT_DIR)/include/libc # # Genode-specific supplements to standard libc headers @@ -13,17 +15,16 @@ REP_INC_DIR += include/libc-genode # ifeq ($(filter-out $(SPECS),x86),) ifeq ($(filter-out $(SPECS),32bit),) - LIBC_REP_INC_DIR = include/libc-i386 + LIBC_ARCH_INC_DIR := $(LIBC_PORT_DIR)/include/libc-i386 endif # 32bit ifeq ($(filter-out $(SPECS),64bit),) - LIBC_REP_INC_DIR = include/libc-amd64 + LIBC_ARCH_INC_DIR := $(LIBC_PORT_DIR)/include/libc-amd64 endif # 32bit - LIBC_REP_INC_DIR += include/libc-x86 endif # x86 ifeq ($(filter-out $(SPECS),arm),) - LIBC_REP_INC_DIR = include/libc-arm + LIBC_ARCH_INC_DIR := $(LIBC_PORT_DIR)/include/libc-arm endif # ARM # @@ -31,11 +32,11 @@ endif # ARM # we have to prevent the build system from building the target. This is # done by adding an artificial requirement. # -ifeq ($(LIBC_REP_INC_DIR),) +ifeq ($(LIBC_ARCH_INC_DIR),) REQUIRES += libc_support_for_your_target_platform endif -REP_INC_DIR += $(LIBC_REP_INC_DIR) +INC_DIR += $(LIBC_ARCH_INC_DIR) # # Prevent gcc headers from defining __size_t. This definition is done in diff --git a/repos/libports/lib/import/import-libcrypto.mk b/repos/libports/lib/import/import-libcrypto.mk index d1175dc79a..1f36a2b467 100644 --- a/repos/libports/lib/import/import-libcrypto.mk +++ b/repos/libports/lib/import/import-libcrypto.mk @@ -1,4 +1,4 @@ -REP_INC_DIR += include/openssl +INC_DIR += $(call select_from_ports,openssl)/include ifeq ($(filter-out $(SPECS),x86_32),) TARGET_CPUARCH=x86_32 diff --git a/repos/libports/lib/import/import-libexfat.mk b/repos/libports/lib/import/import-libexfat.mk index b7e46c2ae0..331f6d1e68 100644 --- a/repos/libports/lib/import/import-libexfat.mk +++ b/repos/libports/lib/import/import-libexfat.mk @@ -1 +1 @@ -REP_INC_DIR += include/exfat +INC_DIR += $(call select_from_ports,exfat)/include diff --git a/repos/libports/lib/import/import-libext2fs.mk b/repos/libports/lib/import/import-libext2fs.mk index 5b4797d324..49c3fd3063 100644 --- a/repos/libports/lib/import/import-libext2fs.mk +++ b/repos/libports/lib/import/import-libext2fs.mk @@ -1 +1 @@ -REP_INC_DIR += include/fuse-ext2 +INC_DIR += $(call select_from_ports,fuse-ext2)/include/fuse-ext2 diff --git a/repos/libports/lib/import/import-libiconv.mk b/repos/libports/lib/import/import-libiconv.mk index ce2c0e469e..83db249fd1 100644 --- a/repos/libports/lib/import/import-libiconv.mk +++ b/repos/libports/lib/import/import-libiconv.mk @@ -1 +1 @@ -REP_INC_DIR += include/iconv +INC_DIR += $(call select_from_ports,libiconv)/include/iconv diff --git a/repos/libports/lib/import/import-libntfs-3g.mk b/repos/libports/lib/import/import-libntfs-3g.mk index dd4aa17b64..9aabfb9f78 100644 --- a/repos/libports/lib/import/import-libntfs-3g.mk +++ b/repos/libports/lib/import/import-libntfs-3g.mk @@ -1 +1 @@ -REP_INC_DIR += include/ntfs-3g +INC_DIR += $(call select_from_ports,ntfs-3g)/include/ntfs-3g diff --git a/repos/libports/lib/import/import-libpng.mk b/repos/libports/lib/import/import-libpng.mk index 4e78f03e43..7df959a37e 100644 --- a/repos/libports/lib/import/import-libpng.mk +++ b/repos/libports/lib/import/import-libpng.mk @@ -1 +1,2 @@ -REP_INC_DIR += include/libpng +INC_DIR += $(call select_from_repositories,include/libpng) +INC_DIR += $(call select_from_ports,libpng)/include/libpng diff --git a/repos/libports/lib/import/import-libssh.mk b/repos/libports/lib/import/import-libssh.mk index ba492020d1..d90f035c4e 100644 --- a/repos/libports/lib/import/import-libssh.mk +++ b/repos/libports/lib/import/import-libssh.mk @@ -1 +1,2 @@ REP_INC_DIR += include/libssh +INC_DIR += $(call select_from_ports,libssh)/include diff --git a/repos/libports/lib/import/import-libssl.mk b/repos/libports/lib/import/import-libssl.mk index d1175dc79a..d2d63e0794 100644 --- a/repos/libports/lib/import/import-libssl.mk +++ b/repos/libports/lib/import/import-libssl.mk @@ -1,10 +1 @@ -REP_INC_DIR += include/openssl - -ifeq ($(filter-out $(SPECS),x86_32),) -TARGET_CPUARCH=x86_32 -else ifeq ($(filter-out $(SPECS),x86_64),) -TARGET_CPUARCH=x86_64 -endif - -# include architecture specific opensslconf.h -REP_INC_DIR += src/lib/openssl/$(TARGET_CPUARCH) +include $(call select_from_repositories,lib/import/import-libcrypto.mk) diff --git a/repos/libports/lib/import/import-lua.mk b/repos/libports/lib/import/import-lua.mk index d7d6418477..cd1e96cf84 100644 --- a/repos/libports/lib/import/import-lua.mk +++ b/repos/libports/lib/import/import-lua.mk @@ -1 +1 @@ -REP_INC_DIR += include/lua +INC_DIR += $(call select_from_ports,lua)/include/lua diff --git a/repos/libports/lib/import/import-luacxx.mk b/repos/libports/lib/import/import-luacxx.mk index d7d6418477..cd1e96cf84 100644 --- a/repos/libports/lib/import/import-luacxx.mk +++ b/repos/libports/lib/import/import-luacxx.mk @@ -1 +1 @@ -REP_INC_DIR += include/lua +INC_DIR += $(call select_from_ports,lua)/include/lua diff --git a/repos/libports/lib/import/import-lwip.mk b/repos/libports/lib/import/import-lwip.mk index 90092d31c0..ffd2a588d0 100644 --- a/repos/libports/lib/import/import-lwip.mk +++ b/repos/libports/lib/import/import-lwip.mk @@ -1 +1,2 @@ -REP_INC_DIR += include/lwip +INC_DIR += $(call select_from_ports,lwip)/include/lwip +INC_DIR += $(REP_DIR)/include/lwip diff --git a/repos/libports/lib/import/import-mpc.mk b/repos/libports/lib/import/import-mpc.mk index 49ae4e3a23..098f609b7b 100644 --- a/repos/libports/lib/import/import-mpc.mk +++ b/repos/libports/lib/import/import-mpc.mk @@ -1,3 +1,2 @@ -MPC = mpc-0.9 - REP_INC_DIR += include/mpc +INC_DIR += $(call select_from_ports,mpc)/include/mpc diff --git a/repos/libports/lib/import/import-mpfr.mk b/repos/libports/lib/import/import-mpfr.mk index 398c59adee..ab8c095501 100644 --- a/repos/libports/lib/import/import-mpfr.mk +++ b/repos/libports/lib/import/import-mpfr.mk @@ -1 +1,2 @@ REP_INC_DIR += include/mpfr +INC_DIR += $(call select_from_ports,mpfr)/include/mpfr diff --git a/repos/libports/lib/import/import-mupdf.mk b/repos/libports/lib/import/import-mupdf.mk index a4ae187896..37e42a5d84 100644 --- a/repos/libports/lib/import/import-mupdf.mk +++ b/repos/libports/lib/import/import-mupdf.mk @@ -1 +1,2 @@ -REP_INC_DIR += include/mupdf +INC_DIR += $(call select_from_ports,mupdf)/include/mupdf + diff --git a/repos/libports/lib/import/import-ncurses.mk b/repos/libports/lib/import/import-ncurses.mk index e575780f3b..21192ff316 100644 --- a/repos/libports/lib/import/import-ncurses.mk +++ b/repos/libports/lib/import/import-ncurses.mk @@ -1 +1,2 @@ REP_INC_DIR += include/ncurses +INC_DIR += $(call select_from_ports,ncurses)/include/ncurses diff --git a/repos/libports/lib/import/import-openjpeg.mk b/repos/libports/lib/import/import-openjpeg.mk index e69ba1ea97..ba772fdfc6 100644 --- a/repos/libports/lib/import/import-openjpeg.mk +++ b/repos/libports/lib/import/import-openjpeg.mk @@ -1 +1 @@ -REP_INC_DIR += include/openjpeg +INC_DIR += $(call select_from_ports,openjpeg)/include/openjpeg diff --git a/repos/libports/lib/import/import-pcre.mk b/repos/libports/lib/import/import-pcre.mk index 7538f6a7fc..752c6a1ca6 100644 --- a/repos/libports/lib/import/import-pcre.mk +++ b/repos/libports/lib/import/import-pcre.mk @@ -1 +1 @@ -REP_INC_DIR += include/pcre +INC_DIR += $(call select_from_ports,pcre)/include/pcre diff --git a/repos/libports/lib/import/import-python.mk b/repos/libports/lib/import/import-python.mk index 1f74bdc169..d89c8a2de6 100644 --- a/repos/libports/lib/import/import-python.mk +++ b/repos/libports/lib/import/import-python.mk @@ -1,5 +1,6 @@ PYTHON = python-2.6.4 REP_INC_DIR += include/python +INC_DIR += $(call select_from_ports,python)/include ifeq ($(filter-out $(SPECS),x86),) ifeq ($(filter-out $(SPECS),32bit),) diff --git a/repos/libports/lib/import/import-qoost.mk b/repos/libports/lib/import/import-qoost.mk new file mode 100644 index 0000000000..1203d20317 --- /dev/null +++ b/repos/libports/lib/import/import-qoost.mk @@ -0,0 +1 @@ +INC_DIR += $(call select_from_ports,qoost)/include diff --git a/repos/libports/lib/import/import-qt5.inc b/repos/libports/lib/import/import-qt5.inc index 771248fbae..541df217fa 100644 --- a/repos/libports/lib/import/import-qt5.inc +++ b/repos/libports/lib/import/import-qt5.inc @@ -105,8 +105,9 @@ INC_DIR += $(QT5_REP_DIR)/include/qt5/genode # included (in 'base/mk/lib.mk') by iterating through the elements of the # 'LIBS' variable. Hence, we also need to manually import the stdlib snippet. # -LIBS += stdcxx +LIBS += stdcxx gallium include $(call select_from_repositories,lib/import/import-stdcxx.mk) +include $(call select_from_repositories,lib/import/import-gallium.mk) # custom main() thread stack size support via main() wrapper ifeq ($(findstring -DQT_MAIN_STACK_SIZE, $(CC_CXX_OPT)), -DQT_MAIN_STACK_SIZE) diff --git a/repos/libports/lib/import/import-readline.mk b/repos/libports/lib/import/import-readline.mk new file mode 100644 index 0000000000..287b0a7881 --- /dev/null +++ b/repos/libports/lib/import/import-readline.mk @@ -0,0 +1 @@ +INC_DIR += $(call select_from_ports,readline)/include diff --git a/repos/libports/lib/import/import-sdl.mk b/repos/libports/lib/import/import-sdl.mk index d421fd46b7..4c7fce08c0 100644 --- a/repos/libports/lib/import/import-sdl.mk +++ b/repos/libports/lib/import/import-sdl.mk @@ -1 +1,4 @@ -REP_INC_DIR += include/SDL +SDL_PORT_DIR := $(call select_from_ports,sdl) + +INC_DIR += $(SDL_PORT_DIR)/include $(SDL_PORT_DIR)/include/SDL +REP_INC_DIR += include/SDL diff --git a/repos/libports/lib/import/import-sdl_image.mk b/repos/libports/lib/import/import-sdl_image.mk new file mode 100644 index 0000000000..62d8c95857 --- /dev/null +++ b/repos/libports/lib/import/import-sdl_image.mk @@ -0,0 +1 @@ +INC_DIR += $(call select_from_ports,sdl_image)/include diff --git a/repos/libports/lib/import/import-sdl_mixer.mk b/repos/libports/lib/import/import-sdl_mixer.mk new file mode 100644 index 0000000000..109c02ea7b --- /dev/null +++ b/repos/libports/lib/import/import-sdl_mixer.mk @@ -0,0 +1 @@ +INC_DIR += $(call select_from_ports,sdl_mixer)/include diff --git a/repos/libports/lib/import/import-sdl_net.mk b/repos/libports/lib/import/import-sdl_net.mk new file mode 100644 index 0000000000..b73d3f44e3 --- /dev/null +++ b/repos/libports/lib/import/import-sdl_net.mk @@ -0,0 +1,2 @@ +SDL_NET_PORT_DIR := $(call select_from_ports,sdl_net) +INC_DIR += $(SDL_NET_PORT_DIR)/include $(SDL_NET_PORT_DIR)/include/SDL diff --git a/repos/libports/lib/import/import-sdl_ttf.mk b/repos/libports/lib/import/import-sdl_ttf.mk new file mode 100644 index 0000000000..697336b164 --- /dev/null +++ b/repos/libports/lib/import/import-sdl_ttf.mk @@ -0,0 +1 @@ +INC_DIR += $(call select_from_ports,sdl_ttf)/include diff --git a/repos/libports/lib/import/import-stdcxx.mk b/repos/libports/lib/import/import-stdcxx.mk index f624a2bc84..fb70474d49 100644 --- a/repos/libports/lib/import/import-stdcxx.mk +++ b/repos/libports/lib/import/import-stdcxx.mk @@ -1,8 +1,15 @@ -REP_INC_DIR += include/stdcxx -REP_INC_DIR += include/stdcxx/std -REP_INC_DIR += include/stdcxx/c_std -REP_INC_DIR += include/stdcxx/c_global -REP_INC_DIR += include/stdcxx-genode +STDCXX_INCLUDE_DIR := $(call select_from_repositories,include/stdcxx) + +INC_DIR += $(STDCXX_INCLUDE_DIR) \ + $(STDCXX_INCLUDE_DIR)/std \ + $(STDCXX_INCLUDE_DIR)/c_std \ + $(STDCXX_INCLUDE_DIR)/c_global + +STDCXX_PORT_INCLUDE_DIR := $(call select_from_ports,stdcxx)/include/stdcxx +INC_DIR += $(STDCXX_PORT_INCLUDE_DIR) \ + $(STDCXX_PORT_INCLUDE_DIR)/std \ + $(STDCXX_PORT_INCLUDE_DIR)/c_std \ + $(STDCXX_PORT_INCLUDE_DIR)/c_global LIBS += libc include $(call select_from_repositories,lib/import/import-libc.mk) diff --git a/repos/libports/lib/import/import-x86emu.mk b/repos/libports/lib/import/import-x86emu.mk new file mode 100644 index 0000000000..e9a6582358 --- /dev/null +++ b/repos/libports/lib/import/import-x86emu.mk @@ -0,0 +1 @@ +INC_DIR += $(call select_from_ports,x86emu)/include diff --git a/repos/libports/lib/import/import-zlib.mk b/repos/libports/lib/import/import-zlib.mk index 37af131b3f..532f54b00c 100644 --- a/repos/libports/lib/import/import-zlib.mk +++ b/repos/libports/lib/import/import-zlib.mk @@ -1 +1 @@ -REP_INC_DIR += include/zlib +INC_DIR += $(call select_from_ports,zlib)/include/zlib diff --git a/repos/libports/lib/mk/arm/gmp-mpn.mk b/repos/libports/lib/mk/arm/gmp-mpn.mk index b921d02319..1e4792add8 100644 --- a/repos/libports/lib/mk/arm/gmp-mpn.mk +++ b/repos/libports/lib/mk/arm/gmp-mpn.mk @@ -9,8 +9,6 @@ FILTER_OUT += udiv_w_sdiv.c SRC_ASM += copyd.asm copyi.asm FILTER_OUT += popham.c -CC_OPT_hamdist = -DOPERATION_hamdist -CC_OPT_popcount = -DOPERATION_popcount SRC_ASM += add_n.asm FILTER_OUT += add_n.c @@ -26,7 +24,7 @@ include $(REP_DIR)/lib/mk/gmp.inc PWD := $(shell pwd) -SRC_O += $(SRC_ASM:.asm=.o) +SRC_O += $(SRC_ASM:.asm=.o) hamdist.o popcount.o # # Create execution environment for the m4-ccas tool, which is used by the gmp @@ -52,6 +50,10 @@ ifneq ($(VERBOSE),) M4_OUTPUT_FILTER = > /dev/null endif +hamdist.o popcount.o: popham.c + $(MSG_COMP)$@ + $(VERBOSE)$(CC) $(CC_DEF) $(CC_C_OPT) -DOPERATION_${@:.o=} $(INCLUDES) -c $< -o $@ + %.o: %.asm $(MSG_ASSEM)$@ $(VERBOSE)cd m4env/mpn; \ @@ -61,5 +63,4 @@ endif vpath %.c $(REP_DIR)/src/lib/gmp/mpn/arm vpath %.c $(REP_DIR)/src/lib/gmp/mpn/32bit vpath %.c $(GMP_MPN_DIR)/generic -#vpath %.asm $(REP_DIR)/src/lib/gmp/mpn/ vpath %.asm $(GMP_MPN_DIR)/arm diff --git a/repos/libports/lib/mk/arm/libc-gen.mk b/repos/libports/lib/mk/arm/libc-gen.mk index 5cbd176731..780beae1f8 100644 --- a/repos/libports/lib/mk/arm/libc-gen.mk +++ b/repos/libports/lib/mk/arm/libc-gen.mk @@ -1,6 +1,6 @@ include $(REP_DIR)/lib/mk/libc-gen.inc -LIBC_GEN_ARM_DIR = $(LIBC_DIR)/libc/arm/gen +LIBC_GEN_ARM_DIR = $(LIBC_DIR)/lib/libc/arm/gen #FILTER_OUT_S += rfork_thread.S sigsetjmp.S setjmp.S _setjmp.S divsi3.S FILTER_OUT_S += rfork_thread.S divsi3.S setjmp.S _setjmp.S @@ -10,6 +10,6 @@ SRC_S += $(filter-out $(FILTER_OUT_S),$(notdir $(wildcard $(LIBC_GEN_ARM_DIR)/* SRC_C += $(filter-out $(FILTER_OUT_C),$(notdir $(wildcard $(LIBC_GEN_ARM_DIR)/*.c))) # fix missing include prefix for 'ucontext.h', should be 'sys/ucontext.h' -CC_OPT_makecontext = -I$(REP_DIR)/include/libc/sys +CC_OPT_makecontext = -I$(call select_from_ports,libc)/include/libc/sys vpath % $(LIBC_GEN_ARM_DIR) diff --git a/repos/libports/lib/mk/arm/libc-setjmp.mk b/repos/libports/lib/mk/arm/libc-setjmp.mk index 9ade9cc8ad..1054f93d3a 100644 --- a/repos/libports/lib/mk/arm/libc-setjmp.mk +++ b/repos/libports/lib/mk/arm/libc-setjmp.mk @@ -1,4 +1,4 @@ -LIBC_GEN_ARM_DIR = $(LIBC_DIR)/libc/arm/gen +LIBC_GEN_ARM_DIR = $(LIBC_DIR)/lib/libc/arm/gen SRC_S = _setjmp.S setjmp.S diff --git a/repos/libports/lib/mk/avcodec.inc b/repos/libports/lib/mk/avcodec.inc index b46880bd43..4ac24ae4f5 100644 --- a/repos/libports/lib/mk/avcodec.inc +++ b/repos/libports/lib/mk/avcodec.inc @@ -2,10 +2,13 @@ include $(REP_DIR)/lib/mk/av.inc include $(REP_DIR)/lib/import/import-avcodec.mk -LIBAVCODEC_DIR = $(REP_DIR)/contrib/$(LIBAV)/libavcodec +LIBAV_PORT_DIR := $(call select_from_ports,libav) +LIBAVCODEC_DIR := $(LIBAV_PORT_DIR)/src/lib/libav/libavcodec include $(LIBAVCODEC_DIR)/Makefile -LIBS += zlib +LIBS += zlib + +INC_DIR += $(LIBAV_PORT_DIR)/src/lib/libav vpath % $(LIBAVCODEC_DIR) diff --git a/repos/libports/lib/mk/avfilter.mk b/repos/libports/lib/mk/avfilter.mk index 3e7b04f55b..063bac6fcf 100644 --- a/repos/libports/lib/mk/avfilter.mk +++ b/repos/libports/lib/mk/avfilter.mk @@ -2,7 +2,7 @@ include $(REP_DIR)/lib/mk/av.inc include $(REP_DIR)/lib/import/import-avfilter.mk -LIBAVFILTER_DIR = $(REP_DIR)/contrib/$(LIBAV)/libavfilter +LIBAVFILTER_DIR = $(call select_from_ports,libav)/src/lib/libav/libavfilter include $(LIBAVFILTER_DIR)/Makefile diff --git a/repos/libports/lib/mk/avformat.mk b/repos/libports/lib/mk/avformat.mk index 69cb39ad6f..e5493112d7 100644 --- a/repos/libports/lib/mk/avformat.mk +++ b/repos/libports/lib/mk/avformat.mk @@ -2,7 +2,7 @@ include $(REP_DIR)/lib/mk/av.inc include $(REP_DIR)/lib/import/import-avformat.mk -LIBAVFORMAT_DIR = $(REP_DIR)/contrib/$(LIBAV)/libavformat +LIBAVFORMAT_DIR = $(call select_from_ports,libav)/src/lib/libav/libavformat include $(LIBAVFORMAT_DIR)/Makefile diff --git a/repos/libports/lib/mk/avutil.inc b/repos/libports/lib/mk/avutil.inc index b650023b2f..eb822f89f6 100644 --- a/repos/libports/lib/mk/avutil.inc +++ b/repos/libports/lib/mk/avutil.inc @@ -2,7 +2,7 @@ include $(REP_DIR)/lib/mk/av.inc include $(REP_DIR)/lib/import/import-avutil.mk -LIBAVUTIL_DIR = $(REP_DIR)/contrib/$(LIBAV)/libavutil +LIBAVUTIL_DIR = $(call select_from_ports,libav)/src/lib/libav/libavutil include $(LIBAVUTIL_DIR)/Makefile diff --git a/repos/libports/lib/mk/curl.mk b/repos/libports/lib/mk/curl.mk index 79b937d751..65a310e69c 100644 --- a/repos/libports/lib/mk/curl.mk +++ b/repos/libports/lib/mk/curl.mk @@ -1,6 +1,4 @@ -include $(REP_DIR)/ports/curl.inc - -CURL_DIR = $(REP_DIR)/contrib/$(CURL) +CURL_PORT_DIR = $(call select_from_ports,curl) SRC_C = \ file.c timeval.c base64.c hostip.c progress.c formdata.c \ @@ -31,4 +29,4 @@ include $(REP_DIR)/lib/import/import-curl.mk SHARED_LIB = yes -vpath %.c $(CURL_DIR)/lib +vpath %.c $(CURL_PORT_DIR)/src/lib/curl/lib diff --git a/repos/libports/lib/mk/expat.mk b/repos/libports/lib/mk/expat.mk index 7a68d74270..2654ca4016 100644 --- a/repos/libports/lib/mk/expat.mk +++ b/repos/libports/lib/mk/expat.mk @@ -1,7 +1,7 @@ include $(REP_DIR)/lib/import/import-expat.mk -EXPAT_DIR = $(REP_DIR)/contrib/$(EXPAT) -LIBS += libc +EXPAT_DIR := $(call select_from_ports,expat)/src/lib/expat/contrib +LIBS += libc SRC_C = xmlparse.c xmlrole.c xmltok.c diff --git a/repos/libports/lib/mk/ffat_block.mk b/repos/libports/lib/mk/ffat_block.mk index 3b69f0410b..3d7700d405 100644 --- a/repos/libports/lib/mk/ffat_block.mk +++ b/repos/libports/lib/mk/ffat_block.mk @@ -2,11 +2,15 @@ # FAT File System Module using a Block session as disk I/O backend # -INC_DIR += $(REP_DIR)/src/lib/ffat/contrib +FFAT_PORT_DIR := $(call select_from_ports,ffat) + +INC_DIR += $(FFAT_PORT_DIR)/include + +FFAT_DIR := $(FFAT_PORT_DIR)/src/lib/ffat SRC_C = ff.c ccsbcs.c SRC_CC = diskio_block.cc vpath % $(REP_DIR)/src/lib/ffat/ -vpath % $(REP_DIR)/contrib/ff007e/src -vpath % $(REP_DIR)/contrib/ff007e/src/option +vpath % $(FFAT_DIR)/src +vpath % $(FFAT_DIR)/src/option diff --git a/repos/libports/lib/mk/freetype.mk b/repos/libports/lib/mk/freetype.mk index fb7bc71bda..af30215481 100644 --- a/repos/libports/lib/mk/freetype.mk +++ b/repos/libports/lib/mk/freetype.mk @@ -1,9 +1,9 @@ -FREETYPE = freetype-2.3.9 -FREETYPE_DIR = $(REP_DIR)/contrib/$(FREETYPE) -LIBS += libc +PORT_DIR := $(call select_from_ports,freetype) +FREETYPE_DIR := $(PORT_DIR)/src/lib/freetype/contrib +LIBS += libc # add local freetype headers to include-search path -INC_DIR += $(FREETYPE_DIR)/src/base +INC_DIR += $(PORT_DIR)/include $(FREETYPE_DIR)/src/base # use our custom freetype config files CC_DEF += -DFT_CONFIG_CONFIG_H="" diff --git a/repos/libports/lib/mk/fribidi.mk b/repos/libports/lib/mk/fribidi.mk index 2e3a2f991a..10e96e1857 100644 --- a/repos/libports/lib/mk/fribidi.mk +++ b/repos/libports/lib/mk/fribidi.mk @@ -1,9 +1,11 @@ -include $(REP_DIR)/ports/fribidi.inc +FRIBIDI_PORT_DIR := $(call select_from_ports,fribidi) -FRIBIDI_DIR = $(REP_DIR)/contrib/$(FRIBIDI) +FRIBIDI_DIR := $(FRIBIDI_PORT_DIR)/src/lib/fribidi/contrib LIBS += libc -INC_DIR += $(FRIBIDI_DIR) $(REP_DIR)/src/lib/fribidi $(REP_DIR)/include/fribidi +INC_DIR += $(FRIBIDI_PORT_DIR)/include/fribidi \ + $(REP_DIR)/src/lib/fribidi \ + $(REP_DIR)/include/fribidi SRC_C = $(notdir $(wildcard $(FRIBIDI_DIR)/lib/*.c)) CC_OPT += -DHAVE_CONFIG_H diff --git a/repos/libports/lib/mk/gallium-egl.mk b/repos/libports/lib/mk/gallium-egl.mk index a56c6fda0f..3abde25a37 100644 --- a/repos/libports/lib/mk/gallium-egl.mk +++ b/repos/libports/lib/mk/gallium-egl.mk @@ -1,9 +1,9 @@ include $(REP_DIR)/lib/mk/gallium.inc -EGL_ST_SRC_DIR := $(MESA_DIR)/src/gallium/state_trackers/egl +EGL_ST_SRC_DIR := $(MESA_PORT_DIR)/src/lib/mesa/src/gallium/state_trackers/egl INC_DIR += $(EGL_ST_SRC_DIR) -INC_DIR += $(MESA_DIR)/src/egl/main -INC_DIR += $(MESA_DIR)/src/gallium +INC_DIR += $(MESA_PORT_DIR)/src/lib/mesa/src/egl/main +INC_DIR += $(MESA_PORT_DIR)/src/lib/mesa/src/gallium CC_OPT += -DRTLD_NODELETE=0 # generic driver code @@ -12,7 +12,7 @@ vpath %.c $(EGL_ST_SRC_DIR)/common # state tracker declarations for OpenGL ES1 and ES2 SRC_C += st_es1.c st_es2.c -vpath %.c $(MESA_DIR)/src/gallium/state_trackers/es +vpath %.c $(MESA_PORT_DIR)/src/lib/mesa/src/gallium/state_trackers/es # state tracker declarations for OpenGL SRC_C += st_opengl.c @@ -25,10 +25,10 @@ vpath select_driver.cc $(REP_DIR)/src/lib/egl LIBS += blit # MESA state tracker code -MESA_ST_SRC_DIR := $(MESA_DIR)/src/mesa/state_tracker +MESA_ST_SRC_DIR := $(MESA_PORT_DIR)/src/lib/mesa/src/mesa/state_tracker INC_DIR += $(MESA_ST_SRC_DIR) -INC_DIR += $(MESA_DIR)/src/mesa/main -INC_DIR += $(MESA_DIR)/src/mesa +INC_DIR += $(MESA_PORT_DIR)/src/lib/mesa/src/mesa/main +INC_DIR += $(MESA_PORT_DIR)/src/lib/mesa/src/mesa SRC_C += $(notdir $(wildcard $(MESA_ST_SRC_DIR)/*.c)) vpath %.c $(MESA_ST_SRC_DIR) diff --git a/repos/libports/lib/mk/gallium-i915.mk b/repos/libports/lib/mk/gallium-i915.mk index a2daed9bc1..2ad938f250 100644 --- a/repos/libports/lib/mk/gallium-i915.mk +++ b/repos/libports/lib/mk/gallium-i915.mk @@ -19,7 +19,7 @@ SRC_CC += query_device_id.cc vpath query_device_id.cc $(REP_DIR)/src/lib/gallium/i915 # libdrm includes -LIBDRM_DIR = $(REP_DIR)/contrib/libdrm-2.4.21 +LIBDRM_DIR := $(call select_from_ports,libdrm)/src/lib/libdrm INC_DIR += $(LIBDRM_DIR)/include/drm $(LIBDRM_DIR)/intel # interface to i915 drm device diff --git a/repos/libports/lib/mk/gallium.inc b/repos/libports/lib/mk/gallium.inc index 6c7ba23621..b858a729e9 100644 --- a/repos/libports/lib/mk/gallium.inc +++ b/repos/libports/lib/mk/gallium.inc @@ -1,13 +1,13 @@ -MESA = Mesa-7.8.1 -MESA_DIR = $(REP_DIR)/contrib/$(MESA) -GALLIUM_SRC_DIR = $(MESA_DIR)/src/gallium +MESA_PORT_DIR := $(call select_from_ports,mesa) +GALLIUM_SRC_DIR := $(MESA_PORT_DIR)/src/lib/mesa/src/gallium -LIBS += cxx libc libm +LIBS += cxx libc libm mesa_host_tools INC_DIR += $(GALLIUM_SRC_DIR)/include \ $(GALLIUM_SRC_DIR)/auxiliary \ $(GALLIUM_SRC_DIR)/auxiliary/util \ - $(GALLIUM_SRC_DIR)/drivers + $(GALLIUM_SRC_DIR)/drivers \ + $(MESA_PORT_DIR)/include CC_OPT += -U__linux__ @@ -18,11 +18,3 @@ CC_OPT += -U__linux__ # that include 'p_compiler.h', we unconditionally include 'sys/types.h'. # CC_OPT += -D__USE_MISC -include sys/types.h - -# -# Detect missing preparation of Mesa library, skip unprepared library -# -ifeq ($(wildcard $(REP_DIR)/include/GL),) -REQUIRES = prepare_mesa -endif - diff --git a/repos/libports/lib/mk/gmp.inc b/repos/libports/lib/mk/gmp.inc index b0a02e8fe3..6c015e9b3e 100644 --- a/repos/libports/lib/mk/gmp.inc +++ b/repos/libports/lib/mk/gmp.inc @@ -1,13 +1,9 @@ -GMP_DIR = $(REP_DIR)/contrib/gmp-4.3.2 - -ifeq ($(wildcard $(GMP_DIR)),) -REQUIRES += prepare_gmp -endif +GMP_DIR = $(call select_from_ports,gmp)/src/lib/gmp include $(REP_DIR)/lib/import/import-gmp.mk LIBS += libc -CC_OPT += -DHAVE_CONFIG_H -D__GMP_WITHIN_GMP +CC_OPT += -DHAVE_CONFIG_H -D__GMP_WITHIN_GMP INC_DIR += $(REP_DIR)/include/gcc diff --git a/repos/libports/lib/mk/history.mk b/repos/libports/lib/mk/history.mk index 055abf6c4e..5eb0feceee 100644 --- a/repos/libports/lib/mk/history.mk +++ b/repos/libports/lib/mk/history.mk @@ -1,9 +1,11 @@ -READLINE = readline-6.0 -READLINE_DIR = $(REP_DIR)/contrib/$(READLINE) -LIBS += libc +READLINE_PORT_DIR := $(call select_from_ports,readline) +READLINE_DIR := $(READLINE_PORT_DIR)/src/lib/readline + +LIBS += libc # use our customized 'config.h' INC_DIR += $(REP_DIR)/include/readline +INC_DIR += $(READLINE_PORT_DIR)/include/readline # add local readline headers to include-search path INC_DIR += $(READLINE_DIR) diff --git a/repos/libports/lib/mk/icu.mk b/repos/libports/lib/mk/icu.mk index 54dec6f559..0f9efae522 100644 --- a/repos/libports/lib/mk/icu.mk +++ b/repos/libports/lib/mk/icu.mk @@ -1,6 +1,6 @@ include $(REP_DIR)/lib/import/import-icu.mk -ICU_DIR = $(REP_DIR)/contrib/icu +ICU_DIR = $(call select_from_ports,icu)/src/lib/icu # copy-pasted from $(ICU_DIR)/source/common/Makefile.in and renamed OBJECTS to ICU_COMMON_OBJECTS diff --git a/repos/libports/lib/mk/jbig2dec.mk b/repos/libports/lib/mk/jbig2dec.mk index bd350ff9ca..4d67e587ed 100644 --- a/repos/libports/lib/mk/jbig2dec.mk +++ b/repos/libports/lib/mk/jbig2dec.mk @@ -1,5 +1,4 @@ -JBIG2DEC = jbig2dec-0.11 -JBIG2DEC_DIR = $(REP_DIR)/contrib/$(JBIG2DEC) +JBIG2DEC_DIR = $(call select_from_ports,jbig2dec)/src/lib/jbig2dec LIBS += libc libpng zlib INC_DIR += $(JBIG2DEC_DIR) $(REP_DIR)/include/jbig2dec diff --git a/repos/libports/lib/mk/jpeg.mk b/repos/libports/lib/mk/jpeg.mk index 0ca844a8a9..b09bca71ce 100644 --- a/repos/libports/lib/mk/jpeg.mk +++ b/repos/libports/lib/mk/jpeg.mk @@ -1,5 +1,5 @@ JPEG = jpeg-7 -JPEG_DIR = $(REP_DIR)/contrib/$(JPEG) +JPEG_DIR = $(call select_from_ports,jpeg)/src/lib/jpeg LIBS += libc # use our customized 'jconfig.h' file diff --git a/repos/libports/lib/mk/libc-common.inc b/repos/libports/lib/mk/libc-common.inc index dec0db26a5..b4693accf4 100644 --- a/repos/libports/lib/mk/libc-common.inc +++ b/repos/libports/lib/mk/libc-common.inc @@ -4,15 +4,16 @@ # this enables 'ports/lib/mk/seoul_libc_support.mk' to reuse the definitions. # -LIBC_DIR = $(call select_from_repositories,contrib/libc-8.2.0) -LIBC_REP_DIR = $(realpath $(subst /contrib/libc-8.2.0,,$(LIBC_DIR))) +LIBC_PORT_DIR := $(call select_from_ports,libc) +LIBC_DIR := $(LIBC_PORT_DIR)/src/lib/libc +LIBC_REP_DIR := $(realpath $(call select_from_repositories,include/libc-genode)/../..) # local libc includes -INC_DIR += $(LIBC_DIR)/libc/locale -INC_DIR += $(LIBC_DIR)/libc/include -INC_DIR += $(LIBC_DIR)/libc/stdio -INC_DIR += $(LIBC_DIR)/libc/net -INC_DIR += $(LIBC_DIR)/gdtoa +INC_DIR += $(LIBC_DIR)/lib/libc/locale +INC_DIR += $(LIBC_DIR)/lib/libc/include +INC_DIR += $(LIBC_DIR)/lib/libc/stdio +INC_DIR += $(LIBC_DIR)/lib/libc/net +INC_DIR += $(LIBC_DIR)/contrib/gdtoa #CC_OPT += -DGENODE_RELEASE diff --git a/repos/libports/lib/mk/libc-compat.mk b/repos/libports/lib/mk/libc-compat.mk index 9c289674a1..28928f658f 100644 --- a/repos/libports/lib/mk/libc-compat.mk +++ b/repos/libports/lib/mk/libc-compat.mk @@ -1,4 +1,4 @@ -LIBC_COMPAT_DIR = $(LIBC_DIR)/libc/compat-43 +LIBC_COMPAT_DIR = $(LIBC_DIR)/lib/libc/compat-43 SRC_C = $(filter-out $(FILTER_OUT),$(notdir $(wildcard $(LIBC_COMPAT_DIR)/*.c))) diff --git a/repos/libports/lib/mk/libc-gdtoa.mk b/repos/libports/lib/mk/libc-gdtoa.mk index 338e661bf5..96a283127e 100644 --- a/repos/libports/lib/mk/libc-gdtoa.mk +++ b/repos/libports/lib/mk/libc-gdtoa.mk @@ -1,5 +1,5 @@ -GDTOA_DIR = $(LIBC_DIR)/gdtoa -LIBC_GDTOA_DIR = $(LIBC_DIR)/libc/gdtoa +GDTOA_DIR = $(LIBC_DIR)/contrib/gdtoa +LIBC_GDTOA_DIR = $(LIBC_DIR)/lib/libc/gdtoa FILTER_OUT = arithchk.c strtodnrp.c qnan.c FILTER_OUT += machdep_ldisQ.c machdep_ldisx.c diff --git a/repos/libports/lib/mk/libc-gen.inc b/repos/libports/lib/mk/libc-gen.inc index b18db1f591..44a277f938 100644 --- a/repos/libports/lib/mk/libc-gen.inc +++ b/repos/libports/lib/mk/libc-gen.inc @@ -1,4 +1,4 @@ -LIBC_GEN_DIR = $(LIBC_DIR)/libc/gen +LIBC_GEN_DIR = $(LIBC_DIR)/lib/libc/gen # this file produces a warning about a missing header file, lets drop it FILTER_OUT_C += getosreldate.c sem.c valloc.c getpwent.c diff --git a/repos/libports/lib/mk/libc-inet.mk b/repos/libports/lib/mk/libc-inet.mk index 9cfb85175a..511e5430e4 100644 --- a/repos/libports/lib/mk/libc-inet.mk +++ b/repos/libports/lib/mk/libc-inet.mk @@ -1,4 +1,4 @@ -LIBC_INET_DIR = $(LIBC_DIR)/libc/inet +LIBC_INET_DIR = $(LIBC_DIR)/lib/libc/inet SRC_C = $(filter-out $(FILTER_OUT_C),$(notdir $(wildcard $(LIBC_INET_DIR)/*.c))) diff --git a/repos/libports/lib/mk/libc-isc.mk b/repos/libports/lib/mk/libc-isc.mk index 77156e49cd..a67f2cea52 100644 --- a/repos/libports/lib/mk/libc-isc.mk +++ b/repos/libports/lib/mk/libc-isc.mk @@ -1,6 +1,6 @@ -LIBC_ISC_DIR = $(LIBC_DIR)/libc/isc +LIBC_ISC_DIR = $(LIBC_DIR)/lib/libc/isc -INC_DIR += $(LIBC_DIR)/libc/isc +INC_DIR += $(LIBC_DIR)/lib/libc/isc SRC_C = $(notdir $(wildcard $(LIBC_ISC_DIR)/*.c)) diff --git a/repos/libports/lib/mk/libc-locale.mk b/repos/libports/lib/mk/libc-locale.mk index 0e43ff82e6..398729a41f 100644 --- a/repos/libports/lib/mk/libc-locale.mk +++ b/repos/libports/lib/mk/libc-locale.mk @@ -1,4 +1,4 @@ -LIBC_LOCALE_DIR = $(LIBC_DIR)/libc/locale +LIBC_LOCALE_DIR = $(LIBC_DIR)/lib/libc/locale SRC_C = $(notdir $(wildcard $(LIBC_LOCALE_DIR)/*.c)) diff --git a/repos/libports/lib/mk/libc-nameser.mk b/repos/libports/lib/mk/libc-nameser.mk index f8ad598f0a..c220e3132c 100644 --- a/repos/libports/lib/mk/libc-nameser.mk +++ b/repos/libports/lib/mk/libc-nameser.mk @@ -1,4 +1,4 @@ -LIBC_NAMESER_DIR = $(LIBC_DIR)/libc/nameser +LIBC_NAMESER_DIR = $(LIBC_DIR)/lib/libc/nameser SRC_C = $(notdir $(wildcard $(LIBC_NAMESER_DIR)/*.c)) diff --git a/repos/libports/lib/mk/libc-net.mk b/repos/libports/lib/mk/libc-net.mk index 5d0e1cea6e..2ad66c89fe 100644 --- a/repos/libports/lib/mk/libc-net.mk +++ b/repos/libports/lib/mk/libc-net.mk @@ -1,4 +1,4 @@ -LIBC_NET_DIR = $(LIBC_DIR)/libc/net +LIBC_NET_DIR = $(LIBC_DIR)/lib/libc/net # needed for compiling getservbyname() and getservbyport() SRC_C = getservent.c nsdispatch.c nsparser.c nslexer.c @@ -27,8 +27,9 @@ include $(REP_DIR)/lib/mk/libc-common.inc INC_DIR += $(REP_DIR)/include/libc INC_DIR += $(REP_DIR)/include/libc/sys +INC_DIR += $(LIBC_PORT_DIR)/include/libc/sys # needed for name6.c, contains res_private.h -INC_DIR += $(LIBC_DIR)/libc/resolv +INC_DIR += $(LIBC_DIR)/lib/libc/resolv vpath %.c $(LIBC_NET_DIR) diff --git a/repos/libports/lib/mk/libc-regex.mk b/repos/libports/lib/mk/libc-regex.mk index e6de688a08..5d1f2bb98f 100644 --- a/repos/libports/lib/mk/libc-regex.mk +++ b/repos/libports/lib/mk/libc-regex.mk @@ -1,4 +1,4 @@ -LIBC_REGEX_DIR = $(LIBC_DIR)/libc/regex +LIBC_REGEX_DIR = $(LIBC_DIR)/lib/libc/regex # # 'engine.c' is meant to be included by other compilation units. It cannot diff --git a/repos/libports/lib/mk/libc-resolv.mk b/repos/libports/lib/mk/libc-resolv.mk index 8ad066125d..048606fc6b 100644 --- a/repos/libports/lib/mk/libc-resolv.mk +++ b/repos/libports/lib/mk/libc-resolv.mk @@ -1,4 +1,4 @@ -LIBC_RESOLV_DIR = $(LIBC_DIR)/libc/resolv +LIBC_RESOLV_DIR = $(LIBC_DIR)/lib/libc/resolv SRC_C = $(notdir $(wildcard $(LIBC_RESOLV_DIR)/*.c)) diff --git a/repos/libports/lib/mk/libc-rpc.mk b/repos/libports/lib/mk/libc-rpc.mk index d1a9dc81c5..a4c3647f66 100644 --- a/repos/libports/lib/mk/libc-rpc.mk +++ b/repos/libports/lib/mk/libc-rpc.mk @@ -1,4 +1,4 @@ -LIBC_RPC_DIR = $(LIBC_DIR)/libc/rpc +LIBC_RPC_DIR = $(LIBC_DIR)/lib/libc/rpc #SRC_C = $(notdir $(wildcard $(LIBC_RPC_DIR)/*.c)) @@ -7,5 +7,6 @@ SRC_C = bindresvport.c include $(REP_DIR)/lib/mk/libc-common.inc INC_DIR += $(REP_DIR)/include/libc/sys +INC_DIR += $(LIBC_PORT_DIR)/include/libc/sys vpath %.c $(LIBC_RPC_DIR) diff --git a/repos/libports/lib/mk/libc-stdio.mk b/repos/libports/lib/mk/libc-stdio.mk index 781b0128b4..ecb23552be 100644 --- a/repos/libports/lib/mk/libc-stdio.mk +++ b/repos/libports/lib/mk/libc-stdio.mk @@ -1,4 +1,4 @@ -LIBC_STDIO_DIR = $(LIBC_DIR)/libc/stdio +LIBC_STDIO_DIR = $(LIBC_DIR)/lib/libc/stdio SRC_C = $(notdir $(wildcard $(LIBC_STDIO_DIR)/*.c)) diff --git a/repos/libports/lib/mk/libc-stdlib.mk b/repos/libports/lib/mk/libc-stdlib.mk index 38ce537dbb..4ca40bef28 100644 --- a/repos/libports/lib/mk/libc-stdlib.mk +++ b/repos/libports/lib/mk/libc-stdlib.mk @@ -1,4 +1,4 @@ -LIBC_STDLIB_DIR = $(LIBC_DIR)/libc/stdlib +LIBC_STDLIB_DIR = $(LIBC_DIR)/lib/libc/stdlib FILTER_OUT = exit.c atexit.c malloc.c #SRC_C = $(notdir $(wildcard $(LIBC_STDLIB_DIR)/*.c)) diff --git a/repos/libports/lib/mk/libc-stdtime.mk b/repos/libports/lib/mk/libc-stdtime.mk index 776b41ea14..46c783b29e 100644 --- a/repos/libports/lib/mk/libc-stdtime.mk +++ b/repos/libports/lib/mk/libc-stdtime.mk @@ -1,4 +1,4 @@ -LIBC_STDTIME_DIR = $(LIBC_DIR)/libc/stdtime +LIBC_STDTIME_DIR = $(LIBC_DIR)/lib/libc/stdtime SRC_C = $(filter-out $(FILTER_OUT),$(notdir $(wildcard $(LIBC_STDTIME_DIR)/*.c))) diff --git a/repos/libports/lib/mk/libc-string.mk b/repos/libports/lib/mk/libc-string.mk index 4372fbdba8..8d2c7bd76f 100644 --- a/repos/libports/lib/mk/libc-string.mk +++ b/repos/libports/lib/mk/libc-string.mk @@ -9,7 +9,7 @@ # FILTER_OUT = strcoll.c strxfrm.c wcscoll.c wcsxfrm.c -LIBC_STRING_DIR = $(LIBC_DIR)/libc/string +LIBC_STRING_DIR = $(LIBC_DIR)/lib/libc/string SRC_C = $(filter-out $(FILTER_OUT),$(notdir $(wildcard $(LIBC_STRING_DIR)/*.c))) diff --git a/repos/libports/lib/mk/libc.mk b/repos/libports/lib/mk/libc.mk index 51b10c540b..1f759f60cd 100644 --- a/repos/libports/lib/mk/libc.mk +++ b/repos/libports/lib/mk/libc.mk @@ -27,7 +27,7 @@ SRC_C += strcoll.c strxfrm.c wcscoll.c wcsxfrm.c include $(REP_DIR)/lib/mk/libc-common.inc vpath % $(REP_DIR)/src/lib/libc -vpath % $(LIBC_DIR)/libc/string +vpath % $(LIBC_DIR)/lib/libc/string # # Shared library, for libc we need symbol versioning diff --git a/repos/libports/lib/mk/libc_ffat.mk b/repos/libports/lib/mk/libc_ffat.mk index 97860154d6..7313b79754 100644 --- a/repos/libports/lib/mk/libc_ffat.mk +++ b/repos/libports/lib/mk/libc_ffat.mk @@ -1,11 +1,5 @@ -FFAT_DIR = $(REP_DIR)/contrib/ff007e - -ifeq ($(wildcard $(FFAT_DIR)),) -REQUIRES += prepare_ffat -endif - -SRC_CC = plugin.cc -LIBS += libc ffat_block +SRC_CC = plugin.cc +LIBS += libc ffat_block vpath plugin.cc $(REP_DIR)/src/lib/libc_ffat diff --git a/repos/libports/lib/mk/libc_fuse_exfat.mk b/repos/libports/lib/mk/libc_fuse_exfat.mk index 492c122d4e..41cab03699 100644 --- a/repos/libports/lib/mk/libc_fuse_exfat.mk +++ b/repos/libports/lib/mk/libc_fuse_exfat.mk @@ -1,5 +1,4 @@ -include $(REP_DIR)/ports/exfat.inc -EXFAT_DIR = $(REP_DIR)/contrib/$(EXFAT) +EXFAT_DIR := $(call select_from_ports,exfat)/src/lib/exfat SRC_C = $(notdir $(EXFAT_DIR)/fuse/main.c) SRC_CC = init.cc diff --git a/repos/libports/lib/mk/libc_fuse_ext2.mk b/repos/libports/lib/mk/libc_fuse_ext2.mk index 2e4b9fd530..39eda17542 100644 --- a/repos/libports/lib/mk/libc_fuse_ext2.mk +++ b/repos/libports/lib/mk/libc_fuse_ext2.mk @@ -1,5 +1,5 @@ -include $(REP_DIR)/ports/fuse-ext2.inc -FUSE_EXT2_DIR = $(REP_DIR)/contrib/$(FUSE_EXT2)/fuse-ext2 +FUSE_EXT2_PORT_DIR := $(call select_from_ports,fuse-ext2) +FUSE_EXT2_DIR := $(FUSE_EXT2_PORT_DIR)/src/lib/fuse-ext2/fuse-ext2 FILTER_OUT = fuse-ext2.probe.c fuse-ext2.wait.c SRC_C = $(filter-out $(FILTER_OUT), $(notdir $(wildcard $(FUSE_EXT2_DIR)/*.c))) @@ -12,7 +12,8 @@ CC_OPT = -DHAVE_CONFIG_H -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 CC_CXX_OPT +=-fpermissive INC_DIR += $(REP_DIR)/src/lib/fuse-ext2 \ - $(FUSE_EXT2_DIR) + $(FUSE_EXT2_DIR) \ + $(FUSE_EXT2_PORT_DIR)/include/fuse-ext2 vpath %.c $(FUSE_EXT2_DIR) vpath %.cc $(REP_DIR)/src/lib/fuse-ext2 diff --git a/repos/libports/lib/mk/libc_fuse_ntfs-3g.mk b/repos/libports/lib/mk/libc_fuse_ntfs-3g.mk index 8af00ada7f..67de1a5506 100644 --- a/repos/libports/lib/mk/libc_fuse_ntfs-3g.mk +++ b/repos/libports/lib/mk/libc_fuse_ntfs-3g.mk @@ -1,5 +1,4 @@ -include $(REP_DIR)/ports/ntfs-3g.inc -NTFS_3G_DIR = $(REP_DIR)/contrib/$(NTFS_3G) +NTFS_3G_DIR := $(call select_from_ports,ntfs-3g)/src/lib/ntfs-3g SRC_C = ntfs-3g.c ntfs-3g_common.c SRC_CC = init.cc @@ -9,9 +8,9 @@ LIBS = libc libc_fuse libfuse libntfs-3g CC_OPT = -DHAVE_TIMESPEC -DHAVE_CONFIG_H -DRECORD_LOCKING_NOT_IMPLEMENTED INC_DIR += $(REP_DIR)/src/lib/ntfs-3g \ - $(REP_DIR)/contrib/$(NTFS_3G)/src + $(NTFS_3G_DIR)/src -vpath %.c $(NTFS_3G_DIR)/src +vpath %.c $(NTFS_3G_DIR)/src vpath %.cc $(REP_DIR)/src/lib/ntfs-3g SHARED_LIB = yes diff --git a/repos/libports/lib/mk/libcrypto.mk b/repos/libports/lib/mk/libcrypto.mk index 1dd1150cb6..46b437eb4e 100644 --- a/repos/libports/lib/mk/libcrypto.mk +++ b/repos/libports/lib/mk/libcrypto.mk @@ -1,5 +1,5 @@ -LIBCRYPTO = libcrypto-1.0.0 -LIBCRYPTO_DIR = $(REP_DIR)/contrib/openssl-1.0.1g/crypto +OPENSSL_PORT_DIR := $(call select_from_ports,openssl) +LIBCRYPTO_DIR := $(OPENSSL_PORT_DIR)/src/lib/openssl/crypto # # ARM is not supported currently (needs testing) @@ -205,6 +205,8 @@ SRC_S += rc4_md5.s endif INC_DIR += $(REP_DIR)/src/lib/openssl/$(TARGET_CPUARCH)/ +INC_DIR += $(OPENSSL_PORT_DIR)/src/lib/openssl/$(TARGET_CPUARCH)/ +INC_DIR += $(OPENSSL_PORT_DIR)/include # @@ -220,5 +222,5 @@ buildinf.h: echo " #define PLATFORM \"FreeBSD-$(TARGET_CPUARCH)\""; \ echo "#endif" ) > $@ -vpath %.s $(REP_DIR)/src/lib/openssl/$(TARGET_CPUARCH) +vpath %.s $(call select_from_ports,openssl)/src/lib/openssl/$(TARGET_CPUARCH) vpath %.c $(LIBCRYPTO_DIR) diff --git a/repos/libports/lib/mk/libdrm.mk b/repos/libports/lib/mk/libdrm.mk index bf7137f7c4..f8d96e887d 100644 --- a/repos/libports/lib/mk/libdrm.mk +++ b/repos/libports/lib/mk/libdrm.mk @@ -1,6 +1,6 @@ SRC_C = intel_bufmgr_gem.c intel_bufmgr.c ioctl.cc -LIBDRM_DIR := $(REP_DIR)/contrib/libdrm-2.4.21 +LIBDRM_DIR := $(call select_from_ports,libdrm)/src/lib/libdrm INC_DIR += $(LIBDRM_DIR) $(LIBDRM_DIR)/include/drm $(LIBDRM_DIR)/intel LIBS += libc cxx diff --git a/repos/libports/lib/mk/libexfat.mk b/repos/libports/lib/mk/libexfat.mk index faca7e6146..1173917336 100644 --- a/repos/libports/lib/mk/libexfat.mk +++ b/repos/libports/lib/mk/libexfat.mk @@ -1,5 +1,4 @@ -include $(REP_DIR)/ports/exfat.inc -EXFAT_DIR = $(REP_DIR)/contrib/$(EXFAT) +EXFAT_DIR = $(call select_from_ports,exfat)/src/lib/exfat #FILTER_OUT = win32_io.c #SRC_C = $(filter-out $(FILTER_OUT),$(notdir $(wildcard $(EXFAT_DIR)/libexfat/*.c))) diff --git a/repos/libports/lib/mk/libext2fs.mk b/repos/libports/lib/mk/libext2fs.mk index 8ea78930bb..e02a721795 100644 --- a/repos/libports/lib/mk/libext2fs.mk +++ b/repos/libports/lib/mk/libext2fs.mk @@ -1,8 +1,8 @@ -include $(REP_DIR)/ports/fuse-ext2.inc -FUSE_EXT2_DIR = $(REP_DIR)/contrib/$(FUSE_EXT2) -E2FSPROGS_DIR = $(FUSE_EXT2_DIR)/e2fsprogs-1.41.12.newgit -EXT2FS_DIR = $(E2FSPROGS_DIR)/ext2fs -ET_DIR = $(E2FSPROGS_DIR)/et +FUSE_EXT2_PORT_DIR := $(call select_from_ports,fuse-ext2) +FUSE_EXT2_DIR = $(FUSE_EXT2_PORT_DIR)/src/lib/fuse-ext2 +E2FSPROGS_DIR = $(FUSE_EXT2_DIR)/e2fsprogs-1.41.12.newgit +EXT2FS_DIR = $(E2FSPROGS_DIR)/ext2fs +ET_DIR = $(E2FSPROGS_DIR)/et FILTER_OUT = bmove.c dosio.c irel_ma.c nt_io.c tdbtool.c SRC_C = $(filter-out $(FILTER_OUT), $(notdir $(wildcard $(EXT2FS_DIR)/*.c))) @@ -10,6 +10,7 @@ SRC_C += $(notdir $(wildcard $(ET_DIR)/*.c)) INC_DIR += $(REP_DIR)/include/fuse-ext2 \ $(REP_DIR)/src/lib/fuse-ext2 \ + $(FUSE_EXT2_PORT_DIR)/include/fuse-ext2 \ $(ET_DIR) CC_OPT += -DHAVE_CONFIG_H -D__BSD_VISIBLE -DENABLE_DEBUG diff --git a/repos/libports/lib/mk/libiconv.mk b/repos/libports/lib/mk/libiconv.mk index 9a9887b9ff..d7062ef7ef 100644 --- a/repos/libports/lib/mk/libiconv.mk +++ b/repos/libports/lib/mk/libiconv.mk @@ -1,19 +1,19 @@ -include $(REP_DIR)/ports/libiconv.inc +LIBICONV_PORT_DIR := $(call select_from_ports,libiconv) -LIBICONV_DIR = $(REP_DIR)/contrib/$(LIBICONV) -LIBS += libc +LIBS += libc + +INC_DIR += $(LIBICONV_PORT_DIR)/include/iconv # find 'config.h' -INC_DIR += $(REP_DIR)/src/lib/libiconv INC_DIR += $(REP_DIR)/src/lib/libiconv/private -CC_DEF += -DLIBDIR=\"\" +CC_DEF += -DLIBDIR=\"\" -SRC_C = iconv.c \ - relocatable.c \ - localcharset.c +SRC_C := iconv.c \ + relocatable.c \ + localcharset.c SHARED_LIB = yes -vpath %.c $(LIBICONV_DIR)/lib -vpath %.c $(LIBICONV_DIR)/libcharset/lib +vpath %.c $(LIBICONV_PORT_DIR)/src/lib/libiconv/lib +vpath %.c $(LIBICONV_PORT_DIR)/src/lib/libiconv/libcharset/lib diff --git a/repos/libports/lib/mk/libm.mk b/repos/libports/lib/mk/libm.mk index 79bcb9e773..76860f715f 100644 --- a/repos/libports/lib/mk/libm.mk +++ b/repos/libports/lib/mk/libm.mk @@ -1,5 +1,7 @@ -LIBC_DIR = $(REP_DIR)/contrib/libc-8.2.0 -LIBM_DIR = $(LIBC_DIR)/msun +LIBC_PORT_DIR := $(call select_from_ports,libc) +LIBC_DIR := $(LIBC_PORT_DIR)/src/lib/libc +LIBM_DIR := $(LIBC_DIR)/lib/msun + LIBS = libc # @@ -15,7 +17,7 @@ INC_DIR += $(LIBM_DIR)/ld80 # # finding 'fpmath.h', included by 'invtrig.h' # -INC_DIR += $(LIBC_DIR)/libc/include +INC_DIR += $(LIBC_DIR)/lib/libc/include FILTER_OUT += s_exp2l.c diff --git a/repos/libports/lib/mk/libntfs-3g.mk b/repos/libports/lib/mk/libntfs-3g.mk index e636a7c060..18d4c297c0 100644 --- a/repos/libports/lib/mk/libntfs-3g.mk +++ b/repos/libports/lib/mk/libntfs-3g.mk @@ -1,11 +1,12 @@ -include $(REP_DIR)/ports/ntfs-3g.inc -NTFS_3G_DIR = $(REP_DIR)/contrib/$(NTFS_3G) +NTFS_3G_PORT_DIR := $(call select_from_ports,ntfs-3g) +NTFS_3G_DIR := $(NTFS_3G_PORT_DIR)/src/lib/ntfs-3g FILTER_OUT = win32_io.c SRC_C = $(filter-out $(FILTER_OUT),$(notdir $(wildcard $(NTFS_3G_DIR)/libntfs-3g/*.c))) INC_DIR += $(REP_DIR)/include/ntfs-3g \ - $(REP_DIR)/src/lib/ntfs-3g + $(REP_DIR)/src/lib/ntfs-3g \ + $(NTFS_3G_PORT_DIR)/include/ntfs-3g CC_OPT += -DHAVE_CONFIG_H -DRECORD_LOCKING_NOT_IMPLEMENTED -DDEBUG diff --git a/repos/libports/lib/mk/libpng.mk b/repos/libports/lib/mk/libpng.mk index 72be3b718e..76b3f3a99a 100644 --- a/repos/libports/lib/mk/libpng.mk +++ b/repos/libports/lib/mk/libpng.mk @@ -1,11 +1,10 @@ -LIBPNG = libpng-1.4.1 -LIBPNG_DIR = $(REP_DIR)/contrib/$(LIBPNG) -LIBS += libc libm zlib +LIBPNG_DIR := $(call select_from_ports,libpng)/src/lib/libpng +LIBS += libc libm zlib # find 'config.h' INC_DIR += $(REP_DIR)/src/lib/libpng -CC_DEF += -DHAVE_CONFIG_H -DPNG_CONFIGURE_LIBPNG +CC_DEF += -DHAVE_CONFIG_H -DPNG_CONFIGURE_LIBPNG SRC_C = png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \ pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c pngwtran.c \ diff --git a/repos/libports/lib/mk/libssh.mk b/repos/libports/lib/mk/libssh.mk index 90740eb41e..3d01728ba5 100644 --- a/repos/libports/lib/mk/libssh.mk +++ b/repos/libports/lib/mk/libssh.mk @@ -1,6 +1,4 @@ -include $(REP_DIR)/ports/libssh.inc - -LIBSSH_DIR = $(REP_DIR)/contrib/$(LIBSSH) +LIBSSH_PORT_DIR := $(call select_from_ports,libssh) SRC_C = \ agent.c \ @@ -43,7 +41,7 @@ SRC_C = \ threads.c \ wrapper.c -#INC_DIR += $(LIBSSH_DIR) +INC_DIR += $(LIBSSH_PORT_DIR)/include INC_DIR += $(REP_DIR)/src/lib/libssh CC_OPT += -DHAVE_CONFIG_H @@ -52,4 +50,4 @@ LIBS += libc zlib libcrypto SHARED_LIB = yes -vpath %.c $(LIBSSH_DIR)/src +vpath %.c $(LIBSSH_PORT_DIR)/src/lib/libssh/src diff --git a/repos/libports/lib/mk/libssl.mk b/repos/libports/lib/mk/libssl.mk index 09deebb12c..acec004608 100644 --- a/repos/libports/lib/mk/libssl.mk +++ b/repos/libports/lib/mk/libssl.mk @@ -1,12 +1,11 @@ -LIBSSL = libssl-1.0.0 -LIBSSL_DIR = $(REP_DIR)/contrib/openssl-1.0.1g +LIBSSL_PORT_DIR = $(call select_from_ports,openssl) # # ARM is not supported currently (needs testing) # REQUIRES = x86 -LIBS += libc libcrypto +LIBS += libc libcrypto SRC_C = s2_meth.c s2_srvr.c s2_clnt.c s2_lib.c s2_enc.c s2_pkt.c \ s3_meth.c s3_srvr.c s3_clnt.c s3_lib.c s3_enc.c s3_pkt.c s3_both.c s3_cbc.c \ @@ -19,8 +18,8 @@ SRC_C = s2_meth.c s2_srvr.c s2_clnt.c s2_lib.c s2_enc.c s2_pkt.c \ ssl_asn1.c ssl_txt.c ssl_algs.c \ bio_ssl.c ssl_err.c kssl.c tls_srp.c t1_reneg.c -INC_DIR += $(LIBSSL_DIR)/ -INC_DIR += $(LIBSSL_DIR)/crypto +INC_DIR += $(LIBSSL_PORT_DIR)/include/openssl +INC_DIR += $(LIBSSL_PORT_DIR)/src/lib/openssl/crypto ifeq ($(filter-out $(SPECS),x86_32),) TARGET_CPUARCH=x86_32 @@ -29,8 +28,9 @@ TARGET_CPUARCH=x86_64 endif INC_DIR += $(REP_DIR)/src/lib/openssl/$(TARGET_CPUARCH)/ +INC_DIR += $(LIBSSL_PORT_DIR)/src/lib/openssl/$(TARGET_CPUARCH)/ +INC_DIR += $(LIBSSL_PORT_DIR)/include - -vpath %.c $(LIBSSL_DIR)/ssl +vpath %.c $(LIBSSL_PORT_DIR)/src/lib/openssl/ssl SHARED_LIB = yes diff --git a/repos/libports/lib/mk/libutil.mk b/repos/libports/lib/mk/libutil.mk index 755ebc9617..465fe889d4 100644 --- a/repos/libports/lib/mk/libutil.mk +++ b/repos/libports/lib/mk/libutil.mk @@ -1,4 +1,4 @@ -LIBC_UTIL_DIR = $(LIBC_DIR)/libutil +LIBC_UTIL_DIR = $(LIBC_DIR)/lib/libutil # needed by libinetutils SRC_C = logout.c logwtmp.c trimdomain.c diff --git a/repos/libports/lib/mk/lua.inc b/repos/libports/lib/mk/lua.inc index 1da151495e..935e07a6a2 100644 --- a/repos/libports/lib/mk/lua.inc +++ b/repos/libports/lib/mk/lua.inc @@ -1,5 +1,4 @@ -LUA = lua-5.1.5 -LUA_DIR = $(REP_DIR)/contrib/$(LUA)/src +LUA_DIR := $(call select_from_ports,lua)/src/lib/lua/src LIBS += libc libm INC_DIR += $(LUA_DIR) CC_DEF = -DLUA_ANSI -DLUA_USE_MKSTEMP diff --git a/repos/libports/lib/mk/lwip.mk b/repos/libports/lib/mk/lwip.mk index 7fb8f2916a..6ed573d25f 100644 --- a/repos/libports/lib/mk/lwip.mk +++ b/repos/libports/lib/mk/lwip.mk @@ -4,9 +4,8 @@ # The library implementes TCP and UDP as well as DNS and DHCP. # -include $(REP_DIR)/ports/lwip.inc - -LWIP_DIR = $(REP_DIR)/contrib/$(LWIP) +LWIP_PORT_DIR := $(call select_from_ports,lwip) +LWIP_DIR := $(LWIP_PORT_DIR)/src/lib/lwip # Genode platform files SRC_CC = nic.cc printf.cc sys_arch.cc @@ -32,6 +31,7 @@ D_OPTS := $(addprefix -D,$(D_OPTS)) CC_DEF += $(D_OPTS) INC_DIR += $(REP_DIR)/include/lwip \ + $(LWIP_PORT_DIR)/include/lwip \ $(LWIP_DIR)/src/include \ $(LWIP_DIR)/src/include/ipv4 \ $(LWIP_DIR)/src/include/api \ diff --git a/repos/libports/lib/mk/mesa-egl.mk b/repos/libports/lib/mk/mesa-egl.mk index 7f4869e5a7..4b393e28ea 100644 --- a/repos/libports/lib/mk/mesa-egl.mk +++ b/repos/libports/lib/mk/mesa-egl.mk @@ -1,6 +1,6 @@ include $(REP_DIR)/lib/mk/mesa.inc -SRC_C := $(notdir $(wildcard $(MESA_DIR)/src/egl/main/*.c)) +SRC_C := $(notdir $(wildcard $(MESA_PORT_DIR)/src/lib/mesa/src/egl/main/*.c)) CC_OPT += -D_EGL_DRIVER_SEARCH_DIR=\"\" CC_OPT += -D_EGL_DEFAULT_DISPLAY=\"\" @@ -9,5 +9,5 @@ CC_OPT += -U__unix__ -U__unix # dim warning noise CC_OPT_eglconfig += -Wno-uninitialized -vpath %.c $(MESA_DIR)/src/egl/main +vpath %.c $(MESA_PORT_DIR)/src/lib/mesa/src/egl/main diff --git a/repos/libports/lib/mk/mesa.inc b/repos/libports/lib/mk/mesa.inc index 5173920ad9..0c84260cab 100644 --- a/repos/libports/lib/mk/mesa.inc +++ b/repos/libports/lib/mk/mesa.inc @@ -1,12 +1,7 @@ -MESA = Mesa-7.8.1 -MESA_DIR = $(REP_DIR)/contrib/$(MESA) -MESA_SRC_DIR = $(MESA_DIR)/src/mesa +MESA_PORT_DIR := $(call select_from_ports,mesa) +MESA_SRC_DIR := $(MESA_PORT_DIR)/src/lib/mesa/src/mesa -ifeq ($(wildcard $(MESA_DIR)),) -REQUIRES += prepare_mesa -endif - -LIBS += cxx libc libm +LIBS += cxx libc libm mesa_host_tools # # Prevent warning about non-existing 'fpu_control.h' included @@ -14,8 +9,9 @@ LIBS += cxx libc libm # CC_OPT += -U__linux__ -INC_DIR += $(MESA_DIR)/src/mesa \ - $(MESA_DIR)/src/gallium/include \ - $(MESA_DIR)/src/gallium/auxiliary +INC_DIR += $(MESA_PORT_DIR)/src/lib/mesa/src/mesa \ + $(MESA_PORT_DIR)/src/lib/mesa/src/gallium/include \ + $(MESA_PORT_DIR)/src/lib/mesa/src/gallium/auxiliary \ + $(MESA_PORT_DIR)/include #SHARED_LIB = yes diff --git a/repos/libports/lib/mk/mesa.mk b/repos/libports/lib/mk/mesa.mk index 1f987ff673..82dab10885 100644 --- a/repos/libports/lib/mk/mesa.mk +++ b/repos/libports/lib/mk/mesa.mk @@ -22,7 +22,7 @@ CC_OPT_texcompress_s3tc += -Wno-unused-but-set-variable CC_OPT_varray += -Wno-format # glsl library -GLSL_SRC_DIR = $(MESA_DIR)/src/glsl +GLSL_SRC_DIR = $(MESA_PORT_DIR)/src/lib/mesa/src/glsl GLSL_SUBDIRS = pp cl SRC_C += $(foreach subdir,$(GLSL_SUBDIRS),$(wildcard $(GLSL_SRC_DIR)/$(subdir)/*.c)) @@ -55,11 +55,11 @@ library: library/%_gc.h: %.gc $(MSG_CONVERT)$@ - $(VERBOSE)$(REP_DIR)/tool/mesa/glsl/compiler fragment $< $@ + $(VERBOSE)$(BUILD_BASE_DIR)/tool/mesa/glsl/compiler fragment $< $@ library/slang_vertex_builtin_gc.h: slang_vertex_builtin.gc $(MSG_CONVERT)$@ - $(VERBOSE)$(REP_DIR)/tool/mesa/glsl/compiler vertex $< $@ + $(VERBOSE)$(BUILD_BASE_DIR)/tool/mesa/glsl/compiler vertex $< $@ vpath %.gc $(MESA_SRC_DIR)/shader/slang/library diff --git a/repos/libports/lib/mk/mesa_host_tools.mk b/repos/libports/lib/mk/mesa_host_tools.mk new file mode 100644 index 0000000000..4d72fb8958 --- /dev/null +++ b/repos/libports/lib/mk/mesa_host_tools.mk @@ -0,0 +1,21 @@ +# +# Build shader compiler as host tool +# + +MESA_PORT_DIR := $(call select_from_ports,mesa) + +GLSL_COMPILER := $(BUILD_BASE_DIR)/tool/mesa/glsl/compiler + +HOST_TOOLS += $(GLSL_COMPILER) + +GLSL_SRC_C := $(wildcard $(MESA_PORT_DIR)/src/lib/mesa/src/glsl/pp/*.c) \ + $(wildcard $(MESA_PORT_DIR)/src/lib/mesa/src/glsl/cl/*.c) \ + $(MESA_PORT_DIR)/src/lib/mesa/src/glsl/apps/compile.c + +GLSL_CFLAGS = -I$(MESA_PORT_DIR)/src/lib/mesa/src/glsl/pp \ + -I$(MESA_PORT_DIR)/src/lib/mesa/src/glsl/cl + +$(GLSL_COMPILER): $(GLSL_SRC_C) + $(MSG_BUILD)tool/mesa/glsl/compiler + $(VERBOSE)mkdir -p $(dir $@) + $(VERBOSE)$(HOST_CC) $(GLSL_CFLAGS) $(GLSL_SRC_C) -o $@ diff --git a/repos/libports/lib/mk/mpc.mk b/repos/libports/lib/mk/mpc.mk index e9f46da9db..d9343577fb 100644 --- a/repos/libports/lib/mk/mpc.mk +++ b/repos/libports/lib/mk/mpc.mk @@ -1,12 +1,8 @@ include $(REP_DIR)/lib/import/import-mpc.mk -MPC_DIR = $(REP_DIR)/contrib/$(MPC) +MPC_DIR := $(call select_from_ports,mpc)/src/lib/mpc -ifeq ($(wildcard $(MPC_DIR)),) -REQUIRES += prepare_mpc -endif - -LIBS = libc gmp mpfr +LIBS := libc gmp mpfr SRC_C := $(notdir $(wildcard $(MPC_DIR)/src/*.c)) diff --git a/repos/libports/lib/mk/mpfr.mk b/repos/libports/lib/mk/mpfr.mk index fac1ad5c24..80ef4f62e1 100644 --- a/repos/libports/lib/mk/mpfr.mk +++ b/repos/libports/lib/mk/mpfr.mk @@ -1,17 +1,13 @@ -MPFR_DIR = $(REP_DIR)/contrib/mpfr-3.0.0 - -ifeq ($(wildcard $(MPFR_DIR)),) -REQUIRES += prepare_mpfr -endif +MPFR_PORT_DIR := $(call select_from_ports,mpfr) LIBS = libc gmp CC_OPT += -DHAVE_STDARG -DHAVE_VA_COPY -DHAVE_INTTYPES_H -INC_DIR += $(REP_DIR)/include/mpfr +INC_DIR += $(REP_DIR)/include/mpfr $(MPFR_PORT_DIR)/include/mpfr -MPFR_SRC_C := $(notdir $(wildcard $(MPFR_DIR)/*.c)) +MPFR_SRC_C := $(notdir $(wildcard $(MPFR_PORT_DIR)/src/lib/mpfr/*.c)) FILTER_OUT := ansi2knr.c jyn_asympt.c round_raw_generic.c speed.c tuneup.c SRC_C := $(filter-out $(FILTER_OUT),$(MPFR_SRC_C)) -vpath %.c $(MPFR_DIR) +vpath %.c $(MPFR_PORT_DIR)/src/lib/mpfr SHARED_LIB = 1 diff --git a/repos/libports/lib/mk/mupdf.mk b/repos/libports/lib/mk/mupdf.mk index 625fcff8dd..8c85efcebc 100644 --- a/repos/libports/lib/mk/mupdf.mk +++ b/repos/libports/lib/mk/mupdf.mk @@ -1,7 +1,6 @@ -MUPDF = mupdf-0.9 -MUPDF_DIR = $(REP_DIR)/contrib/$(MUPDF) -LIBS += libc jpeg zlib jbig2dec openjpeg freetype -INC_DIR += $(addprefix $(MUPDF_DIR)/,fitz pdf xps) +MUPDF_DIR := $(call select_from_ports,mupdf)/src/lib/mupdf +LIBS += libc jpeg zlib jbig2dec openjpeg freetype mupdf_host_tools +INC_DIR += $(addprefix $(MUPDF_DIR)/,fitz pdf xps) SRC_C = $(addprefix fitz/,$(notdir $(wildcard $(MUPDF_DIR)/fitz/*.c))) SRC_C += $(addprefix pdf/, $(notdir $(wildcard $(MUPDF_DIR)/pdf/*.c))) @@ -14,3 +13,37 @@ CC_WARN += -Wall -Wno-uninitialized -Wno-unused-but-set-variable vpath %.c $(MUPDF_DIR) SHARED_LIB = yes + +MUPDF_GEN_FILES := $(addprefix generated/,cmap_cns.h cmap_gb.h cmap_japan.h cmap_korea.h font_base14.h font_droid.h font_cjk.h) + +$(SRC_C:.c=.o): $(MUPDF_GEN_FILES) + +MUPDF_FONTDUMP := $(BUILD_BASE_DIR)/tool/mupdf/fontdump +MUPDF_CMAPDUMP := $(BUILD_BASE_DIR)/tool/mupdf/cmapdump + +define do_cmap_dump + $(MSG_CONVERT)$@ + $(VERBOSE)mkdir -p $(dir $@) + $(VERBOSE)$(MUPDF_CMAPDUMP) $@ $1 > /dev/null 2> /dev/null +endef + +define do_font_dump + $(MSG_CONVERT)$@ + $(VERBOSE)mkdir -p $(dir $@) + $(VERBOSE)$(MUPDF_FONTDUMP) $@ $1 > /dev/null 2> /dev/null +endef + +generated/cmap_cns.h: + $(call do_cmap_dump,$(MUPDF_DIR)/cmaps/cns/*) +generated/cmap_gb.h: + $(call do_cmap_dump,$(MUPDF_DIR)/cmaps/gb/*) +generated/cmap_japan.h: + $(call do_cmap_dump,$(MUPDF_DIR)/cmaps/japan/*) +generated/cmap_korea.h: + $(call do_cmap_dump,$(MUPDF_DIR)/cmaps/korea/*) +generated/font_base14.h: + $(call do_font_dump,$(MUPDF_DIR)/fonts/*.cff) +generated/font_droid.h: + $(call do_font_dump,$(addprefix $(MUPDF_DIR)/fonts/droid/,DroidSans.ttf DroidSansMono.ttf)) +generated/font_cjk.h: + $(call do_font_dump,$(MUPDF_DIR)/fonts/droid/DroidSansFallback.ttf) diff --git a/repos/libports/lib/mk/mupdf_host_tools.mk b/repos/libports/lib/mk/mupdf_host_tools.mk new file mode 100644 index 0000000000..cd0d682443 --- /dev/null +++ b/repos/libports/lib/mk/mupdf_host_tools.mk @@ -0,0 +1,15 @@ +# +# Compile host tools used to create generated header files +# + +MUPDF_FONTDUMP := $(BUILD_BASE_DIR)/tool/mupdf/fontdump +MUPDF_CMAPDUMP := $(BUILD_BASE_DIR)/tool/mupdf/cmapdump + +HOST_TOOLS += $(MUPDF_FONTDUMP) $(MUPDF_CMAPDUMP) + +MUPDF_DIR := $(call select_from_ports,mupdf)/src/lib/mupdf + +$(MUPDF_FONTDUMP) $(MUPDF_CMAPDUMP): $(MUPDF_DIR) + $(MSG_BUILD)$(notdir $@) + $(VERBOSE)mkdir -p $(dir $@) + $(VERBOSE)gcc $(addprefix -I$(MUPDF_DIR)/,fitz pdf) $(MUPDF_DIR)/scripts/$(notdir $@).c -o $@ diff --git a/repos/libports/lib/mk/ncurses.mk b/repos/libports/lib/mk/ncurses.mk index 6caf40e577..05c9470992 100644 --- a/repos/libports/lib/mk/ncurses.mk +++ b/repos/libports/lib/mk/ncurses.mk @@ -1,6 +1,5 @@ -NCURSES = ncurses-5.9 -NCURSES_DIR = $(REP_DIR)/contrib/$(NCURSES) -NCURSES_SRC_DIR = $(NCURSES_DIR)/ncurses +NCURSES_PORT_DIR := $(call select_from_ports,ncurses) +NCURSES_SRC_DIR := $(NCURSES_PORT_DIR)/src/lib/ncurses/ncurses # files from the 'ncurses/base/' subdirectory ALL_BASE_SRC_C = $(notdir $(wildcard $(NCURSES_SRC_DIR)/base/*.c)) @@ -22,10 +21,11 @@ SRC_C += $(notdir $(addprefix $(NCURSES_SRC_DIR)/trace/,lib_trace.c varargs.c vi vpath %.c $(NCURSES_SRC_DIR)/trace # files generated by 'make prepare' -SRC_C += $(notdir $(wildcard $(REP_DIR)/src/lib/ncurses/*.c)) -vpath %.c $(REP_DIR)/src/lib/ncurses +SRC_C += $(notdir $(wildcard $(NCURSES_PORT_DIR)/src/lib/ncurses/*.c)) +vpath %.c $(NCURSES_PORT_DIR)/src/lib/ncurses INC_DIR += $(NCURSES_SRC_DIR) +INC_DIR += $(NCURSES_PORT_DIR)/include/ncurses INC_DIR += $(REP_DIR)/include/ncurses LIBS += libc diff --git a/repos/libports/lib/mk/openjpeg.mk b/repos/libports/lib/mk/openjpeg.mk index 36638692f5..abe99f508f 100644 --- a/repos/libports/lib/mk/openjpeg.mk +++ b/repos/libports/lib/mk/openjpeg.mk @@ -1,5 +1,5 @@ OPENJPEG = openjpeg-1.4 -OPENJPEG_DIR = $(REP_DIR)/contrib/$(OPENJPEG)/libopenjpeg +OPENJPEG_DIR = $(call select_from_ports,openjpeg)/src/lib/openjpeg/libopenjpeg LIBS += libc libm INC_DIR += $(OPENJPEG_DIR) $(REP_DIR)/include/openjpeg diff --git a/repos/libports/lib/mk/pcre.mk b/repos/libports/lib/mk/pcre.mk index 053d76d735..1f625b885c 100644 --- a/repos/libports/lib/mk/pcre.mk +++ b/repos/libports/lib/mk/pcre.mk @@ -1,6 +1,4 @@ -include $(REP_DIR)/ports/pcre.inc - -PCRE_DIR = $(REP_DIR)/contrib/$(PCRE) +PCRE_PORT_DIR := $(call select_from_ports,pcre) SRC_C = pcre_byte_order.c \ pcre_chartables.c \ @@ -23,8 +21,9 @@ SRC_C = pcre_byte_order.c \ pcre_version.c \ pcre_xclass.c -INC_DIR += $(PCRE_DIR) -INC_DIR += $(REP_DIR)/src/lib/pcre/include +INC_DIR += $(PCRE_PORT_DIR)/include/pcre \ + $(PCRE_PORT_DIR)/src/lib/pcre \ + $(REP_DIR)/src/lib/pcre/include CC_OPT += -DHAVE_CONFIG_H @@ -32,5 +31,5 @@ LIBS += libc zlib readline SHARED_LIB = yes -vpath %.c $(PCRE_DIR) +vpath %.c $(PCRE_PORT_DIR)/src/lib/pcre vpath pcre_chartables.c $(REP_DIR)/src/lib/pcre diff --git a/repos/libports/lib/mk/python.inc b/repos/libports/lib/mk/python.inc index f97a1a021a..192bb532bb 100644 --- a/repos/libports/lib/mk/python.inc +++ b/repos/libports/lib/mk/python.inc @@ -1,7 +1,7 @@ -PYTHON = python-2.6.4 -PYTHON_DIR = $(REP_DIR)/contrib/$(PYTHON) -LIBS += libc libm -SHARED_LIB = yes +PYTHON_PORT_DIR := $(call select_from_ports,python) +PYTHON_DIR := $(PYTHON_PORT_DIR)/src/lib/python +LIBS += libc libm +SHARED_LIB = yes # use our custom 'pyconfig.h' file INC_DIR += $(REP_DIR)/include/python diff --git a/repos/libports/lib/mk/qoost.mk b/repos/libports/lib/mk/qoost.mk new file mode 100644 index 0000000000..f24f3b29ed --- /dev/null +++ b/repos/libports/lib/mk/qoost.mk @@ -0,0 +1 @@ +# this library contains only header files diff --git a/repos/libports/lib/mk/qt5_qnitpickerviewwidget.mk b/repos/libports/lib/mk/qt5_qnitpickerviewwidget.mk index 259a41bd7f..e0af8cc097 100644 --- a/repos/libports/lib/mk/qt5_qnitpickerviewwidget.mk +++ b/repos/libports/lib/mk/qt5_qnitpickerviewwidget.mk @@ -7,5 +7,5 @@ HEADERS += qnitpickerviewwidget.h vpath %.h $(REP_DIR)/include/qt5/qnitpickerviewwidget vpath %.cpp $(REP_DIR)/src/lib/qt5/qnitpickerviewwidget -LIBS += qt5_gui qt5_widgets qt5_core libc qt5_qpa_nitpicker +LIBS += qt5_gui qt5_widgets qt5_core libc qt5_qpa_nitpicker qoost diff --git a/repos/libports/lib/mk/qt5_qpa_nitpicker.mk b/repos/libports/lib/mk/qt5_qpa_nitpicker.mk index 6b190f1654..14ca790b46 100644 --- a/repos/libports/lib/mk/qt5_qpa_nitpicker.mk +++ b/repos/libports/lib/mk/qt5_qpa_nitpicker.mk @@ -29,7 +29,7 @@ INC_DIR += $(REP_DIR)/contrib/$(QT5)/qtbase/src/platformsupport/eventdispatchers $(REP_DIR)/contrib/$(QT5)/qtbase/include/QtCore/$(QT_VERSION) \ $(REP_DIR)/contrib/$(QT5)/qtbase/include/QtCore/$(QT_VERSION)/QtCore -LIBS += qt5_xml qt5_gui qt5_core libm freetype gallium +LIBS += qt5_xml qt5_gui qt5_core libm freetype gallium qoost vpath % $(call select_from_repositories,contrib/$(QT5)/qtbase/src/platformsupport/eventdispatchers) vpath % $(call select_from_repositories,contrib/$(QT5)/qtbase/src/platformsupport/input/evdevkeyboard) diff --git a/repos/libports/lib/mk/readline.mk b/repos/libports/lib/mk/readline.mk index 3702e2057a..b8fbff11b7 100644 --- a/repos/libports/lib/mk/readline.mk +++ b/repos/libports/lib/mk/readline.mk @@ -1,9 +1,11 @@ -READLINE = readline-6.0 -READLINE_DIR = $(REP_DIR)/contrib/$(READLINE) -LIBS += libc +READLINE_PORT_DIR := $(call select_from_ports,readline) +READLINE_DIR := $(READLINE_PORT_DIR)/src/lib/readline + +LIBS += libc # use our customized 'config.h' INC_DIR += $(REP_DIR)/include/readline +INC_DIR += $(READLINE_PORT_DIR)/include # add local readline headers to include-search path INC_DIR += $(READLINE_DIR)/src/base diff --git a/repos/libports/lib/mk/sdl.mk b/repos/libports/lib/mk/sdl.mk index 4ce71ac9f4..18b3143d9b 100644 --- a/repos/libports/lib/mk/sdl.mk +++ b/repos/libports/lib/mk/sdl.mk @@ -1,6 +1,5 @@ -include $(REP_DIR)/ports/sdl.inc - -SDL_DIR = $(REP_DIR)/contrib/$(SDL) +SDL_PORT_DIR := $(call select_from_ports,sdl) +SDL_DIR := $(SDL_PORT_DIR)/src/lib/sdl # build shared object SHARED_LIB = yes @@ -8,6 +7,9 @@ SHARED_LIB = yes # use default warning level for 3rd-party code CC_WARN = +INC_DIR += $(SDL_PORT_DIR)/include +INC_DIR += $(SDL_PORT_DIR)/include/SDL + # backends SRC_CC = video/SDL_genode_fb_video.cc \ video/SDL_genode_fb_events.cc \ diff --git a/repos/libports/lib/mk/sdl_image.mk b/repos/libports/lib/mk/sdl_image.mk index 5b1fcea667..d7d8d229e4 100644 --- a/repos/libports/lib/mk/sdl_image.mk +++ b/repos/libports/lib/mk/sdl_image.mk @@ -1,12 +1,13 @@ -include $(REP_DIR)/ports/sdl_image.inc +SDL_IMAGE_PORT_DIR := $(call select_from_ports,sdl_image) + +SRC_C = $(notdir $(wildcard $(SDL_IMAGE_PORT_DIR)/src/lib/sdl_image/IMG*.c)) -SRC_C = $(notdir $(wildcard $(REP_DIR)/contrib/$(SDL_IMAGE)/IMG*.c)) LIBS += libc libm sdl jpeg libpng zlib SUPPORTED_FORMATS = PNG JPG TGA PNM CC_OPT += $(addprefix -DLOAD_,$(SUPPORTED_FORMATS)) -vpath %.c $(REP_DIR)/contrib/$(SDL_IMAGE) +vpath %.c $(SDL_IMAGE_PORT_DIR)/src/lib/sdl_image SHARED_LIB = yes diff --git a/repos/libports/lib/mk/sdl_mixer.mk b/repos/libports/lib/mk/sdl_mixer.mk index d2a2150a8d..faab51a145 100644 --- a/repos/libports/lib/mk/sdl_mixer.mk +++ b/repos/libports/lib/mk/sdl_mixer.mk @@ -1,9 +1,9 @@ -include $(REP_DIR)/ports/sdl_mixer.inc +SDL_MIXER_PORT_DIR := $(call select_from_ports,sdl_mixer) # exclude example programs FILTER_OUT = playmus.c playwave.c -ALL_SDL_MIXER_SRC_C = $(notdir $(wildcard $(REP_DIR)/contrib/$(SDL_MIXER)/*.c)) +ALL_SDL_MIXER_SRC_C = $(notdir $(wildcard $(SDL_MIXER_PORT_DIR)/src/lib/sdl_mixer/*.c)) SRC_C = $(filter-out $(FILTER_OUT), $(ALL_SDL_MIXER_SRC_C)) @@ -14,6 +14,6 @@ CC_OPT_music = -Wno-unused-label -Wno-unused-function CC_OPT_load_aiff = -Wno-unused-but-set-variable CC_OPT_wavestream = -Wno-unused-but-set-variable -vpath %.c $(REP_DIR)/contrib/$(SDL_MIXER) +vpath %.c $(SDL_MIXER_PORT_DIR)/src/lib/sdl_mixer SHARED_LIB = yes diff --git a/repos/libports/lib/mk/sdl_net.mk b/repos/libports/lib/mk/sdl_net.mk index 35bc60f8d1..a11579621d 100644 --- a/repos/libports/lib/mk/sdl_net.mk +++ b/repos/libports/lib/mk/sdl_net.mk @@ -1,11 +1,11 @@ -include $(REP_DIR)/ports/sdl_net.inc -SDL_NET_DIR = $(REP_DIR)/contrib/$(SDL_NET) +SDL_NET_PORT_DIR := $(call select_from_ports,sdl_net) +SDL_NET_DIR := $(SDL_NET_PORT_DIR)/src/lib/sdl_net -SRC_C = $(notdir $(wildcard $(SDL_NET_DIR)/SDLnet*.c)) +SRC_C = $(notdir $(wildcard $(SDL_NET_PORT_DIR)/src/lib/sdl_net/SDLnet*.c)) -vpath %.c $(SDL_NET_DIR) +vpath %.c $(SDL_NET_PORT_DIR)/src/lib/sdl_net -INC_DIR += $(SDL_NET_DIR) +INC_DIR += $(SDL_NET_PORT_DIR)/src/lib/sdl_net LIBS += libc sdl diff --git a/repos/libports/lib/mk/sdl_ttf.mk b/repos/libports/lib/mk/sdl_ttf.mk index 1f5a2f8915..dce196cb93 100644 --- a/repos/libports/lib/mk/sdl_ttf.mk +++ b/repos/libports/lib/mk/sdl_ttf.mk @@ -1,8 +1,6 @@ -include $(REP_DIR)/ports/sdl_ttf.inc - SRC_C = SDL_ttf.c LIBS += libc libm freetype sdl -vpath %.c $(REP_DIR)/contrib/$(SDL_TTF) +vpath %.c $(call select_from_ports,sdl_ttf)/src/lib/sdl_ttf SHARED_LIB = yes diff --git a/repos/libports/lib/mk/stdcxx.mk b/repos/libports/lib/mk/stdcxx.mk index 6599344ae6..b783da3ed8 100644 --- a/repos/libports/lib/mk/stdcxx.mk +++ b/repos/libports/lib/mk/stdcxx.mk @@ -1,9 +1,16 @@ +STDCXX_PORT_DIR := $(call select_from_ports,stdcxx) + # determine location of libstdc++ source tree -include $(REP_DIR)/ports/stdcxx.inc -STDCXX_DIR = $(REP_DIR)/contrib/$(STDCXX) +STDCXX_DIR := $(STDCXX_PORT_DIR)/src/lib/stdcxx + +# public headers from port +INC_DIR += $(STDCXX_PORT_DIR)/include/stdcxx # enable 'atomic.cc' to find 'gstdint.h' -INC_DIR += $(REP_DIR)/include/stdcxx-genode/bits +INC_DIR += $(REP_DIR)/include/stdcxx/bits + +## enable 'allocator-inst.cc' to find 'memory' +#INC_DIR += $(REP_DIR)/include/stdcxx/std # exclude code that is no single compilation unit FILTER_OUT = hash-long-double-tr1-aux.cc diff --git a/repos/libports/lib/mk/swscale.mk b/repos/libports/lib/mk/swscale.mk index 08e921cc1c..666da526fd 100644 --- a/repos/libports/lib/mk/swscale.mk +++ b/repos/libports/lib/mk/swscale.mk @@ -4,7 +4,7 @@ include $(REP_DIR)/lib/import/import-swscale.mk CC_WARN += -Wno-switch -LIBSWSCALE_DIR = $(REP_DIR)/contrib/$(LIBAV)/libswscale +LIBSWSCALE_DIR = $(call select_from_ports,libav)/src/lib/libav/libswscale include $(LIBSWSCALE_DIR)/Makefile diff --git a/repos/libports/lib/mk/x86_32/gmp-mpn.mk b/repos/libports/lib/mk/x86_32/gmp-mpn.mk index 29404b923d..0eb754f1db 100644 --- a/repos/libports/lib/mk/x86_32/gmp-mpn.mk +++ b/repos/libports/lib/mk/x86_32/gmp-mpn.mk @@ -63,6 +63,5 @@ endif vpath %.c $(REP_DIR)/src/lib/gmp/mpn/32bit vpath %.c $(GMP_MPN_DIR)/generic -vpath %.asm $(REP_DIR)/src/lib/gmp/mpn/x86_32 vpath %.asm $(GMP_MPN_DIR)/x86/pentium vpath %.asm $(GMP_MPN_DIR)/x86 diff --git a/repos/libports/lib/mk/x86_32/libc-gen.mk b/repos/libports/lib/mk/x86_32/libc-gen.mk index 4be35b8668..fbf92ef795 100644 --- a/repos/libports/lib/mk/x86_32/libc-gen.mk +++ b/repos/libports/lib/mk/x86_32/libc-gen.mk @@ -1,6 +1,6 @@ include $(REP_DIR)/lib/mk/libc-gen.inc -LIBC_GEN_I386_DIR = $(LIBC_DIR)/libc/i386/gen +LIBC_GEN_I386_DIR = $(LIBC_DIR)/lib/libc/i386/gen FILTER_OUT_S += rfork_thread.S _setjmp.S setjmp.S FILTER_OUT_C += _set_tp.c diff --git a/repos/libports/lib/mk/x86_32/libc-setjmp.mk b/repos/libports/lib/mk/x86_32/libc-setjmp.mk index e996bafd5f..06ee21f74c 100644 --- a/repos/libports/lib/mk/x86_32/libc-setjmp.mk +++ b/repos/libports/lib/mk/x86_32/libc-setjmp.mk @@ -1,4 +1,4 @@ -LIBC_GEN_I386_DIR = $(LIBC_DIR)/libc/i386/gen +LIBC_GEN_I386_DIR = $(LIBC_DIR)/lib/libc/i386/gen SRC_S = _setjmp.S setjmp.S diff --git a/repos/libports/lib/mk/x86_64/gmp-mpn.mk b/repos/libports/lib/mk/x86_64/gmp-mpn.mk index d6319945ad..f08a3d57a1 100644 --- a/repos/libports/lib/mk/x86_64/gmp-mpn.mk +++ b/repos/libports/lib/mk/x86_64/gmp-mpn.mk @@ -13,12 +13,6 @@ SRC_ASM += copyd.asm copyi.asm CC_OPT_add_n = -DOPERATION_add_n CC_OPT_sub_n = -DOPERATION_sub_n -SRC_ASM += hamdist.asm -CC_OPT_hamdist = -DOPERATION_hamdist - -SRC_ASM += popcount.asm -CC_OPT_popcount = -DOPERATION_popcount - FILTER_OUT += popham.c SRC_C += $(notdir $(wildcard $(REP_DIR)/src/lib/gmp/mpn/64bit/*.c)) @@ -28,7 +22,7 @@ include $(REP_DIR)/lib/mk/gmp.inc PWD := $(shell pwd) -SRC_O += $(SRC_ASM:.asm=.o) +SRC_O += $(SRC_ASM:.asm=.o) hamdist.o popcount.o # # Create execution environment for the m4-ccas tool, which is used by the gmp @@ -54,6 +48,11 @@ ifneq ($(VERBOSE),) M4_OUTPUT_FILTER = > /dev/null endif +hamdist.o popcount.o: popham.asm + $(MSG_ASSEM)$@ + $(VERBOSE)cd m4env/mpn; \ + $(GMP_MPN_DIR)/m4-ccas --m4=m4 $(CC) $(CC_MARCH) -std=gnu99 -fPIC -DPIC -DOPERATION_${@:.o=} $(CC_OPT_$*) $(INCLUDES) -c $< -o $(PWD)/$@ \ + $(M4_OUTPUT_FILTER) %.o: %.asm $(MSG_ASSEM)$@ $(VERBOSE)cd m4env/mpn; \ @@ -62,5 +61,4 @@ endif vpath %.c $(REP_DIR)/src/lib/gmp/mpn/64bit vpath %.c $(GMP_MPN_DIR)/generic -vpath %.asm $(REP_DIR)/src/lib/gmp/mpn/x86_64 vpath %.asm $(GMP_MPN_DIR)/x86_64 diff --git a/repos/libports/lib/mk/x86_64/libc-gen.mk b/repos/libports/lib/mk/x86_64/libc-gen.mk index 87dc7029fc..1de88824fe 100644 --- a/repos/libports/lib/mk/x86_64/libc-gen.mk +++ b/repos/libports/lib/mk/x86_64/libc-gen.mk @@ -1,6 +1,6 @@ include $(REP_DIR)/lib/mk/libc-gen.inc -LIBC_GEN_AMD64_DIR = $(LIBC_DIR)/libc/amd64/gen +LIBC_GEN_AMD64_DIR = $(LIBC_DIR)/lib/libc/amd64/gen FILTER_OUT_S += rfork_thread.S setjmp.S _setjmp.S FILTER_OUT_C += _set_tp.c diff --git a/repos/libports/lib/mk/x86_64/libc-setjmp.mk b/repos/libports/lib/mk/x86_64/libc-setjmp.mk index 09890264c1..065531ab48 100644 --- a/repos/libports/lib/mk/x86_64/libc-setjmp.mk +++ b/repos/libports/lib/mk/x86_64/libc-setjmp.mk @@ -1,4 +1,4 @@ -LIBC_GEN_AMD64_DIR = $(LIBC_DIR)/libc/amd64/gen +LIBC_GEN_AMD64_DIR = $(LIBC_DIR)/lib/libc/amd64/gen SRC_S = _setjmp.S setjmp.S diff --git a/repos/libports/lib/mk/x86emu.mk b/repos/libports/lib/mk/x86emu.mk index fb3d4a5e14..2e165c26fa 100644 --- a/repos/libports/lib/mk/x86emu.mk +++ b/repos/libports/lib/mk/x86emu.mk @@ -2,8 +2,7 @@ # x86 real-mode emulation library # -X86EMU = x86emu-1.12.0 -X86EMU_DIR = $(REP_DIR)/contrib/$(X86EMU) +X86EMU_DIR = $(call select_from_ports,x86emu)/src/lib/x86emu/contrib INC_DIR += $(X86EMU_DIR) $(REP_DIR)/include/x86emu CC_OPT += -fomit-frame-pointer diff --git a/repos/libports/lib/mk/zlib.mk b/repos/libports/lib/mk/zlib.mk index ad12a6f025..9edcef190e 100644 --- a/repos/libports/lib/mk/zlib.mk +++ b/repos/libports/lib/mk/zlib.mk @@ -1,5 +1,4 @@ -ZLIB = zlib-1.2.8 -ZLIB_DIR = $(REP_DIR)/contrib/$(ZLIB) +ZLIB_DIR = $(call select_from_ports,zlib)/src/lib/zlib LIBS += libc INC_DIR += $(ZLIB_DIR) SRC_C = adler32.c compress.c crc32.c deflate.c gzclose.c \ diff --git a/repos/libports/ports/curl.hash b/repos/libports/ports/curl.hash new file mode 100644 index 0000000000..421376db9e --- /dev/null +++ b/repos/libports/ports/curl.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/libports/ports/curl.inc b/repos/libports/ports/curl.inc deleted file mode 100644 index f85b47b6a7..0000000000 --- a/repos/libports/ports/curl.inc +++ /dev/null @@ -1,2 +0,0 @@ -CURL_VERSION = 7.29.0 -CURL = curl-$(CURL_VERSION) diff --git a/repos/libports/ports/curl.mk b/repos/libports/ports/curl.mk deleted file mode 100644 index ee3b7f30d0..0000000000 --- a/repos/libports/ports/curl.mk +++ /dev/null @@ -1,46 +0,0 @@ -include ports/curl.inc - -CURL_TGZ = $(CURL).tar.gz -CURL_SIG = $(CURL_TGZ).asc -CURL_BASE_URL = http://curl.haxx.se/download -CURL_URL = $(CURL_BASE_URL)/$(CURL_TGZ) -CURL_URL_SIG = $(CURL_BASE_URL)/$(CURL_SIG) -CURL_KEY = daniel@haxx.se - -# -# Interface to top-level prepare Makefile -# -PORTS += $(CURL) - -prepare-curl: $(CONTRIB_DIR)/$(CURL) include/curl - -$(CONTRIB_DIR)/$(CURL): clean-curl - -# -# Port-specific local rules -# -$(DOWNLOAD_DIR)/$(CURL_TGZ): - $(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(CURL_URL) && touch $@ - -$(DOWNLOAD_DIR)/$(CURL_SIG): - $(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(CURL_URL_SIG) && touch $@ - -$(DOWNLOAD_DIR)/$(CURL_TGZ).verified: $(DOWNLOAD_DIR)/$(CURL_TGZ) $(DOWNLOAD_DIR)/$(CURL_SIG) - $(VERBOSE)$(SIGVERIFIER) $(DOWNLOAD_DIR)/$(CURL_TGZ) $(DOWNLOAD_DIR)/$(CURL_SIG) $(CURL_KEY) - $(VERBOSE)touch $@ - -$(CONTRIB_DIR)/$(CURL): $(DOWNLOAD_DIR)/$(CURL_TGZ).verified - $(VERBOSE)tar xfz $(<:.verified=) -C $(CONTRIB_DIR) && touch $@ - $(VERBOSE)find ./src/lib/curl/ -name "*.patch" |\ - xargs -ixxx sh -c "patch -p1 -r - -N -d $(CONTRIB_DIR)/$(CURL) < xxx" || true - -include/curl: - $(VERBOSE)mkdir -p $@ - $(VERBOSE)for f in $(shell find $(CONTRIB_DIR)/$(CURL)/include/curl -name *.h); do \ - ln -sf ../../$$f $@; done - @# This header is located in src/lib/curl/$(TARGET_ARCH)/curl - $(VERBOSE)rm -rf $@/curlbuild.h - -clean-curl: - $(VERBOSE)rm -rf $(CONTRIB_DIR)/$(CURL) - $(VERBOSE)rm -rf include/curl diff --git a/repos/libports/ports/curl.port b/repos/libports/ports/curl.port new file mode 100644 index 0000000000..9c5b2ce2a8 --- /dev/null +++ b/repos/libports/ports/curl.port @@ -0,0 +1,27 @@ +LICENSE := MIT +DOWNLOADS := curl.archive +VERSION := 7.29.0 + +URL(curl) := http://curl.haxx.se/download/curl-$(VERSION).tar.gz +SHA(curl) := 6f5fd02bd9db83d5a1e2f52c8fa3566a60eda4f1 +SIG(curl) := ${URL(curl)}.asc +KEY(curl) := daniel@haxx.se +DIR(curl) := src/lib/curl + +PATCHES := src/lib/curl/*.patch + +# +# Assemble public include directory. Filter out 'curlbuild.h' because we +# provide a custom version of this file in 'libports/include/curl/'. +# +# Don't use ':=' for the definition of 'DIR_CONTENT(include/curl)' and +# 'curl_headers' to defer the evaluation to the time when the directories are +# created. Otherwise, the '$(wildcard)' would be executed before the +# downloads are complete. +# +curl_include_dir := src/lib/curl/include/curl +curl_headers = $(filter-out curlbuild.h,$(notdir $(wildcard $(curl_include_dir)/*.h))) + +DIRS := include/curl +DIR_CONTENT(include/curl) = $(addprefix $(curl_include_dir)/,$(curl_headers)) + diff --git a/repos/libports/ports/exfat.hash b/repos/libports/ports/exfat.hash new file mode 100644 index 0000000000..421376db9e --- /dev/null +++ b/repos/libports/ports/exfat.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/libports/ports/exfat.inc b/repos/libports/ports/exfat.inc deleted file mode 100644 index 8514ad6f82..0000000000 --- a/repos/libports/ports/exfat.inc +++ /dev/null @@ -1,2 +0,0 @@ -EXFAT_VERSION = 1.0.1 -EXFAT = fuse-exfat-$(EXFAT_VERSION) diff --git a/repos/libports/ports/exfat.mk b/repos/libports/ports/exfat.mk deleted file mode 100644 index 0a98db25aa..0000000000 --- a/repos/libports/ports/exfat.mk +++ /dev/null @@ -1,35 +0,0 @@ -include ports/exfat.inc - -EXFAT_TGZ = $(EXFAT).tar.gz -EXFAT_BASE_URL = https://exfat.googlecode.com/files -EXFAT_URL = $(EXFAT_BASE_URL)/$(EXFAT_TGZ) - -# -# Interface to top-level prepare Makefile -# -PORTS += exfat - -prepare-exfat: $(CONTRIB_DIR)/$(EXFAT) include/exfat - -# -# Port-specific local rules -# -$(DOWNLOAD_DIR)/$(EXFAT_TGZ): - $(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(EXFAT_URL) && touch $@ - -$(CONTRIB_DIR)/$(EXFAT): $(DOWNLOAD_DIR)/$(EXFAT_TGZ) - $(VERBOSE)tar xfz $< -C $(CONTRIB_DIR) && touch $@ - $(VERBOSE)patch -N -p0 < src/lib/exfat/main.c.patch - -# -# Install exfat headers -# - -include/exfat: - $(VERBOSE)mkdir -p $@ - $(VERBOSE)for i in `find $(CONTRIB_DIR)/$(EXFAT)/libexfat -name *.h`; do \ - ln -fs ../../$$i $@; done - -clean-exfat: - $(VERBOSE)rm -rf include/exfat - $(VERBOSE)rm -rf $(CONTRIB_DIR)/$(EXFAT) diff --git a/repos/libports/ports/exfat.port b/repos/libports/ports/exfat.port new file mode 100644 index 0000000000..3422a1ddba --- /dev/null +++ b/repos/libports/ports/exfat.port @@ -0,0 +1,12 @@ +LICENSE := GPLv3 +VERSION := 1.0.1 +DOWNLOADS := exfat.archive + +URL(exfat) := https://exfat.googlecode.com/files/fuse-exfat-$(VERSION).tar.gz +SHA(exfat) := e24d2322797c26fb3bff5952c23f52f3274e887f +DIR(exfat) := src/lib/exfat + +PATCHES := src/lib/exfat/main.c.patch + +DIRS := include +DIR_CONTENT(include) := src/lib/exfat/libexfat/*.h diff --git a/repos/libports/ports/expat.hash b/repos/libports/ports/expat.hash new file mode 100644 index 0000000000..421376db9e --- /dev/null +++ b/repos/libports/ports/expat.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/libports/ports/expat.mk b/repos/libports/ports/expat.mk deleted file mode 100644 index badd12361d..0000000000 --- a/repos/libports/ports/expat.mk +++ /dev/null @@ -1,25 +0,0 @@ -include lib/import/import-expat.mk - -EXPAT_TGZ = $(EXPAT).tar.gz -EXPAT_URL = http://sourceforge.net/projects/expat/files/expat/$(EXPAT_VER)/$(EXPAT_TGZ) - -# -# Interface to top-level prepare Makefile -# -PORTS += $(EXPAT) - -prepare-expat: $(CONTRIB_DIR)/$(EXPAT) - -$(CONTRIB_DIR)/$(EXPAT):clean-expat - -# -# Port-specific local rules -# -$(DOWNLOAD_DIR)/$(EXPAT_TGZ): - $(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(EXPAT_URL) && touch $@ - -$(CONTRIB_DIR)/$(EXPAT): $(DOWNLOAD_DIR)/$(EXPAT_TGZ) - $(VERBOSE)tar xfz $< -C $(CONTRIB_DIR) && touch $@ - -clean-expat: - $(VERBOSE)rm -rf $(CONTRIB_DIR)/$(EXPAT) diff --git a/repos/libports/ports/expat.port b/repos/libports/ports/expat.port new file mode 100644 index 0000000000..af61ce6202 --- /dev/null +++ b/repos/libports/ports/expat.port @@ -0,0 +1,10 @@ +LICENSE := MIT +DOWNLOADS := expat.archive +VERSION := 2.1.0 + +URL(expat) := http://sourceforge.net/projects/expat/files/expat/$(VERSION)/expat-$(VERSION).tar.gz +SHA(expat) := b08197d146930a5543a7b99e871cba3da614f6f0 +DIR(expat) := src/lib/expat/contrib + +DIRS := include +DIR_CONTENT(include) := src/lib/expat/contrib/lib/*.h diff --git a/repos/libports/ports/ffat.hash b/repos/libports/ports/ffat.hash new file mode 100644 index 0000000000..421376db9e --- /dev/null +++ b/repos/libports/ports/ffat.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/libports/ports/ffat.mk b/repos/libports/ports/ffat.mk deleted file mode 100644 index fccfbce354..0000000000 --- a/repos/libports/ports/ffat.mk +++ /dev/null @@ -1,48 +0,0 @@ -FFAT = ff007e -FFAT_ZIP = $(FFAT).zip - -# -# Download archive from genode.org instead of the original location -# 'http://elm-chan.org/fsw/ff/ff007e.zip' because the elm-chan webserver -# does not like wget. -# -FFAT_URL = http://genode.org/files/$(FFAT_ZIP) - -# -# Interface to top-level prepare Makefile -# -PORTS += ffat-0.07e - -# -# Check for tools -# -$(call check_tool,unzip) - -prepare-ffat: $(CONTRIB_DIR)/$(FFAT) - -$(CONTRIB_DIR)/$(FFAT): clean-ffat - -# -# Port-specific local rules -# -$(DOWNLOAD_DIR)/$(FFAT_ZIP): - $(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(FFAT_URL) && touch $@ - -FFAT_HEADERS := ff.h diskio.h integer.h ffconf.h -FFAT_DELETE := diskio.c -FFAT_PATCH := config.patch - -include/ffat: - $(VERBOSE)mkdir -p $@ - -$(CONTRIB_DIR)/$(FFAT): $(DOWNLOAD_DIR)/$(FFAT_ZIP) include/ffat - $(VERBOSE)unzip $< -d $(CONTRIB_DIR)/$(FFAT) && touch $@ - @# create symbolic links for public headers from contrib dir - $(VERBOSE)for i in $(FFAT_HEADERS); do \ - ln -sf ../../$(CONTRIB_DIR)/$(FFAT)/src/$$i include/ffat/; done - $(VERBOSE)rm $(addprefix $(CONTRIB_DIR)/$(FFAT)/src/,$(FFAT_DELETE)) - $(VERBOSE)patch -d $(CONTRIB_DIR)/$(FFAT) -p1 -i $(CURDIR)/src/lib/ffat/config.patch - -clean-ffat: - $(VERBOSE)rm -f $(addprefix include/ffat/,$(FFAT_HEADERS)) - $(VERBOSE)rm -rf $(CONTRIB_DIR)/$(FFAT) diff --git a/repos/libports/ports/ffat.port b/repos/libports/ports/ffat.port new file mode 100644 index 0000000000..4b64f8a975 --- /dev/null +++ b/repos/libports/ports/ffat.port @@ -0,0 +1,18 @@ +LICENSE := BSD +VERSION := 0.07e +DOWNLOADS := ffat.archive + +# +# Download archive from genode.org instead of the original location +# 'http://elm-chan.org/fsw/ff/ff007e.zip' because the elm-chan webserver +# does not like wget. +# +URL(ffat) := http://genode.org/files/ff007e.zip +SHA(ffat) := 3379ad817e1c4f9993ae2722e86235ec85d7e36d +DIR(ffat) := src/lib/ffat + +PATCHES := src/lib/ffat/config.patch + +DIRS := include/ffat +DIR_CONTENT(include/ffat) := $(addprefix src/lib/ffat/src/,\ + ff.h diskio.h integer.h ffconf.h) diff --git a/repos/libports/ports/freetype.hash b/repos/libports/ports/freetype.hash new file mode 100644 index 0000000000..421376db9e --- /dev/null +++ b/repos/libports/ports/freetype.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/libports/ports/freetype.mk b/repos/libports/ports/freetype.mk deleted file mode 100644 index 5ab6f54012..0000000000 --- a/repos/libports/ports/freetype.mk +++ /dev/null @@ -1,43 +0,0 @@ -FREETYPE = freetype-2.3.9 -FREETYPE_TGZ = $(FREETYPE).tar.gz -FREETYPE_SIG = $(FREETYPE_TGZ).sig -FREETYPE_BASE_URL = http://mirrors.zerg.biz/nongnu/freetype/freetype-old -FREETYPE_URL = $(FREETYPE_BASE_URL)/$(FREETYPE_TGZ) -FREETYPE_URL_SIG = $(FREETYPE_BASE_URL)/$(FREETYPE_SIG) -FREETYPE_KEY = wl@gnu.org - -# -# Interface to top-level prepare Makefile -# -PORTS += $(FREETYPE) - -prepare-freetype: $(CONTRIB_DIR)/$(FREETYPE) include/freetype include/ft2build.h - -$(CONTRIB_DIR)/$(FREETYPE): clean-freetype - -# -# Port-specific local rules -# -$(DOWNLOAD_DIR)/$(FREETYPE_TGZ): - $(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(FREETYPE_URL) && touch $@ - -$(DOWNLOAD_DIR)/$(FREETYPE_SIG): - $(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(FREETYPE_URL_SIG) && touch $@ - -$(DOWNLOAD_DIR)/$(FREETYPE_TGZ).verified: $(DOWNLOAD_DIR)/$(FREETYPE_TGZ) $(DOWNLOAD_DIR)/$(FREETYPE_SIG) - $(VERBOSE)$(SIGVERIFIER) $(DOWNLOAD_DIR)/$(FREETYPE_TGZ) $(DOWNLOAD_DIR)/$(FREETYPE_SIG) $(FREETYPE_KEY) - $(VERBOSE)touch $@ - -$(CONTRIB_DIR)/$(FREETYPE): $(DOWNLOAD_DIR)/$(FREETYPE_TGZ).verified - $(VERBOSE)tar xfz $(<:.verified=) -C $(CONTRIB_DIR) && touch $@ - -include/freetype: - $(VERBOSE)ln -s ../$(CONTRIB_DIR)/$(FREETYPE)/include/freetype $@ - -include/ft2build.h: - $(VERBOSE)ln -s ../$(CONTRIB_DIR)/$(FREETYPE)/$@ $@ - -clean-freetype: - $(VERBOSE)rm -rf include/freetype - $(VERBOSE)rm -f include/ft2build.h - $(VERBOSE)rm -rf $(CONTRIB_DIR)/$(FREETYPE) diff --git a/repos/libports/ports/freetype.port b/repos/libports/ports/freetype.port new file mode 100644 index 0000000000..0dc4f74824 --- /dev/null +++ b/repos/libports/ports/freetype.port @@ -0,0 +1,17 @@ +LICENSE := GPLv2 +VERSION := 2.3.9 + +DOWNLOADS := freetype.archive + +BASE_URL := http://mirrors.zerg.biz/nongnu/freetype/freetype-old + +URL(freetype) := $(BASE_URL)/freetype-$(VERSION).tar.gz +SIG(freetype) := ${URL(freetype)}.sig +KEY(freetype) := wl@gnu.org +SHA(freetype) := 2c82a4f87b076c13d878129c8651645803585ff4 +DIR(freetype) := src/lib/freetype/contrib + +DIRS := include include/freetype + +DIR_CONTENT(include) := src/lib/freetype/contrib/include/ft2build.h +DIR_CONTENT(include/freetype) := src/lib/freetype/contrib/include/freetype/* diff --git a/repos/libports/ports/fribidi.hash b/repos/libports/ports/fribidi.hash new file mode 100644 index 0000000000..421376db9e --- /dev/null +++ b/repos/libports/ports/fribidi.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/libports/ports/fribidi.inc b/repos/libports/ports/fribidi.inc deleted file mode 100644 index f676cef2ac..0000000000 --- a/repos/libports/ports/fribidi.inc +++ /dev/null @@ -1,2 +0,0 @@ -FRIBIDI_VERSION := 0.19.5 -FRIBIDI := fribidi-$(FRIBIDI_VERSION) diff --git a/repos/libports/ports/fribidi.mk b/repos/libports/ports/fribidi.mk deleted file mode 100644 index 879a108823..0000000000 --- a/repos/libports/ports/fribidi.mk +++ /dev/null @@ -1,58 +0,0 @@ -include ports/fribidi.inc - -FRIBIDI_TBZ2 = $(FRIBIDI).tar.bz2 -FRIBIDI_SHA = $(FRIBIDI_TBZ2).sha256 -FRIBIDI_SHA_SIG = $(FRIBIDI_TBZ2).sha256.asc -FRIBIDI_BASE_URL = http://fribidi.org/download -FRIBIDI_URL = $(FRIBIDI_BASE_URL)/$(FRIBIDI_TBZ2) -FRIBIDI_URL_SHA = $(FRIBIDI_BASE_URL)/$(FRIBIDI_SHA) -FRIBIDI_URL_SIG = $(FRIBIDI_BASE_URL)/$(FRIBIDI_SHA_SIG) -FRIBIDI_KEY = D3531115 - -# -# Interface to top-level prepare Makefile -# -PORTS += $(FRIBIDI) - -prepare-fribidi: $(CONTRIB_DIR)/$(FRIBIDI) include/fribidi/fribidi.h - -$(CONTRIB_DIR)/$(FRIBIDI):clean-fribidi - -# -# Port-specific local rules -# -$(DOWNLOAD_DIR)/$(FRIBIDI_TBZ2): - $(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(FRIBIDI_URL) && touch $@ - -$(DOWNLOAD_DIR)/$(FRIBIDI_SHA): - $(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(FRIBIDI_URL_SHA) && touch $@ - -$(DOWNLOAD_DIR)/$(FRIBIDI_SHA_SIG): - $(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(FRIBIDI_URL_SIG) && touch $@ - -$(DOWNLOAD_DIR)/$(FRIBIDI_TBZ2).verified: $(DOWNLOAD_DIR)/$(FRIBIDI_TBZ2) \ - $(DOWNLOAD_DIR)/$(FRIBIDI_SHA) \ - $(DOWNLOAD_DIR)/$(FRIBIDI_SHA_SIG) - # XXX fribidi does NOT create a detached signature and thus the signature - # checking is useless !!! -- somebody should inform them - # see http://blog.terryburton.co.uk/2006/11/falling-into-trap-with-gpg.html - #$(VERBOSE)$(SIGVERIFIER) $(DOWNLOAD_DIR)/$(FRIBIDI_SHA) $(DOWNLOAD_DIR)/$(FRIBIDI_SHA_SIG) $(FRIBIDI_KEY) - $(VERBOSE)$(HASHVERIFIER) $(DOWNLOAD_DIR)/$(FRIBIDI_TBZ2) $(DOWNLOAD_DIR)/$(FRIBIDI_SHA) sha256 - $(VERBOSE)touch $@ - -$(CONTRIB_DIR)/$(FRIBIDI): $(DOWNLOAD_DIR)/$(FRIBIDI_TBZ2).verified - $(VERBOSE)tar xfj $(<:.verified=) -C $(CONTRIB_DIR) && touch $@ - -FRIBIDI_INCLUDES = fribidi.h - -include/fribidi/fribidi.h: - $(VERBOSE)for i in lib charset; do \ - for j in `find $(CONTRIB_DIR)/$(FRIBIDI)/$$i -name "fribidi*.h"`; do \ - name=`basename $$j`; \ - ln -sf ../../$(CONTRIB_DIR)/$(FRIBIDI)/$$i/$$name $(dir $@)$$name; \ - done; \ - done - -clean-fribidi: - $(VERBOSE)find include/fribidi -type l -delete - $(VERBOSE)rm -rf $(CONTRIB_DIR)/$(FRIBIDI) diff --git a/repos/libports/ports/fribidi.port b/repos/libports/ports/fribidi.port new file mode 100644 index 0000000000..6025d9f2ca --- /dev/null +++ b/repos/libports/ports/fribidi.port @@ -0,0 +1,12 @@ +LICENSE := LGPL +VERSION := 0.19.5 +DOWNLOADS := fribidi.archive + +URL(fribidi) := http://fribidi.org/download/fribidi-$(VERSION).tar.bz2 +SHA(fribidi) := 58445266df185f7e5109f356c0261d41db39182a +DIR(fribidi) := src/lib/fribidi/contrib + +DIRS := include/fribidi + +DIR_CONTENT(include/fribidi) := src/lib/fribidi/contrib/lib/*.h \ + src/lib/fribidi/contrib/charset/*.h diff --git a/repos/libports/ports/fuse-ext2.hash b/repos/libports/ports/fuse-ext2.hash new file mode 100644 index 0000000000..421376db9e --- /dev/null +++ b/repos/libports/ports/fuse-ext2.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/libports/ports/fuse-ext2.inc b/repos/libports/ports/fuse-ext2.inc deleted file mode 100644 index 9557d1b4ee..0000000000 --- a/repos/libports/ports/fuse-ext2.inc +++ /dev/null @@ -1,4 +0,0 @@ -FUSE_EXT2_REV := 220 -FUSE_EXT2_VERSION := svn-$(FUSE_EXT2_REV) -FUSE_EXT2 := fuse-ext2-$(FUSE_EXT2_VERSION) - diff --git a/repos/libports/ports/fuse-ext2.mk b/repos/libports/ports/fuse-ext2.mk deleted file mode 100644 index 4cc185be5e..0000000000 --- a/repos/libports/ports/fuse-ext2.mk +++ /dev/null @@ -1,36 +0,0 @@ -include ports/fuse-ext2.inc - -FUSE_EXT2_SVN_URL = http://svn.code.sf.net/p/fuse-ext2/code/branch/renzo -EXT2_DIR = e2fsprogs-1.41.12.newgit/ - -# -# Interface to top-level prepare Makefile -# -PORTS += $(FUSE_EXT2) - -prepare-fuse-ext2: $(CONTRIB_DIR)/$(FUSE_EXT2) include/fuse-ext2 - -# -# Port-specific local rules -# -$(CONTRIB_DIR)/$(FUSE_EXT2): - $(ECHO) "checking out 'fuse-ext2 rev. $(FUSE_EXT2_REV)' to '$@'" - $(VERBOSE)svn export $(FUSE_EXT2_SVN_URL)@$(FUSE_EXT2_REV) $@ - $(VERBOSE)for i in src/lib/fuse-ext2/patches/*.patch; do \ - patch -N -p0 < $$i; done || true - -# -# Install fuse-ext2 headers -# -# -include/fuse-ext2: - $(VERBOSE)mkdir -p $@/{e2p,et,ext2fs} - $(VERBOSE)for j in e2p et ext2fs; do \ - for i in `find $(CONTRIB_DIR)/$(FUSE_EXT2)/$(EXT2_DIR)/$$j -name *.h`; do \ - ln -fs ../../../$$i $@/$$j; \ - done; done - -clean-fuse-ext2: - $(VERBOSE)rm -rf include/fuse-ext2 - $(VERBOSE)rm -rf $(CONTRIB_DIR)/$(FUSE_EXT2) - diff --git a/repos/libports/ports/fuse-ext2.port b/repos/libports/ports/fuse-ext2.port new file mode 100644 index 0000000000..c3d3bd02d9 --- /dev/null +++ b/repos/libports/ports/fuse-ext2.port @@ -0,0 +1,16 @@ +LICENSE := GPLv2 +VERSION := svn-220 +DOWNLOADS := fuse-ext2.svn + +URL(fuse-ext2) := http://svn.code.sf.net/p/fuse-ext2/code/branch/renzo +REV(fuse-ext2) := 220 +DIR(fuse-ext2) := src/lib/fuse-ext2 + +PATCHES := src/lib/fuse-ext2/patches/*.patch + +DIRS := $(addprefix include/fuse-ext2/,e2p et ext2fs) +e2fs_dir := src/lib/fuse-ext2/e2fsprogs-1.41.12.newgit + +DIR_CONTENT(include/fuse-ext2/e2p) := $(e2fs_dir)/e2p/*.h +DIR_CONTENT(include/fuse-ext2/et) := $(e2fs_dir)/et/*.h +DIR_CONTENT(include/fuse-ext2/ext2fs) := $(e2fs_dir)/ext2fs/*.h diff --git a/repos/libports/ports/gmp.hash b/repos/libports/ports/gmp.hash new file mode 100644 index 0000000000..421376db9e --- /dev/null +++ b/repos/libports/ports/gmp.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/libports/ports/gmp.mk b/repos/libports/ports/gmp.mk deleted file mode 100644 index f875fe9a86..0000000000 --- a/repos/libports/ports/gmp.mk +++ /dev/null @@ -1,101 +0,0 @@ -GMP = gmp-4.3.2 -GMP_TBZ2 = $(GMP).tar.bz2 -GMP_SIG = $(GMP_TBZ2).sig -GMP_BASE_URL = ftp://ftp.gmplib.org/pub/$(GMP) -GMP_URL = $(GMP_BASE_URL)/$(GMP_TBZ2) -GMP_URL_SIG = $(GMP_BASE_URL)/$(GMP_SIG) -GMP_KEY = "73D46C3667461E4BD93972495D6D47DFDB899F46 343C2FF0FBEE5EC2EDBEF399F3599FF828C67298" - -# -# Interface to top-level prepare Makefile -# -PORTS += $(GMP) - -GMP_INCLUDES = include/gmp/gmp-impl.h -GMP_INCLUDES += include/gmp/arm/gmp-mparam.h -GMP_INCLUDES += include/gmp/x86_32/gmp-mparam.h -GMP_INCLUDES += include/gmp/x86_64/gmp-mparam.h -GMP_SRC += src/lib/gmp/mpn/asm-defs.m4 \ - src/lib/gmp/mpn/arm/hamdist.c \ - src/lib/gmp/mpn/arm/popcount.c \ - src/lib/gmp/mpn/x86_32/add_n.asm \ - src/lib/gmp/mpn/x86_32/sub_n.asm \ - src/lib/gmp/mpn/x86_64/add_n.asm \ - src/lib/gmp/mpn/x86_64/sub_n.asm \ - src/lib/gmp/mpn/x86_64/hamdist.asm \ - src/lib/gmp/mpn/x86_64/popcount.asm - -prepare-gmp: $(CONTRIB_DIR)/$(GMP) $(GMP_INCLUDES) $(GMP_SRC) - -$(CONTRIB_DIR)/$(GMP): clean-gmp - -# -# Port-specific local rules -# -$(DOWNLOAD_DIR)/$(GMP_TBZ2): - $(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(GMP_URL) && touch $@ - -$(DOWNLOAD_DIR)/$(GMP_SIG): - $(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(GMP_URL_SIG) && touch $@ - -$(DOWNLOAD_DIR)/$(GMP_TBZ2).verified: $(DOWNLOAD_DIR)/$(GMP_TBZ2) $(DOWNLOAD_DIR)/$(GMP_SIG) - $(VERBOSE)$(SIGVERIFIER) $(DOWNLOAD_DIR)/$(GMP_TBZ2) $(DOWNLOAD_DIR)/$(GMP_SIG) $(GMP_KEY) - -$(CONTRIB_DIR)/$(GMP): $(DOWNLOAD_DIR)/$(GMP_TBZ2).verified - $(VERBOSE)tar xfj $(<:.verified=) -C $(CONTRIB_DIR) && touch $@ - -include/gmp/gmp-impl.h: - $(VERBOSE)ln -sf ../../$(CONTRIB_DIR)/$(GMP)/gmp-impl.h $@ - -include/gmp/arm/gmp-mparam.h: $(CONTRIB_DIR)/$(GMP)/mpn/arm/gmp-mparam.h - $(VERBOSE)mkdir -p include/gmp/arm - $(VERBOSE)ln -sf ../../../$< $@ - -include/gmp/x86_32/gmp-mparam.h: $(CONTRIB_DIR)/$(GMP)/mpn/x86/pentium/gmp-mparam.h - $(VERBOSE)mkdir -p include/gmp/x86_32 - $(VERBOSE)ln -sf ../../../$< $@ - -include/gmp/x86_64/gmp-mparam.h: $(CONTRIB_DIR)/$(GMP)/mpn/x86_64/gmp-mparam.h - $(VERBOSE)mkdir -p include/gmp/x86_64 - $(VERBOSE)ln -sf ../../../$< $@ - -src/lib/gmp/mpn/asm-defs.m4: $(CONTRIB_DIR)/$(GMP)/mpn/asm-defs.m4 - $(VERBOSE)mkdir -p $(dir $@) - $(VERBOSE)ln -sf ../../../../$< $@ - -src/lib/gmp/mpn/arm/hamdist.c: $(CONTRIB_DIR)/$(GMP)/mpn/generic/popham.c - $(VERBOSE)mkdir -p $(dir $@) - $(VERBOSE)ln -sf ../../../../../$< $@ - -src/lib/gmp/mpn/arm/popcount.c: $(CONTRIB_DIR)/$(GMP)/mpn/generic/popham.c - $(VERBOSE)mkdir -p $(dir $@) - $(VERBOSE)ln -sf ../../../../../$< $@ - -src/lib/gmp/mpn/x86_32/add_n.asm: $(CONTRIB_DIR)/$(GMP)/mpn/x86/pentium/aors_n.asm - $(VERBOSE)mkdir -p $(dir $@) - $(VERBOSE)ln -sf ../../../../../$< $@ - -src/lib/gmp/mpn/x86_32/sub_n.asm: $(CONTRIB_DIR)/$(GMP)/mpn/x86/pentium/aors_n.asm - $(VERBOSE)mkdir -p $(dir $@) - $(VERBOSE)ln -sf ../../../../../$< $@ - -src/lib/gmp/mpn/x86_64/add_n.asm: $(CONTRIB_DIR)/$(GMP)/mpn/x86_64/aors_n.asm - $(VERBOSE)mkdir -p $(dir $@) - $(VERBOSE)ln -sf ../../../../../$< $@ - -src/lib/gmp/mpn/x86_64/sub_n.asm: $(CONTRIB_DIR)/$(GMP)/mpn/x86_64/aors_n.asm - $(VERBOSE)mkdir -p $(dir $@) - $(VERBOSE)ln -sf ../../../../../$< $@ - -src/lib/gmp/mpn/x86_64/hamdist.asm: $(CONTRIB_DIR)/$(GMP)/mpn/x86_64/popham.asm - $(VERBOSE)mkdir -p $(dir $@) - $(VERBOSE)ln -sf ../../../../../$< $@ - -src/lib/gmp/mpn/x86_64/popcount.asm: $(CONTRIB_DIR)/$(GMP)/mpn/x86_64/popham.asm - $(VERBOSE)mkdir -p $(dir $@) - $(VERBOSE)ln -sf ../../../../../$< $@ - -clean-gmp: - $(VERBOSE)rm -f $(GMP_INCLUDES) - $(VERBOSE)rm -f $(GMP_SRC) - $(VERBOSE)rm -rf $(CONTRIB_DIR)/$(GMP) diff --git a/repos/libports/ports/gmp.port b/repos/libports/ports/gmp.port new file mode 100644 index 0000000000..26f147013f --- /dev/null +++ b/repos/libports/ports/gmp.port @@ -0,0 +1,17 @@ +LICENSE := GPLv3 +VERSION := 4.3.2 +DOWNLOADS := gmp.archive + +URL(gmp) := ftp://ftp.gmplib.org/pub/gmp-$(VERSION)/gmp-$(VERSION).tar.bz2 +SHA(gmp) := c011e8feaf1bb89158bd55eaabd7ef8fdd101a2c +SIG(gmp) := ${URL(gmp)}.sig +KEY(gmp) := "73D46C3667461E4BD93972495D6D47DFDB899F46 343C2FF0FBEE5EC2EDBEF399F3599FF828C67298" +DIR(gmp) := src/lib/gmp + +DIRS := include +DIR_CONTENT(include) := ${DIR(gmp)}/gmp-impl.h + +DIRS += $(addprefix include/, x86_32 x86_64 arm) +DIR_CONTENT(include/x86_32) := ${DIR(gmp)}/mpn/x86/pentium/gmp-mparam.h +DIR_CONTENT(include/x86_64) := ${DIR(gmp)}/mpn/x86_64//gmp-mparam.h +DIR_CONTENT(include/arm) := ${DIR(gmp)}/mpn/arm/gmp-mparam.h diff --git a/repos/libports/ports/icu.hash b/repos/libports/ports/icu.hash new file mode 100644 index 0000000000..421376db9e --- /dev/null +++ b/repos/libports/ports/icu.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/libports/ports/icu.mk b/repos/libports/ports/icu.mk deleted file mode 100644 index 826f50cef2..0000000000 --- a/repos/libports/ports/icu.mk +++ /dev/null @@ -1,36 +0,0 @@ -ICU_VERSION = 51.2 -ICU = icu -ICU_TGZ = $(ICU)4c-51_2-src.tgz -ICU_URL = http://download.icu-project.org/files/icu4c/$(ICU_VERSION)/$(ICU_TGZ) -ICU_MD5 = 072e501b87065f3a0ca888f1b5165709 - -# -# Interface to top-level prepare Makefile -# -PORTS += $(ICU) - -prepare-icu: $(CONTRIB_DIR)/$(ICU) include/icu - -$(CONTRIB_DIR)/$(ICU):clean-icu - -# -# Port-specific local rules -# -$(DOWNLOAD_DIR)/$(ICU_TGZ): - $(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(ICU_URL) && touch $@ - -$(DOWNLOAD_DIR)/$(ICU_TGZ).verified: $(DOWNLOAD_DIR)/$(ICU_TGZ) - $(VERBOSE)$(HASHVERIFIER) $(DOWNLOAD_DIR)/$(ICU_TGZ) $(ICU_MD5) md5 - $(VERBOSE)touch $@ - -$(CONTRIB_DIR)/$(ICU): $(DOWNLOAD_DIR)/$(ICU_TGZ).verified - $(VERBOSE)tar xfz $(<:.verified=) -C $(CONTRIB_DIR) && touch $@ - -include/icu: - $(VERBOSE)mkdir -p $@ - ln -sf ../../$(CONTRIB_DIR)/$(ICU)/source/common $@/common - ln -sf ../../$(CONTRIB_DIR)/$(ICU)/source/i18n $@/i18n - -clean-icu: - $(VERBOSE)rm -rf include/icu - $(VERBOSE)rm -rf $(CONTRIB_DIR)/$(ICU) diff --git a/repos/libports/ports/icu.port b/repos/libports/ports/icu.port new file mode 100644 index 0000000000..1fd0e18e63 --- /dev/null +++ b/repos/libports/ports/icu.port @@ -0,0 +1,11 @@ +LICENSE := MIT +DOWNLOADS := icu.archive +VERSION := 51.2 + +URL(icu) := http://download.icu-project.org/files/icu4c/$(VERSION)/icu4c-51_2-src.tgz +SHA(icu) := 074a28dfc96d37ce72c831f3e3e2d686f1f76a14 +DIR(icu) := src/lib/icu + +DIRS := include/icu/common include/icu/i18n +DIR_CONTENT(include/icu/common) := src/lib/icu/source/common/* +DIR_CONTENT(include/icu/i18n) := src/lib/icu/source/i18n/* diff --git a/repos/libports/ports/jbig2dec.hash b/repos/libports/ports/jbig2dec.hash new file mode 100644 index 0000000000..421376db9e --- /dev/null +++ b/repos/libports/ports/jbig2dec.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/libports/ports/jbig2dec.mk b/repos/libports/ports/jbig2dec.mk deleted file mode 100644 index d75a14df1d..0000000000 --- a/repos/libports/ports/jbig2dec.mk +++ /dev/null @@ -1,40 +0,0 @@ -JBIG2DEC = jbig2dec-0.11 -GIT_URL = git://git.ghostscript.com/jbig2dec.git -GIT_REV = 58b513e3ec60feac13ea429c4aff12ea8a8de91d - -# -# Check for tools -# -$(call check_tool,git) - -# -# Interface to top-level prepare Makefile -# -PORTS += $(JBIG2DEC) - -prepare-jbig2dec: $(CONTRIB_DIR)/$(JBIG2DEC) include/jbig2dec/jbig2.h - -$(CONTRIB_DIR)/$(JBIG2DEC): clean-jbig2dec - -# -# Port-specific local rules -# - -$(DOWNLOAD_DIR)/$(JBIG2DEC)/.git: - $(VERBOSE)git clone $(GIT_URL) $(DOWNLOAD_DIR)/$(JBIG2DEC) && \ - cd $(DOWNLOAD_DIR)/$(JBIG2DEC) && \ - git reset --hard $(GIT_REV) && \ - cd ../.. && touch $@ - -$(CONTRIB_DIR)/$(JBIG2DEC)/.git: $(DOWNLOAD_DIR)/$(JBIG2DEC)/.git - $(VERBOSE)git clone $(DOWNLOAD_DIR)/$(JBIG2DEC) $(CONTRIB_DIR)/$(JBIG2DEC) - -$(CONTRIB_DIR)/$(JBIG2DEC): $(CONTRIB_DIR)/$(JBIG2DEC)/.git - -include/jbig2dec/jbig2.h: - $(VERBOSE)mkdir -p $(dir $@) - $(VERBOSE)ln -s ../../$(CONTRIB_DIR)/$(JBIG2DEC)/jbig2.h $@ - -clean-jbig2dec: - $(VERBOSE)rm -rf include/jbig2dec - $(VERBOSE)rm -rf $(CONTRIB_DIR)/$(JBIG2DEC) diff --git a/repos/libports/ports/jbig2dec.port b/repos/libports/ports/jbig2dec.port new file mode 100644 index 0000000000..65cfc99979 --- /dev/null +++ b/repos/libports/ports/jbig2dec.port @@ -0,0 +1,10 @@ +LICENSE := unknown +DOWNLOADS := jbig2dec.git +VERSION := 0.11 + +URL(jbig2dec) := git://git.ghostscript.com/jbig2dec.git +REV(jbig2dec) := 58b513e3ec60feac13ea429c4aff12ea8a8de91d +DIR(jbig2dec) := src/lib/jbig2dec + +DIRS := include/jbig2dec +DIR_CONTENT(include/jbig2dec) := src/lib/jbig2dec/jbig2.h diff --git a/repos/libports/ports/jpeg.hash b/repos/libports/ports/jpeg.hash new file mode 100644 index 0000000000..421376db9e --- /dev/null +++ b/repos/libports/ports/jpeg.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/libports/ports/jpeg.mk b/repos/libports/ports/jpeg.mk deleted file mode 100644 index 52560adbe2..0000000000 --- a/repos/libports/ports/jpeg.mk +++ /dev/null @@ -1,24 +0,0 @@ -JPEG = jpeg-7 -JPEG_TGZ = jpegsrc.v7.tar.gz -JPEG_URL = http://www.ijg.org/files/$(JPEG_TGZ) - -# -# Interface to top-level prepare Makefile -# -PORTS += $(JPEG) - -prepare-jpeg: $(CONTRIB_DIR)/$(JPEG) - -$(CONTRIB_DIR)/$(JPEG): clean-jpeg - -# -# Port-specific local rules -# -$(DOWNLOAD_DIR)/$(JPEG_TGZ): - $(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(JPEG_URL) && touch $@ - -$(CONTRIB_DIR)/$(JPEG): $(DOWNLOAD_DIR)/$(JPEG_TGZ) - $(VERBOSE)tar xfz $< -C $(CONTRIB_DIR) && touch $@ - -clean-jpeg: - $(VERBOSE)rm -rf $(CONTRIB_DIR)/$(JPEG) diff --git a/repos/libports/ports/jpeg.port b/repos/libports/ports/jpeg.port new file mode 100644 index 0000000000..bb5870d450 --- /dev/null +++ b/repos/libports/ports/jpeg.port @@ -0,0 +1,10 @@ +LICENSE := JPEG +VERSION := 7 +DOWNLOADS := jpeg.archive + +URL(jpeg) := http://www.ijg.org/files/jpegsrc.v7.tar.gz +SHA(jpeg) := 88cced0fc3dbdbc82115e1d08abce4e9d23a4b47 +DIR(jpeg) := src/lib/jpeg + +DIRS := include/jpeg +DIR_CONTENT(include/jpeg) := src/lib/jpeg/*.h diff --git a/repos/libports/ports/libav.hash b/repos/libports/ports/libav.hash new file mode 100644 index 0000000000..421376db9e --- /dev/null +++ b/repos/libports/ports/libav.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/libports/ports/libav.mk b/repos/libports/ports/libav.mk deleted file mode 100644 index 08ad83789c..0000000000 --- a/repos/libports/ports/libav.mk +++ /dev/null @@ -1,52 +0,0 @@ -include lib/import/import-av.inc - -LIBAV_TGZ = $(LIBAV).tar.gz -LIBAV_SIG = $(LIBAV_TGZ).asc -LIBAV_SHA = $(LIBAV_TGZ).sha1 -LIBAV_BASE_URL = http://www.libav.org/releases -LIBAV_URL = $(LIBAV_BASE_URL)/$(LIBAV_TGZ) -LIBAV_URL_SIG = $(LIBAV_BASE_URL)/$(LIBAV_SIG) -LIBAV_URL_SHA = $(LIBAV_BASE_URL)/$(LIBAV_SHA) - -# -# XXX Add hash verification for libav downloads. Note: signatures are provided -# for newer versions. Therefore, all is prepared in the make file for -# enabling the signature check. However, the signature check is yet -# commented out. -# -#LIBAV_KEY = UNCLEAR WHAT GOES IN HERE - -# -# Interface to top-level prepare Makefile -# -PORTS += $(LIBAV) - -prepare-libav: $(CONTRIB_DIR)/$(LIBAV) - -$(CONTRIB_DIR)/$(LIBAV): clean-libav - -# -# Port-specific local rules -# -$(DOWNLOAD_DIR)/$(LIBAV_TGZ): - $(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(LIBAV_URL) && touch $@ - -$(DOWNLOAD_DIR)/$(LIBAV_SHA): - $(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(LIBAV_URL_SHA) && touch $@ - -$(DOWNLOAD_DIR)/$(LIBAV_SIG): - $(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(LIBAV_URL_SIG) && touch $@ - -$(DOWNLOAD_DIR)/$(LIBAV_TGZ).verified: $(DOWNLOAD_DIR)/$(LIBAV_TGZ) \ - $(DOWNLOAD_DIR)/$(LIBAV_SHA) \ - $(DOWNLOAD_DIR)/$(LIBAV_SIG) - # XXX Hash verification of libav does not ensure authenticity - $(VERBOSE)$(HASHVERIFIER) $(DOWNLOAD_DIR)/$(LIBAV_TGZ) $(DOWNLOAD_DIR)/$(LIBAV_SHA) sha1 - $(VERBOSE)touch $@ - -$(CONTRIB_DIR)/$(LIBAV): $(DOWNLOAD_DIR)/$(LIBAV_TGZ).verified - $(VERBOSE)tar xfz $(<:.verified=) -C $(CONTRIB_DIR) && touch $@ - $(VERBOSE)patch -d $(CONTRIB_DIR)/$(LIBAV) -p1 -i $(CURDIR)/src/app/avplay/avplay.patch - -clean-libav: - $(VERBOSE)rm -rf $(CONTRIB_DIR)/$(LIBAV) diff --git a/repos/libports/ports/libav.port b/repos/libports/ports/libav.port new file mode 100644 index 0000000000..29634a4263 --- /dev/null +++ b/repos/libports/ports/libav.port @@ -0,0 +1,18 @@ +LICENSE := GPLv3 +VERSION := 0.8.2 +DOWNLOADS := libav.archive + +URL(libav) := http://www.libav.org/releases/libav-$(VERSION).tar.gz +SHA(libav) := e5231f8f995fae53c99e0bd30a455b3e5a906b71 +DIR(libav) := src/lib/libav +SIG(libav) := ${URL(libav)}.asc + +PATCHES := src/app/avplay/avplay.patch + +include_subdirs := . libavcodec libavfilter libavutil libavformat libswscale \ + libavutil/x86 libavutil/arm libavcodec/x86 libavcodec/arm + +DIRS := $(addprefix include/libav/,$(include_subdirs)) + +$(foreach dir,$(include_subdirs),\ + $(eval DIR_CONTENT(include/libav/$(dir)) := src/lib/libav/$(dir)/*.h)) diff --git a/repos/libports/ports/libc.hash b/repos/libports/ports/libc.hash new file mode 100644 index 0000000000..421376db9e --- /dev/null +++ b/repos/libports/ports/libc.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/libports/ports/libc.mk b/repos/libports/ports/libc.mk deleted file mode 100644 index cc5f2f7e75..0000000000 --- a/repos/libports/ports/libc.mk +++ /dev/null @@ -1,602 +0,0 @@ -LIBC := libc-8.2.0 - -# -# Interface to top-level prepare Makefile -# -PORTS += $(LIBC) - -# -# Check for tools -# -$(call check_tool,svn) -$(call check_tool,lex) -$(call check_tool,bison) -$(call check_tool,rpcgen) - -# -# Subdirectories to check out from FreeBSD's Subversion repository -# -LIBC_SVN_BASE = http://svn.freebsd.org/base/release/8.2.0 - -LIBC_CONTRIB_SUB_DIRS = libc libutil include sys_sys sys_netinet sys_netinet6 \ - sys_net sys_bsm sys_rpc sys_vm sys_arm sys_i386 sys_amd64 \ - msun gdtoa - -LIBC_SVN_libc = lib/libc -LIBC_SVN_libutil = lib/libutil -LIBC_SVN_include = include -LIBC_SVN_sys_sys = sys/sys -LIBC_SVN_sys_rpc = sys/rpc -LIBC_SVN_sys_net = sys/net -LIBC_SVN_sys_netinet = sys/netinet -LIBC_SVN_sys_netinet6 = sys/netinet6 -LIBC_SVN_sys_bsm = sys/bsm -LIBC_SVN_sys_vm = sys/vm -LIBC_SVN_sys_arm = sys/arm/include -LIBC_SVN_sys_i386 = sys/i386/include -LIBC_SVN_sys_amd64 = sys/amd64/include -LIBC_SVN_msun = lib/msun -LIBC_SVN_gdtoa = contrib/gdtoa - -LIBC_DIRS_TO_CHECKOUT = $(addprefix $(CONTRIB_DIR)/$(LIBC)/,$(LIBC_CONTRIB_SUB_DIRS)) - -$(LIBC_DIRS_TO_CHECKOUT): - $(ECHO) "checking out '$(LIBC_SVN_$(notdir $@))' to '$@'" - $(VERBOSE)mkdir -p $(CONTRIB_DIR)/$(LIBC) - $(VERBOSE)svn export $(LIBC_SVN_BASE)/$(LIBC_SVN_$(notdir $@)) $@ - -checkout-libc: $(LIBC_DIRS_TO_CHECKOUT) - -# -# Files coming from the include directory -# -LIBC_IMPORT_INCLUDES = include/libc/strings.h \ - include/libc/limits.h \ - include/libc/string.h \ - include/libc/ctype.h \ - include/libc/_ctype.h \ - include/libc/runetype.h \ - include/libc/stdlib.h \ - include/libc/stdio.h \ - include/libc/signal.h \ - include/libc/unistd.h \ - include/libc/wchar.h \ - include/libc/time.h \ - include/libc/sysexits.h \ - include/libc/arpa/inet.h \ - include/libc/arpa/ftp.h \ - include/libc/arpa/nameser.h \ - include/libc/arpa/nameser_compat.h \ - include/libc/arpa/telnet.h \ - include/libc/arpa/tftp.h \ - include/libc/resolv.h \ - include/libc/wctype.h \ - include/libc/fcntl.h \ - include/libc/locale.h \ - include/libc/langinfo.h \ - include/libc/regex.h \ - include/libc/paths.h \ - include/libc/inttypes.h \ - include/libc/fstab.h \ - include/libc/netdb.h \ - include/libc/ar.h \ - include/libc/stdint.h \ - include/libc/ieeefp.h \ - include/libc/memory.h \ - include/libc/res_update.h \ - include/libc/rpc/rpc.h \ - include/libc/netconfig.h \ - include/libc/rpc/xdr.h \ - include/libc/rpc/auth.h \ - include/libc/rpc/clnt_stat.h \ - include/libc/rpc/clnt.h \ - include/libc/rpc/clnt_soc.h \ - include/libc/rpc/rpc_msg.h \ - include/libc/rpc/auth_unix.h \ - include/libc/rpc/auth_des.h \ - include/libc/rpc/svc.h \ - include/libc/rpc/svc_soc.h \ - include/libc/rpc/svc_auth.h \ - include/libc/rpc/pmap_clnt.h \ - include/libc/rpc/pmap_prot.h \ - include/libc/rpc/rpcb_clnt.h \ - include/libc/rpc/rpcb_prot.h \ - include/libc/rpc/rpcent.h \ - include/libc/rpcsvc/yp_prot.h \ - include/libc/rpcsvc/ypclnt.h \ - include/libc/rpc/des_crypt.h \ - include/libc/rpc/des.h \ - include/libc/rpcsvc/nis.h \ - include/libc/rpcsvc/nis_tags.h \ - include/libc/rpcsvc/nislib.h \ - include/libc/rpc/rpc_com.h \ - include/libc/ifaddrs.h \ - include/libc/rpc/nettype.h \ - include/libc/rpc/rpcsec_gss.h \ - include/libc/gssapi/gssapi.h \ - include/libc/rpc/raw.h \ - include/libc/rpcsvc/crypt.h - -# -# Files from include directory needed for stdlib -# -# We have to make sure to shadow all gcc headers to avoid conflicts. -# -LIBC_IMPORT_INCLUDES += include/libc/pthread.h \ - include/libc/sched.h \ - include/libc/err.h \ - include/libc/getopt.h \ - include/libc/search.h \ - include/libc/ktrace.h \ - include/libc/varargs.h \ - include/libc/stddef.h \ - include/libc/stdbool.h \ - include/libc/assert.h \ - include/libc/monetary.h \ - include/libc/printf.h \ - include/libc/math.h - -# -# Files from include directory needed for gen lib -# -LIBC_IMPORT_INCLUDES += include/libc/vis.h \ - include/libc/libgen.h \ - include/libc/dirent.h \ - include/libc/dlfcn.h \ - include/libc/link.h \ - include/libc/fmtmsg.h \ - include/libc/fnmatch.h \ - include/libc/fts.h \ - include/libc/ftw.h \ - include/libc/db.h \ - include/libc/grp.h \ - include/libc/nsswitch.h \ - include/libc/pthread_np.h \ - include/libc/syslog.h \ - include/libc/pwd.h \ - include/libc/utmp.h \ - include/libc/ttyent.h \ - include/libc/stringlist.h \ - include/libc/glob.h \ - include/libc/termios.h \ - include/libc/a.out.h \ - include/libc/elf-hints.h \ - include/libc/nlist.h \ - include/libc/spawn.h \ - include/libc/readpassphrase.h \ - include/libc/semaphore.h \ - include/libc/_semaphore.h \ - include/libc/setjmp.h \ - include/libc/elf.h \ - include/libc/ulimit.h \ - include/libc/utime.h \ - include/libc/wordexp.h - -# -# Files from sys/vm needed for gen lib -# -LIBC_IMPORT_INCLUDES += include/libc/vm/vm_param.h \ - include/libc/vm/vm.h \ - include/libc/vm/pmap.h - -# -# Files coming from the sys/net directories -# -LIBC_IMPORT_INCLUDES += include/libc/net/if.h \ - include/libc/net/if_dl.h \ - include/libc/net/if_types.h - -# -# Files coming from the sys/netinet and sys/netinet6 directories -# -LIBC_IMPORT_INCLUDES += include/libc/netinet/in.h \ - include/libc/netinet/in_systm.h \ - include/libc/netinet6/in6.h \ - include/libc/netinet/ip.h \ - include/libc/netinet/tcp.h - -# -# Files coming from the sys/rpc directory -# -LIBC_IMPORT_INCLUDES += include/libc/sys/rpc/types.h - -# -# Files coming from the sys/sys directory -# -LIBC_IMPORT_INCLUDES += include/libc/sys/_types.h \ - include/libc/sys/limits.h \ - include/libc/sys/cdefs.h \ - include/libc/sys/_null.h \ - include/libc/sys/types.h \ - include/libc/sys/_pthreadtypes.h \ - include/libc/sys/syslimits.h \ - include/libc/sys/select.h \ - include/libc/sys/_sigset.h \ - include/libc/sys/_timeval.h \ - include/libc/sys/timespec.h \ - include/libc/sys/_timespec.h \ - include/libc/sys/stat.h \ - include/libc/sys/signal.h \ - include/libc/sys/unistd.h \ - include/libc/sys/time.h \ - include/libc/sys/param.h \ - include/libc/sys/stdint.h \ - include/libc/sys/event.h \ - include/libc/sys/disk.h \ - include/libc/errno.h \ - include/libc/sys/errno.h \ - include/libc/sys/poll.h - -# -# Files from sys/sys needed for stdlib and stdio and gen lib -# -LIBC_IMPORT_INCLUDES += include/libc/sys/queue.h \ - include/libc/sys/mman.h \ - include/libc/sys/stddef.h \ - include/libc/sys/sysctl.h \ - include/libc/sys/uio.h \ - include/libc/sys/_iovec.h \ - include/libc/sys/ktrace.h \ - include/libc/sys/ioctl.h \ - include/libc/sys/ttycom.h \ - include/libc/sys/ioccom.h \ - include/libc/sys/filio.h \ - include/libc/sys/sockio.h \ - include/libc/sys/wait.h \ - include/libc/sys/file.h \ - include/libc/sys/fcntl.h \ - include/libc/sys/resource.h \ - include/libc/sys/disk.h \ - include/libc/sys/disklabel.h \ - include/libc/sys/link_elf.h \ - include/libc/sys/endian.h \ - include/libc/sys/mount.h \ - include/libc/sys/ucred.h \ - include/libc/sys/dirent.h \ - include/libc/sys/cpuset.h \ - include/libc/sys/socket.h \ - include/libc/sys/un.h \ - include/libc/sys/ttydefaults.h \ - include/libc/sys/imgact_aout.h \ - include/libc/sys/elf32.h \ - include/libc/sys/elf64.h \ - include/libc/sys/elf_generic.h \ - include/libc/sys/elf_common.h \ - include/libc/sys/nlist_aout.h \ - include/libc/sys/ipc.h \ - include/libc/sys/sem.h \ - include/libc/sys/exec.h \ - include/libc/sys/_lock.h \ - include/libc/sys/_mutex.h \ - include/libc/sys/statvfs.h \ - include/libc/sys/ucontext.h \ - include/libc/sys/syslog.h \ - include/libc/sys/times.h \ - include/libc/sys/utsname.h \ - include/libc/sys/elf.h \ - include/libc/sys/mtio.h - -# -# Files coming from the sys/arm/include directory -# -LIBC_IMPORT_INCLUDES += include/libc-arm/machine/_types.h \ - include/libc-arm/machine/endian.h \ - include/libc-arm/machine/_limits.h \ - include/libc-arm/machine/signal.h \ - include/libc-arm/machine/trap.h \ - include/libc-arm/machine/_stdint.h \ - include/libc-arm/machine/pte.h \ - include/libc-arm/machine/cpuconf.h \ - include/libc-arm/machine/sysarch.h \ - include/libc-arm/machine/armreg.h \ - include/libc-arm/machine/ieee.h \ - include/libc-arm/machine/frame.h \ - include/libc-arm/machine/sigframe.h \ - include/libc-arm/machine/vm.h \ - include/libc-arm/stdarg.h \ - include/libc-arm/float.h - - -# -# Files coming from the sys/i386/include directory -# -LIBC_IMPORT_INCLUDES += include/libc-i386/machine/_types.h \ - include/libc-i386/machine/endian.h \ - include/libc-i386/machine/_limits.h \ - include/libc-i386/machine/signal.h \ - include/libc-i386/machine/trap.h \ - include/libc-i386/machine/_inttypes.h \ - include/libc-i386/machine/_stdint.h \ - include/libc-i386/machine/param.h \ - include/libc-i386/machine/vm.h \ - include/libc-i386/machine/specialreg.h \ - include/libc-i386/machine/npx.h \ - include/libc-i386/stdarg.h \ - include/libc-i386/float.h - -# -# Files coming from the sys/amd64/include directory -# -LIBC_IMPORT_INCLUDES += include/libc-amd64/machine/_types.h \ - include/libc-amd64/machine/endian.h \ - include/libc-amd64/machine/_limits.h \ - include/libc-amd64/machine/signal.h \ - include/libc-amd64/machine/trap.h \ - include/libc-amd64/machine/_inttypes.h \ - include/libc-amd64/machine/_stdint.h \ - include/libc-amd64/machine/param.h \ - include/libc-amd64/machine/vm.h \ - include/libc-amd64/machine/specialreg.h \ - include/libc-amd64/machine/fpu.h \ - include/libc-amd64/stdarg.h \ - include/libc-amd64/float.h - -# -# Files from sys/arm/include needed for stdlib and stdio -# -LIBC_IMPORT_INCLUDES += include/libc-arm/machine/cpufunc.h \ - include/libc-arm/machine/vmparam.h \ - include/libc-arm/machine/atomic.h \ - include/libc-arm/arith.h \ - include/libc-arm/_fpmath.h \ - -# -# Files from sys/i386/include needed for stdlib and stdio -# -LIBC_IMPORT_INCLUDES += include/libc-i386/machine/cpufunc.h \ - include/libc-i386/machine/vmparam.h \ - include/libc-i386/machine/atomic.h \ - include/libc-i386/arith.h \ - include/libc-i386/_fpmath.h \ - -# -# Files from sys/amd64/include needed for stdlib and stdio -# -LIBC_IMPORT_INCLUDES += include/libc-amd64/machine/cpufunc.h \ - include/libc-amd64/machine/vmparam.h \ - include/libc-amd64/machine/atomic.h \ - include/libc-amd64/arith.h \ - include/libc-amd64/_fpmath.h \ - -# -# Files from sys/arm/include needed for gen lib -# -LIBC_IMPORT_INCLUDES += include/libc-arm/machine/elf.h \ - include/libc-arm/machine/exec.h \ - include/libc-arm/machine/reloc.h \ - include/libc-arm/machine/pmap.h \ - include/libc-arm/machine/ucontext.h \ - include/libc-arm/machine/setjmp.h \ - include/libc-arm/machine/asm.h \ - include/libc-arm/machine/param.h \ - include/libc-arm/machine/_inttypes.h \ - include/libc-arm/machine/ieeefp.h \ - include/libc-arm/SYS.h - -# -# Files from sys/i386/include needed for gen lib -# -LIBC_IMPORT_INCLUDES += include/libc-i386/machine/elf.h \ - include/libc-i386/machine/exec.h \ - include/libc-i386/machine/reloc.h \ - include/libc-i386/machine/pmap.h \ - include/libc-i386/machine/ucontext.h \ - include/libc-i386/machine/setjmp.h \ - include/libc-i386/machine/asm.h \ - include/libc-i386/machine/ieeefp.h \ - include/libc-i386/SYS.h - -# -# Files from sys/amd64/include needed for gen lib -# -LIBC_IMPORT_INCLUDES += include/libc-amd64/machine/elf.h \ - include/libc-amd64/machine/exec.h \ - include/libc-amd64/machine/reloc.h \ - include/libc-amd64/machine/pmap.h \ - include/libc-amd64/machine/ucontext.h \ - include/libc-amd64/machine/setjmp.h \ - include/libc-amd64/machine/asm.h \ - include/libc-amd64/machine/ieeefp.h \ - include/libc-amd64/SYS.h - -# -# Files needed for math lib -# -LIBC_IMPORT_INCLUDES += include/libc/complex.h - -# -# Files from libc/arm needed for gdtoa lib -# -LIBC_IMPORT_INCLUDES += include/libc-arm/gd_qnan.h - -# -# Files from libc/i386 needed for gdtoa lib -# -LIBC_IMPORT_INCLUDES += include/libc-i386/gd_qnan.h - -# -# Files from libc/amd64 needed for gdtoa lib -# -LIBC_IMPORT_INCLUDES += include/libc-amd64/gd_qnan.h - -# -# Files from msun/arm needed for gdtoa lib -# -LIBC_IMPORT_INCLUDES += include/libc-arm/fenv.h - -# -# Files from msun/i387 needed for gdtoa lib -# -LIBC_IMPORT_INCLUDES += include/libc-i386/fenv.h - -# -# Files from msun/amd64 needed for gdtoa lib -# -LIBC_IMPORT_INCLUDES += include/libc-amd64/fenv.h - -# -# Files from sys/bsm for gen lib -# -LIBC_IMPORT_INCLUDES += include/libc/bsm/audit.h - -# -# Generate files needed for compiling libc-net -# -libc_gen_nslexer: $(CONTRIB_DIR)/$(LIBC)/libc/net/nslexer.l - $(VERBOSE)$(LEX) -P_nsyy -t $< | \ - sed -e '/YY_BUF_SIZE/s/16384/1024/' \ - > $(CONTRIB_DIR)/$(LIBC)/libc/net/nslexer.c - -libc_gen_nsparser: $(CONTRIB_DIR)/$(LIBC)/libc/net/nsparser.y - $(VERBOSE)bison -d -p_nsyy $< \ - --defines=$(CONTRIB_DIR)/$(LIBC)/libc/net/nsparser.h \ - --output=$(CONTRIB_DIR)/$(LIBC)/libc/net/nsparser.c - -libc_net_generate: libc_gen_nslexer libc_gen_nsparser - -# -# Generate files needed for compiling libc-rpc -# -RPCB_FILES = rpcb_prot.x -SRC_RPCB_FILES = $(addprefix $(CONTRIB_DIR)/$(LIBC)/include/rpc/,$(RPCB_FILES)) -GEN_RPCB_FILES = $(SRC_RPCB_FILES:.x=.h) - -# -# Unfortunatly include/rpcsvc contains a lot of .x files and to resolve their -# dependencies would by cumbersome. So we include all of them instead of only -# the ones we currently need. -# -RPCSVC_FILES = bootparam_prot.x nfs_prot.x nlm_prot.x rstat.x ypupdate_prot.x \ - crypt.x nis_cache.x pmap_prot.x rwall.x yp.x \ - key_prot.x nis_callback.x rex.x sm_inter.x ypxfrd.x \ - klm_prot.x nis_object.x rnusers.x spray.x \ - mount.x nis.x rquota.x yppasswd.x - -SRC_RPCSVC_FILES = $(addprefix $(CONTRIB_DIR)/$(LIBC)/include/rpcsvc/,$(RPCSVC_FILES)) -GEN_RPCSVC_FILES = $(SRC_RPCSVC_FILES:.x=.h) - -# nis_object.h is needed by nis.h so we have to generate this header first -$(CONTRIB_DIR)/$(LIBC)/include/rpcsvc/nis.h: $(CONTRIB_DIR)/$(LIBC)/include/rpcsvc/nis_object.x - -libc_rpc_generate: - $(VERBOSE)for header in $(GEN_RPCB_FILES); do\ - if [ ! -e "$$header" ]; then \ - rpcgen -C -h -DWANT_NFS3 $${header%.h}.x -o $$header; \ - fi; done - $(VERBOSE)for header in $(GEN_RPCSVC_FILES); do\ - if [ ! -e "$$header" ]; then \ - rpcgen -C -h -DWANT_NFS3 $${header%.h}.x -o $$header; \ - fi; done - -## -# Shortcut for creating a symlink -# -# \param $(1) prefix prepended to symlink origin, used for creating relative -# symlinks -# -libc_gen_symlink_subsub = $(VERBOSE)mkdir -p $(dir $@); ln -sf ../../$< $@ -libc_gen_symlink_subsubsub = $(VERBOSE)mkdir -p $(dir $@); ln -sf ../../../$< $@ -libc_gen_symlink_subsubsubsub = $(VERBOSE)mkdir -p $(dir $@); ln -sf ../../../../$< $@ - -include/libc/arpa/%.h: $(CONTRIB_DIR)/$(LIBC)/include/arpa/%.h - $(libc_gen_symlink_subsubsub) - -include/libc/gssapi/%.h: $(CONTRIB_DIR)/$(LIBC)/include/gssapi/%.h - $(libc_gen_symlink_subsubsub) - -include/libc/net/%.h: $(CONTRIB_DIR)/$(LIBC)/sys_net/%.h - $(libc_gen_symlink_subsubsub) - -include/libc/netinet/%.h: $(CONTRIB_DIR)/$(LIBC)/sys_netinet/%.h - $(libc_gen_symlink_subsubsub) - -include/libc/netinet6/%.h: $(CONTRIB_DIR)/$(LIBC)/sys_netinet6/%.h - $(libc_gen_symlink_subsubsub) - -include/libc/rpc/%.h: $(CONTRIB_DIR)/$(LIBC)/include/rpc/%.h - $(libc_gen_symlink_subsubsub) - -include/libc/rpcsvc/%.h: $(CONTRIB_DIR)/$(LIBC)/include/rpcsvc/%.h - $(libc_gen_symlink_subsubsub) - -include/libc/%.h: $(CONTRIB_DIR)/$(LIBC)/include/%.h - $(libc_gen_symlink_subsub) - -include/libc/%.h: $(CONTRIB_DIR)/$(LIBC)/sys_sys/%.h - $(libc_gen_symlink_subsub) - -include/libc/%.h: $(CONTRIB_DIR)/$(LIBC)/msun/src/%.h - $(libc_gen_symlink_subsub) - -include/libc-arm/%.h: $(CONTRIB_DIR)/$(LIBC)/msun/arm/%.h - $(libc_gen_symlink_subsub) - -include/libc-i386/%.h: $(CONTRIB_DIR)/$(LIBC)/msun/i387/%.h - $(libc_gen_symlink_subsub) - -include/libc-amd64/%.h: $(CONTRIB_DIR)/$(LIBC)/msun/amd64/%.h - $(libc_gen_symlink_subsub) - -include/libc/sys/%.h: $(CONTRIB_DIR)/$(LIBC)/sys_sys/%.h - $(libc_gen_symlink_subsubsub) - -include/libc/sys/rpc/%.h: $(CONTRIB_DIR)/$(LIBC)/sys_rpc/%.h - $(libc_gen_symlink_subsubsubsub) - -include/libc-arm/machine/%.h: $(CONTRIB_DIR)/$(LIBC)/sys_arm/%.h - $(libc_gen_symlink_subsubsub) - -include/libc-i386/machine/%.h: $(CONTRIB_DIR)/$(LIBC)/sys_i386/%.h - $(libc_gen_symlink_subsubsub) - -include/libc-amd64/machine/%.h: $(CONTRIB_DIR)/$(LIBC)/sys_amd64/%.h - $(libc_gen_symlink_subsubsub) - -include/libc-arm/%.h: $(CONTRIB_DIR)/$(LIBC)/sys_arm/%.h - $(libc_gen_symlink_subsub) - -include/libc-i386/%.h: $(CONTRIB_DIR)/$(LIBC)/sys_i386/%.h - $(libc_gen_symlink_subsub) - -include/libc-amd64/%.h: $(CONTRIB_DIR)/$(LIBC)/sys_amd64/%.h - $(libc_gen_symlink_subsub) - -include/libc-arm/%.h: $(CONTRIB_DIR)/$(LIBC)/libc/arm/%.h - $(libc_gen_symlink_subsub) - -include/libc-i386/%.h: $(CONTRIB_DIR)/$(LIBC)/libc/i386/%.h - $(libc_gen_symlink_subsub) - -include/libc-amd64/%.h: $(CONTRIB_DIR)/$(LIBC)/libc/amd64/%.h - $(libc_gen_symlink_subsub) - -include/libc/bsm/audit.h: $(CONTRIB_DIR)/$(LIBC)/sys_bsm/audit.h - $(libc_gen_symlink_subsubsub) - -include/libc/vm/%.h: $(CONTRIB_DIR)/$(LIBC)/sys_vm/%.h - $(libc_gen_symlink_subsubsub) - -apply_patches-libc: checkout-libc - $(VERBOSE)find ./src/lib/libc/patches/ -name "*.patch" |\ - xargs -ixxx sh -c "patch -p0 -r - -N -d $(CONTRIB_DIR)/$(LIBC) < xxx" || true - -# -# Use new make instance for symlink creation. Otherwise the implicit rules -# above do not work as expected (because the dependent names do not exist -# at the invokation time of the original make instance and are created -# as side effect of the 'LIBC_DIRS_TO_CHECKOUT' out rule). -# -create_include_symlinks-libc: checkout-libc - $(VERBOSE)make $(LIBC_IMPORT_INCLUDES) VERBOSE=$(VERBOSE) - -prepare-libc: apply_patches-libc libc_net_generate libc_rpc_generate create_include_symlinks-libc - -clean_include_symlinks-libc: - $(VERBOSE)-find include/libc{,-amd64,-arm,-i386} -type l -delete 2>/dev/null - -clean_include_subdirs-libc: clean_include_symlinks-libc - $(VERBOSE)-find include/libc{,-amd64,-arm,-i386} -type d -empty -delete 2>/dev/null - -clean-libc: clean_include_subdirs-libc - $(VERBOSE)rm -rf $(CONTRIB_DIR)/$(LIBC) - diff --git a/repos/libports/ports/libc.port b/repos/libports/ports/libc.port new file mode 100644 index 0000000000..dd4b1e4f35 --- /dev/null +++ b/repos/libports/ports/libc.port @@ -0,0 +1,234 @@ +LICENSE := BSD +VERSION := 8.2.0 + +# +# Check for tools +# +$(call check_tool,svn) +$(call check_tool,lex) +$(call check_tool,bison) +$(call check_tool,rpcgen) + +svn_exports := libc libutil include sys_sys sys_netinet \ + sys_netinet6 sys_net sys_bsm sys_rpc sys_vm \ + sys_arm sys_i386 sys_amd64 msun gdtoa gen + +DOWNLOADS := $(addsuffix .svn,$(svn_exports)) + +svn_base_url := http://svn.freebsd.org/base/release/8.2.0 + +sub_dir(libc) := lib/libc +sub_dir(gen) := lib/libc/gen +sub_dir(libutil) := lib/libutil +sub_dir(include) := include +sub_dir(sys_sys) := sys/sys +sub_dir(sys_netinet) := sys/rpc +sub_dir(sys_netinet6) := sys/net +sub_dir(sys_net) := sys/netinet +sub_dir(sys_bsm) := sys/netinet6 +sub_dir(sys_rpc) := sys/bsm +sub_dir(sys_vm) := sys/vm +sub_dir(sys_arm) := sys/arm/include +sub_dir(sys_i386) := sys/i386/include +sub_dir(sys_amd64) := sys/amd64/include +sub_dir(msun) := lib/msun +sub_dir(gdtoa) := contrib/gdtoa + +$(foreach svn_export,$(svn_exports),\ + $(eval URL($(svn_export)) := $(svn_base_url)/$(sub_dir($(svn_export))))) + +$(foreach svn_export,$(svn_exports),\ + $(eval DIR($(svn_export)) := src/lib/libc/$(sub_dir($(svn_export))))) + +$(foreach svn_export,$(svn_exports),\ + $(eval REV($(svn_export)) := HEAD)) + +PATCHES := src/lib/libc/patches/*.patch + + +# +# Generic headers +# + +DIRS := include/libc +DIR_CONTENT(include/libc) := \ + $(addprefix src/lib/libc/include/,\ + strings.h limits.h string.h ctype.h _ctype.h runetype.h \ + stdlib.h stdio.h signal.h unistd.h wchar.h time.h sysexits.h \ + resolv.h wctype.h locale.h langinfo.h regex.h paths.h ieeefp.h \ + inttypes.h fstab.h netdb.h ar.h memory.h res_update.h \ + netconfig.h ifaddrs.h pthread.h err.h getopt.h search.h \ + varargs.h stddef.h stdbool.h assert.h monetary.h printf.h vis.h \ + libgen.h dirent.h dlfcn.h link.h fmtmsg.h fnmatch.h fts.h ftw.h \ + db.h grp.h nsswitch.h pthread_np.h pwd.h utmp.h ttyent.h \ + stringlist.h glob.h a.out.h elf-hints.h nlist.h spawn.h \ + readpassphrase.h setjmp.h elf.h ulimit.h utime.h wordexp.h \ + complex.h) \ + $(addprefix src/lib/libc/sys/sys/,\ + syslog.h fcntl.h stdint.h sched.h ktrace.h termios.h \ + semaphore.h _semaphore.h) \ + src/lib/libc/sys/sys/errno.h \ + src/lib/libc/lib/msun/src/math.h + +DIRS += include/libc/rpc +DIR_CONTENT(include/libc/rpc) := \ + $(addprefix src/lib/libc/include/rpc/,\ + rpc.h xdr.h auth.h clnt_stat.h clnt.h clnt_soc.h rpc_msg.h \ + auth_unix.h auth_des.h svc.h svc_soc.h svc_auth.h pmap_clnt.h \ + pmap_prot.h rpcb_clnt.h rpcent.h des_crypt.h des.h nettype.h \ + rpcsec_gss.h raw.h rpc_com.h) \ + src/lib/libc/include/rpc/rpcb_prot.h + +DIRS += include/libc/rpcsvc +DIR_CONTENT(include/libc/rpcsvc) := \ + $(addprefix src/lib/libc/include/rpcsvc/,\ + yp_prot.h nis.h ypclnt.h nis_tags.h nislib.h crypt.h) + +DIRS += include/libc/gssapi +DIR_CONTENT(include/libc/gssapi) := src/lib/libc/include/gssapi/gssapi.h + +DIRS += include/libc/arpa +DIR_CONTENT(include/libc/arpa) := \ + $(addprefix src/lib/libc/include/arpa/,\ + inet.h ftp.h nameser.h nameser_compat.h telnet.h tftp.h) + +DIRS += include/libc/vm +DIR_CONTENT(include/libc/vm) := \ + $(addprefix src/lib/libc/sys/vm/, vm_param.h vm.h pmap.h) + +DIRS += include/libc/net +DIR_CONTENT(include/libc/net) := \ + $(addprefix src/lib/libc/sys/net/, if.h if_dl.h if_types.h) + +DIRS += include/libc/netinet +DIR_CONTENT(include/libc/netinet) := \ + $(addprefix src/lib/libc/sys/netinet/, in.h in_systm.h ip.h tcp.h) + +DIRS += include/libc/netinet6 +DIR_CONTENT(include/libc/netinet6) := src/lib/libc/sys/netinet6/in6.h + +DIRS += include/libc/bsm +DIR_CONTENT(include/libc/bsm) := src/lib/libc/sys/bsm/audit.h + +DIRS += include/libc/sys/rpc +DIR_CONTENT(include/libc/sys/rpc) := src/lib/libc/sys/rpc/types.h + +DIRS += include/libc/sys +DIR_CONTENT(include/libc/sys) := \ + $(addprefix src/lib/libc/sys/sys/,\ + _types.h limits.h cdefs.h _null.h types.h _pthreadtypes.h \ + syslimits.h select.h _sigset.h _timeval.h timespec.h \ + _timespec.h stat.h signal.h unistd.h time.h param.h stdint.h \ + event.h disk.h errno.h poll.h queue.h mman.h stddef.h sysctl.h \ + uio.h _iovec.h ktrace.h ioctl.h ttycom.h ioccom.h filio.h \ + sockio.h wait.h file.h fcntl.h resource.h disklabel.h \ + link_elf.h endian.h mount.h ucred.h dirent.h cpuset.h socket.h \ + un.h ttydefaults.h imgact_aout.h elf32.h elf64.h elf_generic.h \ + elf_common.h nlist_aout.h ipc.h sem.h exec.h _lock.h _mutex.h \ + statvfs.h ucontext.h syslog.h times.h utsname.h elf.h mtio.h) + + +# +# CPU-architecture-specific headers +# +# The 'common_include_*_content' functions take the CPU architecture as first +# argument. +# + +common_include_libc_arch_content = \ + $(addprefix src/lib/libc/sys/$1/include/, stdarg.h float.h) \ + $(addprefix src/lib/libc/lib/libc/$1/, arith.h _fpmath.h SYS.h gd_qnan.h) + +common_include_libc_arch_machine_content = \ + $(addprefix src/lib/libc/sys/$1/include/,\ + _types.h endian.h _limits.h signal.h trap.h _stdint.h \ + sysarch.h ieeefp.h frame.h sigframe.h vm.h \ + cpufunc.h vmparam.h atomic.h elf.h exec.h reloc.h pmap.h \ + ucontext.h setjmp.h asm.h param.h _inttypes.h) + + +# +# i386-specific headers +# +DIRS += include/libc-i386 +DIR_CONTENT(include/libc-i386) := \ + $(call common_include_libc_arch_content,i386) \ + src/lib/libc/lib/msun/i387/fenv.h + +DIRS += include/libc-i386/machine +DIR_CONTENT(include/libc-i386/machine) := \ + $(call common_include_libc_arch_machine_content,i386) \ + $(addprefix src/lib/libc/sys/i386/include/, specialreg.h npx.h) + + +# +# AMD64-specific headers +# +DIRS += include/libc-amd64 +DIR_CONTENT(include/libc-amd64) := \ + $(call common_include_libc_arch_content,amd64) \ + src/lib/libc/lib/msun/amd64/fenv.h + +DIRS += include/libc-amd64/machine +DIR_CONTENT(include/libc-amd64/machine) := \ + $(call common_include_libc_arch_machine_content,amd64) \ + $(addprefix src/lib/libc/sys/amd64/include/, specialreg.h fpu.h) + + +# +# ARM-specific headers +# +DIRS += include/libc-arm +DIR_CONTENT(include/libc-arm) := \ + $(call common_include_libc_arch_content,arm) \ + src/lib/libc/lib/msun/arm/fenv.h + +DIRS += include/libc-arm/machine +DIR_CONTENT(include/libc-arm/machine) := \ + $(call common_include_libc_arch_machine_content,arm) \ + $(addprefix src/lib/libc/sys/arm/include/, pte.h cpuconf.h armreg.h ieee.h) + + +# +# Rules for generating files +# + +generated_files += src/lib/libc/lib/libc/net/nslexer.c + +src/lib/libc/lib/libc/net/nslexer.l : $(DOWNLOADS) + +src/lib/libc/lib/libc/net/nslexer.c: src/lib/libc/lib/libc/net/nslexer.l + @$(MSG_GENERATE)$(notdir $@) + $(VERBOSE)$(LEX) -P_nsyy -t $< | sed -e '/YY_BUF_SIZE/s/16384/1024/' > $@ + +generated_files += src/lib/libc/lib/libc/net/nsparser.c + +src/lib/libc/lib/libc/net/nsparser.y : $(DOWNLOADS) + +src/lib/libc/lib/libc/net/nsparser.c: src/lib/libc/lib/libc/net/nsparser.y + @$(MSG_GENERATE)$(notdir $@) + $(VERBOSE)bison -d -p_nsyy $< \ + --defines=src/lib/libc/lib/libc/net/nsparser.h --output=$@ + +src/lib/libc/include/rpcsvc/nis.h: src/lib/libc/include/rpcsvc/nis_object.x + @$(MSG_GENERATE)$(notdir $@) + $(VERBOSE)rpcgen -C -h -DWANT_NFS3 $< -o $@ + +src/lib/libc/include/rpcsvc/nis_object.x : $(DOWNLOADS) + +%.h: %.x + @$(MSG_GENERATE)$(notdir $@) + $(VERBOSE)rpcgen -C -h -DWANT_NFS3 $< -o $@ + +generated_files += \ + $(addprefix src/lib/libc/include/rpcsvc/,\ + bootparam_prot.h nfs_prot.h nlm_prot.h rstat.h ypupdate_prot.h \ + crypt.h nis_cache.h pmap_prot.h rwall.h yp.h \ + key_prot.h nis_callback.h rex.h sm_inter.h ypxfrd.h \ + klm_prot.h nis_object.h rnusers.h spray.h \ + mount.h nis.h rquota.h yppasswd.h) \ + src/lib/libc/include/rpc/rpcb_prot.h + +# generate files before assembling the public include directory tree +_dirs: $(generated_files) +$(generated_files) : $(DOWNLOADS) diff --git a/repos/libports/ports/libdrm.hash b/repos/libports/ports/libdrm.hash new file mode 100644 index 0000000000..421376db9e --- /dev/null +++ b/repos/libports/ports/libdrm.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/libports/ports/libdrm.mk b/repos/libports/ports/libdrm.mk deleted file mode 100644 index f0e306162a..0000000000 --- a/repos/libports/ports/libdrm.mk +++ /dev/null @@ -1,27 +0,0 @@ -LIBDRM_VERSION = 2.4.21 -LIBDRM = libdrm-$(LIBDRM_VERSION) -LIBDRM_DIR = libdrm-$(LIBDRM_VERSION) -LIBDRM_TBZ2 = $(LIBDRM).tar.bz2 -LIBDRM_URL = http://dri.freedesktop.org/libdrm/$(LIBDRM_TBZ2) - -# -# Interface to top-level prepare Makefile -# -PORTS += $(LIBDRM) - -prepare-libdrm: $(CONTRIB_DIR)/$(LIBDRM_DIR) - -$(CONTRIB_DIR)/$(LIBDRM_DIR): clean-libdrm - -# -# Port-specific local rules -# -$(DOWNLOAD_DIR)/$(LIBDRM_TBZ2): - $(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(LIBDRM_URL) && touch $@ - -$(CONTRIB_DIR)/$(LIBDRM_DIR): $(DOWNLOAD_DIR)/$(LIBDRM_TBZ2) - $(VERBOSE)tar xfj $< -C $(CONTRIB_DIR) && touch $@ - -clean-libdrm: - $(VERBOSE)rm -rf $(CONTRIB_DIR)/$(LIBDRM_DIR) - diff --git a/repos/libports/ports/libdrm.port b/repos/libports/ports/libdrm.port new file mode 100644 index 0000000000..885608c4b8 --- /dev/null +++ b/repos/libports/ports/libdrm.port @@ -0,0 +1,7 @@ +LICENSE := MIT +VERSION := 2.4.21 +DOWNLOADS := libdrm.archive + +URL(libdrm) := http://dri.freedesktop.org/libdrm/libdrm-$(VERSION).tar.bz2 +SHA(libdrm) := be7754008424a12e01ab0f0da3deb8de13ad2f0c +DIR(libdrm) := src/lib/libdrm diff --git a/repos/libports/ports/libiconv.hash b/repos/libports/ports/libiconv.hash new file mode 100644 index 0000000000..421376db9e --- /dev/null +++ b/repos/libports/ports/libiconv.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/libports/ports/libiconv.inc b/repos/libports/ports/libiconv.inc deleted file mode 100644 index 19379441f3..0000000000 --- a/repos/libports/ports/libiconv.inc +++ /dev/null @@ -1,2 +0,0 @@ -LIBICONV_VERSION = 1.14 -LIBICONV = libiconv-$(LIBICONV_VERSION) diff --git a/repos/libports/ports/libiconv.mk b/repos/libports/ports/libiconv.mk deleted file mode 100644 index 1c6d5263b0..0000000000 --- a/repos/libports/ports/libiconv.mk +++ /dev/null @@ -1,43 +0,0 @@ -LIBICONV = libiconv-1.14 -LIBICONV_TGZ = $(LIBICONV).tar.gz -LIBICONV_SIG = $(LIBICONV_TGZ).sig -LIBICONV_BASE_URL = http://ftp.gnu.org/pub/gnu/libiconv -LIBICONV_URL = $(LIBICONV_BASE_URL)//$(LIBICONV_TGZ) -LIBICONV_URL_SIG = $(LIBICONV_BASE_URL)//$(LIBICONV_SIG) -LIBICONV_KEY = GNU - -# -# Interface to top-level prepare Makefile -# -PORTS += $(LIBICONV) - -prepare-libiconv: $(CONTRIB_DIR)/$(LIBICONV) include/iconv - -# -# Port-specific local rules -# -$(DOWNLOAD_DIR)/$(LIBICONV_TGZ): - $(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(LIBICONV_URL) && touch $@ - -$(DOWNLOAD_DIR)/$(LIBICONV_SIG): - $(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(LIBICONV_URL_SIG) && touch $@ - -$(DOWNLOAD_DIR)/$(LIBICONV_TGZ).verified: $(DOWNLOAD_DIR)/$(LIBICONV_TGZ) \ - $(DOWNLOAD_DIR)/$(LIBICONV_SIG) - $(VERBOSE)$(SIGVERIFIER) $(DOWNLOAD_DIR)/$(LIBICONV_TGZ) $(DOWNLOAD_DIR)/$(LIBICONV_SIG) $(LIBICONV_KEY) - $(VERBOSE)touch $@ - -$(CONTRIB_DIR)/$(LIBICONV): $(DOWNLOAD_DIR)/$(LIBICONV_TGZ).verified - $(VERBOSE)tar xfz $(<:.verified=) -C $(CONTRIB_DIR) && touch $@ - -# -# Install iconv headers -# - -include/iconv: - $(VERBOSE)mkdir -p $@ - $(VERBOSE)ln -sf ../../src/lib/libiconv/iconv.h $@ - -clean-libiconv: - $(VERBOSE)rm -rf include/iconv - $(VERBOSE)rm -rf $(CONTRIB_DIR)/$(LIBICONV) diff --git a/repos/libports/ports/libiconv.port b/repos/libports/ports/libiconv.port new file mode 100644 index 0000000000..7829a2d939 --- /dev/null +++ b/repos/libports/ports/libiconv.port @@ -0,0 +1,29 @@ +LICENSE := GPLv3 +VERSION := 1.14 +DOWNLOADS := libiconv.archive + +URL(libiconv) := http://ftp.gnu.org/pub/gnu/libiconv/libiconv-$(VERSION).tar.gz +SHA(libiconv) := be7d67e50d72ff067b2c0291311bc283add36965 +SIG(libiconv) := ${URL(libiconv)}.sig +KEY(libiconv) := GNU +DIR(libiconv) := src/lib/libiconv + +default: include/iconv/iconv.h + +include/iconv/iconv.h: $(DOWNLOADS) + +iconv_subst := \ + "@DLL_VARIABLE@/" \ + "@EILSEQ@/" \ + "@ICONV_CONST@/" \ + "@USE_MBSTATE_T@/1" \ + "@BROKEN_WCHAR_H@/0" \ + "@HAVE_WCHAR_T@/1" + +apply_substitutions = for i in $(iconv_subst); do sed -i "s/$$i/g" $(1); done + +include/iconv/iconv.h: + $(VERBOSE)mkdir -p $(dir $@) + $(VERBOSE)cp src/lib/libiconv/include/iconv.h.in $@ + $(VERBOSE)$(call apply_substitutions,$@) + diff --git a/repos/libports/ports/libpng.hash b/repos/libports/ports/libpng.hash new file mode 100644 index 0000000000..421376db9e --- /dev/null +++ b/repos/libports/ports/libpng.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/libports/ports/libpng.mk b/repos/libports/ports/libpng.mk deleted file mode 100644 index b104858e3a..0000000000 --- a/repos/libports/ports/libpng.mk +++ /dev/null @@ -1,32 +0,0 @@ -LIBPNG = libpng-1.4.1 -LIBPNG_TGZ = libpng-1.4.1.tar.gz -LIBPNG_URL = http://prdownloads.sourceforge.net/libpng/$(LIBPNG_TGZ) - -# -# Interface to top-level prepare Makefile -# -PORTS += $(LIBPNG) - -prepare-libpng: $(CONTRIB_DIR)/$(LIBPNG) include/libpng - -$(CONTRIB_DIR)/$(LIBPNG): clean-libpng - -# -# Port-specific local rules -# -$(DOWNLOAD_DIR)/$(LIBPNG_TGZ): - $(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(LIBPNG_URL) && touch $@ - -$(CONTRIB_DIR)/$(LIBPNG): $(DOWNLOAD_DIR)/$(LIBPNG_TGZ) - $(VERBOSE)tar xfz $< -C $(CONTRIB_DIR) && touch $@ - -LIBPNG_INCLUDES = pngconf.h png.h pngpriv.h - -include/libpng: - $(VERBOSE)mkdir -p $@ - $(VERBOSE)for i in $(LIBPNG_INCLUDES); do \ - ln -sf ../../$(CONTRIB_DIR)/$(LIBPNG)/$$i $@; done - -clean-libpng: - $(VERBOSE)rm -rf include/libpng - $(VERBOSE)rm -rf $(CONTRIB_DIR)/$(LIBPNG) diff --git a/repos/libports/ports/libpng.port b/repos/libports/ports/libpng.port new file mode 100644 index 0000000000..f8309bb9ad --- /dev/null +++ b/repos/libports/ports/libpng.port @@ -0,0 +1,10 @@ +LICENSE := PNG +DOWNLOADS := libpng.archive +VERSION := 1.4.1 + +URL(libpng) := http://prdownloads.sourceforge.net/libpng/libpng-$(VERSION).tar.gz +SHA(libpng) := 7a3488f5844068d67074f2507dd8a7ed9c69ff04 +DIR(libpng) := src/lib/libpng + +DIRS := include/libpng +DIR_CONTENT(include/libpng) := $(addprefix src/lib/libpng/,pngconf.h png.h pngpriv.h) diff --git a/repos/libports/ports/libssh.hash b/repos/libports/ports/libssh.hash new file mode 100644 index 0000000000..421376db9e --- /dev/null +++ b/repos/libports/ports/libssh.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/libports/ports/libssh.inc b/repos/libports/ports/libssh.inc deleted file mode 100644 index cadf1c6344..0000000000 --- a/repos/libports/ports/libssh.inc +++ /dev/null @@ -1,2 +0,0 @@ -LIBSSH_VERSION = 0.5.4 -LIBSSH = libssh-$(LIBSSH_VERSION) diff --git a/repos/libports/ports/libssh.mk b/repos/libports/ports/libssh.mk deleted file mode 100644 index 1911990d28..0000000000 --- a/repos/libports/ports/libssh.mk +++ /dev/null @@ -1,49 +0,0 @@ -include ports/libssh.inc - -LIBSSH_TGZ = $(LIBSSH).tar.gz -LIBSSH_SIG = $(LIBSSH).tar.asc -LIBSSH_URL = https://red.libssh.org/attachments/download/41/$(LIBSSH_TGZ) -LIBSSH_URL_SIG = https://red.libssh.org/attachments/download/42/$(LIBSSH_SIG) - -# -# XXX The signature check for libssh is prepared but yet disabled. The source -# for the verification PGP key is yet unknown. If the PGP key becomes -# known, just add it to the _KEY variable. -# -LIBSSH_KEY = FIXME - -# -# Interface to top-level prepare Makefile -# -PORTS += $(LIBSSH) - -prepare-libssh: $(CONTRIB_DIR)/$(LIBSSH) include/libssh - -$(CONTRIB_DIR)/$(LIBSSH): clean-libssh - -# -# Port-specific local rules -# -$(DOWNLOAD_DIR)/$(LIBSSH_TGZ): - $(VERBOSE)wget --no-check-certificate -c -P $(DOWNLOAD_DIR) $(LIBSSH_URL) && touch $@ - -$(DOWNLOAD_DIR)/$(LIBSSH_SIG): - $(VERBOSE)wget --no-check-certificate -c -P $(DOWNLOAD_DIR) $(LIBSSH_URL_SIG) && touch $@ - -$(DOWNLOAD_DIR)/$(LIBSSH_TGZ).verified: $(DOWNLOAD_DIR)/$(LIBSSH_TGZ) \ - $(DOWNLOAD_DIR)/$(LIBSSH_SIG) - # XXX We have no key for libssh at the moment - #$(VERBOSE)$(SIGVERIFIER) $(DOWNLOAD_DIR)/$(LIBSSH_TGZ) $(DOWNLOAD_DIR)/$(LIBSSH_SIG) $(LIBSSH_KEY) - $(VERBOSE)touch $@ - -$(CONTRIB_DIR)/$(LIBSSH): $(DOWNLOAD_DIR)/$(LIBSSH_TGZ).verified - $(VERBOSE)tar xfz $(<:.verified=) -C $(CONTRIB_DIR) && touch $@ - -include/libssh: - $(VERBOSE)mkdir -p $@ - $(VERBOSE)for f in $(shell find $(CONTRIB_DIR)/$(LIBSSH)/include -name *.h); do \ - ln -sf ../../$$f $@; done - -clean-libssh: - $(VERBOSE)rm -rf $(CONTRIB_DIR)/$(LIBSSH) - $(VERBOSE)rm -rf include/libssh diff --git a/repos/libports/ports/libssh.port b/repos/libports/ports/libssh.port new file mode 100644 index 0000000000..464113c1ce --- /dev/null +++ b/repos/libports/ports/libssh.port @@ -0,0 +1,11 @@ +LICENSE := LGPL +DOWNLOADS := libssh.archive +VERSION := 0.5.4 + +URL(libssh) := https://red.libssh.org/attachments/download/41/libssh-$(VERSION).tar.gz +SIG(libssh) := https://red.libssh.org/attachments/download/42/libssh-$(VERSION).tar.asc +SHA(libssh) := 4a372378db8fffaf28d5c79d80b2235843aa587c +DIR(libssh) := src/lib/libssh + +DIRS := include +DIR_CONTENT(include) := src/lib/libssh/include/libssh diff --git a/repos/libports/ports/lua.hash b/repos/libports/ports/lua.hash new file mode 100644 index 0000000000..421376db9e --- /dev/null +++ b/repos/libports/ports/lua.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/libports/ports/lua.mk b/repos/libports/ports/lua.mk deleted file mode 100644 index 2366552e28..0000000000 --- a/repos/libports/ports/lua.mk +++ /dev/null @@ -1,39 +0,0 @@ -LUA = lua-5.1.5 -LUA_TGZ = $(LUA).tar.gz -LUA_URL = http://www.lua.org/ftp/$(LUA_TGZ) -LUA_SHA = b3882111ad02ecc6b972f8c1241647905cb2e3fc - -# -# Interface to top-level prepare Makefile -# -PORTS += $(LUA) - -LUA_INC_DIR = include/lua - -prepare-lua: $(CONTRIB_DIR)/$(LUA) $(LUA_INC_DIR) - -$(CONTRIB_DIR)/$(LUA): clean-lua - -# -# Port-specific local rules -# -$(DOWNLOAD_DIR)/$(LUA_TGZ): - $(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(LUA_URL) && touch $@ - -$(DOWNLOAD_DIR)/$(LUA_TGZ).verified: $(DOWNLOAD_DIR)/$(LUA_TGZ) - $(VERBOSE)$(HASHVERIFIER) $(DOWNLOAD_DIR)/$(LUA_TGZ) $(LUA_SHA) sha1 - $(VERBOSE)touch $@ - -$(CONTRIB_DIR)/$(LUA): $(DOWNLOAD_DIR)/$(LUA_TGZ).verified - $(VERBOSE)tar xfz $(<:.verified=) -C $(CONTRIB_DIR) && touch $@ - -LUA_INCLUDES = lua.h lauxlib.h luaconf.h lualib.h - -$(LUA_INC_DIR): - $(VERBOSE)mkdir -p $@ - $(VERBOSE)for i in $(LUA_INCLUDES); do \ - ln -sf ../../$(CONTRIB_DIR)/$(LUA)/src/$$i $@; done - -clean-lua: - $(VERBOSE)rm -rf $(LUA_INC_DIR) - $(VERBOSE)rm -rf $(CONTRIB_DIR)/$(LUA) diff --git a/repos/libports/ports/lua.port b/repos/libports/ports/lua.port new file mode 100644 index 0000000000..f10f228222 --- /dev/null +++ b/repos/libports/ports/lua.port @@ -0,0 +1,11 @@ +LICENSE := MIT +VERSION := 5.1.5 +DOWNLOADS := lua.archive + +URL(lua) := http://www.lua.org/ftp/lua-$(VERSION).tar.gz +SHA(lua) := b3882111ad02ecc6b972f8c1241647905cb2e3fc +DIR(lua) := src/lib/lua + +DIRS := include/lua +DIR_CONTENT(include/lua) := $(addprefix src/lib/lua/src/,\ + lua.h lauxlib.h luaconf.h lualib.h) diff --git a/repos/libports/ports/lwip.hash b/repos/libports/ports/lwip.hash new file mode 100644 index 0000000000..017b7e137e --- /dev/null +++ b/repos/libports/ports/lwip.hash @@ -0,0 +1 @@ +b2af42c914bdda7abfd2caa33d0f7bb54c9408ed diff --git a/repos/libports/ports/lwip.inc b/repos/libports/ports/lwip.inc deleted file mode 100644 index e08ad8cfb8..0000000000 --- a/repos/libports/ports/lwip.inc +++ /dev/null @@ -1,2 +0,0 @@ -LWIP_VERSION = git -LWIP = lwip-$(LWIP_VERSION) diff --git a/repos/libports/ports/lwip.mk b/repos/libports/ports/lwip.mk deleted file mode 100644 index 4a9679935d..0000000000 --- a/repos/libports/ports/lwip.mk +++ /dev/null @@ -1,54 +0,0 @@ -include ports/lwip.inc - -LWIP_URL = git://git.savannah.nongnu.org/lwip.git -LWIP_REV = fe63f36656bd66b4051bdfab93e351a584337d7c -PATCH_URL_WINDOW_SCALING = https://savannah.nongnu.org/patch/download.php?file_id=28026 - -# -# Interface to top-level prepare Makefile -# -PORTS += $(LWIP) - -# -# Check for tools -# -$(call check_tool, git) -$(call check_tool, patch) - -prepare-lwip: $(CONTRIB_DIR)/$(LWIP) include/lwip/lwip include/lwip/netif - -$(CONTRIB_DIR)/$(LWIP): clean-lwip - -# -# Port-specific local rules -# -$(DOWNLOAD_DIR)/$(LWIP)/.git: - $(VERBOSE)git clone $(LWIP_URL) $(DOWNLOAD_DIR)/$(LWIP) && \ - cd $(DOWNLOAD_DIR)/$(LWIP) && \ - git reset --hard $(LWIP_REV) && \ - wget $(PATCH_URL_WINDOW_SCALING) -O window_scaling.patch && \ - cd ../.. && touch $@ - - -$(CONTRIB_DIR)/$(LWIP)/.git: $(DOWNLOAD_DIR)/$(LWIP)/.git - $(VERBOSE)git clone $(DOWNLOAD_DIR)/$(LWIP) $(CONTRIB_DIR)/$(LWIP) - $(VERBOSE)find ./src/lib/lwip/ -name "*.patch" |\ - xargs -ixxx sh -c "patch -p1 -r - -N -d $(CONTRIB_DIR)/$(LWIP) < xxx" || true - $(VERBOSE)patch -p1 -d $(CONTRIB_DIR)/$(LWIP) < $(DOWNLOAD_DIR)/$(LWIP)/window_scaling.patch - -$(CONTRIB_DIR)/$(LWIP): $(CONTRIB_DIR)/$(LWIP)/.git - -include/lwip/lwip: - $(VERBOSE)mkdir -p $@ - $(VERBOSE)ln -s $(addprefix ../../../, $(wildcard $(CONTRIB_DIR)/$(LWIP)/src/include/lwip/*.h)) -t $@ - $(VERBOSE)ln -s $(addprefix ../../../, $(wildcard $(CONTRIB_DIR)/$(LWIP)/src/include/ipv4/lwip/*.h)) -t $@ - $(VERBOSE)ln -s $(addprefix ../../../, $(wildcard $(CONTRIB_DIR)/$(LWIP)/src/include/ipv6/lwip/*.h)) -t $@ - -include/lwip/netif: - $(VERBOSE)mkdir -p $@ - $(VERBOSE)ln -s $(addprefix ../../../, $(wildcard $(CONTRIB_DIR)/$(LWIP)/src/include/netif/*.h)) -t $@ - -clean-lwip: - $(VERBOSE)rm -rf $(CONTRIB_DIR)/$(LWIP) - $(VERBOSE)rm -rf include/lwip/lwip - $(VERBOSE)rm -rf include/lwip/netif diff --git a/repos/libports/ports/lwip.port b/repos/libports/ports/lwip.port new file mode 100644 index 0000000000..9228ca1eb4 --- /dev/null +++ b/repos/libports/ports/lwip.port @@ -0,0 +1,27 @@ +LICENSE := BSD +VERSION := git +DOWNLOADS := lwip.git window_scaling_patch.file + +URL(lwip) := git://git.savannah.nongnu.org/lwip.git +REV(lwip) := fe63f36656bd66b4051bdfab93e351a584337d7c +DIR(lwip) := src/lib/lwip + +URL(window_scaling_patch) := https://savannah.nongnu.org/patch/download.php?file_id=28026 +NAME(window_scaling_patch) := src/lib/lwip/window_scaling.patch +SHA(window_scaling_patch) := 5be562adddc05fa00ecead8fbca8d7797e76670e + +PATCHES := $(addprefix src/lib/lwip/,window_scaling.patch \ + errno.patch \ + libc_select_notify.patch \ + sockets_c_errno.patch \ + sol_socket_definition.patch) + +PATCH_OPT(src/lib/lwip/window_scaling.patch) := -p1 -d src/lib/lwip + +DIRS := include/lwip/lwip include/lwip/netif + +DIR_CONTENT(include/lwip/lwip) := src/lib/lwip/src/include/lwip/*.h \ + src/lib/lwip/src/include/ipv4/lwip/*.h \ + src/lib/lwip/src/include/ipv6/lwip/*.h + +DIR_CONTENT(include/lwip/netif) := src/lib/lwip/src/include/netif/*.h diff --git a/repos/libports/ports/mesa.hash b/repos/libports/ports/mesa.hash new file mode 100644 index 0000000000..421376db9e --- /dev/null +++ b/repos/libports/ports/mesa.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/libports/ports/mesa.mk b/repos/libports/ports/mesa.mk deleted file mode 100644 index 30b438c361..0000000000 --- a/repos/libports/ports/mesa.mk +++ /dev/null @@ -1,49 +0,0 @@ -MESA_VERSION = 7.8.1 -MESA = MesaLib-$(MESA_VERSION) -MESA_DIR = Mesa-$(MESA_VERSION) -MESA_TGZ = $(MESA).tar.gz -MESA_URL = ftp://ftp.freedesktop.org/pub/mesa/older-versions/7.x/7.8.1/$(MESA_TGZ) - -# -# Interface to top-level prepare Makefile -# -# Register Mesa port as lower case to be consistent with the -# other libraries. -# -PORTS += mesa-$(MESA_VERSION) - -MESA_INCLUDE_SYMLINKS = $(addprefix include/,GL KHR EGL/egl.h EGL/eglext.h) - -prepare-mesa: $(CONTRIB_DIR)/$(MESA_DIR) tool/mesa/glsl $(MESA_INCLUDE_SYMLINKS) - -$(CONTRIB_DIR)/$(MESA_DIR): clean-mesa - -# -# Port-specific local rules -# -$(DOWNLOAD_DIR)/$(MESA_TGZ): - $(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(MESA_URL) && touch $@ - -$(CONTRIB_DIR)/$(MESA_DIR): $(DOWNLOAD_DIR)/$(MESA_TGZ) - $(VERBOSE)tar xfz $< -C $(CONTRIB_DIR) - $(VERBOSE)patch -N -p0 -d $(CONTRIB_DIR)/$(MESA_DIR) < src/lib/gallium/p_state_config.patch - $(VERBOSE)patch -N -p1 -d $(CONTRIB_DIR)/$(MESA_DIR) < src/lib/egl/opengl_precision.patch - $(VERBOSE)touch $@ - -tool/mesa/glsl: - $(VERBOSE)make -C tool/mesa - -$(MESA_INCLUDE_SYMLINKS): - $(VERBOSE)ln -sf $(realpath $(CONTRIB_DIR)/$(MESA_DIR)/$@) $@ && touch $@ - -clean_tool_mesa: - $(VERBOSE)make -C tool/mesa clean - -clean_mesa_include_symlinks: - $(VERBOSE)rm -f $(MESA_INCLUDE_SYMLINKS) - -clean-mesa: clean_tool_mesa clean_mesa_include_symlinks - $(VERBOSE)rm -rf $(CONTRIB_DIR)/$(MESA_DIR) - - - diff --git a/repos/libports/ports/mesa.port b/repos/libports/ports/mesa.port new file mode 100644 index 0000000000..fd4f3656d0 --- /dev/null +++ b/repos/libports/ports/mesa.port @@ -0,0 +1,12 @@ +LICENSE := GPLv2 +VERSION := 7.8.1 +DOWNLOADS := mesa.archive + +URL(mesa) := ftp://ftp.freedesktop.org/pub/mesa/older-versions/7.x/$(VERSION)/MesaLib-$(VERSION).tar.gz +SHA(mesa) := 74e72b56c7ae779649c18867fe9e0865f3bfc057 +DIR(mesa) := src/lib/mesa + +DIRS := include include/EGL +DIR_CONTENT(include) := $(addprefix src/lib/mesa/include/,GL KHR) +DIR_CONTENT(include/EGL) := $(addprefix src/lib/mesa/include/EGL/,egl.h eglext.h) + diff --git a/repos/libports/ports/mpc.hash b/repos/libports/ports/mpc.hash new file mode 100644 index 0000000000..421376db9e --- /dev/null +++ b/repos/libports/ports/mpc.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/libports/ports/mpc.mk b/repos/libports/ports/mpc.mk deleted file mode 100644 index 4ba109fd6f..0000000000 --- a/repos/libports/ports/mpc.mk +++ /dev/null @@ -1,46 +0,0 @@ -include lib/import/import-mpc.mk - -MPC_TGZ = $(MPC).tar.gz -MPC_SIG = $(MPC_TGZ).asc -MPC_BASE_URL = http://www.multiprecision.org/mpc/download -MPC_URL = $(MPC_BASE_URL)/$(MPC_TGZ) -MPC_URL_SIG = $(MPC_BASE_URL)/$(MPC_SIG) -# see http://www.multiprecision.org/index.php?prog=mpc&page=download -MPC_KEY = AD17A21EF8AED8F1CC02DBD9F7D5C9BF765C61E3 - - -# -# Interface to top-level prepare Makefile -# -PORTS += $(MPC) - -MPC_INCLUDES = include/mpc/mpc.h - -prepare-mpc: $(CONTRIB_DIR)/$(MPC) $(MPC_INCLUDES) - -$(CONTRIB_DIR)/$(MPC): clean-mpc - -# -# Port-specific local rules -# -$(DOWNLOAD_DIR)/$(MPC_TGZ): - $(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(MPC_URL) && touch $@ - -$(DOWNLOAD_DIR)/$(MPC_SIG): - $(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(MPC_URL_SIG) && touch $@ - -$(DOWNLOAD_DIR)/$(MPC_TGZ).verified: $(DOWNLOAD_DIR)/$(MPC_TGZ) \ - $(DOWNLOAD_DIR)/$(MPC_SIG) - $(VERBOSE)$(SIGVERIFIER) $(DOWNLOAD_DIR)/$(MPC_TGZ) $(DOWNLOAD_DIR)/$(MPC_SIG) $(MPC_KEY) - $(VERBOSE)touch $@ - -$(CONTRIB_DIR)/$(MPC): $(DOWNLOAD_DIR)/$(MPC_TGZ).verified - $(VERBOSE)tar xfz $(<:.verified=) -C $(CONTRIB_DIR) && touch $@ - -include/mpc/mpc.h: - $(VERBOSE)mkdir -p $(dir $@) - $(VERBOSE)ln -sf ../../$(CONTRIB_DIR)/$(MPC)/src/mpc.h $@ - -clean-mpc: - $(VERBOSE)rm -f $(MPC_INCLUDES) - $(VERBOSE)rm -rf $(CONTRIB_DIR)/$(MPC) diff --git a/repos/libports/ports/mpc.port b/repos/libports/ports/mpc.port new file mode 100644 index 0000000000..4b0fbb2961 --- /dev/null +++ b/repos/libports/ports/mpc.port @@ -0,0 +1,12 @@ +LICENSE := LGPL +VERSION := 0.9 +DOWNLOADS := mpc.archive + +URL(mpc) := http://www.multiprecision.org/mpc/download/mpc-$(VERSION).tar.gz +SHA(mpc) := 229722d553030734d49731844abfef7617b64f1a +SIG(mpc) := ${URL(mpc)}.asc +KEY(mpc) := AD17A21EF8AED8F1CC02DBD9F7D5C9BF765C61E3 +DIR(mpc) := src/lib/mpc + +DIRS := include/mpc +DIR_CONTENT(include/mpc) := src/lib/mpc/src/mpc.h diff --git a/repos/libports/ports/mpfr.hash b/repos/libports/ports/mpfr.hash new file mode 100644 index 0000000000..421376db9e --- /dev/null +++ b/repos/libports/ports/mpfr.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/libports/ports/mpfr.mk b/repos/libports/ports/mpfr.mk deleted file mode 100644 index 57051841f0..0000000000 --- a/repos/libports/ports/mpfr.mk +++ /dev/null @@ -1,47 +0,0 @@ -MPFR = mpfr-3.0.0 -MPFR_TGZ = $(MPFR).tar.gz -MPFR_SIG = $(MPFR_TGZ).asc -MPFR_BASE_URL = http://www.mpfr.org/$(MPFR) -MPFR_URL = $(MPFR_BASE_URL)/$(MPFR_TGZ) -MPFR_URL_SIG = $(MPFR_BASE_URL)/$(MPFR_SIG) -MPFR_KEY = GNU - -# -# Interface to top-level prepare Makefile -# -PORTS += $(MPFR) - -MPFR_INCLUDES = include/mpfr/mpfr.h include/mpfr/mparam.h - -prepare-mpfr: $(CONTRIB_DIR)/$(MPFR) $(MPFR_INCLUDES) - -$(CONTRIB_DIR)/$(MPFR): clean-mpfr - -# -# Port-specific local rules -# -$(DOWNLOAD_DIR)/$(MPFR_TGZ): - $(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(MPFR_URL) && touch $@ - -$(DOWNLOAD_DIR)/$(MPFR_SIG): - $(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(MPFR_URL_SIG) && touch $@ - -$(DOWNLOAD_DIR)/$(MPFR_TGZ).verified: $(DOWNLOAD_DIR)/$(MPFR_TGZ) \ - $(DOWNLOAD_DIR)/$(MPFR_SIG) - $(VERBOSE)$(SIGVERIFIER) $(DOWNLOAD_DIR)/$(MPFR_TGZ) $(DOWNLOAD_DIR)/$(MPFR_SIG) $(MPFR_KEY) - $(VERBOSE)touch $@ - -$(CONTRIB_DIR)/$(MPFR): $(DOWNLOAD_DIR)/$(MPFR_TGZ).verified - $(VERBOSE)tar xfz $(<:.verified=) -C $(CONTRIB_DIR) && touch $@ - -include/mpfr/mpfr.h: - $(VERBOSE)mkdir -p $(dir $@) - $(VERBOSE)ln -sf ../../$(CONTRIB_DIR)/$(MPFR)/mpfr.h $@ - -include/mpfr/mparam.h: - $(VERBOSE)mkdir -p $(dir $@) - $(VERBOSE)ln -sf ../../$(CONTRIB_DIR)/$(MPFR)/mparam_h.in $@ - -clean-mpfr: - $(VERBOSE)rm -f $(MPFR_INCLUDES) - $(VERBOSE)rm -rf $(CONTRIB_DIR)/$(MPFR) diff --git a/repos/libports/ports/mpfr.port b/repos/libports/ports/mpfr.port new file mode 100644 index 0000000000..bb72f1f1fd --- /dev/null +++ b/repos/libports/ports/mpfr.port @@ -0,0 +1,19 @@ +LICENSE := GPLv3 +VERSION := 3.0.0 +DOWNLOADS := mpfr.archive + +URL(mpfr) := http://www.mpfr.org/mpfr-$(VERSION)/mpfr-$(VERSION).tar.gz +SHA(mpfr) := d45409b4586c7dda9cc0c0953f27e6dd5188a908 +SIG(mpfr) := ${URL(mpfr)}.asc +KEY(mpfr) := GNU +DIR(mpfr) := src/lib/mpfr + +DIRS := include/mpfr +DIR_CONTENT(include/mpfr) := src/lib/mpfr/mpfr.h + +default: include/mpfr/mparam.h + +include/mpfr/mparam.h: _dirs + @$(MSG_INSTALL)$@ + @cp src/lib/mpfr/mparam_h.in $@ + diff --git a/repos/libports/ports/mupdf.hash b/repos/libports/ports/mupdf.hash new file mode 100644 index 0000000000..421376db9e --- /dev/null +++ b/repos/libports/ports/mupdf.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/libports/ports/mupdf.mk b/repos/libports/ports/mupdf.mk deleted file mode 100644 index 687c3427c6..0000000000 --- a/repos/libports/ports/mupdf.mk +++ /dev/null @@ -1,98 +0,0 @@ -MUPDF := mupdf-0.9 -MUPDF_TGZ := mupdf-0.9.tar.gz -MUPDF_URL := http://mupdf.googlecode.com/files/mupdf-0.9-source.tar.gz -MUPDF_DIR := $(CONTRIB_DIR)/$(MUPDF) - -# -# Interface to top-level prepare Makefile -# -PORTS += $(MUPDF) - -prepare-mupdf: $(CONTRIB_DIR)/$(MUPDF) - -$(CONTRIB_DIR)/$(MUPDF): clean-mupdf - -# -# Port-specific local rules -# -$(DOWNLOAD_DIR)/$(MUPDF_TGZ): - $(VERBOSE)wget -c -P $(DOWNLOAD_DIR) -O $@ $(MUPDF_URL) && touch $@ - -$(CONTRIB_DIR)/$(MUPDF): $(DOWNLOAD_DIR)/$(MUPDF_TGZ) - $(VERBOSE)tar xfz $< -C $(CONTRIB_DIR) && touch $@ - -clean-mupdf: clean-mupdf_contrib -clean-mupdf_contrib: - $(VERBOSE)rm -rf $(MUPDF_DIR) - -# -# Install public headers to 'include/mupdf/' -# -MUPDF_INC_DIR := include/mupdf -MUPDF_INC_FILES := $(addprefix $(MUPDF_INC_DIR)/,mupdf.h fitz.h muxps.h) - -prepare-mupdf: $(MUPDF_INC_FILES) - -$(MUPDF_INC_FILES): $(MUPDF_INC_DIR) - -$(MUPDF_INC_DIR): - $(VERBOSE)mkdir -p $@ - -include/mupdf/mupdf.h: - $(VERBOSE)ln -s ../../$(MUPDF_DIR)/pdf/mupdf.h $@ -include/mupdf/muxps.h: - $(VERBOSE)ln -s ../../$(MUPDF_DIR)/xps/muxps.h $@ -include/mupdf/fitz.h: - $(VERBOSE)ln -s ../../$(MUPDF_DIR)/fitz/fitz.h $@ - -clean-mupdf: clean-mupdf_include -clean-mupdf_include: - $(VERBOSE)rm -rf include/mupdf - -# -# Compile tools used to create generated header files -# -MUPDF_FONTDUMP = tool/mupdf/fontdump -MUPDF_CMAPDUMP = tool/mupdf/cmapdump - -prepare-mupdf: $(MUPDF_FONTDUMP) $(MUPDF_CMAPDUMP) - -$(MUPDF_FONTDUMP) $(MUPDF_CMAPDUMP): $(MUPDF_DIR) - $(VERBOSE)mkdir -p $(dir $@) - $(VERBOSE)gcc $(addprefix -I$(MUPDF_DIR)/,fitz pdf) $(MUPDF_DIR)/scripts/$(notdir $@).c -o $@ - -clean-mupdf: clean-mupdf_tool -clean-mupdf_tool: - $(VERBOSE)rm -rf tool/mupdf - -# -# Create generated (lib-internal) header files -# -MUPDF_GEN_DIR := $(MUPDF_DIR)/generated -MUPDF_GEN_FILES := $(addprefix $(MUPDF_GEN_DIR)/,cmap_cns.h cmap_gb.h cmap_japan.h cmap_korea.h font_base14.h font_droid.h font_cjk.h) - -$(MUPDF_GEN_FILES): $(MUPDF_FONTDUMP) $(MUPDF_CMAPDUMP) -$(MUPDF_GEN_FILES): $(MUPDF_GEN_DIR) - -prepare-mupdf: $(MUPDF_GEN_FILES) - -$(MUPDF_GEN_DIR): - $(VERBOSE)mkdir -p $@ - -MUPDF_ABS_DIR = $(realpath $(MUPDF_DIR)) - -$(MUPDF_DIR)/generated/cmap_cns.h: - $(VERBOSE)$(MUPDF_CMAPDUMP) $@ $(MUPDF_ABS_DIR)/cmaps/cns/* -$(MUPDF_DIR)/generated/cmap_gb.h: - $(VERBOSE)$(MUPDF_CMAPDUMP) $@ $(MUPDF_ABS_DIR)/cmaps/gb/* -$(MUPDF_DIR)/generated/cmap_japan.h: - $(VERBOSE)$(MUPDF_CMAPDUMP) $@ $(MUPDF_ABS_DIR)/cmaps/japan/* -$(MUPDF_DIR)/generated/cmap_korea.h: - $(VERBOSE)$(MUPDF_CMAPDUMP) $@ $(MUPDF_ABS_DIR)/cmaps/korea/* -$(MUPDF_DIR)/generated/font_base14.h: - $(VERBOSE)$(MUPDF_FONTDUMP) $@ $(MUPDF_ABS_DIR)/fonts/*.cff -$(MUPDF_DIR)/generated/font_droid.h: - $(VERBOSE)$(MUPDF_FONTDUMP) $@ $(addprefix $(MUPDF_ABS_DIR)/fonts/droid/,DroidSans.ttf DroidSansMono.ttf) -$(MUPDF_DIR)/generated/font_cjk.h: - $(VERBOSE)$(MUPDF_FONTDUMP) $@ $(MUPDF_ABS_DIR)/fonts/droid/DroidSansFallback.ttf - diff --git a/repos/libports/ports/mupdf.port b/repos/libports/ports/mupdf.port new file mode 100644 index 0000000000..0ede45864e --- /dev/null +++ b/repos/libports/ports/mupdf.port @@ -0,0 +1,17 @@ +LICENSE := GPLv3 +VERSION := 0.9 +DOWNLOADS := mupdf.archive + +URL(mupdf) := http://mupdf.googlecode.com/files/mupdf-$(VERSION)-source.tar.gz +SHA(mupdf) := 3a3ba42d19e3211199110e7c782263241cdea8a0 +DIR(mupdf) := src/lib/mupdf + +DIRS := include/mupdf +DIR_CONTENT(include/mupdf) := $(addprefix src/lib/mupdf/,\ + pdf/mupdf.h xps/muxps.h fitz/fitz.h) + +default: fix_include + +fix_include: $(DOWNLOADS) + $(VERBOSE)sed -i "/include/s/\.\.\///" src/lib/mupdf/pdf/pdf_cmap_table.c \ + src/lib/mupdf/pdf/pdf_fontfile.c diff --git a/repos/libports/ports/ncurses.hash b/repos/libports/ports/ncurses.hash new file mode 100644 index 0000000000..421376db9e --- /dev/null +++ b/repos/libports/ports/ncurses.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/libports/ports/ncurses.mk b/repos/libports/ports/ncurses.mk deleted file mode 100644 index 1bed012f3f..0000000000 --- a/repos/libports/ports/ncurses.mk +++ /dev/null @@ -1,205 +0,0 @@ -NCURSES := ncurses-5.9 -NCURSES_TGZ := $(NCURSES).tar.gz -NCURSES_SIG := $(NCURSES_TGZ).sig -NCURSES_BASE_URL := http://ftp.gnu.org/pub/gnu/ncurses -NCURSES_URL := $(NCURSES_BASE_URL)/$(NCURSES_TGZ) -NCURSES_URL_SIG := $(NCURSES_BASE_URL)/$(NCURSES_SIG) -NCURSES_KEY := GNU - -# -# Interface to top-level prepare Makefile -# -PORTS += $(NCURSES) - -# -# Check for tools -# -$(call check_tool,sed) -$(call check_tool,mawk) - -NCURSES_SYMLINKED_INC := nc_alloc.h nc_panel.h nc_tparm.h term_entry.h \ - tic.h hashed_db.h capdefaults.c -NCURSES_GENERATED_INC := curses.h ncurses_def.h ncurses_dll.h term.h \ - unctrl.h termcap.h parametrized.h hashsize.h \ - init_keytry.h keys.list make_keys MKterm.h.awk - -NCURSES_GENERATED_SRC := names.c unctrl.c fallback.c comp_captab.c codes.c \ - make_hash make_keys - -NCURSES_GEN_SYMLINKS := $(addprefix include/ncurses/,$(NCURSES_SYMLINKED_INC)) - -NCURSES_GEN_FILES := $(addprefix include/ncurses/,$(NCURSES_GENERATED_INC)) \ - $(addprefix src/lib/ncurses/,$(NCURSES_GENERATED_SRC)) - -prepare-ncurses: $(NCURSES_GEN_SYMLINKS) $(NCURSES_GEN_FILES) - -$(CONTRIB_DIR)/$(NCURSES): clean-ncurses - -$(NCURSES_GEN_SYMLINKS) $(NCURSES_GEN_FILES): $(CONTRIB_DIR)/$(NCURSES) src/lib/ncurses - -# -# Port-specific local rules -# -$(DOWNLOAD_DIR)/$(NCURSES_TGZ): - $(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(NCURSES_URL) && touch $@ - -$(DOWNLOAD_DIR)/$(NCURSES_SIG): - $(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(NCURSES_URL_SIG) && touch $@ - -$(DOWNLOAD_DIR)/$(NCURSES_TGZ).verified: $(DOWNLOAD_DIR)/$(NCURSES_TGZ) \ - $(DOWNLOAD_DIR)/$(NCURSES_SIG) - $(VERBOSE)$(SIGVERIFIER) $(DOWNLOAD_DIR)/$(NCURSES_TGZ) $(DOWNLOAD_DIR)/$(NCURSES_SIG) $(NCURSES_KEY) - $(VERBOSE)touch $@ - -$(CONTRIB_DIR)/$(NCURSES): $(DOWNLOAD_DIR)/$(NCURSES_TGZ).verified - $(VERBOSE)tar xfz $(<:.verified=) -C $(CONTRIB_DIR) && touch $@ - -src/lib/ncurses: - $(VERBOSE)mkdir -p $@ - -# -# Create symlinks to ncurses contrib dir -# -$(NCURSES_GEN_SYMLINKS): - $(VERBOSE)for i in $(NCURSES_SYMLINKED_INC); do \ - ln -sf ../../$(CONTRIB_DIR)/$(NCURSES)/include/$$i include/ncurses/$$i; done - $(VERBOSE)ln -sf curses.h include/ncurses/ncurses.h - -# -# Produce generated includes -# - -NCURSES_SUBST := \ - "@NCURSES_MAJOR@/5" \ - "@NCURSES_MINOR@/9" \ - "@NCURSES_PATCH@/20110404" \ - "@NCURSES_MOUSE_VERSION@/1" \ - "@NCURSES_CONST@/\/*nothing*\/" \ - "@NCURSES_INLINE@/inline" \ - "@NCURSES_OPAQUE@/0" \ - "@NCURSES_INTEROP_FUNCS@/0" \ - "@NCURSES_SIZE_T@/short" \ - "@NCURSES_TPARM_VARARGS@/1" \ - "@NCURSES_CH_T@/chtype" \ - "@NCURSES_LIBUTF8@/0" \ - "@NCURSES_OSPEED@/short" \ - "@NCURSES_WCHAR_T@/0" \ - "@NCURSES_WINT_T@/0" \ - "@NCURSES_SBOOL@/char" \ - "@NCURSES_XNAMES@/1" \ - "@HAVE_TERMIOS_H@/1" \ - "@HAVE_TCGETATTR@/1" \ - "@NCURSES_CCHARW_MAX@/5" \ - "@NCURSES_EXT_COLORS@/0" \ - "@NCURSES_EXT_FUNCS@/1" \ - "@NCURSES_SP_FUNCS@/0" \ - "@NCURSES_OK_WCHAR_T@/" \ - "@NCURSES_WRAP_PREFIX@/_nc_" \ - "@cf_cv_header_stdbool_h@/1" \ - "@cf_cv_enable_opaque@/NCURSES_OPAQUE" \ - "@cf_cv_enable_reentrant@/0" \ - "@cf_cv_enable_lp64@/0" \ - "@cf_cv_typeof_chtype@/long" \ - "@cf_cv_typeof_mmask_t@/long" \ - "@cf_cv_type_of_bool@/unsigned char" \ - "@cf_cv_1UL@/1UL" \ - "@USE_CXX_BOOL@/defined(__cplusplus)" \ - "@BROKEN_LINKER@/0" \ - "@NEED_WCHAR_H@/0" \ - "@GENERATED_EXT_FUNCS@/generated" \ - "@HAVE_TERMIO_H@/1" \ - "@HAVE_VSSCANF@/1" - -NCURSES_INCLUDE_DIR := $(CONTRIB_DIR)/$(NCURSES)/include - -NCURSES_SRC_DIR := $(CONTRIB_DIR)/$(NCURSES)/ncurses - -apply_substitutions = $(VERBOSE)for i in $(NCURSES_SUBST); do sed -i "s/$$i/g" $(1); done - -# -# Generate files in 'include/ncurses/' -# - -include/ncurses/curses.h: - $(VERBOSE)cp $(CONTRIB_DIR)/$(NCURSES)/include/curses.h.in $@ - $(call apply_substitutions,$@) - $(VERBOSE)AWK=mawk sh $(NCURSES_INCLUDE_DIR)/MKkey_defs.sh $(NCURSES_INCLUDE_DIR)/Caps >> $@ - $(VERBOSE)cat $(NCURSES_INCLUDE_DIR)/curses.tail >> $@ - -include/ncurses/ncurses_def.h: - $(VERBOSE)AWK=mawk sh $(NCURSES_INCLUDE_DIR)/MKncurses_def.sh $(NCURSES_INCLUDE_DIR)/ncurses_defs > $@ - -include/ncurses/parametrized.h: - $(VERBOSE)AWK=mawk sh $(NCURSES_INCLUDE_DIR)/MKparametrized.sh $(NCURSES_INCLUDE_DIR)/Caps > $@ - -include/ncurses/hashsize.h: $(NCURSES_INCLUDE_DIR)/MKhashsize.sh - $(VERBOSE)AWK=mawk sh $< $(NCURSES_INCLUDE_DIR)/Caps > $@ - -include/ncurses/keys.list: - $(VERBOSE)AWK=mawk sh $(NCURSES_SRC_DIR)/tinfo/MKkeys_list.sh $(NCURSES_INCLUDE_DIR)/Caps | sort > $@ - -include/ncurses/init_keytry.h: src/lib/ncurses/make_keys include/ncurses/keys.list - $(VERBOSE)src/lib/ncurses/make_keys include/ncurses/keys.list > $@ - -include/ncurses/term.h: include/ncurses/MKterm.h.awk - $(VERBOSE)mawk -f $< $(NCURSES_INCLUDE_DIR)/Caps > $@ - -include/ncurses/MKterm.h.awk: $(NCURSES_INCLUDE_DIR)/MKterm.h.awk.in - $(VERBOSE)cp $< $@ - $(call apply_substitutions,$@) - -include/ncurses/ncurses_dll.h: $(NCURSES_INCLUDE_DIR)/ncurses_dll.h.in - $(VERBOSE)cp $< $@ - $(call apply_substitutions,$@) - -include/ncurses/termcap.h: $(NCURSES_INCLUDE_DIR)/termcap.h.in - $(VERBOSE)cp $< $@ - $(call apply_substitutions,$@) - -include/ncurses/unctrl.h: $(NCURSES_INCLUDE_DIR)/unctrl.h.in - $(VERBOSE)cp $< $@ - $(call apply_substitutions,$@) - -# -# Generate files in 'src/lib/ncurses/' -# - -src/lib/ncurses/names.c: - $(VERBOSE)mawk -f $(NCURSES_SRC_DIR)/tinfo/MKnames.awk bigstrings=1 $(NCURSES_INCLUDE_DIR)/Caps > $@ - -src/lib/ncurses/codes.c: - $(VERBOSE)mawk -f $(NCURSES_SRC_DIR)/tinfo/MKcodes.awk bigstrings=1 $(NCURSES_INCLUDE_DIR)/Caps > $@ - -src/lib/ncurses/fallback.c: $(NCURSES_SRC_DIR)/tinfo/MKfallback.sh - $(VERBOSE)sh -e $< x $(CONTRIB_DIR)/$(NCURSES)/misc/terminfo.src tic linux vt102 > $@ - $(VERBOSE)#sh -e $< /usr/share/terminfo $(NCURSES_SRC_DIR)/misc/terminfo.src /usr/bin/tic > $@ - -src/lib/ncurses/unctrl.c: - $(VERBOSE)echo | mawk -f $(NCURSES_SRC_DIR)/base/MKunctrl.awk bigstrings=1 > $@ - -src/lib/ncurses/comp_captab.c: src/lib/ncurses/make_hash - $(VERBOSE)cd $(dir $@); sh -e $(realpath $(NCURSES_SRC_DIR))/tinfo/MKcaptab.sh mawk 1 $(realpath $(NCURSES_SRC_DIR))/tinfo/MKcaptab.awk $(realpath $(NCURSES_INCLUDE_DIR))/Caps > $(notdir $@) - -src/lib/ncurses/make_keys: $(NCURSES_SRC_DIR)/tinfo/make_keys.c - $(VERBOSE)$(CC) -o $@ -DHAVE_CONFIG_H -Iinclude/ncurses -Isrc/lib/ncurses -I$(NCURSES_SRC_DIR) $< - -src/lib/ncurses/make_hash: $(NCURSES_SRC_DIR)/tinfo/make_hash.c - $(VERBOSE)$(CC) -o $@ -DHAVE_CONFIG_H -Iinclude/ncurses -Isrc/lib/ncurses -I$(NCURSES_SRC_DIR) $< - -src/lib/ncurses/make_keys: src/lib/ncurses/names.c - - -# -# Clean rules -# - -clean-ncurses: clean_ncurses_symlinks clean_ncurses_gen_files - $(VERBOSE)rm -rf $(CONTRIB_DIR)/$(NCURSES) - -clean_ncurses_symlinks: - $(VERBOSE)rm -f $(NCURSES_GEN_SYMLINKS) - $(VERBOSE)rm -f include/ncurses/ncurses.h - -clean_ncurses_gen_files: - $(VERBOSE)rm -f $(NCURSES_GEN_FILES) - diff --git a/repos/libports/ports/ncurses.port b/repos/libports/ports/ncurses.port new file mode 100644 index 0000000000..50ad26fa6f --- /dev/null +++ b/repos/libports/ports/ncurses.port @@ -0,0 +1,173 @@ +LICENSE := MIT +VERSION := 5.9 +DOWNLOADS := ncurses.archive + +URL(ncurses) := http://ftp.gnu.org/pub/gnu/ncurses/ncurses-$(VERSION).tar.gz +SHA(ncurses) := 3e042e5f2c7223bffdaac9646a533b8c758b65b5 +SIG(ncurses) := ${URL(ncurses)}.sig +DIR(ncurses) := src/lib/ncurses + +DIRS := include/ncurses +DIR_CONTENT(include/ncurses) := \ + $(addprefix src/lib/ncurses/include/,\ + nc_alloc.h nc_panel.h nc_tparm.h term_entry.h tic.h hashed_db.h \ + capdefaults.c) + +#$(call check_tool,sed) +#$(call check_tool,mawk) + +gen_inc := curses.h ncurses_def.h ncurses_dll.h term.h \ + unctrl.h termcap.h parametrized.h hashsize.h \ + init_keytry.h keys.list make_keys MKterm.h.awk + +gen_src := names.c unctrl.c fallback.c comp_captab.c codes.c + +gen_tools := make_hash make_keys + +gen_files := $(addprefix include/ncurses/,$(gen_inc)) \ + $(addprefix src/lib/ncurses/,$(gen_src)) \ + $(addprefix src/lib/ncurses/,$(gen_tools)) + +default: $(gen_files) cleanup_gen_tools + +$(gen_files): _dirs + +cleanup_gen_tools: $(gen_files) + $(VERBOSE)rm $(addprefix src/lib/ncurses/,$(gen_tools)) + +# +# Generate headers and source codes +# + +subst := \ + "@NCURSES_MAJOR@/5" \ + "@NCURSES_MINOR@/9" \ + "@NCURSES_PATCH@/20110404" \ + "@NCURSES_MOUSE_VERSION@/1" \ + "@NCURSES_CONST@/\/*nothing*\/" \ + "@NCURSES_INLINE@/inline" \ + "@NCURSES_OPAQUE@/0" \ + "@NCURSES_INTEROP_FUNCS@/0" \ + "@NCURSES_SIZE_T@/short" \ + "@NCURSES_TPARM_VARARGS@/1" \ + "@NCURSES_CH_T@/chtype" \ + "@NCURSES_LIBUTF8@/0" \ + "@NCURSES_OSPEED@/short" \ + "@NCURSES_WCHAR_T@/0" \ + "@NCURSES_WINT_T@/0" \ + "@NCURSES_SBOOL@/char" \ + "@NCURSES_XNAMES@/1" \ + "@HAVE_TERMIOS_H@/1" \ + "@HAVE_TCGETATTR@/1" \ + "@NCURSES_CCHARW_MAX@/5" \ + "@NCURSES_EXT_COLORS@/0" \ + "@NCURSES_EXT_FUNCS@/1" \ + "@NCURSES_SP_FUNCS@/0" \ + "@NCURSES_OK_WCHAR_T@/" \ + "@NCURSES_WRAP_PREFIX@/_nc_" \ + "@cf_cv_header_stdbool_h@/1" \ + "@cf_cv_enable_opaque@/NCURSES_OPAQUE" \ + "@cf_cv_enable_reentrant@/0" \ + "@cf_cv_enable_lp64@/0" \ + "@cf_cv_typeof_chtype@/long" \ + "@cf_cv_typeof_mmask_t@/long" \ + "@cf_cv_type_of_bool@/unsigned char" \ + "@cf_cv_1UL@/1UL" \ + "@USE_CXX_BOOL@/defined(__cplusplus)" \ + "@BROKEN_LINKER@/0" \ + "@NEED_WCHAR_H@/0" \ + "@GENERATED_EXT_FUNCS@/generated" \ + "@HAVE_TERMIO_H@/1" \ + "@HAVE_VSSCANF@/1" + +apply_substitutions = $(VERBOSE)for i in $(subst); do sed -i "s/$$i/g" $(1); done + +ncurses_include_dir := src/lib/ncurses/include +ncurses_src_dir := src/lib/ncurses/ncurses + +include/ncurses/curses.h: + @$(MSG_GENERATE)$@ + $(VERBOSE)cp src/lib/ncurses/include/curses.h.in $@ + $(call apply_substitutions,$@) + $(VERBOSE)AWK=mawk sh $(ncurses_include_dir)/MKkey_defs.sh $(ncurses_include_dir)/Caps >> $@ + $(VERBOSE)cat $(ncurses_include_dir)/curses.tail >> $@ + +include/ncurses/ncurses_def.h: + @$(MSG_GENERATE)$@ + $(VERBOSE)AWK=mawk sh $(ncurses_include_dir)/MKncurses_def.sh $(ncurses_include_dir)/ncurses_defs > $@ + +include/ncurses/parametrized.h: + @$(MSG_GENERATE)$@ + $(VERBOSE)AWK=mawk sh $(ncurses_include_dir)/MKparametrized.sh $(ncurses_include_dir)/Caps > $@ + +include/ncurses/hashsize.h: $(ncurses_include_dir)/MKhashsize.sh + @$(MSG_GENERATE)$@ + $(VERBOSE)AWK=mawk sh $< $(ncurses_include_dir)/Caps > $@ + +include/ncurses/keys.list: + @$(MSG_GENERATE)$@ + $(VERBOSE)AWK=mawk sh $(ncurses_src_dir)/tinfo/MKkeys_list.sh $(ncurses_include_dir)/Caps | sort > $@ + +include/ncurses/init_keytry.h: src/lib/ncurses/make_keys include/ncurses/keys.list + @$(MSG_GENERATE)$@ + $(VERBOSE)src/lib/ncurses/make_keys include/ncurses/keys.list > $@ + +include/ncurses/term.h: include/ncurses/MKterm.h.awk + @$(MSG_GENERATE)$@ + $(VERBOSE)mawk -f $< $(ncurses_include_dir)/Caps > $@ + +include/ncurses/MKterm.h.awk: $(ncurses_include_dir)/MKterm.h.awk.in + @$(MSG_GENERATE)$@ + $(VERBOSE)cp $< $@ + $(call apply_substitutions,$@) + +include/ncurses/ncurses_dll.h: $(ncurses_include_dir)/ncurses_dll.h.in + @$(MSG_GENERATE)$@ + $(VERBOSE)cp $< $@ + $(call apply_substitutions,$@) + +include/ncurses/termcap.h: $(ncurses_include_dir)/termcap.h.in + @$(MSG_GENERATE)$@ + $(VERBOSE)cp $< $@ + $(call apply_substitutions,$@) + +include/ncurses/unctrl.h: $(ncurses_include_dir)/unctrl.h.in + @$(MSG_GENERATE)$@ + $(VERBOSE)cp $< $@ + $(call apply_substitutions,$@) + +src/lib/ncurses/names.c: + @$(MSG_GENERATE)$@ + $(VERBOSE)mawk -f $(ncurses_src_dir)/tinfo/MKnames.awk bigstrings=1 $(ncurses_include_dir)/Caps > $@ + +src/lib/ncurses/codes.c: + @$(MSG_GENERATE)$@ + $(VERBOSE)mawk -f $(ncurses_src_dir)/tinfo/MKcodes.awk bigstrings=1 $(ncurses_include_dir)/Caps > $@ + +src/lib/ncurses/fallback.c: $(ncurses_src_dir)/tinfo/MKfallback.sh + @$(MSG_GENERATE)$@ + $(VERBOSE)sh -e $< x src/lib/ncurses/misc/terminfo.src tic linux vt102 > $@ 2> /dev/null + $(VERBOSE)#sh -e $< /usr/share/terminfo $(ncurses_src_dir)/misc/terminfo.src /usr/bin/tic > $@ + +src/lib/ncurses/unctrl.c: + @$(MSG_GENERATE)$@ + $(VERBOSE)echo | mawk -f $(ncurses_src_dir)/base/MKunctrl.awk bigstrings=1 > $@ + +src/lib/ncurses/comp_captab.c: src/lib/ncurses/make_hash + @$(MSG_GENERATE)$@ + $(VERBOSE)cd $(dir $@);\ + sh -e $(realpath $(ncurses_src_dir))/tinfo/MKcaptab.sh \ + mawk 1 $(realpath $(ncurses_src_dir))/tinfo/MKcaptab.awk \ + $(realpath $(ncurses_include_dir))/Caps > $(notdir $@) + +src/lib/ncurses/make_keys: $(ncurses_src_dir)/tinfo/make_keys.c + @$(MSG_GENERATE)$@ + $(VERBOSE)$(CC) -o $@ -DHAVE_CONFIG_H -I$(REP_DIR)/include/ncurses \ + -Iinclude/ncurses -Isrc/lib/ncurses -I$(ncurses_src_dir) $< + +src/lib/ncurses/make_hash: $(ncurses_src_dir)/tinfo/make_hash.c + @$(MSG_GENERATE)$@ + $(VERBOSE)$(CC) -o $@ -DHAVE_CONFIG_H -I$(REP_DIR)/include/ncurses \ + -Iinclude/ncurses -Isrc/lib/ncurses -I$(ncurses_src_dir) $< + +src/lib/ncurses/make_keys: src/lib/ncurses/names.c diff --git a/repos/libports/ports/ntfs-3g.hash b/repos/libports/ports/ntfs-3g.hash new file mode 100644 index 0000000000..421376db9e --- /dev/null +++ b/repos/libports/ports/ntfs-3g.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/libports/ports/ntfs-3g.inc b/repos/libports/ports/ntfs-3g.inc deleted file mode 100644 index 7cd998206d..0000000000 --- a/repos/libports/ports/ntfs-3g.inc +++ /dev/null @@ -1,2 +0,0 @@ -NTFS_3G_VERSION = 2013.1.13 -NTFS_3G = ntfs-3g_ntfsprogs-$(NTFS_3G_VERSION) diff --git a/repos/libports/ports/ntfs-3g.mk b/repos/libports/ports/ntfs-3g.mk deleted file mode 100644 index 43ff6dcdd0..0000000000 --- a/repos/libports/ports/ntfs-3g.mk +++ /dev/null @@ -1,36 +0,0 @@ -include ports/ntfs-3g.inc - -NTFS_3G_TGZ = $(NTFS_3G).tgz -NTFS_3G_BASE_URL = http://tuxera.com/opensource -NTFS_3G_URL = $(NTFS_3G_BASE_URL)/$(NTFS_3G_TGZ) - -# -# Interface to top-level prepare Makefile -# -PORTS += ntfs-3g - -prepare-ntfs-3g: $(CONTRIB_DIR)/$(NTFS_3G) include/ntfs-3g - -# -# Port-specific local rules -# -$(DOWNLOAD_DIR)/$(NTFS_3G_TGZ): - $(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(NTFS_3G_URL) && touch $@ - -$(CONTRIB_DIR)/$(NTFS_3G): $(DOWNLOAD_DIR)/$(NTFS_3G_TGZ) - $(VERBOSE)tar xfz $< -C $(CONTRIB_DIR) && touch $@ - $(VERBOSE)for i in src/lib/ntfs-3g/*.patch; do \ - patch -N -p0 < $$i; done || true - -# -# Install ntfs-3g headers -# - -include/ntfs-3g: - $(VERBOSE)mkdir -p $@ - $(VERBOSE)for i in `find $(CONTRIB_DIR)/$(NTFS_3G)/include/ntfs-3g -name *.h`; do \ - ln -fs ../../$$i $@; done - -clean-ntfs-3g: - $(VERBOSE)rm -rf include/ntfs-3g - $(VERBOSE)rm -rf $(CONTRIB_DIR)/$(NTFS_3G) diff --git a/repos/libports/ports/ntfs-3g.port b/repos/libports/ports/ntfs-3g.port new file mode 100644 index 0000000000..e7cf9ac987 --- /dev/null +++ b/repos/libports/ports/ntfs-3g.port @@ -0,0 +1,13 @@ +LICENSE := GPLv2 +VERSION := 2013.1.13 +DOWNLOADS := ntfs-3g.archive + +URL(ntfs-3g) := http://tuxera.com/opensource/ntfs-3g_ntfsprogs-$(VERSION).tgz +SHA(ntfs-3g) := 8c12b7644d90ae9fb8d0aca0d7ebd5f8fac2c818 +DIR(ntfs-3g) := src/lib/ntfs-3g + +PATCHES := src/lib/ntfs-3g/*.patch + +DIRS := include/ntfs-3g +DIR_CONTENT(include/ntfs-3g) := src/lib/ntfs-3g/include/ntfs-3g/*.h + diff --git a/repos/libports/ports/openjpeg.hash b/repos/libports/ports/openjpeg.hash new file mode 100644 index 0000000000..421376db9e --- /dev/null +++ b/repos/libports/ports/openjpeg.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/libports/ports/openjpeg.mk b/repos/libports/ports/openjpeg.mk deleted file mode 100644 index d4a02f2262..0000000000 --- a/repos/libports/ports/openjpeg.mk +++ /dev/null @@ -1,29 +0,0 @@ -OPENJPEG = openjpeg-1.4 -OPENJPEG_TGZ = openjpeg-1.4.tar.gz -OPENJPEG_URL = http://openjpeg.googlecode.com/files/openjpeg_v1_4_sources_r697.tgz - -# -# Interface to top-level prepare Makefile -# -PORTS += $(OPENJPEG) - -prepare-openjpeg: $(CONTRIB_DIR)/$(OPENJPEG) - -$(CONTRIB_DIR)/$(OPENJPEG): clean-openjpeg include/openjpeg/openjpeg.h - -# -# Port-specific local rules -# -$(DOWNLOAD_DIR)/$(OPENJPEG_TGZ): - $(VERBOSE)wget -c -P $(DOWNLOAD_DIR) -O $@ $(OPENJPEG_URL) && touch $@ - -$(CONTRIB_DIR)/$(OPENJPEG): $(DOWNLOAD_DIR)/$(OPENJPEG_TGZ) - $(VERBOSE)tar xfz $< --transform "s/openjpeg_v1_4_sources_r697/$(OPENJPEG)/" -C $(CONTRIB_DIR) && touch $@ - -include/openjpeg/openjpeg.h: - $(VERBOSE)mkdir -p $(dir $@) - $(VERBOSE)ln -s ../../$(CONTRIB_DIR)/$(OPENJPEG)/libopenjpeg/openjpeg.h $@ - -clean-openjpeg: - $(VERBOSE)rm -rf include/openjpeg - $(VERBOSE)rm -rf $(CONTRIB_DIR)/$(OPENJPEG) diff --git a/repos/libports/ports/openjpeg.port b/repos/libports/ports/openjpeg.port new file mode 100644 index 0000000000..437e74d06f --- /dev/null +++ b/repos/libports/ports/openjpeg.port @@ -0,0 +1,10 @@ +LICENSE := BSD +VERSION := 1.4 +DOWNLOADS := openjpeg.archive + +URL(openjpeg) := http://openjpeg.googlecode.com/files/openjpeg_v1_4_sources_r697.tgz +DIR(openjpeg) := src/lib/openjpeg +SHA(openjpeg) := 9ef6a08ecf5944962b4e2cd7569ac01a8eaa66d0 + +DIRS := include/openjpeg +DIR_CONTENT(include/openjpeg) := src/lib/openjpeg/libopenjpeg/openjpeg.h diff --git a/repos/libports/ports/openssl.hash b/repos/libports/ports/openssl.hash new file mode 100644 index 0000000000..421376db9e --- /dev/null +++ b/repos/libports/ports/openssl.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/libports/ports/openssl.mk b/repos/libports/ports/openssl.mk deleted file mode 100644 index d7e8ec56bf..0000000000 --- a/repos/libports/ports/openssl.mk +++ /dev/null @@ -1,70 +0,0 @@ -OPENSSL_VERSION = 1.0.1g -OPENSSL = openssl-$(OPENSSL_VERSION) -OPENSSL_TGZ = $(OPENSSL).tar.gz -OPENSSL_SIG = $(OPENSSL_TGZ).asc -OPENSSL_BASE_URL = https://www.openssl.org/source -OPENSSL_URL = $(OPENSSL_BASE_URL)/$(OPENSSL_TGZ) -OPENSSL_URL_SIG = $(OPENSSL_BASE_URL)/$(OPENSSL_SIG) -OPENSSL_KEY = "49A563D9 26BB437D F295C759 9C58A66D 2118CF83 F709453B 5A6A9B85" - -# local openssl src -OPENSSL_SRC = src/lib/openssl - -# -# Interface to top-level prepare Makefile -# -PORTS += $(OPENSSL) - -prepare-openssl: $(CONTRIB_DIR)/$(OPENSSL) include/openssl generate_asm - -#$(CONTRIB_DIR)/$(OPENSSL): - -# -# Port-specific local rules -# -$(DOWNLOAD_DIR)/$(OPENSSL_TGZ): - $(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(OPENSSL_URL) && touch $@ - -$(DOWNLOAD_DIR)/$(OPENSSL_SIG): - $(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(OPENSSL_URL_SIG) && touch $@ - -$(DOWNLOAD_DIR)/$(OPENSSL_TGZ).verified: $(DOWNLOAD_DIR)/$(OPENSSL_TGZ) \ - $(DOWNLOAD_DIR)/$(OPENSSL_SIG) - $(VERBOSE)$(SIGVERIFIER) $(DOWNLOAD_DIR)/$(OPENSSL_TGZ) $(DOWNLOAD_DIR)/$(OPENSSL_SIG) $(OPENSSL_KEY) - $(VERBOSE)touch $@ - -$(CONTRIB_DIR)/$(OPENSSL): $(DOWNLOAD_DIR)/$(OPENSSL_TGZ) - $(VERBOSE)tar xfz $(<:.verified=) -C $(CONTRIB_DIR) && touch $@ - -# -# Generate ASM codes -# - -generate_asm: $(OPENSSL_SRC)/x86_64/modexp512.s $(OPENSSL_SRC)/x86_64/rc4_md5.s - -$(OPENSSL_SRC)/x86_64/modexp512.s: - $(VERBOSE)perl $(CONTRIB_DIR)/$(OPENSSL)/crypto/bn/asm/modexp512-x86_64.pl \ - $(CONTRIB_DIR)/$(OPENSSL_DIR)/crypto/perlasm/x86as.pl > $@ - -$(OPENSSL_SRC)/x86_64/rc4_md5.s: - $(VERBOSE)perl $(CONTRIB_DIR)/$(OPENSSL)/crypto/rc4/asm/rc4-md5-x86_64.pl \ - $(CONTRIB_DIR)/$(OPENSSL_DIR)/crypto/perlasm/x86as.pl > $@ - - -# -# Install openssl headers -# -include/openssl: - $(VERBOSE)mkdir -p $@ - $(VERBOSE)for i in `find $(CONTRIB_DIR)/$(OPENSSL)/include -name *.h`; do \ - ln -fs ../../$$i include/openssl/; done - $(VERBOSE)rm include/openssl/opensslconf.h - $(VERBOSE)ln -fs ../../$(CONTRIB_DIR)/$(OPENSSL)/e_os.h include/openssl/ - $(VERBOSE)ln -fs ../../$(CONTRIB_DIR)/$(OPENSSL)/crypto/md2/md2.h include/openssl/ - $(VERBOSE)ln -fs ../../$(CONTRIB_DIR)/$(OPENSSL)/crypto/rc5/rc5.h include/openssl/ - $(VERBOSE)ln -fs ../../$(CONTRIB_DIR)/$(OPENSSL)/crypto/store/store.h include/openssl/ - -clean-openssl: - $(VERBOSE)rm -rf include/openssl - $(VERBOSE)rm -rf $(CONTRIB_DIR)/$(OPENSSL) - $(VERBOSE)rm -rf $(OPENSSL_SRC)/x86_32/*.s $(OPENSSL_SRC)/x86_64/*.s diff --git a/repos/libports/ports/openssl.port b/repos/libports/ports/openssl.port new file mode 100644 index 0000000000..15f2fd5559 --- /dev/null +++ b/repos/libports/ports/openssl.port @@ -0,0 +1,39 @@ +LICENSE := OpenSSL +VERSION := 1.0.1g +DOWNLOADS := openssl.archive + +URL(openssl) := http://www.openssl.org/source/openssl-$(VERSION).tar.gz +SHA(openssl) := b28b3bcb1dc3ee7b55024c9f795be60eb3183e3c +SIG(openssl) := ${URL(openssl)}.asc +KEY(openssl) := "49A563D9 26BB437D F295C759 9C58A66D 2118CF83 F709453B 5A6A9B85" +DIR(openssl) := src/lib/openssl + +DIRS := include/openssl +DIR_CONTENT(include/openssl) = $(shell find src/lib/openssl/include/openssl/ -name *.h) \ + src/lib/openssl/e_os.h \ + src/lib/openssl/crypto/md2/md2.h \ + src/lib/openssl/crypto/rc5/rc5.h \ + src/lib/openssl/crypto/store/store.h + +# +# Generate ASM codes +# + +#$(call check_tool,sed) + +gen_files := src/lib/openssl/x86_64/modexp512.s src/lib/openssl/x86_64/rc4_md5.s + +default: $(gen_files) +$(gen_files): $(DOWNLOADS) + +src/lib/openssl/x86_64/modexp512.s: + @$(MSG_GENERATE)$@ + $(VERBOSE)mkdir -p $(dir $@) + $(VERBOSE)perl src/lib/openssl/crypto/bn/asm/modexp512-x86_64.pl \ + src/lib/openssl/crypto/perlasm/x86as.pl > $@ + +src/lib/openssl/x86_64/rc4_md5.s: + @$(MSG_GENERATE)$@ + $(VERBOSE)mkdir -p $(dir $@) + $(VERBOSE)perl src/lib/openssl/crypto/rc4/asm/rc4-md5-x86_64.pl \ + src/lib/openssl/crypto/perlasm/x86as.pl > $@ diff --git a/repos/libports/ports/pcre.hash b/repos/libports/ports/pcre.hash new file mode 100644 index 0000000000..421376db9e --- /dev/null +++ b/repos/libports/ports/pcre.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/libports/ports/pcre.inc b/repos/libports/ports/pcre.inc deleted file mode 100644 index 2a29f4b7cd..0000000000 --- a/repos/libports/ports/pcre.inc +++ /dev/null @@ -1,2 +0,0 @@ -PCRE_VERSION = 8.30 -PCRE = pcre-$(PCRE_VERSION) diff --git a/repos/libports/ports/pcre.mk b/repos/libports/ports/pcre.mk deleted file mode 100644 index 82c81099de..0000000000 --- a/repos/libports/ports/pcre.mk +++ /dev/null @@ -1,42 +0,0 @@ -include ports/pcre.inc - -PCRE_TBZ = $(PCRE).tar.bz2 -PCRE_SIG = $(PCRE_TBZ).sig -PCRE_BASE_URL = http://sourceforge.net/projects/pcre/files/pcre/$(PCRE_VERSION) -PCRE_URL = $(PCRE_BASE_URL)/$(PCRE_TBZ)/download -PCRE_URL_SIG = $(PCRE_BASE_URL)/$(PCRE_SIG)/download -PCRE_KEY = ph10@cam.ac.uk - -# -# Interface to top-level prepare Makefile -# -PORTS += $(PCRE) - -prepare-pcre: $(CONTRIB_DIR)/$(PCRE) include/pcre - -$(CONTRIB_DIR)/$(PCRE): clean-pcre - -# -# Port-specific local rules -# -$(DOWNLOAD_DIR)/$(PCRE_TBZ): - $(VERBOSE)wget -c -O $(DOWNLOAD_DIR)/$(PCRE_TBZ) $(PCRE_URL) && touch $@ - -$(DOWNLOAD_DIR)/$(PCRE_SIG): - $(VERBOSE)wget -c -O $(DOWNLOAD_DIR)/$(PCRE_SIG) $(PCRE_URL_SIG) && touch $@ - -$(DOWNLOAD_DIR)/$(PCRE_TBZ).verified: $(DOWNLOAD_DIR)/$(PCRE_TBZ) \ - $(DOWNLOAD_DIR)/$(PCRE_SIG) - $(VERBOSE)$(SIGVERIFIER) $(DOWNLOAD_DIR)/$(PCRE_TBZ) $(DOWNLOAD_DIR)/$(PCRE_SIG) $(PCRE_KEY) - $(VERBOSE)touch $@ - -$(CONTRIB_DIR)/$(PCRE): $(DOWNLOAD_DIR)/$(PCRE_TBZ) - $(VERBOSE)tar xfj $(<:.verified=) -C $(CONTRIB_DIR) && touch $@ - -include/pcre: - $(VERBOSE)mkdir -p $@ - $(VERBOSE)ln -sf ../../src/lib/pcre/include/pcre.h include/pcre - -clean-pcre: - $(VERBOSE)rm -rf $(CONTRIB_DIR)/$(PCRE) - $(VERBOSE)rm -rf include/pcre diff --git a/repos/libports/ports/pcre.port b/repos/libports/ports/pcre.port new file mode 100644 index 0000000000..86d8496c56 --- /dev/null +++ b/repos/libports/ports/pcre.port @@ -0,0 +1,26 @@ +LICENSE := BSD +VERSION := 8.30 +DOWNLOADS := pcre.archive + +URL(pcre) := http://sourceforge.net/projects/pcre/files/pcre/$(VERSION)/pcre-$(VERSION).tar.bz2 +SHA(pcre) := 68d28fb383325b8af9e3d481d30f586b46c56022 +SIG(pcre) := ${URL(pcre)}.sig +KEY(pcre) := ph10@cam.ac.uk +DIR(pcre) := src/lib/pcre + +default: include/pcre/pcre.h + +include/pcre/pcre.h: $(DOWNLOADS) + +subst := \ + "@PCRE_MAJOR@/8" \ + "@PCRE_MINOR@/30" \ + "@PCRE_PRERELEASE@/" \ + "@PCRE_DATE@/2012-02-04" + +apply_substitutions = for i in $(subst); do sed -i "s/$$i/g" $(1); done + +include/pcre/pcre.h: + $(VERBOSE)mkdir -p $(dir $@) + $(VERBOSE)cp src/lib/pcre/pcre.h.in $@ + $(VERBOSE)$(call apply_substitutions,$@) diff --git a/repos/libports/ports/python.hash b/repos/libports/ports/python.hash new file mode 100644 index 0000000000..421376db9e --- /dev/null +++ b/repos/libports/ports/python.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/libports/ports/python.mk b/repos/libports/ports/python.mk deleted file mode 100644 index 3722a3b894..0000000000 --- a/repos/libports/ports/python.mk +++ /dev/null @@ -1,49 +0,0 @@ -PYTHON = python-2.6.4 -PYTHON_TGZ = Python-2.6.4.tgz -PYTHON_SIG = $(PYTHON_TGZ).asc -PYTHON_BASE_URL = http://www.python.org/ftp/python/2.6.4 -PYTHON_URL = $(PYTHON_BASE_URL)/$(PYTHON_TGZ) -PYTHON_URL_SIG = $(PYTHON_BASE_URL)/$(PYTHON_SIG) -PYTHON_KEY = 12EF3DC38047DA382D18A5B999CDEA9DA4135B38 - -# -# Interface to top-level prepare Makefile -# -PORTS += $(PYTHON) - -prepare-python: $(CONTRIB_DIR)/$(PYTHON) include/python2.6 - -$(CONTRIB_DIR)/$(PYTHON): clean-python - -# -# Port-specific local rules -# -$(DOWNLOAD_DIR)/$(PYTHON_TGZ): - $(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(PYTHON_URL) && touch $@ - -$(DOWNLOAD_DIR)/$(PYTHON_SIG): - $(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(PYTHON_URL_SIG) && touch $@ - -$(DOWNLOAD_DIR)/$(PYTHON_TGZ).verified: $(DOWNLOAD_DIR)/$(PYTHON_TGZ) - # - # As signatures are only provided for versions 2.7.3 and newer, the check - # is yet disabled. Just remove the comment sign once the newer version is - # used. - # - #$(VERBOSE)$(SIGVERIFIER) $(DOWNLOAD_DIR)/$(PYTHON_TGZ) $(DOWNLOAD_DIR)/$(PYTHON_SIG) $(PYTHON_KEY) - $(VERBOSE)touch $@ - -$(CONTRIB_DIR)/$(PYTHON): $(DOWNLOAD_DIR)/$(PYTHON_TGZ) - $(VERBOSE)tar xfz $(<:.verified=) -C $(CONTRIB_DIR) - @# rename Python subdirectory to lower case to be consistent - @# with the other libs - $(VERBOSE)mv $(CONTRIB_DIR)/Python-2.6.4 $@ - $(VERBOSE)touch $@ - $(VERBOSE)patch -p0 -i src/lib/python/posixmodule.patch - -include/python2.6: - $(VERBOSE)ln -s ../$(CONTRIB_DIR)/$(PYTHON)/Include $@ - -clean-python: - $(VERBOSE)rm -rf include/python2.6 - $(VERBOSE)rm -rf $(CONTRIB_DIR)/$(PYTHON) diff --git a/repos/libports/ports/python.port b/repos/libports/ports/python.port new file mode 100644 index 0000000000..c947445d7f --- /dev/null +++ b/repos/libports/ports/python.port @@ -0,0 +1,14 @@ +LICENSE := Python +VERSION := 2.6.4 +DOWNLOADS := python.archive + +URL(python) := http://www.python.org/ftp/python/2.6.4/Python-$(VERSION).tgz +SHA(python) := f30c7e64c2caf8a58705ab9184bea12db39ca0a9 +SIG(python) := ${URL(python)}.asc +PYTHON_KEY := 12EF3DC38047DA382D18A5B999CDEA9DA4135B38 +DIR(python) := src/lib/python + +PATCHES := src/lib/python/posixmodule.patch + +DIRS := include/python2.6 +DIR_CONTENT(include/python2.6) := src/lib/python/Include/*.h diff --git a/repos/libports/ports/qoost.hash b/repos/libports/ports/qoost.hash new file mode 100644 index 0000000000..421376db9e --- /dev/null +++ b/repos/libports/ports/qoost.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/libports/ports/qoost.mk b/repos/libports/ports/qoost.mk deleted file mode 100644 index bdeb264318..0000000000 --- a/repos/libports/ports/qoost.mk +++ /dev/null @@ -1,31 +0,0 @@ -QOOST_VERSION = 2013-06-10 -QOOST = qoost-$(QOOST_VERSION) -QOOST_TBZ = $(QOOST).tar.bz2 -QOOST_URL = https://downloads.sourceforge.net/project/qoost/$(QOOST_TBZ) - -# -# Interface to top-level prepare Makefile -# -PORTS += $(QOOST) - -prepare-qoost: $(CONTRIB_DIR)/$(QOOST) include/qoost - -$(CONTRIB_DIR)/$(QOOST): clean-qoost - -# -# Port-specific local rules -# -$(DOWNLOAD_DIR)/$(QOOST_TBZ): - $(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(QOOST_URL) && touch $@ - -$(CONTRIB_DIR)/$(QOOST): $(DOWNLOAD_DIR)/$(QOOST_TBZ) - $(VERBOSE)tar xfj $< -C $(CONTRIB_DIR) && touch $@ - -include/qoost: - $(VERBOSE)mkdir -p $(dir $@) - $(VERBOSE)ln -sf ../$(CONTRIB_DIR)/$(QOOST)/include/qoost $@ - - -clean-qoost: - $(VERBOSE)rm -f include/qoost - $(VERBOSE)rm -rf $(CONTRIB_DIR)/$(QOOST) diff --git a/repos/libports/ports/qoost.port b/repos/libports/ports/qoost.port new file mode 100644 index 0000000000..87227e57ff --- /dev/null +++ b/repos/libports/ports/qoost.port @@ -0,0 +1,10 @@ +LICENSE := MIT +VERSION := 2013-06-10 +DOWNLOADS := qoost.archive + +URL(qoost) := https://downloads.sourceforge.net/project/qoost/qoost-$(VERSION).tar.bz2 +SHA(qoost) := 4a181e797c477090a3f2c327e441d9d2e98d0c80 +DIR(qoost) := src/lib/qoost + +DIRS := include +DIR_CONTENT(include) := src/lib/qoost/include/qoost diff --git a/repos/libports/ports/readline.hash b/repos/libports/ports/readline.hash new file mode 100644 index 0000000000..421376db9e --- /dev/null +++ b/repos/libports/ports/readline.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/libports/ports/readline.mk b/repos/libports/ports/readline.mk deleted file mode 100644 index 1398683bda..0000000000 --- a/repos/libports/ports/readline.mk +++ /dev/null @@ -1,42 +0,0 @@ -READLINE = readline-6.0 -READLINE_TGZ = $(READLINE).tar.gz -READLINE_SIG = $(READLINE_TGZ).sig -READLINE_BASE_URL = ftp://ftp.gnu.org/gnu/readline -READLINE_URL = $(READLINE_BASE_URL)/$(READLINE_TGZ) -READLINE_URL_SIG = $(READLINE_BASE_URL)/$(READLINE_SIG) -READLINE_KEY = GNU - -# -# Interface to top-level prepare Makefile -# -PORTS += $(READLINE) - -prepare-readline: $(CONTRIB_DIR)/$(READLINE) - -$(CONTRIB_DIR)/$(READLINE): clean-readline - -# -# Port-specific local rules -# -$(DOWNLOAD_DIR)/$(READLINE_TGZ): - $(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(READLINE_URL) && touch $@ - -$(DOWNLOAD_DIR)/$(READLINE_SIG): - $(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(READLINE_URL_SIG) && touch $@ - -$(DOWNLOAD_DIR)/$(READLINE_TGZ).verified: $(DOWNLOAD_DIR)/$(READLINE_TGZ) \ - $(DOWNLOAD_DIR)/$(READLINE_SIG) - $(VERBOSE)$(SIGVERIFIER) $(DOWNLOAD_DIR)/$(READLINE_TGZ) $(DOWNLOAD_DIR)/$(READLINE_SIG) $(READLINE_KEY) - $(VERBOSE)touch $@ - -READLINE_HEADERS := rlstdc.h rltypedefs.h keymaps.h tilde.h - -$(CONTRIB_DIR)/$(READLINE): $(DOWNLOAD_DIR)/$(READLINE_TGZ).verified - $(VERBOSE)tar xfz $(<:.verified=) -C $(CONTRIB_DIR) && touch $@ - @# create symbolic links for public headers from contrib dir - $(VERBOSE)for i in $(READLINE_HEADERS); do \ - ln -sf ../../$(CONTRIB_DIR)/$(READLINE)/$$i include/readline/; done - -clean-readline: - $(VERBOSE)rm -f $(addprefix include/readline/,$(READLINE_HEADERS)) - $(VERBOSE)rm -rf $(CONTRIB_DIR)/$(READLINE) diff --git a/repos/libports/ports/readline.port b/repos/libports/ports/readline.port new file mode 100644 index 0000000000..4d8a736d04 --- /dev/null +++ b/repos/libports/ports/readline.port @@ -0,0 +1,13 @@ +LICENSE := GPLv3 +VERSION := 6.0 +DOWNLOADS := readline.archive + +URL(readline) := ftp://ftp.gnu.org/gnu/readline/readline-$(VERSION).tar.gz +SHA(readline) := 1e511b091514ef631c539552316787c75ace5262 +SIG(readline) := ${URL(readline)}.sig +KEY(readline) := GNU +DIR(readline) := src/lib/readline + +DIRS := include/readline +DIR_CONTENT(include/readline) := $(addprefix src/lib/readline/,\ + rlstdc.h rltypedefs.h keymaps.h tilde.h) diff --git a/repos/libports/ports/sdl.hash b/repos/libports/ports/sdl.hash new file mode 100644 index 0000000000..421376db9e --- /dev/null +++ b/repos/libports/ports/sdl.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/libports/ports/sdl.inc b/repos/libports/ports/sdl.inc deleted file mode 100644 index 41673a24cd..0000000000 --- a/repos/libports/ports/sdl.inc +++ /dev/null @@ -1,2 +0,0 @@ -SDL_VERSION = 1.2.13 -SDL = SDL-$(SDL_VERSION) diff --git a/repos/libports/ports/sdl.mk b/repos/libports/ports/sdl.mk deleted file mode 100644 index c1c55e4907..0000000000 --- a/repos/libports/ports/sdl.mk +++ /dev/null @@ -1,60 +0,0 @@ -include ports/sdl.inc - -SDL_TGZ = $(SDL).tar.gz -SDL_SIG = $(SDL_TGZ).sig -SDL_BASE_URL = http://www.libsdl.org/release -SDL_URL = $(SDL_BASE_URL)/$(SDL_TGZ) -SDL_URL_SIG = $(SDL_BASE_URL)/$(SDL_SIG) -SDL_KEY = 1528635D8053A57F77D1E08630A59377A7763BE6 - -# -# Interface to top-level prepare Makefile -# -# Register SDL port as lower case to be consistent with the -# other libraries. -# -PORTS += sdl-$(SDL_VERSION) - -prepare-sdl: $(CONTRIB_DIR)/$(SDL) include/SDL/SDL_platform.h - -$(CONTRIB_DIR)/$(SDL): clean-sdl - -# -# Port-specific local rules -# -$(DOWNLOAD_DIR)/$(SDL_TGZ): - $(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(SDL_URL) && touch $@ - -$(DOWNLOAD_DIR)/$(SDL_SIG): - $(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(SDL_URL_SIG) && touch $@ - -$(DOWNLOAD_DIR)/$(SDL_TGZ).verified: $(DOWNLOAD_DIR)/$(SDL_TGZ) \ - $(DOWNLOAD_DIR)/$(SDL_SIG) - $(VERBOSE)$(SIGVERIFIER) $(DOWNLOAD_DIR)/$(SDL_TGZ) $(DOWNLOAD_DIR)/$(SDL_SIG) $(SDL_KEY) - $(VERBOSE)touch $@ - -$(CONTRIB_DIR)/$(SDL): $(DOWNLOAD_DIR)/$(SDL_TGZ).verified - $(VERBOSE)tar xfz $(<:.verified=) -C $(CONTRIB_DIR) && touch $@ - $(VERBOSE)rm -f $@/include/SDL_config.h - $(VERBOSE)patch -p0 -i src/lib/sdl/SDL_video.patch - $(VERBOSE)patch -d $(CONTRIB_DIR)/$(SDL) -p1 -i $(CURDIR)/src/lib/sdl/SDL_audio.patch - -# -# Install SDL headers -# -# Use 'SDL_platform.h' as representative of the header files to be installed. -# -include/SDL/SDL_platform.h: - $(VERBOSE)mkdir -p $(dir $@) - $(VERBOSE)for i in `find $(CONTRIB_DIR)/$(SDL)/include -name "*.h"`; do \ - ln -fs ../../$$i include/SDL/; done - $(VERBOSE)ln -fs ../../src/lib/sdl/SDL_config.h $(dir $@) - $(VERBOSE)ln -fs ../../src/lib/sdl/SDL_config_genode.h $(dir $@) - -clean-sdl: - $(VERBOSE)test -d $(CONTRIB_DIR)/$(SDL) && \ - for i in `find $(CONTRIB_DIR)/$(SDL)/include -name "*.h"`; do \ - rm -f include/SDL/`basename $$i`; done || true - $(VERBOSE)rm -f $(addprefix include/SDL/,SDL_config_genode.h SDL_config.h) - $(VERBOSE)rmdir include/SDL 2>/dev/null || true - $(VERBOSE)rm -rf $(CONTRIB_DIR)/$(SDL) diff --git a/repos/libports/ports/sdl.port b/repos/libports/ports/sdl.port new file mode 100644 index 0000000000..77aac11080 --- /dev/null +++ b/repos/libports/ports/sdl.port @@ -0,0 +1,19 @@ +LICENSE := LGPL +VERSION := 1.2.13 +DOWNLOADS := sdl.archive + +URL(sdl) := http://www.libsdl.org/release/SDL-$(VERSION).tar.gz +SHA(sdl) := 51fcaa3e1d5c01fd813ea08688780f86b19cf539 +SIG(sdl) := ${URL(sdl)}.sig +KEY(sdl) := 1528635D8053A57F77D1E08630A59377A7763BE6 +DIR(sdl) := src/lib/sdl + +PATCHES := src/lib/sdl/SDL_video.patch src/lib/sdl/SDL_audio.patch + +# wipe original 'SDL_config.h' file because it conflicts with out version +_dirs: remove_default_config +remove_default_config: $(DOWNLOADS) + $(VERBOSE)rm src/lib/sdl/include/SDL_config.h + +DIRS := include/SDL +DIR_CONTENT(include/SDL) := src/lib/sdl/include/*.h diff --git a/repos/libports/ports/sdl_image.hash b/repos/libports/ports/sdl_image.hash new file mode 100644 index 0000000000..421376db9e --- /dev/null +++ b/repos/libports/ports/sdl_image.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/libports/ports/sdl_image.inc b/repos/libports/ports/sdl_image.inc deleted file mode 100644 index de3fc61d24..0000000000 --- a/repos/libports/ports/sdl_image.inc +++ /dev/null @@ -1,2 +0,0 @@ -SDL_IMAGE_VERSION = 1.2.12 -SDL_IMAGE = SDL_image-$(SDL_IMAGE_VERSION) diff --git a/repos/libports/ports/sdl_image.mk b/repos/libports/ports/sdl_image.mk deleted file mode 100644 index d4df623697..0000000000 --- a/repos/libports/ports/sdl_image.mk +++ /dev/null @@ -1,40 +0,0 @@ -include ports/sdl_image.inc - -SDL_IMAGE_TGZ = $(SDL_IMAGE).tar.gz -SDL_IMAGE_URL = http://www.libsdl.org/projects/SDL_image/release/$(SDL_IMAGE_TGZ) - -# -# Interface to top-level prepare Makefile -# -# Register SDL_image port as lower case to be consistent with the -# other libraries. -# -PORTS += sdl_image-$(SDL_IMAGE_VERSION) - -prepare-sdl_image: $(CONTRIB_DIR)/$(SDL_IMAGE) include/SDL/SDL_image.h - -$(CONTRIB_DIR)/$(SDL_IMAGE): clean-sdl_image - -# -# Port-specific local rules -# -$(DOWNLOAD_DIR)/$(SDL_IMAGE_TGZ): - $(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(SDL_IMAGE_URL) && touch $@ - -$(CONTRIB_DIR)/$(SDL_IMAGE): $(DOWNLOAD_DIR)/$(SDL_IMAGE_TGZ) - $(VERBOSE)tar xfz $< \ - --exclude Xcode --exclude VisualC --exclude Xcode-iOS \ - --exclude VisualCE --exclude Watcom-OS2.zip \ - -C $(CONTRIB_DIR) && touch $@ - -# -# Install SDL_image headers -# -include/SDL/SDL_image.h: - $(VERBOSE)mkdir -p $(dir $@) - $(VERBOSE)ln -fs ../../$(CONTRIB_DIR)/$(SDL_IMAGE)/SDL_image.h include/SDL/ - -clean-sdl_image: - $(VERBOSE)rm -rf include/SDL/SDL_image.h - $(VERBOSE)rmdir include/SDL 2>/dev/null || true - $(VERBOSE)rm -rf $(CONTRIB_DIR)/$(SDL_IMAGE) diff --git a/repos/libports/ports/sdl_image.port b/repos/libports/ports/sdl_image.port new file mode 100644 index 0000000000..9df14c4129 --- /dev/null +++ b/repos/libports/ports/sdl_image.port @@ -0,0 +1,10 @@ +LICENSE := BSD +VERSION := 1.2.12 +DOWNLOADS := sdl_image.archive + +URL(sdl_image) := http://www.libsdl.org/projects/SDL_image/release/SDL_image-$(VERSION).tar.gz +SHA(sdl_image) := 5e3e393d4e366638048bbb10d6a269ea3f4e4cf2 +DIR(sdl_image) := src/lib/sdl_image + +DIRS := include/SDL +DIR_CONTENT(include/SDL) := src/lib/sdl_image/SDL_image.h diff --git a/repos/libports/ports/sdl_mixer.hash b/repos/libports/ports/sdl_mixer.hash new file mode 100644 index 0000000000..421376db9e --- /dev/null +++ b/repos/libports/ports/sdl_mixer.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/libports/ports/sdl_mixer.inc b/repos/libports/ports/sdl_mixer.inc deleted file mode 100644 index 9a3e81d559..0000000000 --- a/repos/libports/ports/sdl_mixer.inc +++ /dev/null @@ -1,2 +0,0 @@ -SDL_MIXER_VERSION = 1.2.12 -SDL_MIXER = SDL_mixer-$(SDL_MIXER_VERSION) diff --git a/repos/libports/ports/sdl_mixer.mk b/repos/libports/ports/sdl_mixer.mk deleted file mode 100644 index b9a520bd48..0000000000 --- a/repos/libports/ports/sdl_mixer.mk +++ /dev/null @@ -1,38 +0,0 @@ -include ports/sdl_mixer.inc - -SDL_MIXER_TGZ = $(SDL_MIXER).tar.gz -SDL_MIXER_URL = http://www.libsdl.org/projects/SDL_mixer/release/$(SDL_MIXER_TGZ) - -# -# Interface to top-level prepare Makefile -# -# Register SDL_mixer port as lower case to be consistent with the -# other libraries. -# -PORTS += sdl_mixer-$(SDL_MIXER_VERSION) - -prepare-sdl_mixer: $(CONTRIB_DIR)/$(SDL_MIXER) include/SDL/SDL_mixer.h - -$(CONTRIB_DIR)/$(SDL_MIXER): clean-sdl_mixer - -# -# Port-specific local rules -# -$(DOWNLOAD_DIR)/$(SDL_MIXER_TGZ): - $(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(SDL_MIXER_URL) && touch $@ - -$(CONTRIB_DIR)/$(SDL_MIXER): $(DOWNLOAD_DIR)/$(SDL_MIXER_TGZ) - $(VERBOSE)tar xfz $< \ - -C $(CONTRIB_DIR) && touch $@ - -# -# Install SDL_mixer headers -# -include/SDL/SDL_mixer.h: - $(VERBOSE)mkdir -p $(dir $@) - $(VERBOSE)ln -fs ../../$(CONTRIB_DIR)/$(SDL_MIXER)/SDL_mixer.h include/SDL/ - -clean-sdl_mixer: - $(VERBOSE)rm -rf include/SDL/SDL_mixer.h - $(VERBOSE)rmdir include/SDL 2>/dev/null || true - $(VERBOSE)rm -rf $(CONTRIB_DIR)/$(SDL_MIXER) diff --git a/repos/libports/ports/sdl_mixer.port b/repos/libports/ports/sdl_mixer.port new file mode 100644 index 0000000000..e3e9dead20 --- /dev/null +++ b/repos/libports/ports/sdl_mixer.port @@ -0,0 +1,10 @@ +LICENSE := BSD +VERSION := 1.2.12 +DOWNLOADS := sdl_mixer.archive + +URL(sdl_mixer) := http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-$(VERSION).tar.gz +SHA(sdl_mixer) := a20fa96470ad9e1052f1957b77ffa68fb090b384 +DIR(sdl_mixer) := src/lib/sdl_mixer + +DIRS := include/SDL +DIR_CONTENT(include/SDL) := src/lib/sdl_mixer/SDL_mixer.h diff --git a/repos/libports/ports/sdl_net.hash b/repos/libports/ports/sdl_net.hash new file mode 100644 index 0000000000..421376db9e --- /dev/null +++ b/repos/libports/ports/sdl_net.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/libports/ports/sdl_net.inc b/repos/libports/ports/sdl_net.inc deleted file mode 100644 index cdc7c58dd1..0000000000 --- a/repos/libports/ports/sdl_net.inc +++ /dev/null @@ -1,2 +0,0 @@ -SDL_NET_VERSION = 1.2.8 -SDL_NET = SDL_net-$(SDL_NET_VERSION) diff --git a/repos/libports/ports/sdl_net.mk b/repos/libports/ports/sdl_net.mk deleted file mode 100644 index 86eb5fbc3c..0000000000 --- a/repos/libports/ports/sdl_net.mk +++ /dev/null @@ -1,42 +0,0 @@ -include ports/sdl_net.inc - -SDL_NET_TGZ = $(SDL_NET).tar.gz -SDL_NET_URL = http://www.libsdl.org/projects/SDL_net/release/$(SDL_NET_TGZ) - -# -# Interface to top-level prepare Makefile -# -# Register SDL_net port as lower case to be consistent with the -# other libraries. -# -PORTS += sdl_net-$(SDL_NET_VERSION) - -prepare-sdl_net: $(CONTRIB_DIR)/$(SDL_NET) include/SDL/SDL_net.h - -$(CONTRIB_DIR)/$(SDL_NET): clean-sdl_net - -# -# Port-specific local rules -# -$(DOWNLOAD_DIR)/$(SDL_NET_TGZ): - $(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(SDL_NET_URL) && touch $@ - -$(CONTRIB_DIR)/$(SDL_NET): $(DOWNLOAD_DIR)/$(SDL_NET_TGZ) - $(VERBOSE)tar xfz $< \ - --exclude Xcode --exclude VisualC --exclude Xcode-iOS \ - --exclude VisualCE --exclude Watcom-OS2.zip --exclude debian \ - -C $(CONTRIB_DIR) && touch $@ - $(VERBOSE)patch -N -p0 < src/lib/sdl_net/SDLnet.patch - $(VERBOSE)patch -N -p0 < src/lib/sdl_net/SDL_net.h.patch - -# -# Install SDL_net headers -# -include/SDL/SDL_net.h: - $(VERBOSE)mkdir -p $(dir $@) - $(VERBOSE)ln -fs ../../$(CONTRIB_DIR)/$(SDL_NET)/SDL_net.h include/SDL/ - -clean-sdl_net: - $(VERBOSE)rm -rf include/SDL/SDL_net.h - $(VERBOSE)rmdir include/SDL 2>/dev/null || true - $(VERBOSE)rm -rf $(CONTRIB_DIR)/$(SDL_NET) diff --git a/repos/libports/ports/sdl_net.port b/repos/libports/ports/sdl_net.port new file mode 100644 index 0000000000..2d6443733e --- /dev/null +++ b/repos/libports/ports/sdl_net.port @@ -0,0 +1,12 @@ +LICENSE := BSD +VERSION := 1.2.8 +DOWNLOADS := sdl_net.archive + +URL(sdl_net) := http://www.libsdl.org/projects/SDL_net/release/SDL_net-$(VERSION).tar.gz +SHA(sdl_net) := fd393059fef8d9925dc20662baa3b25e02b8405d +DIR(sdl_net) := src/lib/sdl_net + +PATCHES := src/lib/sdl_net/SDLnet.patch src/lib/sdl_net/SDL_net.h.patch + +DIRS := include/SDL +DIR_CONTENT(include/SDL) := src/lib/sdl_net/SDL_net.h diff --git a/repos/libports/ports/sdl_ttf.hash b/repos/libports/ports/sdl_ttf.hash new file mode 100644 index 0000000000..421376db9e --- /dev/null +++ b/repos/libports/ports/sdl_ttf.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/libports/ports/sdl_ttf.inc b/repos/libports/ports/sdl_ttf.inc deleted file mode 100644 index a6ed80eecf..0000000000 --- a/repos/libports/ports/sdl_ttf.inc +++ /dev/null @@ -1,2 +0,0 @@ -SDL_TTF_VERSION = 2.0.11 -SDL_TTF = SDL_ttf-$(SDL_TTF_VERSION) diff --git a/repos/libports/ports/sdl_ttf.mk b/repos/libports/ports/sdl_ttf.mk deleted file mode 100644 index 774c5297f4..0000000000 --- a/repos/libports/ports/sdl_ttf.mk +++ /dev/null @@ -1,40 +0,0 @@ -include ports/sdl_ttf.inc - -SDL_TTF_TGZ = $(SDL_TTF).tar.gz -SDL_TTF_URL = http://www.libsdl.org/projects/SDL_ttf/release/$(SDL_TTF_TGZ) - -# -# Interface to top-level prepare Makefile -# -# Register SDL_ttf port as lower case to be consistent with the -# other libraries. -# -PORTS += sdl_ttf-$(SDL_TTF_VERSION) - -prepare-sdl_ttf: $(CONTRIB_DIR)/$(SDL_TTF) include/SDL/SDL_ttf.h - -$(CONTRIB_DIR)/$(SDL_TTF): clean-sdl_ttf - -# -# Port-specific local rules -# -$(DOWNLOAD_DIR)/$(SDL_TTF_TGZ): - $(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(SDL_TTF_URL) && touch $@ - -$(CONTRIB_DIR)/$(SDL_TTF): $(DOWNLOAD_DIR)/$(SDL_TTF_TGZ) - $(VERBOSE)tar xfz $< \ - --exclude Xcode --exclude VisualC --exclude Xcode-iOS \ - --exclude Watcom-Win32.zip \ - -C $(CONTRIB_DIR) && touch $@ - -# -# Install SDL_ttf headers -# -include/SDL/SDL_ttf.h: - $(VERBOSE)mkdir -p $(dir $@) - $(VERBOSE)ln -fs ../../$(CONTRIB_DIR)/$(SDL_TTF)/SDL_ttf.h include/SDL/ - -clean-sdl_ttf: - $(VERBOSE)rm -rf include/SDL/SDL_ttf.h - $(VERBOSE)rmdir include/SDL 2>/dev/null || true - $(VERBOSE)rm -rf $(CONTRIB_DIR)/$(SDL_TTF) diff --git a/repos/libports/ports/sdl_ttf.port b/repos/libports/ports/sdl_ttf.port new file mode 100644 index 0000000000..3b3c9512e4 --- /dev/null +++ b/repos/libports/ports/sdl_ttf.port @@ -0,0 +1,10 @@ +LICENSE := BSD +VERSION := 2.0.11 +DOWNLOADS := sdl_ttf.archive + +URL(sdl_ttf) := http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-$(VERSION).tar.gz +SHA(sdl_ttf) := 0ccf7c70e26b7801d83f4847766e09f09db15cc6 +DIR(sdl_ttf) := src/lib/sdl_ttf + +DIRS := include/SDL +DIR_CONTENT(include/SDL) := src/lib/sdl_ttf/SDL_ttf.h diff --git a/repos/libports/ports/stdcxx.hash b/repos/libports/ports/stdcxx.hash new file mode 100644 index 0000000000..421376db9e --- /dev/null +++ b/repos/libports/ports/stdcxx.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/libports/ports/stdcxx.inc b/repos/libports/ports/stdcxx.inc deleted file mode 100644 index ea0b44f542..0000000000 --- a/repos/libports/ports/stdcxx.inc +++ /dev/null @@ -1,2 +0,0 @@ -STDCXX_VERSION = 4.7.2 -STDCXX = stdcxx-$(STDCXX_VERSION) diff --git a/repos/libports/ports/stdcxx.mk b/repos/libports/ports/stdcxx.mk deleted file mode 100644 index 4376c0adaa..0000000000 --- a/repos/libports/ports/stdcxx.mk +++ /dev/null @@ -1,114 +0,0 @@ -include ports/stdcxx.inc - -STDCXX_TBZ2 = $(STDCXX).tar.bz2 -STDCXX_SIG = gcc-$(STDCXX_VERSION).tar.bz2.sig -STDCXX_BASE_URL = ftp://ftp.fu-berlin.de/gnu/gcc/gcc-$(STDCXX_VERSION) -STDCXX_URL = $(STDCXX_BASE_URL)/gcc-$(STDCXX_VERSION).tar.bz2 -STDCXX_URL_SIG = $(STDCXX_BASE_URL)/$(STDCXX_SIG) -STDCXX_KEY = GNU - -# -# Interface to top-level prepare Makefile -# -PORTS += $(STDCXX) - -STDCXX_GEN_INCLUDES := \ - include/stdcxx-genode/new \ - include/stdcxx-genode/exception \ - include/stdcxx-genode/typeinfo \ - include/stdcxx-genode/initializer_list \ - include/stdcxx-genode/bits/c++allocator.h \ - include/stdcxx-genode/bits/c++locale.h \ - include/stdcxx-genode/bits/cpu_defines.h \ - include/stdcxx-genode/bits/cxxabi_tweaks.h \ - include/stdcxx-genode/bits/hash_bytes.h \ - include/stdcxx-genode/bits/error_constants.h \ - include/stdcxx-genode/bits/os_defines.h \ - include/stdcxx-genode/bits/cxxabi_forced.h \ - include/stdcxx-genode/bits/atomic_lockfree_defines.h \ - include/stdcxx-genode/bits/basic_file.h \ - include/stdcxx-genode/bits/c++io.h \ - include/stdcxx-genode/bits/atomic_word.h \ - include/stdcxx-genode/bits/ctype_base.h \ - include/stdcxx-genode/bits/ctype_inline.h \ - include/stdcxx-genode/bits/time_members.h \ - include/stdcxx-genode/bits/messages_members.h \ - include/stdcxx-genode/bits/exception_defines.h \ - include/stdcxx-genode/bits/exception_ptr.h \ - include/stdcxx-genode/bits/nested_exception.h - -prepare-stdcxx: $(CONTRIB_DIR)/$(STDCXX) include/stdcxx $(STDCXX_GEN_INCLUDES) - -$(CONTRIB_DIR)/$(STDCXX): clean-stdcxx - -# -# Port-specific local rules -# -$(DOWNLOAD_DIR)/$(STDCXX_TBZ2): - $(VERBOSE)wget -c -P $(DOWNLOAD_DIR) -O$@ $(STDCXX_URL) && touch $@ - -$(DOWNLOAD_DIR)/$(STDCXX_SIG): - $(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(STDCXX_URL_SIG) && touch $@ - -$(DOWNLOAD_DIR)/$(STDCXX_TBZ2).verified: $(DOWNLOAD_DIR)/$(STDCXX_TBZ2) \ - $(DOWNLOAD_DIR)/$(STDCXX_SIG) - $(VERBOSE)$(SIGVERIFIER) $(DOWNLOAD_DIR)/$(STDCXX_TBZ2) $(DOWNLOAD_DIR)/$(STDCXX_SIG) $(STDCXX_KEY) - $(VERBOSE)touch $@ - -$(CONTRIB_DIR)/$(STDCXX): $(DOWNLOAD_DIR)/$(STDCXX_TBZ2).verified - $(VERBOSE)tar xfj $(<:.verified=) -C $(CONTRIB_DIR) gcc-$(STDCXX_VERSION)/libstdc++-v3 \ - --transform "s/gcc-$(STDCXX_VERSION).libstdc++-v3/stdcxx-$(STDCXX_VERSION)/" && touch $@ - -include/stdcxx: - $(VERBOSE)ln -s ../$(CONTRIB_DIR)/$(STDCXX)/include $@ -include/stdcxx-genode/new: - $(VERBOSE)ln -s ../../$(CONTRIB_DIR)/$(STDCXX)/libsupc++/new $@ -include/stdcxx-genode/exception: - $(VERBOSE)ln -s ../../$(CONTRIB_DIR)/$(STDCXX)/libsupc++/exception $@ -include/stdcxx-genode/typeinfo: - $(VERBOSE)ln -s ../../$(CONTRIB_DIR)/$(STDCXX)/libsupc++/typeinfo $@ -include/stdcxx-genode/initializer_list: - $(VERBOSE)ln -s ../../$(CONTRIB_DIR)/$(STDCXX)/libsupc++/initializer_list $@ -include/stdcxx-genode/bits/hash_bytes.h: - $(VERBOSE)ln -s ../../../$(CONTRIB_DIR)/$(STDCXX)/libsupc++/hash_bytes.h $@ -include/stdcxx-genode/bits/exception_defines.h: - $(VERBOSE)ln -s ../../../$(CONTRIB_DIR)/$(STDCXX)/libsupc++/exception_defines.h $@ -include/stdcxx-genode/bits/exception_ptr.h: - $(VERBOSE)ln -s ../../../$(CONTRIB_DIR)/$(STDCXX)/libsupc++/exception_ptr.h $@ -include/stdcxx-genode/bits/nested_exception.h: - $(VERBOSE)ln -s ../../../$(CONTRIB_DIR)/$(STDCXX)/libsupc++/nested_exception.h $@ -include/stdcxx-genode/bits/cxxabi_forced.h: - $(VERBOSE)ln -s ../../../$(CONTRIB_DIR)/$(STDCXX)/libsupc++/cxxabi_forced.h $@ -include/stdcxx-genode/bits/atomic_lockfree_defines.h: - $(VERBOSE)ln -s ../../../$(CONTRIB_DIR)/$(STDCXX)/libsupc++/atomic_lockfree_defines.h $@ -include/stdcxx-genode/bits/c++allocator.h: - $(VERBOSE)ln -s ../../../$(CONTRIB_DIR)/$(STDCXX)/config/allocator/new_allocator_base.h $@ -include/stdcxx-genode/bits/c++locale.h: - $(VERBOSE)ln -s ../../../$(CONTRIB_DIR)/$(STDCXX)/config/locale/generic/c_locale.h $@ -include/stdcxx-genode/bits/cpu_defines.h: - $(VERBOSE)ln -s ../../../$(CONTRIB_DIR)/$(STDCXX)/config/cpu/generic/cpu_defines.h $@ -include/stdcxx-genode/bits/cxxabi_tweaks.h: - $(VERBOSE)ln -s ../../../$(CONTRIB_DIR)/$(STDCXX)/config/cpu/generic/cxxabi_tweaks.h $@ -include/stdcxx-genode/bits/error_constants.h: - $(VERBOSE)ln -s ../../../$(CONTRIB_DIR)/$(STDCXX)/config/os/generic/error_constants.h $@ -include/stdcxx-genode/bits/os_defines.h: - $(VERBOSE)ln -s ../../../$(CONTRIB_DIR)/$(STDCXX)/config/os/generic/os_defines.h $@ -include/stdcxx-genode/bits/basic_file.h: - $(VERBOSE)ln -s ../../../$(CONTRIB_DIR)/$(STDCXX)/config/io/basic_file_stdio.h $@ -include/stdcxx-genode/bits/c++io.h: - $(VERBOSE)ln -s ../../../$(CONTRIB_DIR)/$(STDCXX)/config/io/c_io_stdio.h $@ -include/stdcxx-genode/bits/atomic_word.h: - $(VERBOSE)ln -s ../../../$(CONTRIB_DIR)/$(STDCXX)/config/cpu/generic/atomic_word.h $@ -include/stdcxx-genode/bits/ctype_base.h: - $(VERBOSE)ln -s ../../../$(CONTRIB_DIR)/$(STDCXX)/config/os/generic/ctype_base.h $@ -include/stdcxx-genode/bits/ctype_inline.h: - $(VERBOSE)ln -s ../../../$(CONTRIB_DIR)/$(STDCXX)/config/os/generic/ctype_inline.h $@ -include/stdcxx-genode/bits/time_members.h: - $(VERBOSE)ln -s ../../../$(CONTRIB_DIR)/$(STDCXX)/config/locale/generic/time_members.h $@ -include/stdcxx-genode/bits/messages_members.h: - $(VERBOSE)ln -s ../../../$(CONTRIB_DIR)/$(STDCXX)/config/locale/generic/messages_members.h $@ - -clean-stdcxx: - $(VERBOSE)rm -rf $(CONTRIB_DIR)/$(STDCXX) - $(VERBOSE)rm -f include/stdcxx - $(VERBOSE)rm -f $(STDCXX_GEN_INCLUDES) diff --git a/repos/libports/ports/stdcxx.port b/repos/libports/ports/stdcxx.port new file mode 100644 index 0000000000..0b39df6187 --- /dev/null +++ b/repos/libports/ports/stdcxx.port @@ -0,0 +1,45 @@ +LICENSE := LGPL +VERSION := 4.7.2 +DOWNLOADS := gcc.archive + +URL(gcc) := ftp://ftp.fu-berlin.de/gnu/gcc/gcc-$(VERSION)/gcc-$(VERSION).tar.bz2 +SHA(gcc) := a464ba0f26eef24c29bcd1e7489421117fb9ee35 +DIR(gcc) := src/lib/stdcxx +SIG(gcc) := ${URL(gcc)} +KEY(gcc) := GNU + +TAR_OPT(gcc) := gcc-$(VERSION)/libstdc++-v3 --strip-components=2 + +DIRS := include/stdcxx +DIR_CONTENT(include/stdcxx) := \ + src/lib/stdcxx/include/* \ + src/lib/stdcxx/libsupc++/new \ + src/lib/stdcxx/libsupc++/exception \ + src/lib/stdcxx/libsupc++/typeinfo \ + src/lib/stdcxx/libsupc++/initializer_list + +DIRS += include/stdcxx/bits +DIR_CONTENT(include/stdcxx/bits) := \ + src/lib/stdcxx/libsupc++/hash_bytes.h \ + src/lib/stdcxx/libsupc++/exception_defines.h \ + src/lib/stdcxx/libsupc++/exception_ptr.h \ + src/lib/stdcxx/libsupc++/nested_exception.h \ + src/lib/stdcxx/libsupc++/cxxabi_forced.h \ + src/lib/stdcxx/libsupc++/atomic_lockfree_defines.h \ + src/lib/stdcxx/config/cpu/generic/cpu_defines.h \ + src/lib/stdcxx/config/cpu/generic/cxxabi_tweaks.h \ + src/lib/stdcxx/config/os/generic/error_constants.h \ + src/lib/stdcxx/config/os/generic/os_defines.h \ + src/lib/stdcxx/config/cpu/generic/atomic_word.h \ + src/lib/stdcxx/config/os/generic/ctype_base.h \ + src/lib/stdcxx/config/os/generic/ctype_inline.h \ + src/lib/stdcxx/config/locale/generic/time_members.h \ + src/lib/stdcxx/config/locale/generic/messages_members.h + +DIRS += include/stdcxx/config +DIR_CONTENT(include/stdcxx/config) := \ + src/lib/stdcxx/config/allocator/new_allocator_base.h \ + src/lib/stdcxx/config/locale/generic/c_locale.h \ + src/lib/stdcxx/config/io/basic_file_stdio.h \ + src/lib/stdcxx/config/io/c_io_stdio.h + diff --git a/repos/libports/ports/x86emu.hash b/repos/libports/ports/x86emu.hash new file mode 100644 index 0000000000..421376db9e --- /dev/null +++ b/repos/libports/ports/x86emu.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/libports/ports/x86emu.mk b/repos/libports/ports/x86emu.mk deleted file mode 100644 index 9efdd1751d..0000000000 --- a/repos/libports/ports/x86emu.mk +++ /dev/null @@ -1,62 +0,0 @@ -# XXX We stay with 1.12.0 currently as later versions changed many places just cosmetically. -X86EMU_VERSION = 1.12.0 -X86EMU = x86emu-$(X86EMU_VERSION) -X86EMU_XSERVER = xserver-xorg-server-$(X86EMU_VERSION) -X86EMU_TGZ = $(X86EMU_XSERVER).tar.gz -X86EMU_URL = http://cgit.freedesktop.org/xorg/xserver/snapshot/$(X86EMU_TGZ) - -# -# Check for tools -# -$(call check_tool,sed) - -# -# Interface to top-level prepare Makefile -# -PORTS += $(X86EMU) - -X86EMU_INC_DIR = include/x86emu - -X86EMU_INCLUDES = $(X86EMU_INC_DIR)/x86emu.h -X86EMU_INCLUDES += $(X86EMU_INC_DIR)/x86emu/regs.h -X86EMU_INCLUDES += $(X86EMU_INC_DIR)/x86emu/types.h - -# dummy links -X86EMU_INCLUDES += $(addprefix $(X86EMU_INC_DIR)/, stdint.h stdio.h stdlib.h string.h) - -prepare-x86emu: $(CONTRIB_DIR)/$(X86EMU) $(X86EMU_INC_DIR)/x86emu $(X86EMU_INCLUDES) - -$(CONTRIB_DIR)/$(X86EMU): clean-x86emu - -# -# Port-specific local rules -# -$(DOWNLOAD_DIR)/$(X86EMU_TGZ): - $(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(X86EMU_URL) && touch $@ - -# use sed to replace in a structure a member 'private' - reserved keyword in C++ -$(CONTRIB_DIR)/$(X86EMU): $(DOWNLOAD_DIR)/$(X86EMU_TGZ) - $(VERBOSE)mkdir $@ \ - && tar xzf $< -C $@ --strip-components=4 $(X86EMU_XSERVER)/hw/xfree86/x86emu \ - && cp $(CONTRIB_DIR)/$(X86EMU)/x86emu/regs.h $(CONTRIB_DIR)/$(X86EMU)/x86emu/regs.h.orig \ - && sed 's/private;/private_ptr;/g' <$(CONTRIB_DIR)/$(X86EMU)/x86emu/regs.h.orig >$(CONTRIB_DIR)/$(X86EMU)/x86emu/regs.h \ - && touch $@ - -$(X86EMU_INC_DIR)/x86emu: - $(VERBOSE) mkdir $@ - -# create dummy links to std*.h -$(X86EMU_INC_DIR)/std%.h: - $(VERBOSE) ln -sf sys/types.h $@ - -# create dummy link to string.h -$(X86EMU_INC_DIR)/string.h: - $(VERBOSE) ln -sf sys/types.h $@ - -# create links to x86emu header files -$(X86EMU_INC_DIR)/%.h: - $(VERBOSE)ln -sf ../..$(subst $(subst x86emu/,,$(subst $(X86EMU_INC_DIR)/,,$@)),,$(subst x86emu/,/..,$(subst $(X86EMU_INC_DIR)/,,$@)))/$(CONTRIB_DIR)/$(X86EMU)/$(subst $(X86EMU_INC_DIR)/,,$@) $@ - -clean-x86emu: - $(VERBOSE)rm -f $(X86EMU_INCLUDES) - $(VERBOSE)rm -rf $(CONTRIB_DIR)/$(X86EMU) diff --git a/repos/libports/ports/x86emu.port b/repos/libports/ports/x86emu.port new file mode 100644 index 0000000000..8446ea0fba --- /dev/null +++ b/repos/libports/ports/x86emu.port @@ -0,0 +1,22 @@ +LICENSE := MIT +VERSION := 1.12.0 + +DOWNLOADS := xserver.archive + +URL(xserver) := http://ftp.x.org/pub/individual/xserver/xorg-server-1.12.0.tar.bz2 +SHA(xserver) := 5f48db767f71e9f58ded6ff356f3b8340820e524 +DIR(xserver) := src/lib/x86emu/contrib + +TAR_OPT(xserver) := --strip-components=4 xorg-server-$(VERSION)/hw/xfree86/x86emu + +default: fix_cxx + +# use sed to replace in a structure a member 'private' - reserved keyword in C++ +fix_cxx: $(DOWNLOADS) + $(VERBOSE)sed -i 's/private;/private_ptr;/g' src/lib/x86emu/contrib/x86emu/regs.h + +DIRS := include/x86emu include/x86emu/x86emu + +DIR_CONTENT(include/x86emu) := src/lib/x86emu/contrib/x86emu.h +DIR_CONTENT(include/x86emu/x86emu) := src/lib/x86emu/contrib/x86emu/regs.h \ + src/lib/x86emu/contrib/x86emu/types.h diff --git a/repos/libports/ports/zlib.hash b/repos/libports/ports/zlib.hash new file mode 100644 index 0000000000..421376db9e --- /dev/null +++ b/repos/libports/ports/zlib.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/libports/ports/zlib.mk b/repos/libports/ports/zlib.mk deleted file mode 100644 index 94af33cbaf..0000000000 --- a/repos/libports/ports/zlib.mk +++ /dev/null @@ -1,38 +0,0 @@ -ZLIB_VERSION = 1.2.8 -ZLIB = zlib-$(ZLIB_VERSION) -ZLIB_TGZ = $(ZLIB).tar.gz -ZLIB_URL = http://downloads.sourceforge.net/project/libpng/zlib/$(ZLIB_VERSION)/$(ZLIB_TGZ) -ZLIB_MD5 = 44d667c142d7cda120332623eab69f40 - -# -# Interface to top-level prepare Makefile -# -PORTS += $(ZLIB) - -prepare-zlib: $(CONTRIB_DIR)/$(ZLIB) include/zlib - -$(CONTRIB_DIR)/$(ZLIB):clean-zlib - -# -# Port-specific local rules -# -$(DOWNLOAD_DIR)/$(ZLIB_TGZ): - $(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(ZLIB_URL) && touch $@ - -$(DOWNLOAD_DIR)/$(ZLIB_TGZ).verified: $(DOWNLOAD_DIR)/$(ZLIB_TGZ) - $(VERBOSE)$(HASHVERIFIER) $(DOWNLOAD_DIR)/$(ZLIB_TGZ) $(ZLIB_MD5) md5 - $(VERBOSE)touch $@ - -$(CONTRIB_DIR)/$(ZLIB): $(DOWNLOAD_DIR)/$(ZLIB_TGZ).verified - $(VERBOSE)tar xfz $(<:.verified=) -C $(CONTRIB_DIR) && touch $@ - -ZLIB_INCLUDES = zconf.h zlib.h - -include/zlib: - $(VERBOSE)mkdir -p $@ - $(VERBOSE)for i in $(ZLIB_INCLUDES); do \ - ln -sf ../../$(CONTRIB_DIR)/$(ZLIB)/$$i $@; done - -clean-zlib: - $(VERBOSE)rm -rf include/zlib - $(VERBOSE)rm -rf $(CONTRIB_DIR)/$(ZLIB) diff --git a/repos/libports/ports/zlib.port b/repos/libports/ports/zlib.port new file mode 100644 index 0000000000..60367db7c1 --- /dev/null +++ b/repos/libports/ports/zlib.port @@ -0,0 +1,10 @@ +LICENSE := zlib +VERSION := 1.2.8 +DOWNLOADS := zlib.archive + +URL(zlib) := http://downloads.sourceforge.net/project/libpng/zlib/$(VERSION)/zlib-$(VERSION).tar.gz +SHA(zlib) := a4d316c404ff54ca545ea71a27af7dbc29817088 +DIR(zlib) := src/lib/zlib + +DIRS := include/zlib +DIR_CONTENT(include/zlib) := $(addprefix src/lib/zlib/,zconf.h zlib.h) diff --git a/repos/libports/src/app/avplay/avplay.patch b/repos/libports/src/app/avplay/avplay.patch index 9f5427b700..c0b836d733 100644 --- a/repos/libports/src/app/avplay/avplay.patch +++ b/repos/libports/src/app/avplay/avplay.patch @@ -1,9 +1,7 @@ - don't show status messages - fix audio/video synchronicity (needs more testing) -diff --git a/avplay.c b/avplay.c ---- a/avplay.c -+++ b/avplay.c ++++ src/lib/libav/avplay.c @@ -235,7 +235,7 @@ }; static int seek_by_bytes = -1; diff --git a/repos/libports/src/app/avplay/target.mk b/repos/libports/src/app/avplay/target.mk index 622956e7e0..aff796d590 100644 --- a/repos/libports/src/app/avplay/target.mk +++ b/repos/libports/src/app/avplay/target.mk @@ -8,9 +8,14 @@ LIBS += sdl libc libm config_args CC_WARN += -Wno-parentheses -Wno-switch -Wno-uninitialized \ -Wno-format-zero-length -Wno-pointer-sign +LIBAV_PORT_DIR := $(call select_from_ports,libav) + +# version.h +INC_DIR += $(PRG_DIR) + # config.h INC_DIR += $(REP_DIR)/src/lib/libav CC_C_OPT += -DLIBAV_VERSION=\"0.8\" -vpath %.c $(REP_DIR)/contrib/$(LIBAV) +vpath %.c $(LIBAV_PORT_DIR)/src/lib/libav diff --git a/repos/libports/src/app/avplay/version.h b/repos/libports/src/app/avplay/version.h new file mode 100644 index 0000000000..e69de29bb2 diff --git a/repos/libports/src/app/mupdf/target.mk b/repos/libports/src/app/mupdf/target.mk index f8d75d1802..140855f1fa 100644 --- a/repos/libports/src/app/mupdf/target.mk +++ b/repos/libports/src/app/mupdf/target.mk @@ -1,8 +1,8 @@ -MUPDF_DIR = $(REP_DIR)/contrib/mupdf-0.9 -TARGET = mupdf -SRC_C = pdfapp.c -SRC_CC = main.cc -LIBS = libc mupdf -INC_DIR += $(MUPDF_DIR)/apps +MUPDF_DIR := $(call select_from_ports,mupdf)/src/lib/mupdf +TARGET := mupdf +SRC_C := pdfapp.c +SRC_CC := main.cc +LIBS := libc mupdf +INC_DIR += $(MUPDF_DIR)/apps vpath pdfapp.c $(MUPDF_DIR)/apps diff --git a/repos/libports/src/app/qt5/qt_avplay/target.mk b/repos/libports/src/app/qt5/qt_avplay/target.mk index 125eb934e8..d5a17badfb 100644 --- a/repos/libports/src/app/qt5/qt_avplay/target.mk +++ b/repos/libports/src/app/qt5/qt_avplay/target.mk @@ -6,4 +6,4 @@ include $(QT5_REP_DIR)/src/app/qt5/tmpl/target_defaults.inc include $(QT5_REP_DIR)/src/app/qt5/tmpl/target_final.inc -LIBS += qt5_qnitpickerviewwidget +LIBS += qt5_qnitpickerviewwidget qoost diff --git a/repos/libports/src/lib/curl/configure.patch b/repos/libports/src/lib/curl/configure.patch index b980302d4c..9375bf4ed5 100644 --- a/repos/libports/src/lib/curl/configure.patch +++ b/repos/libports/src/lib/curl/configure.patch @@ -1,8 +1,7 @@ Since noux.mk is using a brute-force approach for setting CFLAGS, CPPFLAGs etc. disable this check. ---- curl-7.29.0/configure.orig 2013-02-23 16:55:37.710076636 +0100 -+++ curl-7.29.0/configure 2013-02-23 16:56:01.286193552 +0100 ++++ src/lib/curl/configure @@ -3671,8 +3671,8 @@ - if test $xc_bad_var_libs = yes || diff --git a/repos/libports/src/lib/curl/curl_h.patch b/repos/libports/src/lib/curl/curl_h.patch index 7deada5aef..d5c92ec542 100644 --- a/repos/libports/src/lib/curl/curl_h.patch +++ b/repos/libports/src/lib/curl/curl_h.patch @@ -2,8 +2,7 @@ We have no osreldate.h because this header is normally created by `sys/conf/newvers.sh` but since our libc is based on FreeBSD 8.2 let's just define the symbol. ---- curl-7.29.0/include/curl/curl.h.orig 2012-12-04 00:06:21.701911303 +0100 -+++ curl-7.29.0/include/curl/curl.h 2012-12-04 00:07:01.208367480 +0100 ++++ src/lib/curl/include/curl/curl.h @@ -47,8 +47,7 @@ #include diff --git a/repos/libports/src/lib/exfat/main.c.patch b/repos/libports/src/lib/exfat/main.c.patch index d7a1afa4c7..dc49583e3b 100644 --- a/repos/libports/src/lib/exfat/main.c.patch +++ b/repos/libports/src/lib/exfat/main.c.patch @@ -1,7 +1,7 @@ Make fuse_operation struct globally accessible and comment-out main() function. ---- contrib/fuse-exfat-1.0.1/fuse/main.c.orig 2013-11-11 14:34:42.668119109 +0100 -+++ contrib/fuse-exfat-1.0.1/fuse/main.c 2013-11-11 14:36:25.728122089 +0100 + ++++ src/lib/exfat/fuse/main.c @@ -296,7 +296,7 @@ exit(1); } diff --git a/repos/libports/src/lib/ffat/config.patch b/repos/libports/src/lib/ffat/config.patch index 3e87856c2b..a06a630bac 100644 --- a/repos/libports/src/lib/ffat/config.patch +++ b/repos/libports/src/lib/ffat/config.patch @@ -1,6 +1,4 @@ -diff -urN ff007e.orig/src/ffconf.h ff007e/src/ffconf.h ---- ff007e.orig/src/ffconf.h 2009-11-03 00:44:22.000000000 +0100 -+++ ff007e/src/ffconf.h 2012-07-09 13:08:03.000000000 +0200 ++++ src/lib/ffat/src/ffconf.h 2012-07-09 13:08:03.000000000 +0200 @@ -40,7 +40,7 @@ /* To enable string functions, set _USE_STRFUNC to 1 or 2. */ diff --git a/repos/libports/src/lib/fuse-ext2/patches/bitops.h.patch b/repos/libports/src/lib/fuse-ext2/patches/bitops.h.patch index f5af19ab3e..cb5f5e7eb5 100644 --- a/repos/libports/src/lib/fuse-ext2/patches/bitops.h.patch +++ b/repos/libports/src/lib/fuse-ext2/patches/bitops.h.patch @@ -1,5 +1,4 @@ ---- contrib/fuse-ext2-svn-220/e2fsprogs-1.41.12.newgit/ext2fs/bitops.h.orig 2013-11-14 15:25:38.621795983 +0100 -+++ contrib/fuse-ext2-svn-220/e2fsprogs-1.41.12.newgit/ext2fs/bitops.h 2013-11-14 15:24:24.069798186 +0100 ++++ src/lib/fuse-ext2/e2fsprogs-1.41.12.newgit/ext2fs/bitops.h @@ -98,7 +98,7 @@ extern int ext2fs_test_block_bitmap_range(ext2fs_block_bitmap bitmap, blk_t block, int num); diff --git a/repos/libports/src/lib/fuse-ext2/patches/closefs.c.patch b/repos/libports/src/lib/fuse-ext2/patches/closefs.c.patch index f2a379b0ff..6d142cae43 100644 --- a/repos/libports/src/lib/fuse-ext2/patches/closefs.c.patch +++ b/repos/libports/src/lib/fuse-ext2/patches/closefs.c.patch @@ -1,5 +1,4 @@ ---- contrib/fuse-ext2-svn-220/e2fsprogs-1.41.12.newgit/ext2fs/closefs.c.orig 2013-11-22 17:12:24.152903960 +0100 -+++ contrib/fuse-ext2-svn-220/e2fsprogs-1.41.12.newgit/ext2fs/closefs.c 2013-11-22 17:12:52.936905227 +0100 ++++ src/lib/fuse-ext2/e2fsprogs-1.41.12.newgit/ext2fs/closefs.c @@ -32,19 +32,6 @@ } } diff --git a/repos/libports/src/lib/fuse-ext2/patches/com_err.c.patch b/repos/libports/src/lib/fuse-ext2/patches/com_err.c.patch index ae8df3f0f7..ebfccdbfd7 100644 --- a/repos/libports/src/lib/fuse-ext2/patches/com_err.c.patch +++ b/repos/libports/src/lib/fuse-ext2/patches/com_err.c.patch @@ -1,5 +1,4 @@ ---- contrib/fuse-ext2-svn-220/e2fsprogs-1.41.12.newgit/et/com_err.c.orig 2013-12-09 15:25:01.855366466 +0100 -+++ contrib/fuse-ext2-svn-220/e2fsprogs-1.41.12.newgit/et/com_err.c 2013-12-09 15:25:11.063366732 +0100 ++++ src/lib/fuse-ext2/e2fsprogs-1.41.12.newgit/et/com_err.c @@ -11,6 +11,8 @@ * express or implied warranty. */ diff --git a/repos/libports/src/lib/fuse-ext2/patches/error_message.c.patch b/repos/libports/src/lib/fuse-ext2/patches/error_message.c.patch index 5e7d01919a..79b51b3684 100644 --- a/repos/libports/src/lib/fuse-ext2/patches/error_message.c.patch +++ b/repos/libports/src/lib/fuse-ext2/patches/error_message.c.patch @@ -1,5 +1,4 @@ ---- contrib/fuse-ext2-svn-220/e2fsprogs-1.41.12.newgit/et/error_message.c.orig 2013-12-09 15:26:26.847368923 +0100 -+++ contrib/fuse-ext2-svn-220/e2fsprogs-1.41.12.newgit/et/error_message.c 2013-12-09 15:26:21.483368767 +0100 ++++ src/lib/fuse-ext2/e2fsprogs-1.41.12.newgit/et/error_message.c @@ -16,6 +16,8 @@ * express or implied warranty. */ diff --git a/repos/libports/src/lib/fuse-ext2/patches/ext2fs.h.patch b/repos/libports/src/lib/fuse-ext2/patches/ext2fs.h.patch index 88e2954bec..56bfd6aa2e 100644 --- a/repos/libports/src/lib/fuse-ext2/patches/ext2fs.h.patch +++ b/repos/libports/src/lib/fuse-ext2/patches/ext2fs.h.patch @@ -1,5 +1,4 @@ ---- contrib/fuse-ext2-svn-220/e2fsprogs-1.41.12.newgit/ext2fs/ext2fs.h.orig 2013-11-22 17:06:23.728888099 +0100 -+++ contrib/fuse-ext2-svn-220/e2fsprogs-1.41.12.newgit/ext2fs/ext2fs.h 2013-11-22 17:03:53.028881471 +0100 ++++ src/lib/fuse-ext2/e2fsprogs-1.41.12.newgit/ext2fs/ext2fs.h @@ -49,9 +49,12 @@ #include #endif diff --git a/repos/libports/src/lib/fuse-ext2/patches/fuse-ext2.c.patch b/repos/libports/src/lib/fuse-ext2/patches/fuse-ext2.c.patch index 3f5ecdd44e..c8af5bbbe4 100644 --- a/repos/libports/src/lib/fuse-ext2/patches/fuse-ext2.c.patch +++ b/repos/libports/src/lib/fuse-ext2/patches/fuse-ext2.c.patch @@ -1,5 +1,4 @@ ---- contrib/fuse-ext2-svn-220/fuse-ext2/fuse-ext2.c.orig 2013-11-27 17:49:58.000000000 +0100 -+++ contrib/fuse-ext2-svn-220/fuse-ext2/fuse-ext2.c 2013-11-27 17:50:45.593877786 +0100 ++++ src/lib/fuse-ext2/fuse-ext2/fuse-ext2.c @@ -278,7 +278,7 @@ goto exit; } diff --git a/repos/libports/src/lib/fuse-ext2/patches/fuse-ext2.h.patch b/repos/libports/src/lib/fuse-ext2/patches/fuse-ext2.h.patch index 2ff28832fe..05c03b1399 100644 --- a/repos/libports/src/lib/fuse-ext2/patches/fuse-ext2.h.patch +++ b/repos/libports/src/lib/fuse-ext2/patches/fuse-ext2.h.patch @@ -1,5 +1,4 @@ ---- contrib/fuse-ext2-svn-220/fuse-ext2/fuse-ext2.h.orig 2013-12-09 14:39:42.000000000 +0100 -+++ contrib/fuse-ext2-svn-220/fuse-ext2/fuse-ext2.h 2013-12-09 14:33:19.455276804 +0100 ++++ src/lib/fuse-ext2/fuse-ext2/fuse-ext2.h @@ -88,7 +88,7 @@ static inline ext2_filsys current_ext2fs(void) { diff --git a/repos/libports/src/lib/fuse-ext2/patches/gen_bitmap64.c.patch b/repos/libports/src/lib/fuse-ext2/patches/gen_bitmap64.c.patch index 52124e6157..2fb21c6fc2 100644 --- a/repos/libports/src/lib/fuse-ext2/patches/gen_bitmap64.c.patch +++ b/repos/libports/src/lib/fuse-ext2/patches/gen_bitmap64.c.patch @@ -1,5 +1,4 @@ ---- contrib/fuse-ext2-svn-220/e2fsprogs-1.41.12.newgit/ext2fs/gen_bitmap64.c.orig 2013-12-09 15:23:27.407363737 +0100 -+++ contrib/fuse-ext2-svn-220/e2fsprogs-1.41.12.newgit/ext2fs/gen_bitmap64.c 2013-12-09 15:23:21.847363577 +0100 ++++ src/lib/fuse-ext2/e2fsprogs-1.41.12.newgit/ext2fs/gen_bitmap64.c @@ -577,4 +577,5 @@ com_err(0, EXT2_ET_MAGIC_GENERIC_BITMAP, "called %s with 64-bit bitmap", func); diff --git a/repos/libports/src/lib/fuse-ext2/patches/icount.c.patch b/repos/libports/src/lib/fuse-ext2/patches/icount.c.patch index 21a6c48399..0d3a7c73af 100644 --- a/repos/libports/src/lib/fuse-ext2/patches/icount.c.patch +++ b/repos/libports/src/lib/fuse-ext2/patches/icount.c.patch @@ -1,5 +1,4 @@ ---- contrib/fuse-ext2-svn-220/e2fsprogs-1.41.12.newgit/ext2fs/icount.c.orig 2013-12-09 15:27:23.231370552 +0100 -+++ contrib/fuse-ext2-svn-220/e2fsprogs-1.41.12.newgit/ext2fs/icount.c 2013-12-09 15:27:35.755370914 +0100 ++++ src/lib/fuse-ext2/e2fsprogs-1.41.12.newgit/ext2fs/icount.c @@ -9,6 +9,8 @@ * %End-Header% */ diff --git a/repos/libports/src/lib/fuse-ext2/patches/init_et.c.patch b/repos/libports/src/lib/fuse-ext2/patches/init_et.c.patch index c41b4a9a9f..e5634c60dc 100644 --- a/repos/libports/src/lib/fuse-ext2/patches/init_et.c.patch +++ b/repos/libports/src/lib/fuse-ext2/patches/init_et.c.patch @@ -1,5 +1,4 @@ ---- contrib/fuse-ext2-svn-220/e2fsprogs-1.41.12.newgit/et/init_et.c.orig 2013-12-09 15:31:03.111376907 +0100 -+++ contrib/fuse-ext2-svn-220/e2fsprogs-1.41.12.newgit/et/init_et.c 2013-12-09 15:31:11.391377147 +0100 ++++ src/lib/fuse-ext2/e2fsprogs-1.41.12.newgit/et/init_et.c @@ -16,6 +16,8 @@ * express or implied warranty. */ diff --git a/repos/libports/src/lib/fuse-ext2/patches/op_access.c.patch b/repos/libports/src/lib/fuse-ext2/patches/op_access.c.patch index e641beb8a4..13a854a434 100644 --- a/repos/libports/src/lib/fuse-ext2/patches/op_access.c.patch +++ b/repos/libports/src/lib/fuse-ext2/patches/op_access.c.patch @@ -1,5 +1,4 @@ ---- contrib/fuse-ext2-svn-220/fuse-ext2/op_access.c.orig 2013-11-22 17:10:24.636898700 +0100 -+++ contrib/fuse-ext2-svn-220/fuse-ext2/op_access.c 2013-11-22 17:10:34.728899142 +0100 ++++ src/lib/fuse-ext2/fuse-ext2/op_access.c @@ -18,6 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff --git a/repos/libports/src/lib/fuse-ext2/patches/op_statfs.c.patch b/repos/libports/src/lib/fuse-ext2/patches/op_statfs.c.patch index 2db69d9dd9..bead8ca58b 100644 --- a/repos/libports/src/lib/fuse-ext2/patches/op_statfs.c.patch +++ b/repos/libports/src/lib/fuse-ext2/patches/op_statfs.c.patch @@ -1,5 +1,4 @@ ---- contrib/fuse-ext2-svn-220/fuse-ext2/op_statfs.c.orig 2013-11-25 15:51:51.752182307 +0100 -+++ contrib/fuse-ext2-svn-220/fuse-ext2/op_statfs.c 2013-11-25 15:51:45.592104883 +0100 ++++ src/lib/fuse-ext2/fuse-ext2/op_statfs.c @@ -41,10 +41,12 @@ static int ext2_bg_has_super (ext2_filsys e2fs, int group) diff --git a/repos/libports/src/lib/fuse-ext2/patches/res_gdt.c.patch b/repos/libports/src/lib/fuse-ext2/patches/res_gdt.c.patch index 88ff6c1acf..3da1419e3f 100644 --- a/repos/libports/src/lib/fuse-ext2/patches/res_gdt.c.patch +++ b/repos/libports/src/lib/fuse-ext2/patches/res_gdt.c.patch @@ -1,5 +1,4 @@ ---- contrib/fuse-ext2-svn-220/e2fsprogs-1.41.12.newgit/ext2fs/res_gdt.c.orig 2013-12-09 15:17:10.771352852 +0100 -+++ contrib/fuse-ext2-svn-220/e2fsprogs-1.41.12.newgit/ext2fs/res_gdt.c 2013-12-09 15:16:58.379352494 +0100 ++++ src/lib/fuse-ext2/e2fsprogs-1.41.12.newgit/ext2fs/res_gdt.c @@ -63,7 +63,7 @@ errcode_t retval, retval2; struct ext2_super_block *sb; diff --git a/repos/libports/src/lib/fuse-ext2/patches/rw_bitmaps.c.patch b/repos/libports/src/lib/fuse-ext2/patches/rw_bitmaps.c.patch index de0b536c0c..458aeb2e26 100644 --- a/repos/libports/src/lib/fuse-ext2/patches/rw_bitmaps.c.patch +++ b/repos/libports/src/lib/fuse-ext2/patches/rw_bitmaps.c.patch @@ -1,5 +1,4 @@ ---- contrib/fuse-ext2-svn-220/e2fsprogs-1.41.12.newgit/ext2fs/rw_bitmaps.c.orig 2013-12-09 15:17:28.255353356 +0100 -+++ contrib/fuse-ext2-svn-220/e2fsprogs-1.41.12.newgit/ext2fs/rw_bitmaps.c 2013-12-09 15:21:02.807359558 +0100 ++++ src/lib/fuse-ext2/e2fsprogs-1.41.12.newgit/ext2fs/rw_bitmaps.c @@ -34,7 +34,7 @@ int block_nbytes, inode_nbytes; unsigned int nbits; diff --git a/repos/libports/src/lib/fuse-ext2/patches/tdb.c.patch b/repos/libports/src/lib/fuse-ext2/patches/tdb.c.patch index ab77147434..24949a8f6d 100644 --- a/repos/libports/src/lib/fuse-ext2/patches/tdb.c.patch +++ b/repos/libports/src/lib/fuse-ext2/patches/tdb.c.patch @@ -1,5 +1,4 @@ ---- contrib/fuse-ext2-svn-220/e2fsprogs-1.41.12.newgit/ext2fs/tdb.c.orig 2013-12-09 15:04:04.315330122 +0100 -+++ contrib/fuse-ext2-svn-220/e2fsprogs-1.41.12.newgit/ext2fs/tdb.c 2013-12-09 15:05:19.767332303 +0100 ++++ src/lib/fuse-ext2/e2fsprogs-1.41.12.newgit/ext2fs/tdb.c @@ -75,12 +75,11 @@ static char *rep_strdup(const char *s) { diff --git a/repos/libports/src/lib/fuse-ext2/patches/test_io.c.patch b/repos/libports/src/lib/fuse-ext2/patches/test_io.c.patch index 11141105d4..8e0dbbdf60 100644 --- a/repos/libports/src/lib/fuse-ext2/patches/test_io.c.patch +++ b/repos/libports/src/lib/fuse-ext2/patches/test_io.c.patch @@ -1,5 +1,4 @@ ---- contrib/fuse-ext2-svn-220/e2fsprogs-1.41.12.newgit/ext2fs/test_io.c.orig 2013-12-09 15:32:11.095378871 +0100 -+++ contrib/fuse-ext2-svn-220/e2fsprogs-1.41.12.newgit/ext2fs/test_io.c 2013-12-09 15:32:20.811379151 +0100 ++++ src/lib/fuse-ext2/e2fsprogs-1.41.12.newgit/ext2fs/test_io.c @@ -9,6 +9,8 @@ * %End-Header% */ diff --git a/repos/libports/src/lib/fuse-ext2/patches/unix_io.c.patch b/repos/libports/src/lib/fuse-ext2/patches/unix_io.c.patch index 679a188976..8596db8b86 100644 --- a/repos/libports/src/lib/fuse-ext2/patches/unix_io.c.patch +++ b/repos/libports/src/lib/fuse-ext2/patches/unix_io.c.patch @@ -1,5 +1,4 @@ ---- contrib/fuse-ext2-svn-220/e2fsprogs-1.41.12.newgit/ext2fs/unix_io.c.orig 2013-12-09 15:07:14.055335606 +0100 -+++ contrib/fuse-ext2-svn-220/e2fsprogs-1.41.12.newgit/ext2fs/unix_io.c 2013-12-09 15:06:55.163335059 +0100 ++++ src/lib/fuse-ext2/e2fsprogs-1.41.12.newgit/ext2fs/unix_io.c @@ -200,7 +200,7 @@ errcode_t retval; size_t size, alignsize, fragment; diff --git a/repos/libports/src/lib/libc/patches/getaddrinfo_c.patch b/repos/libports/src/lib/libc/patches/getaddrinfo_c.patch index 03f64d9ef2..6086534191 100644 --- a/repos/libports/src/lib/libc/patches/getaddrinfo_c.patch +++ b/repos/libports/src/lib/libc/patches/getaddrinfo_c.patch @@ -1,5 +1,4 @@ ---- libc/net/getaddrinfo.c.orig -+++ libc/net/getaddrinfo.c ++++ src/lib/libc/lib/libc/net/getaddrinfo.c @@ -329,7 +329,7 @@ do { \ ((x) == (y) || (/*CONSTCOND*/(w) && ((x) == ANY || (y) == ANY))) diff --git a/repos/libports/src/lib/libc/patches/log2.patch b/repos/libports/src/lib/libc/patches/log2.patch index 6f7fc232a0..950e55849c 100644 --- a/repos/libports/src/lib/libc/patches/log2.patch +++ b/repos/libports/src/lib/libc/patches/log2.patch @@ -1,9 +1,7 @@ - add 'log2()' and 'log2f()' declarations - this patch is only needed for FreeBSD libc versions < 9 -diff --git a/msun/src/math.h b/msun/src/math.h ---- msun/src/math.h -+++ msun/src/math.h ++++ src/lib/libc/lib/msun/src/math.h @@ -204,6 +204,7 @@ double ldexp(double, int); double log(double); diff --git a/repos/libports/src/lib/libc/patches/malloc_c.patch b/repos/libports/src/lib/libc/patches/malloc_c.patch index 8ded897789..c612f70649 100644 --- a/repos/libports/src/lib/libc/patches/malloc_c.patch +++ b/repos/libports/src/lib/libc/patches/malloc_c.patch @@ -1,5 +1,4 @@ ---- /tmp/freebsd-libc.cvs/stdlib/malloc.c 2008-10-21 15:50:04.000000000 +0100 -+++ libc/stdlib/malloc.c 2008-10-22 18:08:40.000000000 +0100 ++++ src/lib/libc/lib/libc/stdlib/malloc.c @@ -153,7 +153,7 @@ * unnecessary, but we are burdened by history and the lack of resource limits * for anonymous mapped memory. diff --git a/repos/libports/src/lib/libc/patches/math_private.patch b/repos/libports/src/lib/libc/patches/math_private.patch index 465aff8883..b7bb4455c8 100644 --- a/repos/libports/src/lib/libc/patches/math_private.patch +++ b/repos/libports/src/lib/libc/patches/math_private.patch @@ -1,5 +1,4 @@ ---- /tmp/math_private.h 2009-04-15 17:09:50.000000000 +0200 -+++ msun/src/math_private.h 2009-04-15 17:10:09.000000000 +0200 ++++ src/lib/libc/lib/msun/src/math_private.h @@ -225,6 +225,7 @@ /* Asm versions of some functions. */ diff --git a/repos/libports/src/lib/libc/patches/nis_x.patch b/repos/libports/src/lib/libc/patches/nis_x.patch index afb1433cb4..93d4ca2c73 100644 --- a/repos/libports/src/lib/libc/patches/nis_x.patch +++ b/repos/libports/src/lib/libc/patches/nis_x.patch @@ -1,5 +1,4 @@ ---- include/rpcsvc/nis.x.orig 2012-06-03 09:44:28.379015585 +0200 -+++ include/rpcsvc/nis.x 2012-06-03 09:45:45.916091879 +0200 ++++ src/lib/libc/include/rpcsvc/nis.x @@ -399,10 +399,7 @@ %#define OARIGHTS(d, n) (((d)->do_armask.do_armask_val+n)->oa_rights) %#define WORLD_DEFAULT (NIS_READ_ACC) diff --git a/repos/libports/src/lib/libc/patches/pthread_cancel.patch b/repos/libports/src/lib/libc/patches/pthread_cancel.patch index ce5a50b827..68f6661471 100644 --- a/repos/libports/src/lib/libc/patches/pthread_cancel.patch +++ b/repos/libports/src/lib/libc/patches/pthread_cancel.patch @@ -1,5 +1,4 @@ ---- src/lib/libc/gen/_pthread_stubs.c Mon Jan 18 14:51:51 2010 +0100 -+++ libc/gen/_pthread_stubs.c Thu Feb 04 22:05:48 2010 +0100 ++++ src/lib/libc/lib/libc/gen/_pthread_stubs.c @@ -253,7 +253,7 @@ STUB_FUNC2(pthread_attr_setschedparam, PJT_ATTR_SETSCHEDPARAM, int, void *, void *) STUB_FUNC2(pthread_attr_setschedpolicy, PJT_ATTR_SETSCHEDPOLICY, int, void *, int) diff --git a/repos/libports/src/lib/libc/patches/pthread_not_implemented.patch b/repos/libports/src/lib/libc/patches/pthread_not_implemented.patch index ff569c5210..14e914dcf7 100644 --- a/repos/libports/src/lib/libc/patches/pthread_not_implemented.patch +++ b/repos/libports/src/lib/libc/patches/pthread_not_implemented.patch @@ -4,13 +4,7 @@ From: Christian Prochaska --- - libc/gen/_pthread_stubs.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/libc/gen/_pthread_stubs.c b/libc/gen/_pthread_stubs.c -index 063676f..5a79231 100644 ---- libc/gen/_pthread_stubs.c -+++ libc/gen/_pthread_stubs.c ++++ src/lib/libc/lib/libc/gen/_pthread_stubs.c @@ -33,6 +33,8 @@ __FBSDID("$FreeBSD$"); #include "libc_private.h" diff --git a/repos/libports/src/lib/libc/patches/res_send_c.patch b/repos/libports/src/lib/libc/patches/res_send_c.patch index 13bb51357e..38f65e7658 100644 --- a/repos/libports/src/lib/libc/patches/res_send_c.patch +++ b/repos/libports/src/lib/libc/patches/res_send_c.patch @@ -1,5 +1,4 @@ ---- libc/include/port_after.h.orig 2006-03-21 19:31:24.000000000 +0100 -+++ libc/include/port_after.h 2012-05-24 11:22:13.453080652 +0200 ++++ src/lib/libc/lib/libc/include/port_after.h @@ -4,7 +4,7 @@ #define _PORT_AFTER_H_ @@ -9,8 +8,7 @@ #define HAVE_SIN6_SCOPE_ID 1 #define HAVE_TIME_R 1 ---- libc/include/port_before.h.orig 2006-03-21 16:37:16.000000000 +0100 -+++ libc/include/port_before.h 2012-05-24 11:22:13.453080652 +0200 ++++ src/lib/libc/lib/libc/include/port_before.h @@ -4,8 +4,8 @@ #define _PORT_BEFORE_H_ @@ -22,8 +20,7 @@ #define ISC_SOCKLEN_T socklen_t #define ISC_FORMAT_PRINTF(fmt, args) \ ---- libc/resolv/res_send.c.orig 2008-12-14 20:39:53.360146000 +0100 -+++ libc/resolv/res_send.c 2012-05-24 11:29:55.602592107 +0200 ++++ src/lib/libc/lib/libc/resolv/res_send.c @@ -78,7 +78,7 @@ #include "port_before.h" diff --git a/repos/libports/src/lib/libc/patches/vfwprintf_c_warn.patch b/repos/libports/src/lib/libc/patches/vfwprintf_c_warn.patch index 9f05069f7c..0fd446a5f4 100644 --- a/repos/libports/src/lib/libc/patches/vfwprintf_c_warn.patch +++ b/repos/libports/src/lib/libc/patches/vfwprintf_c_warn.patch @@ -1,5 +1,4 @@ ---- /tmp/freebsd-libc.cvs/stdio/vfwprintf.c 2008-08-04 08:55:42.000000000 +0100 -+++ libc/stdio/vfwprintf.c 2009-02-21 21:44:30.000000000 +0100 ++++ src/lib/libc/lib/libc/stdio/vfwprintf.c @@ -838,10 +838,10 @@ sign = '-'; if (expt == INT_MAX) { /* inf or nan */ diff --git a/repos/libports/src/lib/libiconv/iconv.h b/repos/libports/src/lib/libiconv/iconv.h deleted file mode 100644 index 987a11ec8f..0000000000 --- a/repos/libports/src/lib/libiconv/iconv.h +++ /dev/null @@ -1,248 +0,0 @@ -/* Copyright (C) 1999-2003, 2005-2006, 2008-2011 Free Software Foundation, Inc. - This file is part of the GNU LIBICONV Library. - - The GNU LIBICONV Library is free software; you can redistribute it - and/or modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either version 2 - of the License, or (at your option) any later version. - - The GNU LIBICONV Library is distributed in the hope that it will be - useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU LIBICONV Library; see the file COPYING.LIB. - If not, write to the Free Software Foundation, Inc., 51 Franklin Street, - Fifth Floor, Boston, MA 02110-1301, USA. */ - -/* When installed, this file is called "iconv.h". */ - -#ifndef _LIBICONV_H -#define _LIBICONV_H - -#define _LIBICONV_VERSION 0x010E /* version number: (major<<8) + minor */ - -#if 1 && BUILDING_LIBICONV -#define LIBICONV_DLL_EXPORTED __attribute__((__visibility__("default"))) -#else -#define LIBICONV_DLL_EXPORTED -#endif -extern LIBICONV_DLL_EXPORTED int _libiconv_version; /* Likewise */ - -/* We would like to #include any system header file which could define - iconv_t, 1. in order to eliminate the risk that the user gets compilation - errors because some other system header file includes /usr/include/iconv.h - which defines iconv_t or declares iconv after this file, 2. when compiling - for LIBICONV_PLUG, we need the proper iconv_t type in order to produce - binary compatible code. - But gcc's #include_next is not portable. Thus, once libiconv's iconv.h - has been installed in /usr/local/include, there is no way any more to - include the original /usr/include/iconv.h. We simply have to get away - without it. - Ad 1. The risk that a system header file does - #include "iconv.h" or #include_next "iconv.h" - is small. They all do #include . - Ad 2. The iconv_t type is a pointer type in all cases I have seen. (It - has to be a scalar type because (iconv_t)(-1) is a possible return value - from iconv_open().) */ - -/* Define iconv_t ourselves. */ -#undef iconv_t -#define iconv_t libiconv_t -typedef void* iconv_t; - -/* Get size_t declaration. - Get wchar_t declaration if it exists. */ -#include - -/* Get errno declaration and values. */ -#include -/* Some systems, like SunOS 4, don't have EILSEQ. Some systems, like BSD/OS, - have EILSEQ in a different header. On these systems, define EILSEQ - ourselves. */ -#ifndef EILSEQ -#define EILSEQ -#endif - - -#ifdef __cplusplus -extern "C" { -#endif - - -/* Allocates descriptor for code conversion from encoding ‘fromcode’ to - encoding ‘tocode’. */ -#ifndef LIBICONV_PLUG -#define iconv_open libiconv_open -#endif -extern LIBICONV_DLL_EXPORTED iconv_t iconv_open (const char* tocode, const char* fromcode); - -/* Converts, using conversion descriptor ‘cd’, at most ‘*inbytesleft’ bytes - starting at ‘*inbuf’, writing at most ‘*outbytesleft’ bytes starting at - ‘*outbuf’. - Decrements ‘*inbytesleft’ and increments ‘*inbuf’ by the same amount. - Decrements ‘*outbytesleft’ and increments ‘*outbuf’ by the same amount. */ -#ifndef LIBICONV_PLUG -#define iconv libiconv -#endif -extern LIBICONV_DLL_EXPORTED size_t iconv (iconv_t cd, char* * inbuf, size_t *inbytesleft, char* * outbuf, size_t *outbytesleft); - -/* Frees resources allocated for conversion descriptor ‘cd’. */ -#ifndef LIBICONV_PLUG -#define iconv_close libiconv_close -#endif -extern LIBICONV_DLL_EXPORTED int iconv_close (iconv_t cd); - - -#ifdef __cplusplus -} -#endif - - -#ifndef LIBICONV_PLUG - -/* Nonstandard extensions. */ - -#if 1 -#if 0 -/* Tru64 with Desktop Toolkit C has a bug: must be included before - . - BSD/OS 4.0.1 has a bug: , and must be - included before . */ -#include -#include -#include -#endif -#include -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -/* A type that holds all memory needed by a conversion descriptor. - A pointer to such an object can be used as an iconv_t. */ -typedef struct { - void* dummy1[28]; -#if 1 - mbstate_t dummy2; -#endif -} iconv_allocation_t; - -/* Allocates descriptor for code conversion from encoding ‘fromcode’ to - encoding ‘tocode’ into preallocated memory. Returns an error indicator - (0 or -1 with errno set). */ -#define iconv_open_into libiconv_open_into -extern LIBICONV_DLL_EXPORTED int iconv_open_into (const char* tocode, const char* fromcode, - iconv_allocation_t* resultp); - -/* Control of attributes. */ -#define iconvctl libiconvctl -extern LIBICONV_DLL_EXPORTED int iconvctl (iconv_t cd, int request, void* argument); - -/* Hook performed after every successful conversion of a Unicode character. */ -typedef void (*iconv_unicode_char_hook) (unsigned int uc, void* data); -/* Hook performed after every successful conversion of a wide character. */ -typedef void (*iconv_wide_char_hook) (wchar_t wc, void* data); -/* Set of hooks. */ -struct iconv_hooks { - iconv_unicode_char_hook uc_hook; - iconv_wide_char_hook wc_hook; - void* data; -}; - -/* Fallback function. Invoked when a small number of bytes could not be - converted to a Unicode character. This function should process all - bytes from inbuf and may produce replacement Unicode characters by calling - the write_replacement callback repeatedly. */ -typedef void (*iconv_unicode_mb_to_uc_fallback) - (const char* inbuf, size_t inbufsize, - void (*write_replacement) (const unsigned int *buf, size_t buflen, - void* callback_arg), - void* callback_arg, - void* data); -/* Fallback function. Invoked when a Unicode character could not be converted - to the target encoding. This function should process the character and - may produce replacement bytes (in the target encoding) by calling the - write_replacement callback repeatedly. */ -typedef void (*iconv_unicode_uc_to_mb_fallback) - (unsigned int code, - void (*write_replacement) (const char *buf, size_t buflen, - void* callback_arg), - void* callback_arg, - void* data); -#if 1 -/* Fallback function. Invoked when a number of bytes could not be converted to - a wide character. This function should process all bytes from inbuf and may - produce replacement wide characters by calling the write_replacement - callback repeatedly. */ -typedef void (*iconv_wchar_mb_to_wc_fallback) - (const char* inbuf, size_t inbufsize, - void (*write_replacement) (const wchar_t *buf, size_t buflen, - void* callback_arg), - void* callback_arg, - void* data); -/* Fallback function. Invoked when a wide character could not be converted to - the target encoding. This function should process the character and may - produce replacement bytes (in the target encoding) by calling the - write_replacement callback repeatedly. */ -typedef void (*iconv_wchar_wc_to_mb_fallback) - (wchar_t code, - void (*write_replacement) (const char *buf, size_t buflen, - void* callback_arg), - void* callback_arg, - void* data); -#else -/* If the wchar_t type does not exist, these two fallback functions are never - invoked. Their argument list therefore does not matter. */ -typedef void (*iconv_wchar_mb_to_wc_fallback) (); -typedef void (*iconv_wchar_wc_to_mb_fallback) (); -#endif -/* Set of fallbacks. */ -struct iconv_fallbacks { - iconv_unicode_mb_to_uc_fallback mb_to_uc_fallback; - iconv_unicode_uc_to_mb_fallback uc_to_mb_fallback; - iconv_wchar_mb_to_wc_fallback mb_to_wc_fallback; - iconv_wchar_wc_to_mb_fallback wc_to_mb_fallback; - void* data; -}; - -/* Requests for iconvctl. */ -#define ICONV_TRIVIALP 0 /* int *argument */ -#define ICONV_GET_TRANSLITERATE 1 /* int *argument */ -#define ICONV_SET_TRANSLITERATE 2 /* const int *argument */ -#define ICONV_GET_DISCARD_ILSEQ 3 /* int *argument */ -#define ICONV_SET_DISCARD_ILSEQ 4 /* const int *argument */ -#define ICONV_SET_HOOKS 5 /* const struct iconv_hooks *argument */ -#define ICONV_SET_FALLBACKS 6 /* const struct iconv_fallbacks *argument */ - -/* Listing of locale independent encodings. */ -#define iconvlist libiconvlist -extern LIBICONV_DLL_EXPORTED void iconvlist (int (*do_one) (unsigned int namescount, - const char * const * names, - void* data), - void* data); - -/* Canonicalize an encoding name. - The result is either a canonical encoding name, or name itself. */ -extern LIBICONV_DLL_EXPORTED const char * iconv_canonicalize (const char * name); - -/* Support for relocatable packages. */ - -/* Sets the original and the current installation prefix of the package. - Relocation simply replaces a pathname starting with the original prefix - by the corresponding pathname with the current prefix instead. Both - prefixes should be directory names without trailing slash (i.e. use "" - instead of "/"). */ -extern LIBICONV_DLL_EXPORTED void libiconv_set_relocation_prefix (const char *orig_prefix, - const char *curr_prefix); - -#ifdef __cplusplus -} -#endif - -#endif - - -#endif /* _LIBICONV_H */ diff --git a/repos/libports/src/lib/lwip/errno.patch b/repos/libports/src/lib/lwip/errno.patch index 4097b9a296..53891c4b74 100644 --- a/repos/libports/src/lib/lwip/errno.patch +++ b/repos/libports/src/lib/lwip/errno.patch @@ -1,5 +1,4 @@ ---- lwip-STABLE-1_4_1-RC1/src/include/lwip/arch.h.orig -+++ lwip-STABLE-1_4_1-RC1/src/include/lwip/arch.h ++++ src/lib/lwip/src/include/lwip/arch.h @@ -208,6 +208,12 @@ extern "C" { extern int errno; #endif diff --git a/repos/libports/src/lib/lwip/libc_select_notify.patch b/repos/libports/src/lib/lwip/libc_select_notify.patch index a5638368b1..c3984ac456 100644 --- a/repos/libports/src/lib/lwip/libc_select_notify.patch +++ b/repos/libports/src/lib/lwip/libc_select_notify.patch @@ -1,5 +1,4 @@ ---- lwip-STABLE-1_4_1-RC1/src/api/sockets.c.orig -+++ lwip-STABLE-1_4_1-RC1/src/api/sockets.c ++++ src/lib/lwip/src/api/sockets.c @@ -171,6 +171,9 @@ static const int err_to_errno_table[] = { set_errno(sk->err); \ } while (0) diff --git a/repos/libports/src/lib/lwip/sockets_c_errno.patch b/repos/libports/src/lib/lwip/sockets_c_errno.patch index 46c5e7b5fe..8e2b17bae6 100644 --- a/repos/libports/src/lib/lwip/sockets_c_errno.patch +++ b/repos/libports/src/lib/lwip/sockets_c_errno.patch @@ -3,8 +3,7 @@ connection is established but never EISCONN. So most programs will fail to connect because they at one point while connecting expect to get EISCONN. ---- lwip-STABLE-1_4_1-RC1/src/api/sockets.c.orig -+++ lwip-STABLE-1_4_1-RC1/src/api/sockets.c ++++ src/lib/lwip/src/api/sockets.c @@ -142,7 +142,7 @@ static const int err_to_errno_table[] = { EINVAL, /* ERR_VAL -6 Illegal value. */ EWOULDBLOCK, /* ERR_WOULDBLOCK -7 Operation would block. */ diff --git a/repos/libports/src/lib/lwip/sol_socket_definition.patch b/repos/libports/src/lib/lwip/sol_socket_definition.patch index a20129fa09..c53d78dd08 100644 --- a/repos/libports/src/lib/lwip/sol_socket_definition.patch +++ b/repos/libports/src/lib/lwip/sol_socket_definition.patch @@ -2,8 +2,7 @@ Our FreeBSD libc based libc defines SOL_SOCKET as 0xffff. We change lwip's definition from 0xfff to match ours. This prevents us from converting the level when we call {g,s}etsockopt. ---- lwip-STABLE-1_4_1-RC1/src/include/lwip/sockets.h.orig -+++ lwip-STABLE-1_4_1-RC1/src/include/lwip/sockets.h ++++ src/lib/lwip/src/include/lwip/sockets.h @@ -115,7 +115,7 @@ struct linger { /* * Level number for (get/set)sockopt() to apply to socket itself. diff --git a/repos/libports/src/lib/ntfs-3g/ntfs-3g.c.patch b/repos/libports/src/lib/ntfs-3g/ntfs-3g.c.patch index 7b9a14c453..b0a6dbe8a3 100644 --- a/repos/libports/src/lib/ntfs-3g/ntfs-3g.c.patch +++ b/repos/libports/src/lib/ntfs-3g/ntfs-3g.c.patch @@ -1,5 +1,4 @@ ---- contrib/ntfs-3g_ntfsprogs-2013.1.13/src/ntfs-3g.c.orig 2013-12-10 16:16:48.000000000 +0100 -+++ contrib/ntfs-3g_ntfsprogs-2013.1.13/src/ntfs-3g.c 2013-12-10 16:19:05.040371689 +0100 ++++ src/lib/ntfs-3g/src/ntfs-3g.c @@ -151,6 +151,11 @@ static ntfs_fuse_context_t *ctx; static u32 ntfs_sequence; diff --git a/repos/libports/src/lib/pcre/include/pcre.h b/repos/libports/src/lib/pcre/include/pcre.h deleted file mode 100644 index 712bd3d714..0000000000 --- a/repos/libports/src/lib/pcre/include/pcre.h +++ /dev/null @@ -1,503 +0,0 @@ -/************************************************* -* Perl-Compatible Regular Expressions * -*************************************************/ - -/* This is the public header file for the PCRE library, to be #included by -applications that call the PCRE functions. - - Copyright (c) 1997-2012 University of Cambridge - ------------------------------------------------------------------------------ -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - * Neither the name of the University of Cambridge nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. ------------------------------------------------------------------------------ -*/ - -#ifndef _PCRE_H -#define _PCRE_H - -/* The current PCRE version information. */ - -#define PCRE_MAJOR 8 -#define PCRE_MINOR 30 -#define PCRE_PRERELEASE -#define PCRE_DATE 2012-02-04 - -/* When an application links to a PCRE DLL in Windows, the symbols that are -imported have to be identified as such. When building PCRE, the appropriate -export setting is defined in pcre_internal.h, which includes this file. So we -don't change existing definitions of PCRE_EXP_DECL and PCRECPP_EXP_DECL. */ - -#if defined(_WIN32) && !defined(PCRE_STATIC) -# ifndef PCRE_EXP_DECL -# define PCRE_EXP_DECL extern __declspec(dllimport) -# endif -# ifdef __cplusplus -# ifndef PCRECPP_EXP_DECL -# define PCRECPP_EXP_DECL extern __declspec(dllimport) -# endif -# ifndef PCRECPP_EXP_DEFN -# define PCRECPP_EXP_DEFN __declspec(dllimport) -# endif -# endif -#endif - -/* By default, we use the standard "extern" declarations. */ - -#ifndef PCRE_EXP_DECL -# ifdef __cplusplus -# define PCRE_EXP_DECL extern "C" -# else -# define PCRE_EXP_DECL extern -# endif -#endif - -#ifdef __cplusplus -# ifndef PCRECPP_EXP_DECL -# define PCRECPP_EXP_DECL extern -# endif -# ifndef PCRECPP_EXP_DEFN -# define PCRECPP_EXP_DEFN -# endif -#endif - -/* Have to include stdlib.h in order to ensure that size_t is defined; -it is needed here for malloc. */ - -#include - -/* Allow for C++ users */ - -#ifdef __cplusplus -extern "C" { -#endif - -/* Options. Some are compile-time only, some are run-time only, and some are -both, so we keep them all distinct. However, almost all the bits in the options -word are now used. In the long run, we may have to re-use some of the -compile-time only bits for runtime options, or vice versa. In the comments -below, "compile", "exec", and "DFA exec" mean that the option is permitted to -be set for those functions; "used in" means that an option may be set only for -compile, but is subsequently referenced in exec and/or DFA exec. Any of the -compile-time options may be inspected during studying (and therefore JIT -compiling). */ - -#define PCRE_CASELESS 0x00000001 /* Compile */ -#define PCRE_MULTILINE 0x00000002 /* Compile */ -#define PCRE_DOTALL 0x00000004 /* Compile */ -#define PCRE_EXTENDED 0x00000008 /* Compile */ -#define PCRE_ANCHORED 0x00000010 /* Compile, exec, DFA exec */ -#define PCRE_DOLLAR_ENDONLY 0x00000020 /* Compile, used in exec, DFA exec */ -#define PCRE_EXTRA 0x00000040 /* Compile */ -#define PCRE_NOTBOL 0x00000080 /* Exec, DFA exec */ -#define PCRE_NOTEOL 0x00000100 /* Exec, DFA exec */ -#define PCRE_UNGREEDY 0x00000200 /* Compile */ -#define PCRE_NOTEMPTY 0x00000400 /* Exec, DFA exec */ -/* The next two are also used in exec and DFA exec */ -#define PCRE_UTF8 0x00000800 /* Compile (same as PCRE_UTF16) */ -#define PCRE_UTF16 0x00000800 /* Compile (same as PCRE_UTF8) */ -#define PCRE_NO_AUTO_CAPTURE 0x00001000 /* Compile */ -/* The next two are also used in exec and DFA exec */ -#define PCRE_NO_UTF8_CHECK 0x00002000 /* Compile (same as PCRE_NO_UTF16_CHECK) */ -#define PCRE_NO_UTF16_CHECK 0x00002000 /* Compile (same as PCRE_NO_UTF8_CHECK) */ -#define PCRE_AUTO_CALLOUT 0x00004000 /* Compile */ -#define PCRE_PARTIAL_SOFT 0x00008000 /* Exec, DFA exec */ -#define PCRE_PARTIAL 0x00008000 /* Backwards compatible synonym */ -#define PCRE_DFA_SHORTEST 0x00010000 /* DFA exec */ -#define PCRE_DFA_RESTART 0x00020000 /* DFA exec */ -#define PCRE_FIRSTLINE 0x00040000 /* Compile, used in exec, DFA exec */ -#define PCRE_DUPNAMES 0x00080000 /* Compile */ -#define PCRE_NEWLINE_CR 0x00100000 /* Compile, exec, DFA exec */ -#define PCRE_NEWLINE_LF 0x00200000 /* Compile, exec, DFA exec */ -#define PCRE_NEWLINE_CRLF 0x00300000 /* Compile, exec, DFA exec */ -#define PCRE_NEWLINE_ANY 0x00400000 /* Compile, exec, DFA exec */ -#define PCRE_NEWLINE_ANYCRLF 0x00500000 /* Compile, exec, DFA exec */ -#define PCRE_BSR_ANYCRLF 0x00800000 /* Compile, exec, DFA exec */ -#define PCRE_BSR_UNICODE 0x01000000 /* Compile, exec, DFA exec */ -#define PCRE_JAVASCRIPT_COMPAT 0x02000000 /* Compile, used in exec */ -#define PCRE_NO_START_OPTIMIZE 0x04000000 /* Compile, exec, DFA exec */ -#define PCRE_NO_START_OPTIMISE 0x04000000 /* Synonym */ -#define PCRE_PARTIAL_HARD 0x08000000 /* Exec, DFA exec */ -#define PCRE_NOTEMPTY_ATSTART 0x10000000 /* Exec, DFA exec */ -#define PCRE_UCP 0x20000000 /* Compile, used in exec, DFA exec */ - -/* Exec-time and get/set-time error codes */ - -#define PCRE_ERROR_NOMATCH (-1) -#define PCRE_ERROR_NULL (-2) -#define PCRE_ERROR_BADOPTION (-3) -#define PCRE_ERROR_BADMAGIC (-4) -#define PCRE_ERROR_UNKNOWN_OPCODE (-5) -#define PCRE_ERROR_UNKNOWN_NODE (-5) /* For backward compatibility */ -#define PCRE_ERROR_NOMEMORY (-6) -#define PCRE_ERROR_NOSUBSTRING (-7) -#define PCRE_ERROR_MATCHLIMIT (-8) -#define PCRE_ERROR_CALLOUT (-9) /* Never used by PCRE itself */ -#define PCRE_ERROR_BADUTF8 (-10) /* Same for 8/16 */ -#define PCRE_ERROR_BADUTF16 (-10) /* Same for 8/16 */ -#define PCRE_ERROR_BADUTF8_OFFSET (-11) /* Same for 8/16 */ -#define PCRE_ERROR_BADUTF16_OFFSET (-11) /* Same for 8/16 */ -#define PCRE_ERROR_PARTIAL (-12) -#define PCRE_ERROR_BADPARTIAL (-13) -#define PCRE_ERROR_INTERNAL (-14) -#define PCRE_ERROR_BADCOUNT (-15) -#define PCRE_ERROR_DFA_UITEM (-16) -#define PCRE_ERROR_DFA_UCOND (-17) -#define PCRE_ERROR_DFA_UMLIMIT (-18) -#define PCRE_ERROR_DFA_WSSIZE (-19) -#define PCRE_ERROR_DFA_RECURSE (-20) -#define PCRE_ERROR_RECURSIONLIMIT (-21) -#define PCRE_ERROR_NULLWSLIMIT (-22) /* No longer actually used */ -#define PCRE_ERROR_BADNEWLINE (-23) -#define PCRE_ERROR_BADOFFSET (-24) -#define PCRE_ERROR_SHORTUTF8 (-25) -#define PCRE_ERROR_SHORTUTF16 (-25) /* Same for 8/16 */ -#define PCRE_ERROR_RECURSELOOP (-26) -#define PCRE_ERROR_JIT_STACKLIMIT (-27) -#define PCRE_ERROR_BADMODE (-28) -#define PCRE_ERROR_BADENDIANNESS (-29) - -/* Specific error codes for UTF-8 validity checks */ - -#define PCRE_UTF8_ERR0 0 -#define PCRE_UTF8_ERR1 1 -#define PCRE_UTF8_ERR2 2 -#define PCRE_UTF8_ERR3 3 -#define PCRE_UTF8_ERR4 4 -#define PCRE_UTF8_ERR5 5 -#define PCRE_UTF8_ERR6 6 -#define PCRE_UTF8_ERR7 7 -#define PCRE_UTF8_ERR8 8 -#define PCRE_UTF8_ERR9 9 -#define PCRE_UTF8_ERR10 10 -#define PCRE_UTF8_ERR11 11 -#define PCRE_UTF8_ERR12 12 -#define PCRE_UTF8_ERR13 13 -#define PCRE_UTF8_ERR14 14 -#define PCRE_UTF8_ERR15 15 -#define PCRE_UTF8_ERR16 16 -#define PCRE_UTF8_ERR17 17 -#define PCRE_UTF8_ERR18 18 -#define PCRE_UTF8_ERR19 19 -#define PCRE_UTF8_ERR20 20 -#define PCRE_UTF8_ERR21 21 - -/* Specific error codes for UTF-16 validity checks */ - -#define PCRE_UTF16_ERR0 0 -#define PCRE_UTF16_ERR1 1 -#define PCRE_UTF16_ERR2 2 -#define PCRE_UTF16_ERR3 3 -#define PCRE_UTF16_ERR4 4 - -/* Request types for pcre_fullinfo() */ - -#define PCRE_INFO_OPTIONS 0 -#define PCRE_INFO_SIZE 1 -#define PCRE_INFO_CAPTURECOUNT 2 -#define PCRE_INFO_BACKREFMAX 3 -#define PCRE_INFO_FIRSTBYTE 4 -#define PCRE_INFO_FIRSTCHAR 4 /* For backwards compatibility */ -#define PCRE_INFO_FIRSTTABLE 5 -#define PCRE_INFO_LASTLITERAL 6 -#define PCRE_INFO_NAMEENTRYSIZE 7 -#define PCRE_INFO_NAMECOUNT 8 -#define PCRE_INFO_NAMETABLE 9 -#define PCRE_INFO_STUDYSIZE 10 -#define PCRE_INFO_DEFAULT_TABLES 11 -#define PCRE_INFO_OKPARTIAL 12 -#define PCRE_INFO_JCHANGED 13 -#define PCRE_INFO_HASCRORLF 14 -#define PCRE_INFO_MINLENGTH 15 -#define PCRE_INFO_JIT 16 -#define PCRE_INFO_JITSIZE 17 - -/* Request types for pcre_config(). Do not re-arrange, in order to remain -compatible. */ - -#define PCRE_CONFIG_UTF8 0 -#define PCRE_CONFIG_NEWLINE 1 -#define PCRE_CONFIG_LINK_SIZE 2 -#define PCRE_CONFIG_POSIX_MALLOC_THRESHOLD 3 -#define PCRE_CONFIG_MATCH_LIMIT 4 -#define PCRE_CONFIG_STACKRECURSE 5 -#define PCRE_CONFIG_UNICODE_PROPERTIES 6 -#define PCRE_CONFIG_MATCH_LIMIT_RECURSION 7 -#define PCRE_CONFIG_BSR 8 -#define PCRE_CONFIG_JIT 9 -#define PCRE_CONFIG_UTF16 10 -#define PCRE_CONFIG_JITTARGET 11 - -/* Request types for pcre_study(). Do not re-arrange, in order to remain -compatible. */ - -#define PCRE_STUDY_JIT_COMPILE 0x0001 - -/* Bit flags for the pcre[16]_extra structure. Do not re-arrange or redefine -these bits, just add new ones on the end, in order to remain compatible. */ - -#define PCRE_EXTRA_STUDY_DATA 0x0001 -#define PCRE_EXTRA_MATCH_LIMIT 0x0002 -#define PCRE_EXTRA_CALLOUT_DATA 0x0004 -#define PCRE_EXTRA_TABLES 0x0008 -#define PCRE_EXTRA_MATCH_LIMIT_RECURSION 0x0010 -#define PCRE_EXTRA_MARK 0x0020 -#define PCRE_EXTRA_EXECUTABLE_JIT 0x0040 - -/* Types */ - -struct real_pcre; /* declaration; the definition is private */ -typedef struct real_pcre pcre; - -struct real_pcre16; /* declaration; the definition is private */ -typedef struct real_pcre16 pcre16; - -struct real_pcre_jit_stack; /* declaration; the definition is private */ -typedef struct real_pcre_jit_stack pcre_jit_stack; - -struct real_pcre16_jit_stack; /* declaration; the definition is private */ -typedef struct real_pcre16_jit_stack pcre16_jit_stack; - -/* If PCRE is compiled with 16 bit character support, PCRE_UCHAR16 must contain -a 16 bit wide signed data type. Otherwise it can be a dummy data type since -pcre16 functions are not implemented. There is a check for this in pcre_internal.h. */ -#ifndef PCRE_UCHAR16 -#define PCRE_UCHAR16 unsigned short -#endif - -#ifndef PCRE_SPTR16 -#define PCRE_SPTR16 const PCRE_UCHAR16 * -#endif - -/* When PCRE is compiled as a C++ library, the subject pointer type can be -replaced with a custom type. For conventional use, the public interface is a -const char *. */ - -#ifndef PCRE_SPTR -#define PCRE_SPTR const char * -#endif - -/* The structure for passing additional data to pcre_exec(). This is defined in -such as way as to be extensible. Always add new fields at the end, in order to -remain compatible. */ - -typedef struct pcre_extra { - unsigned long int flags; /* Bits for which fields are set */ - void *study_data; /* Opaque data from pcre_study() */ - unsigned long int match_limit; /* Maximum number of calls to match() */ - void *callout_data; /* Data passed back in callouts */ - const unsigned char *tables; /* Pointer to character tables */ - unsigned long int match_limit_recursion; /* Max recursive calls to match() */ - unsigned char **mark; /* For passing back a mark pointer */ - void *executable_jit; /* Contains a pointer to a compiled jit code */ -} pcre_extra; - -/* Same structure as above, but with 16 bit char pointers. */ - -typedef struct pcre16_extra { - unsigned long int flags; /* Bits for which fields are set */ - void *study_data; /* Opaque data from pcre_study() */ - unsigned long int match_limit; /* Maximum number of calls to match() */ - void *callout_data; /* Data passed back in callouts */ - const unsigned char *tables; /* Pointer to character tables */ - unsigned long int match_limit_recursion; /* Max recursive calls to match() */ - PCRE_UCHAR16 **mark; /* For passing back a mark pointer */ - void *executable_jit; /* Contains a pointer to a compiled jit code */ -} pcre16_extra; - -/* The structure for passing out data via the pcre_callout_function. We use a -structure so that new fields can be added on the end in future versions, -without changing the API of the function, thereby allowing old clients to work -without modification. */ - -typedef struct pcre_callout_block { - int version; /* Identifies version of block */ - /* ------------------------ Version 0 ------------------------------- */ - int callout_number; /* Number compiled into pattern */ - int *offset_vector; /* The offset vector */ - PCRE_SPTR subject; /* The subject being matched */ - int subject_length; /* The length of the subject */ - int start_match; /* Offset to start of this match attempt */ - int current_position; /* Where we currently are in the subject */ - int capture_top; /* Max current capture */ - int capture_last; /* Most recently closed capture */ - void *callout_data; /* Data passed in with the call */ - /* ------------------- Added for Version 1 -------------------------- */ - int pattern_position; /* Offset to next item in the pattern */ - int next_item_length; /* Length of next item in the pattern */ - /* ------------------- Added for Version 2 -------------------------- */ - const unsigned char *mark; /* Pointer to current mark or NULL */ - /* ------------------------------------------------------------------ */ -} pcre_callout_block; - -/* Same structure as above, but with 16 bit char pointers. */ - -typedef struct pcre16_callout_block { - int version; /* Identifies version of block */ - /* ------------------------ Version 0 ------------------------------- */ - int callout_number; /* Number compiled into pattern */ - int *offset_vector; /* The offset vector */ - PCRE_SPTR16 subject; /* The subject being matched */ - int subject_length; /* The length of the subject */ - int start_match; /* Offset to start of this match attempt */ - int current_position; /* Where we currently are in the subject */ - int capture_top; /* Max current capture */ - int capture_last; /* Most recently closed capture */ - void *callout_data; /* Data passed in with the call */ - /* ------------------- Added for Version 1 -------------------------- */ - int pattern_position; /* Offset to next item in the pattern */ - int next_item_length; /* Length of next item in the pattern */ - /* ------------------- Added for Version 2 -------------------------- */ - const PCRE_UCHAR16 *mark; /* Pointer to current mark or NULL */ - /* ------------------------------------------------------------------ */ -} pcre16_callout_block; - -/* Indirection for store get and free functions. These can be set to -alternative malloc/free functions if required. Special ones are used in the -non-recursive case for "frames". There is also an optional callout function -that is triggered by the (?) regex item. For Virtual Pascal, these definitions -have to take another form. */ - -#ifndef VPCOMPAT -PCRE_EXP_DECL void *(*pcre_malloc)(size_t); -PCRE_EXP_DECL void (*pcre_free)(void *); -PCRE_EXP_DECL void *(*pcre_stack_malloc)(size_t); -PCRE_EXP_DECL void (*pcre_stack_free)(void *); -PCRE_EXP_DECL int (*pcre_callout)(pcre_callout_block *); - -PCRE_EXP_DECL void *(*pcre16_malloc)(size_t); -PCRE_EXP_DECL void (*pcre16_free)(void *); -PCRE_EXP_DECL void *(*pcre16_stack_malloc)(size_t); -PCRE_EXP_DECL void (*pcre16_stack_free)(void *); -PCRE_EXP_DECL int (*pcre16_callout)(pcre16_callout_block *); -#else /* VPCOMPAT */ -PCRE_EXP_DECL void *pcre_malloc(size_t); -PCRE_EXP_DECL void pcre_free(void *); -PCRE_EXP_DECL void *pcre_stack_malloc(size_t); -PCRE_EXP_DECL void pcre_stack_free(void *); -PCRE_EXP_DECL int pcre_callout(pcre_callout_block *); - -PCRE_EXP_DECL void *pcre16_malloc(size_t); -PCRE_EXP_DECL void pcre16_free(void *); -PCRE_EXP_DECL void *pcre16_stack_malloc(size_t); -PCRE_EXP_DECL void pcre16_stack_free(void *); -PCRE_EXP_DECL int pcre16_callout(pcre16_callout_block *); -#endif /* VPCOMPAT */ - -/* User defined callback which provides a stack just before the match starts. */ - -typedef pcre_jit_stack *(*pcre_jit_callback)(void *); -typedef pcre16_jit_stack *(*pcre16_jit_callback)(void *); - -/* Exported PCRE functions */ - -PCRE_EXP_DECL pcre *pcre_compile(const char *, int, const char **, int *, - const unsigned char *); -PCRE_EXP_DECL pcre16 *pcre16_compile(PCRE_SPTR16, int, const char **, int *, - const unsigned char *); -PCRE_EXP_DECL pcre *pcre_compile2(const char *, int, int *, const char **, - int *, const unsigned char *); -PCRE_EXP_DECL pcre16 *pcre16_compile2(PCRE_SPTR16, int, int *, const char **, - int *, const unsigned char *); -PCRE_EXP_DECL int pcre_config(int, void *); -PCRE_EXP_DECL int pcre16_config(int, void *); -PCRE_EXP_DECL int pcre_copy_named_substring(const pcre *, const char *, - int *, int, const char *, char *, int); -PCRE_EXP_DECL int pcre16_copy_named_substring(const pcre16 *, PCRE_SPTR16, - int *, int, PCRE_SPTR16, PCRE_UCHAR16 *, int); -PCRE_EXP_DECL int pcre_copy_substring(const char *, int *, int, int, - char *, int); -PCRE_EXP_DECL int pcre16_copy_substring(PCRE_SPTR16, int *, int, int, - PCRE_UCHAR16 *, int); -PCRE_EXP_DECL int pcre_dfa_exec(const pcre *, const pcre_extra *, - const char *, int, int, int, int *, int , int *, int); -PCRE_EXP_DECL int pcre16_dfa_exec(const pcre16 *, const pcre16_extra *, - PCRE_SPTR16, int, int, int, int *, int , int *, int); -PCRE_EXP_DECL int pcre_exec(const pcre *, const pcre_extra *, PCRE_SPTR, - int, int, int, int *, int); -PCRE_EXP_DECL int pcre16_exec(const pcre16 *, const pcre16_extra *, - PCRE_SPTR16, int, int, int, int *, int); -PCRE_EXP_DECL void pcre_free_substring(const char *); -PCRE_EXP_DECL void pcre16_free_substring(PCRE_SPTR16); -PCRE_EXP_DECL void pcre_free_substring_list(const char **); -PCRE_EXP_DECL void pcre16_free_substring_list(PCRE_SPTR16 *); -PCRE_EXP_DECL int pcre_fullinfo(const pcre *, const pcre_extra *, int, - void *); -PCRE_EXP_DECL int pcre16_fullinfo(const pcre16 *, const pcre16_extra *, int, - void *); -PCRE_EXP_DECL int pcre_get_named_substring(const pcre *, const char *, - int *, int, const char *, const char **); -PCRE_EXP_DECL int pcre16_get_named_substring(const pcre16 *, PCRE_SPTR16, - int *, int, PCRE_SPTR16, PCRE_SPTR16 *); -PCRE_EXP_DECL int pcre_get_stringnumber(const pcre *, const char *); -PCRE_EXP_DECL int pcre16_get_stringnumber(const pcre16 *, PCRE_SPTR16); -PCRE_EXP_DECL int pcre_get_stringtable_entries(const pcre *, const char *, - char **, char **); -PCRE_EXP_DECL int pcre16_get_stringtable_entries(const pcre16 *, PCRE_SPTR16, - PCRE_UCHAR16 **, PCRE_UCHAR16 **); -PCRE_EXP_DECL int pcre_get_substring(const char *, int *, int, int, - const char **); -PCRE_EXP_DECL int pcre16_get_substring(PCRE_SPTR16, int *, int, int, - PCRE_SPTR16 *); -PCRE_EXP_DECL int pcre_get_substring_list(const char *, int *, int, - const char ***); -PCRE_EXP_DECL int pcre16_get_substring_list(PCRE_SPTR16, int *, int, - PCRE_SPTR16 **); -PCRE_EXP_DECL const unsigned char *pcre_maketables(void); -PCRE_EXP_DECL const unsigned char *pcre16_maketables(void); -PCRE_EXP_DECL int pcre_refcount(pcre *, int); -PCRE_EXP_DECL int pcre16_refcount(pcre16 *, int); -PCRE_EXP_DECL pcre_extra *pcre_study(const pcre *, int, const char **); -PCRE_EXP_DECL pcre16_extra *pcre16_study(const pcre16 *, int, const char **); -PCRE_EXP_DECL void pcre_free_study(pcre_extra *); -PCRE_EXP_DECL void pcre16_free_study(pcre16_extra *); -PCRE_EXP_DECL const char *pcre_version(void); -PCRE_EXP_DECL const char *pcre16_version(void); - -/* Utility functions for byte order swaps. */ -PCRE_EXP_DECL int pcre_pattern_to_host_byte_order(pcre *, pcre_extra *, - const unsigned char *); -PCRE_EXP_DECL int pcre16_pattern_to_host_byte_order(pcre16 *, pcre16_extra *, - const unsigned char *); -PCRE_EXP_DECL int pcre16_utf16_to_host_byte_order(PCRE_UCHAR16 *, - PCRE_SPTR16, int, int *, int); - -/* JIT compiler related functions. */ - -PCRE_EXP_DECL pcre_jit_stack *pcre_jit_stack_alloc(int, int); -PCRE_EXP_DECL pcre16_jit_stack *pcre16_jit_stack_alloc(int, int); -PCRE_EXP_DECL void pcre_jit_stack_free(pcre_jit_stack *); -PCRE_EXP_DECL void pcre16_jit_stack_free(pcre16_jit_stack *); -PCRE_EXP_DECL void pcre_assign_jit_stack(pcre_extra *, - pcre_jit_callback, void *); -PCRE_EXP_DECL void pcre16_assign_jit_stack(pcre16_extra *, - pcre16_jit_callback, void *); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* End of pcre.h */ diff --git a/repos/libports/src/lib/python/posixmodule.patch b/repos/libports/src/lib/python/posixmodule.patch index c8a584186b..002fbd7164 100644 --- a/repos/libports/src/lib/python/posixmodule.patch +++ b/repos/libports/src/lib/python/posixmodule.patch @@ -1,6 +1,4 @@ -diff -r 4395e7e35ad9 Modules/posixmodule.c ---- contrib/python-2.6.4/Modules/posixmodule.c Tue Jan 26 17:04:11 2010 +0100 -+++ contrib/python-2.6.4/Modules/posixmodule.c Wed Feb 17 18:30:10 2010 +0100 ++++ src/lib/python/Modules/posixmodule.c @@ -135,16 +135,16 @@ /* Everything needed is defined in PC/os2emx/pyconfig.h or vms/pyconfig.h */ #else /* all other compilers */ diff --git a/repos/libports/src/lib/sdl/SDL_audio.patch b/repos/libports/src/lib/sdl/SDL_audio.patch index 58b0ca6d5d..8f9079936f 100644 --- a/repos/libports/src/lib/sdl/SDL_audio.patch +++ b/repos/libports/src/lib/sdl/SDL_audio.patch @@ -1,6 +1,4 @@ -diff --git a/src/audio/SDL_audio.c b/src/audio/SDL_audio.c ---- a/src/audio/SDL_audio.c -+++ b/src/audio/SDL_audio.c ++++ src/lib/sdl/src/audio/SDL_audio.c @@ -113,6 +113,9 @@ #if SDL_AUDIO_DRIVER_EPOCAUDIO &EPOCAudio_bootstrap, @@ -11,9 +9,7 @@ diff --git a/src/audio/SDL_audio.c b/src/audio/SDL_audio.c NULL }; SDL_AudioDevice *current_audio = NULL; -diff --git a/src/audio/SDL_sysaudio.h b/src/audio/SDL_sysaudio.h ---- a/src/audio/SDL_sysaudio.h -+++ b/src/audio/SDL_sysaudio.h ++++ src/lib/sdl/src/audio/SDL_sysaudio.h @@ -177,6 +177,9 @@ #if SDL_AUDIO_DRIVER_EPOCAUDIO extern AudioBootStrap EPOCAudio_bootstrap; diff --git a/repos/libports/src/lib/sdl/SDL_video.patch b/repos/libports/src/lib/sdl/SDL_video.patch index 648ac46d23..16cad3b8ac 100644 --- a/repos/libports/src/lib/sdl/SDL_video.patch +++ b/repos/libports/src/lib/sdl/SDL_video.patch @@ -1,5 +1,4 @@ ---- contrib/SDL-1.2.13/src/video/SDL_video.c 2007-12-31 05:48:14.000000000 +0100 -+++ contrib/SDL-1.2.13/src/video/SDL_video.c 2010-04-15 20:57:54.000000000 +0200 ++++ src/lib/sdl/src/video/SDL_video.c @@ -28,8 +28,8 @@ #include "SDL_blit.h" #include "SDL_pixels_c.h" @@ -21,8 +20,7 @@ #if SDL_VIDEO_DRIVER_DUMMY &DUMMY_bootstrap, #endif ---- contrib/SDL-1.2.13/src/video/SDL_sysvideo.h 2007-12-31 05:48:14.000000000 +0100 -+++ contrib/SDL-1.2.13/src/video/SDL_sysvideo.h 2010-04-15 20:57:54.000000000 +0200 ++++ src/lib/sdl/src/video/SDL_sysvideo.h @@ -404,6 +404,9 @@ #if SDL_VIDEO_DRIVER_AALIB extern VideoBootStrap AALIB_bootstrap; diff --git a/repos/libports/src/lib/sdl_net/SDL_net.h.patch b/repos/libports/src/lib/sdl_net/SDL_net.h.patch index 14d605497a..bdc7407606 100644 --- a/repos/libports/src/lib/sdl_net/SDL_net.h.patch +++ b/repos/libports/src/lib/sdl_net/SDL_net.h.patch @@ -1,5 +1,4 @@ ---- contrib/SDL_net-1.2.8/SDL_net.h.orig 2013-10-30 15:17:11.391825241 +0100 -+++ contrib/SDL_net-1.2.8/SDL_net.h 2013-10-30 15:17:55.108447538 +0100 ++++ src/lib/sdl_net/SDL_net.h @@ -350,6 +350,13 @@ extern no_parse_DECLSPEC char * SDLCALL SDLNet_GetError(void); */ diff --git a/repos/libports/src/lib/sdl_net/SDLnet.patch b/repos/libports/src/lib/sdl_net/SDLnet.patch index ec1efbe143..e7a419896e 100644 --- a/repos/libports/src/lib/sdl_net/SDLnet.patch +++ b/repos/libports/src/lib/sdl_net/SDLnet.patch @@ -1,5 +1,4 @@ ---- contrib/SDL_net-1.2.8/SDLnet.c.orig 2013-10-22 23:17:40.135873087 +0200 -+++ contrib/SDL_net-1.2.8/SDLnet.c 2013-10-22 23:28:28.845485683 +0200 ++++ src/lib/sdl_net/SDLnet.c @@ -122,11 +122,11 @@ } else { address->host = inet_addr(host); diff --git a/repos/libports/src/server/fuse_fs/exfat/target.mk b/repos/libports/src/server/fuse_fs/exfat/target.mk index 33f4389619..87ac848e1d 100644 --- a/repos/libports/src/server/fuse_fs/exfat/target.mk +++ b/repos/libports/src/server/fuse_fs/exfat/target.mk @@ -1,9 +1,8 @@ -include $(REP_DIR)/ports/exfat.inc -EXFAT_DIR = $(REP_DIR)/contrib/$(EXFAT) +EXFAT_DIR := $(call select_from_ports,exfat)/src/lib/exfat TARGET = exfat_fuse_fs -SRC_C = $(notdir $(EXFAT_DIR)/fuse/main.c) +SRC_C = $(notdir $(EXFAT_DIR)/fuse/main.c) SRC_CC = fuse_fs_main.cc \ init.cc diff --git a/repos/libports/src/server/fuse_fs/ext2/target.mk b/repos/libports/src/server/fuse_fs/ext2/target.mk index 54a7d1924c..c7d96bf2a5 100644 --- a/repos/libports/src/server/fuse_fs/ext2/target.mk +++ b/repos/libports/src/server/fuse_fs/ext2/target.mk @@ -1,5 +1,4 @@ -include $(REP_DIR)/ports/fuse-ext2.inc -FUSE_EXT2_DIR = $(REP_DIR)/contrib/$(FUSE_EXT2)/fuse-ext2 +FUSE_EXT2_DIR = $(call select_from_ports,fuse-ext2)/src/lib/fuse-ext2/fuse-ext2 TARGET = ext2_fuse_fs diff --git a/repos/libports/src/server/fuse_fs/ntfs-3g/target.mk b/repos/libports/src/server/fuse_fs/ntfs-3g/target.mk index 86b254bb53..93ca75b262 100644 --- a/repos/libports/src/server/fuse_fs/ntfs-3g/target.mk +++ b/repos/libports/src/server/fuse_fs/ntfs-3g/target.mk @@ -1,19 +1,19 @@ -include $(REP_DIR)/ports/ntfs-3g.inc -NTFS_3G_DIR = $(REP_DIR)/contrib/$(NTFS_3G) +NTFS_3G_DIR := $(call select_from_ports,ntfs-3g)/src/lib/ntfs-3g -TARGET = ntfs-3g_fuse_fs +TARGET := ntfs-3g_fuse_fs -SRC_C = ntfs-3g.c ntfs-3g_common.c -SRC_CC = fuse_fs_main.cc \ +SRC_C := ntfs-3g.c ntfs-3g_common.c +SRC_CC := fuse_fs_main.cc \ init.cc -LIBS = base config server libc libfuse libntfs-3g +LIBS := base config server libc libfuse libntfs-3g -CC_OPT = -DHAVE_TIMESPEC -DHAVE_CONFIG_H -DRECORD_LOCKING_NOT_IMPLEMENTED +CC_OPT := -DHAVE_TIMESPEC -DHAVE_CONFIG_H -DRECORD_LOCKING_NOT_IMPLEMENTED INC_DIR += $(PRG_DIR)/.. INC_DIR += $(REP_DIR)/src/lib/ntfs-3g \ + $(NTFS_3G_DIR)/src \ $(REP_DIR)/contrib/$(NTFS_3G)/src vpath %.c $(NTFS_3G_DIR)/src diff --git a/repos/libports/src/test/qt5/qpluginwidget/target.mk b/repos/libports/src/test/qt5/qpluginwidget/target.mk index f5525212da..f4f8bd6561 100644 --- a/repos/libports/src/test/qt5/qpluginwidget/target.mk +++ b/repos/libports/src/test/qt5/qpluginwidget/target.mk @@ -6,7 +6,7 @@ include $(QT5_REP_DIR)/src/app/qt5/tmpl/target_defaults.inc include $(QT5_REP_DIR)/src/app/qt5/tmpl/target_final.inc -LIBS += qt5_qpluginwidget qt5_network +LIBS += qt5_qpluginwidget qt5_network qoost $(TARGET): test-plugin.tar diff --git a/repos/libports/tool/mesa/Makefile b/repos/libports/tool/mesa/Makefile deleted file mode 100644 index 59787a22d7..0000000000 --- a/repos/libports/tool/mesa/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -MESA = Mesa-7.8.1 -MESA_DIR = ../../contrib/$(MESA) -SRC_C := $(wildcard $(MESA_DIR)/src/glsl/pp/*.c) \ - $(wildcard $(MESA_DIR)/src/glsl/cl/*.c) \ - $(MESA_DIR)/src/glsl/apps/compile.c - -CFLAGS = -I$(MESA_DIR)/glsl/pp -I$(MESA_DIR)/glsl/cl - -all: glsl/compiler - -glsl: - mkdir -p $@ - -glsl/compiler: glsl $(SRC_C) - $(CC) $(CFLAGS) $(SRC_C) -o $@ - -clean: - rm -rf glsl diff --git a/repos/ports/lib/mk/seoul_libc_support.mk b/repos/ports/lib/mk/seoul_libc_support.mk index cba5f3500f..a1b948e447 100644 --- a/repos/ports/lib/mk/seoul_libc_support.mk +++ b/repos/ports/lib/mk/seoul_libc_support.mk @@ -4,4 +4,4 @@ SRC_C = stdlib/strtoul.c SRC_C += $(addprefix string/,strchr.c strncpy.c strspn.c strcspn.c strstr.c strlen.c strnlen.c strcpy.c memcmp.c strcmp.c) SRC_C += sys/__error.c gen/errno.c locale/none.c locale/table.c -vpath %.c $(LIBC_DIR)/libc +vpath %.c $(LIBC_DIR)/lib/libc diff --git a/repos/ports/lib/mk/virtualbox_libc_support.inc b/repos/ports/lib/mk/virtualbox_libc_support.inc index 0eac435b31..24d7068a4c 100644 --- a/repos/ports/lib/mk/virtualbox_libc_support.inc +++ b/repos/ports/lib/mk/virtualbox_libc_support.inc @@ -44,14 +44,14 @@ INC_DIR += $(LIBC_REP_DIR)/src/lib/libc vpath %.cc $(LIBC_REP_DIR)/src/lib # FreeBSD libc FPU math -FPU_SRC_C = $(wildcard $(LIBC_DIR)/msun/src/*.c) \ - $(wildcard $(LIBC_DIR)/msun/ld80/*.c) \ - $(wildcard $(LIBC_DIR)/msun/bsdsrc/*.c) +FPU_SRC_C = $(wildcard $(LIBC_DIR)/lib/msun/src/*.c) \ + $(wildcard $(LIBC_DIR)/lib/msun/ld80/*.c) \ + $(wildcard $(LIBC_DIR)/lib/msun/bsdsrc/*.c) SRC_C += $(filter-out e_rem_pio2.c e_rem_pio2f.c s_exp2l.c, $(notdir $(FPU_SRC_C))) -vpath %.c $(LIBC_DIR)/msun/src -vpath %.c $(LIBC_DIR)/msun/ld80 -vpath %.c $(LIBC_DIR)/msun/bsdsrc +vpath %.c $(LIBC_DIR)/lib/msun/src +vpath %.c $(LIBC_DIR)/lib/msun/ld80 +vpath %.c $(LIBC_DIR)/lib/msun/bsdsrc # Disable warnings for selected files, i.e., to suppress # 'is static but used in inline function which is not static' @@ -80,6 +80,6 @@ CC_OPT_s_cosf += -D__kernel_sindf=__kernel_sindf_cosf CC_OPT_s_tanf += -D__ieee754_rem_pio2f=__ieee754_rem_pio2f_s_tanf CC_OPT += -D__inline=inline -INC_DIR += $(LIBC_DIR)/msun/src $(LIBC_DIR)/msun/ld80 $(LIBC_DIR)/msun/bsdsrc +INC_DIR += $(addprefix $(LIBC_DIR)/lib/msun/,src ld80 bsdsrc) # vi: set ft=make : diff --git a/repos/ports/lib/mk/x86_32/virtualbox_libc_support.mk b/repos/ports/lib/mk/x86_32/virtualbox_libc_support.mk index 9e77381a96..9eefd509d5 100644 --- a/repos/ports/lib/mk/x86_32/virtualbox_libc_support.mk +++ b/repos/ports/lib/mk/x86_32/virtualbox_libc_support.mk @@ -2,6 +2,6 @@ include $(REP_DIR)/lib/mk/seoul_libc_support.mk SRC_C += fenv.c -vpath fenv.c $(LIBC_DIR)/msun/i387 +vpath fenv.c $(LIBC_DIR)/lib/msun/i387 include $(REP_DIR)/lib/mk/virtualbox_libc_support.inc diff --git a/repos/ports/lib/mk/x86_64/virtualbox_libc_support.mk b/repos/ports/lib/mk/x86_64/virtualbox_libc_support.mk index 7849cc9804..977957703c 100644 --- a/repos/ports/lib/mk/x86_64/virtualbox_libc_support.mk +++ b/repos/ports/lib/mk/x86_64/virtualbox_libc_support.mk @@ -2,6 +2,6 @@ include $(REP_DIR)/lib/mk/seoul_libc_support.mk SRC_C += fenv.c -vpath fenv.c $(LIBC_DIR)/msun/amd64 +vpath fenv.c $(LIBC_DIR)/lib/msun/amd64 include $(REP_DIR)/lib/mk/virtualbox_libc_support.inc diff --git a/tool/prepare.mk b/tool/prepare.mk index b561b67d59..7c24bd4592 100644 --- a/tool/prepare.mk +++ b/tool/prepare.mk @@ -19,6 +19,22 @@ SIGVERIFIER = $(CURDIR)/../../tool/download_sigver HASHVERIFIER = $(CURDIR)/../../tool/download_hashver MAKEFLAGS += --no-print-directory +# +# Support for transitioning to the new tool/ports/prepare_port mechanism +# + +# obtain version of the port +port_version = $(strip $(shell grep "^VERSION" ports/$1.port | sed "s/^.*=//")) + +# collect information about ports available via tool/ports/prepare_port +#NEW_PORTS := $(foreach PORT,$(wildcard ports/*.port),\ +# $(notdir $(PORT:.port=))-$(call port_version,$(PORT))) +NEW_PORTS := $(patsubst %.port,%,$(notdir $(wildcard ports/*.port))) + +# generic rule for invoking the new tool/ports/prepare_port mechanism +$(addprefix prepare-,$(NEW_PORTS)): + $(VERBOSE)../../tool/ports/prepare_port $(patsubst prepare-%,%,$@) + # # Create download and contrib directory so that '.mk' files # do not need to care for them. @@ -50,13 +66,15 @@ $(call check_tool,sha256sum) # Furthermore, each '.mk' file extends the 'prepare' rule for # downloading and unpacking the corresponding upstream sources. # -PKG ?= $(patsubst ports/%.mk,%,$(wildcard ports/*.mk)) -include $(addprefix ports/,$(addsuffix .mk,$(PKG))) +PKG ?= $(patsubst ports/%.mk,%,$(wildcard ports/*.mk)) $(NEW_PORTS) +-include $(addprefix ports/,$(addsuffix .mk,$(PKG))) + +LIST_OF_PORTS = $(sort $(PORTS) $(foreach P,$(NEW_PORTS),$P-$(call port_version,$P))) help:: $(ECHO) $(ECHO) "Download and unpack upstream source codes:" - @for i in $(PORTS); do echo " $$i"; done + @for i in $(LIST_OF_PORTS); do echo " $$i"; done $(ECHO) $(ECHO) "Downloads will be placed into the '$(DOWNLOAD_DIR)/' directory." $(ECHO) "Source codes will be unpacked in the '$(CONTRIB_DIR)/' directory."