Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 11 Sep 2015 18:15:58 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r396690 - head/lang/dmd1
Message-ID:  <201509111815.t8BIFwxr072841@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509111815.t8BIFwxr072841>