diff options
| author | Sergey Skvortsov <skv@FreeBSD.org> | 2003-04-09 11:31:31 +0000 |
|---|---|---|
| committer | Sergey Skvortsov <skv@FreeBSD.org> | 2003-04-09 11:31:31 +0000 |
| commit | b3c65df55604560c2fb17d1dda9147afc65c1b4f (patch) | |
| tree | 72ab74b8e65c874350fcc47ec7af0dc6df799818 | |
| parent | aef5122501198d44fbf99a7833362c39b4ca755b (diff) | |
| download | ports-b3c65df55604560c2fb17d1dda9147afc65c1b4f.tar.gz ports-b3c65df55604560c2fb17d1dda9147afc65c1b4f.zip | |
1. remove ${PREFIX}/oracle7 on uninstall
2. don't use skeleton files while user addition
Pointed by: kris
Notes
Notes:
svn path=/head/; revision=78661
| -rw-r--r-- | databases/oracle7-client/Makefile | 12 | ||||
| -rw-r--r-- | databases/oracle7-client/pkg-install | 5 | ||||
| -rw-r--r-- | databases/oracle7-client/pkg-plist | 1 |
3 files changed, 10 insertions, 8 deletions
diff --git a/databases/oracle7-client/Makefile b/databases/oracle7-client/Makefile index d3294a5eb2b2..a49094651973 100644 --- a/databases/oracle7-client/Makefile +++ b/databases/oracle7-client/Makefile @@ -8,7 +8,7 @@ PORTNAME= oracle7-client PORTVERSION= 0.01 CATEGORIES= databases -MASTER_SITES= \ +MASTER_SITES= ftp://www.kuzbass.ru/pub/freebsd/oracle/ \ ftp://ftp.atnet.ru/pub/OS/FreeBSD/oracle/ \ ftp://ftp.lipetsk.ru/pub/unix/Oracle/FreeBSD/ \ ftp://ftp.redcom.ru/pub/Oracle/freebsd-client7/ @@ -26,14 +26,14 @@ PLIST_SUB= ORACLE_PREFIX="${ORACLE_PREFIX}" NO_BUILD= yes pre-install: - @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} 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 + @${CP} -pRP ${WRKSRC}/network ${WRKSRC}/ocommon ${WRKSRC}/rdbms \ + ${ORACLE_HOME} + @${LN} -sf rdbms/lib ${ORACLE_HOME}/lib post-install: - @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> diff --git a/databases/oracle7-client/pkg-install b/databases/oracle7-client/pkg-install index f30bfe445475..00bac61fae2a 100644 --- a/databases/oracle7-client/pkg-install +++ b/databases/oracle7-client/pkg-install @@ -26,11 +26,12 @@ PRE-INSTALL) echo "You already have a user \"${USER}\", so I will use it." else if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \ - -m -d ${DB_DIR} -c "Oracle" -b ${PKG_PREFIX} + -d ${DB_DIR} -c "Oracle" then echo "Added user \"${USER}\"." else - echo "Adding user \"${USER}\" failed..." + echo "Adding user \"${USER}\" failed." + echo "Please create it manually, before reinstalling this package." exit 1 fi fi diff --git a/databases/oracle7-client/pkg-plist b/databases/oracle7-client/pkg-plist index d961bf674466..f2e8db353ed9 100644 --- a/databases/oracle7-client/pkg-plist +++ b/databases/oracle7-client/pkg-plist @@ -1793,3 +1793,4 @@ @dirrm %%ORACLE_PREFIX%%/rdbms/mesg @dirrm %%ORACLE_PREFIX%%/rdbms/public @dirrm %%ORACLE_PREFIX%%/rdbms +@dirrm %%ORACLE_PREFIX%% |