23 files changed, 13 insertions, 28 deletions

diff --git a/editors/ooodict-all/Makefile b/editors/ooodict-all/Makefile
index 327698a01211..c9aa61224ee0 100644
--- a/editors/ooodict-all/Makefile
+++ b/editors/ooodict-all/Makefile
@@ -33,7 +33,6 @@ HYPHDIST?=	hyph_cs_CZ.zip hyph_da_DK.zip hyph_de_DE.zip \
 		hyph_sk_SK.zip hyph_sl_SI.zip hyph_uk_UA.zip
 .endif
 
-SORT?=	/usr/bin/sort
 CUT?=	/usr/bin/cut
 
 .include <bsd.port.pre.mk>
diff --git a/editors/openoffice-1.0/Makefile b/editors/openoffice-1.0/Makefile
index 7075b8bba12d..6e02d344ac9e 100644
--- a/editors/openoffice-1.0/Makefile
+++ b/editors/openoffice-1.0/Makefile
@@ -25,7 +25,6 @@ DISTFILES+=	OOo_${PORTVERSION}_source.tar.bz2 \
 DISTFILES+=	${L10NHELP:S/$/:help/}
 .endif
 
-SORT?=	/usr/bin/sort
 FIND?=	/usr/bin/find
 CUT?=	/usr/bin/cut
 AWK?=	/usr/bin/awk
diff --git a/editors/openoffice-1.1-devel/Makefile b/editors/openoffice-1.1-devel/Makefile
index edbb16b713f3..25333d21fe30 100644
--- a/editors/openoffice-1.1-devel/Makefile
+++ b/editors/openoffice-1.1-devel/Makefile
@@ -24,7 +24,6 @@ DISTFILES+=	OOo_${PORTVERSION}_source.tar.bz2 gpc231.tar.Z:gpc \
 DISTFILES+=	${L10NHELP:S/$/:help/}
 .endif
 
-SORT?=	/usr/bin/sort
 FIND?=	/usr/bin/find
 CUT?=	/usr/bin/cut
 AWK?=	/usr/bin/awk
diff --git a/editors/openoffice-1.1/Makefile b/editors/openoffice-1.1/Makefile
index edbb16b713f3..25333d21fe30 100644
--- a/editors/openoffice-1.1/Makefile
+++ b/editors/openoffice-1.1/Makefile
@@ -24,7 +24,6 @@ DISTFILES+=	OOo_${PORTVERSION}_source.tar.bz2 gpc231.tar.Z:gpc \
 DISTFILES+=	${L10NHELP:S/$/:help/}
 .endif
 
-SORT?=	/usr/bin/sort
 FIND?=	/usr/bin/find
 CUT?=	/usr/bin/cut
 AWK?=	/usr/bin/awk
diff --git a/editors/openoffice-2.0-devel/Makefile b/editors/openoffice-2.0-devel/Makefile
index 9e9f4e0bb38f..18f56b523e91 100644
--- a/editors/openoffice-2.0-devel/Makefile
+++ b/editors/openoffice-2.0-devel/Makefile
@@ -24,7 +24,6 @@ DISTFILES+=	cws_src680_ooo20031216_20031208.tar.bz2 gpc231.tar.Z:gpc \
 DISTFILES+=	${L10NHELP:S/$/:help/}
 .endif
 
-SORT?=	/usr/bin/sort
 FIND?=	/usr/bin/find
 CUT?=	/usr/bin/cut
 AWK?=	/usr/bin/awk
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 9e9f4e0bb38f..18f56b523e91 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -24,7 +24,6 @@ DISTFILES+=	cws_src680_ooo20031216_20031208.tar.bz2 gpc231.tar.Z:gpc \
 DISTFILES+=	${L10NHELP:S/$/:help/}
 .endif
 
-SORT?=	/usr/bin/sort
 FIND?=	/usr/bin/find
 CUT?=	/usr/bin/cut
 AWK?=	/usr/bin/awk
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index 9e9f4e0bb38f..18f56b523e91 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -24,7 +24,6 @@ DISTFILES+=	cws_src680_ooo20031216_20031208.tar.bz2 gpc231.tar.Z:gpc \
 DISTFILES+=	${L10NHELP:S/$/:help/}
 .endif
 
