From owner-svn-ports-head@freebsd.org Mon May 23 20:59:56 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C96A5B47CE8; Mon, 23 May 2016 20:59:56 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 809C71005; Mon, 23 May 2016 20:59:56 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4NKxtte084940; Mon, 23 May 2016 20:59:55 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4NKxtup084937; Mon, 23 May 2016 20:59:55 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <201605232059.u4NKxtup084937@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Mon, 23 May 2016 20:59:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r415743 - in head/databases/db6: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 May 2016 20:59:56 -0000 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