From owner-svn-ports-head@FreeBSD.ORG  Sun Feb  2 11:17:48 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A39C46D2;
 Sun,  2 Feb 2014 11:17:48 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 756AA142A;
 Sun,  2 Feb 2014 11:17:48 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s12BHmTJ001120;
 Sun, 2 Feb 2014 11:17:48 GMT (envelope-from miwi@svn.freebsd.org)
Received: (from miwi@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s12BHliP001115;
 Sun, 2 Feb 2014 11:17:47 GMT (envelope-from miwi@svn.freebsd.org)
Message-Id: <201402021117.s12BHliP001115@svn.freebsd.org>
From: Martin Wilke <miwi@FreeBSD.org>
Date: Sun, 2 Feb 2014 11:17:47 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r342272 - in head/databases: db42 db42-nocrypto
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.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 02 Feb 2014 11:17:48 -0000

Author: miwi
Date: Sun Feb  2 11:17:47 2014
New Revision: 342272
URL: http://svnweb.freebsd.org/changeset/ports/342272
QAT: https://qat.redports.org/buildarchive/r342272/

Log:
  - Stage support

Modified:
  head/databases/db42-nocrypto/Makefile
  head/databases/db42/Makefile
  head/databases/db42/Makefile.db

Modified: head/databases/db42-nocrypto/Makefile
==============================================================================
--- head/databases/db42-nocrypto/Makefile	Sun Feb  2 11:16:22 2014	(r342271)
+++ head/databases/db42-nocrypto/Makefile	Sun Feb  2 11:17:47 2014	(r342272)
@@ -9,7 +9,6 @@ MAINTAINER=	mandree@FreeBSD.org
 MASTERDIR=	${.CURDIR}/../db42
 DISTINFO_FILE=	${.CURDIR}/distinfo
 
-NO_STAGE=	yes
 CONFLICTS=	db42-4*
 
 .include "${MASTERDIR}/Makefile"

Modified: head/databases/db42/Makefile
==============================================================================
--- head/databases/db42/Makefile	Sun Feb  2 11:16:22 2014	(r342271)
+++ head/databases/db42/Makefile	Sun Feb  2 11:17:47 2014	(r342272)
@@ -22,7 +22,6 @@ MASTERDIR?=	${.CURDIR}
 
 SLAVE_PORT=	no
 
-NO_STAGE=	yes
 .include <${MASTERDIR}/Makefile.db>
 .include <bsd.port.pre.mk>
 

Modified: head/databases/db42/Makefile.db
==============================================================================
--- head/databases/db42/Makefile.db	Sun Feb  2 11:16:22 2014	(r342271)
+++ head/databases/db42/Makefile.db	Sun Feb  2 11:17:47 2014	(r342272)
@@ -24,10 +24,9 @@ CONFIGURE_ARGS=		--enable-compat185 --en
 			--libdir=${PREFIX}/lib/${PORTNAME} \
 			--bindir=${PREFIX}/bin/${PORTNAME}
 INSTALL_TARGET=		install_include install_lib install_utilities
-.if !defined(NOPORTDOCS)
 INSTALL_TARGET+=	install_docs docdir=${DOCSDIR}
-PORTDOCS=		*
-.endif
+
+PORTDOCS=	*
 
 pre-patch:
 	${REINPLACE_CMD} -Ee 's|-l?pthread|${PTHREAD_LIBS}|g; s,/usr/bin/objformat \|\| echo aout,/usr/bin/objformat || echo elf,' ${WRKSRC}/${CONFIGURE_SCRIPT}
@@ -37,11 +36,9 @@ pre-configure:
 
 post-install:
 .for i in libdb libdb_cxx
-	${LN} -s -f ${PORTNAME}/${i}-${BDBVER}.so.${BDBMINOR} ${PREFIX}/lib
-	${LN} -s -f ${i}-${BDBVER}.so.${BDBMINOR} ${PREFIX}/lib/${i}-${BDBVER}.so
+	${LN} -s -f ${PORTNAME}/${i}-${BDBVER}.so.${BDBMINOR} ${STAGEDIR}${PREFIX}/lib
+	${LN} -s -f ${i}-${BDBVER}.so.${BDBMINOR} ${STAGEDIR}${PREFIX}/lib/${i}-${BDBVER}.so
 .endfor
-.if !defined(NOPORTDOCS)
-	@${RMDIR} ${DOCSDIR}/ref/splash 2>/dev/null || :
-.endif
-	cd ${PREFIX}/bin/${PORTNAME} ; \
+	@${RMDIR} ${STAGEDIR}${DOCSDIR}/ref/splash 2>/dev/null || :
+	cd ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ; \
 	for i in * ; do ${LN} -s -f ${PORTNAME}/$$i ../$$i-${BDBVER} ; done