From owner-svn-ports-head@freebsd.org Wed Jan 29 02:52:00 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 54C5D1B3E86; Wed, 29 Jan 2020 02:52:00 +0000 (UTC) (envelope-from meta@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 486p0w1fkxz40TH; Wed, 29 Jan 2020 02:52:00 +0000 (UTC) (envelope-from meta@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3407255AC; Wed, 29 Jan 2020 02:52:00 +0000 (UTC) (envelope-from meta@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00T2q0oM025266; Wed, 29 Jan 2020 02:52:00 GMT (envelope-from meta@FreeBSD.org) Received: (from meta@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00T2pxZJ025259; Wed, 29 Jan 2020 02:51:59 GMT (envelope-from meta@FreeBSD.org) Message-Id: <202001290251.00T2pxZJ025259@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: meta set sender to meta@FreeBSD.org using -f From: Koichiro Iwao Date: Wed, 29 Jan 2020 02:51:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r524528 - head/japanese/ebnetd X-SVN-Group: ports-head X-SVN-Commit-Author: meta X-SVN-Commit-Paths: head/japanese/ebnetd X-SVN-Commit-Revision: 524528 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Jan 2020 02:52:00 -0000 Author: meta Date: Wed Jan 29 02:51:59 2020 New Revision: 524528 URL: https://svnweb.freebsd.org/changeset/ports/524528 Log: japanese/ebnetd: Fix build on real environment by changing character set of doc-ja/ebnetd-ja.texi from EUC-JP to UTF-8. - Change pkg-install so it doesn't modify /etc/services while building package - Bump PORTREVISION by package change PR: 242091 Submitted by: Yasuhiro KIMURA (maintainer) Modified: head/japanese/ebnetd/Makefile head/japanese/ebnetd/pkg-install Modified: head/japanese/ebnetd/Makefile ============================================================================== --- head/japanese/ebnetd/Makefile Wed Jan 29 02:25:23 2020 (r524527) +++ head/japanese/ebnetd/Makefile Wed Jan 29 02:51:59 2020 (r524528) @@ -3,7 +3,7 @@ PORTNAME= ebnetd PORTVERSION= 1.0 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= japanese MASTER_SITES= ftp://ftp.sra.co.jp/pub/misc/eb/ @@ -15,6 +15,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libeb.so:japanese/eb +USES= iconv:patch + GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=${RUNDIR} --with-logdir=${LOGDIR} CONFIGURE_ENV= PERL=${PREFIX}/bin/perl @@ -37,6 +39,8 @@ PLIST_SUB= EBNETD_RUNDIR=${RUNDIR}/${PORTNAME} \ INFO= ebnetd ebnetd-ja post-patch: + ${MV} ${WRKSRC}/doc-ja/ebnetd-ja.texi ${WRKSRC}/doc-ja/ebnetd-ja.texi.orig + ${ICONV_CMD} -f EUC-JP -t UTF-8 ${WRKSRC}/doc-ja/ebnetd-ja.texi.orig > ${WRKSRC}/doc-ja/ebnetd-ja.texi ${REINPLACE_CMD} -e "s/%%EBNETD_USER%%/${EBNETD_USER}/" \ -e "s/%%EBNETD_GROUP%%/${EBNETD_GROUP}/" \ ${WRKSRC}/ebnetd.conf.sample.in Modified: head/japanese/ebnetd/pkg-install ============================================================================== --- head/japanese/ebnetd/pkg-install Wed Jan 29 02:25:23 2020 (r524527) +++ head/japanese/ebnetd/pkg-install Wed Jan 29 02:51:59 2020 (r524528) @@ -10,9 +10,9 @@ ask() { question=$1 default=$2 - if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then + if [ x${BATCH} = xno ]; then read -p "${question} (y/n) [${default}]? " answer - [ "${answer}" ] && default=${answer} + [ "${answer}" ] && default=${answer} fi echo ${default} } @@ -102,18 +102,20 @@ entry_ndtp=ndtp port_ndtp=2010/tcp comment_ndtp='Network Dictionary Transfer Protocol' -echo "************************************************************************" -if checkall ${file} ${entrylist}; then - echo "This system has already all entries for EBNETD in ${file}." -else - echo "This system doesn't have some of entries for EBNETD in ${file}." - if yesno " Would you like to add them automatically?" y; then - cp -f ${file} ${back} - echo " The original file is saved as ${back}." - add ${file} ${entry_ebnet} ${port_ebnet} ${comment_ebnet} - add ${file} ${entry_ndtp} ${port_ndtp} ${comment_ndtp} +if [ -z "${PACKAGE_BUILDING}" ]; then + echo "************************************************************************" + if checkall ${file} ${entrylist}; then + echo "This system has already all entries for EBNETD in ${file}." + else + echo "This system doesn't have some of entries for EBNETD in ${file}." + if yesno " Would you like to add them automatically?" y; then + cp -f ${file} ${back} + echo " The original file is saved as ${back}." + add ${file} ${entry_ebnet} ${port_ebnet} ${comment_ebnet} + add ${file} ${entry_ndtp} ${port_ndtp} ${comment_ndtp} + fi fi + echo "************************************************************************" fi -echo "************************************************************************" exit 0