Attachment #42780 for bug #66645

View | Details | Raw Unified | Return to bug 66645
Collapse All | Expand All




#

PORTNAME=	rudiments
PORTVERSION=	0.26.3
PORTREVISION=	2
CATEGORIES=	devel
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PORTNAME}

MAINTAINER=	ports@FreeBSD.org
COMMENT=	A utility C++ class library for daemons, clients, servers and more

USE_GMAKE=		yes
USE_LIBTOOL_VER=	13
CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV=		CXX="${CXX}" CXXFLAGS="${CXXFLAGS}"	\
			PTHREADINCLUDES="${PTHREAD_CFLAGS}"	\
			PTHREADLIB="${PTHREAD_LIBS}"
PLIST_SUB=		VER="${PORTVERSION}"

INSTALLS_SHLIB=		yes

USE_REINPLACE=		yes

pre-configure:
.if defined(NOPORTDOCS)
	@${REINPLACE_CMD} -e "s|install-bin install-doc|install-bin|"		\
		${WRKSRC}/Makefile

post-install:
.if !defined(NOPORTDOCS)
	cd ${WRKSRC} && ${MAKE} doc-install
.endif

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)devel/rudiments/distinfo (-2 / +2 lines)
1	MD5 (rudiments-0.24.tar.gz) = 9ff19e9ddf2ce79b8f217043bc4259b7	1	MD5 (rudiments-0.26.3.tar.gz) = c0244258820bd1df788f0a522daca46e
2	SIZE (rudiments-0.24.tar.gz) = 81999	2	SIZE (rudiments-0.26.3.tar.gz) = 453224




--- 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

Lines 1-10 Link Here

(-)devel/rudiments/files/patch-Makefile.in (-10 lines)
1	--- Makefile.in.orig Wed Jun 20 13:57:31 2001
2	+++ Makefile.in Mon Jul 2 16:52:51 2001
3	@@ -16,6 +16,7 @@
4	install:
5	cd src; $(MAKE) install
6	cd include; $(MAKE) install
7	+doc-install:
8	cd doc; $(MAKE) install
9
10	uninstall:




--- config.mk.in.orig	Tue Dec 30 18:16:20 2003
+++ config.mk.in	Mon May 10 22:16:53 2004
@@ -10,7 +10,7 @@
 includedir = @includedir@
 incdir = @includedir@
 libdir = @libdir@
 datadir = @datadir@
-docdir = ${datadir}/doc/rudiments
+docdir = $(prefix)/share/doc/rudiments
 
 # 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@




--- configure.orig	Tue Dec 30 18:12:47 2003
+++ configure	Tue May 11 23:39:41 2004
@@ -1505,7 +1505,7 @@
   enableval="$enable_debug"
   CXXFLAGS="-g -pg -fno-exceptions -Wall"; INSTALLSTRIP=""
 else
-  CXXFLAGS="-fomit-frame-pointer -fno-exceptions -Wall"; INSTALLSTRIP="-s"
+  CXXFLAGS="${CXXFLAGS} -fomit-frame-pointer -fno-exceptions -Wall"; INSTALLSTRIP="-s"
 fi;
 
 # Check whether --with-system-libtool or --without-system-libtool was given.
@@ -18523,6 +18523,7 @@
 
 # This can be used to rebuild libtool when needed
 LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -19444,8 +19445,8 @@
 
 
 HAVE_PTHREAD=""
-PTHREADINCLUDES=""
-PTHREADLIB=""
+#PTHREADINCLUDES=""
+#PTHREADLIB=""
 
 if ( test "$cross_compiling" = "yes" )
 then




--- 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.




--- 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.




