Index: head/lang/dmd1/Makefile
===================================================================
--- head/lang/dmd1/Makefile	(revision 396689)
+++ head/lang/dmd1/Makefile	(revision 396690)
@@ -1,97 +1,95 @@
 # Created by: Ruben <chromium@hybridsource.org>
 # $FreeBSD$
 
 PORTNAME=	dmd
 PORTVERSION=	1.076
-PORTREVISION=	1
+PORTREVISION=	2
 PKGNAMESUFFIX=	1
 CATEGORIES=	lang
 MASTER_SITES=	http://ftp.digitalmars.com/
 DISTNAME=	${PORTNAME}.${PORTVERSION}
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Official compiler for the D 1.0 programming language
 
 NO_PACKAGE=	No redistribution of non validated binaries
 USES=		gmake zip
 PORTDOCS=	*.txt html/ phobos/
 WRKSRC=		${WRKDIR}/${PORTNAME}/src/${PORTNAME}
 LICENSE_COMB=	multi
 LICENSE=	ART10 ZLIB DMD
 LICENSE_NAME_DMD=	digital mars license
 LICENSE_FILE_DMD=	${WRKSRC}/../../license.txt
 LICENSE_PERMS_DMD=	no-pkg-mirror auto-accept
 
 OPTIONS_DEFINE=	SOURCE DOCS
 SOURCE_DESC=	Compile dmd and phobos from source
 
 .include <bsd.port.options.mk>
 
 MODULEDIR=	${PREFIX}/include/d/phobos
 
 .if ${PORT_OPTIONS:MSOURCE}
 MAKEFILE=	posix.mak
 .else
 NO_BUILD=	yes
 .endif
 
 .if ${ARCH} == "amd64"
 MAKE_ARGS+=	MODEL=64
 .else
 MAKE_ARGS+=	MODEL=32
 .endif
 
 post-patch:
 .if ${PORT_OPTIONS:MSOURCE}
 	@${REINPLACE_CMD} -e "s|gcc|${CC}|"			\
 		${WRKSRC}/../phobos/freebsd.mak			\
 		${WRKSRC}/../phobos/etc/c/zlib/freebsd.mak	\
 		${WRKSRC}/../phobos/internal/gc/freebsd.mak
 	@${REINPLACE_CMD} -e "s|g++|${CXX}|"			\
 		${WRKSRC}/../phobos/freebsd.mak
 	@${REINPLACE_CMD} -e "s|/etc|${PREFIX}/etc|"	\
 		${WRKDIR}/dmd/man/man1/dmd.1		\
 		${WRKDIR}/dmd/man/man1/dmd.conf.5
 	@${REINPLACE_CMD} -e 's|"/etc/"|"${PREFIX}/etc/"|' ${WRKSRC}/inifile.c
 	@${REINPLACE_CMD} -e 's|dmd.conf|dmd1.conf|' ${WRKSRC}/mars.c
 .endif
 	@${REINPLACE_CMD} -e "s|%@P%/../../src/phobos|${MODULEDIR}|" ${WRKDIR}/dmd/freebsd/bin32/dmd.conf
 	@${CP} ${WRKDIR}/dmd/freebsd/bin32/dmd.conf ${WRKDIR}/dmd/freebsd/bin32/dmd.conf.tango
 	@${REINPLACE_CMD} -e "s|phobos|tango -defaultlib=tango -version=freebsd|" ${WRKDIR}/dmd/freebsd/bin32/dmd.conf.tango
 	@${REINPLACE_CMD} -e "1s|^|# You'll need to recompile libtango.a with dmd and install it yourself.|" ${WRKDIR}/dmd/freebsd/bin32/dmd.conf.tango
 	@${REINPLACE_CMD} -e "s|%@P%/../lib|${PREFIX}/lib|" \
 		${WRKDIR}/dmd/freebsd/bin32/dmd.conf	\
 		${WRKDIR}/dmd/freebsd/bin32/dmd.conf.tango
 
 post-build:
 	@${REINPLACE_CMD} -e "s| etc/c/zlib/gzio.o||" ${WRKSRC}/../phobos/freebsd.mak
 
 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}
 	${INSTALL_DATA} ${WRKDIR}/dmd/freebsd/bin32/dmd.conf ${STAGEDIR}${EXAMPLESDIR}/dmd1.conf
 	${INSTALL_DATA} ${WRKDIR}/dmd/freebsd/bin32/dmd.conf.tango ${STAGEDIR}${EXAMPLESDIR}/dmd1.conf.tango
 	cd ${WRKDIR}/dmd && ${COPYTREE_SHARE} samples ${STAGEDIR}${EXAMPLESDIR}
 	${MKDIR} ${STAGEDIR}${MODULEDIR}
 	${INSTALL_DATA} ${WRKSRC}/../phobos/*.d ${STAGEDIR}${MODULEDIR}
 	${MKDIR} ${STAGEDIR}${MODULEDIR}/etc
 	${INSTALL_DATA} ${WRKSRC}/../phobos/etc/gamma.d ${STAGEDIR}${MODULEDIR}/etc
 	${MKDIR} ${STAGEDIR}${MODULEDIR}/etc/c
 	${INSTALL_DATA} ${WRKSRC}/../phobos/etc/c/zlib.d ${STAGEDIR}${MODULEDIR}/etc/c
 	cd ${WRKSRC}/../phobos && ${COPYTREE_SHARE} std ${STAGEDIR}${MODULEDIR}
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.txt ${STAGEDIR}${DOCSDIR}
 	cd ${WRKDIR}/dmd && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/phobos
 	${INSTALL_DATA} ${WRKSRC}/../phobos/phoboslicense.txt ${STAGEDIR}${DOCSDIR}/phobos
 	${INSTALL_DATA} ${WRKSRC}/../phobos/std.ddoc ${STAGEDIR}${DOCSDIR}/phobos
 .endif
 
 .include <bsd.port.mk>
Index: head/lang/dmd1/pkg-plist
===================================================================
--- head/lang/dmd1/pkg-plist	(revision 396689)
+++ head/lang/dmd1/pkg-plist	(revision 396690)
@@ -1,168 +1,167 @@
-@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
 %%EXAMPLESDIR%%/samples/d/d2html.d
 %%EXAMPLESDIR%%/samples/d/dclient.d
 %%EXAMPLESDIR%%/samples/d/dhry.d
 %%EXAMPLESDIR%%/samples/d/dserver.d
 %%EXAMPLESDIR%%/samples/d/dserver.def
 %%EXAMPLESDIR%%/samples/d/hello.d
 %%EXAMPLESDIR%%/samples/d/hello2.html
 %%EXAMPLESDIR%%/samples/d/htmlget.d
 %%EXAMPLESDIR%%/samples/d/listener.d
 %%EXAMPLESDIR%%/samples/d/mydll/build.bat
 %%EXAMPLESDIR%%/samples/d/mydll/dll.d
 %%EXAMPLESDIR%%/samples/d/mydll/mydll.d
 %%EXAMPLESDIR%%/samples/d/mydll/mydll.def
 %%EXAMPLESDIR%%/samples/d/mydll/mydll2.d
 %%EXAMPLESDIR%%/samples/d/mydll/test.d
 %%EXAMPLESDIR%%/samples/d/pi.d
 %%EXAMPLESDIR%%/samples/d/run.bat
 %%EXAMPLESDIR%%/samples/d/sieve.d
 %%EXAMPLESDIR%%/samples/d/wc.d
 %%EXAMPLESDIR%%/samples/d/wc2.d
 %%EXAMPLESDIR%%/samples/d/winsamp.d
 %%EXAMPLESDIR%%/samples/d/winsamp.def
 lib/libphobos.a
 include/d/phobos/crc32.d
 include/d/phobos/etc/gamma.d
 include/d/phobos/etc/c/zlib.d
 include/d/phobos/gcstats.d
 include/d/phobos/object.d
 include/d/phobos/phobos.d
 include/d/phobos/std/array.d
 include/d/phobos/std/asserterror.d
 include/d/phobos/std/base64.d
 include/d/phobos/std/bind.d
 include/d/phobos/std/bitarray.d
 include/d/phobos/std/boxer.d
 include/d/phobos/std/c/fenv.d
 include/d/phobos/std/c/freebsd/freebsd.d
 include/d/phobos/std/c/freebsd/math.d
 include/d/phobos/std/c/freebsd/pthread.d
 include/d/phobos/std/c/freebsd/socket.d
 include/d/phobos/std/c/linux/linux.d
 include/d/phobos/std/c/linux/linuxextern.d
 include/d/phobos/std/c/linux/pthread.d
 include/d/phobos/std/c/linux/socket.d
 include/d/phobos/std/c/locale.d
 include/d/phobos/std/c/math.d
 include/d/phobos/std/c/openbsd/openbsd.d
 include/d/phobos/std/c/openbsd/pthread.d
 include/d/phobos/std/c/openbsd/socket.d
 include/d/phobos/std/c/osx/mach/dyld.d
 include/d/phobos/std/c/osx/mach/getsect.d
 include/d/phobos/std/c/osx/mach/loader.d
 include/d/phobos/std/c/osx/osx.d
 include/d/phobos/std/c/posix/posix.d
 include/d/phobos/std/c/posix/pthread.d
 include/d/phobos/std/c/posix/socket.d
 include/d/phobos/std/c/process.d
 include/d/phobos/std/c/solaris/pthread.d
 include/d/phobos/std/c/solaris/socket.d
 include/d/phobos/std/c/solaris/solaris.d
 include/d/phobos/std/c/stdarg.d
 include/d/phobos/std/c/stdint.d
 include/d/phobos/std/c/stddef.d
 include/d/phobos/std/c/stdio.d
 include/d/phobos/std/c/stdlib.d
 include/d/phobos/std/c/string.d
 include/d/phobos/std/c/time.d
 include/d/phobos/std/c/windows/com.d
 include/d/phobos/std/c/windows/stat.d
 include/d/phobos/std/c/windows/windows.d
 include/d/phobos/std/c/windows/winsock.d
 include/d/phobos/std/compiler.d
 include/d/phobos/std/conv.d
 include/d/phobos/std/cover.d
 include/d/phobos/std/cpuid.d
 include/d/phobos/std/cstream.d
 include/d/phobos/std/ctype.d
 include/d/phobos/std/date.d
 include/d/phobos/std/dateparse.d
 include/d/phobos/std/demangle.d
 include/d/phobos/std/file.d
 include/d/phobos/std/format.d
 include/d/phobos/std/gc.d
 include/d/phobos/std/intrinsic.d
 include/d/phobos/std/loader.d
 include/d/phobos/std/math.d
 include/d/phobos/std/math2.d
 include/d/phobos/std/md5.d
 include/d/phobos/std/metastrings.d
 include/d/phobos/std/mmfile.d
 include/d/phobos/std/moduleinit.d
 include/d/phobos/std/openrj.d
 include/d/phobos/std/outbuffer.d
 include/d/phobos/std/outofmemory.d
 include/d/phobos/std/path.d
 include/d/phobos/std/perf.d
 include/d/phobos/std/process.d
 include/d/phobos/std/random.d
 include/d/phobos/std/regexp.d
 include/d/phobos/std/signals.d
 include/d/phobos/std/socket.d
 include/d/phobos/std/socketstream.d
 include/d/phobos/std/stdarg.d
 include/d/phobos/std/stdint.d
 include/d/phobos/std/stdio.d
 include/d/phobos/std/stream.d
 include/d/phobos/std/string.d
 include/d/phobos/std/switcherr.d
 include/d/phobos/std/syserror.d
 include/d/phobos/std/system.d
 include/d/phobos/std/thread.d
 include/d/phobos/std/thread_helper.d
 include/d/phobos/std/traits.d
 include/d/phobos/std/typeinfo/ti_AC.d
 include/d/phobos/std/typeinfo/ti_Acdouble.d
 include/d/phobos/std/typeinfo/ti_Acfloat.d
 include/d/phobos/std/typeinfo/ti_Acreal.d
 include/d/phobos/std/typeinfo/ti_Adouble.d
 include/d/phobos/std/typeinfo/ti_Afloat.d
 include/d/phobos/std/typeinfo/ti_Ag.d
 include/d/phobos/std/typeinfo/ti_Aint.d
 include/d/phobos/std/typeinfo/ti_Along.d
 include/d/phobos/std/typeinfo/ti_Areal.d
 include/d/phobos/std/typeinfo/ti_Ashort.d
 include/d/phobos/std/typeinfo/ti_C.d
 include/d/phobos/std/typeinfo/ti_byte.d
 include/d/phobos/std/typeinfo/ti_cdouble.d
 include/d/phobos/std/typeinfo/ti_cfloat.d
 include/d/phobos/std/typeinfo/ti_char.d
 include/d/phobos/std/typeinfo/ti_creal.d
 include/d/phobos/std/typeinfo/ti_dchar.d
 include/d/phobos/std/typeinfo/ti_delegate.d
 include/d/phobos/std/typeinfo/ti_double.d
 include/d/phobos/std/typeinfo/ti_float.d
 include/d/phobos/std/typeinfo/ti_idouble.d
 include/d/phobos/std/typeinfo/ti_ifloat.d
 include/d/phobos/std/typeinfo/ti_int.d
 include/d/phobos/std/typeinfo/ti_ireal.d
 include/d/phobos/std/typeinfo/ti_long.d
 include/d/phobos/std/typeinfo/ti_ptr.d
 include/d/phobos/std/typeinfo/ti_real.d
 include/d/phobos/std/typeinfo/ti_short.d
 include/d/phobos/std/typeinfo/ti_ubyte.d
 include/d/phobos/std/typeinfo/ti_uint.d
 include/d/phobos/std/typeinfo/ti_ulong.d
 include/d/phobos/std/typeinfo/ti_ushort.d
 include/d/phobos/std/typeinfo/ti_void.d
 include/d/phobos/std/typeinfo/ti_wchar.d
 include/d/phobos/std/typetuple.d
 include/d/phobos/std/uni.d
 include/d/phobos/std/uri.d
 include/d/phobos/std/utf.d
 include/d/phobos/std/windows/charset.d
 include/d/phobos/std/windows/iunknown.d
 include/d/phobos/std/windows/registry.d
 include/d/phobos/std/windows/syserror.d
 include/d/phobos/std/zip.d
 include/d/phobos/std/zlib.d
 include/d/phobos/unittest.d
 man/man1/dmd1.1.gz
 man/man5/dmd1.conf.5.gz