-SORT?=	/usr/bin/sort
 FIND?=	/usr/bin/find
 CUT?=	/usr/bin/cut
 AWK?=	/usr/bin/awk
diff --git a/editors/openoffice.org-1.0/Makefile b/editors/openoffice.org-1.0/Makefile
index 7075b8bba12d..6e02d344ac9e 100644
--- a/editors/openoffice.org-1.0/Makefile
+++ b/editors/openoffice.org-1.0/Makefile
@@ -25,7 +25,6 @@ DISTFILES+=	OOo_${PORTVERSION}_source.tar.bz2 \
 DISTFILES+=	${L10NHELP:S/$/:help/}
 .endif
 
-SORT?=	/usr/bin/sort
 FIND?=	/usr/bin/find
 CUT?=	/usr/bin/cut
 AWK?=	/usr/bin/awk
diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile
index edbb16b713f3..25333d21fe30 100644
--- a/editors/openoffice.org-1.1-devel/Makefile
+++ b/editors/openoffice.org-1.1-devel/Makefile
@@ -24,7 +24,6 @@ DISTFILES+=	OOo_${PORTVERSION}_source.tar.bz2 gpc231.tar.Z:gpc \
 DISTFILES+=	${L10NHELP:S/$/:help/}
 .endif
 
-SORT?=	/usr/bin/sort
 FIND?=	/usr/bin/find
 CUT?=	/usr/bin/cut
 AWK?=	/usr/bin/awk
diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile
index edbb16b713f3..25333d21fe30 100644
--- a/editors/openoffice.org-1.1/Makefile
+++ b/editors/openoffice.org-1.1/Makefile
@@ -24,7 +24,6 @@ DISTFILES+=	OOo_${PORTVERSION}_source.tar.bz2 gpc231.tar.Z:gpc \
 DISTFILES+=	${L10NHELP:S/$/:help/}
 .endif
 
-SORT?=	/usr/bin/sort
 FIND?=	/usr/bin/find
 CUT?=	/usr/bin/cut
 AWK?=	/usr/bin/awk
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index 9e9f4e0bb38f..18f56b523e91 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -24,7 +24,6 @@ DISTFILES+=	cws_src680_ooo20031216_20031208.tar.bz2 gpc231.tar.Z:gpc \
 DISTFILES+=	${L10NHELP:S/$/:help/}
 .endif
 
-SORT?=	/usr/bin/sort
 FIND?=	/usr/bin/find
 CUT?=	/usr/bin/cut
 AWK?=	/usr/bin/awk
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index 9e9f4e0bb38f..18f56b523e91 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -24,7 +24,6 @@ DISTFILES+=	cws_src680_ooo20031216_20031208.tar.bz2 gpc231.tar.Z:gpc \
 DISTFILES+=	${L10NHELP:S/$/:help/}
 .endif
 
-SORT?=	/usr/bin/sort
 FIND?=	/usr/bin/find
 CUT?=	/usr/bin/cut
 AWK?=	/usr/bin/awk
diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile
index 9e9f4e0bb38f..18f56b523e91 100644
--- a/editors/openoffice.org-2.0-devel/Makefile
+++ b/editors/openoffice.org-2.0-devel/Makefile
@@ -24,7 +24,6 @@ DISTFILES+=	cws_src680_ooo20031216_20031208.tar.bz2 gpc231.tar.Z:gpc \
 DISTFILES+=	${L10NHELP:S/$/:help/}
 .endif
 
-SORT?=	/usr/bin/sort
 FIND?=	/usr/bin/find
 CUT?=	/usr/bin/cut
 AWK?=	/usr/bin/awk
diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile
index 9e9f4e0bb38f..18f56b523e91 100644
--- a/editors/openoffice.org-2.0/Makefile
+++ b/editors/openoffice.org-2.0/Makefile
@@ -24,7 +24,6 @@ DISTFILES+=	cws_src680_ooo20031216_20031208.tar.bz2 gpc231.tar.Z:gpc \
 DISTFILES+=	${L10NHELP:S/$/:help/}
 .endif
 
