[49887] trunk/dports/devel/poco
nox at macports.org
nox at macports.org
Sun Apr 19 10:37:02 PDT 2009
Revision: 49887
http://trac.macports.org/changeset/49887
Author: nox at macports.org
Date: 2009-04-19 10:37:01 -0700 (Sun, 19 Apr 2009)
Log Message:
-----------
poco: Update to 1.3.3p1.
Modified Paths:
--------------
trunk/dports/devel/poco/Portfile
Added Paths:
-----------
trunk/dports/devel/poco/files/patch-Data-MySQL-Makefile.diff
trunk/dports/devel/poco/files/patch-Data-ODBC-Makefile.diff
Modified: trunk/dports/devel/poco/Portfile
===================================================================
--- trunk/dports/devel/poco/Portfile 2009-04-19 15:53:02 UTC (rev 49886)
+++ trunk/dports/devel/poco/Portfile 2009-04-19 17:37:01 UTC (rev 49887)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -3,7 +4,7 @@
name poco
-version 1.3.2
+version 1.3.3p1
categories devel
-maintainers nox
+maintainers nox openmaintainer
platforms darwin
description POCO C++ Libraries
@@ -17,36 +18,32 @@
homepage http://pocoproject.org/
master_sites sourceforge
use_bzip2 yes
-set my_distname ${distname}
+distname ${name}-${version}-all
+set docdistname ${name}-[strsed ${version} {s/[a-z].*$//}]-doc
-checksums poco-1.3.2.tar.bz2 \
- md5 ba0a8e58522a01e77981ea2b42d369a6 \
- sha1 ec1eb28ceda24bca524c485a73da92e2ac78df0e \
- rmd160 ba6cb689c05f9c718f6381918183a7f72da85d4c \
- poco-1.3.2-data.tar.bz2 \
- md5 110f8daf889b915f50e78ca0f8edd800 \
- sha1 b8d884beab455b63c9edc0c60bf4c11b504ccf7a \
- rmd160 73112ddd532b093bd55bb611759ce96c39395e52 \
- poco-1.3.2-doc.tar.gz \
- md5 a92ccd7038573064515a9f2f3b0f8562 \
- sha1 cbf72f9cfbb624f28978f3d752cba7d4dc471ce6 \
- rmd160 813f8b0ce8cb18269c5fcbf1c577375bca7db0c4
+checksums [suffix ${distname}] \
+ md5 6efc7100e7f1455725ec9a3af92be00e \
+ sha1 59f3af74b105e6357af9e5d41c7d7579d2300a3c \
+ rmd160 bcdf37b0dc1d8cae84c020a34dcf2c838f92053a \
+ ${docdistname}.tar.gz \
+ md5 51b80106556e2b9ddc15856b943f3b35 \
+ sha1 cfdea5d3b4c3b15dcc300a7e5c2a60525e9bed8a \
+ rmd160 0a9a5ba3117076bc163a0674ca47630d4346dc9e
-if {[variant_isset universal]} {
- patchfiles-append patch-rules-deps-universal.diff
-}
-
set config Darwin
+set omit {NetSSL_OpenSSL Data/ODBC Data/MySQL Crypto}
+configure.args --no-samples
+
pre-configure {
+ configure.args-append --omit=[join ${omit} ,]
+
reinplace -E "/^C(XX)?FLAGS +=/s|\$| ${configure.cppflags} ${configure.cflags}|" \
${worksrcpath}/build/config/${config}
reinplace -E "/^((SH|DY)LIB|LINKFLAGS) +=/s|\$| ${configure.ldflags}|" \
${worksrcpath}/build/config/${config}
}
-configure.args --no-samples
-
use_parallel_build yes
build.target poco
@@ -110,42 +107,50 @@
}
}
-variant ssl description {Build NetSSL library} {
- distname ${my_distname}-ssl
+variant ssl description {Build NetSSL and Crypto library} {
depends_lib-append port:openssl
+ set omit [ldelete [ldelete ${omit} NetSSL_OpenSSL] Crypto]
}
-variant data description {Build Data library} {
- distname ${my_distname}-data
+variant odbc description {Build ODBC backend for Data library} {
+ patchfiles-append patch-Data-ODBC-Makefile.diff
depends_lib-append lib:libiodbc:unixODBC
+ set omit [ldelete ${omit} Data/ODBC]
+}
- post-patch {
- if {! [variant_isset ssl]} {
- reinplace -E {/^(COMPONENTS|\.PHONY|libexecs|tests|samples)/s/NetSSL_OpenSSL[^ ]*//} \
- ${worksrcpath}/Makefile
- reinplace {/NETSSL_OpenSSL/d} ${worksrcpath}/components
- }
+variant mysql description {Build MySQL backend for Data library} {
+ patchfiles-append patch-Data-MySQL-Makefile.diff
+
+ depends_lib-append port:mysql5
+
+ post-configure {
+ reinplace -E "/^C(XX)?FLAGS +=/s|\$| -I${prefix}/include/mysql5/mysql|" \
+ ${worksrcpath}/build/config/${config}
+ reinplace -E "/^((SH|DY)LIB|LINKFLAGS) +=/s|\$| -L${prefix}/lib/mysql5/mysql|" \
+ ${worksrcpath}/build/config/${config}
}
+
+ set omit [ldelete ${omit} Data/MySQL]
}
variant doc description {Install extra documentation} {
extract.only ${distfiles}
- distfiles-append ${my_distname}-doc.tar.gz
+ distfiles-append ${docdistname}.tar.gz
post-extract {
- system "tar xzf ${distpath}/${my_distname}-doc.tar.gz -C ${workpath}"
+ system "tar xzf ${distpath}/${docdistname}.tar.gz -C ${workpath}"
}
post-destroot {
- set workdocpath ${workpath}/${my_distname}-doc
+ set workdocpath ${workpath}/${docdistname}
xinstall -d ${destroot}${docdir}/html/CppUnit
- eval xinstall -m 0644 [glob ${workdocpath}/*.html] ${destroot}${docdir}/html
- eval xinstall -m 0644 [glob ${worksrcpath}/CppUnit/doc/*] ${destroot}${docdir}/html/CppUnit
+ eval xinstall -m 0644 [glob -directory ${workdocpath} *.html] ${destroot}${docdir}/html
+ eval xinstall -m 0644 [glob -directory ${worksrcpath}/CppUnit/doc *] ${destroot}${docdir}/html/CppUnit
foreach {dir} {images css} {
xinstall -d ${destroot}${docdir}/html/${dir}
- eval xinstall -m 0644 [glob ${workdocpath}/${dir}/*] ${destroot}${docdir}/html/${dir}
+ eval xinstall -m 0644 [glob -directory ${workdocpath}/${dir} *] ${destroot}${docdir}/html/${dir}
}
}
}
Added: trunk/dports/devel/poco/files/patch-Data-MySQL-Makefile.diff
===================================================================
--- trunk/dports/devel/poco/files/patch-Data-MySQL-Makefile.diff (rev 0)
+++ trunk/dports/devel/poco/files/patch-Data-MySQL-Makefile.diff 2009-04-19 17:37:01 UTC (rev 49887)
@@ -0,0 +1,13 @@
+diff -ur Data.orig/MySQL/Makefile Data/MySQL/Makefile
+--- Data/MySQL/Makefile 2009-04-19 17:09:05.000000000 +0200
++++ Data/MySQL/Makefile 2009-04-19 17:10:37.000000000 +0200
+@@ -8,8 +8,7 @@
+
+ include $(POCO_BASE)/build/rules/global
+
+-SYSLIBS += -L/usr/local/lib/mysql -L/usr/lib/mysql -L/usr/mysql/lib/mysql -L/usr/local/mysql/lib -lmysqlclient
+-INCLUDE += -I/usr/local/include/mysql/ -I/usr/include/mysql -I/usr/mysql/include/mysql -I/usr/local/mysql/include
++SYSLIBS += -lmysqlclient
+ SYSFLAGS += -DTHREADSAFE -DNO_TCL
+
+ objects = Binder Extractor SessionImpl Connector \
Added: trunk/dports/devel/poco/files/patch-Data-ODBC-Makefile.diff
===================================================================
--- trunk/dports/devel/poco/files/patch-Data-ODBC-Makefile.diff (rev 0)
+++ trunk/dports/devel/poco/files/patch-Data-ODBC-Makefile.diff 2009-04-19 17:37:01 UTC (rev 49887)
@@ -0,0 +1,35 @@
+diff -ur Data.orig/ODBC/Makefile Data/ODBC/Makefile
+--- Data.orig/ODBC/Makefile 2009-04-19 17:18:32.000000000 +0200
++++ Data/ODBC/Makefile 2009-04-19 17:18:51.000000000 +0200
+@@ -8,31 +8,8 @@
+
+ include $(POCO_BASE)/build/rules/global
+
+-ifeq ($(POCO_CONFIG),MinGW)
+-# Lack of unixODBC or iODBC is not an error for MinGW platform since it uses Windows odbc32.lib
+-else
+-ifeq (0, $(shell test -e /usr/lib/libodbc$(SHAREDLIBLINKEXT); echo $$?))
+-SYSLIBS += -lodbc -lodbcinst
+-COMMONFLAGS += -DPOCO_UNIXODBC
+-else
+-ifeq (0, $(shell test -h /usr/lib/libodbc$(SHAREDLIBLINKEXT); echo $$?))
+-SYSLIBS += -lodbc -lodbcinst
+-COMMONFLAGS += -DPOCO_UNIXODBC
+-else
+-ifeq (0, $(shell test -e /usr/lib/libiodbc$(SHAREDLIBLINKEXT); echo $$?))
+ SYSLIBS += -liodbc -liodbcinst
+ COMMONFLAGS += -DPOCO_IODBC
+-else
+-ifeq (0, $(shell test -h /usr/lib/libiodbc$(SHAREDLIBLINKEXT); echo $$?))
+-SYSLIBS += -liodbc -liodbcinst
+-COMMONFLAGS += -DPOCO_IODBC
+-else
+-$(error No ODBC library found. Please install unixODBC or iODBC and try again)
+-endif
+-endif
+-endif
+-endif
+-endif
+
+ objects = Binder ConnectionHandle Connector DataTypes EnvironmentHandle \
+ Extractor ODBCColumn ODBCException ODBCStatementImpl \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090419/fb29b395/attachment-0001.html>
More information about the macports-changes
mailing list