From owner-svn-ports-head@FreeBSD.ORG Mon Sep 1 19:26:04 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 803752BE; Mon, 1 Sep 2014 19:26:04 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5147C17AA; Mon, 1 Sep 2014 19:26:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s81JQ40G011891; Mon, 1 Sep 2014 19:26:04 GMT (envelope-from adamw@FreeBSD.org) Received: (from adamw@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s81JQ4IV011890; Mon, 1 Sep 2014 19:26:04 GMT (envelope-from adamw@FreeBSD.org) Message-Id: <201409011926.s81JQ4IV011890@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: adamw set sender to adamw@FreeBSD.org using -f From: Adam Weinberger Date: Mon, 1 Sep 2014 19:26:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r366936 - head/devel/avr-libc X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Sep 2014 19:26:04 -0000 Author: adamw Date: Mon Sep 1 19:26:03 2014 New Revision: 366936 URL: http://svnweb.freebsd.org/changeset/ports/366936 QAT: https://qat.redports.org/buildarchive/r366936/ Log: The doxygen build was failing on 8 and 9 for non-obvious reasons. As a stopgap (and as a favour to anyone building from ports ;-), change the DOCS option to DOXYGEN, and default it to off. THere are still some stage-qa issues but it should build and package on all platforms now. Approved by: joerg (maintainer) Modified: head/devel/avr-libc/Makefile Modified: head/devel/avr-libc/Makefile ============================================================================== --- head/devel/avr-libc/Makefile Mon Sep 1 19:18:57 2014 (r366935) +++ head/devel/avr-libc/Makefile Mon Sep 1 19:26:03 2014 (r366936) @@ -3,6 +3,7 @@ PORTNAME= avr-libc PORTVERSION= 1.8.1 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= SAVANNAH @@ -21,15 +22,15 @@ RUN_DEPENDS= avr-as:${PORTSDIR}/devel/av avr-ld:${PORTSDIR}/devel/avr-binutils \ avr-gcc:${PORTSDIR}/devel/avr-gcc -OPTIONS_DEFINE= DOCS +OPTIONS_DEFINE= DOXYGEN .include -.if ! ${PORT_OPTIONS:MDOCS} +.if ! ${PORT_OPTIONS:MDOXYGEN} .undef WITHOUT_AVRLIBCDOCS= true .endif -.if ${PORT_OPTIONS:MDOCS} +.if ${PORT_OPTIONS:MDOXYGEN} USE_TEX= latex:build BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen \ fig2dev:${PORTSDIR}/print/transfig \ @@ -41,7 +42,7 @@ USES= gettext:build tar:bzip2 gmake HAS_CONFIGURE= yes CONFIGURE_ENV= CC=avr-gcc PREFIX=${PREFIX} -.if ${PORT_OPTIONS:MDOCS} +.if ${PORT_OPTIONS:MDOXYGEN} CONFIGURE_ARGS= --build=`./config.guess` --host=avr \ --enable-doc --disable-versioned-doc --prefix=${PREFIX} \ --mandir=${PREFIX}/share/doc/avr-libc/man @@ -58,13 +59,13 @@ CFLAGS+= -O CXXFLAGS+= -O post-patch: -.if ! ${PORT_OPTIONS:MDOCS} +.if ! ${PORT_OPTIONS:MDOXYGEN} ${REINPLACE_CMD} -e '/SUBDIRS/s,examples,,' ${WRKSRC}/doc/Makefile.in .endif do-install: ${RM} -f ${TMPPLIST} -.if ${PORT_OPTIONS:MDOCS} +.if ${PORT_OPTIONS:MDOXYGEN} (cd ${BUILD_WRKSRC}/doc/api/avr-libc-user-manual && \ ${FIND} . -type f \ \( -name '*.html' -or -name '*.css' -or \