-SORT?=	/usr/bin/sort
 FIND?=	/usr/bin/find
 CUT?=	/usr/bin/cut
 AWK?=	/usr/bin/awk
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
index 9e9f4e0bb38f..18f56b523e91 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -24,7 +24,6 @@ DISTFILES+=	cws_src680_ooo20031216_20031208.tar.bz2 gpc231.tar.Z:gpc \
 DISTFILES+=	${L10NHELP:S/$/:help/}
 .endif
 
-SORT?=	/usr/bin/sort
 FIND?=	/usr/bin/find
 CUT?=	/usr/bin/cut
 AWK?=	/usr/bin/awk
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index 9e9f4e0bb38f..18f56b523e91 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -24,7 +24,6 @@ DISTFILES+=	cws_src680_ooo20031216_20031208.tar.bz2 gpc231.tar.Z:gpc \
 DISTFILES+=	${L10NHELP:S/$/:help/}
 .endif
 
-SORT?=	/usr/bin/sort
 FIND?=	/usr/bin/find
 CUT?=	/usr/bin/cut
 AWK?=	/usr/bin/awk
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 9e9f4e0bb38f..18f56b523e91 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -24,7 +24,6 @@ DISTFILES+=	cws_src680_ooo20031216_20031208.tar.bz2 gpc231.tar.Z:gpc \
 DISTFILES+=	${L10NHELP:S/$/:help/}
 .endif
 
-SORT?=	/usr/bin/sort
 FIND?=	/usr/bin/find
 CUT?=	/usr/bin/cut
 AWK?=	/usr/bin/awk
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index 9e9f4e0bb38f..18f56b523e91 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -24,7 +24,6 @@ DISTFILES+=	cws_src680_ooo20031216_20031208.tar.bz2 gpc231.tar.Z:gpc \
 DISTFILES+=	${L10NHELP:S/$/:help/}
 .endif
 
-SORT?=	/usr/bin/sort
 FIND?=	/usr/bin/find
 CUT?=	/usr/bin/cut
 AWK?=	/usr/bin/awk
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index 9e9f4e0bb38f..18f56b523e91 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -24,7 +24,6 @@ DISTFILES+=	cws_src680_ooo20031216_20031208.tar.bz2 gpc231.tar.Z:gpc \
 DISTFILES+=	${L10NHELP:S/$/:help/}
 .endif
 
-SORT?=	/usr/bin/sort
 FIND?=	/usr/bin/find
 CUT?=	/usr/bin/cut
 AWK?=	/usr/bin/awk
diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index e247875cea26..20000b4fad47 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -158,11 +158,11 @@ post-install:
 	${INSTALL_DATA} ${FILESDIR}/vietnamese_viscii.vim ${DATADIR}/keymap
 	cd ${PREFIX} ;\
 	    ${FIND} share/vim/${_DATADIR} -type f -o -type l	\
-	    	| sort						\
+	    	| ${SORT}					\
 	    	>${WRKDIR}/PLIST.share-vim
 	cd ${PREFIX} ;\
-	    ${FIND} share/vim/${_DATADIR} -type d	\
-	    	| sort -r | ${SED} -e 's/^/@dirrm /g'	\
+	    ${FIND} share/vim/${_DATADIR} -type d		\
+	    	| ${SORT} -r | ${SED} -e 's/^/@dirrm /g'	\
 		>>${WRKDIR}/PLIST.share-vim
 	${ECHO_CMD} "r ${TMPPLIST}"			> ${WRKDIR}/ex.script
 	${ECHO_CMD} "/Insert PLIST.share-vim"		>> ${WRKDIR}/ex.script
