5 files changed, 97 insertions, 42 deletions

diff --git a/devel/log4cpp/Makefile b/devel/log4cpp/Makefile
index a57057995644..6e1094aa127d 100644
--- a/devel/log4cpp/Makefile
+++ b/devel/log4cpp/Makefile
@@ -7,13 +7,11 @@
 #
 
 PORTNAME=	log4cpp
-DISTVERSION=	0.3.5rc3
-PORTREVISION=	1
+DISTVERSION=	1.0
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	A library of C++ classes for flexible logging
 
 USE_AUTOTOOLS=	libtool:15
@@ -25,35 +23,11 @@ CONFIGURE_ARGS=	--with-pthreads --disable-html-docs
 MAKE_ENV+=	RM=${RM}
 USE_LDCONFIG=	yes
 
+.include "Makefile.man"
 .include <bsd.port.pre.mk>
 
 .if exists (${LOCALBASE}/bin/doxygen) || !defined (NOPORTDOCS)
 BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
-
-MAN3=	log4cpp.3 log4cpp::AbortAppender.3 log4cpp::Appender.3 log4cpp::AppenderSkeleton.3\
-	log4cpp::BasicConfigurator.3 log4cpp::BasicLayout.3 log4cpp::Category.3\
-	log4cpp::CategoryNameComponent.3 log4cpp::CategoryStream.3\
-	log4cpp::ConfigureFailure.3 log4cpp::FileAppender.3 log4cpp::Filter.3\
-	log4cpp::FixedContextCategory.3 log4cpp::FormatModifierComponent.3\
-	log4cpp::HierarchyMaintainer.3 log4cpp::IdsaAppender.3 log4cpp::Layout.3\
-	log4cpp::LayoutAppender.3 log4cpp::LoggingEvent.3\
-	log4cpp::MessageComponent.3 log4cpp::MillisSinceEpochComponent.3\
-	log4cpp::NDC.3 log4cpp::NDC::DiagnosticContext.3 log4cpp::NDCComponent.3\
-	log4cpp::NTEventLogAppender.3 log4cpp::OstreamAppender.3\
-	log4cpp::PatternLayout.3 log4cpp::PatternLayout::PatternComponent.3\
-	log4cpp::Priority.3 log4cpp::PriorityComponent.3\
-	log4cpp::ProcessorTimeComponent.3 log4cpp::Properties.3\
-	log4cpp::PropertyConfigurator.3 log4cpp::PropertyConfiguratorImpl.3\
-	log4cpp::RemoteSyslogAppender.3 log4cpp::RollingFileAppender.3\
-	log4cpp::SecondsSinceEpochComponent.3 log4cpp::SimpleConfigurator.3\
-	log4cpp::SimpleLayout.3 log4cpp::StringLiteralComponent.3\
-	log4cpp::StringQueueAppender.3 log4cpp::StringUtil.3\
-	log4cpp::SyslogAppender.3 log4cpp::ThreadNameComponent.3\
-	log4cpp::TimeStamp.3 log4cpp::TimeStampComponent.3 log4cpp::width.3\
-	log4cpp::Win32DebugAppender.3 log4cpp::tab.3 log4cpp::threading.3\
-	log4cpp::threading::MSMutex.3 log4cpp::threading::MSScopedLock.3\
-	log4cpp::threading::Mutex.3 log4cpp::threading::ScopedLock.3\
-	log4cpp::threading::ThreadLocalDataHolder.3
 .else
 NOPORTDOCS=		true
 CONFIGURE_ARGS+=	--disable-doxygen