--- 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() {
 




--- 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;

Lines 1-59 Link Here

(-)devel/rudiments/pkg-plist (-44 / +188 lines)
1	include/rudiments/clientsocket.h	1	bin/rudiments-config
		2	include/rudiments/charstring.h
		3	include/rudiments/client.h
2	include/rudiments/commandline.h	4	include/rudiments/commandline.h
3	include/rudiments/daemonprocess.h	5	include/rudiments/daemonprocess.h
		6	include/rudiments/datatransport.h
		7	include/rudiments/datatransportfactory.h
4	include/rudiments/datetime.h	8	include/rudiments/datetime.h
5	include/rudiments/genericsocket.h	9	include/rudiments/dictionary.h
		10	include/rudiments/dtd.h
		11	include/rudiments/environment.h
		12	include/rudiments/errorhandler.h
		13	include/rudiments/file.h
		14	include/rudiments/filedescriptor.h
		15	include/rudiments/filesystem.h
		16	include/rudiments/groupentry.h
		17	include/rudiments/hostentry.h
		18	include/rudiments/inetclientsocket.h
		19	include/rudiments/inetserversocket.h
		20	include/rudiments/linkedlist.h
		21	include/rudiments/listener.h
		22	include/rudiments/logger.h
		23	include/rudiments/memorypool.h
		24	include/rudiments/parameterstring.h
		25	include/rudiments/passwdentry.h
6	include/rudiments/permissions.h	26	include/rudiments/permissions.h
7	include/rudiments/randomnumber.h	27	include/rudiments/private/charstring.h
8	include/rudiments/regularexpression.h	28	include/rudiments/private/charstringincludes.h
9	include/rudiments/semaphoreset.h	29	include/rudiments/private/client.h
10	include/rudiments/serversocket.h	30	include/rudiments/private/clientincludes.h
11	include/rudiments/serversocketpool.h
12	include/rudiments/sharedmemory.h
13	include/rudiments/signalclasses.h
14	include/rudiments/text.h
15	include/rudiments/private/clientsocket.h
16	include/rudiments/private/commandline.h	31	include/rudiments/private/commandline.h
		32	include/rudiments/private/commandlineincludes.h
		33	include/rudiments/private/config.h
17	include/rudiments/private/daemonprocess.h	34	include/rudiments/private/daemonprocess.h
		35	include/rudiments/private/daemonprocessincludes.h
		36	include/rudiments/private/datatransport.h
		37	include/rudiments/private/datatransportfactoryincludes.h
		38	include/rudiments/private/datatransportincludes.h
18	include/rudiments/private/datetime.h	39	include/rudiments/private/datetime.h
19	include/rudiments/private/genericsocket.h	40	include/rudiments/private/datetimeincludes.h
		41	include/rudiments/private/dictionary.h
		42	include/rudiments/private/dictionaryincludes.h
		43	include/rudiments/private/dictionaryinlines.h
		44	include/rudiments/private/dictionarynode.h
		45	include/rudiments/private/dictionarynodeinlines.h
		46	include/rudiments/private/dtd.h
		47	include/rudiments/private/dtdincludes.h
		48	include/rudiments/private/environment.h
		49	include/rudiments/private/environmentincludes.h
		50	include/rudiments/private/errorhandler.h
		51	include/rudiments/private/errorhandlerincludes.h
		52	include/rudiments/private/file.h
		53	include/rudiments/private/filedescriptor.h
		54	include/rudiments/private/filedescriptorincludes.h
		55	include/rudiments/private/filedestination.h
		56	include/rudiments/private/fileincludes.h
		57	include/rudiments/private/filesystem.h
		58	include/rudiments/private/filesystemincludes.h
		59	include/rudiments/private/groupentry.h
		60	include/rudiments/private/groupentryincludes.h
		61	include/rudiments/private/hostentry.h
		62	include/rudiments/private/hostentryincludes.h
		63	include/rudiments/private/inetclientsocketincludes.h
		64	include/rudiments/private/inetserversocketincludes.h
		65	include/rudiments/private/inetsocket.h
		66	include/rudiments/private/linkedlist.h
		67	include/rudiments/private/linkedlistincludes.h
		68	include/rudiments/private/linkedlistinlines.h
		69	include/rudiments/private/linkedlistnode.h
		70	include/rudiments/private/linkedlistnodeinlines.h
		71	include/rudiments/private/linkedlistutil.h
		72	include/rudiments/private/linkedlistutilinlines.h
		73	include/rudiments/private/listener.h
		74	include/rudiments/private/listenerincludes.h
		75	include/rudiments/private/logdestination.h
		76	include/rudiments/private/logger.h
		77	include/rudiments/private/loggerincludes.h
		78	include/rudiments/private/memorypool.h
		79	include/rudiments/private/memorypoolincludes.h
		80	include/rudiments/private/memorypoolnode.h
		81	include/rudiments/private/parameterstring.h
		82	include/rudiments/private/parameterstringincludes.h
		83	include/rudiments/private/passwdentry.h
		84	include/rudiments/private/passwdentryincludes.h
		85	include/rudiments/private/permissionsincludes.h
		86	include/rudiments/private/protocolentry.h
		87	include/rudiments/private/protocolentryincludes.h
		88	include/rudiments/private/randomnumberincludes.h
20	include/rudiments/private/regularexpression.h	89	include/rudiments/private/regularexpression.h
		90	include/rudiments/private/regularexpressionincludes.h
		91	include/rudiments/private/rpcentry.h
		92	include/rudiments/private/rpcentryincludes.h
		93	include/rudiments/private/rudimentsinlines.h
21	include/rudiments/private/semaphoreset.h	94	include/rudiments/private/semaphoreset.h
		95	include/rudiments/private/semaphoresetincludes.h
		96	include/rudiments/private/serverincludes.h
22	include/rudiments/private/serversocket.h	97	include/rudiments/private/serversocket.h
23	include/rudiments/private/serversocketpool.h	98	include/rudiments/private/serversocketincludes.h
		99	include/rudiments/private/serviceentry.h
		100	include/rudiments/private/serviceentryincludes.h
24	include/rudiments/private/sharedmemory.h	101	include/rudiments/private/sharedmemory.h
		102	include/rudiments/private/sharedmemoryincludes.h
		103	include/rudiments/private/signalclassesincludes.h
25	include/rudiments/private/signalhandler.h	104	include/rudiments/private/signalhandler.h
26	include/rudiments/private/signalset.h	105	include/rudiments/private/signalset.h
27	include/rudiments/private/socketnode.h	106	include/rudiments/private/stderrdestination.h
28	@dirrm include/rudiments/private	107	include/rudiments/private/stdoutdestination.h
29	@dirrm include/rudiments	108	include/rudiments/private/stringbuffer.h
		109	include/rudiments/private/stringbufferincludes.h
		110	include/rudiments/private/syslogdestination.h
		111	include/rudiments/private/timezonefile.h
		112	include/rudiments/private/unixclientsocketincludes.h
		113	include/rudiments/private/unixserversocket.h
		114	include/rudiments/private/unixserversocketincludes.h
		115	include/rudiments/private/unixsocket.h
		116	include/rudiments/private/variablebuffer.h
		117	include/rudiments/private/variablebufferincludes.h
		118	include/rudiments/private/xmldom.h
		119	include/rudiments/private/xmldomincludes.h
		120	include/rudiments/private/xmldomnode.h
		121	include/rudiments/private/xmldomnodeincludes.h
		122	include/rudiments/private/xmlsax.h
		123	include/rudiments/private/xmlsaxincludes.h
		124	include/rudiments/protocolentry.h
		125	include/rudiments/randomnumber.h
		126	include/rudiments/regularexpression.h
		127	include/rudiments/resultcodes.h
		128	include/rudiments/rpcentry.h
		129	include/rudiments/semaphoreset.h
		130	include/rudiments/server.h
		131	include/rudiments/serversocket.h
		132	include/rudiments/serviceentry.h
		133	include/rudiments/sharedmemory.h
		134	include/rudiments/signalclasses.h
		135	include/rudiments/stringbuffer.h
		136	include/rudiments/timezonefile.h
		137	include/rudiments/unixclientsocket.h
		138	include/rudiments/unixserversocket.h
		139	include/rudiments/variablebuffer.h
		140	include/rudiments/xmldom.h
		141	include/rudiments/xmldomnode.h
		142	include/rudiments/xmlsax.h
		143	lib/librudiments-%%VER%%.so.1
30	lib/librudiments.a	144	lib/librudiments.a
31	lib/librudiments.so	145	lib/librudiments.so
32	lib/librudiments.so.0	146	%%PORTDOCS%%%%DOCSDIR%%/classes/client.h.html
33	%%PROFILE%%lib/librudiments_p.a	147	%%PORTDOCS%%%%DOCSDIR%%/classes/commandline.h.html
34	%%PORTDOCS%%share/doc/rudiments/classes/clientsocket.h.html	148	%%PORTDOCS%%%%DOCSDIR%%/classes/daemonprocess.h.html
35	%%PORTDOCS%%share/doc/rudiments/classes/commandline.h.html	149	%%PORTDOCS%%%%DOCSDIR%%/classes/datatransport.h.html
36	%%PORTDOCS%%share/doc/rudiments/classes/daemonprocess.h.html	150	%%PORTDOCS%%%%DOCSDIR%%/classes/datatransportfactory.h.html
37	%%PORTDOCS%%share/doc/rudiments/classes/datetime.h.html	151	%%PORTDOCS%%%%DOCSDIR%%/classes/datetime.h.html
38	%%PORTDOCS%%share/doc/rudiments/classes/genericsocket.h.html	152	%%PORTDOCS%%%%DOCSDIR%%/classes/dictionary.h.html
39	%%PORTDOCS%%share/doc/rudiments/classes/permissions.h.html	153	%%PORTDOCS%%%%DOCSDIR%%/classes/dtd.h.html
40	%%PORTDOCS%%share/doc/rudiments/classes/randomnumber.h.html	154	%%PORTDOCS%%%%DOCSDIR%%/classes/environment.h.html
41	%%PORTDOCS%%share/doc/rudiments/classes/regularexpression.h.html	155	%%PORTDOCS%%%%DOCSDIR%%/classes/errorhandler.h.html
42	%%PORTDOCS%%share/doc/rudiments/classes/semaphoreset.h.html	156	%%PORTDOCS%%%%DOCSDIR%%/classes/file.h.html
43	%%PORTDOCS%%share/doc/rudiments/classes/serversocket.h.html	157	%%PORTDOCS%%%%DOCSDIR%%/classes/filedescriptor.h.html
44	%%PORTDOCS%%share/doc/rudiments/classes/serversocketpool.h.html	158	%%PORTDOCS%%%%DOCSDIR%%/classes/filesystem.h.html
45	%%PORTDOCS%%share/doc/rudiments/classes/sharedmemory.h.html	159	%%PORTDOCS%%%%DOCSDIR%%/classes/groupentry.h.html
46	%%PORTDOCS%%share/doc/rudiments/classes/signalclasses.h.html	160	%%PORTDOCS%%%%DOCSDIR%%/classes/hostentry.h.html
47	%%PORTDOCS%%share/doc/rudiments/classes/text.h.html	161	%%PORTDOCS%%%%DOCSDIR%%/classes/inetclientsocket.h.html
48	%%PORTDOCS%%share/doc/rudiments/css/styles.css	162	%%PORTDOCS%%%%DOCSDIR%%/classes/inetserversocket.h.html
49	%%PORTDOCS%%share/doc/rudiments/guide.html	163	%%PORTDOCS%%%%DOCSDIR%%/classes/list.h.html
50	%%PORTDOCS%%share/doc/rudiments/index.html	164	%%PORTDOCS%%%%DOCSDIR%%/classes/listener.h.html
51	%%PORTDOCS%%share/doc/rudiments/introduction.html	165	%%PORTDOCS%%%%DOCSDIR%%/classes/logger.h.html
52	%%PORTDOCS%%share/doc/rudiments/invisible.gif	166	%%PORTDOCS%%%%DOCSDIR%%/classes/memorypool.h.html
53	%%PORTDOCS%%share/doc/rudiments/programming/baseclasses.html	167	%%PORTDOCS%%%%DOCSDIR%%/classes/parameterstring.h.html
54	%%PORTDOCS%%share/doc/rudiments/programming/utilclasses.html	168	%%PORTDOCS%%%%DOCSDIR%%/classes/passwdentry.h.html
55	%%PORTDOCS%%share/doc/rudiments/reference.html	169	%%PORTDOCS%%%%DOCSDIR%%/classes/permissions.h.html
56	%%PORTDOCS%%@dirrm share/doc/rudiments/programming	170	%%PORTDOCS%%%%DOCSDIR%%/classes/protocolentry.h.html
57	%%PORTDOCS%%@dirrm share/doc/rudiments/css	171	%%PORTDOCS%%%%DOCSDIR%%/classes/randomnumber.h.html
58	%%PORTDOCS%%@dirrm share/doc/rudiments/classes	172	%%PORTDOCS%%%%DOCSDIR%%/classes/regularexpression.h.html
59	%%PORTDOCS%%@dirrm share/doc/rudiments	173	%%PORTDOCS%%%%DOCSDIR%%/classes/rpcentry.h.html
		174	%%PORTDOCS%%%%DOCSDIR%%/classes/semaphoreset.h.html
		175	%%PORTDOCS%%%%DOCSDIR%%/classes/server.h.html
		176	%%PORTDOCS%%%%DOCSDIR%%/classes/serversocket.h.html
		177	%%PORTDOCS%%%%DOCSDIR%%/classes/serviceentry.h.html
		178	%%PORTDOCS%%%%DOCSDIR%%/classes/shadowentry.h.html
		179	%%PORTDOCS%%%%DOCSDIR%%/classes/sharedmemory.h.html
		180	%%PORTDOCS%%%%DOCSDIR%%/classes/signalclasses.h.html
		181	%%PORTDOCS%%%%DOCSDIR%%/classes/string.h.html
		182	%%PORTDOCS%%%%DOCSDIR%%/classes/stringbuffer.h.html
		183	%%PORTDOCS%%%%DOCSDIR%%/classes/timezonefile.h.html
		184	%%PORTDOCS%%%%DOCSDIR%%/classes/unixclientsocket.h.html
		185	%%PORTDOCS%%%%DOCSDIR%%/classes/unixserversocket.h.html
		186	%%PORTDOCS%%%%DOCSDIR%%/classes/variablebuffer.h.html
		187	%%PORTDOCS%%%%DOCSDIR%%/classes/xmldom.h.html
		188	%%PORTDOCS%%%%DOCSDIR%%/classes/xmldomnode.h.html
		189	%%PORTDOCS%%%%DOCSDIR%%/classes/xmlsax.h.html
		190	%%PORTDOCS%%%%DOCSDIR%%/css/styles.css
		191	%%PORTDOCS%%%%DOCSDIR%%/guide.html
		192	%%PORTDOCS%%%%DOCSDIR%%/index.html
		193	%%PORTDOCS%%%%DOCSDIR%%/introduction.html
		194	%%PORTDOCS%%%%DOCSDIR%%/invisible.gif
		195	%%PORTDOCS%%%%DOCSDIR%%/programming/baseclasses.html
		196	%%PORTDOCS%%%%DOCSDIR%%/programming/utilclasses.html
		197	%%PORTDOCS%%%%DOCSDIR%%/reference.html
		198	%%PORTDOCS%%@dirrm %%DOCSDIR%%/programming
		199	%%PORTDOCS%%@dirrm %%DOCSDIR%%/css
		200	%%PORTDOCS%%@dirrm %%DOCSDIR%%/classes
		201	%%PORTDOCS%%@dirrm %%DOCSDIR%%
		202	@dirrm include/rudiments/private
		203	@dirrm include/rudiments

Return to bug 66645

Lines 6-13 Link Here

(-)devel/rudiments/Makefile (-23 / +18 lines)
6	#	6	#
7		7
8	PORTNAME= rudiments	8	PORTNAME= rudiments
9	PORTVERSION= 0.24	9	PORTVERSION= 0.26.3
10	PORTREVISION= 2
11	CATEGORIES= devel	10	CATEGORIES= devel
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 15-40 Link Here
15	MAINTAINER= ports@FreeBSD.org	14	MAINTAINER= ports@FreeBSD.org
16	COMMENT= A utility C++ class library for daemons, clients, servers and more	15	COMMENT= A utility C++ class library for daemons, clients, servers and more
17		16
18	USE_GMAKE= yes	17	USE_GMAKE= yes
19	USE_AUTOCONF_VER=213	18	USE_LIBTOOL_VER= 13
20	CONFIGURE_ENV= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}"	19	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
21	MAKE_ARGS= VERSION="${PORTVERSION:R}"	20	CONFIGURE_ENV= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
22		21	PTHREADINCLUDES="${PTHREAD_CFLAGS}" \
23	INSTALLS_SHLIB= yes	22	PTHREADLIB="${PTHREAD_LIBS}"
24		23	PLIST_SUB= VER="${PORTVERSION}"
25	.include <bsd.port.pre.mk>	24
26		25	INSTALLS_SHLIB= yes
27	.if ${OSVERSION} >= 500000	26
28	EXTRA_PATCHES= ${PATCHDIR}/extra-patch-*	27	USE_REINPLACE= yes
29		28
30	PLIST_SUB+= PROFILE="@comment "	29	pre-configure:
31	.else	30	.if defined(NOPORTDOCS)
32	PLIST_SUB+= PROFILE=""	31	@${REINPLACE_CMD} -e "s\|install-bin install-doc\|install-bin\|" \
33	.endif	32	${WRKSRC}/Makefile
34
35	post-install:
36	.if !defined(NOPORTDOCS)
37	cd ${WRKSRC} && ${MAKE} doc-install
38	.endif	33	.endif
39		34
40	.include <bsd.port.post.mk>	35	.include <bsd.port.mk>

