[Midnightbsd-cvs] mports [19260] trunk/Mk/bsd.mport.mk: switch to @dir

[laffer1 at midnightbsd.org]

Revision: 19260
          http://svnweb.midnightbsd.org/mports/?rev=19260
Author:   laffer1
Date:     2015-05-30 16:32:35 -0400 (Sat, 30 May 2015)
Log Message:
-----------
switch to @dir

Modified Paths:
--------------
    trunk/Mk/bsd.mport.mk

Modified: trunk/Mk/bsd.mport.mk
===================================================================
--- trunk/Mk/bsd.mport.mk	2015-05-30 20:27:14 UTC (rev 19259)
+++ trunk/Mk/bsd.mport.mk	2015-05-30 20:32:35 UTC (rev 19260)
@@ -3797,7 +3797,7 @@
 .	endfor
  
 .	for dir in ${PLIST_DIRS}
-		@${ECHO_CMD} ${dir} | ${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} | ${SED} -e 's,^, at dirrm ,' >> ${TMPPLIST}
+		@${ECHO_CMD} ${dir} | ${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} | ${SED} -e 's,^, at dir ,' >> ${TMPPLIST}
 .	endfor
 
 .	if defined(USE_LDCONFIG)
@@ -3822,7 +3822,7 @@
 .endif 
 
 ${TMPPLIST}:
-	@cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} generate-plist
+	@cd ${.CURDIR} && ${MAKE} generate-plist
 
 .if !target(add-plist-docs)
 add-plist-docs:
@@ -3842,8 +3842,8 @@
 		@${FIND} -P ${FAKE_DESTDIR}${PORTDOCS:S/^/${DOCSDIR}\//} ! -type d 2>/dev/null | \
 			${SED} -ne 's,^${FAKE_DESTDIR}${PREFIX}/,,p' >> ${TMPPLIST}
 		@${FIND} -P -d ${FAKE_DESTDIR}${PORTDOCS:S/^/${DOCSDIR}\//} -type d 2>/dev/null | \
-			${SED} -ne 's,^${FAKE_DESTDIR}${PREFIX}/, at dirrm ,p' >> ${TMPPLIST}
-		@${ECHO_CMD} "@dirrm ${DOCSDIR:S,^${PREFIX}/,,}" >> ${TMPPLIST}
+			${SED} -ne 's,^${FAKE_DESTDIR}${PREFIX}/, at dir ,p' >> ${TMPPLIST}
+		@${ECHO_CMD} "@dir ${DOCSDIR:S,^${PREFIX}/,,}" >> ${TMPPLIST}
 .	else
 		@${DO_NADA}
 .	endif
@@ -3860,7 +3860,7 @@
 	@${ECHO_CMD} "@exec install-info --quiet %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \
 		>> ${TMPPLIST}
 	@if [ "`${DIRNAME} $i`" != "." ]; then \
-		${ECHO_CMD} "@dirrmtry info/`${DIRNAME} $i`" >> ${TMPPLIST}; \
+		${ECHO_CMD} "@dir info/`${DIRNAME} $i`" >> ${TMPPLIST}; \
 	fi
 .endfor
 .if defined(INFO_SUBDIR)
@@ -3871,7 +3871,7 @@
 		 | grep -q '^[*] '; then true; else rm %D/${INFO_PATH}/dir; fi; fi" >> ${TMPPLIST}
 
 .if (${PREFIX} != ${LOCALBASE_REL} && ${PREFIX} != ${LINUXBASE_REL})
-	@${ECHO_CMD} "@dirrmtry rmdir info/" >> ${TMPPLIST}
+	@${ECHO_CMD} "@dir rmdir info/" >> ${TMPPLIST}
 .endif
 
 .endif