[81169] trunk/dports/sysutils/rpm

[afb at macports.org]

Revision: 81169
          http://trac.macports.org/changeset/81169
Author:   afb at macports.org
Date:     2011-07-26 02:08:51 -0700 (Tue, 26 Jul 2011)
Log Message:
-----------
fix db build error on lion (#30384), maintainer, livecheck

Modified Paths:
--------------
    trunk/dports/sysutils/rpm/Portfile

Added Paths:
-----------
    trunk/dports/sysutils/rpm/files/patch-db-mutex-mut_pthread.c

Modified: trunk/dports/sysutils/rpm/Portfile
===================================================================
--- trunk/dports/sysutils/rpm/Portfile	2011-07-26 09:03:34 UTC (rev 81168)
+++ trunk/dports/sysutils/rpm/Portfile	2011-07-26 09:08:51 UTC (rev 81169)
@@ -4,10 +4,10 @@
 
 name			rpm
 version			4.4.9
-revision                11
+revision                12
 platforms		darwin freebsd linux
 categories		sysutils archivers
-maintainers		mac.com:n3npq
+maintainers		mac.com:n3npq afb
 description		The RPM package management system.
 long_description	The RPM Package Manager (RPM) is a powerful command line driven \
 			package management system capable of installing, uninstalling, \
@@ -60,6 +60,7 @@
 			patch-rpmsq.c \
 			patch-rpmevr.h \
 			patch-parseBuildInstallClean.c \
+			patch-db-mutex-mut_pthread.c \
 			patch-scripts-brp-nobuildrootpath
 
 post-patch {
@@ -125,3 +126,8 @@
 	configure.args-delete --without-apidocs
 	configure.args-append --with-apidocs
 }
+
+livecheck.type	regex
+# get the last modified tarball
+livecheck.url	${master_sites}
+livecheck.regex	${name}-(\[0-9\\.\]+)${extract.suffix}

Added: trunk/dports/sysutils/rpm/files/patch-db-mutex-mut_pthread.c
===================================================================
--- trunk/dports/sysutils/rpm/files/patch-db-mutex-mut_pthread.c	                        (rev 0)
+++ trunk/dports/sysutils/rpm/files/patch-db-mutex-mut_pthread.c	2011-07-26 09:08:51 UTC (rev 81169)
@@ -0,0 +1,32 @@
+diff -Nur -x '*.orig' -x '*.rej' rpm-4.4.8/db/mutex/mut_pthread.c mezzanine_patched_rpm-4.4.8/db/mutex/mut_pthread.c
+--- db/mutex/mut_pthread.c.orig	2006-12-02 11:33:09.000000000 -0500
++++ db/mutex/mut_pthread.c	2007-02-22 17:51:56.000000000 -0500
+@@ -71,7 +71,7 @@
+ 	pthread_mutexattr_t mutexattr, *mutexattrp = NULL;
+ 
+ 	if (!LF_ISSET(DB_MUTEX_PROCESS_ONLY)) {
+-#if defined(EOWNERDEAD)
++#if defined(EOWNERDEAD) && defined(PTHREAD_MUTEX_ROBUST_NP)
+ 		RET_SET((pthread_mutexattr_init(&mutexattr)), ret);
+ 		if (ret == 0) {
+ 			RET_SET((pthread_mutexattr_setrobust_np(
+@@ -202,7 +202,7 @@
+ #endif
+ 
+ 	RET_SET((pthread_mutex_lock(&mutexp->mutex)), ret);
+-#if defined(EOWNERDEAD)
++#if defined(EOWNERDEAD) && defined(PTHREAD_MUTEX_ROBUST_NP)
+ 	if (ret == EOWNERDEAD) {
+ 		RET_SET((pthread_mutex_consistent_np(&mutexp->mutex)), ret);
+ 		ret = 0;
+@@ -318,7 +318,7 @@
+ #endif
+ 	if (F_ISSET(mutexp, DB_MUTEX_SELF_BLOCK)) {
+ 		RET_SET((pthread_mutex_lock(&mutexp->mutex)), ret);
+-#if defined(EOWNERDEAD)
++#if defined(EOWNERDEAD) && defined(PTHREAD_MUTEX_ROBUST_NP)
+ 		if (ret == EOWNERDEAD) {
+ 			RET_SET((pthread_mutex_consistent_np(&mutexp->mutex)), ret);
+ 			ret = 0;
+
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110726/310a6073/attachment-0001.html>