diff options
| -rw-r--r-- | cross/avr-libc/Makefile | 10 | ||||
| -rw-r--r-- | cross/avr-libc/PLIST | 57 | ||||
| -rw-r--r-- | cross/avr-libc/distinfo | 4 | ||||
| -rw-r--r-- | cross/avr-libc/patches/patch-aa | 15 | ||||
| -rw-r--r-- | cross/avr-libc/patches/patch-doc_api_Makefile_am | 16 |
5 files changed, 75 insertions, 27 deletions
diff --git a/cross/avr-libc/Makefile b/cross/avr-libc/Makefile index 30f86bdb52a..089fbbcf4b2 100644 --- a/cross/avr-libc/Makefile +++ b/cross/avr-libc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2012/08/18 14:46:26 dsainty Exp $ +# $NetBSD: Makefile,v 1.20 2012/08/18 15:13:51 dsainty Exp $ DISTNAME= avr-libc-1.6.7 PKGREVISION= 1 @@ -15,11 +15,11 @@ PKG_DESTDIR_SUPPORT= user-destdir BUILD_DEPENDS+= avr-binutils-[0-9]*:../../cross/avr-binutils BUILD_DEPENDS+= avr-gcc-[0-9]*:../../cross/avr-gcc -BUILD_DEPENDS+= doxygen>=1.6.3nb1:../../devel/doxygen +BUILD_DEPENDS+= doxygen>=1.8.1.1nb1:../../devel/doxygen BUILD_DEPENDS+= transfig-[0-9]*:../../print/transfig BUILD_DEPENDS+= netpbm-[0-9]*:../../graphics/netpbm -USE_TOOLS+= gmake +USE_TOOLS+= aclocal autoconf autoheader automake gmake USE_TOOLS+= perl GNU_CONFIGURE= yes USE_GNU_CONFIGURE_HOST= no @@ -31,6 +31,10 @@ CONFIGURE_ARGS+= --build=${MACHINE_GNU_PLATFORM:Q} --host=avr CONFIGURE_ARGS+= --enable-doc CONFIGURE_ARGS+= --disable-versioned-doc +pre-configure: + set -e; cd ${WRKSRC}; \ + aclocal; autoheader; automake -a --foreign -i; autoconf + post-build: cd ${WRKSRC}/doc/examples/demo && ${GMAKE} cd ${WRKSRC}/doc/examples/demo && ${GMAKE} dox diff --git a/cross/avr-libc/PLIST b/cross/avr-libc/PLIST index 66bf30b3702..a152c2e32c9 100644 --- a/cross/avr-libc/PLIST +++ b/cross/avr-libc/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2010/08/05 15:50:22 drochner Exp $ +@comment $NetBSD: PLIST,v 1.11 2012/08/18 15:13:51 dsainty Exp $ avr/include/alloca.h avr/include/assert.h avr/include/avr/boot.h @@ -370,15 +370,34 @@ share/doc/avr-libc/avr-libc-user-manual/atoi_8S.html share/doc/avr-libc/avr-libc-user-manual/atol_8S.html share/doc/avr-libc/avr-libc-user-manual/atomic_8h.html share/doc/avr-libc/avr-libc-user-manual/avrs.png +share/doc/avr-libc/avr-libc-user-manual/bc_s.png +share/doc/avr-libc/avr-libc-user-manual/bdwn.png share/doc/avr-libc/avr-libc-user-manual/benchmarks.html share/doc/avr-libc/avr-libc-user-manual/boot_8h.html share/doc/avr-libc/avr-libc-user-manual/classes.html +share/doc/avr-libc/avr-libc-user-manual/closed.png share/doc/avr-libc/avr-libc-user-manual/crc16_8h.html share/doc/avr-libc/avr-libc-user-manual/ctype_8h.html share/doc/avr-libc/avr-libc-user-manual/delay_8h.html share/doc/avr-libc/avr-libc-user-manual/delay__basic_8h.html share/doc/avr-libc/avr-libc-user-manual/demo.png share/doc/avr-libc/avr-libc-user-manual/deprecated.html +share/doc/avr-libc/avr-libc-user-manual/dir_000000.html +share/doc/avr-libc/avr-libc-user-manual/dir_000001.html +share/doc/avr-libc/avr-libc-user-manual/dir_000002.html +share/doc/avr-libc/avr-libc-user-manual/dir_000003.html +share/doc/avr-libc/avr-libc-user-manual/dir_000004.html +share/doc/avr-libc/avr-libc-user-manual/dir_000005.html +share/doc/avr-libc/avr-libc-user-manual/dir_000006.html +share/doc/avr-libc/avr-libc-user-manual/dir_000007.html +share/doc/avr-libc/avr-libc-user-manual/dir_000008.html +share/doc/avr-libc/avr-libc-user-manual/dir_000009.html +share/doc/avr-libc/avr-libc-user-manual/dir_000010.html +share/doc/avr-libc/avr-libc-user-manual/dir_000011.html +share/doc/avr-libc/avr-libc-user-manual/dir_000012.html +share/doc/avr-libc/avr-libc-user-manual/dir_000013.html +share/doc/avr-libc/avr-libc-user-manual/dir_000014.html +share/doc/avr-libc/avr-libc-user-manual/dir_000015.html share/doc/avr-libc/avr-libc-user-manual/dox.css share/doc/avr-libc/avr-libc-user-manual/doxygen.png share/doc/avr-libc/avr-libc-user-manual/errno_8h.html @@ -387,6 +406,22 @@ share/doc/avr-libc/avr-libc-user-manual/ffs_8S.html share/doc/avr-libc/avr-libc-user-manual/ffsl_8S.html share/doc/avr-libc/avr-libc-user-manual/ffsll_8S.html share/doc/avr-libc/avr-libc-user-manual/files.html +share/doc/avr-libc/avr-libc-user-manual/ftv2blank.png +share/doc/avr-libc/avr-libc-user-manual/ftv2cl.png +share/doc/avr-libc/avr-libc-user-manual/ftv2doc.png +share/doc/avr-libc/avr-libc-user-manual/ftv2folderclosed.png +share/doc/avr-libc/avr-libc-user-manual/ftv2folderopen.png +share/doc/avr-libc/avr-libc-user-manual/ftv2lastnode.png +share/doc/avr-libc/avr-libc-user-manual/ftv2link.png +share/doc/avr-libc/avr-libc-user-manual/ftv2mlastnode.png +share/doc/avr-libc/avr-libc-user-manual/ftv2mnode.png +share/doc/avr-libc/avr-libc-user-manual/ftv2mo.png +share/doc/avr-libc/avr-libc-user-manual/ftv2node.png +share/doc/avr-libc/avr-libc-user-manual/ftv2ns.png +share/doc/avr-libc/avr-libc-user-manual/ftv2plastnode.png +share/doc/avr-libc/avr-libc-user-manual/ftv2pnode.png +share/doc/avr-libc/avr-libc-user-manual/ftv2splitbar.png +share/doc/avr-libc/avr-libc-user-manual/ftv2vertline.png share/doc/avr-libc/avr-libc-user-manual/functions.html share/doc/avr-libc/avr-libc-user-manual/functions_vars.html share/doc/avr-libc/avr-libc-user-manual/fuse_8h.html @@ -490,8 +525,8 @@ share/doc/avr-libc/avr-libc-user-manual/group__util__parity.html share/doc/avr-libc/avr-libc-user-manual/group__util__setbaud.html share/doc/avr-libc/avr-libc-user-manual/group__util__twi.html share/doc/avr-libc/avr-libc-user-manual/index.html -share/doc/avr-libc/avr-libc-user-manual/inline__asm.html -share/doc/avr-libc/avr-libc-user-manual/install__tools.html +share/doc/avr-libc/avr-libc-user-manual/inline_asm.html +share/doc/avr-libc/avr-libc-user-manual/install_tools.html share/doc/avr-libc/avr-libc-user-manual/interrupt_8h.html share/doc/avr-libc/avr-libc-user-manual/inttypes_8h.html share/doc/avr-libc/avr-libc-user-manual/io_8h.html @@ -505,7 +540,7 @@ share/doc/avr-libc/avr-libc-user-manual/malloc-x1.png share/doc/avr-libc/avr-libc-user-manual/malloc-x2.png share/doc/avr-libc/avr-libc-user-manual/malloc.html share/doc/avr-libc/avr-libc-user-manual/math_8h.html -share/doc/avr-libc/avr-libc-user-manual/mem__sections.html +share/doc/avr-libc/avr-libc-user-manual/mem_sections.html share/doc/avr-libc/avr-libc-user-manual/memccpy_8S.html share/doc/avr-libc/avr-libc-user-manual/memchr_8S.html share/doc/avr-libc/avr-libc-user-manual/memchr__P_8S.html @@ -519,6 +554,10 @@ share/doc/avr-libc/avr-libc-user-manual/memrchr_8S.html share/doc/avr-libc/avr-libc-user-manual/memrchr__P_8S.html share/doc/avr-libc/avr-libc-user-manual/memset_8S.html share/doc/avr-libc/avr-libc-user-manual/modules.html +share/doc/avr-libc/avr-libc-user-manual/nav_f.png +share/doc/avr-libc/avr-libc-user-manual/nav_g.png +share/doc/avr-libc/avr-libc-user-manual/nav_h.png +share/doc/avr-libc/avr-libc-user-manual/open.png share/doc/avr-libc/avr-libc-user-manual/overview.html share/doc/avr-libc/avr-libc-user-manual/pages.html share/doc/avr-libc/avr-libc-user-manual/parity_8h.html @@ -526,7 +565,7 @@ share/doc/avr-libc/avr-libc-user-manual/pgmspace.html share/doc/avr-libc/avr-libc-user-manual/pgmspace_8h.html share/doc/avr-libc/avr-libc-user-manual/porting.html share/doc/avr-libc/avr-libc-user-manual/power_8h.html -share/doc/avr-libc/avr-libc-user-manual/release__method.html +share/doc/avr-libc/avr-libc-user-manual/release_method.html share/doc/avr-libc/avr-libc-user-manual/releases.png share/doc/avr-libc/avr-libc-user-manual/setbaud_8h.html share/doc/avr-libc/avr-libc-user-manual/setjmp_8h.html @@ -586,10 +625,14 @@ share/doc/avr-libc/avr-libc-user-manual/strtok__r_8S.html share/doc/avr-libc/avr-libc-user-manual/structdiv__t.html share/doc/avr-libc/avr-libc-user-manual/structldiv__t.html share/doc/avr-libc/avr-libc-user-manual/strupr_8S.html +share/doc/avr-libc/avr-libc-user-manual/tab_a.png +share/doc/avr-libc/avr-libc-user-manual/tab_b.png +share/doc/avr-libc/avr-libc-user-manual/tab_h.png +share/doc/avr-libc/avr-libc-user-manual/tab_s.png share/doc/avr-libc/avr-libc-user-manual/tabs.css share/doc/avr-libc/avr-libc-user-manual/todo.html -share/doc/avr-libc/avr-libc-user-manual/using__avrprog.html -share/doc/avr-libc/avr-libc-user-manual/using__tools.html +share/doc/avr-libc/avr-libc-user-manual/using_avrprog.html +share/doc/avr-libc/avr-libc-user-manual/using_tools.html share/doc/avr-libc/avr-libc-user-manual/util_2twi_8h.html share/doc/avr-libc/avr-libc-user-manual/wdt_8h.html share/doc/avr-libc/examples/asmdemo/Makefile diff --git a/cross/avr-libc/distinfo b/cross/avr-libc/distinfo index 6015d859226..3da1c59c0e5 100644 --- a/cross/avr-libc/distinfo +++ b/cross/avr-libc/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.7 2010/04/05 00:36:42 jakllsch Exp $ +$NetBSD: distinfo,v 1.8 2012/08/18 15:13:51 dsainty Exp $ SHA1 (avr-libc-1.6.7.tar.bz2) = bed0bc1538735ab7049ab7af0b7d889b1a6f8956 RMD160 (avr-libc-1.6.7.tar.bz2) = a80048a715a8b56108e2f79f43dc82725a4bf0f8 Size (avr-libc-1.6.7.tar.bz2) = 1272043 bytes -SHA1 (patch-aa) = a888ec60f18e9021a9fca9ff04a4188fe03b102a +SHA1 (patch-doc_api_Makefile_am) = 6abe1acb37d87f310ad87f3d35b347f11dcc2a5c diff --git a/cross/avr-libc/patches/patch-aa b/cross/avr-libc/patches/patch-aa deleted file mode 100644 index d9a752a9042..00000000000 --- a/cross/avr-libc/patches/patch-aa +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-aa,v 1.6 2010/04/05 00:36:42 jakllsch Exp $ - ---- doc/api/Makefile.in.orig 2009-07-01 15:11:33.000000000 +0000 -+++ doc/api/Makefile.in -@@ -493,8 +493,8 @@ latex_src/refman.tex: doxygen.config $(I - sed -e '/{TabularC}{3}/s/{TabularC}{3}/{longtable}{|l|l|l|}/' \ - -e '/{longtable}{|l|l|l|}/,/TabularC/s/TabularC/longtable/' \ - -e '/Architecture/s/\\\\\\hline/\\endhead\\hline/' \ -- using_tools.tex > tmp.$$ && \ -- mv -f tmp.$$ using_tools.tex -+ using__tools.tex > tmp.$$ && \ -+ mv -f tmp.$$ using__tools.tex - - #doxygen.config: doxygen.config.in $(top_srcdir)/stamp-h1 - doxygen.config: doxygen.config.in diff --git a/cross/avr-libc/patches/patch-doc_api_Makefile_am b/cross/avr-libc/patches/patch-doc_api_Makefile_am new file mode 100644 index 00000000000..22005500897 --- /dev/null +++ b/cross/avr-libc/patches/patch-doc_api_Makefile_am @@ -0,0 +1,16 @@ +$NetBSD: patch-doc_api_Makefile_am,v 1.1 2012/08/18 15:13:51 dsainty Exp $ + +Doxygen produces man pages for the build directories too, which we really +don't want to install. These are tricky to match, but are the man pages +that start and finish with a single underscore character. Prune them out. + +--- doc/api/Makefile.am.orig 2008-11-07 10:42:52.000000000 +1300 ++++ doc/api/Makefile.am 2012-08-19 02:12:34.354453680 +1200 +@@ -230,6 +230,7 @@ + $(mkinstalldirs) $(DOC_INST_DIR)/man/man3 + @list='$(wildcard man/man3/*.3)'; \ + for file in $$list ; do \ ++ case "$$file" in */_[^_]*[^_]_.3) continue;; esac; \ + echo " $(INSTALL_DATA) $$file $(DOC_INST_DIR)/$$file"; \ + $(INSTALL_DATA) $$file $(DOC_INST_DIR)/$$file; \ + done |