--- plamo/00_base/old/ncurses-20160428/PlamoBuild.ncurses-6.0 2016-04-28 23:01:54.000000000 +0900 +++ plamo/00_base/ncurses/PlamoBuild.ncurses-6.0 2016-12-08 12:47:34.000000000 +0900 @@ -2,16 +2,19 @@ ###################################################################### url="http://ftp.gnu.org/gnu/ncurses/ncurses-6.0.tar.gz - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/ncurses/ncurses-6.0-Charable.patch.gz" + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/ncurses/ncurses-6.0-Charable.patch.gz" pkgbase=ncurses vers=6.0 arch=`uname -m` -build=P4 +build=P5 src=$pkgbase-$vers +patchfiles="ncurses-6.0-Charable.patch.gz" OPT_CONFIG="--with-shared --without-debug --enable-widec --with-manpage-format=normal --disable-ext-colors" DOCS="README.MinGW README README.emx NEWS ANNOUNCE COPYING INSTALL TO-DO AUTHORS" +template=20161020 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### fscheck() { @@ -190,14 +193,22 @@ if [ $opt_download -eq 1 ] ; then for i in $url ; do if [ ! -f ${i##*/} ] ; then - wget $i - for sig in asc sig{,n} {md5,sha{1,256}}{,sum} ; do + wget $i ; j=${i%.*} + for sig in asc sig{,n} {sha{256,1},md5}{,sum} ; do if wget --spider $i.$sig ; then wget $i.$sig ; break ; fi + if wget --spider $j.$sig ; then + case ${i##*.} in + gz) gunzip -c ${i##*/} > ${j##*/} ;; + bz2) bunzip2 -c ${i##*/} > ${j##*/} ;; + xz) unxz -c ${i##*/} > ${j##*/} ;; + esac + touch -r ${i##*/} ${j##*/} ; i=$j ; wget $i.$sig ; break + fi done if [ -f ${i##*/}.$sig ] ; then case $sig in asc|sig|sign) gpg2 --verify ${i##*/}.$sig ;; - md5|sha1|sha256) ${sig}sum -c ${i##*/}.$sig ;; + sha256|sha1|md5) ${sig}sum -c ${i##*/}.$sig ;; *) $sig -c ${i##*/}.$sig ;; esac if [ $? -ne 0 ] ; then echo "archive verify failed" ; exit ; fi @@ -208,8 +219,8 @@ case ${i##*.} in tar) tar xvpf ${i##*/} ;; gz|tgz) tar xvpzf ${i##*/} ;; - bz2) tar xvpjf ${i##*/} ;; - xz) tar xvpJf ${i##*/} ;; + bz2|tbz) tar xvpjf ${i##*/} ;; + xz|txz) tar xvpJf ${i##*/} ;; esac done fi @@ -217,8 +228,18 @@ for i in `seq 0 $((${#B[@]} - 1))` ; do if [ -d ${B[$i]} ] ; then rm -rf ${B[$i]} ; fi ; cp -a ${S[$i]} ${B[$i]} done + for i in `seq 0 $((${#B[@]} - 1))` ; do + cd ${B[$i]} + for j in ${patchfiles[$i]} ; do + case ${j##*.} in + gz) gunzip -c $W/$j | patch -Np1 -i - ;; + bz2) bunzip2 -c $W/j | patch -Np1 -i - ;; + xz) unxz -c $W/$j | patch -Np1 -i - ;; + *) patch -Np1 -i $W/$j ;; + esac + done + done cd $B - gunzip -c $W/ncurses-6.0-Charable.patch.gz | patch -Np1 -i - if [ $arch == x86_64 ] ; then cp -p misc/run_tic.in{,.orig} sed -i 's@\@lib64@g' misc/run_tic.in @@ -232,8 +253,8 @@ rm -rf config.cache config.log fi if [ -x configure ] ; then - ./configure --prefix=/usr --libdir=/$libdir \ - --infodir='${prefix}'/share/info \ + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libdir=/$libdir --infodir='${prefix}'/share/info \ --mandir='${prefix}'/share/man ${OPT_CONFIG[$i]} fi done @@ -289,9 +310,23 @@ if [ $i -eq 0 ] ; then install $myname $docdir/$src touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname + tmpl=${myname%%.*}-template-$template + if [ -f ../admin/$tmpl ] ; then + cp -p ../admin/$tmpl $docdir/$src + else + ( cd $docdir/$src + curl -Rs -o $tmpl $tmplurl/${tmpl/${myname%%.*}/PlamoBuild} ) + fi + spec=${myname%%.*}-spec + ( cd $docdir/$src ; diff -u $tmpl $myname > $spec ) + touch -t `date '+%m%d0900'` $docdir/$src/$spec + gzip $docdir/$src/{$myname,$spec} + rm $docdir/$src/$tmpl + mv $docdir/$src/{$myname,$spec}.gz $C + mv $C/{$myname,$spec}.gz $docdir/$src else ln $docdir/$src/$myname.gz $docdir/${src[$i]} + ln $docdir/$src/$spec.gz $docdir/${src[$i]} fi ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) done