aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoramdmi3 <amdmi3@FreeBSD.org>2015-09-12 02:15:58 +0800
committeramdmi3 <amdmi3@FreeBSD.org>2015-09-12 02:15:58 +0800
commitb17abd135a5bd0df2b2d766b4cbab42ba6baaa27 (patch)
tree577e028bd0e50b36ebc8781df499774e6356fbb3
parentd732284ee992546152869436f58504bddb3ca4ff (diff)
downloadfreebsd-ports-gnome-b17abd135a5bd0df2b2d766b4cbab42ba6baaa27.tar.gz
freebsd-ports-gnome-b17abd135a5bd0df2b2d766b4cbab42ba6baaa27.tar.zst
freebsd-ports-gnome-b17abd135a5bd0df2b2d766b4cbab42ba6baaa27.zip
- Fix config file handling, switch to @sample
Approved by: portmgr blanket
-rw-r--r--lang/dmd1/Makefile6
-rw-r--r--lang/dmd1/pkg-plist5
2 files changed, 4 insertions, 7 deletions
diff --git a/lang/dmd1/Makefile b/lang/dmd1/Makefile
index d6d6ef36c503..d0ceca1751fe 100644
--- a/lang/dmd1/Makefile
+++ b/lang/dmd1/Makefile
@@ -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}
diff --git a/lang/dmd1/pkg-plist b/lang/dmd1/pkg-plist
index fb95f4e80ad1..ef76bae0cfd3 100644
--- a/lang/dmd1/pkg-plist
+++ b/lang/dmd1/pkg-plist
@@ -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