Attachment #81195 for bug #116300

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




#

PORTNAME=	commoncpp
PORTVERSION=	1.5.7
PORTEPOCH=	2
CATEGORIES=	devel
MASTER_SITES=	GNU
MASTER_SITE_SUBDIR=	gnutelephony
DISTNAME=	${PORTNAME:S/$/2/}-${PORTVERSION}

MAINTAINER=	acm@FreeBSD.org
COMMENT=	GNU project portable class framework for C++

USE_LDCONFIG=	yes
USE_GNOME=	gnomehack gnometarget

.if !defined(WITHOUT_LIBXML2)
USE_GNOME+=	libxml2
.else
CONFIGURE_ARGS=	--without-libxml2
.endif

USE_GETOPT_LONG=yes
USE_GMAKE=	yes
GNU_CONFIGURE=	yes
USE_GCC=	3.4+
CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
		ac_cv_path_DOXYGEN=no

OPTIONS=	LIBXML2 "Enable libxml2 support" on

INFO=		commoncpp2

CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}

.include <bsd.port.pre.mk>

.if !defined(WITHOUT_LIBXML2)
USE_GNOME+=	libxml2
.else
CONFIGURE_ARGS+=--without-libxml2
.endif

.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)commoncpp/distinfo (-3 / +3 lines)
1	MD5 (commoncpp2-1.5.2.tar.gz) = 9d84aa85af660b0dbb8fb601cf783409	1	MD5 (commoncpp2-1.5.7.tar.gz) = bd85e157e1f4f457e9137c59d40a13fb
2	SHA256 (commoncpp2-1.5.2.tar.gz) = 75e2a4777f7fc6764c176b79851ca9530f6c5c745e9f610dbedf4253fde5f200	2	SHA256 (commoncpp2-1.5.7.tar.gz) = 95b0e86c27db1ec0b79abe4097f4449f1e15dde1870202ead0551c506269a504
3	SIZE (commoncpp2-1.5.2.tar.gz) = 862550	3	SIZE (commoncpp2-1.5.7.tar.gz) = 858598




--- ./include/cc++/address.h.orig	Tue Jan 23 14:15:02 2007
+++ ./include/cc++/address.h	Tue Sep 11 11:58:17 2007
@@ -236,10 +236,10 @@
 	bool isMember(const struct in_addr &inaddr) const;
 
 	inline bool operator==(const struct sockaddr *a) const
-		{return isMember(a);};
+		{return isMember(a);}
 
 	inline bool operator==(const struct in_addr &a) const
-		{return isMember(a);};
+		{return isMember(a);}
 };
 
 inline bool operator==(struct sockaddr *sa, IPV4Cidr &cidr)
-	{return cidr.isMember(sa);};
+	{return cidr.isMember(sa);}
 
 inline bool operator==(struct in_addr &a, IPV4Cidr &cidr)
-	{return cidr.isMember(a);};
+	{return cidr.isMember(a);}
 
 #ifdef	CCXX_IPV6
@@ -324,10 +324,10 @@
 	bool isMember(const struct in6_addr &inaddr) const;
 };
 
 	inline bool operator==(const struct sockaddr *sa) const
-		{return isMember(sa);};
+		{return isMember(sa);}
 
 	inline bool operator==(const struct in6_addr &a) const
-		{return isMember(a);};
+		{return isMember(a);}
 };
 
 #endif
 

Added Link Here