Lines 1-25 Link Here

(-)devel/rudiments/files/extra-patch-src+Makefile.in (-25 lines)
1	--- src/Makefile.in.orig Mon Apr 15 13:21:24 2002
2	+++ src/Makefile.in Sat Dec 7 19:27:01 2002
3	@@ -17,7 +17,6 @@
4
5	all:
6	$(MAKE) ../lib/librudiments.a; \
7	- $(MAKE) ../lib/librudiments_p.a; \
8	if ( test ! -n "@MINGW32@" -a ! -n "@CYGWIN@" -a ! -n "@UWIN@" ); then \
9	$(MAKE) ../lib/librudiments.so.$(VERSION); \
10	else \
11	@@ -48,7 +47,6 @@
12	install:
13	$(top_srcdir)/mkinstalldirs $(libdir)
14	$(INSTALL) -m 644 ../lib/librudiments.a $(libdir); \
15	- $(INSTALL) -m 644 ../lib/librudiments_p.a $(libdir); \
16	if ( test ! -n "@MINGW32@" -a ! -n "@CYGWIN@" -a ! -n "@UWIN@" ); then \
17	$(RM) $(libdir)/librudiments.so*; \
18	$(INSTALL) ../lib/librudiments.so.$(VERSION) $(libdir); \
19	@@ -62,6 +60,5 @@
20	uninstall:
21	$(RM) $(libdir)/librudiments.so*
22	$(RM) $(libdir)/librudiments.a
23	- $(RM) $(libdir)/librudiments_p.a
24	$(RM) $(libdir)/librudiments.dll
25	$(RM) $(libdir)/librudiments.lib

