Commits

Barry Schwartz  committed 1181bc9

Package ncurses. Also change the readline packaging to include patchlevel in the version.

  • Participants
  • Parent commits b0bafb5

Comments (0)

Files changed (9)

File packages/gnu/inetutils/inetutils.exlib

 
 MYOPTIONS=""
 
-# FIXME: Add gnu/ncurses to dependencies when it has been packaged.
 DEPENDENCIES="
     build+run:
+        gnu/ncurses
         gnu/readline
 "
 

File packages/gnu/ncurses/ncurses-5.9.exheres-0

+# Copyright 2012 Barry Schwartz
+# Distributed under the terms of the GNU General Public License v2
+
+require gnu [ suffix=gz ]
+
+SUMMARY="GNU New Curses: an emulation of curses in System V Release 4.0, and more"
+LICENCES="as-is"
+
+SLOT="0"
+PLATFORMS="~amd64"
+
+MYOPTIONS="
+    ada [[ description = [ Build Ada95 bindings ] ]]
+"
+
+# FIXME: Dependency for MYOPTIONS="ada".
+# FIXME: Figure out how to deal with the "gpm" optional dependency.
+DEPENDENCIES=""
+
+DEFAULT_SRC_CONFIGURE_PARAMS=(
+    --hates=docdir
+    --with-shared
+    --with-debug
+    --enable-widec
+)
+
+DEFAULT_SRC_CONFIGURE_OPTION_WITHS=( ada )
+
+# FIXME: Would it be safe to make "narrow curses" a synonym for "wide curses" for Ada, as we have
+# done here for C?
+src_install() {
+    default
+
+    edo rm -f "${IMAGE}/share/doc/${PNVR}/announce.html.in"
+
+    edo pushd doc
+    dodoc -r .
+    edo popd
+
+    # What follows is compatibility via a potpourri of symlinks and GNU linker scripts. Note that no
+    # actual "narrow curses" is installed here, so binaries that we did not compile may not work.
+
+    dosym ncursesw5-config /bin/ncurses5-config
+    dosym ncursesw5-config.1 /share/man/man1/ncurses5-config.1
+
+    edo pushd "${IMAGE}/include"
+    edo find ncursesw -name \*.h -print -exec ln -s {} \;
+    edo popd
+
+    for lib in form menu ncurses panel; do
+        dosym lib${lib}w.a /lib/lib${lib}.a
+        dosym lib${lib}w_g.a /lib/lib${lib}_g.a
+
+        edo echo "INPUT(-l${lib}w)" > lib${lib}.so.5.9
+        dolib.so lib${lib}.so.5.9
+
+        dosym lib${lib}.so.5.9 /lib/lib${lib}.so.5
+        dosym lib${lib}.so.5 /lib/lib${lib}.so
+    done
+
+    dosym libncursesw.a /lib/libcursesw.a
+    edo echo "INPUT(-lncursesw)" > libcursesw.so.5.9
+    dolib.so libcursesw.so.5.9
+    dosym libcurses.so.5.9 /lib/libcursesw.so.5
+    dosym libcurses.so.5 /lib/libcursesw.so
+
+    dosym libncursesw.a /lib/libcurses.a
+    edo echo "INPUT(-lncursesw)" > libcurses.so.5.9
+    dolib.so libcurses.so.5.9
+    dosym libcurses.so.5.9 /lib/libcurses.so.5
+    dosym libcurses.so.5 /lib/libcurses.so
+
+    dosym libncurses++w.a /lib/libncurses++.a
+}
+

File packages/gnu/readline/readline-6.2.exheres-0

-# Copyright 2012 Barry Schwartz
-# Distributed under the terms of the GNU General Public License v2
-
-require readline
-
-SLOT="0"
-PLATFORMS="~amd64"
-
-DEFAULT_SRC_PREPARE_PATCHES=( )
-for i in 001 002 003 004; do
-    DOWNLOADS+=" ftp://ftp.gnu.org/gnu/${PN}/${PNV}-patches/readline62-${i}"
-    DEFAULT_SRC_PREPARE_PATCHES=( ${DEFAULT_SRC_PREPARE_PATCHES[@]}
-    	-p0 ${FETCHEDDIR}/readline62-${i} )
-done
-

