gcc: Update to 6.4.0

[people/ms/ipfire-3.x.git] / ncurses / ncurses.nm

diff --git a/ncurses/ncurses.nm b/ncurses/ncurses.nm
index 7edeba2aa25d751e09985ac79fcc9041eb3e1590..86da88ccd3e856d08838f056d251833d9b7225e8 100644 (file)
--- a/ncurses/ncurses.nm
+++ b/ncurses/ncurses.nm
@@ -5,7 +5,9 @@
 
 name       = ncurses
 version    = 5.9
-release    = 5
+revision   = 20150117
+release    = 11.%{revision}
+thisapp    = %{name}-%{version}-%{revision}
 
 groups     = System/Base
 url        = http://invisible-island.net/ncurses/ncurses.html
@@ -19,7 +21,8 @@ description
        discontinued 4.4 BSD classic curses library.
 end
 
-source_dl  =
+source_dl  = ftp://invisible-island.net/ncurses/current/
+sources    = %{thisapp}.tgz
 
 build
        requires
@@ -27,7 +30,6 @@ build
        end
 
        configure_options += \
-               --mandir=/usr/share/man \
                --with-shared \
                --without-debug \
                --without-ada \
@@ -36,12 +38,12 @@ build
                --enable-hard-tabs \
                --enable-xmc-glitch \
                --enable-colorfgbg \
-               --with-terminfo-dirs=/etc/terminfo:/usr/share/terminfo:/lib/terminfo \
+               --with-terminfo-dirs=%{sysconfdir}/terminfo:%{datadir}/terminfo \
                --enable-overwrite \
                --enable-pc-files \
                --with-termlib=tinfo
 
-       export PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig
+       export PKG_CONFIG_LIBDIR=%{libdir}/pkgconfig
 
        build
                mkdir -pv narrowc widec
@@ -63,59 +65,33 @@ build
 
        install
                make -C narrowc DESTDIR=%{BUILDROOT} install.{libs,progs,data}
-               rm -rvf %{BUILDROOT}/usr/lib/libtinfo.*
+               rm -rvf %{BUILDROOT}%{libdir}/libtinfo.*
                make -C widec DESTDIR=%{BUILDROOT} install.{libs,includes,man}
 
-               chmod -v 755 %{BUILDROOT}/usr/lib/lib*.so.*.*
+               chmod -v 755 %{BUILDROOT}%{libdir}/lib*.so.*.*
 
-               # move lib{ncurses{,w},tinfo}.so.* to /lib*
-               mkdir -pv %{BUILDROOT}/lib
-               mv -v %{BUILDROOT}/usr/lib/lib{ncurses{,w},tinfo}.so.* %{BUILDROOT}/lib
-               for l in %{BUILDROOT}/usr/lib/lib{ncurses{,w},tinfo}.so; do
-                       ln -sf $(echo /usr/lib | \
-                               sed 's,\(^/\|\)[^/][^/]*,..,g')/lib/$(readlink $l) $l
-               done
-               mkdir -pv %{BUILDROOT}/{etc,lib}/terminfo
-
-               # move few basic terminfo entries to /lib
-               baseterms=
-               for termname in \
-                               ansi dumb linux vt100 vt100-nav vt102 vt220 vt52; do
-                       for t in $(find %{BUILDROOT}/usr/share/terminfo \
-                                       -samefile %{BUILDROOT}/usr/share/terminfo/${termname::1}/$termname); do
-                               baseterms="$baseterms $(basename $t)"
-                       done
-               done
-               for termname in ${baseterms}; do
-                       termpath=terminfo/${termname::1}/${termname}
-                       mkdir -pv %{BUILDROOT}/lib/terminfo/${termname::1}
-                       mv -v %{BUILDROOT}/usr/share/${termpath} %{BUILDROOT}/lib/${termpath}
-                       ln -svf $(dirname /usr/share/${termpath} | \
-                                       sed 's,\(^/\|\)[^/][^/]*,..,g')/lib/${termpath} \
-                               %{BUILDROOT}/usr/share//${termpath}
-               done
+               mkdir -pv %{BUILDROOT}/etc/terminfo
 
