From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Dec 19 03:40:01 2012 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0AFB4FD8 for ; Wed, 19 Dec 2012 03:40:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id C77C78FC13 for ; Wed, 19 Dec 2012 03:40:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id qBJ3e0NE056953 for ; Wed, 19 Dec 2012 03:40:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id qBJ3e056056952; Wed, 19 Dec 2012 03:40:00 GMT (envelope-from gnats) Resent-Date: Wed, 19 Dec 2012 03:40:00 GMT Resent-Message-Id: <201212190340.qBJ3e056056952@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "4721@hushmail.com" <4721@hushmail.com> Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 06FE0FC1 for ; Wed, 19 Dec 2012 03:37:33 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id E18408FC0C for ; Wed, 19 Dec 2012 03:37:32 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.5/8.14.5) with ESMTP id qBJ3bW5u039767 for ; Wed, 19 Dec 2012 03:37:32 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.5/8.14.5/Submit) id qBJ3bWon039766; Wed, 19 Dec 2012 03:37:32 GMT (envelope-from nobody) Message-Id: <201212190337.qBJ3bWon039766@red.freebsd.org> Date: Wed, 19 Dec 2012 03:37:32 GMT From: "4721@hushmail.com" <4721@hushmail.com> To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/174559: [patch] add vendor patchset to devel/avr-libc X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Dec 2012 03:40:01 -0000 >Number: 174559 >Category: ports >Synopsis: [patch] add vendor patchset to devel/avr-libc >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Dec 19 03:40:00 UTC 2012 >Closed-Date: >Last-Modified: >Originator: 4721@hushmail.com >Release: >Organization: >Environment: >Description: * add vendor patchset and extra headers to devel/avr-libc * remove duplicate avr-binutils depend * change to optionsng >How-To-Repeat: >Fix: Patch attached with submission follows: Index: devel/avr-libc/Makefile =================================================================== --- devel/avr-libc/Makefile (revision 309150) +++ devel/avr-libc/Makefile (working copy) @@ -7,10 +7,17 @@ PORTNAME= avr-libc PORTVERSION= 1.8.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_SAVANNAH} +MASTER_SITES= ${MASTER_SITE_SAVANNAH} \ + http://distribute.atmel.no/tools/opensource/Atmel-AVR-Toolchain-3.4.1.830/avr/:patches MASTER_SITE_SUBDIR= ${PORTNAME} +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ + avr-patches.tar.gz:patches \ + avr-headers-${HEADER_VERSION}.zip:patches +DIST_SUBDIR= ${PKGNAMEPREFIX}${PORTNAME}/${PORTVERSION} +EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= joerg@FreeBSD.org COMMENT= A C and math library for the Atmel AVR controller family @@ -19,24 +26,23 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= avr-as:${PORTSDIR}/devel/avr-binutils \ - avr-ld:${PORTSDIR}/devel/avr-binutils \ avr-gcc:${PORTSDIR}/devel/avr-gcc RUN_DEPENDS= avr-as:${PORTSDIR}/devel/avr-binutils \ - avr-ld:${PORTSDIR}/devel/avr-binutils \ avr-gcc:${PORTSDIR}/devel/avr-gcc -.if !defined(NOPORTDOCS) -OPTIONS= AVRLIBCDOCS "Build avr-libc documents" off +.if exists(/usr/bin/unzip) +UNZIP_CMD=/usr/bin/unzip +.else +EXTRACT_DEPENDS+=unzip:${PORTSDIR}/archivers/unzip +UNZIP_CMD=${LOCALBASE}/bin/unzip .endif +OPTIONS_DEFINE= DOCS +OPTIONS_UNSET= DOCS + .include -.if defined(WITHOUT_AVRLIBCDOCS) || defined(NOPORTDOCS) -WITHOUT_AVRLIBCDOCS= true -.undef WITH_AVRLIBCDOCS -.endif - -.if defined(WITH_AVRLIBCDOCS) +.if ${PORT_OPTIONS:MDOCS} BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen \ latex:${PORTSDIR}/print/teTeX \ pdflatex:${PORTSDIR}/print/teTeX \ @@ -44,6 +50,8 @@ jpegtopnm:${PORTSDIR}/graphics/netpbm .endif +HEADER_VERSION= 6.1.0.1157 +EXTRA_PATCHES= ${WRKDIR}/avr-patches/${PORTNAME}/* USE_BZIP2= yes USE_GMAKE= yes USE_GETTEXT= build @@ -53,14 +61,11 @@ CONFLICTS= avr-libc-devel-[0-9]* CONFIGURE_ENV= CC=avr-gcc PREFIX=${PREFIX} -.if defined(WITH_AVRLIBCDOCS) -CONFIGURE_ARGS= --build=`./config.guess` --host=avr \ - --enable-doc --disable-versioned-doc --prefix=${PREFIX} \ - --mandir=${PREFIX}/share/doc/avr-libc/man +CONFIGURE_ARGS= --build=`./config.guess` --host=avr --prefix=${PREFIX} +.if${PORT_OPTIONS:MDOCS} +CONFIGURE_ARGS+=--enable-doc --disable-versioned-doc \ + --mandir=${PREFIX}/share/doc/avr-libc/man PLIST_DOC= ${PKGDIR}/pkg-plist.doc -.else -CONFIGURE_ARGS= --build=`./config.guess` --host=avr --prefix=${PREFIX} -PLIST_DOC= .endif # Work around the braind***ness introduced by in freebsd-5. # Sorry, the user is no longer be able to override the optimization and @@ -69,36 +74,45 @@ CFLAGS= -O CXXFLAGS= -O +post-extract: + ${TAR} -C ${WRKDIR} --no-same-owner --no-same-permissions -z -x \ + -f ${DISTDIR}/${DIST_SUBDIR}/avr-patches.tar.gz + ${UNZIP_CMD} -q -d ${WRKDIR} \ + ${DISTDIR}/${DIST_SUBDIR}/avr-headers-${HEADER_VERSION}.zip + ${CHMOD} -R a-x ${WRKDIR}/avr/ + post-patch: -.if defined(WITHOUT_AVRLIBCDOCS) +.if !${PORT_OPTIONS:MDOCS} ${REINPLACE_CMD} -e '/SUBDIRS/s,examples,,' ${WRKSRC}/doc/Makefile.in .endif + ${TAR} -C ${WRKDIR}/ -c -f - avr | ${TAR} -C ${WRKSRC}/include/ -k \ + --no-same-owner --no-same-permissions -x -f - \ + >/dev/null 2>&1 || ${TRUE} do-install: - ${RM} -f ${TMPPLIST} -.if defined(WITH_AVRLIBCDOCS) - (cd ${BUILD_WRKSRC}/doc/api/avr-libc-user-manual && \ - ${FIND} . -type f \ - \( -name '*.html' -or -name '*.css' -or \ - -name '*.jpg' -or -name '*.png' \) |\ - ${SORT} |\ - ${SED} -e 's|^\.|share/doc/avr-libc/avr-libc-user-manual|' \ - >> ${TMPPLIST}) - (cd ${BUILD_WRKSRC}/doc/api/man/man3 && \ - ${FIND} . -type f |\ - ${SORT} |\ - ${SED} -e 's|^\.|share/doc/avr-libc/man/man3|' \ - >> ${TMPPLIST}) - ${CAT} ${PLIST_DOC} >> ${TMPPLIST} + ${RM} -f ${TMPPLIST} +.if ${PORT_OPTIONS:MDOCS} + (cd ${BUILD_WRKSRC}/doc/api/avr-libc-user-manual && \ + ${FIND} . -type f \ + \( -name '*.html' -or -name '*.css' -or \ + -name '*.jpg' -or -name '*.png' \) |\ + ${SORT} |\ + ${SED} -e 's|^\.|share/doc/avr-libc/avr-libc-user-manual|' \ + >> ${TMPPLIST}) + (cd ${BUILD_WRKSRC}/doc/api/man/man3 && \ + ${FIND} . -type f |\ + ${SORT} |\ + ${SED} -e 's|^\.|share/doc/avr-libc/man/man3|' \ + >> ${TMPPLIST}) + ${CAT} ${PLIST_DOC} >> ${TMPPLIST} .endif - ${CAT} ${PLIST} >> ${TMPPLIST} - @for file in ${PLIST_FILES}; do \ - ${ECHO_CMD} $${file} >> ${TMPPLIST}; \ - done - (cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} install) - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} \ - ${WRKDIR}/${DISTNAME}/AUTHORS \ - ${DOCSDIR} + ${CAT} ${PLIST} >> ${TMPPLIST} + @for file in ${PLIST_FILES}; do \ + ${ECHO_CMD} $${file} >> ${TMPPLIST}; \ + done + (cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} install) + ${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/AUTHORS ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/include/avr/*.h ${PREFIX}/avr/include/avr/ .include Index: devel/avr-libc/distinfo =================================================================== --- devel/avr-libc/distinfo (revision 309150) +++ devel/avr-libc/distinfo (working copy) @@ -1,2 +1,6 @@ -SHA256 (avr-libc-1.8.0.tar.bz2) = 67a36bdb43a16f9b0512ba09584d4785f9bce6c057393f1020a5552e096e34ce -SIZE (avr-libc-1.8.0.tar.bz2) = 1428776 +SHA256 (avr-libc/1.8.0/avr-libc-1.8.0.tar.bz2) = 67a36bdb43a16f9b0512ba09584d4785f9bce6c057393f1020a5552e096e34ce +SIZE (avr-libc/1.8.0/avr-libc-1.8.0.tar.bz2) = 1428776 +SHA256 (avr-libc/1.8.0/avr-patches.tar.gz) = 5f7ed872ca85c46f44f0fe0b109185e304ca9463ed312c17a811852508245681 +SIZE (avr-libc/1.8.0/avr-patches.tar.gz) = 174104 +SHA256 (avr-libc/1.8.0/avr-headers-6.1.0.1157.zip) = abbc5ea0db0a128cf5ceca288b9187bdfb8fd0c1af367d1acbbbde09a49bd308 +SIZE (avr-libc/1.8.0/avr-headers-6.1.0.1157.zip) = 2707848 Index: devel/avr-libc/pkg-plist =================================================================== --- devel/avr-libc/pkg-plist (revision 309150) +++ devel/avr-libc/pkg-plist (working copy) @@ -26,6 +26,7 @@ avr/include/avr/io8535.h avr/include/avr/io86r401.h avr/include/avr/io90pwm1.h +avr/include/avr/io90pwm161.h avr/include/avr/io90pwm216.h avr/include/avr/io90pwm2b.h avr/include/avr/io90pwm316.h @@ -33,6 +34,12 @@ avr/include/avr/io90pwm81.h avr/include/avr/io90pwmx.h avr/include/avr/io90scr100.h +avr/include/avr/ioa5272.h +avr/include/avr/ioa5505.h +avr/include/avr/ioa5790.h +avr/include/avr/ioa5795.h +avr/include/avr/ioa6285.h +avr/include/avr/ioa6286.h avr/include/avr/ioa6289.h avr/include/avr/ioat94k.h avr/include/avr/iocan128.h @@ -43,18 +50,29 @@ avr/include/avr/iom128.h avr/include/avr/iom1280.h avr/include/avr/iom1281.h +avr/include/avr/iom1284.h avr/include/avr/iom1284p.h +avr/include/avr/iom128a.h avr/include/avr/iom128rfa1.h +avr/include/avr/iom128rfr2.h avr/include/avr/iom16.h avr/include/avr/iom161.h avr/include/avr/iom162.h avr/include/avr/iom163.h avr/include/avr/iom164.h +avr/include/avr/iom164a.h +avr/include/avr/iom164p.h +avr/include/avr/iom164pa.h avr/include/avr/iom165.h +avr/include/avr/iom165a.h avr/include/avr/iom165p.h +avr/include/avr/iom165pa.h avr/include/avr/iom168.h +avr/include/avr/iom168a.h avr/include/avr/iom168p.h +avr/include/avr/iom168pa.h avr/include/avr/iom169.h +avr/include/avr/iom169a.h avr/include/avr/iom169p.h avr/include/avr/iom169pa.h avr/include/avr/iom16a.h @@ -67,16 +85,33 @@ avr/include/avr/iom16u4.h avr/include/avr/iom2560.h avr/include/avr/iom2561.h +avr/include/avr/iom256rfr2.h avr/include/avr/iom3000.h avr/include/avr/iom32.h avr/include/avr/iom323.h avr/include/avr/iom324.h +avr/include/avr/iom324a.h +avr/include/avr/iom324p.h avr/include/avr/iom324pa.h avr/include/avr/iom325.h avr/include/avr/iom3250.h +avr/include/avr/iom3250a.h +avr/include/avr/iom3250p.h +avr/include/avr/iom3250pa.h +avr/include/avr/iom325a.h +avr/include/avr/iom325p.h +avr/include/avr/iom325pa.h +avr/include/avr/iom328.h avr/include/avr/iom328p.h avr/include/avr/iom329.h avr/include/avr/iom3290.h +avr/include/avr/iom3290a.h +avr/include/avr/iom3290p.h +avr/include/avr/iom3290pa.h +avr/include/avr/iom329a.h +avr/include/avr/iom329p.h +avr/include/avr/iom329pa.h +avr/include/avr/iom32a.h avr/include/avr/iom32c1.h avr/include/avr/iom32hvb.h avr/include/avr/iom32hvbrevb.h @@ -86,26 +121,40 @@ avr/include/avr/iom32u6.h avr/include/avr/iom406.h avr/include/avr/iom48.h +avr/include/avr/iom48a.h avr/include/avr/iom48p.h +avr/include/avr/iom48pa.h avr/include/avr/iom64.h avr/include/avr/iom640.h avr/include/avr/iom644.h +avr/include/avr/iom644a.h avr/include/avr/iom644p.h avr/include/avr/iom644pa.h avr/include/avr/iom645.h avr/include/avr/iom6450.h +avr/include/avr/iom6450a.h +avr/include/avr/iom6450p.h +avr/include/avr/iom645a.h +avr/include/avr/iom645p.h avr/include/avr/iom649.h avr/include/avr/iom6490.h +avr/include/avr/iom6490a.h +avr/include/avr/iom6490p.h +avr/include/avr/iom649a.h avr/include/avr/iom649p.h +avr/include/avr/iom64a.h avr/include/avr/iom64c1.h avr/include/avr/iom64hve.h avr/include/avr/iom64m1.h +avr/include/avr/iom64rfr2.h avr/include/avr/iom8.h avr/include/avr/iom8515.h avr/include/avr/iom8535.h avr/include/avr/iom88.h +avr/include/avr/iom88a.h avr/include/avr/iom88p.h avr/include/avr/iom88pa.h +avr/include/avr/iom8a.h avr/include/avr/iom8hva.h avr/include/avr/iom8u2.h avr/include/avr/iomx8.h @@ -118,6 +167,7 @@ avr/include/avr/iotn13.h avr/include/avr/iotn13a.h avr/include/avr/iotn15.h +avr/include/avr/iotn1634.h avr/include/avr/iotn167.h avr/include/avr/iotn20.h avr/include/avr/iotn22.h @@ -141,6 +191,7 @@ avr/include/avr/iotn461a.h avr/include/avr/iotn48.h avr/include/avr/iotn5.h +avr/include/avr/iotn828.h avr/include/avr/iotn84.h avr/include/avr/iotn84a.h avr/include/avr/iotn85.h @@ -163,20 +214,46 @@ avr/include/avr/iox128a1.h avr/include/avr/iox128a1u.h avr/include/avr/iox128a3.h +avr/include/avr/iox128a3u.h +avr/include/avr/iox128a4u.h +avr/include/avr/iox128b1.h +avr/include/avr/iox128b3.h +avr/include/avr/iox128c3.h avr/include/avr/iox128d3.h +avr/include/avr/iox128d4.h avr/include/avr/iox16a4.h +avr/include/avr/iox16a4u.h +avr/include/avr/iox16c4.h avr/include/avr/iox16d4.h +avr/include/avr/iox16e5.h avr/include/avr/iox192a3.h +avr/include/avr/iox192a3u.h +avr/include/avr/iox192c3.h avr/include/avr/iox192d3.h avr/include/avr/iox256a3.h avr/include/avr/iox256a3b.h +avr/include/avr/iox256a3bu.h +avr/include/avr/iox256a3u.h +avr/include/avr/iox256c3.h avr/include/avr/iox256d3.h avr/include/avr/iox32a4.h +avr/include/avr/iox32a4u.h +avr/include/avr/iox32c4.h avr/include/avr/iox32d4.h +avr/include/avr/iox32e5.h +avr/include/avr/iox384c3.h +avr/include/avr/iox384d3.h avr/include/avr/iox64a1.h avr/include/avr/iox64a1u.h avr/include/avr/iox64a3.h +avr/include/avr/iox64a3u.h +avr/include/avr/iox64a4u.h +avr/include/avr/iox64b1.h +avr/include/avr/iox64b3.h +avr/include/avr/iox64c3.h avr/include/avr/iox64d3.h +avr/include/avr/iox64d4.h +avr/include/avr/iox8e5.h avr/include/avr/lock.h avr/include/avr/parity.h avr/include/avr/pgmspace.h >Release-Note: >Audit-Trail: >Unformatted: