Wed Oct 19 13:17:20 2011 UTC ()
Pullup ticket #3564 - requested by obache
pkgsrc/devel/poco: build fix

Revisions pulled up:
- devel/poco/Makefile                                           1.3
- devel/poco/Makefile.common                                    1.4
- devel/poco/distinfo                                           1.3
- devel/poco/patches/patch-Foundation_include_Poco_Platform.h   1.1

---
   Module Name:	pkgsrc
   Committed By:	obache
   Date:		Sun Oct 16 08:18:53 UTC 2011

   Modified Files:
   	pkgsrc/devel/poco: Makefile Makefile.common distinfo
   Added Files:
   	pkgsrc/devel/poco/patches: patch-Foundation_include_Poco_Platform.h

   Log Message:
   Add DragonFly BSD support.
   PR pkg/45475 by Samuel J. Greear.


(tron)
diff -r1.2 -r1.2.6.1 pkgsrc/devel/poco/Makefile
diff -r1.2 -r1.2.6.1 pkgsrc/devel/poco/distinfo
diff -r1.3 -r1.3.6.1 pkgsrc/devel/poco/Makefile.common
diff -r0 -r1.1.2.2 pkgsrc/devel/poco/patches/patch-Foundation_include_Poco_Platform.h
cvs diff -r1.2 -r1.2.6.1 pkgsrc/devel/poco/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/poco/Makefile 2011/02/06 06:08:07 1.2
+++ pkgsrc/devel/poco/Makefile 2011/10/19 13:17:20 1.2.6.1
@@ -1,26 +1,30 @@ @@ -1,26 +1,30 @@
1# $NetBSD: Makefile,v 1.2 2011/02/06 06:08:07 schnoebe Exp $ 1# $NetBSD: Makefile,v 1.2.6.1 2011/10/19 13:17:20 tron Exp $
2# 2#
3 3
4PKGNAME= poco-${POCO_VERSION} 4PKGNAME= poco-${POCO_VERSION}
5CATEGORIES= devel 5CATEGORIES= devel
6 6
7COMMENT= POCO C++ Foundation libraries 7COMMENT= POCO C++ Foundation libraries
8 8
9.include "../../devel/poco/Makefile.common" 9.include "../../devel/poco/Makefile.common"
10 10
11CONFIGURE_ARGS+= --library-path=${BUILDLINK_PREFIX.expat}/lib 11CONFIGURE_ARGS+= --library-path=${BUILDLINK_PREFIX.expat}/lib
12CONFIGURE_ARGS+= --library-path=${BUILDLINK_PREFIX.pcre}/lib 12CONFIGURE_ARGS+= --library-path=${BUILDLINK_PREFIX.pcre}/lib
13CONFIGURE_ARGS+= --library-path=${BUILDLINK_PREFIX.zlib}/lib 13CONFIGURE_ARGS+= --library-path=${BUILDLINK_PREFIX.zlib}/lib
14CONFIGURE_ARGS+= --library-path=${BUILDLINK_PREFIX.openssl}/lib 14CONFIGURE_ARGS+= --library-path=${BUILDLINK_PREFIX.openssl}/lib
15 15
16CONFIGURE_ARGS+= --include-path=${BUILDLINK_PREFIX.expat}/include 16CONFIGURE_ARGS+= --include-path=${BUILDLINK_PREFIX.expat}/include
17CONFIGURE_ARGS+= --include-path=${BUILDLINK_PREFIX.pcre}/include 17CONFIGURE_ARGS+= --include-path=${BUILDLINK_PREFIX.pcre}/include
18CONFIGURE_ARGS+= --include-path=${BUILDLINK_PREFIX.zlib}/include 18CONFIGURE_ARGS+= --include-path=${BUILDLINK_PREFIX.zlib}/include
19CONFIGURE_ARGS+= --include-path=${BUILDLINK_PREFIX.openssl}/include 19CONFIGURE_ARGS+= --include-path=${BUILDLINK_PREFIX.openssl}/include
20 20
 21# remove pach backup files.
 22pre-install:
 23 ${RM} -f ${WRKSRC}/Foundation/include/Poco/Platform.h.orig
 24
