[21282] trunk

[source_changes at macosforge.org]

Revision: 21282
          http://trac.macosforge.org/projects/macports/changeset/21282
Author:   dluke at macports.org
Date:     2007-01-19 06:16:49 -0800 (Fri, 19 Jan 2007)

Log Message:
-----------
Update py-bsddb to work with db44 (see ticket #11037)

Modified Paths:
--------------
    trunk/dports/python/py-bsddb/Portfile
    trunk/dports/python/py-bsddb/files/setup.py

Property Changed:
----------------
    trunk/


Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 023a8b07-a327-4f20-9012-67c915bb7b7c:/local/branches/updates:21118
023a8b07-a327-4f20-9012-67c915bb7b7c:/local/trunk:21326
a2b01108-8822-4c85-91cd-1541804339d8:/local/macports:20632
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/libdnet-maintainer:20898
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/p5-app-cli:20923
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/p5-list-moreutils:20919
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/p5-path-class:20929
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/updates:20946
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/trunk:20947
f2dd1c64-7982-4318-98ce-263798263e0a:/local:21203
   + 023a8b07-a327-4f20-9012-67c915bb7b7c:/local/branches/updates:21118
023a8b07-a327-4f20-9012-67c915bb7b7c:/local/trunk:21326
a2b01108-8822-4c85-91cd-1541804339d8:/local/macports:20632
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/libdnet-maintainer:20898
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/p5-app-cli:20923
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/p5-list-moreutils:20919
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/p5-path-class:20929
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/updates:20946
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/trunk:20947
f2dd1c64-7982-4318-98ce-263798263e0a:/local:21378

Modified: trunk/dports/python/py-bsddb/Portfile
===================================================================
--- trunk/dports/python/py-bsddb/Portfile	2007-01-19 09:20:15 UTC (rev 21281)
+++ trunk/dports/python/py-bsddb/Portfile	2007-01-19 14:16:49 UTC (rev 21282)
@@ -5,6 +5,7 @@
 
 name			py-bsddb
 version			2.4.3
+revision		1
 categories		python databases
 platforms		darwin
 maintainers		mww at opendarwin.org
@@ -26,19 +27,21 @@
 	file copy	${filespath}/setup.py ${worksrcpath}
 }
 
-set db_version	4
-depends_lib-append	lib:libdb-4:db4
+set libdir ${prefix}/lib/db44
+set incdir ${prefix}/include/db44
+depends_lib-append	port:db44
 
 variant db3	{
-	set db_version	3
-	depends_lib-delete	lib:libdb-4:db4
-	depends_lib-append	lib:libdb-3:db3
+	set libdir ${prefix}/lib
+	set incdir ${prefix}/include/db3
+	depends_lib-delete	port:db44
+	depends_lib-append	port:db3
 }
 
 post-patch	{
 	cd ${worksrcpath}
 	reinplace "s|__VERSION__|${version}|g" setup.py
-	reinplace "s|__PREFIX__|${prefix}|g" setup.py
-	reinplace "s|<db.h>|<db${db_version}/db.h>|g" _bsddb.c
+	reinplace "s|__LIBDIR__|${libdir}|g" setup.py
+	reinplace "s|__INCDIR__|${incdir}|g" setup.py
 }
 

Modified: trunk/dports/python/py-bsddb/files/setup.py
===================================================================
--- trunk/dports/python/py-bsddb/files/setup.py	2007-01-19 09:20:15 UTC (rev 21281)
+++ trunk/dports/python/py-bsddb/files/setup.py	2007-01-19 14:16:49 UTC (rev 21282)
@@ -6,10 +6,9 @@
 except:
     raise SystemExit, "Distutils problem"
 
-prefix = "__PREFIX__"
-inc_dirs = [prefix + "/include"]
-lib_dirs = [prefix + "/lib"]
-libs = ["db-4"]
+inc_dirs = ["__INCDIR__"]
+lib_dirs = ["__LIBDIR__"]
+libs = ["db"]
 
 setup(name = "_bsddb",
       version = "__VERSION__",

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070119/ce6be76b/attachment.html