diff options
| author | hrs <hrs@FreeBSD.org> | 2011-06-11 14:07:08 +0800 |
|---|---|---|
| committer | hrs <hrs@FreeBSD.org> | 2011-06-11 14:07:08 +0800 |
| commit | bf2f0fd31d4f08e0166eda63e2b149f353d39157 (patch) | |
| tree | 15dd74bafb74a5ee6d8384733be793a8b3271a35 /japanese | |
| parent | bcdfcb206684150b8bce2f1e64a8534135b11960 (diff) | |
| download | freebsd-ports-gnome-bf2f0fd31d4f08e0166eda63e2b149f353d39157.tar.gz freebsd-ports-gnome-bf2f0fd31d4f08e0166eda63e2b149f353d39157.tar.zst freebsd-ports-gnome-bf2f0fd31d4f08e0166eda63e2b149f353d39157.zip | |
Use $USERS instead of pkg-install for adding wnn user.
Submitted by: Chris Rees (utisoft@gmail.com)
PR: ports/157579
Diffstat (limited to 'japanese')
| -rw-r--r-- | japanese/FreeWnn-server/Makefile | 5 | ||||
| -rw-r--r-- | japanese/FreeWnn-server/files/pkg-install.in | 14 |
2 files changed, 1 insertions, 18 deletions
diff --git a/japanese/FreeWnn-server/Makefile b/japanese/FreeWnn-server/Makefile index 0c9fdda8da02..2394f10a25d7 100644 --- a/japanese/FreeWnn-server/Makefile +++ b/japanese/FreeWnn-server/Makefile @@ -32,6 +32,7 @@ INSTALL_TARGET= install install.man SUB_FILES= pkg-install PKGINSTALL= ${WRKDIR}/pkg-install MAKE_JOBS_UNSAFE= yes +USERS= wnn WNNTYPE?= WNN CONFIGURE_ARGS= --enable-libraries=no \ @@ -77,10 +78,6 @@ ${M}+= ${${M}.${WNNTYPE}} . endif .endfor -pre-install: - ${SETENV} BATCH=${BATCH} \ - ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL - post-install: ${SETENV} PKG_PREFIX=${PREFIX} \ ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL diff --git a/japanese/FreeWnn-server/files/pkg-install.in b/japanese/FreeWnn-server/files/pkg-install.in index 63d732cad1fe..c1c539414581 100644 --- a/japanese/FreeWnn-server/files/pkg-install.in +++ b/japanese/FreeWnn-server/files/pkg-install.in @@ -2,20 +2,6 @@ # $FreeBSD$ case $2 in -PRE-INSTALL) - if id -u wnn > /dev/null 2>&1; then - echo "INFO: wnn user already exists. FreeWnn will use it." - else - echo "INFO: Creating 'wnn' user..." - if pw useradd wnn -u 69 -g 7 -h - -d /nonexistent \ - -s /nonexistent -c Wnn; then - echo "INFO: Created." - else - echo "ERROR: wnn user cannot create." - exit 1 - fi - fi - ;; POST-INSTALL) case $1 in ja-FreeWnn-*) |