12 files changed, 218 insertions, 202 deletions

diff --git a/devel/rudiments/Makefile b/devel/rudiments/Makefile
index 4a15bb6ec5eb..5c03bdcdd635 100644
--- a/devel/rudiments/Makefile
+++ b/devel/rudiments/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	rudiments
-PORTVERSION=	0.24
-PORTREVISION=	2
+PORTVERSION=	0.26
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,25 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A utility C++ class library for daemons, clients, servers and more
 
 USE_GMAKE=	yes
-USE_AUTOCONF_VER=213
-CONFIGURE_ENV=	CXX="${CXX}" CXXFLAGS="${CXXFLAGS}"
-MAKE_ARGS=	VERSION="${PORTVERSION:R}"
-
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500000
-EXTRA_PATCHES=	${PATCHDIR}/extra-patch-*
-
-PLIST_SUB+=	PROFILE="@comment "
-.else
-PLIST_SUB+=	PROFILE=""
-.endif
-
-post-install:
-.if !defined(NOPORTDOCS)
-	cd ${WRKSRC} && ${MAKE} doc-install
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/rudiments/distinfo b/devel/rudiments/distinfo
index 236988b00a76..d349a51be4c8 100644
--- a/devel/rudiments/distinfo
+++ b/devel/rudiments/distinfo
@@ -1,2 +1,2 @@
-MD5 (rudiments-0.24.tar.gz) = 9ff19e9ddf2ce79b8f217043bc4259b7
-SIZE (rudiments-0.24.tar.gz) = 81999
+MD5 (rudiments-0.26.tar.gz) = 73be0511f3917740ec825dd49e8d2760
+SIZE (rudiments-0.26.tar.gz) = 358442
diff --git a/devel/rudiments/files/extra-patch-src+Makefile.in b/devel/rudiments/files/extra-patch-src+Makefile.in
deleted file mode 100644
index c059fcc336bd..000000000000
--- a/devel/rudiments/files/extra-patch-src+Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/Makefile.in.orig	Mon Apr 15 13:21:24 2002
-+++ src/Makefile.in	Sat Dec  7 19:27:01 2002
-@@ -17,7 +17,6 @@
- 
- all:
- 	$(MAKE) ../lib/librudiments.a; \
--	$(MAKE) ../lib/librudiments_p.a; \
- 	if ( test ! -n "@MINGW32@" -a ! -n "@CYGWIN@" -a ! -n "@UWIN@" ); then \
- 		$(MAKE) ../lib/librudiments.so.$(VERSION); \
- 	else \
-@@ -48,7 +47,6 @@
- install:
- 	$(top_srcdir)/mkinstalldirs $(libdir)
- 	$(INSTALL) -m 644 ../lib/librudiments.a $(libdir); \
--	$(INSTALL) -m 644 ../lib/librudiments_p.a $(libdir); \
- 	if ( test ! -n "@MINGW32@" -a ! -n "@CYGWIN@" -a ! -n "@UWIN@" ); then \
- 		$(RM) $(libdir)/librudiments.so*; \
- 		$(INSTALL) ../lib/librudiments.so.$(VERSION) $(libdir); \
-@@ -62,6 +60,5 @@
- uninstall:
- 	$(RM) $(libdir)/librudiments.so*
- 	$(RM) $(libdir)/librudiments.a
--	$(RM) $(libdir)/librudiments_p.a
- 	$(RM) $(libdir)/librudiments.dll
- 	$(RM) $(libdir)/librudiments.lib
diff --git a/devel/rudiments/files/patch-Makefile.in b/devel/rudiments/files/patch-Makefile.in
deleted file mode 100644
index 9702d6dc09a4..000000000000
--- a/devel/rudiments/files/patch-Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.in.orig	Wed Jun 20 13:57:31 2001
-+++ Makefile.in	Mon Jul  2 16:52:51 2001
-@@ -16,6 +16,7 @@
- install:
- 	cd src; $(MAKE) install
- 	cd include; $(MAKE) install
-+doc-install:
- 	cd doc; $(MAKE) install
- 
- uninstall:
diff --git a/devel/rudiments/files/patch-config.mk.in b/devel/rudiments/files/patch-config.mk.in
index d90287d7c31a..cb0154c3bad8 100644
--- a/devel/rudiments/files/patch-config.mk.in
+++ b/devel/rudiments/files/patch-config.mk.in
@@ -1,7 +1,7 @@
---- config.mk.in.orig	Mon Apr 15 11:21:21 2002
-+++ config.mk.in	Tue Oct 28 07:39:01 2003
-@@ -7,13 +7,13 @@
- exec_prefix = @exec_prefix@
+--- config.mk.in.orig	Tue Nov 25 08:04:00 2003
++++ config.mk.in	Wed May 26 12:48:10 2004
+@@ -9,7 +9,7 @@
+ bindir = @bindir@
  incdir = @includedir@
  libdir = @libdir@
 -docdir = $(prefix)/doc/rudiments
