From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Jun 15 20:20:12 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CF4B4106567A for ; Wed, 15 Jun 2011 20:20:12 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 9382A8FC14 for ; Wed, 15 Jun 2011 20:20:12 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p5FKKC69038165 for ; Wed, 15 Jun 2011 20:20:12 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p5FKKCjN038164; Wed, 15 Jun 2011 20:20:12 GMT (envelope-from gnats) Resent-Date: Wed, 15 Jun 2011 20:20:12 GMT Resent-Message-Id: <201106152020.p5FKKCjN038164@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Max Brazhnikov Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9BF76106566B for ; Wed, 15 Jun 2011 20:12:45 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 8BBF38FC0A for ; Wed, 15 Jun 2011 20:12:45 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p5FKCjNQ016965 for ; Wed, 15 Jun 2011 20:12:45 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id p5FKCjUu016960; Wed, 15 Jun 2011 20:12:45 GMT (envelope-from nobody) Message-Id: <201106152012.p5FKCjUu016960@red.freebsd.org> Date: Wed, 15 Jun 2011 20:12:45 GMT From: Max Brazhnikov To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/157910: emulators/mtools: don't overwrite mtools.conf X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Jun 2011 20:20:12 -0000 >Number: 157910 >Category: ports >Synopsis: emulators/mtools: don't overwrite mtools.conf >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Jun 15 20:20:12 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Max Brazhnikov >Release: FreeBSD 9.0-CURRENT amd64 >Organization: >Environment: FreeBSD luna.dio.ru 9.0-CURRENT FreeBSD 9.0-CURRENT #2 r222977: Sat Jun 11 14:22:54 MSD 2011 root@luna.dio.ru:/usr/obj/head/usr/freebsd/svn/head/sys/LUNA amd64 >Description: emulators/mtools overwrites mtools.conf when installing from ports. >How-To-Repeat: >Fix: follow http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/plist-config.html Patch attached with submission follows: Index: Makefile =================================================================== RCS file: /home/pcvs/ports/emulators/mtools/Makefile,v retrieving revision 1.70 diff -u -r1.70 Makefile --- Makefile 7 Jun 2011 14:53:03 -0000 1.70 +++ Makefile 15 Jun 2011 19:55:05 -0000 @@ -7,7 +7,7 @@ PORTNAME= mtools PORTVERSION= 4.0.10 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= mtools @@ -63,9 +63,9 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/mtools.conf ${PREFIX}/etc/mtools.conf.sample -.if !exists(${PREFIX}/etc/mtools.conf) - @cd ${PREFIX}/etc && ${CP} -f mtools.conf.sample mtools.conf -.endif + @if [ ! -f ${PREFIX}/etc/mtools.conf ]; then \ + cd ${PREFIX}/etc && ${CP} -p mtools.conf.sample mtools.conf; \ + fi @${CAT} ${PKGMESSAGE} .include >Release-Note: >Audit-Trail: >Unformatted: