diff --git a/sys/libs/ncurses/ympbuild b/sys/libs/ncurses/ympbuild index c735b516..e7bd52dc 100644 --- a/sys/libs/ncurses/ympbuild +++ b/sys/libs/ncurses/ympbuild @@ -29,6 +29,7 @@ setup(){ --with-progs --with-terminfo-dirs="/etc/terminfo:/usr/share/terminfo:/lib/terminfo:/usr/lib/terminfo" --enable-pc-files + --with-pkg-config-libdir=/usr/lib64/pkgconfig --with-shared) ./configure ${opts[@]} cd ../widec @@ -44,14 +45,25 @@ build(){ } package(){ + cd ../widec + make $jobs install + cd ../$name-$version + make $jobs install + mkdir -p "$DESTDIR/lib64/" "$DESTDIR/usr/lib64/pkgconfig/" for lib in ncurses ncurses++ form panel menu; do - printf "INPUT(-l%sw)\n" "${lib}" > "$DESTDIR/lib64/lib${lib}.so" - ln -sv ${lib}w.pc "$DESTDIR/usr/lib64/pkgconfig/${lib}.pc" + if ! ls "$DESTDIR/lib64/lib${lib}.so" ; then + printf "INPUT(-l%sw)\n" "${lib}" > "$DESTDIR/lib64/lib${lib}.so" + fi + if ! ls "$DESTDIR/usr/lib64/pkgconfig/${lib}.pc" ; then + ln -sv ${lib}w.pc "$DESTDIR/usr/lib64/pkgconfig/${lib}.pc" + fi done # some packages look for -lcurses during build printf 'INPUT(-lncursesw)\n' > "$DESTDIR/lib64/libcursesw.so" - ln -sv libncurses.so "$DESTDIR/lib64/libcurses.so" + if ! ls "$DESTDIR"/lib64/libcurses.so ; then + ln -sv libncurses.so "$DESTDIR/lib64/libcurses.so" + fi # tic and ticinfo functionality is built in by default # make sure that anything linking against it links against libncursesw.so instead @@ -59,6 +71,8 @@ package(){ printf "INPUT(libncursesw.so.%s)\n" "${so_ver}" > "$DESTDIR/lib64/lib${lib}.so" if ! ls $DESTDIR/lib64/lib${lib}.so.${so_ver} ; then ln -sv libncursesw.so.${so_ver} "$DESTDIR/lib64/lib${lib}.so.${so_ver}" + fi + if ! ls "$DESTDIR/usr/lib64/pkgconfig/${lib}.pc" ; then ln -sv ncursesw.pc "$DESTDIR/usr/lib64/pkgconfig/${lib}.pc" fi done @@ -66,8 +80,4 @@ package(){ for lib in libncursesw libncurses libtinfo libpanelw libformw libmenuw ; do ln -sv ${lib}.so.${so_ver} "$DESTDIR"/lib64/${lib}.so.5 done - cd ../widec - make $jobs install - cd ../$name-$version - make $jobs install }