From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Aug 17 12:50:16 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3A9FF16A41F for ; Wed, 17 Aug 2005 12:50:16 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B76D143D48 for ; Wed, 17 Aug 2005 12:50:15 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j7HCoFIT020073 for ; Wed, 17 Aug 2005 12:50:15 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j7HCoF6t020072; Wed, 17 Aug 2005 12:50:15 GMT (envelope-from gnats) Resent-Date: Wed, 17 Aug 2005 12:50:15 GMT Resent-Message-Id: <200508171250.j7HCoF6t020072@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, Emanuel Haupt Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3EEF316A41F for ; Wed, 17 Aug 2005 12:48:17 +0000 (GMT) (envelope-from ehaupt@mx.critical.ch) Received: from mx.critical.ch (admin.critical.ch [67.18.86.178]) by mx1.FreeBSD.org (Postfix) with SMTP id E6ACA43D46 for ; Wed, 17 Aug 2005 12:48:16 +0000 (GMT) (envelope-from ehaupt@mx.critical.ch) Received: (qmail 58453 invoked by uid 1000); 17 Aug 2005 12:48:15 -0000 Message-Id: <20050817124815.58452.qmail@mx.critical.ch> Date: 17 Aug 2005 12:48:15 -0000 From: Emanuel Haupt To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/85045: update: mail/nail 11.24 -> 11.25, preserve nail.rc, take maintainership X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Emanuel Haupt List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Aug 2005 12:50:16 -0000 >Number: 85045 >Category: ports >Synopsis: update: mail/nail 11.24 -> 11.25, preserve nail.rc, take maintainership >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Aug 17 12:50:15 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Emanuel Haupt >Release: FreeBSD 4.11-RELEASE-p11 i386 >Organization: >Environment: System: FreeBSD admin.critical.ch 4.11-RELEASE-p11 FreeBSD 4.11-RELEASE-p11 #0: Thu Jun 30 09:36:40 CEST 2005 root@admin.critical.ch:/usr/obj/usr/src-release/src/sys/GENERIC i386 >Description: - update: mail/nail 11.24 -> 11.25 - preserve etc/nail.rc if != etc/nail.rc.default - take maintainership note: let me know if you prefer the 3 aditional lines in pkg-plist, i thought pkg-plist for 4 lines would be overkill >How-To-Repeat: >Fix: --- nail.patch begins here --- diff -Nur nail.orig/Makefile nail/Makefile --- nail.orig/Makefile Fri Jul 15 09:12:34 2005 +++ nail/Makefile Wed Aug 17 14:35:39 2005 @@ -1,17 +1,17 @@ # New ports collection makefile for: nail -# Date created: 20 October 2000 -# Whom: Kris Kennaway +# Date created: 20 October 2000 +# Whom: Kris Kennaway # # $FreeBSD: ports/mail/nail/Makefile,v 1.42 2005/07/14 14:41:30 pav Exp $ # PORTNAME= nail -PORTVERSION= 11.24 +PORTVERSION= 11.25 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= ehaupt@critical.ch COMMENT= BSD mail utility with MIME extensions USE_BZIP2= yes @@ -25,14 +25,20 @@ IPv6="-DHAVE_IPv6_FUNCS" MAN1= nail.1 -PLIST_FILES= bin/nail etc/nail.rc +PLIST_FILES= bin/nail \ + "@unexec if cmp -s %D/etc/nail.rc %D/etc/nail.rc.default; then rm -f %D/etc/nail.rc; fi " \ + "etc/nail.rc.default" \ + "@exec [ -f %B/nail.rc ] || cp %B/%f %B/nail.rc" CPPFLAGS= -I${LOCALBASE}/include LDFLAGS= -L${LOCALBASE}/lib do-install: ${INSTALL_PROGRAM} ${WRKSRC}/nail ${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/nail.rc ${PREFIX}/etc ${INSTALL_MAN} ${WRKSRC}/nail.1 ${MANPREFIX}/man/man1 + ${INSTALL_DATA} ${WRKSRC}/nail.rc ${PREFIX}/etc/nail.rc.default +.if !exists(${PREFIX}/etc/nail.rc) + ${INSTALL_DATA} ${WRKSRC}/nail.rc ${PREFIX}/etc +.endif .include diff -Nur nail.orig/distinfo nail/distinfo --- nail.orig/distinfo Fri Jul 15 09:12:34 2005 +++ nail/distinfo Wed Aug 17 14:25:37 2005 @@ -1,2 +1,2 @@ -MD5 (nail-11.24.tar.bz2) = e127cdbba1220a45f6f1f463ac4b4fd1 -SIZE (nail-11.24.tar.bz2) = 266691 +MD5 (nail-11.25.tar.bz2) = 54f42db31911d734fcf37a89b72d4df7 +SIZE (nail-11.25.tar.bz2) = 267959 --- nail.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: