6 files changed, 30 insertions, 24 deletions

diff --git a/databases/db42/Makefile.db b/databases/db42/Makefile.db
index 5d2c504bb2f2..be96d05d2e1b 100644
--- a/databases/db42/Makefile.db
+++ b/databases/db42/Makefile.db
@@ -7,13 +7,11 @@ PATCH_DIST_STRIP=	-d ${WRKDIR}/${DISTNAME}
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
 
-# Do not use GNU_CONFIGURE or USE_LIBTOOL, it adds a --prefix option
-# we do not want in CONFIGURE_ARGS, and currently (2003-12-09) breaks
-# with its non-standard ${CONFIGURE_SCRIPT}.
 USE_REINPLACE=		yes
 INSTALLS_SHLIB=		yes
-HAS_CONFIGURE=		yes
+USE_LIBTOOL_VER=	15
 CONFIGURE_SCRIPT=	../dist/configure
+LIBTOOLFILES=		${CONFIGURE_SCRIPT}
 CONFIGURE_TARGET=	--target=${ARCH}-portbld-freebsd${OSREL}
 BDBVER=			${PORTVERSION:R}
 BDBMINOR=		${BDBVER:E:S/^\.//}
@@ -33,6 +31,9 @@ PORTDOCS=		*
 pre-patch:
 	@${REINPLACE_CMD} -Ee 's|-l?pthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
 
+pre-configure:
+	${CHMOD} u+w ${WRKSRC}/../dist/configure
+
 post-install:
 .for i in libdb libdb_cxx
 	${LN} -s -f ${PORTNAME}/${i}-${BDBVER}.so.${BDBMINOR} ${PREFIX}/lib
diff --git a/databases/db43/Makefile.db b/databases/db43/Makefile.db
index 5d2c504bb2f2..be96d05d2e1b 100644
--- a/databases/db43/Makefile.db
+++ b/databases/db43/Makefile.db
@@ -7,13 +7,11 @@ PATCH_DIST_STRIP=	-d ${WRKDIR}/${DISTNAME}
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
 
-# Do not use GNU_CONFIGURE or USE_LIBTOOL, it adds a --prefix option
-# we do not want in CONFIGURE_ARGS, and currently (2003-12-09) breaks
-# with its non-standard ${CONFIGURE_SCRIPT}.
 USE_REINPLACE=		yes
 INSTALLS_SHLIB=		yes
-HAS_CONFIGURE=		yes
+USE_LIBTOOL_VER=	15
 CONFIGURE_SCRIPT=	../dist/configure
+LIBTOOLFILES=		${CONFIGURE_SCRIPT}
 CONFIGURE_TARGET=	--target=${ARCH}-portbld-freebsd${OSREL}
 BDBVER=			${PORTVERSION:R}
 BDBMINOR=		${BDBVER:E:S/^\.//}
@@ -33,6 +31,9 @@ PORTDOCS=		*
 pre-patch:
 	@${REINPLACE_CMD} -Ee 's|-l?pthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
 
+pre-configure:
+	${CHMOD} u+w ${WRKSRC}/../dist/configure
+
 post-install:
 .for i in libdb libdb_cxx
 	${LN} -s -f ${PORTNAME}/${i}-${BDBVER}.so.${BDBMINOR} ${PREFIX}/lib
diff --git a/databases/db44/Makefile.db b/databases/db44/Makefile.db
index 5d2c504bb2f2..be96d05d2e1b 100644
--- a/databases/db44/Makefile.db
+++ b/databases/db44/Makefile.db
@@ -7,13 +7,11 @@ PATCH_DIST_STRIP=	-d ${WRKDIR}/${DISTNAME}
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
 
-# Do not use GNU_CONFIGURE or USE_LIBTOOL, it adds a --prefix option
-# we do not want in CONFIGURE_ARGS, and currently (2003-12-09) breaks
-# with its non-standard ${CONFIGURE_SCRIPT}.
 USE_REINPLACE=		yes
 INSTALLS_SHLIB=		yes
-HAS_CONFIGURE=		yes
+USE_LIBTOOL_VER=	15
 CONFIGURE_SCRIPT=	../dist/configure
+LIBTOOLFILES=		${CONFIGURE_SCRIPT}
 CONFIGURE_TARGET=	--target=${ARCH}-portbld-freebsd${OSREL}
 BDBVER=			${PORTVERSION:R}
 BDBMINOR=		${BDBVER:E:S/^\.//}
@@ -33,6 +31,9 @@ PORTDOCS=		*
 pre-patch:
 	@${REINPLACE_CMD} -Ee 's|-l?pthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
 
+pre-configure:
+	${CHMOD} u+w ${WRKSRC}/../dist/configure
+
 post-install:
 .for i in libdb libdb_cxx
 	${LN} -s -f ${PORTNAME}/${i}-${BDBVER}.so.${BDBMINOR} ${PREFIX}/lib
diff --git a/databases/db45/Makefile.db b/databases/db45/Makefile.db
index 5d2c504bb2f2..be96d05d2e1b 100644
--- a/databases/db45/Makefile.db
+++ b/databases/db45/Makefile.db
@@ -7,13 +7,11 @@ PATCH_DIST_STRIP=	-d ${WRKDIR}/${DISTNAME}
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
 
-# Do not use GNU_CONFIGURE or USE_LIBTOOL, it adds a --prefix option
-# we do not want in CONFIGURE_ARGS, and currently (2003-12-09) breaks
-# with its non-standard ${CONFIGURE_SCRIPT}.
 USE_REINPLACE=		yes
 INSTALLS_SHLIB=		yes
-HAS_CONFIGURE=		yes
+USE_LIBTOOL_VER=	15
 CONFIGURE_SCRIPT=	../dist/configure
+LIBTOOLFILES=		${CONFIGURE_SCRIPT}
 CONFIGURE_TARGET=	--target=${ARCH}-portbld-freebsd${OSREL}
 BDBVER=			${PORTVERSION:R}
 BDBMINOR=		${BDBVER:E:S/^\.//}
@@ -33,6 +31,9 @@ PORTDOCS=		*
 pre-patch:
 	@${REINPLACE_CMD} -Ee 's|-l?pthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
 
+pre-configure:
+	${CHMOD} u+w ${WRKSRC}/../dist/configure
+
 post-install:
 .for i in libdb libdb_cxx
 	${LN} -s -f ${PORTNAME}/${i}-${BDBVER}.so.${BDBMINOR} ${PREFIX}/lib
diff --git a/databases/db46/Makefile.db b/databases/db46/Makefile.db
index 5d2c504bb2f2..be96d05d2e1b 100644
--- a/databases/db46/Makefile.db
+++ b/databases/db46/Makefile.db
@@ -7,13 +7,11 @@ PATCH_DIST_STRIP=	-d ${WRKDIR}/${DISTNAME}
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
 
-# Do not use GNU_CONFIGURE or USE_LIBTOOL, it adds a --prefix option
-# we do not want in CONFIGURE_ARGS, and currently (2003-12-09) breaks
-# with its non-standard ${CONFIGURE_SCRIPT}.
 USE_REINPLACE=		yes
 INSTALLS_SHLIB=		yes
-HAS_CONFIGURE=		yes
+USE_LIBTOOL_VER=	15
 CONFIGURE_SCRIPT=	../dist/configure
+LIBTOOLFILES=		${CONFIGURE_SCRIPT}
 CONFIGURE_TARGET=	--target=${ARCH}-portbld-freebsd${OSREL}
 BDBVER=			${PORTVERSION:R}
 BDBMINOR=		${BDBVER:E:S/^\.//}
@@ -33,6 +31,9 @@ PORTDOCS=		*
 pre-patch:
 	@${REINPLACE_CMD} -Ee 's|-l?pthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
 
+pre-configure:
+	${CHMOD} u+w ${WRKSRC}/../dist/configure
+
 post-install:
 .for i in libdb libdb_cxx
 	${LN} -s -f ${PORTNAME}/${i}-${BDBVER}.so.${BDBMINOR} ${PREFIX}/lib
diff --git a/databases/db47/Makefile.db b/databases/db47/Makefile.db
index 5d2c504bb2f2..be96d05d2e1b 100644
--- a/databases/db47/Makefile.db
+++ b/databases/db47/Makefile.db
@@ -7,13 +7,11 @@ PATCH_DIST_STRIP=	-d ${WRKDIR}/${DISTNAME}
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
 
-# Do not use GNU_CONFIGURE or USE_LIBTOOL, it adds a --prefix option
-# we do not want in CONFIGURE_ARGS, and currently (2003-12-09) breaks
-# with its non-standard ${CONFIGURE_SCRIPT}.
 USE_REINPLACE=		yes
 INSTALLS_SHLIB=		yes
-HAS_CONFIGURE=		yes
+USE_LIBTOOL_VER=	15
 CONFIGURE_SCRIPT=	../dist/configure
+LIBTOOLFILES=		${CONFIGURE_SCRIPT}
 CONFIGURE_TARGET=	--target=${ARCH}-portbld-freebsd${OSREL}
 BDBVER=			${PORTVERSION:R}
 BDBMINOR=		${BDBVER:E:S/^\.//}
@@ -33,6 +31,9 @@ PORTDOCS=		*
 pre-patch:
 	@${REINPLACE_CMD} -Ee 's|-l?pthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
 
+pre-configure:
+	${CHMOD} u+w ${WRKSRC}/../dist/configure
+
 post-install:
 .for i in libdb libdb_cxx
 	${LN} -s -f ${PORTNAME}/${i}-${BDBVER}.so.${BDBMINOR} ${PREFIX}/lib