- Update to 1.0.4

- Remove unneeded patch
- Doc tarball isn't used any more
- Generated docs aren't included any more
- Cleanup pkg-descr
- Pass maintainership to submitter

PR:		ports/158187
Submitted by:	"Jeremy C. Reed" <reed@reedmedia.net>
Approved by:	petri.totterman@hmv.fi (maintainer bounce)

5 files changed, 18 insertions, 32 deletions

diff --git a/devel/log4cplus/Makefile b/devel/log4cplus/Makefile
index 44ecc1e2efbd..f0526f350711 100644
--- a/devel/log4cplus/Makefile
+++ b/devel/log4cplus/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	log4cplus
-PORTVERSION=	1.0.2
-PORTREVISION=	1
+PORTVERSION=	1.0.4
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-stable/${PORTVERSION}
-DISTFILES=	log4cplus-${PORTVERSION}.tar.gz log4cplus-${PORTVERSION}-docs.tar.gz
+DISTFILES=	log4cplus-${PORTVERSION}.tar.bz2
 
-MAINTAINER=	petri.totterman@hmv.fi
+MAINTAINER=	reed@reedmedia.net
 COMMENT=	A logging library for C++
 
 USE_AUTOTOOLS=	libtool
@@ -30,16 +29,12 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/license.apl ${PREFIX}/include/log4cplus
+	${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/include/log4cplus
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/docs/*.config ${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/docs/*.html ${DOCSDIR}
-	${MKDIR} ${DOCSDIR}/html
-	${INSTALL_MAN} ${WRKSRC}/docs/html/*.html ${DOCSDIR}/html
-	${INSTALL_MAN} ${WRKSRC}/docs/html/*.png ${DOCSDIR}/html
-	${INSTALL_MAN} ${WRKSRC}/docs/html/doxygen.css ${DOCSDIR}/html
-	${INSTALL_MAN} ${WRKSRC}/docs/html/graph_legend.dot ${DOCSDIR}/html
+	${INSTALL_MAN} ${WRKSRC}/docs/doxygen.css ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/log4cplus/distinfo b/devel/log4cplus/distinfo
index a80bf44dd144..4ccf662456e2 100644
--- a/devel/log4cplus/distinfo
+++ b/devel/log4cplus/distinfo
@@ -1,4 +1,2 @@
-SHA256 (log4cplus-1.0.2.tar.gz) = 44689689a1407308121e931c35ab2124931cadc8e8f262457b156dd68359d521
-SIZE (log4cplus-1.0.2.tar.gz) = 539550
-SHA256 (log4cplus-1.0.2-docs.tar.gz) = 20da364160635576747a64f1ad76264220e953279e901524a8fab50b98c97495
-SIZE (log4cplus-1.0.2-docs.tar.gz) = 878960
+SHA256 (log4cplus-1.0.4.tar.bz2) = c2bb01b5f4bff5fa768700e98ead4a79dfd556096c9f3f0401849da7ab80fbef
+SIZE (log4cplus-1.0.4.tar.bz2) = 420708
diff --git a/devel/log4cplus/files/patch-src-socketbuffer.cxx b/devel/log4cplus/files/patch-src-socketbuffer.cxx
deleted file mode 100644
index bf30895eb7d4..000000000000
--- a/devel/log4cplus/files/patch-src-socketbuffer.cxx
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/socketbuffer.cxx.orig	Fri Nov 21 22:23:29 2003
-+++ src/socketbuffer.cxx	Thu Dec  9 15:49:28 2004
-@@ -29,6 +29,7 @@
- 
- #include <log4cplus/helpers/socketbuffer.h>
- #include <log4cplus/helpers/loglog.h>
-+#include <arpa/inet.h>
- 
- #if !defined(_WIN32)
- #  include <netdb.h>
diff --git a/devel/log4cplus/pkg-descr b/devel/log4cplus/pkg-descr
index ed3e201194ea..f57f139fa18c 100644
--- a/devel/log4cplus/pkg-descr
+++ b/devel/log4cplus/pkg-descr
@@ -2,9 +2,4 @@ This is a port of log4cplus, a simple-to-use C++ logging API providing
 thread-safe, flexible, and arbitrarily granular control over log management
 and configuration. It is modeled after the Java log4j API.
 
-Authors:
-Tad E. Smith, Michael CATANZARITI, Steighton Haley
-
 WWW: http://log4cplus.sourceforge.net
-
--pbt
diff --git a/devel/log4cplus/pkg-plist b/devel/log4cplus/pkg-plist
index 92d7f4b1a8fc..732c08cac1b6 100644
--- a/devel/log4cplus/pkg-plist
+++ b/devel/log4cplus/pkg-plist
@@ -1,5 +1,9 @@
+include/log4cplus/LICENSE
 include/log4cplus/appender.h
-include/log4cplus/config.h
+include/log4cplus/config.hxx
+include/log4cplus/config/defines.hxx
+include/log4cplus/config/macosx.h
+include/log4cplus/config/win32.h
 include/log4cplus/configurator.h
 include/log4cplus/consoleappender.h
 include/log4cplus/fileappender.h
@@ -13,13 +17,14 @@ include/log4cplus/helpers/sleep.h
 include/log4cplus/helpers/socket.h
 include/log4cplus/helpers/socketbuffer.h
 include/log4cplus/helpers/stringhelper.h
+include/log4cplus/helpers/syncprims-pthreads.h
+include/log4cplus/helpers/syncprims.h
 include/log4cplus/helpers/thread-config.h
 include/log4cplus/helpers/threads.h
 include/log4cplus/helpers/timehelper.h
 include/log4cplus/hierarchy.h
 include/log4cplus/hierarchylocker.h
 include/log4cplus/layout.h
-include/log4cplus/license.apl
 include/log4cplus/logger.h
 include/log4cplus/loggingmacros.h
 include/log4cplus/loglevel.h
@@ -37,10 +42,13 @@ include/log4cplus/spi/rootlogger.h
 include/log4cplus/streams.h
 include/log4cplus/syslogappender.h
 include/log4cplus/tstring.h
+include/log4cplus/version.h
+lib/liblog4cplus-1.0.so
+lib/liblog4cplus-1.0.so.4
 lib/liblog4cplus.a
 lib/liblog4cplus.la
 lib/liblog4cplus.so
-lib/liblog4cplus.so.2
+@dirrm include/log4cplus/config
 @dirrm include/log4cplus/spi
 @dirrm include/log4cplus/helpers
 @dirrm include/log4cplus