From owner-svn-ports-all@FreeBSD.ORG  Fri Feb 14 14:33:25 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@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 A853AC43;
 Fri, 14 Feb 2014 14:33:25 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 93C251D4B;
 Fri, 14 Feb 2014 14:33:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1EEXP3I073188;
 Fri, 14 Feb 2014 14:33:25 GMT (envelope-from dinoex@svn.freebsd.org)
Received: (from dinoex@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1EEXPCO073186;
 Fri, 14 Feb 2014 14:33:25 GMT (envelope-from dinoex@svn.freebsd.org)
Message-Id: <201402141433.s1EEXPCO073186@svn.freebsd.org>
From: Dirk Meyer <dinoex@FreeBSD.org>
Date: Fri, 14 Feb 2014 14:33:25 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r344211 - head/comms/hylafax
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 14 Feb 2014 14:33:25 -0000

Author: dinoex
Date: Fri Feb 14 14:33:24 2014
New Revision: 344211
URL: http://svnweb.freebsd.org/changeset/ports/344211
QAT: https://qat.redports.org/buildarchive/r344211/

Log:
  - preserve etc/hosts.hfaxd
  PR:		185589
  Reported by:	Georg Altmann

Modified:
  head/comms/hylafax/Makefile
  head/comms/hylafax/pkg-plist

Modified: head/comms/hylafax/Makefile
==============================================================================
--- head/comms/hylafax/Makefile	Fri Feb 14 14:28:54 2014	(r344210)
+++ head/comms/hylafax/Makefile	Fri Feb 14 14:33:24 2014	(r344211)
@@ -3,6 +3,7 @@
 
 PORTNAME=	hylafax
 PORTVERSION=	6.0.6
+PORTREVISION=	1
 CATEGORIES=	comms
 MASTER_SITES=	ftp://ftp.hylafax.org/source/
 
@@ -15,7 +16,6 @@ LIB_DEPENDS=	libtiff.so:${PORTSDIR}/grap
 		libjbig.so:${PORTSDIR}/graphics/jbigkit
 
 MAKE_JOBS_UNSAFE=	yes
-#NO_STAGE=	yes
 NEED_ROOT=	yes
 
 USE_GHOSTSCRIPT=yes
@@ -85,6 +85,8 @@ post-patch:
 		${WRKSRC}/configure
 	${REINPLACE_CMD} -e 's,-O hfaxd.conf,-O hfaxd.conf-dist,' \
 		${WRKSRC}/hfaxd/Makefile.in
+	${REINPLACE_CMD} -e 's,hosts.hfaxd,hosts.hfaxd-dist,' \
+		${WRKSRC}/etc/Makefile.in
 	${REINPLACE_CMD} -e 's,-O typerules,-O typerules-dist,' \
 		-e 's,-O pagesizes,-O pagesizes-dist -src pagesizes,' \
 		${WRKSRC}/libhylafax/Makefile.in

Modified: head/comms/hylafax/pkg-plist
==============================================================================
--- head/comms/hylafax/pkg-plist	Fri Feb 14 14:28:54 2014	(r344210)
+++ head/comms/hylafax/pkg-plist	Fri Feb 14 14:33:24 2014	(r344211)
@@ -253,7 +253,9 @@ config/sierra
 etc/dpsprinter.ps
 etc/cover.templ
 etc/xferfaxlog
-etc/hosts.hfaxd
+@unexec if cmp -s %D/etc/hosts.hfaxd %D/etc/hosts.hfaxd-dist; then rm -f %D/etc/hosts.hfaxd; fi
+etc/hosts.hfaxd-dist
+@exec [ -f %B/hosts.hfaxd ] || cp %B/%f %B/hosts.hfaxd
 etc/dialrules
 etc/dialrules.sf-ba
 etc/dialrules.europe