From e3ed04e74d073951233b85d994850ff7dcd51d24 Mon Sep 17 00:00:00 2001 From: wennmach Date: Wed, 13 Dec 2006 21:23:45 +0000 Subject: - Fix build on DragonFly - Fix building documentation (PDF files) From Joerg Sonnenberger in private e-mail with some minor modifications by myself. Thanks, Joerg! --- cross/avr-libc/Makefile | 27 +++++++++++-------- cross/avr-libc/distinfo | 3 ++- cross/avr-libc/patches/patch-aa | 58 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 76 insertions(+), 12 deletions(-) create mode 100644 cross/avr-libc/patches/patch-aa diff --git a/cross/avr-libc/Makefile b/cross/avr-libc/Makefile index 185487e6b67..0d71a942024 100644 --- a/cross/avr-libc/Makefile +++ b/cross/avr-libc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/06/30 07:02:51 joerg Exp $ +# $NetBSD: Makefile,v 1.12 2006/12/13 21:23:45 wennmach Exp $ DISTNAME= avr-libc-1.2.5 PKGREVISION= 3 @@ -17,11 +17,13 @@ BUILD_DEPENDS+= doxygen>=1.4.7:../../devel/doxygen BUILD_DEPENDS+= transfig-[0-9]*:../../print/transfig BUILD_DEPENDS+= netpbm-[0-9]*:../../graphics/netpbm -USE_BZIP2= yes USE_TOOLS+= gmake +USE_TOOLS+= perl HAS_CONFIGURE= yes -CONFIGURE_ENV+= CC=${LOCALBASE}/bin/avr-gcc -CONFIGURE_ENV+= PREFIX=${PREFIX:Q} +CONFIGURE_ENV+= AS=${PREFIX}/bin/avr-as +CONFIGURE_ENV+= AR=${PREFIX}/bin/avr-ar +CONFIGURE_ENV+= RANLIB=${PREFIX}/bin/avr-ranlib +CONFIGURE_ENV+= CC=${PREFIX}/bin/avr-gcc CONFIGURE_ARGS+= --enable-doc CONFIGURE_ARGS+= --disable-versioned-doc # avr-libc's method to build the man pages seems to be broken @@ -29,11 +31,14 @@ CONFIGURE_ARGS+= --disable-man-doc CONFIGURE_SCRIPT= ${SRCDIR}/doconf SRCDIR= ${WRKDIR}/${DISTNAME} +post-extract: + ${INSTALL} -m 755 ${PKGSRCDIR}/mk/gnu-config/config.guess ${WRKSRC}/config.guess + do-build: - (cd ${WRKSRC}; ./domake MAKE=${GMAKE}) + cd ${WRKSRC} && ./domake MAKE=${GMAKE:Q} do-install: - (cd ${WRKSRC}; ./domake MAKE=${GMAKE} install) + cd ${WRKSRC} && ./domake MAKE=${GMAKE:Q} install ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/avr-libc ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/avr-libc/examples ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/avr-libc/examples/demo @@ -42,21 +47,21 @@ do-install: ${WRKSRC}/LICENSE \ ${WRKSRC}/AUTHORS \ ${PREFIX}/share/doc/avr-libc - @for f in avr-recv.c io.c prg printf.h progmem.c \ + for f in avr-recv.c io.c prg printf.h progmem.c \ send_byte.s signal.c;\ do \ ${INSTALL_DATA} ${WRKSRC}/doc/examples/$$f \ ${PREFIX}/share/doc/avr-libc/examples; \ done - (cd ${WRKSRC}/doc/examples/demo; ${GMAKE}) - (cd ${WRKSRC}/doc/examples/demo; ${GMAKE} dox) - @for f in Makefile demo.c demo.bin demo.hex demo.pdf \ + cd ${WRKSRC}/doc/examples/demo && ${GMAKE} + cd ${WRKSRC}/doc/examples/demo && ${GMAKE} dox + for f in Makefile demo.c demo.bin demo.hex demo.pdf \ demo.srec;\ do \ ${INSTALL_DATA} ${WRKSRC}/doc/examples/demo/$$f \ ${PREFIX}/share/doc/avr-libc/examples/demo; \ done - @for f in Makefile twitest.c;\ + for f in Makefile twitest.c;\ do \ ${INSTALL_DATA} ${WRKSRC}/doc/examples/twitest/$$f \ ${PREFIX}/share/doc/avr-libc/examples/twitest; \ diff --git a/cross/avr-libc/distinfo b/cross/avr-libc/distinfo index 03d9231f4ee..a47ce228a15 100644 --- a/cross/avr-libc/distinfo +++ b/cross/avr-libc/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.4 2005/08/15 08:45:54 wennmach Exp $ +$NetBSD: distinfo,v 1.5 2006/12/13 21:23:45 wennmach Exp $ SHA1 (avr-libc-1.2.5.tar.bz2) = 2750aa701f9c91a364e625caf07c0e71bcc20d67 RMD160 (avr-libc-1.2.5.tar.bz2) = daa06bb5b2d6675d2f240c007293d59510b089f8 Size (avr-libc-1.2.5.tar.bz2) = 319622 bytes +SHA1 (patch-aa) = 26496bdf63977bb0528887cd8d0dc34f5671865e SHA1 (patch-ab) = 0a130048451dee029ed3e07a3cde2819905d79f5 diff --git a/cross/avr-libc/patches/patch-aa b/cross/avr-libc/patches/patch-aa new file mode 100644 index 00000000000..b351f61802b --- /dev/null +++ b/cross/avr-libc/patches/patch-aa @@ -0,0 +1,58 @@ +$NetBSD: patch-aa,v 1.4 2006/12/13 21:23:45 wennmach Exp $ + +--- doc/api/Makefile.in.orig 2005-07-31 22:31:26.000000000 +0000 ++++ doc/api/Makefile.in +@@ -147,7 +147,7 @@ FIG2DEV = fig2dev + IMAGE_SRC = malloc-std.fig malloc-x1.fig malloc-x2.fig releases.fig + + IMAGE_PNG = $(IMAGE_SRC:.fig=.png) +- ++IMAGE_PDF = $(IMAGE_SRC:.fig=.pdf) + IMAGE_EPS = $(IMAGE_SRC:.fig=.eps) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_CLEAN_FILES = doxygen.config +@@ -269,6 +269,8 @@ demo: + ${MAKE} DEFS="-I$(top_srcdir)/include" \ + LIBS="$$NODEFLIBS $(DEMO_LIBS)" dox all + ++.fig.pdf: ++ $(FIG2DEV) -L pdf $< $@ + .fig.eps: + $(FIG2DEV) -L eps $< $@ + +@@ -287,7 +289,7 @@ fix_png: $(wildcard $(USER_MANUAL)/*.png + for png in *.png; do \ + echo "Fixing transparency for $$png"; \ + $(PNGTOPNM) $$png > tmp.pnm; \ +- $(PNMTOPNG) -transparent white tmp.pnm > $$png && rm tmp.pnm; \ ++ $(PNMTOPNG) -transparent "#ffffff" tmp.pnm > $$png && rm tmp.pnm; \ + done + echo timestamp > fix_png + +@@ -346,9 +348,15 @@ latex_src/refman.tex: doxygen.config $(I + -e '/Architecture/s/\\\\\\hline/\\endhead\\hline/' \ + using_tools.tex > tmp.$$ && \ + mv -f tmp.$$ using_tools.tex ++ cd latex_src && \ ++ sed -e 's/{demo}/{demo\.eps}/' \ ++ group__demo__project.tex > tmp.$$ && \ ++ mv -f tmp.$$ group__demo__project.tex + +-latex_pdf_src/refman.tex: doxygen-pdf.config $(IMAGE_EPS) ++latex_pdf_src/refman.tex: doxygen-pdf.config ${IMAGE_PDF} + doxygen doxygen-pdf.config ++ cp ../../../doc/examples/demo/demo.pdf latex_pdf_src/ ++ cp ${IMAGE_PDF} latex_pdf_src/ + cd latex_pdf_src && \ + sed -e '/tocdepth/s/1/3/' \ + -e '/usepackage{doxygen}/s/$$/\\usepackage{longtable}/' \ +@@ -367,7 +375,8 @@ latex_pdf_src/refman.tex: doxygen-pdf.co + using_tools.tex > tmp.$$ && \ + mv -f tmp.$$ using_tools.tex + cd latex_pdf_src && \ +- sed -e '/{demo.eps}/s/demo.eps/demo.pdf/' \ ++ sed -e 's/{demo}/{demo\.pdf}/' \ ++ -e '/{demo.eps}/s/demo.eps/demo.pdf/' \ + group__demo__project.tex > tmp.$$ && \ + mv -f tmp.$$ group__demo__project.tex + -- cgit v1.2.3