Lines 1-18 Link Here

(-)devel/rudiments/files/patch-config.mk.in (-13 / +6 lines)
1	--- config.mk.in.orig Mon Apr 15 11:21:21 2002	1	--- config.mk.in.orig Tue Dec 30 18:16:20 2003
2	+++ config.mk.in Tue Oct 28 07:39:01 2003	2	+++ config.mk.in Mon May 10 22:16:53 2004
3	@@ -7,13 +7,13 @@	3	@@ -10,7 +10,7 @@
4	exec_prefix = @exec_prefix@	4	includedir = @includedir@
5	incdir = @includedir@
6	libdir = @libdir@	5	libdir = @libdir@
7	-docdir = $(prefix)/doc/rudiments	6	datadir = @datadir@
		7	-docdir = ${datadir}/doc/rudiments
8	+docdir = $(prefix)/share/doc/rudiments	8	+docdir = $(prefix)/share/doc/rudiments
9		9
10	# compiler to use	10	# compiler to use
11	CXX = @CXX@	11	CXX = @CXX@
12
13	# debug and optimization flags (-g, -O2, etc.)
14	-CXXFLAGS = -pedantic -w -O2 -fPIC @CXXFLAGS@
15	+CXXFLAGS = -w -fPIC @CXXFLAGS@
16
17	# command to build a shared object library
18	DYNAMICAR = @DYNAMICAR@

