svn commit: r368809 - head/Mk

[Baptiste Daroussin]

Author: bapt
Date: Mon Sep 22 06:30:46 2014
New Revision: 368809
URL: http://svnweb.freebsd.org/changeset/ports/368809
QAT: https://qat.redports.org/buildarchive/r368809/

Log:
  PLIST_DIRS and PLIST_DIRSTRY are now equivalent and both emitting @dir entries
  (Note that PLIST_DIRSTRY) is now deprecated

Modified:
  head/Mk/bsd.port.mk

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Mon Sep 22 06:28:15 2014	(r368808)
+++ head/Mk/bsd.port.mk	Mon Sep 22 06:30:46 2014	(r368809)
@@ -5116,11 +5116,8 @@ generate-plist: ${WRKDIR}
 		${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${PLIST} >> ${TMPPLIST}; \
 	fi
 
-.for dir in ${PLIST_DIRS}
-	@${ECHO_CMD} ${dir} | ${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} -e 's,^, at dirrm ,' >> ${TMPPLIST}
-.endfor
-.for dir in ${PLIST_DIRSTRY}
-	@${ECHO_CMD} ${dir} | ${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} -e 's,^, at dirrmtry ,' >> ${TMPPLIST}
+.for dir in ${PLIST_DIRS} ${PLIST_DIRSTRY}
+	@${ECHO_CMD} ${dir} | ${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} -e 's,^, at dir ,' >> ${TMPPLIST}
 .endfor
 
 .if defined(USE_LINUX_PREFIX)