From 8800692b14d9c1eeef3c00cff9f30aa8bfce2e0d Mon Sep 17 00:00:00 2001
From: Guido Falsi <madpilot@FreeBSD.org>
Date: Mon, 12 May 2014 09:02:56 +0000
Subject: [PATCH] Stage port.

---
 databases/oracle7-client/Makefile  | 16 +++++-----------
 databases/oracle7-client/pkg-plist |  3 +--
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/databases/oracle7-client/Makefile b/databases/oracle7-client/Makefile
index 5c71c9f32080..970e9e26accb 100644
--- a/databases/oracle7-client/Makefile
+++ b/databases/oracle7-client/Makefile
@@ -20,17 +20,11 @@ PLIST_SUB=	ORACLE_PREFIX="${ORACLE_PREFIX}"
 
 NO_BUILD=	yes
 
-NO_STAGE=	yes
-pre-install:
-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
 do-install:
-	@${CP} -pRP ${WRKSRC}/network ${WRKSRC}/ocommon ${WRKSRC}/rdbms \
-		${ORACLE_HOME}
-	@${LN} -sf rdbms/lib ${ORACLE_HOME}/lib
-	@${ECHO_CMD} "-lwrap" >> ${ORACLE_HOME}/lib/sysliblist
-
-post-install:
-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	${MKDIR} ${STAGEDIR}${ORACLE_HOME}
+	${CP} -pRP ${WRKSRC}/network ${WRKSRC}/ocommon ${WRKSRC}/rdbms \
+		${STAGEDIR}${ORACLE_HOME}
+	${LN} -sf rdbms/lib ${STAGEDIR}${ORACLE_HOME}/lib
+	@${ECHO_CMD} "-lwrap" >> ${STAGEDIR}${ORACLE_HOME}/lib/sysliblist
 
 .include <bsd.port.mk>
diff --git a/databases/oracle7-client/pkg-plist b/databases/oracle7-client/pkg-plist
index bef89b0efccc..32a2195940dd 100644
--- a/databases/oracle7-client/pkg-plist
+++ b/databases/oracle7-client/pkg-plist
@@ -1769,8 +1769,7 @@
 %%ORACLE_PREFIX%%/rdbms/lib.old/libmdhh.a
 %%ORACLE_PREFIX%%/rdbms/lib.old/config.o
 %%ORACLE_PREFIX%%/rdbms/lib.old/sysliblist
-@exec ln -s rdbms/lib %D/%%ORACLE_PREFIX%%/lib
-@rmtry %%ORACLE_PREFIX%%/lib
+%%ORACLE_PREFIX%%/lib
 @dirrm %%ORACLE_PREFIX%%/network/admin
 @dirrm %%ORACLE_PREFIX%%/network
 @dirrm %%ORACLE_PREFIX%%/ocommon/install