File packages/gnu/readline/readline-6.2_p4.exheres-0

+# Copyright 2012 Barry Schwartz
+# Distributed under the terms of the GNU General Public License v2
+
+require readline
+
+MY_PV="$(ever range -2)"
+MY_PNV="${PN}-${MY_PV}"
+MY_PNVV="${PN}$(ever delete_all ${MY_PV})"
+
+DOWNLOADS="mirror://gnu/${MY_PNV}.tar.gz"
+
+SLOT="0"
+PLATFORMS="~amd64"
+
+WORK="${WORKBASE}/${MY_PNV}"
+
+DEFAULT_SRC_PREPARE_PATCHES=( )
+for i in 001 002 003 004; do
+    DOWNLOADS+=" ftp://ftp.gnu.org/gnu/${PN}/${MY_PNV}-patches/${MY_PNVV}-${i}"
+    DEFAULT_SRC_PREPARE_PATCHES=( ${DEFAULT_SRC_PREPARE_PATCHES[@]}
+    	-p0 ${FETCHEDDIR}/${MY_PNVV}-${i} )
+done
+

File packages/gnu/readline/readline.exlib

 
 MYOPTIONS=""
 
-# FIXME: Once we get our ncurses arrangement sorted out,
-# add a dependency here, and rearrange the phases for
-# the new layout.
-DEPENDENCIES=""
+DEPENDENCIES="
+    build+run:
+        gnu/ncurses
+"
 
-export_exlib_phases src_configure src_compile src_install
-
-readline_src_configure() {
-    econf CPPFLAGS="${CPPFLAGS} -I/include/ncursesw"
-}
+export_exlib_phases src_compile src_install
 
 readline_src_compile() {
     emake SHLIB_LIBS="-lncursesw"
-    default
 }
 
 readline_src_install() {

File packages/gnu/texinfo/texinfo.exlib

 
 MYOPTIONS=""
 
-# FIXME: Dependencies may include ncurses, TeX.
-DEPENDENCIES=""
+# FIXME: Dependencies may include TeX.
+DEPENDENCIES="
+    build+run:
+        gnu/ncurses
+"
 

File packages/kermitproject/ckermit/ckermit-9.0.304_pre02.exheres-0

 MYOPTIONS="ssl"
 
 # FIXME
-#    gnu/ncurses (when it has been packaged)
 #    virtual/pam (add -DCK_PAM to cflags, and pkg-config flags)
 # dependence on pkg-config
 DEPENDENCIES="
     build+run:
         compression/zlib
         debian/lockdev
+        gnu/ncurses
         ssl? ( openssl/openssl[>=1.0.0j] )
 "
 

File packages/procps/procps/procps-3.3.3.exheres-0

 PLATFORMS="~amd64"
 MYOPTIONS=""
 
-# FIXME when ncurses and dejagnu are packaged.
-DEPENDENCIES=""
-#DEPENDENCIES="
-#    build+run:
-#        gnu/ncurses
+# FIXME when dejagnu is packaged.
+DEPENDENCIES="
+    build+run:
+        gnu/ncurses
+"
 #    test:
 #        gnu/dejagnu
-#"
 
 # We will use kill from gnu/coreutils, instead.
 DEFAULT_SRC_CONFIGURE_PARAMS=(

File packages/python/python/python-build.exlib

     build+run:
         compression/bzip2
         ffi/libffi
+        gnu/ncurses
         openssl/openssl
         compression/zlib[>=1.1.3]
         readline? ( gnu/readline[>=4.1] )
 #        dev-util/pkg-config
 #    build+run:
 #        dbm? ( gnu/gdbm )
-#        gnu/ncurses
 #        sqlite? ( dev-db/sqlite:3[>=3.0.8] )
 #        tk? ( dev-lang/tk[>=8.0] )