Index: archivers/dact/Makefile
===================================================================
--- archivers/dact/Makefile	(revision 317360)
+++ archivers/dact/Makefile	(working copy)
@@ -39,7 +39,7 @@
 post-install:
 .if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${EXAMPLESDIR}
-	${CP} -n ${WRKSRC}/dact.conf ${EXAMPLESDIR}
+	${CP} -n ${WRKSRC}/dact.conf ${EXAMPLESDIR} || ${TRUE}
 .endif
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
Index: comms/ncid/Makefile
===================================================================
--- comms/ncid/Makefile	(revision 317360)
+++ comms/ncid/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   ncid
-# Date created:        06 June 2005
-# Whom:                David
-#
+# Created by: David
 # $FreeBSD$
-#
 
 PORTNAME=	ncid
 PORTVERSION=	0.84
@@ -53,7 +49,7 @@
 	@cd ${WRKSRC};for i in server/*.alias scripts/*.conf;do\
 		ib=`basename $$i`;\
 		${INSTALL_DATA} $$i ${ETCDIR}/$$ib.dist;\
-		${CP} -n ${ETCDIR}/$$ib.dist ${ETCDIR}/$$ib;\
+		${CP} -n ${ETCDIR}/$$ib.dist ${ETCDIR}/$$ib || ${TRUE} ;\
 		${ECHO_CMD} "@unexec cd %D/${ETCDIR_REL}/;! cmp -s $$ib $$ib.dist||\
 			${RM} -f $$ib">>${TMPPLIST};\
 		${ECHO_CMD} "${ETCDIR_REL}/$$ib.dist">>${TMPPLIST};\
Index: databases/phppgadmin/Makefile
===================================================================
--- databases/phppgadmin/Makefile	(revision 317360)
+++ databases/phppgadmin/Makefile	(working copy)
@@ -40,9 +40,9 @@
 	${CP} -Rp ${WRKSRC}/ ${PREFIX}/${PGADMDIR}/
 .if exists(${PREFIX}/${PGADMOLDDIR}/conf/config.inc.php)
 	${CP} -np ${PREFIX}/${PGADMOLDDIR}/conf/config.inc.php \
-		${PREFIX}/${PGADMDIR}/conf/config.inc.php
+		${PREFIX}/${PGADMDIR}/conf/config.inc.php || ${TRUE}
 .endif
 	${CP} -np ${PREFIX}/${PGADMDIR}/conf/config.inc.php-dist \
-		${PREFIX}/${PGADMDIR}/conf/config.inc.php
+		${PREFIX}/${PGADMDIR}/conf/config.inc.php || ${TRUE}
 
 .include <bsd.port.post.mk>
Index: deskutils/plans/Makefile
===================================================================
--- deskutils/plans/Makefile	(revision 317360)
+++ deskutils/plans/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	plans
-# Date created:				2004-12-17
-# Whom:					Edwin Groothuis <edwin@mavetju.org>
-#
+# Created by: Edwin Groothuis <edwin@mavetju.org>
 # $FreeBSD$
-#
 
 PORTNAME=	plans
 PORTVERSION=	8.2.1
@@ -62,7 +58,7 @@
 	@${FIND} ${WWWDIR} -name '*.cgi' -exec ${CHMOD} 755 {} \;
 	@${FIND} ${WWWDIR} -name '*.xml' -exec ${CHMOD} 664 {} \;
 	@for i in ${WWWDIR}/data/*default ${WWWDIR}/*default; do\
-		${CP} -np $$i $${i%.default}; done
+		${CP} -np $$i $${i%.default} || ${TRUE} ; done
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
Index: devel/pear/Makefile
===================================================================
--- devel/pear/Makefile	(revision 317360)
+++ devel/pear/Makefile	(working copy)
@@ -38,6 +38,6 @@
 		${PEARDIR}/peclcmd.php
 
 post-install:
-	@${CP} -n ${PREFIX}/etc/pear.conf.sample ${PREFIX}/etc/pear.conf
+	@${CP} -n ${PREFIX}/etc/pear.conf.sample ${PREFIX}/etc/pear.conf || ${TRUE}
 
 .include <bsd.port.mk>
Index: ftp/proftpd/Makefile
===================================================================
--- ftp/proftpd/Makefile	(revision 317360)
+++ ftp/proftpd/Makefile	(working copy)
@@ -247,10 +247,10 @@
 	@cd ${WRKSRC} && ${MAKE} include/buildstamp.h
 .else
 post-install:
-	@cd  ${PREFIX}/etc/ && ${CP} -n proftpd.conf.sample proftpd.conf
+	@cd  ${PREFIX}/etc/ && ${CP} -n proftpd.conf.sample proftpd.conf || ${TRUE}
 	@${MKDIR} ${LOCALSTATEDIR}/proftpd
-	@cd  ${PREFIX}/etc/proftpd && ${CP} -n dhparams.pem.sample dhparams.pem
-	@cd  ${PREFIX}/etc/proftpd && ${CP} -n blacklist.dat.sample blacklist.dat
+	@cd  ${PREFIX}/etc/proftpd && ${CP} -n dhparams.pem.sample dhparams.pem || ${TRUE}
+	@cd  ${PREFIX}/etc/proftpd && ${CP} -n blacklist.dat.sample blacklist.dat || ${TRUE}
 .if ${PORT_OPTIONS:MDOCS}
 	@${INSTALL} -d ${DOCSDIR}
 	@cd ${WRKSRC} && ${CP} README* RELEASE_NOTES ${DOCSDIR}
Index: games/mangos/Makefile
===================================================================
--- games/mangos/Makefile	(revision 317360)
+++ games/mangos/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	mangos
-# Date created:		15 March 2007
-# Whom:			Artemiy Kropachev <neon_cyrex@mail.ru>
-#
+# Created by: Artemiy Kropachev <neon_cyrex@mail.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	mangos
 PORTVERSION=	5101
@@ -89,7 +85,7 @@
 post-install:
 	@for i in mangosd realmd;do cd ${PREFIX}/etc/&&\
 		${INSTALL_DATA} ${WRKSRC}/src/$$i/$$i.conf $$i.conf.sample&&\
-		${CP} -np $$i.conf.sample $$i.conf;done
+		${CP} -np $$i.conf.sample $$i.conf || ${TRUE} ;done
 .ifdef WITH_SCRIPTDEV2
 	@(cd ${INSTALL_WRKSRC}/src/bindings/ScriptDev2 && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
 .endif
Index: irc/darkbot/Makefile
===================================================================
--- irc/darkbot/Makefile	(revision 317360)
+++ irc/darkbot/Makefile	(working copy)
@@ -35,12 +35,12 @@
 	cd ${WRKSRC}/dat; \
 	for file in *; do \
 	    ${INSTALL_DATA} $$file ${ETCDIR}/dat/$${file}.dist; \
-	    ${CP} -np ${ETCDIR}/dat/$${file}.dist ${ETCDIR}/dat/$$file; \
+	    ${CP} -np ${ETCDIR}/dat/$${file}.dist ${ETCDIR}/dat/$$file || ${TRUE} ; \
 	    ${ECHO_CMD} "@unexec cmp -s ${ETCDIR}/dat/$$file \
 		${ETCDIR}/dat/$${file}.dist && \
 		rm -f ${ETCDIR}/dat/$$file || true" >> ${TMPPLIST}; \
 	    ${ECHO_CMD} "${ETCDIR_REL}/dat/$${file}.dist" >> ${TMPPLIST}; \
-	    ${ECHO_CMD} "@exec cp -np %D/%F %B/$$file" >> ${TMPPLIST}; \
+	    ${ECHO_CMD} "@exec cp -np %D/%F %B/$$file || true" >> ${TMPPLIST}; \
 	done
 	${ECHO_CMD} "@unexec rmdir ${ETCDIR}/logs 2>/dev/null || true" >> ${TMPPLIST}
 	${ECHO_CMD} "@unexec rmdir ${ETCDIR}/dat 2>/dev/null || true" >> ${TMPPLIST}
Index: lang/php5/Makefile
===================================================================
--- lang/php5/Makefile	(revision 317360)
+++ lang/php5/Makefile	(working copy)
@@ -195,7 +195,7 @@
 	@${INSTALL_DATA} ${WRKDIR}/php.conf ${PREFIX}/etc
 	@${TOUCH} ${PREFIX}/include/php/ext/php_config.h
 .if ${PORT_OPTIONS:MFPM}
-	@${CP} -n ${PREFIX}/etc/php-fpm.conf.default ${PREFIX}/etc/php-fpm.conf
+	@${CP} -n ${PREFIX}/etc/php-fpm.conf.default ${PREFIX}/etc/php-fpm.conf || ${TRUE}
 .endif
 .if ${PORT_OPTIONS:MAPACHE}
 	@${CAT} ${PKGMESSAGE}
Index: lang/php52/Makefile
===================================================================
--- lang/php52/Makefile	(revision 317360)
+++ lang/php52/Makefile	(working copy)
@@ -216,7 +216,7 @@
 	@${INSTALL_DATA} ${WRKDIR}/php-fpm.conf.sample ${PREFIX}/etc
 	@${MKDIR} `dirname ${PHP_FPM_PID}`
 	@${MKDIR} `dirname ${PHP_FPM_LOG}`
-	@cd ${PREFIX}/etc && ${CP} -n php-fpm.conf.sample php-fpm.conf
+	@cd ${PREFIX}/etc && ${CP} -n php-fpm.conf.sample php-fpm.conf || ${TRUE}
 .endif
 .if defined(WITH_APACHE)
 	@${CAT} ${PKGMESSAGE}
Index: lang/php53/Makefile
===================================================================
--- lang/php53/Makefile	(revision 317360)
+++ lang/php53/Makefile	(working copy)
@@ -185,7 +185,7 @@
 	@${INSTALL_DATA} ${WRKDIR}/php.conf ${PREFIX}/etc
 	@${TOUCH} ${PREFIX}/include/php/ext/php_config.h
 .if ${PORT_OPTIONS:MFPM}
-	@${CP} -n ${PREFIX}/etc/php-fpm.conf.default ${PREFIX}/etc/php-fpm.conf
+	@${CP} -n ${PREFIX}/etc/php-fpm.conf.default ${PREFIX}/etc/php-fpm.conf || echo "File exists"
 .endif
 .if ${PORT_OPTIONS:MAPACHE}
 	@${CAT} ${PKGMESSAGE}
Index: mail/postfixadmin/Makefile
===================================================================
--- mail/postfixadmin/Makefile	(revision 317360)
+++ mail/postfixadmin/Makefile	(working copy)
@@ -60,7 +60,7 @@
 	(cd ${WRKSRC}/ && \
 	${COPYTREE_SHARE} \*.php ${PREFIX}/www/postfixadmin "! -name config.inc.php")
 	@${CP} ${WRKSRC}/config.inc.php ${PREFIX}/www/postfixadmin/config.inc.php.sample
-	@${CP} -n ${WRKSRC}/config.inc.php ${PREFIX}/www/postfixadmin/config.inc.php
+	@${CP} -n ${WRKSRC}/config.inc.php ${PREFIX}/www/postfixadmin/config.inc.php || ${TRUE}
 	@${INSTALL_DATA} ${WRKSRC}/*.txt ${PREFIX}/www/postfixadmin
 	@${INSTALL_DATA} ${WRKSRC}/*.TXT ${PREFIX}/www/postfixadmin
 	@${INSTALL_DATA} ${WRKSRC}/css/* ${PREFIX}/www/postfixadmin/css
Index: net-im/jggtrans/Makefile
===================================================================
--- net-im/jggtrans/Makefile	(revision 317360)
+++ net-im/jggtrans/Makefile	(working copy)
@@ -1,7 +1,4 @@
-# Ports collection makefile for:	jggtrans
-# Date created:				13 September 2006
-# Whom:					Bartek Rutkowski <r@robakdesign.com>
-#
+# Created by: Bartek Rutkowski <r@robakdesign.com>
 # $FreeBSD$
 
 PORTNAME=		jggtrans
@@ -49,7 +46,7 @@
 
 post-install:
 	@${INSTALL_DATA} ${WRKSRC}/jggtrans.xml ${PREFIX}/etc/jggtrans.xml.sample
-	@${CP} -n ${WRKSRC}/jggtrans.xml ${PREFIX}/etc/jggtrans.xml
+	@${CP} -n ${WRKSRC}/jggtrans.xml ${PREFIX}/etc/jggtrans.xml || ${TRUE}
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
Index: net-mgmt/xymon-client/Makefile
===================================================================
--- net-mgmt/xymon-client/Makefile	(revision 317360)
+++ net-mgmt/xymon-client/Makefile	(working copy)
@@ -35,7 +35,7 @@
 post-install:
 .for i in ${CONFIG_FILES}
 	${CP} -np ${WWWDIR}/client/etc/${i}.DIST \
-		${WWWDIR}/client/etc/${i}
+		${WWWDIR}/client/etc/${i} || ${TRUE}
 .endfor
 
 .include <bsd.port.mk>
Index: net-mgmt/xymon-server/Makefile
===================================================================
--- net-mgmt/xymon-server/Makefile	(revision 317360)
+++ net-mgmt/xymon-server/Makefile	(working copy)
@@ -101,7 +101,7 @@
 .endfor
 .for i in ${CONFIG_FILES}
 	${CP} -np ${WWWDIR}/server/etc/${i}.DIST \
-		${WWWDIR}/server/etc/${i}
+		${WWWDIR}/server/etc/${i} || ${TRUE}
 .endfor
 
 .include <bsd.port.mk>
Index: net/relayd/Makefile
===================================================================
--- net/relayd/Makefile	(revision 317360)
+++ net/relayd/Makefile	(working copy)
@@ -58,6 +58,6 @@
 	@${INSTALL_DATA} ${WRKSRC}/../etc/relayd.conf \
 		${PREFIX}/etc/relayd.conf.sample
 	@${CP} -n ${PREFIX}/etc/relayd.conf.sample \
-		${PREFIX}/etc/relayd.conf
+		${PREFIX}/etc/relayd.conf || ${TRUE}
 
 .include <bsd.port.post.mk>
Index: net/ushare/Makefile
===================================================================
--- net/ushare/Makefile	(revision 317360)
+++ net/ushare/Makefile	(working copy)
@@ -42,6 +42,6 @@
 
 post-install:
 	${CP} -np ${PREFIX}/etc/${PORTNAME}.conf.sample \
-		${PREFIX}/etc/${PORTNAME}.conf
+		${PREFIX}/etc/${PORTNAME}.conf || ${TRUE}
 
 .include <bsd.port.mk>
Index: security/sancp/Makefile
===================================================================
--- security/sancp/Makefile	(revision 317360)
+++ security/sancp/Makefile	(working copy)
@@ -31,7 +31,7 @@
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/sancp ${PREFIX}/bin
 	@${INSTALL_DATA} ${WRKSRC}/etc/sancp/sancp.conf ${PREFIX}/etc/sancp.conf-dist
-	@${CP} -n ${PREFIX}/etc/sancp.conf-dist ${PREFIX}/etc/sancp.conf
+	@${CP} -n ${PREFIX}/etc/sancp.conf-dist ${PREFIX}/etc/sancp.conf || ${TRUE}
 
 .if !defined(NOPORTDOCS)
 	@${INSTALL} -d ${DOCSDIR}/
Index: textproc/pootle/Makefile
===================================================================
--- textproc/pootle/Makefile	(revision 317360)
+++ textproc/pootle/Makefile	(working copy)
@@ -94,7 +94,7 @@
 post-install:
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${CP} -n ${PREFIX}/etc/pootle/localsettings.py.sample \
-		${PREFIX}/etc/pootle/localsettings.py
+		${PREFIX}/etc/pootle/localsettings.py || ${TRUE}
 
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
Index: www/c-icap-modules/Makefile
===================================================================
--- www/c-icap-modules/Makefile	(revision 317360)
+++ www/c-icap-modules/Makefile	(working copy)
@@ -33,8 +33,8 @@
 
 post-install:
 	@${CP} -np ${PREFIX}/etc/c-icap/srv_url_check.conf.default \
-		${PREFIX}/etc/c-icap/srv_url_check.conf
+		${PREFIX}/etc/c-icap/srv_url_check.conf || ${TRUE}
 	@${CP} -np ${PREFIX}/etc/c-icap/virus_scan.conf.default \
-		${PREFIX}/etc/c-icap/virus_scan.conf
+		${PREFIX}/etc/c-icap/virus_scan.conf || ${TRUE}
 
 .include <bsd.port.mk>
Index: www/c-icap/Makefile
===================================================================
--- www/c-icap/Makefile	(revision 317360)
+++ www/c-icap/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	c-icap
-# Date created:				30 January 2006
-# Whom:					Elisey Savateev <b3k@mail.ru>
-#
+# Created by: Elisey Savateev <b3k@mail.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	c-icap
 PORTVERSION=	0.2.3
@@ -122,9 +118,9 @@
 
 post-install:
 	@${CP} -np ${PREFIX}/etc/c-icap/c-icap.conf.default \
-		${PREFIX}/etc/c-icap/c-icap.conf
+		${PREFIX}/etc/c-icap/c-icap.conf || ${TRUE}
 	@${CP} -np ${PREFIX}/etc/c-icap/c-icap.magic.default \
-		${PREFIX}/etc/c-icap/c-icap.magic
+		${PREFIX}/etc/c-icap/c-icap.magic || ${TRUE}
 	@${SH} ${PKGINSTALL} ${PREFIX} POST-INSTALL
 
 .include <bsd.port.post.mk>
Index: x11/xdm/Makefile
===================================================================
--- x11/xdm/Makefile	(revision 317360)
+++ x11/xdm/Makefile	(working copy)
@@ -49,7 +49,7 @@
 
 post-install:
 .for f in ${CFFILES}
-	${CP} -n ${EXAMPLESDIR}/$f ${PREFIX}/lib/X11/xdm/$f
+	${CP} -n ${EXAMPLESDIR}/$f ${PREFIX}/lib/X11/xdm/$f || ${TRUE}
 .endfor
 	${MKDIR} /var/lib/xdm/authdir
 	${LN} -sf /var/lib/xdm/authdir ${PREFIX}/lib/X11/xdm/authdir