diff options
| author | sunpoet <sunpoet@FreeBSD.org> | 2016-06-27 02:01:59 +0800 |
|---|---|---|
| committer | sunpoet <sunpoet@FreeBSD.org> | 2016-06-27 02:01:59 +0800 |
| commit | 4d72e69d667b576cc504ecbe6e106f2aed645e9b (patch) | |
| tree | 8206e14260b00cfd2f08847de38e765478ecf78a /databases/db6 | |
| parent | cca76fb41644a43c34b9038dda4b89232df0d141 (diff) | |
| download | freebsd-ports-gnome-4d72e69d667b576cc504ecbe6e106f2aed645e9b.tar.gz freebsd-ports-gnome-4d72e69d667b576cc504ecbe6e106f2aed645e9b.tar.zst freebsd-ports-gnome-4d72e69d667b576cc504ecbe6e106f2aed645e9b.zip | |
- Revert WRKSRC_SUBDIR change in r417590 which breaks make makepatch
Notified by: mat
Diffstat (limited to 'databases/db6')
| -rw-r--r-- | databases/db6/Makefile | 5 | ||||
| -rw-r--r-- | databases/db6/files/patch-lang_sql_upgrade61.sh | 4 | ||||
| -rw-r--r-- | databases/db6/files/patch-src_dbinc_mutex__int.h | 4 |
3 files changed, 6 insertions, 7 deletions
diff --git a/databases/db6/Makefile b/databases/db6/Makefile index fe102e35a4fc..3c9059469958 100644 --- a/databases/db6/Makefile +++ b/databases/db6/Makefile @@ -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} diff --git a/databases/db6/files/patch-lang_sql_upgrade61.sh b/databases/db6/files/patch-lang_sql_upgrade61.sh index e7b2f9f71daf..894fbe49ba76 100644 --- a/databases/db6/files/patch-lang_sql_upgrade61.sh +++ b/databases/db6/files/patch-lang_sql_upgrade61.sh @@ -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 diff --git a/databases/db6/files/patch-src_dbinc_mutex__int.h b/databases/db6/files/patch-src_dbinc_mutex__int.h index 7649e30e3b38..750f9c3504a4 100644 --- a/databases/db6/files/patch-src_dbinc_mutex__int.h +++ b/databases/db6/files/patch-src_dbinc_mutex__int.h @@ -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) : |