diff --git a/devel/log4cpp/Makefile.man b/devel/log4cpp/Makefile.man
new file mode 100644
index 000000000000..8057ba749872
--- /dev/null
+++ b/devel/log4cpp/Makefile.man
@@ -0,0 +1,72 @@
+# $FreeBSD$
+
+.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 --git a/devel/log4cpp/distinfo b/devel/log4cpp/distinfo
index ba60f068fc82..6c68d4a163c1 100644
--- a/devel/log4cpp/distinfo
+++ b/devel/log4cpp/distinfo
@@ -1,3 +1,3 @@
-MD5 (log4cpp-0.3.5rc3.tar.gz) = 13177d6bf50e403cc72b15e903326392
-SHA256 (log4cpp-0.3.5rc3.tar.gz) = 2bcfefc7a59cedd0e3754ed796fa025081e66a2bca5120687c8605ce417325e8
-SIZE (log4cpp-0.3.5rc3.tar.gz) = 472249
+MD5 (log4cpp-1.0.tar.gz) = 1face50ead0790d1297dfb04bacf273c
+SHA256 (log4cpp-1.0.tar.gz) = b4533324b0a1f46ad74a9e92bf2caa46c246e9353059e1a835e735d41826ed19
+SIZE (log4cpp-1.0.tar.gz) = 495726
diff --git a/devel/log4cpp/files/patch-doc_Makefile.in b/devel/log4cpp/files/patch-doc_Makefile.in
index 8a84a3609b7c..be06d8cdf2cf 100644
--- a/devel/log4cpp/files/patch-doc_Makefile.in
+++ b/devel/log4cpp/files/patch-doc_Makefile.in
@@ -1,11 +1,11 @@
---- doc/Makefile.in.orig	Fri Jul 29 14:25:28 2005
-+++ doc/Makefile.in	Sat Dec  9 00:03:10 2006
-@@ -182,7 +182,7 @@
- target_alias = @target_alias@
- SUBDIRS = html
- man3dir = $(mandir)/man3
+--- 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@
- EXTRA_DIST = \
- 	mainPage.txt
- 
+ dvidir = @dvidir@
+ enable_dot = @enable_dot@
+ enable_html_docs = @enable_html_docs@
diff --git a/devel/log4cpp/pkg-plist b/devel/log4cpp/pkg-plist
index c49fc919c596..714d820c7d95 100644
--- a/devel/log4cpp/pkg-plist
+++ b/devel/log4cpp/pkg-plist
@@ -2,12 +2,15 @@ bin/log4cpp-config
 include/log4cpp/AbortAppender.hh
 include/log4cpp/Appender.hh
 include/log4cpp/AppenderSkeleton.hh
+include/log4cpp/AppendersFactory.hh
 include/log4cpp/BasicConfigurator.hh
 include/log4cpp/BasicLayout.hh
+include/log4cpp/BufferingAppender.hh
 include/log4cpp/Category.hh
 include/log4cpp/CategoryStream.hh
 include/log4cpp/Configurator.hh
 include/log4cpp/Export.hh
+include/log4cpp/FactoryParams.hh
 include/log4cpp/FileAppender.hh
 include/log4cpp/Filter.hh
 include/log4cpp/FixedContextCategory.hh
@@ -15,11 +18,14 @@ include/log4cpp/HierarchyMaintainer.hh
 include/log4cpp/IdsaAppender.hh
 include/log4cpp/Layout.hh
 include/log4cpp/LayoutAppender.hh
+include/log4cpp/LayoutsFactory.hh
+include/log4cpp/LevelEvaluator.hh
 include/log4cpp/LoggingEvent.hh
 include/log4cpp/Manipulator.hh
 include/log4cpp/NDC.hh
 include/log4cpp/NTEventLogAppender.hh
 include/log4cpp/OstreamAppender.hh
+include/log4cpp/PassThroughLayout.hh
 include/log4cpp/PatternLayout.hh
 include/log4cpp/Portability.hh
 include/log4cpp/Priority.hh
@@ -31,10 +37,13 @@ include/log4cpp/SimpleLayout.hh
 include/log4cpp/StringQueueAppender.hh
 include/log4cpp/SyslogAppender.hh
 include/log4cpp/TimeStamp.hh
+include/log4cpp/TriggeringEventEvaluator.hh
+include/log4cpp/TriggeringEventEvaluatorFactory.hh
 include/log4cpp/Win32DebugAppender.hh
 include/log4cpp/config-openvms.h
 include/log4cpp/config-win32.h
 include/log4cpp/config.h
+include/log4cpp/convenience.h
 include/log4cpp/threading/BoostThreads.hh
 include/log4cpp/threading/DummyThreads.hh
 include/log4cpp/threading/MSThreads.hh