[50102] trunk/dports/devel/poco

[nox at macports.org]

Revision: 50102
          http://trac.macports.org/changeset/50102
Author:   nox at macports.org
Date:     2009-04-25 05:31:09 -0700 (Sat, 25 Apr 2009)
Log Message:
-----------
poco:
 * Update to 1.3.4.
 * Fix building when cppunit is already installed or poco is upgraded (closes #19107).

Modified Paths:
--------------
    trunk/dports/devel/poco/Portfile
    trunk/dports/devel/poco/files/patch-Data-ODBC-Makefile.diff

Modified: trunk/dports/devel/poco/Portfile
===================================================================
--- trunk/dports/devel/poco/Portfile	2009-04-25 11:52:47 UTC (rev 50101)
+++ trunk/dports/devel/poco/Portfile	2009-04-25 12:31:09 UTC (rev 50102)
@@ -4,7 +4,7 @@
 PortSystem      1.0
 
 name            poco
-version         1.3.3p1
+version         1.3.4
 categories      devel
 maintainers     nox openmaintainer
 platforms       darwin
@@ -22,13 +22,13 @@
 set docdistname ${name}-[strsed ${version} {s/[a-z].*$//}]-doc
 
 checksums       [suffix ${distname}] \
-                md5     6efc7100e7f1455725ec9a3af92be00e \
-                sha1    59f3af74b105e6357af9e5d41c7d7579d2300a3c \
-                rmd160  bcdf37b0dc1d8cae84c020a34dcf2c838f92053a \
+                    md5     4ede282a9dd1f11012718aa3e6de3888 \
+                    sha1    73acc7fbf8d91d8f8c5f241081baed808a87c452 \
+                    rmd160  5ca96f3fbcddd475e5bed3ca595b957c4c351dfc \
                 ${docdistname}.tar.gz \
-                md5     51b80106556e2b9ddc15856b943f3b35 \
-                sha1    cfdea5d3b4c3b15dcc300a7e5c2a60525e9bed8a \
-                rmd160  0a9a5ba3117076bc163a0674ca47630d4346dc9e
+                    md5     ca466b83314109bfd6afcdb79a24168d \
+                    sha1    88afdfc87d4cdbeae4d2cade8a0d75186111c1c6 \
+                    rmd160  4b83a9528174f664c99446877a82e066304d67fd
 
 set config      Darwin
 set omit        {NetSSL_OpenSSL Data/ODBC Data/MySQL Crypto}
@@ -40,7 +40,7 @@
 
     reinplace -E "/^C(XX)?FLAGS +=/s|\$| ${configure.cppflags} ${configure.cflags}|" \
         ${worksrcpath}/build/config/${config}
-    reinplace -E "/^((SH|DY)LIB|LINKFLAGS) +=/s|\$| ${configure.ldflags}|" \
+    reinplace -E "/^((SH|DY)LIB|LINKFLAGS) +=/s|\$| -L\$(LIBPATH) ${configure.ldflags}|" \
         ${worksrcpath}/build/config/${config}
 }
 

Modified: trunk/dports/devel/poco/files/patch-Data-ODBC-Makefile.diff
===================================================================
--- trunk/dports/devel/poco/files/patch-Data-ODBC-Makefile.diff	2009-04-25 11:52:47 UTC (rev 50101)
+++ trunk/dports/devel/poco/files/patch-Data-ODBC-Makefile.diff	2009-04-25 12:31:09 UTC (rev 50102)
@@ -1,35 +1,48 @@
-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 @@
+--- Data/ODBC/Makefile.orig	2009-04-25 13:31:41.000000000 +0200
++++ Data/ODBC/Makefile	2009-04-25 14:24:42.000000000 +0200
+@@ -8,45 +8,8 @@
  
  include $(POCO_BASE)/build/rules/global
  
+-# adjust for the target system (usually '/usr/lib' or '/usr/local/lib')
+-ODBCLIBDIR = /usr/lib
+-
+-INCLUDE += -I/usr/local/include -I/usr/include -I/usr/include/odbc -I/usr/local/include/odbc
+-SYSLIBS += -L/usr/local/lib/odbc -L/usr/lib/odbc -L/usr/lib -L/usr/local/lib
+-
 -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 $$?))
+-ifeq ($(POCO_CONFIG),CYGWIN)
+-# -DODBCVER=0x0300: SQLHandle declaration issue
+-# -DNOMINMAX      : MIN/MAX macros defined in windows conflict with libstdc++
+-CXXFLAGS += -DODBCVER=0x0300 -DNOMINMAX
+-# CYGWIN platform has its own ODBC library in /lib/w32api 
+-SYSLIBS += -L/lib/w32api -lodbc32 -lodbccp32
+-else
+-ifeq (0, $(shell test -e $(ODBCLIBDIR)/libodbc$(SHAREDLIBLINKEXT); echo $$?))
 -SYSLIBS += -lodbc -lodbcinst
 -COMMONFLAGS += -DPOCO_UNIXODBC
 -else
--ifeq (0, $(shell test -h /usr/lib/libodbc$(SHAREDLIBLINKEXT); echo $$?))
+-ifeq (0, $(shell test -h $(ODBCLIBDIR)/libodbc$(SHAREDLIBLINKEXT); echo $$?))
 -SYSLIBS += -lodbc -lodbcinst
 -COMMONFLAGS += -DPOCO_UNIXODBC
 -else
--ifeq (0, $(shell test -e /usr/lib/libiodbc$(SHAREDLIBLINKEXT); echo $$?))
+-ifeq (0, $(shell test -e $(ODBCLIBDIR)/libiodbc$(SHAREDLIBLINKEXT); echo $$?))
+-SYSLIBS += -liodbc -liodbcinst
+-COMMONFLAGS += -DPOCO_IODBC
+-else
+-ifeq (0, $(shell test -h $(ODBCLIBDIR)/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
+-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/20090425/2fe96b2f/attachment.html>