Line 0 Link Here

(-)devel/rudiments/files/patch-configure (+30 lines)
	1	--- configure.orig Tue Dec 30 18:12:47 2003
	2	+++ configure Tue May 11 23:39:41 2004
	3	@@ -1505,7 +1505,7 @@
	4	enableval="$enable_debug"
	5	CXXFLAGS="-g -pg -fno-exceptions -Wall"; INSTALLSTRIP=""
	6	else
	7	- CXXFLAGS="-fomit-frame-pointer -fno-exceptions -Wall"; INSTALLSTRIP="-s"
	8	+ CXXFLAGS="${CXXFLAGS} -fomit-frame-pointer -fno-exceptions -Wall"; INSTALLSTRIP="-s"
	9	fi;
	10
	11	# Check whether --with-system-libtool or --without-system-libtool was given.
	12	@@ -18523,6 +18523,7 @@
	13
	14	# This can be used to rebuild libtool when needed
	15	LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
	16	+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
	17
	18	# Always use our own libtool.
	19	LIBTOOL='$(SHELL) $(top_builddir)/libtool'
	20	@@ -19444,8 +19445,8 @@
	21
	22
	23	HAVE_PTHREAD=""
	24	-PTHREADINCLUDES=""
	25	-PTHREADLIB=""
	26	+#PTHREADINCLUDES=""
	27	+#PTHREADLIB=""
	28
	29	if ( test "$cross_compiling" = "yes" )
	30	then

