Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 14 Dec 2013 09:57:03 +0000 (UTC)
From:      Matthias Andree <mandree@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r336431 - in head/databases: db5 db6
Message-ID:  <201312140957.rBE9v3Cj011099@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mandree
Date: Sat Dec 14 09:57:02 2013
New Revision: 336431
URL: http://svnweb.freebsd.org/changeset/ports/336431

Log:
  Convert to staging.
  Strip debug symbols for installed .so files unless WITH_DEBUG is set.

Modified:
  head/databases/db5/Makefile
  head/databases/db6/Makefile

Modified: head/databases/db5/Makefile
==============================================================================
--- head/databases/db5/Makefile	Sat Dec 14 09:52:41 2013	(r336430)
+++ head/databases/db5/Makefile	Sat Dec 14 09:57:02 2013	(r336431)
@@ -6,7 +6,7 @@ PORTVERSION=	5.3.21.0
 CATEGORIES=	databases java
 MASTER_SITES=	http://download.oracle.com/berkeley-db/
 PKGNAMEPREFIX?=
-NO_STAGE=	yes
+#
 # the distfiles aren't named db5-* but db-*:
 DISTNAME=	db-${PORTVERSION:R}
 DIST_SUBDIR=	bdb
@@ -23,7 +23,7 @@ CONFIGURE_ARGS=	--enable-cxx --enable-st
 		--bindir=${PREFIX}/bin/${PORTNAME}
 CONFIGURE_SCRIPT=	../dist/configure
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake
 INSTALL_TARGET=	install_include install_lib install_utilities
 LIBTOOLFILES=	${CONFIGURE_SCRIPT}
 WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
@@ -85,30 +85,31 @@ post-patch:
 
 post-install:
 .for i in libdb libdb_cxx libdb_stl ${libdb_sql} ${libdb_java}
