Date: Fri, 4 Apr 2014 21:15:18 +0400 (MSK) From: Dmitry Marakasov <amdmi3@amdmi3.ru> To: FreeBSD-gnats-submit@freebsd.org Cc: joerg@FreeBSD.org Subject: ports/188263: [PATCH] devel/avrdude: properly handle config file Message-ID: <20140404171518.B10493699@hades.panopticon> Resent-Message-ID: <201404041720.s34HK2ED088649@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <bsd.port.mk>
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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140404171518.B10493699>