Lines 1-13 Link Here

(-)devel/rudiments/files/patch-configure.in (-13 lines)
1	--- configure.in.orig Fri Jun 29 14:14:19 2001
2	+++ configure.in Mon Jul 2 16:32:29 2001
3	@@ -112,8 +112,8 @@
4	VERSION="0.20"
5	AC_SUBST(VERSION)
6	AC_DEFINE_UNQUOTED(VERSION,"$VERSION",Version)
7	-CXXFLAGS=""
8	-CFLAGS=""
9	+#CXXFLAGS=""
10	+#CFLAGS=""
11	AC_PREFIX_DEFAULT(/usr/local/firstworks)
12
13	dnl Output files.

Lines 1-18 Link Here

(-)devel/rudiments/files/patch-genericsocket.h (-18 lines)
1	--- include/rudiments/genericsocket.h.bak Mon Apr 15 06:21:25 2002
2	+++ include/rudiments/genericsocket.h Sun Feb 29 01:55:13 2004
3	@@ -4,12 +4,14 @@
4	#ifndef GENERICSOCKET_H
5	#define GENERICSOCKET_H
6
7	-#include <strstream.h>
8	+#include <strstream>
9
10	#include <sys/types.h>
11	#include <sys/un.h>
12	#include <netinet/in.h>
13	#include <netdb.h>
14	+
15	+using namespace std;
16
17	// The client class allows you to write programs that can talk to other
18	// programs over TCP connections.

