This port uses pkg-install to create new users instead of using USERS=. Fix: - Use USERS Submitted by: Chris Rees (utisoft@gmail.com) -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.--SvjhU94Vq0TntqKFg49ET1pPmPhAaif2jPR69yUSvHr8Xkoj Content-Type: text/plain; name="japanese-FreeWnn-server.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="japanese-FreeWnn-server.patch" Index: Makefile =================================================================== RCS file: /exports/cvsroot-freebsd/ports/japanese/FreeWnn-server/Makefile,v retrieving revision 1.48 diff -u -r1.48 Makefile --- Makefile 4 Dec 2010 07:32:13 -0000 1.48 +++ Makefile 2 Jun 2011 20:02:23 -0000 @@ -19,6 +19,8 @@ MAINTAINER= hrs@FreeBSD.org COMMENT?= A Japanese/Chinese/Korean input method (Japanese server) +USERS= wnn + USE_BZIP2= yes GNU_CONFIGURE= yes USE_AUTOTOOLS= autoconf libtool @@ -77,10 +79,6 @@ . endif .endfor -pre-install: - ${SETENV} BATCH=${BATCH} \ - ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL - post-install: ${SETENV} PKG_PREFIX=${PREFIX} \ ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL Index: files/pkg-install.in =================================================================== RCS file: /exports/cvsroot-freebsd/ports/japanese/FreeWnn-server/files/pkg-install.in,v retrieving revision 1.3 diff -u -r1.3 pkg-install.in --- files/pkg-install.in 2 Jan 2010 14:47:20 -0000 1.3 +++ files/pkg-install.in 2 Jun 2011 20:01:04 -0000 @@ -2,20 +2,6 @@ # $FreeBSD: ports/japanese/FreeWnn-server/files/pkg-install.in,v 1.3 2010/01/02 14:47:20 hrs Exp $ 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-*)
Responsible Changed From-To: freebsd-ports-bugs->hrs Over to maintainer (via the GNATS Auto Assign Tool)
hrs 2011-06-11 06:07:08 UTC FreeBSD ports repository Modified files: japanese/FreeWnn-server Makefile japanese/FreeWnn-server/files pkg-install.in Log: Use $USERS instead of pkg-install for adding wnn user. Submitted by: Chris Rees (utisoft@gmail.com) PR: ports/157579 Revision Changes Path 1.49 +1 -4 ports/japanese/FreeWnn-server/Makefile 1.4 +1 -15 ports/japanese/FreeWnn-server/files/pkg-install.in _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed, thanks!