diff --git a/Makefile b/Makefile index 8ddc1e0..372d7e4 100644 --- a/Makefile +++ b/Makefile @@ -8,39 +8,27 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -DEPENDS = -ARCH = x86_64 -URL = https://www.gnu.org/software/ncurses/ +export SRCPKG = ncurses +export DEPENDS = glibc +export ARCH = x86_64 +export URL = https://www.gnu.org/software/ncurses/ +BRIEF = Library and tools for terminal handling DESC = The Ncurses (new curses) library is a free software emulation of \ curses in System V Release 4.0, and more. -SNAPVER = sr0 +SNAPVER = 1 ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1) TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n') SRCDIR := $(shell tar -tf $(ARCHIVE)|head -1|sed 's/\/.*//') PATCHDIR := $(PWD)/SRC/patches -VERSION := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'|sed 's/^-//')$(SNAPVER) +export VERSION := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'| \ + sed 's/^-//')-$(SNAPVER) + +DEV := $(PWD)/ncurses-dev +DEVROOT := $(DEV)/ROOT MAKE = make MAKEINST = make install -SNAPHACKS = install -v -d -m 755 $(ROOT)/lib && \ - install -v -d -m 755 $(ROOT)/usr/share/doc/ncurses && \ - mv -v $(ROOT)/usr/lib/libncursesw.so.[0-9]* $(ROOT)/lib && \ - ln -sfv ../../lib/`readlink $(ROOT)/usr/lib/libncursesw.so` \ - $(ROOT)/usr/lib/libncursesw.so && \ - for lib in ncurses form panel menu; do \ - rm -vf $(ROOT)/usr/lib/lib$${lib}.so && \ - echo "INPUT(-l$${lib}w)" > $(ROOT)/usr/lib/lib$${lib}.so && \ - ln -sfv lib$${lib}w.a $(ROOT)/usr/lib/lib$${lib}.a; \ - done && \ - ln -sfv libncurses++w.a $(ROOT)/usr/lib/libncurses++.a && \ - rm -vf $(ROOT)/usr/lib/libcursesw.so && \ - echo "INPUT(-lncursesw)" > $(ROOT)/usr/lib/libcursesw.so && \ - ln -sfv libncurses.so $(ROOT)/usr/lib/libcurses.so && \ - ln -sfv libncursesw.a $(ROOT)/usr/lib/libcursesw.a && \ - ln -sfv libncurses.a $(ROOT)/usr/lib/libcurses.a && \ - cp -v -R $(SRCDIR)/doc/* $(ROOT)/usr/share/doc/ncurses - include /usr/share/snap/Makefile.snaplinux $(SRCDIR)/configure: $(ARCHIVE) @@ -59,7 +47,8 @@ $(SRCDIR)/configure: $(ARCHIVE) @touch $(SRCDIR)/configure $(SRCDIR)/config.log: $(SRCDIR)/configure - @cd $(SRCDIR) && for patch in `find $(PATCHDIR) -name \*.patch`; do \ + @cd $(SRCDIR) && \ + for patch in `find $(PATCHDIR) -name \*.patch|sort`; do \ patch --verbose -Np1 -i $$patch; \ done @cd $(SRCDIR); \ @@ -71,13 +60,13 @@ $(SRCDIR)/config.log: $(SRCDIR)/configure --without-normal \ --enable-pc-files \ --enable-widec \ + --program-prefix='' \ --build=x86_64-snap-linux-gnu \ --host=x86_64-snap-linux-gnu \ --target=x86_64-snap-linux-gnu $(SRCDIR)/objects/cursesmain.o: $(SRCDIR)/config.log - @cd $(SRCDIR); \ - $(MAKE) + @cd $(SRCDIR) && make $(ROOT): $(SRCDIR)/objects/cursesmain.o @if [ -d $(ROOT) ]; then \ @@ -86,13 +75,38 @@ $(ROOT): $(SRCDIR)/objects/cursesmain.o mkdir -v $(ROOT); \ fi - @cd $(SRCDIR); \ - $(MAKEINST) DESTDIR=$(ROOT) + @cd $(SRCDIR) && make install DESTDIR=$(ROOT) && \ + install -v -d -m 755 $(ROOT)/lib && \ + mv -v $(ROOT)/usr/lib/libncursesw.so.[0-9]* $(ROOT)/lib && \ + ln -sfv ../../lib/`readlink $(ROOT)/usr/lib/libncursesw.so` \ + $(ROOT)/usr/lib/libncursesw.so && \ + for lib in ncurses form panel menu; do \ + rm -vf $(ROOT)/usr/lib/lib$${lib}.so && \ + echo "INPUT(-l$${lib}w)" > $(ROOT)/usr/lib/lib$${lib}.so && \ + ln -sfv lib$${lib}w.a $(ROOT)/usr/lib/lib$${lib}.a; \ + done && \ + ln -sfv libncurses++w.a $(ROOT)/usr/lib/libncurses++.a && \ + rm -vf $(ROOT)/usr/lib/libcursesw.so && \ + echo "INPUT(-lncursesw)" > $(ROOT)/usr/lib/libcursesw.so && \ + ln -sfv libncurses.so $(ROOT)/usr/lib/libcurses.so && \ + ln -sfv libncursesw.a $(ROOT)/usr/lib/libcursesw.a && \ + ln -sfv libncurses.a $(ROOT)/usr/lib/libcurses.a - @$(SNAPHACKS) + @install -v -d $(DEV)/SNAP && \ + install -v -d $(DEVROOT) && \ + install -v -d -m 755 $(DEVROOT)/usr/share/doc/ncurses && \ + for file in `find $(ROOT)|egrep 'man3\/|pkgconfig\/|\.a$$|\.h$$'`; do \ + path=`dirname $$file|sed "s[$(ROOT)[$(DEVROOT)["`; \ + mkdir -p $$path; \ + mv $$file $$path; \ + done && \ + cp -v -R $(SRCDIR)/doc/* $(DEVROOT)/usr/share/doc/ncurses + find $(ROOT) -type d -empty -delete && \ + cd $(DEV) && make -f ../Makefile.ncurses-dev && mv *.snap ../ clean: @rm -rvf $(ROOT) \ + $(DEV) \ $(SNAPINFO) \ $(MANIFEST) \ $(FILES) \ diff --git a/Makefile.ncurses-dev b/Makefile.ncurses-dev new file mode 100644 index 0000000..10cfee4 --- /dev/null +++ b/Makefile.ncurses-dev @@ -0,0 +1,15 @@ +# This file is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation here: +# (http://www.gnu.org/licenses/gpl-2.0.html) +# +# This program 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 General Public License for more details. + +DEPENDS = ncurses +BRIEF = Development files for ncurses +DESC = Development files for ncurses + +include /usr/share/snap/Makefile.snaplinux diff --git a/SRC/ncurses-5.9.tar.gz b/SRC/ncurses-5.9.tar.gz new file mode 100644 index 0000000..653fab0 Binary files /dev/null and b/SRC/ncurses-5.9.tar.gz differ diff --git a/SRC/ncurses-5.9.tar.gz.sig b/SRC/ncurses-5.9.tar.gz.sig new file mode 100644 index 0000000..20328df Binary files /dev/null and b/SRC/ncurses-5.9.tar.gz.sig differ diff --git a/SRC/ncurses-6.0.tar.gz b/SRC/ncurses-6.0.tar.gz deleted file mode 100644 index 7951168..0000000 Binary files a/SRC/ncurses-6.0.tar.gz and /dev/null differ diff --git a/SRC/ncurses-6.0.tar.gz.sig b/SRC/ncurses-6.0.tar.gz.sig deleted file mode 100644 index 6d1172e..0000000 Binary files a/SRC/ncurses-6.0.tar.gz.sig and /dev/null differ