-               # can't replace directory with symlink, symlink all headers
-               #mkdir %{BUILDROOT}/usr/include/ncurses{,w}
-               #for l in %{BUILDROOT}/usr/include/*.h; do
-               #       ln -s ../$(basename $l) %{BUILDROOT}/usr/include/ncurses
-               #       ln -s ../$(basename $l) %{BUILDROOT}/usr/include/ncursesw
-               #done
+               mkdir %{BUILDROOT}%{includedir}/ncurses{,w}
+               for l in %{BUILDROOT}%{includedir}/*.h; do
+                       ln -s ../$(basename $l) %{BUILDROOT}%{includedir}/ncurses
+                       ln -s ../$(basename $l) %{BUILDROOT}%{includedir}/ncursesw
+               done
 
                # don't require -ltinfo when linking with --no-add-needed
-               for l in %{BUILDROOT}/usr/lib/libncurses{,w}.so; do
+               for l in %{BUILDROOT}%{libdir}/libncurses{,w}.so; do
                        soname=$(basename $(readlink $l))
                        rm -f $l
                        echo "INPUT($soname -ltinfo)" > $l
                done
 
-               rm -f %{BUILDROOT}/usr/lib/libcurses{,w}.so
-               echo "INPUT(-lncurses)" > %{BUILDROOT}/usr/lib/libcurses.so
-               echo "INPUT(-lncursesw)" > %{BUILDROOT}/usr/lib/libcursesw.so
-               echo "INPUT(-ltinfo)" > %{BUILDROOT}/usr/lib/libtermcap.so
+               rm -f %{BUILDROOT}%{libdir}/libcurses{,w}.so
+               echo "INPUT(-lncurses)" > %{BUILDROOT}%{libdir}/libcurses.so
+               echo "INPUT(-lncursesw)" > %{BUILDROOT}%{libdir}/libcursesw.so
+               echo "INPUT(-ltinfo)" > %{BUILDROOT}%{libdir}/libtermcap.so
 
-               rm -vf %{BUILDROOT}/usr/lib/terminfo
-               rm -vf %{BUILDROOT}/usr/lib/pkgconfig/{*_g,ncurses++*}.pc
+               rm -vf %{BUILDROOT}%{libdir}/terminfo
+               rm -vf %{BUILDROOT}%{libdir}/pkgconfig/{*_g,ncurses++*}.pc
        end
 end
 
@@ -158,12 +134,13 @@ packages
                conflicts = ncurses<=5.9-1
 
                files
-                       /lib/terminfo
                        /usr/share/terminfo/*/Eterm*
+                       /usr/share/terminfo/*/ansi
                        /usr/share/terminfo/*/aterm
                        /usr/share/terminfo/*/bterm
                        /usr/share/terminfo/*/cons25
                        /usr/share/terminfo/*/cygwin
+                       /usr/share/terminfo/*/dumb
                        /usr/share/terminfo/*/eterm*
                        /usr/share/terminfo/*/gnome
                        /usr/share/terminfo/*/gnome-256color
@@ -171,6 +148,7 @@ packages
                        /usr/share/terminfo/*/jfbterm
                        /usr/share/terminfo/*/konsole
                        /usr/share/terminfo/*/konsole-256color
+                       /usr/share/terminfo/*/linux
                        /usr/share/terminfo/*/mach*
                        /usr/share/terminfo/*/mlterm
                        /usr/share/terminfo/*/mrxvt
@@ -185,12 +163,18 @@ packages
                        /usr/share/terminfo/*/sun
                        /usr/share/terminfo/*/teraterm
                        /usr/share/terminfo/*/teraterm2.3
+                       /usr/share/terminfo/*/vt100
+                       /usr/share/terminfo/*/vt100-nav
+                       /usr/share/terminfo/*/vt102
+                       /usr/share/terminfo/*/vt220
+                       /usr/share/terminfo/*/vt52
                        /usr/share/terminfo/*/vte
                        /usr/share/terminfo/*/vte-256color
                        /usr/share/terminfo/*/vwmterm
                        /usr/share/terminfo/*/wsvt25*
                        /usr/share/terminfo/*/xfce
-                       /usr/share/terminfo/*/xterm xterm-*
+                       /usr/share/terminfo/*/xterm
+                       /usr/share/terminfo/*/xterm-*
                end
        end