Date: Mon, 23 May 2016 20:59:55 +0000 (UTC) From: Matthias Andree <mandree@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r415743 - in head/databases/db6: . files Message-ID: <201605232059.u4NKxtup084937@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mandree Date: Mon May 23 20:59:55 2016 New Revision: 415743 URL: https://svnweb.freebsd.org/changeset/ports/415743 Log: Fix portlint warnings. Add PATCH_WRKSRC so that make makepatch works, refresh patches with make makepatch and rename them, and drop the "The" from COMMENT. Added: head/databases/db6/files/patch-src_dbinc_mutex__int.h (contents, props changed) Deleted: head/databases/db6/files/patch-dbinc_mutex_int.h Modified: head/databases/db6/Makefile head/databases/db6/files/patch-lang_sql_upgrade61.sh Modified: head/databases/db6/Makefile ============================================================================== --- head/databases/db6/Makefile Mon May 23 20:35:01 2016 (r415742) +++ head/databases/db6/Makefile Mon May 23 20:59:55 2016 (r415743) @@ -12,7 +12,7 @@ DISTNAME= db-${PORTVERSION} DIST_SUBDIR= bdb MAINTAINER= mandree@FreeBSD.org -COMMENT= The Oracle Berkeley DB, revision ${BDBVER} +COMMENT= Oracle Berkeley DB, revision ${BDBVER} LICENSE= AGPLv3 @@ -28,6 +28,7 @@ GNU_CONFIGURE= yes USES= gmake libtool INSTALL_TARGET= install_include install_lib install_utilities WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix +PATCH_WRKSRC= ${WRKDIR}/${DISTNAME} USE_LDCONFIG= yes PLIST_SUB= BDBMAJ=${BDBMAJ} BDBVER=${BDBVER} MAKE_ARGS+= docdir=${DOCSDIR} Modified: head/databases/db6/files/patch-lang_sql_upgrade61.sh ============================================================================== --- head/databases/db6/files/patch-lang_sql_upgrade61.sh Mon May 23 20:35:01 2016 (r415742) +++ head/databases/db6/files/patch-lang_sql_upgrade61.sh Mon May 23 20:59:55 2016 (r415743) @@ -1,5 +1,5 @@ ---- ../lang/sql/upgrade61.sh 2016-03-28 21:45:53.000000000 +0200 -+++ ../../db6-upgrade61.sh 2016-05-23 21:55:49.741020000 +0200 +--- lang/sql/upgrade61.sh.orig 2016-03-28 19:45:53 UTC ++++ lang/sql/upgrade61.sh @@ -1,12 +1,19 @@ #!/bin/sh # This script upgrades SQL databases from BDB 5.0 to early 6.1 Added: head/databases/db6/files/patch-src_dbinc_mutex__int.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/db6/files/patch-src_dbinc_mutex__int.h Mon May 23 20:59:55 2016 (r415743) @@ -0,0 +1,11 @@ +--- src/dbinc/mutex_int.h.orig 2016-03-28 19:45:54 UTC ++++ src/dbinc/mutex_int.h +@@ -652,7 +652,7 @@ MUTEX_SET(int *tsl) { + : "=&r" (__r), "+r" (tsl) + : + : "cr0", "memory"); +- return (int)tsl; ++ return (tsl != 0); + } + + static inline int
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605232059.u4NKxtup084937>