diff --git a/editors/vim5/Makefile b/editors/vim5/Makefile
index 05efd179eac1..dd1e01e4eee4 100644
--- a/editors/vim5/Makefile
+++ b/editors/vim5/Makefile
@@ -96,11 +96,11 @@ post-install:
 	${TEST} -e ${PREFIX}/bin/rgview || (cd ${PREFIX}/bin ; ${LN} -s vim rgview)
 	cd ${PREFIX} ;\
 	    ${FIND} share/vim/${DISTNAME:S/-//:S/.//}/ -type f -o -type l	\
-	    	| sort \
+	    	| ${SORT} \
 	    	>${WRKDIR}/PLIST.share-vim
 	cd ${PREFIX} ;\
 	    ${FIND} share/vim/${DISTNAME:S/-//:S/.//}/ -type d \
-	    	| sort -r | ${SED} -e 's/^/@dirrm /g' \
+	    	| ${SORT} -r | ${SED} -e 's/^/@dirrm /g' \
 		>>${WRKDIR}/PLIST.share-vim
 	${ECHO_CMD} "r ${TMPPLIST}"			> ${WRKDIR}/ex.script
 	${ECHO_CMD} "/Insert PLIST.share-vim"		>> ${WRKDIR}/ex.script
diff --git a/editors/xemacs-mule-packages/Makefile b/editors/xemacs-mule-packages/Makefile
index f0d1ba3dc1b4..b58db5b63664 100644
--- a/editors/xemacs-mule-packages/Makefile
+++ b/editors/xemacs-mule-packages/Makefile
@@ -44,8 +44,10 @@ do-install:
 
 post-install:
 	@cd ${WRKDIR} && \
-	${FIND} ${PACKAGES_SUBDIR} -type f|sort|${SED} 's:^:lib/xemacs/:' >> ${TMPPLIST}; \
-	${FIND} ${PACKAGES_SUBDIR}/*/* -type d|sort -r|${SED} 's:^:@dirrm lib/xemacs/:'>> ${TMPPLIST}
+	${FIND} ${PACKAGES_SUBDIR} -type f|${SORT}| \
+		${SED} 's:^:lib/xemacs/:' >> ${TMPPLIST}; \
+	${FIND} ${PACKAGES_SUBDIR}/*/* -type d|${SORT} -r| \
+		${SED} 's:^:@dirrm lib/xemacs/:'>> ${TMPPLIST}
 	@${ECHO_CMD} '@unexec rmdir %D/lib/xemacs/${PACKAGES_SUBDIR}/* 2>/dev/null || true' >> ${TMPPLIST}
 	@${ECHO_CMD} '@unexec rmdir %D/lib/xemacs/${PACKAGES_SUBDIR} 2>/dev/null || true' >> ${TMPPLIST}
 	@${ECHO_CMD} '@unexec rmdir %D/lib/xemacs 2>/dev/null || true' >> ${TMPPLIST}
diff --git a/editors/xemacs-packages/Makefile b/editors/xemacs-packages/Makefile
index 1a66faf4212d..663aa9338c85 100644
--- a/editors/xemacs-packages/Makefile
+++ b/editors/xemacs-packages/Makefile
@@ -144,8 +144,10 @@ do-install:
 
 post-install:
 	@cd ${WRKDIR} && \
-	${FIND} ${PACKAGES_SUBDIR} -type f|sort|${SED} 's:^:lib/xemacs/:' >> ${TMPPLIST}; \
-	${FIND} ${PACKAGES_SUBDIR}/*/* -type d|sort -r|${SED} 's:^:@dirrm lib/xemacs/:'>> ${TMPPLIST}
+	${FIND} ${PACKAGES_SUBDIR} -type f|${SORT}| \
+		${SED} 's:^:lib/xemacs/:' >> ${TMPPLIST}; \
+	${FIND} ${PACKAGES_SUBDIR}/*/* -type d|${SORT} -r| \
+		${SED} 's:^:@dirrm lib/xemacs/:'>> ${TMPPLIST}
 	@${ECHO_CMD} '@unexec rmdir %D/lib/xemacs/${PACKAGES_SUBDIR}/* 2>/dev/null || true' >> ${TMPPLIST}
 	@${ECHO_CMD} '@unexec rmdir %D/lib/xemacs/${PACKAGES_SUBDIR} 2>/dev/null || true' >> ${TMPPLIST}
 	@${ECHO_CMD} '@unexec rmdir %D/lib/xemacs 2>/dev/null || true' >> ${TMPPLIST}