From owner-svn-ports-head@freebsd.org  Fri Sep 11 18:15:59 2015
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 79FB5A020EB;
 Fri, 11 Sep 2015 18:15:59 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (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 5183515C0;
 Fri, 11 Sep 2015 18:15:59 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8BIFx3N072843;
 Fri, 11 Sep 2015 18:15:59 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8BIFwxr072841;
 Fri, 11 Sep 2015 18:15:58 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201509111815.t8BIFwxr072841@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Fri, 11 Sep 2015 18:15:58 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r396690 - head/lang/dmd1
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 11 Sep 2015 18:15:59 -0000

Author: amdmi3
Date: Fri Sep 11 18:15:58 2015
New Revision: 396690
URL: https://svnweb.freebsd.org/changeset/ports/396690

Log:
  - Fix config file handling, switch to @sample
  
  Approved by:	portmgr blanket

Modified:
  head/lang/dmd1/Makefile
  head/lang/dmd1/pkg-plist

Modified: head/lang/dmd1/Makefile
==============================================================================
--- head/lang/dmd1/Makefile	Fri Sep 11 17:58:44 2015	(r396689)
+++ head/lang/dmd1/Makefile	Fri Sep 11 18:15:58 2015	(r396690)
@@ -3,7 +3,7 @@
 
 PORTNAME=	dmd
 PORTVERSION=	1.076
-PORTREVISION=	1
+PORTREVISION=	2
 PKGNAMESUFFIX=	1
 CATEGORIES=	lang
 MASTER_SITES=	http://ftp.digitalmars.com/
@@ -69,9 +69,7 @@ post-build:
 do-install:
 	${INSTALL_MAN} ${WRKDIR}/dmd/man/man1/dmd.1 ${STAGEDIR}${MANPREFIX}/man/man1/dmd1.1
 	${INSTALL_MAN} ${WRKDIR}/dmd/man/man1/dmd.conf.5 ${STAGEDIR}${MANPREFIX}/man/man5/dmd1.conf.5
-.if !exists(${STAGEDIR}${PREFIX}/etc/dmd.conf)
-	${INSTALL_DATA} ${WRKDIR}/dmd/freebsd/bin32/dmd.conf ${STAGEDIR}${PREFIX}/etc
-.endif
+	${INSTALL_DATA} ${WRKDIR}/dmd/freebsd/bin32/dmd.conf ${STAGEDIR}${PREFIX}/etc/dmd1.conf.sample
 	${INSTALL_PROGRAM} ${WRKDIR}/dmd/freebsd/bin32/dmd ${STAGEDIR}${PREFIX}/bin/dmd1
 	${INSTALL_DATA} ${WRKDIR}/dmd/freebsd/lib32/libphobos.a ${STAGEDIR}${PREFIX}/lib
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}

Modified: head/lang/dmd1/pkg-plist
==============================================================================
--- head/lang/dmd1/pkg-plist	Fri Sep 11 17:58:44 2015	(r396689)
+++ head/lang/dmd1/pkg-plist	Fri Sep 11 18:15:58 2015	(r396690)
@@ -1,7 +1,6 @@
-@unexec if cmp -s %D/%%EXAMPLESDIR%%/dmd1.conf %D/etc/dmd1.conf; then rm -f %D/etc/dmd1.conf; fi
-%%EXAMPLESDIR%%/dmd1.conf
-@exec if [ ! -f %D/etc/dmd1.conf ]; then cp -p %D/%%EXAMPLESDIR%%/dmd1.conf %D/etc/dmd1.conf; fi
+@sample etc/dmd1.conf.sample
 bin/dmd1
+%%EXAMPLESDIR%%/dmd1.conf
 %%EXAMPLESDIR%%/dmd1.conf.tango
 %%EXAMPLESDIR%%/samples/d/all.sh
 %%EXAMPLESDIR%%/samples/d/chello.d