Tue Sep 17 11:58:57 2013 UTC ()
Fix build with -Woverloaded-virtual.
Add missing openssl & pcre dependencies. Bump PKGREVISION.


(fhajny)
diff -r1.22 -r1.23 pkgsrc/devel/rudiments/Makefile
diff -r1.8 -r1.9 pkgsrc/devel/rudiments/buildlink3.mk
diff -r1.8 -r1.9 pkgsrc/devel/rudiments/distinfo
diff -r0 -r1.1 pkgsrc/devel/rudiments/patches/patch-include_rudiments_private_clientsocket.h
cvs diff -r1.22 -r1.23 pkgsrc/devel/rudiments/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/rudiments/Makefile 2013/09/14 09:14:08 1.22
+++ pkgsrc/devel/rudiments/Makefile 2013/09/17 11:58:57 1.23
@@ -1,20 +1,23 @@ @@ -1,20 +1,23 @@
1# $NetBSD: Makefile,v 1.22 2013/09/14 09:14:08 fhajny Exp $ 1# $NetBSD: Makefile,v 1.23 2013/09/17 11:58:57 fhajny Exp $
2# 2#
3 3
4DISTNAME= rudiments-0.42 4DISTNAME= rudiments-0.42
 5PKGREVISION= 1
5CATEGORIES= devel 6CATEGORIES= devel
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rudiments/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rudiments/}
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://rudiments.sourceforge.net/ 10HOMEPAGE= http://rudiments.sourceforge.net/
10COMMENT= C++ class library for client/server/daemon applications 11COMMENT= C++ class library for client/server/daemon applications
11LICENSE= gnu-lgpl-v2 12LICENSE= gnu-lgpl-v2
12 13
13GNU_CONFIGURE= YES 14GNU_CONFIGURE= YES
14USE_TOOLS+= gmake 15USE_TOOLS+= gmake
15USE_LANGUAGES= c c++ 16USE_LANGUAGES= c c++
16USE_LIBTOOL= YES 17USE_LIBTOOL= YES
17USE_PKGLOCALEDIR= YES 18USE_PKGLOCALEDIR= YES
18 19
 20.include "../../devel/pcre/buildlink3.mk"
 21.include "../../security/openssl/buildlink3.mk"
19.include "../../mk/pthread.buildlink3.mk" 22.include "../../mk/pthread.buildlink3.mk"
20.include "../../mk/bsd.pkg.mk" 23.include "../../mk/bsd.pkg.mk"
cvs diff -r1.8 -r1.9 pkgsrc/devel/rudiments/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/devel/rudiments/buildlink3.mk 2009/03/20 19:24:29 1.8
+++ pkgsrc/devel/rudiments/buildlink3.mk 2013/09/17 11:58:57 1.9
@@ -1,18 +1,21 @@ @@ -1,18 +1,21 @@
1# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:29 joerg Exp $ 1# $NetBSD: buildlink3.mk,v 1.9 2013/09/17 11:58:57 fhajny Exp $
2# 2#
3# This Makefile fragment is included by packages that use rudiments. 3# This Makefile fragment is included by packages that use rudiments.
4# 4#
5# This file was created automatically using createbuildlink-3.1. 5# This file was created automatically using createbuildlink-3.1.
6# 6#
7 7
8BUILDLINK_TREE+= rudiments 8BUILDLINK_TREE+= rudiments
9 9
10.if !defined(RUDIMENTS_BUILDLINK3_MK) 10.if !defined(RUDIMENTS_BUILDLINK3_MK)
11RUDIMENTS_BUILDLINK3_MK:= 11RUDIMENTS_BUILDLINK3_MK:=
12 12
13BUILDLINK_API_DEPENDS.rudiments+= rudiments>=0.25.1 13BUILDLINK_API_DEPENDS.rudiments+= rudiments>=0.25.1
14BUILDLINK_ABI_DEPENDS.rudiments+= rudiments>=0.28.2nb1 14BUILDLINK_ABI_DEPENDS.rudiments+= rudiments>=0.28.2nb1
15BUILDLINK_PKGSRCDIR.rudiments?= ../../devel/rudiments 15BUILDLINK_PKGSRCDIR.rudiments?= ../../devel/rudiments
 16
 17.include "../../devel/pcre/buildlink3.mk"
 18.include "../../security/openssl/buildlink3.mk"
16.endif # RUDIMENTS_BUILDLINK3_MK 19.endif # RUDIMENTS_BUILDLINK3_MK
17 20
18BUILDLINK_TREE+= -rudiments 21BUILDLINK_TREE+= -rudiments
cvs diff -r1.8 -r1.9 pkgsrc/devel/rudiments/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/rudiments/distinfo 2013/09/14 09:14:08 1.8
+++ pkgsrc/devel/rudiments/distinfo 2013/09/17 11:58:57 1.9
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.8 2013/09/14 09:14:08 fhajny Exp $ 1$NetBSD: distinfo,v 1.9 2013/09/17 11:58:57 fhajny Exp $
2 2
3SHA1 (rudiments-0.42.tar.gz) = 136faa5186d052dccb6616dbe40e5e10a52c0ffb 3SHA1 (rudiments-0.42.tar.gz) = 136faa5186d052dccb6616dbe40e5e10a52c0ffb
4RMD160 (rudiments-0.42.tar.gz) = 46aa5d06d63faa8fb7319fd73d28c71f2dea3dc0 4RMD160 (rudiments-0.42.tar.gz) = 46aa5d06d63faa8fb7319fd73d28c71f2dea3dc0
5Size (rudiments-0.42.tar.gz) = 1488133 bytes 5Size (rudiments-0.42.tar.gz) = 1488133 bytes
6SHA1 (patch-aa) = b3a49dd56808843d0e995a5c45df236abeb4c7d3 6SHA1 (patch-aa) = b3a49dd56808843d0e995a5c45df236abeb4c7d3
 7SHA1 (patch-include_rudiments_private_clientsocket.h) = bfc239e4eb5ca79c01e3a17837443ea329dd9d80
7SHA1 (patch-src_charstring.cpp) = b385472b2340abd8090d75df9b272e6f1564061a 8SHA1 (patch-src_charstring.cpp) = b385472b2340abd8090d75df9b272e6f1564061a
File Added: pkgsrc/devel/rudiments/patches/Attic/patch-include_rudiments_private_clientsocket.h
$NetBSD: patch-include_rudiments_private_clientsocket.h,v 1.1 2013/09/17 11:58:57 fhajny Exp $

Fix hidden overloaded virtual function in include/rudiments/client.h.
--- include/rudiments/private/clientsocket.h.orig	2012-01-30 01:52:27.000000000 +0000
+++ include/rudiments/private/clientsocket.h
@@ -5,6 +5,7 @@
 #ifdef RUDIMENTS_HAS_SSL
 		BIO	*newSSLBIO() const;
 #endif
+		using rudiments::client::connect;
 		int32_t	connect(const struct ::sockaddr *addr,
 				socklen_t addrlen, long sec, long usec);
 		ssize_t	lowLevelRead(void *buf, ssize_t count) const;