21.include "../../devel/pcre/buildlink3.mk" 25.include "../../devel/pcre/buildlink3.mk"
22.include "../../devel/zlib/buildlink3.mk" 26.include "../../devel/zlib/buildlink3.mk"
23.include "../../security/openssl/buildlink3.mk" 27.include "../../security/openssl/buildlink3.mk"
24.include "../../textproc/expat/buildlink3.mk" 28.include "../../textproc/expat/buildlink3.mk"
25 29
26.include "../../mk/bsd.pkg.mk" 30.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.2.6.1 pkgsrc/devel/poco/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/poco/distinfo 2011/02/06 07:14:21 1.2
+++ pkgsrc/devel/poco/distinfo 2011/10/19 13:17:20 1.2.6.1
@@ -1,14 +1,15 @@ @@ -1,14 +1,15 @@
1$NetBSD: distinfo,v 1.2 2011/02/06 07:14:21 schnoebe Exp $ 1$NetBSD: distinfo,v 1.2.6.1 2011/10/19 13:17:20 tron Exp $
2 2
3SHA1 (poco-1.4.0-all.tar.gz) = 6e7dbf895d76227047974ba7b3390d5452a0a7c7 3SHA1 (poco-1.4.0-all.tar.gz) = 6e7dbf895d76227047974ba7b3390d5452a0a7c7
4RMD160 (poco-1.4.0-all.tar.gz) = ee3ddbe0311b7aaca61046e964ef6550e52634d5 4RMD160 (poco-1.4.0-all.tar.gz) = ee3ddbe0311b7aaca61046e964ef6550e52634d5
5Size (poco-1.4.0-all.tar.gz) = 3858463 bytes 5Size (poco-1.4.0-all.tar.gz) = 3858463 bytes
 6SHA1 (patch-Foundation_include_Poco_Platform.h) = a7d81c20902af7e23ce8a10eb90fc1a98d7cc412
6SHA1 (patch-aa) = be1c72c9c63b65e8d4211abab9dd036255ed6233 7SHA1 (patch-aa) = be1c72c9c63b65e8d4211abab9dd036255ed6233
7SHA1 (patch-ab) = 0709ba35fe938f7efc94650dde4afd84c427de0f 8SHA1 (patch-ab) = 0709ba35fe938f7efc94650dde4afd84c427de0f
8SHA1 (patch-ac) = e3ee4b43e458f1ab1227aa029a00fcebf5f53541 9SHA1 (patch-ac) = e3ee4b43e458f1ab1227aa029a00fcebf5f53541
9SHA1 (patch-ad) = cb9ec4df286227121f7f93a5695a18c1c1665317 10SHA1 (patch-ad) = cb9ec4df286227121f7f93a5695a18c1c1665317
10SHA1 (patch-ae) = a13a01901b3df6df7d5e5ad7a0639086b0897566 11SHA1 (patch-ae) = a13a01901b3df6df7d5e5ad7a0639086b0897566
11SHA1 (patch-af) = 6d76f0b116e4b1f5333940737c9a9df80178441f 12SHA1 (patch-af) = 6d76f0b116e4b1f5333940737c9a9df80178441f
12SHA1 (patch-ag) = 945a594376393462e1cc0f881532d2294adf5816 13SHA1 (patch-ag) = 945a594376393462e1cc0f881532d2294adf5816
13SHA1 (patch-ah) = f8debbf7b416fc562f5af321be739e0d4481a130 14SHA1 (patch-ah) = f8debbf7b416fc562f5af321be739e0d4481a130
14SHA1 (patch-ai) = 9feef00a05372578d957c68b53657e6468f65f6a 15SHA1 (patch-ai) = 9feef00a05372578d957c68b53657e6468f65f6a
cvs diff -r1.3 -r1.3.6.1 pkgsrc/devel/poco/Makefile.common (expand / switch to unified diff)