-	${LN} -s -f ${PORTNAME}/${i}-${BDBVER}.so.0 ${PREFIX}/lib
-	${LN} -s -f ${PORTNAME}/${i}-${BDBMAJ}.so ${PREFIX}/lib
-	${LN} -s -f ${i}-${BDBVER}.so.0 ${PREFIX}/lib/${i}-${BDBVER}.so
-	${LN} -s -f ${i}-${BDBVER}.so.0 ${PREFIX}/lib/${i}-${BDBMAJ}.so.0
-	${LN} -s -f ${i}-${BDBVER}.a ${PREFIX}/lib/${PORTNAME}/${i}.a
-	${CHMOD} a-w ${PREFIX}/lib/${PORTNAME}/${i}-${BDBVER}.so.0 \
-		${PREFIX}/lib/${PORTNAME}/${i}-${BDBVER}.a \
-		${PREFIX}/lib/${PORTNAME}/${i}-${BDBVER}.la
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${i}-${BDBVER}.so.0
+	${LN} -s -f ${PORTNAME}/${i}-${BDBVER}.so.0 ${STAGEDIR}${PREFIX}/lib
+	${LN} -s -f ${PORTNAME}/${i}-${BDBMAJ}.so ${STAGEDIR}${PREFIX}/lib
+	${LN} -s -f ${i}-${BDBVER}.so.0 ${STAGEDIR}${PREFIX}/lib/${i}-${BDBVER}.so
+	${LN} -s -f ${i}-${BDBVER}.so.0 ${STAGEDIR}${PREFIX}/lib/${i}-${BDBMAJ}.so.0
+	${LN} -s -f ${i}-${BDBVER}.a ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${i}.a
+	${CHMOD} a-w ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${i}-${BDBVER}.so.0 \
+		${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${i}-${BDBVER}.a \
+		${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${i}-${BDBVER}.la
 .endfor
-	cd ${PREFIX}/bin/${PORTNAME}; \
+	cd ${STAGEDIR}${PREFIX}/bin/${PORTNAME}; \
 	for i in *; do ${LN} -s -f ${PORTNAME}/$$i ../$$i-${BDBVER} ; \
 		       ${LN} -s -f ${PORTNAME}/$$i ../$$i-${BDBMAJ} ; done
 .if ${PORT_OPTIONS:MDOCS}
 .for i in api_reference/TCL
-	${RM} -r -f ${DOCSDIR}/${i}
+	${RM} -r -f ${STAGEDIR}${DOCSDIR}/${i}
 .endfor
 .if empty(PORT_OPTIONS:MJAVA)
-	${RM} -r -f ${DOCSDIR}/java
+	${RM} -r -f ${STAGEDIR}${DOCSDIR}/java
 .for i in gsg gsg_db_rep gsg_txn
-	${RM} -r -f ${DOCSDIR}/${i}/JAVA
+	${RM} -r -f ${STAGEDIR}${DOCSDIR}/${i}/JAVA
 .endfor
 .endif
 .if empty(PORT_OPTIONS:MSQL)
-	${RM} -r -f ${DOCSDIR}/bdb-sql
+	${RM} -r -f ${STAGEDIR}${DOCSDIR}/bdb-sql
 .endif
 .endif
 

Modified: head/databases/db6/Makefile
==============================================================================
--- head/databases/db6/Makefile	Sat Dec 14 09:52:41 2013	(r336430)
+++ head/databases/db6/Makefile	Sat Dec 14 09:57:02 2013	(r336431)
@@ -6,7 +6,6 @@ PORTVERSION=	6.0.19.0
 CATEGORIES=	databases java
 MASTER_SITES=	http://download.oracle.com/berkeley-db/
 PKGNAMEPREFIX?=
-NO_STAGE=	yes
 # the distfiles aren't named db6-* but db-*:
 DISTNAME=	db-${PORTVERSION:R}
 DIST_SUBDIR=	bdb
@@ -25,7 +24,7 @@ CONFIGURE_ARGS=	--enable-cxx --enable-st
 		--bindir=${PREFIX}/bin/${PORTNAME}
 CONFIGURE_SCRIPT=	../dist/configure
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake
 INSTALL_TARGET=	install_include install_lib install_utilities
 LIBTOOLFILES=	${CONFIGURE_SCRIPT}
 WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
@@ -90,23 +89,24 @@ post-patch:
 
 post-install:
 .for i in libdb libdb_cxx libdb_stl ${libdb_sql} ${libdb_java}
-	${LN} -s -f ${PORTNAME}/${i}-${BDBVER}.so ${PREFIX}/lib
-	${LN} -s -f ${i}-${BDBVER}.a ${PREFIX}/lib/${PORTNAME}/${i}.a
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${i}-${BDBVER}.so
+	${LN} -s -f ${PORTNAME}/${i}-${BDBVER}.so ${STAGEDIR}${PREFIX}/lib
+	${LN} -s -f ${i}-${BDBVER}.a ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${i}.a
 .endfor
-	cd ${PREFIX}/bin/${PORTNAME}; \
+	cd ${STAGEDIR}${PREFIX}/bin/${PORTNAME}; \
 	for i in *; do ${LN} -s -f ${PORTNAME}/$$i ../$$i-${BDBVER} ; done
 .if ${PORT_OPTIONS:MDOCS}
 .for i in api_reference/TCL
-	${RM} -r -f ${DOCSDIR}/${i}
+	${RM} -r -f ${STAGEDIR}${DOCSDIR}/${i}
 .endfor
 .if empty(PORT_OPTIONS:MJAVA)
-	${RM} -r -f ${DOCSDIR}/java
+	${RM} -r -f ${STAGEDIR}${DOCSDIR}/java
 .for i in gsg gsg_db_rep gsg_txn
-	${RM} -r -f ${DOCSDIR}/${i}/JAVA
+	${RM} -r -f ${STAGEDIR}${DOCSDIR}/${i}/JAVA
 .endfor
 .endif
 .if empty(PORT_OPTIONS:MSQL)
-	${RM} -r -f ${DOCSDIR}/bdb-sql
+	${RM} -r -f ${STAGEDIR}${DOCSDIR}/bdb-sql
 .endif
 .endif
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312140957.rBE9v3Cj011099>