From owner-svn-ports-head@FreeBSD.ORG Tue Oct 23 20:53:48 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E5A68D8; Tue, 23 Oct 2012 20:53:48 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C97388FC12; Tue, 23 Oct 2012 20:53:48 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9NKrmsC054733; Tue, 23 Oct 2012 20:53:48 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9NKrmpm054731; Tue, 23 Oct 2012 20:53:48 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201210232053.q9NKrmpm054731@svn.freebsd.org> From: Rene Ladan Date: Tue, 23 Oct 2012 20:53:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r306327 - head/devel/log4cxx 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.14 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: Tue, 23 Oct 2012 20:53:49 -0000 Author: rene Date: Tue Oct 23 20:53:48 2012 New Revision: 306327 URL: http://svn.freebsd.org/changeset/ports/306327 Log: - convert an implicit dependency on doxygen into an explicit option - explicitly use optionsNG - bump PORTREVISION Feature safe: yes Modified: head/devel/log4cxx/Makefile (contents, props changed) Modified: head/devel/log4cxx/Makefile ============================================================================== --- head/devel/log4cxx/Makefile Tue Oct 23 20:32:59 2012 (r306326) +++ head/devel/log4cxx/Makefile Tue Oct 23 20:53:48 2012 (r306327) @@ -3,7 +3,7 @@ PORTNAME= log4cxx PORTVERSION= 0.10.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_APACHE} MASTER_SITE_SUBDIR= logging/${PORTNAME}/${PORTVERSION} @@ -16,17 +16,18 @@ LICENSE= AL2 LIB_DEPENDS= apr-1:${PORTSDIR}/devel/apr1 -.if !defined(NOPORTDOCS) && defined(WITH_DOXYGEN) +OPTIONS_DEFINE= BOOST DOXYGEN +OPTIONS_DEFAULT= + +.include + +.if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MDOXYGEN} BUILD_DEPENDS+= ${LOCALBASE}/bin/doxygen:${PORTSDIR}/devel/doxygen .else CONFIGURE_ARGS+= --disable-doxygen .endif -.if exists(${LOCALBASE}/lib/libboost_regex.so) -WITH_BOOST= yes -.endif - -.if defined(WITH_BOOST) +.if ${PORT_OPTIONS:MBOOST} BUILD_DEPENDS+= ${LOCALBASE}/include/boost/regex.hpp:${PORTSDIR}/devel/boost-libs .endif @@ -37,7 +38,7 @@ MAKE_JOBS_UNSAFE= yes USE_LDCONFIG= yes -.if !defined(NOPORTDOCS) && defined(WITH_DOXYGEN) +.if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MDOXYGEN} PORTDOCS= * .endif @@ -48,7 +49,7 @@ pre-configure: @${REINPLACE_CMD} -e 's|GREP "\\-L"|GREP "conftest\\.$$objext"|g' ${WRKSRC}/configure post-install: -.if !defined(NOPORTDOCS) && defined(WITH_DOXYGEN) +.if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MDOXYGEN} ${MKDIR} ${DOCSDIR} for f in ${PORTDOCS}; do \ ${INSTALL_DATA} ${WRKSRC}/$$f ${DOCSDIR}; \