svn commit: r342272 - in head/databases: db42 db42-nocrypto

[Martin Wilke]

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 at 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