pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
avr-libc: Move doxygen and LaTex dependencies to options.mk
Module Name: pkgsrc-wip
Committed By: Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By: micha
Date: Mon Aug 30 18:08:53 2021 +0200
Changeset: bfbe4c648d9084dda8ee30c3ddd6635ecddadfd1
Modified Files:
avr-libc/Makefile
avr-libc/PLIST
avr-libc/options.mk
Added Files:
avr-libc/files/INSTALL.pkgsrc
Removed Files:
avr-libc/MESSAGE
Log Message:
avr-libc: Move doxygen and LaTex dependencies to options.mk
They are not required for a build without option doc.
Move information from MESSAGE to INSTALL.pkgsrc.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=bfbe4c648d9084dda8ee30c3ddd6635ecddadfd1
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
avr-libc/MESSAGE | 6 ------
avr-libc/Makefile | 25 ++++++++++---------------
avr-libc/PLIST | 1 +
avr-libc/files/INSTALL.pkgsrc | 5 +++++
avr-libc/options.mk | 29 ++++++++++++++++++++++++-----
5 files changed, 40 insertions(+), 26 deletions(-)
diffs:
diff --git a/avr-libc/MESSAGE b/avr-libc/MESSAGE
deleted file mode 100644
index 43e81d85df..0000000000
--- a/avr-libc/MESSAGE
+++ /dev/null
@@ -1,6 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2015/02/25 15:46:52 mef Exp $
-Man pages are installed in ${PREFIX}/share/doc/avr-libc/man/man3/
-To read those pages, for example, use
- env MANPATH=${PREFIX}/share/doc/avr-libc/man man BOOTLOADER_SECTION
-===========================================================================
diff --git a/avr-libc/Makefile b/avr-libc/Makefile
index 226beec63b..174c7ca724 100644
--- a/avr-libc/Makefile
+++ b/avr-libc/Makefile
@@ -21,21 +21,15 @@ CONFIGURE_ARGS+= --disable-versioned-doc
CONFIGURE_ARGS+= CC=${PREFIX}/bin/avr-gcc
CONFIGURE_ARGS+= CPPFLAGS="-I${PREFIX}/include -I${PREFIX}/avr/include"
-BUILD_DEPENDS+= doxygen>=1.8.20:../../devel/doxygen
-BUILD_DEPENDS+= tex-hanging-[0-9]*:../../print/tex-hanging
-BUILD_DEPENDS+= tex-stackengine-[0-9]*:../../print/tex-stackengine
-BUILD_DEPENDS+= tex-newunicodechar-[0-9]*:../../print/tex-newunicodechar
-BUILD_DEPENDS+= tex-etoc-[0-9]*:../../print/tex-etoc
-BUILD_DEPENDS+= tex-epstopdf-pkg-[0-9]*:../../print/tex-epstopdf-pkg
-
-# In doc/examples/demo directory, we have sample Makefile both for
-# generating *.hex file at pkg installation time, and for installing
-# Makefile itself. That Makefile should be for general purpose, meaning
+# In share/doc/avr-libc/examples/demo directory, we have sample Makefile both
+# for generating *.hex file at pkg installation time, and for installing
+# Makefile itself. That Makefile should be for general purpose, meaning
+#
# OBJCOPY = avr-objcopy
-# line should be intact. While pkg installation time it should refer
-# wrapper ${LOCALBASE}/cross/bin files. See patch-doc_Makefile.in adding
-# related one line.
-
+#
+# line should be intact. While pkg installation time it should refer
+# wrapper ${LOCALBASE}/cross/bin files. See patch-doc_Makefile.in adding
+# related one line.
SUBST_CLASSES+= demo
SUBST_STAGE.demo= pre-configure
SUBST_MESSAGE.demo= Add cross/bin on PATH for OBJCOPY (avr-objcopy) etc
@@ -43,9 +37,10 @@ SUBST_FILES.demo= doc/Makefile.in
SUBST_SED.demo= -e 's|@@@PATH@@@|${PREFIX}/bin:${PATH:Q}|g'
.include "options.mk"
+
.include "../../wip/avr-binutils/buildlink3.mk"
.include "../../wip/avr-gcc/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
# Not to be overridden as --mandir=${PREFIX}, put the line here.
-CONFIGURE_ARGS+= --mandir=${PREFIX}/share/doc/avr-libc/man
+CONFIGURE_ARGS+= --mandir=${PREFIX}/share/doc/avr-libc/man
diff --git a/avr-libc/PLIST b/avr-libc/PLIST
index def842b376..d0c5a0083b 100644
--- a/avr-libc/PLIST
+++ b/avr-libc/PLIST
@@ -900,6 +900,7 @@ avr/lib/tiny-stack/libscanf_flt.a
avr/lib/tiny-stack/libscanf_min.a
bin/avr-man
${PLIST.doc}share/doc/avr-libc/AUTHORS
+${PLIST.doc}share/doc/avr-libc/INSTALL.pkgsrc
${PLIST.doc}share/doc/avr-libc/LICENSE
${PLIST.doc}share/doc/avr-libc/avr-libc-user-manual.pdf
${PLIST.doc}share/doc/avr-libc/avr-libc-user-manual/FAQ.html
diff --git a/avr-libc/files/INSTALL.pkgsrc b/avr-libc/files/INSTALL.pkgsrc
new file mode 100644
index 0000000000..fbfd1813ea
--- /dev/null
+++ b/avr-libc/files/INSTALL.pkgsrc
@@ -0,0 +1,5 @@
+Man pages are installed in ${PREFIX}/share/doc/avr-libc/man/man3/
+
+To read those pages, for example, use:
+
+ env MANPATH=${PREFIX}/share/doc/avr-libc/man man BOOTLOADER_SECTION
diff --git a/avr-libc/options.mk b/avr-libc/options.mk
index a460837c79..fa161f7603 100644
--- a/avr-libc/options.mk
+++ b/avr-libc/options.mk
@@ -9,7 +9,7 @@ PLIST_VARS+= doc
.if !empty(PKG_OPTIONS:Mdoc)
CONFIGURE_ARGS+= --enable-doc
-BUILD_DEPENDS+= doxygen>=1.8.9.1.nb1:../../devel/doxygen
+BUILD_DEPENDS+= doxygen>=1.8.20:../../devel/doxygen
BUILD_DEPENDS+= tex-psnfss-[0-9]*:../../fonts/tex-psnfss
BUILD_DEPENDS+= tex-wasysym-[0-9]*:../../fonts/tex-wasysym
BUILD_DEPENDS+= netpbm-[0-9]*:../../graphics/netpbm
@@ -19,17 +19,22 @@ BUILD_DEPENDS+= tex-caption-[0-9]*:../../print/tex-caption
BUILD_DEPENDS+= tex-collectbox-[0-9]*:../../print/tex-collectbox
BUILD_DEPENDS+= tex-colortbl-[0-9]*:../../print/tex-colortbl
BUILD_DEPENDS+= tex-ec-[0-9]*:../../fonts/tex-ec
+BUILD_DEPENDS+= tex-epstopdf-pkg-[0-9]*:../../print/tex-epstopdf-pkg
+BUILD_DEPENDS+= tex-etoc-[0-9]*:../../print/tex-etoc
BUILD_DEPENDS+= tex-fancyhdr-[0-9]*:../../print/tex-fancyhdr
BUILD_DEPENDS+= tex-fancyvrb-[0-9]*:../../print/tex-fancyvrb
BUILD_DEPENDS+= tex-float-[0-9]*:../../print/tex-float
BUILD_DEPENDS+= tex-geometry-[0-9]*:../../print/tex-geometry
BUILD_DEPENDS+= tex-graphics-cfg-[0-9]*:../../print/tex-graphics-cfg
+BUILD_DEPENDS+= tex-hanging-[0-9]*:../../print/tex-hanging
BUILD_DEPENDS+= tex-hyperref-[0-9]*:../../print/tex-hyperref
BUILD_DEPENDS+= tex-latex-bin-[0-9]*:../../print/tex-latex-bin
BUILD_DEPENDS+= tex-multirow-[0-9]*:../../print/tex-multirow
BUILD_DEPENDS+= tex-natbib-[0-9]*:../../print/tex-natbib
+BUILD_DEPENDS+= tex-newunicodechar-[0-9]*:../../print/tex-newunicodechar
BUILD_DEPENDS+= tex-pgf-[0-9]*:../../print/tex-pgf
BUILD_DEPENDS+= tex-sectsty-[0-9]*:../../print/tex-sectsty
+BUILD_DEPENDS+= tex-stackengine-[0-9]*:../../print/tex-stackengine
BUILD_DEPENDS+= tex-tabu-[0-9]*:../../print/tex-tabu
BUILD_DEPENDS+= tex-tocloft-[0-9]*:../../print/tex-tocloft
BUILD_DEPENDS+= tex-ulem-[0-9]*:../../print/tex-ulem
@@ -38,6 +43,14 @@ BUILD_DEPENDS+= tex-xkeyval-[0-9]*:../../print/tex-xkeyval
BUILD_DEPENDS+= fig2dev-[0-9]*:../../print/fig2dev
BUILD_DEPENDS+= makeindexk-[0-9]*:../../textproc/makeindexk
+# Configure INSTALL.pkgsrc (formerly displayed as MESSAGE)
+# Only installed if option doc is enabled.
+SUBST_CLASSES+= install
+SUBST_STAGE.install= do-configure
+SUBST_MESSAGE.install= Preparing INSTALL.pkgsrc file ...
+SUBST_FILES.install= ${WRKDIR}/INSTALL.pkgsrc
+SUBST_SED.install= -e 's,$${PREFIX},${PREFIX},g'
+
post-extract:
${MKDIR} ${WRKSRC}/doc/api/latex_src
${LN} -s ../../examples/largedemo/largedemo-setup.jpg ${WRKSRC}/doc/api/latex_src
@@ -45,11 +58,17 @@ post-extract:
${LN} -s ../../examples/largedemo/largedemo-wiring2.jpg ${WRKSRC}/doc/api/latex_src
${LN} -s ../../examples/stdiodemo/stdiodemo-setup.jpg ${WRKSRC}/doc/api/latex_src
+pre-configure:
+ ${CP} ${FILESDIR}/INSTALL.pkgsrc ${WRKDIR}
+
post-install:
- ${INSTALL_DATA} \
- ${WRKSRC}/LICENSE \
- ${WRKSRC}/AUTHORS \
- ${DESTDIR}${PREFIX}/share/doc/avr-libc
+ ${INSTALL_DATA} \
+ ${WRKSRC}/LICENSE \
+ ${WRKSRC}/AUTHORS \
+ ${DESTDIR}${PREFIX}/share/doc/avr-libc
+ ${INSTALL_DATA} \
+ ${WRKDIR}/INSTALL.pkgsrc \
+ ${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} -f ${DESTDIR}${PREFIX}/share/doc/avr-libc/man/man3/*${PKGVERSION_NOREV}*
Home |
Main Index |
Thread Index |
Old Index