svn commit: r417595 - in head/databases/db6: . files

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Sun Jun 26 18:01:59 2016
New Revision: 417595
URL: https://svnweb.freebsd.org/changeset/ports/417595

Log:
  - Revert WRKSRC_SUBDIR change in r417590 which breaks make makepatch
  
  Notified by:	mat

Modified:
  head/databases/db6/Makefile
  head/databases/db6/files/patch-lang_sql_upgrade61.sh
  head/databases/db6/files/patch-src_dbinc_mutex__int.h

Modified: head/databases/db6/Makefile
==============================================================================
--- head/databases/db6/Makefile	Sun Jun 26 17:24:38 2016	(r417594)
+++ head/databases/db6/Makefile	Sun Jun 26 18:01:59 2016	(r417595)
@@ -28,9 +28,8 @@ CONFIGURE_SCRIPT=	../dist/configure
 GNU_CONFIGURE=	yes
 USES=		gmake libtool
 INSTALL_TARGET=	install_include install_lib install_utilities
-WRKSRC_SUBDIR=	build_unix
-#WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
-#PATCH_WRKSRC=	${WRKDIR}/${DISTNAME}
+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	Sun Jun 26 17:24:38 2016	(r417594)
+++ head/databases/db6/files/patch-lang_sql_upgrade61.sh	Sun Jun 26 18:01:59 2016	(r417595)
@@ -1,5 +1,5 @@
---- ../lang/sql/upgrade61.sh.orig	2016-03-28 19:45:53 UTC
-+++ ../lang/sql/upgrade61.sh
+--- 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

Modified: head/databases/db6/files/patch-src_dbinc_mutex__int.h
==============================================================================
--- head/databases/db6/files/patch-src_dbinc_mutex__int.h	Sun Jun 26 17:24:38 2016	(r417594)
+++ head/databases/db6/files/patch-src_dbinc_mutex__int.h	Sun Jun 26 18:01:59 2016	(r417595)
@@ -1,5 +1,5 @@
---- ../src/dbinc/mutex_int.h.orig	2016-03-28 19:45:54 UTC
-+++ ../src/dbinc/mutex_int.h
+--- 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)
  	 :