From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Apr 4 17:20:03 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F3B45561 for ; Fri, 4 Apr 2014 17:20:02 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D0AAB96D for ; Fri, 4 Apr 2014 17:20:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s34HK2XN088650 for ; Fri, 4 Apr 2014 17:20:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s34HK2ED088649; Fri, 4 Apr 2014 17:20:02 GMT (envelope-from gnats) Resent-Date: Fri, 4 Apr 2014 17:20:02 GMT Resent-Message-Id: <201404041720.s34HK2ED088649@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, Dmitry Marakasov Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6EF044CB; Fri, 4 Apr 2014 17:15:29 +0000 (UTC) Received: from smtpout6.timeweb.ru (smtpout6.timeweb.ru [92.53.117.39]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 22D49937; Fri, 4 Apr 2014 17:15:28 +0000 (UTC) Received: from [213.148.20.85] (helo=hive.panopticon) by smtp.timeweb.ru with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1WW7i3-0007Ap-4T; Fri, 04 Apr 2014 21:15:19 +0400 Received: from hades.panopticon (hades.panopticon [192.168.0.32]) by hive.panopticon (Postfix) with ESMTP id BB9E82A8; Fri, 4 Apr 2014 21:15:18 +0400 (MSK) Received: by hades.panopticon (Postfix, from userid 1000) id B10493699; Fri, 4 Apr 2014 21:15:18 +0400 (MSK) Message-Id: <20140404171518.B10493699@hades.panopticon> Date: Fri, 4 Apr 2014 21:15:18 +0400 (MSK) From: Dmitry Marakasov To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/188263: [PATCH] devel/avrdude: properly handle config file Cc: joerg@FreeBSD.org X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Apr 2014 17:20:03 -0000 >Number: 188263 >Category: ports >Synopsis: [PATCH] devel/avrdude: properly handle config file >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: Fri Apr 04 17:20:01 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Dmitry Marakasov >Release: FreeBSD 10.0-RELEASE amd64 >Organization: >Environment: System: FreeBSD hades.panopticon 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260807: Fri Jan 17 13:14:28 MSK >Description: - Properly handle config file and do not override user settings - While here, use shorter MASTER_SITES version - Bump PORTREVISION Port maintainer (joerg@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 1.00.2014.03.23 (mode: change, diff: SVN) >How-To-Repeat: >Fix: --- avrdude-5.11.patch begins here --- Index: Makefile =================================================================== --- Makefile (revision 350140) +++ Makefile (working copy) @@ -3,9 +3,9 @@ PORTNAME= avrdude PORTVERSION= 5.11 +PORTREVISION= 1 CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_SAVANNAH} -MASTER_SITE_SUBDIR= avrdude +MASTER_SITES= SAVANNAH/avrdude MAINTAINER= joerg@FreeBSD.org COMMENT= Program for programming the on-chip memory of Atmel AVR CPUs @@ -17,4 +17,7 @@ CFLAGS+= -I${LOCALBASE}/include MAKE_JOBS_UNSAFE= yes +post-install: + ${MV} ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.dist + .include Index: pkg-plist =================================================================== --- pkg-plist (revision 350140) +++ pkg-plist (working copy) @@ -1,3 +1,5 @@ bin/avrdude -etc/avrdude.conf man/man1/avrdude.1.gz +@unexec if cmp -s %D/etc/avrdude.conf.dist %D/etc/avrdude.conf; then rm -f %D/etc/avrdude.conf; fi +etc/avrdude.conf.dist +@exec if [ ! -f %B/avrdude.conf ]; then cp -p %D/%F %B/avrdude.conf; fi --- avrdude-5.11.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: