CVS commit: pkgsrc/cross/avr-libc

["Makoto Fujiwara" <mef%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mef
Date:           Tue Mar 31 12:59:27 UTC 2020

Modified Files:
        pkgsrc/cross/avr-libc: distinfo options.mk
        pkgsrc/cross/avr-libc/patches: patch-doc_api_Makefile.in

Log Message:
(cross/avr-libc) Fix packaging. Adhoc adjusting on options.mk, and Makefile.in


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/cross/avr-libc/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/cross/avr-libc/options.mk
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/cross/avr-libc/patches/patch-doc_api_Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/cross/avr-libc/distinfo
diff -u pkgsrc/cross/avr-libc/distinfo:1.14 pkgsrc/cross/avr-libc/distinfo:1.15
--- pkgsrc/cross/avr-libc/distinfo:1.14 Sun Jan 29 04:29:54 2017
+++ pkgsrc/cross/avr-libc/distinfo      Tue Mar 31 12:59:27 2020
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.14 2017/01/29 04:29:54 mef Exp $
+$NetBSD: distinfo,v 1.15 2020/03/31 12:59:27 mef Exp $
 
 SHA1 (avr-libc-2.0.0.tar.bz2) = c46b4c92bd88339f4d8d9bce29893661be890845
 RMD160 (avr-libc-2.0.0.tar.bz2) = 3185d66f9c3024ecbf56d272033b87eac4c49ad2
 SHA512 (avr-libc-2.0.0.tar.bz2) = fc8d062043d633350dbe05978935dcb8028257a4f1013f246af9658aef0671def19ac11577d1ee9302df68df1b8cf030b22441d96852e185db212263aacabea6
 Size (avr-libc-2.0.0.tar.bz2) = 3590893 bytes
 SHA1 (patch-doc_Makefile.in) = e44e69a7a438c4175a8c15c0548b77df49a691d8
-SHA1 (patch-doc_api_Makefile.in) = 73521550c8ff0b1348e80a8490795a00480ec779
+SHA1 (patch-doc_api_Makefile.in) = 0d30c3704d2b5651a68293c8b78afed19f86fdbb

Index: pkgsrc/cross/avr-libc/options.mk
diff -u pkgsrc/cross/avr-libc/options.mk:1.4 pkgsrc/cross/avr-libc/options.mk:1.5
--- pkgsrc/cross/avr-libc/options.mk:1.4        Sun Nov 24 12:31:37 2019
+++ pkgsrc/cross/avr-libc/options.mk    Tue Mar 31 12:59:27 2020
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2019/11/24 12:31:37 dsainty Exp $
+# $NetBSD: options.mk,v 1.5 2020/03/31 12:59:27 mef Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.avr-libc
 PKG_SUPPORTED_OPTIONS+=                doc
@@ -52,12 +52,23 @@ post-install:
                 ${DESTDIR}${PREFIX}/share/doc/avr-libc
        ## delete following or similar files, which includes PATH at build time.
        ##_usr_pkgsrc_cross_avr-libc_work_avr-libc-1.8.0_libc_string_.3
-       ${RM} ${DESTDIR}${PREFIX}/share/doc/avr-libc/man/man3/*${PKGVERSION_NOREV}*
+       ${RM} -f ${DESTDIR}${PREFIX}/share/doc/avr-libc/man/man3/*${PKGVERSION_NOREV}*
+       ${MV}    ${DESTDIR}${PREFIX}/share/doc/avr-libc/man/man3/_VECTOR.3 \
+                ${DESTDIR}${PREFIX}/share/doc/avr-libc/man/man3/VECTOR.3
 .  for f in Makefile demo.c demo.bin demo.hex demo.pdf demo.srec
        ${INSTALL_DATA} ${WRKSRC}/doc/examples/demo/${f} \
                ${DESTDIR}${PREFIX}/share/doc/avr-libc/examples/demo
 .  endfor
 
+.  for f in largedemo-setup.jpg largedemo-wiring.jpg largedemo-wiring2.jpg  stdiodemo-setup.jpg
+       ${INSTALL_DATA} ${WRKSRC}/doc/api/latex_src/${f} \
+               ${DESTDIR}${PREFIX}/share/doc/avr-libc/avr-libc-user-manual
+.  endfor
+
+.  for f in malloc-std.png malloc-x1.png releases.png malloc-x2.png
+       ${INSTALL_DATA} ${WRKSRC}/doc/api/${f} \
+               ${DESTDIR}${PREFIX}/share/doc/avr-libc/avr-libc-user-manual
+.  endfor
 
 PLIST.doc=             yes
 

Index: pkgsrc/cross/avr-libc/patches/patch-doc_api_Makefile.in
diff -u pkgsrc/cross/avr-libc/patches/patch-doc_api_Makefile.in:1.2 pkgsrc/cross/avr-libc/patches/patch-doc_api_Makefile.in:1.3
--- pkgsrc/cross/avr-libc/patches/patch-doc_api_Makefile.in:1.2 Sun Jan 29 04:29:54 2017
+++ pkgsrc/cross/avr-libc/patches/patch-doc_api_Makefile.in     Tue Mar 31 12:59:27 2020
@@ -1,4 +1,4 @@
-$NetBSD: patch-doc_api_Makefile.in,v 1.2 2017/01/29 04:29:54 mef Exp $
+$NetBSD: patch-doc_api_Makefile.in,v 1.3 2020/03/31 12:59:27 mef Exp $
 
 Fix dependencies. Ultimately ignore the errors from latex though, since
 undefined references remain.
@@ -10,7 +10,7 @@ undefined references remain.
  
  $(USER_MANUAL).pdf: latex_src/refman.tex
 -      cd latex_src && ${MAKE} refman.pdf
-+      cd latex_src && sed -e 's,pdflatex refman$$,pdflatex refman || true,' < Makefile > Makefile.new && mv Makefile.new Makefile && ${MAKE} refman.pdf
++      cd latex_src && sed -e 's,pdflatex refman$$,pdflatex refman || true,' < Makefile > Makefile.new && mv Makefile.new Makefile && ${MAKE} || echo true
        cp latex_src/refman.pdf $(USER_MANUAL).pdf
  
  # Install rules for the various documentation parts.  The actual