Attachment 157091 Details for Bug 197422 – devel_log4cpp.diff

[patch] devel_log4cpp.diff

devel_log4cpp.diff (text/plain), 10.09 KB, created by tkato432 on 2015-05-23 22:30:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2015-05-23 22:30:07 UTC

Size: 10.09 KB

patch

obsolete

>diff -urN /usr/ports/devel/log4cpp/Makefile devel/log4cpp/Makefile
>--- /usr/ports/devel/log4cpp/Makefile	2014-12-03 08:21:13.000000000 +0900
>+++ devel/log4cpp/Makefile	2015-05-24 07:00:00.000000000 +0900
>@@ -2,38 +2,37 @@
> # $FreeBSD: head/devel/log4cpp/Makefile 373790 2014-12-02 22:40:56Z bapt $
> 
> PORTNAME=	log4cpp
>-DISTVERSION=	1.1
>-PORTREVISION=	1
>+DISTVERSION=	1.1.1
> CATEGORIES=	devel
>-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}.x%20%28new%29/${PORTNAME}-${PORTVERSION}
>+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}.x%20%28new%29/${PORTNAME}-${PORTVERSION:R}
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Library of C++ classes for flexible logging
> 
>+LICENSE=	LGPL21
>+
>+WRKSRC=		${WRKDIR}/${PORTNAME}
>+
> USES=		gmake libtool pathfix
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--with-pthreads --disable-html-docs
>+CONFIGURE_ARGS=	--disable-html-docs
>+INSTALL_TARGET=	install-strip
> USE_LDCONFIG=	yes
>-WRKSRC=		${WRKDIR}/${PORTNAME}
> 
>-# doxygen build is BROKEN atm
>-#.if exists (${LOCALBASE}/bin/doxygen) || ${PORT_OPTIONS:MDOCS}
>-#BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
>-#.else
>-CONFIGURE_ARGS+=	--disable-doxygen
>-#.endif
>-
>-#.if !exists (${LOCALBASE}/bin/doxygen) && ${PORT_OPTIONS:MDOCS}
>-#pre-everything::
>-#	@${ECHO_CMD}
>-#	@${ECHO_CMD} By default, this port uses doxygen to build its documentation.\
>-#It currently is not present your system, and if you do not want to install it, abort\
>-#this build by hitting CTRL+C and re-run the installation with OPTIONS_UNSET=DOCS | ${FMT} 74
>-#	@${ECHO_CMD}
>-#	@sleep 3
>-#.endif
>+OPTIONS_DEFINE=		DOXYGEN
>+OPTIONS_SUB=		yes
>+
>+DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
>+DOXYGEN_CONFIGURE_ENABLE=	doxygen
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's| -pedantic||g' ${WRKSRC}/configure
>+	@${REINPLACE_CMD} -e \
>+		's|^MAX_|#MAX_|' \
>+		${WRKSRC}/doc/Doxyfile.in
>+	@${REINPLACE_CMD} -e \
>+		's|$$(prefix)/doc/.*|@docdir@| ; \
>+		 s|$[[:blank:]]$$$$(man3dir)$|\1$$(DESTDIR)\2| ; \
>+		 s|$[[:blank:]]$$$$(docdir)$|\1$$(DESTDIR)\2|' \
>+		${WRKSRC}/doc/Makefile.in
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/devel/log4cpp/Makefile.man devel/log4cpp/Makefile.man
>--- /usr/ports/devel/log4cpp/Makefile.man	2014-06-21 17:53:21.000000000 +0900
>+++ devel/log4cpp/Makefile.man	1970-01-01 09:00:00.000000000 +0900
>@@ -1,72 +0,0 @@
>-# $FreeBSD: head/devel/log4cpp/Makefile.man 340722 2014-01-22 17:00:46Z mat $
>-
>-.if exists (${LOCALBASE}/bin/doxygen) || !defined (NOPORTDOCS)
>-MAN3+=	log4cpp.3
>-MAN3+=	log4cpp::AbortAppender.3
>-MAN3+=	log4cpp::Appender.3
>-MAN3+=	log4cpp::AppenderSkeleton.3
>-MAN3+=	log4cpp::AppendersFactory.3
>-MAN3+=	log4cpp::BasicConfigurator.3
>-MAN3+=	log4cpp::BasicLayout.3
>-MAN3+=	log4cpp::BufferingAppender.3
>-MAN3+=	log4cpp::Category.3
>-MAN3+=	log4cpp::CategoryNameComponent.3
>-MAN3+=	log4cpp::CategoryStream.3
>-MAN3+=	log4cpp::ConfigureFailure.3
>-MAN3+=	log4cpp::FactoryParams.3
>-MAN3+=	log4cpp::FileAppender.3
>-MAN3+=	log4cpp::Filter.3
>-MAN3+=	log4cpp::FixedContextCategory.3
>-MAN3+=	log4cpp::FormatModifierComponent.3
>-MAN3+=	log4cpp::HierarchyMaintainer.3
>-MAN3+=	log4cpp::IdsaAppender.3
>-MAN3+=	log4cpp::Layout.3
>-MAN3+=	log4cpp::LayoutAppender.3
>-MAN3+=	log4cpp::LayoutsFactory.3
>-MAN3+=	log4cpp::LevelEvaluator.3
>-MAN3+=	log4cpp::LoggingEvent.3
>-MAN3+=	log4cpp::MessageComponent.3
>-MAN3+=	log4cpp::MillisSinceEpochComponent.3
>-MAN3+=	log4cpp::NDC.3
>-MAN3+=	log4cpp::NDC::DiagnosticContext.3
>-MAN3+=	log4cpp::NDCComponent.3
>-MAN3+=	log4cpp::NTEventLogAppender.3
>-MAN3+=	log4cpp::OstreamAppender.3
>-MAN3+=	log4cpp::PassThroughLayout.3
>-MAN3+=	log4cpp::PatternLayout.3
>-MAN3+=	log4cpp::PatternLayout::PatternComponent.3
>-MAN3+=	log4cpp::Priority.3
>-MAN3+=	log4cpp::PriorityComponent.3
>-MAN3+=	log4cpp::ProcessorTimeComponent.3
>-MAN3+=	log4cpp::Properties.3
>-MAN3+=	log4cpp::PropertyConfigurator.3
>-MAN3+=	log4cpp::PropertyConfiguratorImpl.3
>-MAN3+=	log4cpp::RemoteSyslogAppender.3
>-MAN3+=	log4cpp::RollingFileAppender.3
>-MAN3+=	log4cpp::SecondsSinceEpochComponent.3
>-MAN3+=	log4cpp::SimpleConfigurator.3
>-MAN3+=	log4cpp::SimpleLayout.3
>-MAN3+=	log4cpp::StringLiteralComponent.3
>-MAN3+=	log4cpp::StringQueueAppender.3
>-MAN3+=	log4cpp::StringUtil.3
>-MAN3+=	log4cpp::SyslogAppender.3
>-MAN3+=	log4cpp::ThreadNameComponent.3
>-MAN3+=	log4cpp::TimeStamp.3
>-MAN3+=	log4cpp::TimeStampComponent.3
>-MAN3+=	log4cpp::TriggeringEventEvaluator.3
>-MAN3+=	log4cpp::TriggeringEventEvaluatorFactory.3
>-MAN3+=	log4cpp::Win32DebugAppender.3
>-MAN3+=	log4cpp::details.3
>-MAN3+=	log4cpp::details::base::validator::data.3
>-MAN3+=	log4cpp::details::optional::params::validator.3
>-MAN3+=	log4cpp::details::parameter::validator.3
>-MAN3+=	log4cpp::details::required::params::validator.3
>-MAN3+=	log4cpp::tab.3
>-MAN3+=	log4cpp::threading.3
>-MAN3+=	log4cpp::threading::MSMutex.3
>-MAN3+=	log4cpp::threading::MSScopedLock.3
>-MAN3+=	log4cpp::threading::Mutex.3
>-MAN3+=	log4cpp::threading::ScopedLock.3
>-MAN3+=	log4cpp::threading::ThreadLocalDataHolder.3
>-MAN3+=	log4cpp::width.3
>-.endif
>diff -urN /usr/ports/devel/log4cpp/distinfo devel/log4cpp/distinfo
>--- /usr/ports/devel/log4cpp/distinfo	2014-06-21 17:53:21.000000000 +0900
>+++ devel/log4cpp/distinfo	2015-05-24 07:00:00.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (log4cpp-1.1.tar.gz) = c25bd1e0abd47a5dee2ab49b84cbce6292fcada90536a26a5fc9999d343768b4
>-SIZE (log4cpp-1.1.tar.gz) = 547676
>+SHA256 (log4cpp-1.1.1.tar.gz) = 35abf332630a6809c969276b1d60b90c81a95daf24c86cfd7866ffef72f9bed0
>+SIZE (log4cpp-1.1.1.tar.gz) = 548124
>diff -urN /usr/ports/devel/log4cpp/files/patch-doc_Makefile.in devel/log4cpp/files/patch-doc_Makefile.in
>--- /usr/ports/devel/log4cpp/files/patch-doc_Makefile.in	2014-06-21 17:53:21.000000000 +0900
>+++ devel/log4cpp/files/patch-doc_Makefile.in	1970-01-01 09:00:00.000000000 +0900
>@@ -1,11 +0,0 @@
>---- doc/Makefile.in.orig	2007-09-03 17:53:35.000000000 +0800
>-+++ doc/Makefile.in	2008-04-14 15:33:21.000000000 +0800
>-@@ -154,7 +154,7 @@
>- builddir = @builddir@
>- datadir = @datadir@
>- datarootdir = @datarootdir@
>--docdir = $(prefix)/doc/@PACKAGE_TARNAME@-@PACKAGE_VERSION@
>-+docdir = $(prefix)/share/doc/@PACKAGE_TARNAME@
>- dvidir = @dvidir@
>- enable_dot = @enable_dot@
>- enable_html_docs = @enable_html_docs@
>diff -urN /usr/ports/devel/log4cpp/pkg-plist devel/log4cpp/pkg-plist
>--- /usr/ports/devel/log4cpp/pkg-plist	2014-10-27 23:12:58.000000000 +0900
>+++ devel/log4cpp/pkg-plist	2015-05-24 07:00:00.000000000 +0900
>@@ -56,7 +56,75 @@
> lib/liblog4cpp.so.5
> lib/liblog4cpp.so.5.0.6
> libdata/pkgconfig/log4cpp.pc
>+%%DOXYGEN%%man/man3/log4cpp.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::AbortAppender.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::Appender.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::AppenderSkeleton.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::AppendersFactory.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::BasicConfigurator.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::BasicLayout.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::BufferingAppender.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::Category.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::CategoryNameComponent.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::CategoryStream.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::ConfigureFailure.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::FactoryParams.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::FileAppender.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::Filter.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::FixedContextCategory.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::FormatModifierComponent.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::HierarchyMaintainer.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::IdsaAppender.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::Layout.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::LayoutAppender.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::LayoutsFactory.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::LevelEvaluator.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::LoggingEvent.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::MessageComponent.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::MillisSinceEpochComponent.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::NDC.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::NDC::DiagnosticContext.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::NDCComponent.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::NTEventLogAppender.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::OstreamAppender.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::PassThroughLayout.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::PatternLayout.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::PatternLayout::PatternComponent.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::Priority.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::PriorityComponent.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::ProcessorTimeComponent.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::Properties.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::PropertyConfigurator.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::PropertyConfiguratorImpl.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::RemoteSyslogAppender.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::RollingFileAppender.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::SecondsSinceEpochComponent.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::SimpleConfigurator.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::SimpleLayout.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::StringLiteralComponent.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::StringQueueAppender.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::StringUtil.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::SyslogAppender.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::ThreadNameComponent.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::TimeStamp.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::TimeStampComponent.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::TriggeringEventEvaluator.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::TriggeringEventEvaluatorFactory.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::Win32DebugAppender.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::details.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::details::base::validator::data.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::details::optional::params::validator.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::details::parameter::validator.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::details::required::params::validator.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::tab.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::threading.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::threading::MSMutex.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::threading::MSScopedLock.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::threading::Mutex.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::threading::ScopedLock.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::threading::ThreadLocalDataHolder.3.gz
>+%%DOXYGEN%%man/man3/log4cpp::width.3.gz
> share/aclocal/log4cpp.m4
>-@comment %%PORTDOCS%%%%DOCSDIR%%/index.html
>-@comment %%PORTDOCS%%%%DOCSDIR%%/default.css
>-@comment %%PORTDOCS%%%%DOCSDIR%%/sflogo.png
>+%%DOXYGEN%%%%DOCSDIR%%/default.css
>+%%DOXYGEN%%%%DOCSDIR%%/index.html
>+%%DOXYGEN%%%%DOCSDIR%%/sflogo.png

Actions: View | Diff

Attachments on bug 197422: 152721 | 157091 | 157392