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

3 files changed, 17 insertions, 6 deletions

diff --git a/cross/avr-libc/distinfo b/cross/avr-libc/distinfo
index 350e6c138a3..7bfff84165f 100644
--- a/cross/avr-libc/distinfo
+++ b/cross/avr-libc/distinfo
@@ -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
diff --git a/cross/avr-libc/options.mk b/cross/avr-libc/options.mk
index ac0ac009f70..8d1db8fdc2f 100644
--- a/cross/avr-libc/options.mk
+++ b/cross/avr-libc/options.mk
@@ -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
 
diff --git a/cross/avr-libc/patches/patch-doc_api_Makefile.in b/cross/avr-libc/patches/patch-doc_api_Makefile.in
index 2c5bb9134fc..982fba7e81d 100644
--- a/cross/avr-libc/patches/patch-doc_api_Makefile.in
+++ b/cross/avr-libc/patches/patch-doc_api_Makefile.in
@@ -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