@@ -9,10 +9,3 @@
  
  # compiler to use
  CXX = @CXX@
- 
- # debug and optimization flags (-g, -O2, etc.)
--CXXFLAGS = -pedantic -w -O2 -fPIC @CXXFLAGS@
-+CXXFLAGS = -w -fPIC @CXXFLAGS@
- 
- # command to build a shared object library
- DYNAMICAR = @DYNAMICAR@
diff --git a/devel/rudiments/files/patch-configure b/devel/rudiments/files/patch-configure
new file mode 100644
index 000000000000..e9e837fcfa07
--- /dev/null
+++ b/devel/rudiments/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Sat Nov 29 22:39:23 2003
++++ configure	Wed May 26 15:31:52 2004
+@@ -13768,7 +13768,7 @@
+ #define RUDIMENTS_VERSION "$RUDIMENTS_VERSION"
+ _ACEOF
+ 
+-SONAME_VERSION_INFO="1:0:0"
++SONAME_VERSION_INFO="0:0:0"
+ 
+ 
+ 
diff --git a/devel/rudiments/files/patch-configure.in b/devel/rudiments/files/patch-configure.in
deleted file mode 100644
index 10ffd8ca6373..000000000000
--- a/devel/rudiments/files/patch-configure.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.in.orig	Fri Jun 29 14:14:19 2001
-+++ configure.in	Mon Jul  2 16:32:29 2001
-@@ -112,8 +112,8 @@
- VERSION="0.20"
- AC_SUBST(VERSION)
- AC_DEFINE_UNQUOTED(VERSION,"$VERSION",Version)
--CXXFLAGS=""
--CFLAGS=""
-+#CXXFLAGS=""
-+#CFLAGS=""
- AC_PREFIX_DEFAULT(/usr/local/firstworks)
- 
- dnl Output files.
diff --git a/devel/rudiments/files/patch-genericsocket.h b/devel/rudiments/files/patch-genericsocket.h
deleted file mode 100644
index 18498be16eec..000000000000
--- a/devel/rudiments/files/patch-genericsocket.h
+++ /dev/null
@@ -1,18 +0,0 @@
---- include/rudiments/genericsocket.h.bak	Mon Apr 15 06:21:25 2002
-+++ include/rudiments/genericsocket.h	Sun Feb 29 01:55:13 2004
-@@ -4,12 +4,14 @@
- #ifndef GENERICSOCKET_H
- #define GENERICSOCKET_H
- 
--#include <strstream.h>
-+#include <strstream>
- 
- #include <sys/types.h>
- #include <sys/un.h>
- #include <netinet/in.h>
- #include <netdb.h>
-+
-+using namespace std;
- 
- // The client class allows you to write programs that can talk to other
- // programs over TCP connections.
diff --git a/devel/rudiments/files/patch-src-Makefile b/devel/rudiments/files/patch-src-Makefile
new file mode 100644
index 000000000000..37b614d38a20
--- /dev/null
+++ b/devel/rudiments/files/patch-src-Makefile
@@ -0,0 +1,11 @@
+--- src/Makefile.orig	Wed Oct  1 01:54:50 2003
++++ src/Makefile	Wed May 26 15:21:35 2004
+@@ -175,7 +175,7 @@
+ rebuild: clean all
+ 
+ librudiments.la: $(SRCS) $(LOBJS)
+-	$(LIBTOOL) --mode=link $(CXX) -o $@ $(LOBJS) -rpath $(libdir) -release $(RUDIMENTS_VERSION) -version-info $(SONAME_VERSION_INFO)
++	$(LIBTOOL) --mode=link $(CXX) -o $@ $(LOBJS) -rpath $(libdir) -version-info $(SONAME_VERSION_INFO)
+ 
+ install:
+ 	$(top_builddir)/mkinstalldirs $(libdir)
diff --git a/devel/rudiments/files/patch-src-daemonprocess.C b/devel/rudiments/files/patch-src-daemonprocess.C
deleted file mode 100644
index 4755635349ec..000000000000
--- a/devel/rudiments/files/patch-src-daemonprocess.C
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/daemonprocess.C.orig	Mon Apr 15 06:21:24 2002
-+++ src/daemonprocess.C	Sun Feb 29 01:53:19 2004
-@@ -5,7 +5,7 @@
- 
- #include <iostream.h>
- #include <fstream.h>
--#include <strstream.h>
-+#include <strstream>
- 
- #include <sys/types.h>
- #ifdef HAVE_UNISTD_H
-@@ -22,11 +22,13 @@
- #include <rudiments/daemonprocess.h>
- 
- #ifdef __GNUC__
--static	signalhandler	*daemonprocess::termhandler;
--static	signalhandler	*daemonprocess::inthandler;
--static	void		(*daemonprocess::shutdownfunc)(int);
--static	signalhandler	*daemonprocess::deadchildhandler;
-+signalhandler	*daemonprocess::termhandler;
-+signalhandler	*daemonprocess::inthandler;
-+void		(*daemonprocess::shutdownfunc)(int);
-+signalhandler	*daemonprocess::deadchildhandler;
- #endif
-+
-+using namespace std;
- 
- daemonprocess::daemonprocess() {
- 
diff --git a/devel/rudiments/files/patch-src-genericsocket.C b/devel/rudiments/files/patch-src-genericsocket.C
deleted file mode 100644
index b7dc7089b985..000000000000
--- a/devel/rudiments/files/patch-src-genericsocket.C
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/genericsocket.C.orig	Mon Apr 15 11:21:24 2002
-+++ src/genericsocket.C	Tue Oct 28 08:10:37 2003
-@@ -211,7 +211,7 @@
- 				// If we got no error, just didn't get
- 				// all of the data, we need to get the
- 				// rest.
--				return retval+safeRead(fd,buf+retval,
-+				return retval+safeRead(fd,(char *)buf+retval,
- 							realcount-retval);
- 			} else if (errno && showerrors) {
- 				cerr << "error: read failed: ";
-@@ -223,7 +223,7 @@
- 
- 	// handle cases where count>SSIZE_MAX by continuing to read
- 	if (realcount<count) {
--		return retval+safeRead(fd,buf+retval,count-retval);
-+		return retval+safeRead(fd,(char *)buf+retval,count-retval);
- 	}
- 
- 	return retval;
-@@ -260,7 +260,7 @@
- 
- 	// must send at least 1 iovector with 1 byte of real data
- 	struct iovec	iovector[1];
--	iovector[0].iov_base=(void *)" ";
-+	iovector[0].iov_base=const_cast<char *>(" ");
- 	iovector[0].iov_len=sizeof(char);
- 	messageheader.msg_iov=iovector;
- 	messageheader.msg_iovlen=1;
diff --git a/devel/rudiments/pkg-plist b/devel/rudiments/pkg-plist
index 498d2aaa7400..11695ad4c4e1 100644
--- a/devel/rudiments/pkg-plist
+++ b/devel/rudiments/pkg-plist
@@ -1,59 +1,203 @@
-include/rudiments/clientsocket.h
+bin/rudiments-config
+include/rudiments/charstring.h
+include/rudiments/client.h
 include/rudiments/commandline.h
 include/rudiments/daemonprocess.h
+include/rudiments/datatransport.h
+include/rudiments/datatransportfactory.h
 include/rudiments/datetime.h
-include/rudiments/genericsocket.h
+include/rudiments/dictionary.h
+include/rudiments/dtd.h
+include/rudiments/environment.h
+include/rudiments/errorhandler.h
+include/rudiments/file.h
+include/rudiments/filedescriptor.h
+include/rudiments/filesystem.h
+include/rudiments/groupentry.h
+include/rudiments/hostentry.h
+include/rudiments/inetclientsocket.h
+include/rudiments/inetserversocket.h
+include/rudiments/linkedlist.h
+include/rudiments/listener.h
+include/rudiments/logger.h
+include/rudiments/memorypool.h
+include/rudiments/parameterstring.h
+include/rudiments/passwdentry.h
 include/rudiments/permissions.h
-include/rudiments/randomnumber.h
-include/rudiments/regularexpression.h
-include/rudiments/semaphoreset.h
-include/rudiments/serversocket.h
-include/rudiments/serversocketpool.h
-include/rudiments/sharedmemory.h
-include/rudiments/signalclasses.h
-include/rudiments/text.h
-include/rudiments/private/clientsocket.h
+include/rudiments/private/charstring.h
+include/rudiments/private/charstringincludes.h
+include/rudiments/private/client.h
+include/rudiments/private/clientincludes.h
 include/rudiments/private/commandline.h
+include/rudiments/private/commandlineincludes.h
+include/rudiments/private/config.h
 include/rudiments/private/daemonprocess.h
+include/rudiments/private/daemonprocessincludes.h
+include/rudiments/private/datatransport.h
+include/rudiments/private/datatransportfactoryincludes.h
+include/rudiments/private/datatransportincludes.h
 include/rudiments/private/datetime.h
-include/rudiments/private/genericsocket.h
+include/rudiments/private/datetimeincludes.h
+include/rudiments/private/dictionary.h
+include/rudiments/private/dictionaryincludes.h
+include/rudiments/private/dictionaryinlines.h
+include/rudiments/private/dictionarynode.h
+include/rudiments/private/dictionarynodeinlines.h
+include/rudiments/private/dtd.h
+include/rudiments/private/dtdincludes.h
+include/rudiments/private/environment.h
+include/rudiments/private/environmentincludes.h
+include/rudiments/private/errorhandler.h
+include/rudiments/private/errorhandlerincludes.h
+include/rudiments/private/file.h
+include/rudiments/private/filedescriptor.h
+include/rudiments/private/filedescriptorincludes.h
+include/rudiments/private/filedestination.h
+include/rudiments/private/fileincludes.h
+include/rudiments/private/filesystem.h
+include/rudiments/private/filesystemincludes.h
+include/rudiments/private/groupentry.h
+include/rudiments/private/groupentryincludes.h
+include/rudiments/private/hostentry.h
+include/rudiments/private/hostentryincludes.h
+include/rudiments/private/inetclientsocketincludes.h
+include/rudiments/private/inetserversocketincludes.h
+include/rudiments/private/inetsocket.h
+include/rudiments/private/linkedlist.h
+include/rudiments/private/linkedlistincludes.h
+include/rudiments/private/linkedlistinlines.h
+include/rudiments/private/linkedlistnode.h
+include/rudiments/private/linkedlistnodeinlines.h
+include/rudiments/private/linkedlistutil.h
+include/rudiments/private/linkedlistutilinlines.h
+include/rudiments/private/listener.h
+include/rudiments/private/listenerincludes.h
+include/rudiments/private/logdestination.h
+include/rudiments/private/logger.h
+include/rudiments/private/loggerincludes.h
+include/rudiments/private/memorypool.h
+include/rudiments/private/memorypoolincludes.h
+include/rudiments/private/memorypoolnode.h
+include/rudiments/private/parameterstring.h
+include/rudiments/private/parameterstringincludes.h
+include/rudiments/private/passwdentry.h
+include/rudiments/private/passwdentryincludes.h
+include/rudiments/private/permissionsincludes.h
+include/rudiments/private/protocolentry.h
+include/rudiments/private/protocolentryincludes.h
+include/rudiments/private/randomnumberincludes.h
 include/rudiments/private/regularexpression.h
+include/rudiments/private/regularexpressionincludes.h
+include/rudiments/private/rpcentry.h
+include/rudiments/private/rpcentryincludes.h
+include/rudiments/private/rudimentsinlines.h
 include/rudiments/private/semaphoreset.h
+include/rudiments/private/semaphoresetincludes.h
+include/rudiments/private/serverincludes.h
 include/rudiments/private/serversocket.h
-include/rudiments/private/serversocketpool.h
+include/rudiments/private/serversocketincludes.h
+include/rudiments/private/serviceentry.h
+include/rudiments/private/serviceentryincludes.h
 include/rudiments/private/sharedmemory.h
+include/rudiments/private/sharedmemoryincludes.h
+include/rudiments/private/signalclassesincludes.h
 include/rudiments/private/signalhandler.h
 include/rudiments/private/signalset.h
-include/rudiments/private/socketnode.h
-@dirrm include/rudiments/private
-@dirrm include/rudiments
+include/rudiments/private/stderrdestination.h
+include/rudiments/private/stdoutdestination.h
+include/rudiments/private/stringbuffer.h
+include/rudiments/private/stringbufferincludes.h
+include/rudiments/private/syslogdestination.h
+include/rudiments/private/timezonefile.h
+include/rudiments/private/unixclientsocketincludes.h
+include/rudiments/private/unixserversocket.h
+include/rudiments/private/unixserversocketincludes.h
+include/rudiments/private/unixsocket.h
+include/rudiments/private/variablebuffer.h
+include/rudiments/private/variablebufferincludes.h
+include/rudiments/private/xmldom.h
+include/rudiments/private/xmldomincludes.h
+include/rudiments/private/xmldomnode.h
+include/rudiments/private/xmldomnodeincludes.h
+include/rudiments/private/xmlsax.h
+include/rudiments/private/xmlsaxincludes.h
+include/rudiments/protocolentry.h
+include/rudiments/randomnumber.h
+include/rudiments/regularexpression.h
+include/rudiments/resultcodes.h
+include/rudiments/rpcentry.h
+include/rudiments/semaphoreset.h
+include/rudiments/server.h
+include/rudiments/serversocket.h
+include/rudiments/serviceentry.h
+include/rudiments/sharedmemory.h
+include/rudiments/signalclasses.h
+include/rudiments/stringbuffer.h
+include/rudiments/timezonefile.h
+include/rudiments/unixclientsocket.h
+include/rudiments/unixserversocket.h
+include/rudiments/variablebuffer.h
+include/rudiments/xmldom.h
+include/rudiments/xmldomnode.h
+include/rudiments/xmlsax.h
 lib/librudiments.a
 lib/librudiments.so
 lib/librudiments.so.0
-%%PROFILE%%lib/librudiments_p.a
-%%PORTDOCS%%share/doc/rudiments/classes/clientsocket.h.html
-%%PORTDOCS%%share/doc/rudiments/classes/commandline.h.html
-%%PORTDOCS%%share/doc/rudiments/classes/daemonprocess.h.html
-%%PORTDOCS%%share/doc/rudiments/classes/datetime.h.html
-%%PORTDOCS%%share/doc/rudiments/classes/genericsocket.h.html
-%%PORTDOCS%%share/doc/rudiments/classes/permissions.h.html
-%%PORTDOCS%%share/doc/rudiments/classes/randomnumber.h.html
-%%PORTDOCS%%share/doc/rudiments/classes/regularexpression.h.html
-%%PORTDOCS%%share/doc/rudiments/classes/semaphoreset.h.html
-%%PORTDOCS%%share/doc/rudiments/classes/serversocket.h.html
-%%PORTDOCS%%share/doc/rudiments/classes/serversocketpool.h.html
-%%PORTDOCS%%share/doc/rudiments/classes/sharedmemory.h.html
-%%PORTDOCS%%share/doc/rudiments/classes/signalclasses.h.html
-%%PORTDOCS%%share/doc/rudiments/classes/text.h.html
-%%PORTDOCS%%share/doc/rudiments/css/styles.css
-%%PORTDOCS%%share/doc/rudiments/guide.html
-%%PORTDOCS%%share/doc/rudiments/index.html
-%%PORTDOCS%%share/doc/rudiments/introduction.html
-%%PORTDOCS%%share/doc/rudiments/invisible.gif
-%%PORTDOCS%%share/doc/rudiments/programming/baseclasses.html
-%%PORTDOCS%%share/doc/rudiments/programming/utilclasses.html
-%%PORTDOCS%%share/doc/rudiments/reference.html
-%%PORTDOCS%%@dirrm share/doc/rudiments/programming
-%%PORTDOCS%%@dirrm share/doc/rudiments/css
-%%PORTDOCS%%@dirrm share/doc/rudiments/classes
-%%PORTDOCS%%@dirrm share/doc/rudiments
+share/doc/rudiments/classes/client.h.html
+share/doc/rudiments/classes/commandline.h.html
+share/doc/rudiments/classes/daemonprocess.h.html
+share/doc/rudiments/classes/datatransport.h.html
+share/doc/rudiments/classes/datatransportfactory.h.html
+share/doc/rudiments/classes/datetime.h.html
+share/doc/rudiments/classes/dictionary.h.html
+share/doc/rudiments/classes/dtd.h.html
+share/doc/rudiments/classes/environment.h.html
+share/doc/rudiments/classes/errorhandler.h.html
+share/doc/rudiments/classes/file.h.html
+share/doc/rudiments/classes/filedescriptor.h.html
+share/doc/rudiments/classes/filesystem.h.html
+share/doc/rudiments/classes/groupentry.h.html
+share/doc/rudiments/classes/hostentry.h.html
+share/doc/rudiments/classes/inetclientsocket.h.html
+share/doc/rudiments/classes/inetserversocket.h.html
+share/doc/rudiments/classes/list.h.html
+share/doc/rudiments/classes/listener.h.html
+share/doc/rudiments/classes/logger.h.html
+share/doc/rudiments/classes/memorypool.h.html
+share/doc/rudiments/classes/parameterstring.h.html
+share/doc/rudiments/classes/passwdentry.h.html
+share/doc/rudiments/classes/permissions.h.html
+share/doc/rudiments/classes/protocolentry.h.html
+share/doc/rudiments/classes/randomnumber.h.html
+share/doc/rudiments/classes/regularexpression.h.html
+share/doc/rudiments/classes/rpcentry.h.html
+share/doc/rudiments/classes/semaphoreset.h.html
+share/doc/rudiments/classes/server.h.html
+share/doc/rudiments/classes/serversocket.h.html
+share/doc/rudiments/classes/serviceentry.h.html
+share/doc/rudiments/classes/shadowentry.h.html
+share/doc/rudiments/classes/sharedmemory.h.html
+share/doc/rudiments/classes/signalclasses.h.html
+share/doc/rudiments/classes/string.h.html
+share/doc/rudiments/classes/stringbuffer.h.html
+share/doc/rudiments/classes/timezonefile.h.html
+share/doc/rudiments/classes/unixclientsocket.h.html
+share/doc/rudiments/classes/unixserversocket.h.html
+share/doc/rudiments/classes/variablebuffer.h.html
+share/doc/rudiments/classes/xmldom.h.html
+share/doc/rudiments/classes/xmldomnode.h.html
+share/doc/rudiments/classes/xmlsax.h.html
+share/doc/rudiments/css/styles.css
+share/doc/rudiments/guide.html
+share/doc/rudiments/index.html
+share/doc/rudiments/introduction.html
+share/doc/rudiments/invisible.gif
+share/doc/rudiments/programming/baseclasses.html
+share/doc/rudiments/programming/utilclasses.html
+share/doc/rudiments/reference.html
+@dirrm include/rudiments/private
+@dirrm include/rudiments
+@dirrm share/doc/rudiments/programming
+@dirrm share/doc/rudiments/css
+@dirrm share/doc/rudiments/classes
+@dirrm share/doc/rudiments