(-)commoncpp/files/patch-src_timer.cpp (+11 lines)
1	--- src/timer.cpp.orig Tue Jan 23 21:09:13 2007
2	+++ src/timer.cpp Tue Sep 11 13:12:41 2007
3	@@ -117,7 +117,7 @@
4	active = true;
5	}
6
7	-#ifdef HAVE_HIRES_TIMER
8	+#if defined(HAVE_HIRES_TIMER) && !defined(__FreeBSD__)
9	void TimerPort::sleepTimer(void)
10	{
11	struct timespec ts;

Return to bug 116300

Lines 6-40 Link Here

(-)commoncpp/Makefile (-14 / +14 lines)
6	#	6	#
7		7
8	PORTNAME= commoncpp	8	PORTNAME= commoncpp
9	PORTVERSION= 1.5.2	9	PORTVERSION= 1.5.7
10	PORTEPOCH= 2	10	PORTEPOCH= 2
11	CATEGORIES= devel	11	CATEGORIES= devel
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= GNU
13	MASTER_SITE_SUBDIR= gnutelephony
14	DISTNAME= ${PORTNAME:S/$/2/}-${PORTVERSION}	13	DISTNAME= ${PORTNAME:S/$/2/}-${PORTVERSION}
15		14
16	MAINTAINER= acm@FreeBSD.org	15	MAINTAINER= acm@FreeBSD.org
17	COMMENT= GNU project portable class framework for C++	16	COMMENT= GNU project portable class framework for C++
18		17
		18	USE_LDCONFIG= yes
19	USE_GNOME= gnomehack gnometarget	19	USE_GNOME= gnomehack gnometarget
20
21	.if !defined(WITHOUT_LIBXML2)
22	USE_GNOME+= libxml2
23	.else
24	CONFIGURE_ARGS= --without-libxml2
25	.endif
26
27	USE_GETOPT_LONG=yes
28	USE_GMAKE= yes	20	USE_GMAKE= yes
29	GNU_CONFIGURE= yes	21	GNU_CONFIGURE= yes
30	USE_GCC= 3.4+
31	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \	22	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
32	ac_cv_path_DOXYGEN=no	23	ac_cv_path_DOXYGEN=no
33	USE_LDCONFIG= yes	24
		25	OPTIONS= LIBXML2 "Enable libxml2 support" on
34		26
35	INFO= commoncpp2	27	INFO= commoncpp2
36		28
37	CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}	29	CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
38	LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}	30	LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
39		31
40	.include <bsd.port.mk>	32	.include <bsd.port.pre.mk>
		33
		34	.if !defined(WITHOUT_LIBXML2)
		35	USE_GNOME+= libxml2
		36	.else
		37	CONFIGURE_ARGS+=--without-libxml2
		38	.endif
		39
		40	.include <bsd.port.post.mk>

Lines 1-28 Link Here

(-)commoncpp/files/patch-include-cc++_address.h (-22 / +22 lines)
1	--- include/cc++/address.h Sun Oct 1 07:07:12 2006	1	--- ./include/cc++/address.h.orig Tue Jan 23 14:15:02 2007
2	+++ include/cc++/address.h Wed Oct 4 21:25:44 2006	2	+++ ./include/cc++/address.h Tue Sep 11 11:58:17 2007
3	@@ -237,10 +237,10 @@	3	@@ -236,10 +236,10 @@
		4	bool isMember(const struct in_addr &inaddr) const;
		5
		6	inline bool operator==(const struct sockaddr *a) const
		7	- {return isMember(a);};
		8	+ {return isMember(a);}
		9
		10	inline bool operator==(const struct in_addr &a) const
		11	- {return isMember(a);};
		12	+ {return isMember(a);}
4	};	13	};
5		14
6	inline bool operator==(struct sockaddr *sa, IPV4Cidr &cidr)
7	- {return cidr.isMember(sa);};
8	+ {return cidr.isMember(sa);}
9
10	inline bool operator==(struct in_addr &a, IPV4Cidr &cidr)
11	- {return cidr.isMember(a);};
12	+ {return cidr.isMember(a);}
13
14	#ifdef CCXX_IPV6	15	#ifdef CCXX_IPV6
15	/**	16	@@ -324,10 +324,10 @@
16	@@ -325,10 +325,10 @@	17	bool isMember(const struct in6_addr &inaddr) const;
17	};
18		18
19	inline bool operator==(struct sockaddr *sa, IPV6Cidr &cidr)	19	inline bool operator==(const struct sockaddr *sa) const
20	- {return cidr.isMember(sa);};	20	- {return isMember(sa);};
21	+ {return cidr.isMember(sa);}	21	+ {return isMember(sa);}
22		22
23	inline bool operator==(struct in6_addr &a, IPV6Cidr &cidr)	23	inline bool operator==(const struct in6_addr &a) const
24	- {return cidr.isMember(a);};	24	- {return isMember(a);};
25	+ {return cidr.isMember(a);}	25	+ {return isMember(a);}
		26	};
26		27
27	#endif	28	#endif
28