--- pkgsrc/devel/poco/Makefile.common 2011/02/06 18:54:50 1.3
+++ pkgsrc/devel/poco/Makefile.common 2011/10/19 13:17:20 1.3.6.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.3 2011/02/06 18:54:50 schnoebe Exp $ 1# $NetBSD: Makefile.common,v 1.3.6.1 2011/10/19 13:17:20 tron Exp $
2# 2#
3# used by devel/poco/Makefile 3# used by devel/poco/Makefile
4# used by databases/poco-data/Makefile 4# used by databases/poco-data/Makefile
5# used by databases/poco-data-sqlite/Makefile 5# used by databases/poco-data-sqlite/Makefile
6# used by databases/poco-data-mysql/Makefile 6# used by databases/poco-data-mysql/Makefile
7# used by databases/poco-data-odbc/Makefile 7# used by databases/poco-data-odbc/Makefile
8 8
9POCO_VERSION=1.4.0 9POCO_VERSION=1.4.0
10 10
11DISTNAME= poco-${POCO_VERSION}-all 11DISTNAME= poco-${POCO_VERSION}-all
12MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=poco/} 12MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=poco/}
13 13
14MAINTAINER= pkgsrc-users@NetBSD.org 14MAINTAINER= pkgsrc-users@NetBSD.org
@@ -20,21 +20,21 @@ LICENSE= boost-license @@ -20,21 +20,21 @@ LICENSE= boost-license
20PATCHDIR= ${.CURDIR}/../../devel/poco/patches 20PATCHDIR= ${.CURDIR}/../../devel/poco/patches
21DISTINFO_FILE= ${.CURDIR}/../../devel/poco/distinfo 21DISTINFO_FILE= ${.CURDIR}/../../devel/poco/distinfo
22 22
23HAS_CONFIGURE= yes 23HAS_CONFIGURE= yes
24USE_LANGUAGES= c c++ 24USE_LANGUAGES= c c++
25USE_TOOLS+= gmake 25USE_TOOLS+= gmake
26 26
27CONFIGURE_ARGS+= --prefix=${PREFIX} --omit=Data 27CONFIGURE_ARGS+= --prefix=${PREFIX} --omit=Data
28# don't use the bundled versions of SQLite, zlib, etc.. 28# don't use the bundled versions of SQLite, zlib, etc..
29CONFIGURE_ARGS+= --unbundled 29CONFIGURE_ARGS+= --unbundled
30 30
31.include "../../mk/bsd.prefs.mk" 31.include "../../mk/bsd.prefs.mk"
32 32
33.if !empty(OPSYS:M*BSD) 33.if !empty(OPSYS:M*BSD) || ${OPSYS} == "DragonFly"
34CONFIGURE_ARGS+= --config=FreeBSD 34CONFIGURE_ARGS+= --config=FreeBSD
35.endif 35.endif
36 36
37.if ${OPSYS} == "NetBSD" 37.if ${OPSYS} == "NetBSD"
38# NetBSD doesn't have fenv.h. We should add one. 38# NetBSD doesn't have fenv.h. We should add one.
39CONFIGURE_ARGS+= --no-fpenvironment 39CONFIGURE_ARGS+= --no-fpenvironment
40.endif 40.endif
File Added: pkgsrc/devel/poco/patches/patch-Foundation_include_Poco_Platform.h
$NetBSD: patch-Foundation_include_Poco_Platform.h,v 1.1.2.2 2011/10/19 13:17:20 tron Exp $

* DragonFly BSD support

--- Foundation/include/Poco/Platform.h.orig	2010-12-16 05:43:25 +0000
+++ Foundation/include/Poco/Platform.h
@@ -93,6 +93,10 @@
 	#define POCO_OS_FAMILY_UNIX 1
 	#define POCO_OS_FAMILY_BSD 1
 	#define POCO_OS POCO_OS_OPEN_BSD
+#elif defined(__DragonFly__)
+	#define POCO_OS_FAMILY_UNIX 1
+	#define POCO_OS_FAMILY_BSD 1
+	#define POCO_OS POCO_OS_FREE_BSD
 #elif defined(sgi) || defined(__sgi)
 	#define POCO_OS_FAMILY_UNIX 1
 	#define POCO_OS POCO_OS_IRIX