Lines 1-29 Link Here

(-)devel/rudiments/files/patch-src-daemonprocess.C (-29 lines)
1	--- src/daemonprocess.C.orig Mon Apr 15 06:21:24 2002
2	+++ src/daemonprocess.C Sun Feb 29 01:53:19 2004
3	@@ -5,7 +5,7 @@
4
5	#include <iostream.h>
6	#include <fstream.h>
7	-#include <strstream.h>
8	+#include <strstream>
9
10	#include <sys/types.h>
11	#ifdef HAVE_UNISTD_H
12	@@ -22,11 +22,13 @@
13	#include <rudiments/daemonprocess.h>
14
15	#ifdef __GNUC__
16	-static signalhandler *daemonprocess::termhandler;
17	-static signalhandler *daemonprocess::inthandler;
18	-static void (*daemonprocess::shutdownfunc)(int);
19	-static signalhandler *daemonprocess::deadchildhandler;
20	+signalhandler *daemonprocess::termhandler;
21	+signalhandler *daemonprocess::inthandler;
22	+void (*daemonprocess::shutdownfunc)(int);
23	+signalhandler *daemonprocess::deadchildhandler;
24	#endif
25	+
26	+using namespace std;
27
28	daemonprocess::daemonprocess() {
29

Lines 1-29 Link Here

(-)devel/rudiments/files/patch-src-genericsocket.C (-29 lines)
1	--- src/genericsocket.C.orig Mon Apr 15 11:21:24 2002
2	+++ src/genericsocket.C Tue Oct 28 08:10:37 2003
3	@@ -211,7 +211,7 @@
4	// If we got no error, just didn't get
5	// all of the data, we need to get the
6	// rest.
7	- return retval+safeRead(fd,buf+retval,
8	+ return retval+safeRead(fd,(char *)buf+retval,
9	realcount-retval);
10	} else if (errno && showerrors) {
11	cerr << "error: read failed: ";
12	@@ -223,7 +223,7 @@
13
14	// handle cases where count>SSIZE_MAX by continuing to read
15	if (realcount<count) {
16	- return retval+safeRead(fd,buf+retval,count-retval);
17	+ return retval+safeRead(fd,(char *)buf+retval,count-retval);
18	}
19
20	return retval;
21	@@ -260,7 +260,7 @@
22
23	// must send at least 1 iovector with 1 byte of real data
24	struct iovec iovector[1];
25	- iovector[0].iov_base=(void *)" ";
26	+ iovector[0].iov_base=const_cast<char *>(" ");
27	iovector[0].iov_len=sizeof(char);
28	messageheader.msg_iov=iovector;
29	messageheader.msg_iovlen=1;