Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 4 Jun 2011 09:57:49 +0100
From:      Chris Rees <utisoft@gmail.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/157579: Fix port: japanese/FreeWnn-server should use USERS
Message-ID:  <BLU0-SMTP655511CD56256162C70545A97E0@phx.gbl>
Resent-Message-ID: <201106040900.p5490Kpf005284@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         157579
>Category:       ports
>Synopsis:       Fix port: japanese/FreeWnn-server should use USERS
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jun 04 09:00:20 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Chris Rees
>Release:        FreeBSD 8.2-RELEASE-p1 i386
>Organization:
bayofrum
>Environment:
System: FreeBSD zeus.bayofrum.net 8.2-RELEASE-p1 FreeBSD 8.2-RELEASE-p1 #0: Sat Apr 30 15:09:06 BST 2011 root@zeus.bayofrum.net:/usr/obj/usr/src/sys/ZEUS i386


	
>Description:
	

	This port uses pkg-install to create new users instead of using USERS=.
>How-To-Repeat:
	
>Fix:

	

	- Use USERS

	Submitted by: Chris Rees (utisoft@gmail.com)


--- japanese-FreeWnn-server.patch begins here ---
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-*)
--- japanese-FreeWnn-server.patch ends here ---



-- 
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.

>Release-Note:
>Audit-Trail:
>Unformatted:



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