diff options
106 files changed, 108 insertions, 144 deletions
diff --git a/audio/mbrolavox/Makefile b/audio/mbrolavox/Makefile index 1df441197a52..6b5d531a3fe0 100644 --- a/audio/mbrolavox/Makefile +++ b/audio/mbrolavox/Makefile @@ -57,7 +57,7 @@ do-patch: pre-install: @${RM} -f ${PLIST} @cd ${WRKSRC}; \ - for ii in `${FIND} * \! -type d | sort`; do \ + for ii in `${FIND} * \! -type d | ${SORT}`; do \ ${ECHO_CMD} share/mbrolavox/$${ii} >> ${PLIST}; \ done ; \ for ii in `${FIND} -d * -type d`; do \ diff --git a/databases/pydbdesigner/Makefile b/databases/pydbdesigner/Makefile index 22d9b9daf88d..97e147965f9a 100644 --- a/databases/pydbdesigner/Makefile +++ b/databases/pydbdesigner/Makefile @@ -46,9 +46,9 @@ post-patch: do-build: cd ${WRKSRC};\ ${ECHO_CMD} bin/${PORTNAME} >${PLIST};\ - ${FIND} . ! -type d | cut -c3- | sort \ + ${FIND} . ! -type d | cut -c3- | ${SORT} \ | ${SED} -e "s|^|${MY_SITELIBSUBDIR}/|" >>${PLIST};\ - ${FIND} . -type d | cut -c3- | sort -r \ + ${FIND} . -type d | cut -c3- | ${SORT} -r \ | ${SED} -e "s|^|@dirrm ${MY_SITELIBSUBDIR}/|" >>${PLIST} do-install: diff --git a/devel/ace+tao-doc/Makefile b/devel/ace+tao-doc/Makefile index 2a375b08b4c7..d0de143644ba 100644 --- a/devel/ace+tao-doc/Makefile +++ b/devel/ace+tao-doc/Makefile @@ -36,7 +36,7 @@ pre-install: n=`${ECHO_CMD} $${f}|${SED} -e 's#^./##'`; \ ${ECHO_CMD} ${INSTALL_DIR}/$${n} >> ${PLIST}; \ done; \ - sort -r ${DIRLIST} >> ${PLIST} + ${SORT} -r ${DIRLIST} >> ${PLIST} do-install: @${ECHO_MSG} "--> Installing files:"; \ diff --git a/devel/cc65/Makefile b/devel/cc65/Makefile index 5feb28e7d0f9..4ff18e2cd910 100644 --- a/devel/cc65/Makefile +++ b/devel/cc65/Makefile @@ -89,7 +89,7 @@ do-install: plist: @${FIND} ${WRKSRC}/samples -not -type d | \ ${SED} -E -e 's/^.*cc65.*\/samples/%%PORTDOCS%%share\/doc\/cc65\/samples/' - @${FIND} ${WRKSRC}/samples -type d | sort -r | \ + @${FIND} ${WRKSRC}/samples -type d | ${SORT} -r | \ ${SED} -E -e 's/^.*cc65.*\/samples/%%PORTDOCS%%@dirrm share\/doc\/cc65\/samples/' .for filename in ${DOCFILES} @${ECHO_CMD} %%PORTDOCS%%share/doc/cc65/`${BASENAME} ${filename}` @@ -106,7 +106,7 @@ plist: .endfor @${FIND} ${WRKSRC}/include -not -type d | \ ${SED} -E -e 's/^.*cc65.*\/include/lib\/cc65\/include/' - @${FIND} ${WRKSRC}/include -type d | sort -r | \ + @${FIND} ${WRKSRC}/include -type d | ${SORT} -r | \ ${SED} -E -e 's/^.*cc65.*\/include/@dirrm lib\/cc65\/include/' .for filename in ${CC65LIBFILES} @${ECHO_CMD} lib/cc65/lib/`${BASENAME} ${filename}` diff --git a/devel/cscout/Makefile b/devel/cscout/Makefile index 7e5113fdaa23..3048ddcc1b42 100644 --- a/devel/cscout/Makefile +++ b/devel/cscout/Makefile @@ -23,7 +23,6 @@ USE_REINPLACE= yes MAN1= cscout.1 cswc.1 CPIO= /usr/bin/cpio -SORT= /usr/bin/sort post-patch: .if exists(/usr/include/g++/) diff --git a/devel/invitation_to_ruby/Makefile b/devel/invitation_to_ruby/Makefile index 286e3318f552..0864e20ed515 100644 --- a/devel/invitation_to_ruby/Makefile +++ b/devel/invitation_to_ruby/Makefile @@ -29,7 +29,6 @@ NO_BUILD= yes PLIST= ${WRKDIR}/plist CPIO?= /usr/bin/cpio -SORT?= /usr/bin/sort .include <bsd.port.pre.mk> diff --git a/devel/pear-PEAR/Makefile.common b/devel/pear-PEAR/Makefile.common index 30c7bf2bb01c..d07d4a670464 100644 --- a/devel/pear-PEAR/Makefile.common +++ b/devel/pear-PEAR/Makefile.common @@ -83,7 +83,6 @@ pre-install: .endif DIRFILTER= ${SED} -En '\:^.*/[^/]*$$:s:^(.+)/[^/]*$$:\1:p' | ${SORT} -ru -SORT?= /usr/bin/sort .if !defined(USE_PHPIZE) do-generate-plist: 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} diff --git a/finance/myphpmoney/Makefile b/finance/myphpmoney/Makefile index d6bc6baa9c20..caf6d46208bb 100644 --- a/finance/myphpmoney/Makefile +++ b/finance/myphpmoney/Makefile @@ -30,9 +30,9 @@ PLIST_SUB+= INSTALLDIR=${INSTALLDIR:S,^${PREFIX}/,,} post-patch: ${RM} -f ${PLIST} cd ${WRKSRC};\ - ${FIND} . ! -type d | sort | ${SED} "s|^.|%%INSTALLDIR%%|"\ + ${FIND} . ! -type d | ${SORT} | ${SED} "s|^.|%%INSTALLDIR%%|"\ >${PLIST};\ - ${FIND} . -type d | sort -r | ${SED} "s|^.|@dirrm %%INSTALLDIR%%|"\ + ${FIND} . -type d | ${SORT} -r | ${SED} "s|^.|@dirrm %%INSTALLDIR%%|"\ >>${PLIST} do-install: diff --git a/ftp/sftp/Makefile b/ftp/sftp/Makefile index cc92dbc7cf82..fd74b25a2719 100644 --- a/ftp/sftp/Makefile +++ b/ftp/sftp/Makefile @@ -32,7 +32,7 @@ pre-install: ${ECHO_CMD} bin/sftp >> ${PLIST}.unsorted; \ ${ECHO_CMD} man/man1/sftp.1.gz >> ${PLIST}.unsorted; \ fi - @sort -u ${PLIST}.unsorted > ${PLIST} + @${SORT} -u ${PLIST}.unsorted > ${PLIST} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/sftp ${PREFIX}/bin/secftp diff --git a/games/halflifeserver/Makefile b/games/halflifeserver/Makefile index 61ae12020280..1257cc7d2080 100644 --- a/games/halflifeserver/Makefile +++ b/games/halflifeserver/Makefile @@ -28,7 +28,6 @@ INSTALL_DIR= ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755 LDCONFIG_LINUX= ${LINUXBASE}/sbin/ldconfig HLDSDIR= /usr/games/hlds_l/ -SORT?= /usr/bin/sort # files which should be installed with executables perms EXECUTABLES= hltv hlds hlds_run hlds_amd hlds_i486 hlds_i686 diff --git a/games/hlserver-cs/Makefile b/games/hlserver-cs/Makefile index efed0fa778b3..97be1a8db4f2 100644 --- a/games/hlserver-cs/Makefile +++ b/games/hlserver-cs/Makefile @@ -38,7 +38,6 @@ WRKSRC?= ${WRKDIR}/${PORTNAME} PLIST_SUB+= ${PLIST_SUB_MASTER} INSTALL_DIR= ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755 -SORT?= /usr/bin/sort HALFLIFESERVER_PORT= ${.CURDIR}/../halflifeserver HLDSDIR!= cd ${HALFLIFESERVER_PORT} && ${MAKE} -V HLDSDIR diff --git a/games/q3server-ra3/Makefile b/games/q3server-ra3/Makefile index aa2b86884a56..fba662cc6309 100644 --- a/games/q3server-ra3/Makefile +++ b/games/q3server-ra3/Makefile @@ -46,7 +46,6 @@ Q3DIR= usr/games/quake3/${Q3SUBDIR}/ PLIST_SUB+= Q3DIR="${Q3DIR}" INSTALL_DIR= ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755 -SORT?= /usr/bin/sort Q3SERVER_PORT= ${.CURDIR}/../q3server PKGMESSAGE!= cd ${Q3SERVER_PORT} && ${MAKE} -V PKGMESSAGE diff --git a/games/quake3-ra3/Makefile b/games/quake3-ra3/Makefile index aa2b86884a56..fba662cc6309 100644 --- a/games/quake3-ra3/Makefile +++ b/games/quake3-ra3/Makefile @@ -46,7 +46,6 @@ Q3DIR= usr/games/quake3/${Q3SUBDIR}/ PLIST_SUB+= Q3DIR="${Q3DIR}" INSTALL_DIR= ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755 -SORT?= /usr/bin/sort Q3SERVER_PORT= ${.CURDIR}/../q3server PKGMESSAGE!= cd ${Q3SERVER_PORT} && ${MAKE} -V PKGMESSAGE diff --git a/games/utserver-to/Makefile b/games/utserver-to/Makefile index c4ea2e4ac12b..ba83ffa1f7f7 100644 --- a/games/utserver-to/Makefile +++ b/games/utserver-to/Makefile @@ -48,7 +48,6 @@ STRIP= UTDIR= usr/games/ut-server/ PLIST_SUB+= UTDIR="${UTDIR}" INSTALL_DIR= ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} -SORT?= /usr/bin/sort UTSERVER_PORT= ${.CURDIR}/../utserver MASTERPKGMESSAGE!= cd ${UTSERVER_PORT} && ${MAKE} -V PKGMESSAGE diff --git a/games/utserver/Makefile b/games/utserver/Makefile index efd86c886712..e79446db06c2 100644 --- a/games/utserver/Makefile +++ b/games/utserver/Makefile @@ -31,7 +31,6 @@ PLIST_SUB= UTDIR="${UTDIR}" EXTRA_PATCHES= ${WRKDIR}/patch-ngstatsut INSTALL_DIR= ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755 INSTALL_MY_DATA= ${INSTALL} -o ${SHAREOWN} -g ${SHAREGRP} -m 644 -SORT?= /usr/bin/sort # files which should be installed with executable perms EXECUTABLES= ucc ucc-bin ngStatsUT ngStatsUT.exe ngWorldStats \ diff --git a/japanese/hns/Makefile b/japanese/hns/Makefile index 03c623df763b..0a066556e517 100644 --- a/japanese/hns/Makefile +++ b/japanese/hns/Makefile @@ -29,9 +29,10 @@ do-install: post-install: @cd ${WRKSRC} && ${FIND} . -type f -o -type l | \ - sed 's,^\.,share/${PORTNAME},' | sort >> ${TMPPLIST} + sed 's,^\.,share/${PORTNAME},' | ${SORT} >> ${TMPPLIST} @cd ${WRKSRC} && ${FIND} . -type d | \ - sed 's,^\.,@dirrm share/${PORTNAME},' | sort -r >> ${TMPPLIST} + sed 's,^\.,@dirrm share/${PORTNAME},' | ${SORT} -r \ + >> ${TMPPLIST} @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/japanese/linux-JM/Makefile b/japanese/linux-JM/Makefile index d4e2a62731e1..209d6bc397fe 100644 --- a/japanese/linux-JM/Makefile +++ b/japanese/linux-JM/Makefile @@ -74,7 +74,7 @@ post-build: ${ECHO_CMD} man/ja/man$$2/$$1.gz; shift 2; \ done; \ fi; \ - done|sort|uniq >>${PLIST} + done|${SORT}|uniq >>${PLIST} post-install: @${CAT} ${PKGMESSAGE} diff --git a/japanese/man-doc/Makefile b/japanese/man-doc/Makefile index 4a9092090a60..6941c99187a5 100644 --- a/japanese/man-doc/Makefile +++ b/japanese/man-doc/Makefile @@ -56,7 +56,7 @@ post-build: ${ECHO_CMD} share/man/ja/man$$2/$$1.gz; shift 2; \ done; \ fi; \ - done|sort|uniq >>${PLIST} + done|${SORT}|uniq >>${PLIST} pre-install: .for sec in ${MANSECS} diff --git a/japanese/wikicker/Makefile b/japanese/wikicker/Makefile index d8982cd62acb..f2e998f1343b 100644 --- a/japanese/wikicker/Makefile +++ b/japanese/wikicker/Makefile @@ -72,9 +72,11 @@ post-install: @${ECHO_MSG} @${ECHO_MSG} "===> Making PLIST Phase Start" @cd ${PREFIX}; ${FIND} ${WIKIAUTO:S/^${PREFIX}\///} -type f -o -type l | ${SED} -e 's,^\.,${WIKIAUTO:S|${PREFIX}/||},' >>${TMPPLIST} - @cd ${PREFIX}; ${FIND} ${WIKIAUTO:S/^${PREFIX}\///} -type d | sort -r | ${SED} -e 's/^/@dirrm /' >>${TMPPLIST} + @cd ${PREFIX}; ${FIND} ${WIKIAUTO:S/^${PREFIX}\///} -type d | \ + ${SORT} -r | ${SED} -e 's/^/@dirrm /' >>${TMPPLIST} @cd ${PREFIX}; ${FIND} ${WIKIPM:S/^${PREFIX}\///} -type f -o -type l | ${SED} -e 's,^\.,${WIKIPM:S|${PREFIX}/||},' >>${TMPPLIST} - @cd ${PREFIX}; ${FIND} ${WIKIPM:S/^${PREFIX}\///} -type d | sort -r | ${SED} -e 's/^/@dirrm /' >>${TMPPLIST} + @cd ${PREFIX}; ${FIND} ${WIKIPM:S/^${PREFIX}\///} -type d | \ + ${SORT} -r | ${SED} -e 's/^/@dirrm /' >>${TMPPLIST} @${ECHO_MSG} "===> Making PLIST Phase End" @${SED} -e 's|%%EXAMPLESDIR%%|${EXAMPLESDIR}|' \ diff --git a/japanese/xjman/Makefile b/japanese/xjman/Makefile index 2d520398d2c8..aff000b80f44 100644 --- a/japanese/xjman/Makefile +++ b/japanese/xjman/Makefile @@ -53,7 +53,7 @@ post-build: ${ECHO_CMD} man/ja/man$$2/$$1.gz; shift 2; \ done; \ fi; \ - done|sort|uniq >>${PLIST} + done|${SORT}|uniq >>${PLIST} @${ECHO_CMD} "@exec ${LN} -sf %D/man/ja %D/man/ja_JP.EUC" >>${PLIST} @${ECHO_CMD} "@unexec ${RM} -f %D/man/ja_JP.EUC" >>${PLIST} @${ECHO_CMD} "share/doc/xjman/COPYRIGHT" >>${PLIST} diff --git a/java/diablo-jdk13/Makefile b/java/diablo-jdk13/Makefile index 95305e388371..658a0fd79474 100644 --- a/java/diablo-jdk13/Makefile +++ b/java/diablo-jdk13/Makefile @@ -47,7 +47,6 @@ WRKSRC= ${WRKDIR}/${PKGNAMEPREFIX}jdk${JDK_VERSION} NO_BUILD= yes CPIO?= /usr/bin/cpio -SORT?= /usr/bin/sort INSTALL_DIR= ${PREFIX}/${PKGNAMEPREFIX}jdk${JDK_VERSION} .if defined(WITHOUT_PLUGIN) diff --git a/java/diablo-jre13/Makefile b/java/diablo-jre13/Makefile index bc596faeeb94..ed075b994fe7 100644 --- a/java/diablo-jre13/Makefile +++ b/java/diablo-jre13/Makefile @@ -47,7 +47,6 @@ WRKSRC= ${WRKDIR}/${PKGNAMEPREFIX}jre${JRE_VERSION} NO_BUILD= yes CPIO?= /usr/bin/cpio -SORT?= /usr/bin/sort INSTALL_DIR= ${PREFIX}/${PKGNAMEPREFIX}jre${JRE_VERSION} .if defined(WITHOUT_PLUGIN) diff --git a/java/jakarta-oro/Makefile b/java/jakarta-oro/Makefile index 7362fdd326d0..319235ad97c2 100644 --- a/java/jakarta-oro/Makefile +++ b/java/jakarta-oro/Makefile @@ -49,7 +49,7 @@ do-install-apidocs: @${CHOWN} -h -R ${SHAREOWN}:${SHAREGRP} ${APIDOCSDIR} @${FIND} ${APIDOCSDIR} -type f -print | \ ${SED} "s,${PREFIX}/*,," >> ${PLIST} - @${FIND} ${APIDOCSDIR} -type d -print | sort -r | \ + @${FIND} ${APIDOCSDIR} -type d -print | ${SORT} -r | \ ${SED} -e "s,${PREFIX}/*,," -e "s,^,@dirrm ,g" >> ${PLIST} .endif diff --git a/java/jakarta-regexp/Makefile b/java/jakarta-regexp/Makefile index f269e2cb598d..7da09b534c28 100644 --- a/java/jakarta-regexp/Makefile +++ b/java/jakarta-regexp/Makefile @@ -49,7 +49,7 @@ do-install-apidocs: @${CHOWN} -h -R ${SHAREOWN}:${SHAREGRP} ${APIDOCSDIR} @${FIND} ${APIDOCSDIR} -type f -print | \ ${SED} "s,${PREFIX}/*,," >> ${PLIST} - @${FIND} ${APIDOCSDIR} -type d -print | sort -r | \ + @${FIND} ${APIDOCSDIR} -type d -print | ${SORT} -r | \ ${SED} -e "s,${PREFIX}/*,," -e "s,^,@dirrm ,g" >> ${PLIST} .endif diff --git a/java/jdk11-doc/Makefile b/java/jdk11-doc/Makefile index 34dd02daf121..ce0dc6499490 100644 --- a/java/jdk11-doc/Makefile +++ b/java/jdk11-doc/Makefile @@ -46,7 +46,7 @@ do-install: @${ECHO_CMD} -n ">> Creating packing list..." @${FIND} ${TARGET_DIR} -type f -print | \ ${SED} "s,${PREFIX}/*,," >> ${PLIST} - @${FIND} ${TARGET_DIR} -type d -print | sort -r | \ + @${FIND} ${TARGET_DIR} -type d -print | ${SORT} -r | \ ${SED} -e "s,${PREFIX}/*,," -e "s,^,@dirrm ,g" >> ${PLIST} @${ECHO_CMD} " [ DONE ]" diff --git a/java/jdk12-doc/Makefile b/java/jdk12-doc/Makefile index 5991c5ad4dca..e6c5c16d8638 100644 --- a/java/jdk12-doc/Makefile +++ b/java/jdk12-doc/Makefile @@ -48,7 +48,7 @@ do-install: @${ECHO_CMD} -n ">> Creating packing list..." @${FIND} ${TARGET_DIR} -type f -print | \ ${SED} "s,${PREFIX}/*,," >> ${PLIST} - @${FIND} ${TARGET_DIR} -type d -print | sort -r | \ + @${FIND} ${TARGET_DIR} -type d -print | ${SORT} -r | \ ${SED} -e "s,${PREFIX}/*,," -e "s,^,@dirrm ,g" >> ${PLIST} @${ECHO_CMD} " [ DONE ]" diff --git a/java/jdk13-doc/Makefile b/java/jdk13-doc/Makefile index 8f1edecc3411..2eb099dea8da 100644 --- a/java/jdk13-doc/Makefile +++ b/java/jdk13-doc/Makefile @@ -52,7 +52,7 @@ do-install: @${ECHO_CMD} -n ">> Creating packing list..." @${FIND} ${TARGET_DIR} -type f -print | \ ${SED} "s,${PREFIX}/*,," >> ${PLIST} - @${FIND} ${TARGET_DIR} -type d -print | sort -r | \ + @${FIND} ${TARGET_DIR} -type d -print | ${SORT} -r | \ ${SED} -e "s,${PREFIX}/*,," -e "s,^,@dirrm ,g" >> ${PLIST} @${ECHO_CMD} " [ DONE ]" diff --git a/java/jdk13/Makefile b/java/jdk13/Makefile index da90f72b4c1d..765afd235595 100644 --- a/java/jdk13/Makefile +++ b/java/jdk13/Makefile @@ -74,7 +74,6 @@ PLIST_SUB+= JDK_VERSION=${JDK_VERSION} JDKIMAGEDIR= ${WRKSRC}/../build/bsd-i386/jdk-image-i386 JDKIMAGEDIR_G= ${WRKSRC}/../build/bsd-i386/jdk-debug-image-i386 -SORT?= /usr/bin/sort CPIO?= /usr/bin/cpio .if defined(NODEBUG) diff --git a/java/jdk14-doc/Makefile b/java/jdk14-doc/Makefile index 8614ce9dd257..415fe840dfc2 100644 --- a/java/jdk14-doc/Makefile +++ b/java/jdk14-doc/Makefile @@ -53,7 +53,7 @@ do-install: @${ECHO_CMD} -n ">> Creating packing list..." @${FIND} ${TARGET_DIR} -type f -print | \ ${SED} "s,${PREFIX}/*,," >> ${PLIST} - @${FIND} ${TARGET_DIR} -type d -print | sort -r | \ + @${FIND} ${TARGET_DIR} -type d -print | ${SORT} -r | \ ${SED} -e "s,${PREFIX}/*,," -e "s,^,@dirrm ,g" >> ${PLIST} @${ECHO_CMD} " [ DONE ]" diff --git a/java/jdk14/Makefile b/java/jdk14/Makefile index 6c90be937a12..4ac3e9d011a7 100644 --- a/java/jdk14/Makefile +++ b/java/jdk14/Makefile @@ -100,7 +100,6 @@ PKGINSTALL= ${WRKDIR}/pkg-install JDKIMAGEDIR= ${WRKSRC}/../build/bsd-i586/j2sdk-image JDKIMAGEDIR_G= ${WRKSRC}/../build/bsd-i586/j2sdk-debug-image -SORT?= /usr/bin/sort CPIO?= /usr/bin/cpio .if defined(WITH_DEBUG) diff --git a/java/jdk15/Makefile b/java/jdk15/Makefile index 6c90be937a12..4ac3e9d011a7 100644 --- a/java/jdk15/Makefile +++ b/java/jdk15/Makefile @@ -100,7 +100,6 @@ PKGINSTALL= ${WRKDIR}/pkg-install JDKIMAGEDIR= ${WRKSRC}/../build/bsd-i586/j2sdk-image JDKIMAGEDIR_G= ${WRKSRC}/../build/bsd-i586/j2sdk-debug-image -SORT?= /usr/bin/sort CPIO?= /usr/bin/cpio .if defined(WITH_DEBUG) diff --git a/java/jdk16/Makefile b/java/jdk16/Makefile index 6c90be937a12..4ac3e9d011a7 100644 --- a/java/jdk16/Makefile +++ b/java/jdk16/Makefile @@ -100,7 +100,6 @@ PKGINSTALL= ${WRKDIR}/pkg-install JDKIMAGEDIR= ${WRKSRC}/../build/bsd-i586/j2sdk-image JDKIMAGEDIR_G= ${WRKSRC}/../build/bsd-i586/j2sdk-debug-image -SORT?= /usr/bin/sort CPIO?= /usr/bin/cpio .if defined(WITH_DEBUG) diff --git a/lang/compaq-cc/Makefile b/lang/compaq-cc/Makefile index d2f520ae6377..78844466b89b 100644 --- a/lang/compaq-cc/Makefile +++ b/lang/compaq-cc/Makefile @@ -112,7 +112,7 @@ post-install: cd ${PREFIX} ;\ ${FIND} ${CCC_DIR}/alpha-freebsd -type d \ | ${SED} -e 's/^/@dirrm /g' \ - | sort -r >>${WRKDIR}/PLIST.alpha-freebsd + | ${SORT} -r >>${WRKDIR}/PLIST.alpha-freebsd ${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script ${ECHO_CMD} "/Insert PLIST.alpha-freebsd" >> ${WRKDIR}/ex.script ${ECHO_CMD} "d" >> ${WRKDIR}/ex.script @@ -129,7 +129,7 @@ post-install: cd ${PREFIX} ;\ ${FIND} ${CCC_DIR}/alpha-linux -type d \ | ${SED} -e 's/^/@dirrm /g' \ - | sort -r >>${WRKDIR}/PLIST.alphalinux + | ${SORT} -r >>${WRKDIR}/PLIST.alphalinux ${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script2 ${ECHO_CMD} "/Insert PLIST.alphalinux" >> ${WRKDIR}/ex.script2 ${ECHO_CMD} "d" >> ${WRKDIR}/ex.script2 @@ -144,7 +144,7 @@ post-install: cd ${PREFIX} ;\ ${FIND} usr/doc/${CCC_REV:C/-1$//} -type d \ | ${SED} -e 's/^/@dirrm /g' \ - | sort -r >>${WRKDIR}/PLIST.docs + | ${SORT} -r >>${WRKDIR}/PLIST.docs ${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script3 ${ECHO_CMD} "/Insert PLIST.docs" >> ${WRKDIR}/ex.script3 ${ECHO_CMD} "d" >> ${WRKDIR}/ex.script3 diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile index 0207b8c301b5..ec546d4c6595 100644 --- a/lang/erlang/Makefile +++ b/lang/erlang/Makefile @@ -122,25 +122,25 @@ post-install: @cd ${PREFIX} ; ${FIND} lib/erlang/* -type f -o -type l \ | ${GREP} -v "^lib/erlang/man" \ | ${GREP} -v "^lib/erlang/lib" \ - | sort \ + | ${SORT} \ > ${WRKDIR}/PLIST.lib-erlang # Stock OTP libraries. @for LIBRARY in ${OTP_LIBS}; do \ cd ${PREFIX} ; ${FIND} lib/erlang/lib/$${LIBRARY} -type f -o -type l; \ - done | sort >> ${WRKDIR}/PLIST.lib-erlang + done | ${SORT} >> ${WRKDIR}/PLIST.lib-erlang # Stock OTP library directories. @for LIBRARY in ${OTP_LIBS}; do \ cd ${PREFIX} ; ${FIND} lib/erlang/lib/$${LIBRARY} -type d \ | ${SED} -e 's/^/@dirrm /g'; \ - done | sort -r >> ${WRKDIR}/PLIST.lib-erlang + done | ${SORT} -r >> ${WRKDIR}/PLIST.lib-erlang # Other directories. - @cd ${PREFIX} ; ${FIND} lib/erlang/* -type d | sort -r \ + @cd ${PREFIX} ; ${FIND} lib/erlang/* -type d | ${SORT} -r \ | ${GREP} -v "^lib/erlang/man" \ | ${GREP} -v "^lib/erlang/lib" \ | ${SED} -e 's/^/@dirrm /g' \ diff --git a/lang/erlang14/Makefile b/lang/erlang14/Makefile index 0207b8c301b5..ec546d4c6595 100644 --- a/lang/erlang14/Makefile +++ b/lang/erlang14/Makefile @@ -122,25 +122,25 @@ post-install: @cd ${PREFIX} ; ${FIND} lib/erlang/* -type f -o -type l \ | ${GREP} -v "^lib/erlang/man" \ | ${GREP} -v "^lib/erlang/lib" \ - | sort \ + | ${SORT} \ > ${WRKDIR}/PLIST.lib-erlang # Stock OTP libraries. @for LIBRARY in ${OTP_LIBS}; do \ cd ${PREFIX} ; ${FIND} lib/erlang/lib/$${LIBRARY} -type f -o -type l; \ - done | sort >> ${WRKDIR}/PLIST.lib-erlang + done | ${SORT} >> ${WRKDIR}/PLIST.lib-erlang # Stock OTP library directories. @for LIBRARY in ${OTP_LIBS}; do \ cd ${PREFIX} ; ${FIND} lib/erlang/lib/$${LIBRARY} -type d \ | ${SED} -e 's/^/@dirrm /g'; \ - done | sort -r >> ${WRKDIR}/PLIST.lib-erlang + done | ${SORT} -r >> ${WRKDIR}/PLIST.lib-erlang # Other directories. - @cd ${PREFIX} ; ${FIND} lib/erlang/* -type d | sort -r \ + @cd ${PREFIX} ; ${FIND} lib/erlang/* -type d | ${SORT} -r \ | ${GREP} -v "^lib/erlang/man" \ | ${GREP} -v "^lib/erlang/lib" \ | ${SED} -e 's/^/@dirrm /g' \ diff --git a/lang/gcc-ooo/Makefile b/lang/gcc-ooo/Makefile index 50a827b3fe40..943b30d33c32 100644 --- a/lang/gcc-ooo/Makefile +++ b/lang/gcc-ooo/Makefile @@ -165,7 +165,7 @@ post-install: ${FIND} ${inc:S/^${PREFIX}\///} -type f -o -type l \ >>${WRKDIR}/PLIST.lib ;\ ${FIND} ${inc:S/^${PREFIX}\///} -type d \ - | sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib + | ${SORT} -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib .endfor (${ECHO_CMD} "@unexec rmdir %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/lib/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib ${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile index 50a827b3fe40..943b30d33c32 100644 --- a/lang/gcc/Makefile +++ b/lang/gcc/Makefile @@ -165,7 +165,7 @@ post-install: ${FIND} ${inc:S/^${PREFIX}\///} -type f -o -type l \ >>${WRKDIR}/PLIST.lib ;\ ${FIND} ${inc:S/^${PREFIX}\///} -type d \ - | sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib + | ${SORT} -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib .endfor (${ECHO_CMD} "@unexec rmdir %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/lib/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib ${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script diff --git a/lang/gcc30/Makefile b/lang/gcc30/Makefile index 1f95625f715c..0e1c208a63e7 100644 --- a/lang/gcc30/Makefile +++ b/lang/gcc30/Makefile @@ -124,7 +124,8 @@ post-install: >${WRKDIR}/PLIST.gcc-lib cd ${PREFIX} ;\ ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type d \ - | sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.gcc-lib + | ${SORT} -r | ${SED} -e 's/^/@dirrm /g' \ + >>${WRKDIR}/PLIST.gcc-lib (${ECHO_CMD} "@unexec rmdir %D/lib/gcc-lib/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/lib/gcc-lib 2>&1 || true") >> ${WRKDIR}/PLIST.gcc-lib ${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script ${ECHO_CMD} "/Insert PLIST.gcc-lib" >> ${WRKDIR}/ex.script diff --git a/lang/gcc31/Makefile b/lang/gcc31/Makefile index 7ced6015ea02..244ff3c931a8 100644 --- a/lang/gcc31/Makefile +++ b/lang/gcc31/Makefile @@ -150,7 +150,8 @@ post-install: >${WRKDIR}/PLIST.gcc-lib cd ${PREFIX} ;\ ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type d \ - | sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.gcc-lib + | ${SORT} -r | ${SED} -e 's/^/@dirrm /g' \ + >>${WRKDIR}/PLIST.gcc-lib (${ECHO_CMD} "@unexec rmdir %D/lib/gcc-lib/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/lib/gcc-lib 2>&1 || true") >> ${WRKDIR}/PLIST.gcc-lib ${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script ${ECHO_CMD} "/Insert PLIST.gcc-lib" >> ${WRKDIR}/ex.script diff --git a/lang/gcc32/Makefile b/lang/gcc32/Makefile index a9341323a567..cd8ea93022d9 100644 --- a/lang/gcc32/Makefile +++ b/lang/gcc32/Makefile @@ -159,7 +159,8 @@ post-install: >${WRKDIR}/PLIST.gcc-lib cd ${PREFIX} ;\ ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type d \ - | sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.gcc-lib + | ${SORT} -r | ${SED} -e 's/^/@dirrm /g' \ + >>${WRKDIR}/PLIST.gcc-lib (${ECHO_CMD} "@unexec rmdir %D/lib/gcc-lib/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/lib/gcc-lib 2>&1 || true") >> ${WRKDIR}/PLIST.gcc-lib ${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script ${ECHO_CMD} "/Insert PLIST.gcc-lib" >> ${WRKDIR}/ex.script diff --git a/lang/gcc33/Makefile b/lang/gcc33/Makefile index 380930ce6ed4..772b7286164c 100644 --- a/lang/gcc33/Makefile +++ b/lang/gcc33/Makefile @@ -158,7 +158,7 @@ post-install: .for d in ${TARGLIB:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax cd ${PREFIX} ; if [ -d $d ]; then \ ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\ - ${FIND} $d -type d | sort -r \ + ${FIND} $d -type d | ${SORT} -r \ | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib ;\ fi .endfor diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile index 50a827b3fe40..943b30d33c32 100644 --- a/lang/gcc34/Makefile +++ b/lang/gcc34/Makefile @@ -165,7 +165,7 @@ post-install: ${FIND} ${inc:S/^${PREFIX}\///} -type f -o -type l \ >>${WRKDIR}/PLIST.lib ;\ ${FIND} ${inc:S/^${PREFIX}\///} -type d \ - | sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib + | ${SORT} -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib .endfor (${ECHO_CMD} "@unexec rmdir %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/lib/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib ${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script diff --git a/lang/gcc35/Makefile b/lang/gcc35/Makefile index 50a827b3fe40..943b30d33c32 100644 --- a/lang/gcc35/Makefile +++ b/lang/gcc35/Makefile @@ -165,7 +165,7 @@ post-install: ${FIND} ${inc:S/^${PREFIX}\///} -type f -o -type l \ >>${WRKDIR}/PLIST.lib ;\ ${FIND} ${inc:S/^${PREFIX}\///} -type d \ - | sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib + | ${SORT} -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib .endfor (${ECHO_CMD} "@unexec rmdir %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/lib/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib ${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script diff --git a/lang/gcc40/Makefile b/lang/gcc40/Makefile index 50a827b3fe40..943b30d33c32 100644 --- a/lang/gcc40/Makefile +++ b/lang/gcc40/Makefile @@ -165,7 +165,7 @@ post-install: ${FIND} ${inc:S/^${PREFIX}\///} -type f -o -type l \ >>${WRKDIR}/PLIST.lib ;\ ${FIND} ${inc:S/^${PREFIX}\///} -type d \ - | sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib + | ${SORT} -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib .endfor (${ECHO_CMD} "@unexec rmdir %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/lib/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib ${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script diff --git a/lang/gcc41/Makefile b/lang/gcc41/Makefile index 50a827b3fe40..943b30d33c32 100644 --- a/lang/gcc41/Makefile +++ b/lang/gcc41/Makefile @@ -165,7 +165,7 @@ post-install: ${FIND} ${inc:S/^${PREFIX}\///} -type f -o -type l \ >>${WRKDIR}/PLIST.lib ;\ ${FIND} ${inc:S/^${PREFIX}\///} -type d \ - | sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib + | ${SORT} -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib .endfor (${ECHO_CMD} "@unexec rmdir %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/lib/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib ${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile index 50a827b3fe40..943b30d33c32 100644 --- a/lang/gcc42/Makefile +++ b/lang/gcc42/Makefile @@ -165,7 +165,7 @@ post-install: ${FIND} ${inc:S/^${PREFIX}\///} -type f -o -type l \ >>${WRKDIR}/PLIST.lib ;\ ${FIND} ${inc:S/^${PREFIX}\///} -type d \ - | sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib + | ${SORT} -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib .endfor (${ECHO_CMD} "@unexec rmdir %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/lib/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib ${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile index 50a827b3fe40..943b30d33c32 100644 --- a/lang/gcc43/Makefile +++ b/lang/gcc43/Makefile @@ -165,7 +165,7 @@ post-install: ${FIND} ${inc:S/^${PREFIX}\///} -type f -o -type l \ >>${WRKDIR}/PLIST.lib ;\ ${FIND} ${inc:S/^${PREFIX}\///} -type d \ - | sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib + | ${SORT} -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib .endfor (${ECHO_CMD} "@unexec rmdir %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/lib/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib ${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile index 50a827b3fe40..943b30d33c32 100644 --- a/lang/gcc44/Makefile +++ b/lang/gcc44/Makefile @@ -165,7 +165,7 @@ post-install: ${FIND} ${inc:S/^${PREFIX}\///} -type f -o -type l \ >>${WRKDIR}/PLIST.lib ;\ ${FIND} ${inc:S/^${PREFIX}\///} -type d \ - | sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib + | ${SORT} -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib .endfor (${ECHO_CMD} "@unexec rmdir %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/lib/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib ${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile index 50a827b3fe40..943b30d33c32 100644 --- a/lang/gcc45/Makefile +++ b/lang/gcc45/Makefile @@ -165,7 +165,7 @@ post-install: ${FIND} ${inc:S/^${PREFIX}\///} -type f -o -type l \ >>${WRKDIR}/PLIST.lib ;\ ${FIND} ${inc:S/^${PREFIX}\///} -type d \ - | sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib + | ${SORT} -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib .endfor (${ECHO_CMD} "@unexec rmdir %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/lib/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib ${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile index 50a827b3fe40..943b30d33c32 100644 --- a/lang/gcc46/Makefile +++ b/lang/gcc46/Makefile @@ -165,7 +165,7 @@ post-install: ${FIND} ${inc:S/^${PREFIX}\///} -type f -o -type l \ >>${WRKDIR}/PLIST.lib ;\ ${FIND} ${inc:S/^${PREFIX}\///} -type d \ - | sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib + | ${SORT} -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib .endfor (${ECHO_CMD} "@unexec rmdir %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/lib/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib ${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile index 50a827b3fe40..943b30d33c32 100644 --- a/lang/gcc47/Makefile +++ b/lang/gcc47/Makefile @@ -165,7 +165,7 @@ post-install: ${FIND} ${inc:S/^${PREFIX}\///} -type f -o -type l \ >>${WRKDIR}/PLIST.lib ;\ ${FIND} ${inc:S/^${PREFIX}\///} -type d \ - | sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib + | ${SORT} -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib .endfor (${ECHO_CMD} "@unexec rmdir %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/lib/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib ${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile index 50a827b3fe40..943b30d33c32 100644 --- a/lang/gcc48/Makefile +++ b/lang/gcc48/Makefile @@ -165,7 +165,7 @@ post-install: ${FIND} ${inc:S/^${PREFIX}\///} -type f -o -type l \ >>${WRKDIR}/PLIST.lib ;\ ${FIND} ${inc:S/^${PREFIX}\///} -type d \ - | sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib + | ${SORT} -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib .endfor (${ECHO_CMD} "@unexec rmdir %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/lib/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib ${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script diff --git a/lang/mozart/Makefile b/lang/mozart/Makefile index daac92b467fb..2076d5701d00 100644 --- a/lang/mozart/Makefile +++ b/lang/mozart/Makefile @@ -75,9 +75,9 @@ post-install: | ${XARGS} -0 ${CHMOD} ${SHAREMODE} @${RM} -rf ${PREFIX}/lib/oz/mozart .endif - @cd ${PREFIX} ; ${FIND} lib/oz -type f -o -type l | sort \ + @cd ${PREFIX} ; ${FIND} lib/oz -type f -o -type l | ${SORT} \ > ${WRKDIR}/PLIST.lib-oz - @cd ${PREFIX} ; ${FIND} lib/oz -type d | sort -r \ + @cd ${PREFIX} ; ${FIND} lib/oz -type d | ${SORT} -r \ | ${SED} -e 's/^/@dirrm /g' \ >> ${WRKDIR}/PLIST.lib-oz @${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script diff --git a/lang/python-doc-html/Makefile b/lang/python-doc-html/Makefile index 3ba67737be47..0e90af167bb3 100644 --- a/lang/python-doc-html/Makefile +++ b/lang/python-doc-html/Makefile @@ -57,10 +57,11 @@ pre-install: fi .else @cd ${WRKSRC} && (${FIND} . -type f | \ - ${SED} -e 's,^\.,share/doc/${PYTHON_VERSION},' | sort > ${PLIST}) + ${SED} -e 's,^\.,share/doc/${PYTHON_VERSION},' | ${SORT} \ + > ${PLIST}) @cd ${WRKSRC} && (${FIND} * -type d | \ ${SED} -e 's,^,@dirrm share/doc/${PYTHON_VERSION}/,' | \ - sort -r) >> ${PLIST} + ${SORT} -r) >> ${PLIST} @${ECHO_CMD} "@unexec rmdir %D/share/doc/%%PYTHON_VERSION%% 2>/dev/null || true" >> ${PLIST} .endif diff --git a/lang/python15/Makefile b/lang/python15/Makefile index bad067e115e2..e73b18405ab6 100644 --- a/lang/python15/Makefile +++ b/lang/python15/Makefile @@ -97,7 +97,7 @@ pre-install: ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/* \ ${PYTHONPREFIX_LIBDIR}/${platform} .endfor - @sort -r -o ${PLIST} ${PLIST_GMP} ${PLIST_TOOLS} ${PKGDIR}/pkg-plist + @${SORT} -r -o ${PLIST} ${PLIST_GMP} ${PLIST_TOOLS} ${PKGDIR}/pkg-plist post-install: @${MKDIR} ${MANPREFIX}/man/man1 diff --git a/lang/python20/Makefile b/lang/python20/Makefile index 29b48e1517ce..b52237867df0 100644 --- a/lang/python20/Makefile +++ b/lang/python20/Makefile @@ -118,7 +118,8 @@ pre-install: ${PYTHONPREFIX_LIBDIR}/${platform} .endfor .endfor - @sort -r -o ${PLIST} ${PLIST_GMP} ${PLIST_TOOLS} ${PLIST_DEMO} ${PKGDIR}/pkg-plist + @${SORT} -r -o ${PLIST} ${PLIST_GMP} ${PLIST_TOOLS} ${PLIST_DEMO} \ + ${PKGDIR}/pkg-plist post-install: @${MKDIR} ${MANPREFIX}/man/man1 diff --git a/lang/sml-nj-devel/Makefile b/lang/sml-nj-devel/Makefile index fdab5e4f34b3..387fd4f1f891 100644 --- a/lang/sml-nj-devel/Makefile +++ b/lang/sml-nj-devel/Makefile @@ -178,8 +178,8 @@ pre-install: ( ${FIND} -s -d ${MLSRCSBASE} -type d | \ ${AWK} '{ print "@dirrm ${MLROOTRELATIVE}/" $$0 }' ) ) | \ ${EGREP} -v ${MLSRCEXCLUDEREGEX} > ${MLSRCPLIST} - @${GREP} -h ^[^@] ${MLPLISTFILES} | sort -u > ${PLIST} - @${GREP} -h ^@dirrm ${MLPLISTFILES} | sort -r -u >> ${PLIST} + @${GREP} -h ^[^@] ${MLPLISTFILES} | ${SORT} -u > ${PLIST} + @${GREP} -h ^@dirrm ${MLPLISTFILES} | ${SORT} -r -u >> ${PLIST} @${ECHO} ' done.' .endif diff --git a/mail/mozilla-thunderbird/Makefile b/mail/mozilla-thunderbird/Makefile index 027516e60740..d9565523d33f 100644 --- a/mail/mozilla-thunderbird/Makefile +++ b/mail/mozilla-thunderbird/Makefile @@ -44,8 +44,6 @@ NOT_FOR_ARCHS= amd64 .include <bsd.port.pre.mk> -SORT?=/usr/bin/sort - .if ${ARCH} == "i386" CONFIGURE_ENV+= WITH_REORDER=yes .endif # ${ARCH} == "i386" diff --git a/mail/openwebmail/Makefile b/mail/openwebmail/Makefile index 642309dd7a41..8f5e6ae6a665 100644 --- a/mail/openwebmail/Makefile +++ b/mail/openwebmail/Makefile @@ -125,7 +125,8 @@ pre-install: @${FIND} ${WRKSRC}/*/openwebmail \( -name "*.bak" -or -name "*.orig" \) -delete .if !exists(${PLIST}) @${ECHO} "@unexec if cmp -s %D/www/cgi-bin/openwebmail/etc/openwebmail.conf %D/www/cgi-bin/openwebmail/etc/openwebmail.conf-dist; then ${RM} -f %D/www/cgi-bin/openwebmail/etc/openwebmail.conf; fi" > ${PLIST} - @${FIND} ${WRKSRC}/*/openwebmail -type f -o -type l | ${SED} -e 's,${WRKSRC},www,g' | sort -u >> ${PLIST} + @${FIND} ${WRKSRC}/*/openwebmail -type f -o -type l | \ + ${SED} -e 's,${WRKSRC},www,g' | ${SORT} -u >> ${PLIST} @${ECHO} "www/cgi-bin/openwebmail/etc/dbm.conf" >> ${PLIST} .for f in b2g g2b lunar @${ECHO} "www/cgi-bin/openwebmail/etc/${f}.db" >> ${PLIST} @@ -136,7 +137,8 @@ pre-install: -e 's,openwebmail/openwebmail,openwebmail/.openwebmail,g' \ >> ${PLIST} .endif - @${FIND} ${WRKSRC}/*/openwebmail -type d | sort -ur | ${SED} -e 's,${WRKSRC},@dirrm www,g' >> ${PLIST} + @${FIND} ${WRKSRC}/*/openwebmail -type d | ${SORT} -ur | \ + ${SED} -e 's,${WRKSRC},@dirrm www,g' >> ${PLIST} .endif do-install: diff --git a/mail/thunderbird-devel/Makefile b/mail/thunderbird-devel/Makefile index 027516e60740..d9565523d33f 100644 --- a/mail/thunderbird-devel/Makefile +++ b/mail/thunderbird-devel/Makefile @@ -44,8 +44,6 @@ NOT_FOR_ARCHS= amd64 .include <bsd.port.pre.mk> -SORT?=/usr/bin/sort - .if ${ARCH} == "i386" CONFIGURE_ENV+= WITH_REORDER=yes .endif # ${ARCH} == "i386" diff --git a/mail/thunderbird-esr/Makefile b/mail/thunderbird-esr/Makefile index 027516e60740..d9565523d33f 100644 --- a/mail/thunderbird-esr/Makefile +++ b/mail/thunderbird-esr/Makefile @@ -44,8 +44,6 @@ NOT_FOR_ARCHS= amd64 .include <bsd.port.pre.mk> -SORT?=/usr/bin/sort - .if ${ARCH} == "i386" CONFIGURE_ENV+= WITH_REORDER=yes .endif # ${ARCH} == "i386" diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile index 027516e60740..d9565523d33f 100644 --- a/mail/thunderbird/Makefile +++ b/mail/thunderbird/Makefile @@ -44,8 +44,6 @@ NOT_FOR_ARCHS= amd64 .include <bsd.port.pre.mk> -SORT?=/usr/bin/sort - .if ${ARCH} == "i386" CONFIGURE_ENV+= WITH_REORDER=yes .endif # ${ARCH} == "i386" diff --git a/mail/thunderbird3/Makefile b/mail/thunderbird3/Makefile index 027516e60740..d9565523d33f 100644 --- a/mail/thunderbird3/Makefile +++ b/mail/thunderbird3/Makefile @@ -44,8 +44,6 @@ NOT_FOR_ARCHS= amd64 .include <bsd.port.pre.mk> -SORT?=/usr/bin/sort - .if ${ARCH} == "i386" CONFIGURE_ENV+= WITH_REORDER=yes .endif # ${ARCH} == "i386" diff --git a/misc/gnomehier/Makefile b/misc/gnomehier/Makefile index 0e00fad19d33..066c639e3a7c 100644 --- a/misc/gnomehier/Makefile +++ b/misc/gnomehier/Makefile @@ -27,13 +27,13 @@ do-fetch: pre-install: @${RM} -f ${PLIST} @${TOUCH} -f ${PLIST} - @${CAT} ${FILESDIR}/dirlist | sort | ${SED} -e \ + @${CAT} ${FILESDIR}/dirlist | ${SORT} | ${SED} -e \ 's|$$|/.keep_me|' >> ${PLIST} @${ECHO_CMD} "etc/gconf/gconf.xml.defaults/schemas/apps/%gconf.xml" \ >> ${PLIST} @${ECHO_CMD} "etc/gconf/gconf.xml.defaults/apps/%gconf.xml" \ >> ${PLIST} - @${CAT} ${FILESDIR}/dirlist | sort -r | ${SED} -e \ + @${CAT} ${FILESDIR}/dirlist | ${SORT} -r | ${SED} -e \ 's|^|@dirrm |' >> ${PLIST} do-install: diff --git a/misc/lingoteach/Makefile b/misc/lingoteach/Makefile index 1f94981f26a3..ba85a09edb68 100644 --- a/misc/lingoteach/Makefile +++ b/misc/lingoteach/Makefile @@ -42,8 +42,6 @@ CONFIGURE_ARGS+= --enable-debug PLIST= ${WRKDIR}/plist .endif -SORT?= /usr/bin/sort - .include <bsd.port.pre.mk> pre-everything:: diff --git a/misc/sword-modules/Makefile b/misc/sword-modules/Makefile index e5238123231c..fab68facdaac 100644 --- a/misc/sword-modules/Makefile +++ b/misc/sword-modules/Makefile @@ -45,7 +45,6 @@ SCRIPTS_ENV= SETDIR="${SETDIR}" \ BATCH="${BATCH}" DIRNAME?= ${BASENAME:S/basename/dirname/} -SORT?= sort .if !exists(${MODFILE}) pre-fetch: select diff --git a/multimedia/mplayer-skins/Makefile b/multimedia/mplayer-skins/Makefile index 05caec1508a1..9f8273743c3a 100644 --- a/multimedia/mplayer-skins/Makefile +++ b/multimedia/mplayer-skins/Makefile @@ -51,7 +51,6 @@ PLIST= ${WRKSRC}/pkg-plist SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" INSTALL_DIR= ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755 -SORT?= /usr/bin/sort myDATADIR= share/${PORTNAME}/Skin # Used by other ports to detect if this is installed diff --git a/net-im/jarl/Makefile b/net-im/jarl/Makefile index 6a2da5959b1e..f5eb08c0315d 100644 --- a/net-im/jarl/Makefile +++ b/net-im/jarl/Makefile @@ -28,7 +28,7 @@ makeplist: ${FIND} ${PREFIX}/share/jarl -type f -print | ${CUT} -d/ -f4- >> \ ${PLIST} ${FIND} ${PREFIX}/share/jarl -type d -print | ${CUT} -d/ -f4- | \ - sort -r | ${SED} 's/^/@dirrm /' >> ${PLIST} + ${SORT} -r | ${SED} 's/^/@dirrm /' >> ${PLIST} post-patch: ${REINPLACE_CMD} -e "s:%%PREFIX%%:${PREFIX}:g" ${WRKSRC}/jarl diff --git a/net-im/tik/Makefile b/net-im/tik/Makefile index 6803b1334cdd..ef398291b1b6 100644 --- a/net-im/tik/Makefile +++ b/net-im/tik/Makefile @@ -20,8 +20,6 @@ RUN_DEPENDS= tclsh8.2:${PORTSDIR}/lang/tcl82 \ NO_BUILD= yes WRKSRC= ${WRKDIR}/tik -SORT?= sort - SRCDIRS= share/tik share/tik/components share/tik/media \ share/tik/packages share/tik/strs diff --git a/net/danamics/Makefile b/net/danamics/Makefile index 245fdfd3a655..34ea9791ab14 100644 --- a/net/danamics/Makefile +++ b/net/danamics/Makefile @@ -22,8 +22,6 @@ WRKSRC= ${WRKDIR}/DaNAMiCS PLIST= ${WRKDIR}/plist -SORT?= /usr/bin/sort - pre-install: cd ${WRKSRC}; ${FIND} . -type f \ | ${SORT} | ${SED} -e 's|^\.|danamics|' >${PLIST} diff --git a/net/jarl/Makefile b/net/jarl/Makefile index 6a2da5959b1e..f5eb08c0315d 100644 --- a/net/jarl/Makefile +++ b/net/jarl/Makefile @@ -28,7 +28,7 @@ makeplist: ${FIND} ${PREFIX}/share/jarl -type f -print | ${CUT} -d/ -f4- >> \ ${PLIST} ${FIND} ${PREFIX}/share/jarl -type d -print | ${CUT} -d/ -f4- | \ - sort -r | ${SED} 's/^/@dirrm /' >> ${PLIST} + ${SORT} -r | ${SED} 's/^/@dirrm /' >> ${PLIST} post-patch: ${REINPLACE_CMD} -e "s:%%PREFIX%%:${PREFIX}:g" ${WRKSRC}/jarl diff --git a/net/openreg/Makefile b/net/openreg/Makefile index da9f6730f520..f4717597cfd7 100644 --- a/net/openreg/Makefile +++ b/net/openreg/Makefile @@ -34,7 +34,7 @@ post-install: for file in `${FIND} ./ ! -type d` ; do \ printf "share/doc/${PORTNAME}/%s\n" $$file >> ${TMPPLIST} ;\ done ;\ - for dir in `${FIND} ./ -type d -mindepth 1| sort -r` ; do \ + for dir in `${FIND} ./ -type d -mindepth 1| ${SORT} -r` ; do \ printf "@dirrm share/doc/${PORTNAME}/%s\n" $$dir >> ${TMPPLIST} ;\ done @${ECHO} "@dirrm share/doc/${PORTNAME}" >> ${TMPPLIST} diff --git a/net/ruby-jabber4r/Makefile b/net/ruby-jabber4r/Makefile index bcc3800d7758..ae911e9c103a 100644 --- a/net/ruby-jabber4r/Makefile +++ b/net/ruby-jabber4r/Makefile @@ -54,8 +54,10 @@ do-install: ${CP} -R ${WRKSRC}/${f} ${RUBY_MODEXAMPLESDIR}/ .endfor cd ${WRKSRC} && \ - ${FIND} doc -type f|sort|${SED} 's:^:${PLIST_MODDOCDIR}/:' >> ${TMPPLIST}; \ - ${FIND} doc -type d|sort -r|${SED} 's:^:@dirrm ${PLIST_MODDOCDIR}/:'>> ${TMPPLIST} + ${FIND} doc -type f|${SORT}| \ + ${SED} 's:^:${PLIST_MODDOCDIR}/:' >> ${TMPPLIST}; \ + ${FIND} doc -type d|${SORT} -r| \ + ${SED} 's:^:@dirrm ${PLIST_MODDOCDIR}/:'>> ${TMPPLIST} ${ECHO_CMD} '@dirrm ${PLIST_MODDOCDIR}'>> ${TMPPLIST} .endif diff --git a/net/tik/Makefile b/net/tik/Makefile index 6803b1334cdd..ef398291b1b6 100644 --- a/net/tik/Makefile +++ b/net/tik/Makefile @@ -20,8 +20,6 @@ RUN_DEPENDS= tclsh8.2:${PORTSDIR}/lang/tcl82 \ NO_BUILD= yes WRKSRC= ${WRKDIR}/tik -SORT?= sort - SRCDIRS= share/tik share/tik/components share/tik/media \ share/tik/packages share/tik/strs diff --git a/print/abntex/Makefile b/print/abntex/Makefile index 0e52f51a5e31..19ff95f6db04 100644 --- a/print/abntex/Makefile +++ b/print/abntex/Makefile @@ -18,8 +18,6 @@ RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX WRKSRC= ${WRKDIR}/${PORTNAME} NO_BUILD= yes -# -SORT?= /usr/bin/sort do-install: # extract into staging area diff --git a/russian/rispell/Makefile b/russian/rispell/Makefile index 2bfe2baf1599..7a18050ef5cb 100644 --- a/russian/rispell/Makefile +++ b/russian/rispell/Makefile @@ -23,7 +23,7 @@ BUILD_DEPENDS= ispell:${PORTSDIR}/textproc/ispell WRKSRC= ${WRKDIR}/russian-ispell post-build: - cd ${WRKSRC} && LANG=ru_RU.KOI8-R sort russian.sml > russian.dict + cd ${WRKSRC} && LANG=ru_RU.KOI8-R ${SORT} russian.sml > russian.dict do-install: cd ${WRKSRC} && \ diff --git a/sysutils/freesbie/Makefile b/sysutils/freesbie/Makefile index bace80ec551c..a879d9e01f46 100644 --- a/sysutils/freesbie/Makefile +++ b/sysutils/freesbie/Makefile @@ -21,7 +21,6 @@ NO_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME} CPIO?= /usr/bin/cpio --quiet -pdum -R -SORT= /usr/bin/sort -r PLIST= ${WRKDIR}/PLIST pre-install: @@ -31,7 +30,9 @@ do-install: @${MKDIR} ${DATADIR} @ cd ${WRKSRC} && ${FIND} * -type f -print | ${CPIO} ${BINOWN}:${BINGRP} ${DATADIR} @ cd ${DATADIR} && ${FIND} * -type d -print | ${XARGS} ${CHMOD} 0755 - @ cd ${PREFIX} && ${FIND} share/${PORTNAME} -type f -print | ${SORT} > ${TMPPLIST} - @ cd ${PREFIX} && ${FIND} share/${PORTNAME} -type d -print | ${SORT} | ${SED} -e 's#^#@dirrm #' >> ${TMPPLIST} + @ cd ${PREFIX} && ${FIND} share/${PORTNAME} -type f -print | \ + ${SORT} -r > ${TMPPLIST} + @ cd ${PREFIX} && ${FIND} share/${PORTNAME} -type d -print | \ + ${SORT} -r | ${SED} -e 's#^#@dirrm #' >> ${TMPPLIST} .include <bsd.port.mk> diff --git a/sysutils/usermin/Makefile b/sysutils/usermin/Makefile index aec65d6f1149..092b7bdaa985 100644 --- a/sysutils/usermin/Makefile +++ b/sysutils/usermin/Makefile @@ -52,9 +52,9 @@ do-install: @${CHMOD} 554 ${PREFIX}/etc/rc.d/usermin.sh-dist post-install: - @cd ${PREFIX} ; ${FIND} lib/usermin -type f -o -type l | sort \ + @cd ${PREFIX} ; ${FIND} lib/usermin -type f -o -type l | ${SORT} \ > ${WRKDIR}/PLIST.lib-usermin - @cd ${PREFIX} ; ${FIND} lib/usermin -type d | sort -r \ + @cd ${PREFIX} ; ${FIND} lib/usermin -type d | ${SORT} -r \ | ${SED} -e 's/^/@dirrm /g' \ >> ${WRKDIR}/PLIST.lib-usermin diff --git a/sysutils/webmin/Makefile b/sysutils/webmin/Makefile index 10fa282a7a90..15e60deab747 100644 --- a/sysutils/webmin/Makefile +++ b/sysutils/webmin/Makefile @@ -80,8 +80,11 @@ do-install: @${CHMOD} 554 ${PREFIX}/etc/rc.d/webmin.sh-dist post-install: - @cd ${WRKSRC} ; ${FIND} * -type f -o -type l | sort | ${AWK} '{ print "lib/webmin/" $$1 }' > ${WRKDIR}/PLIST.lib-webmin - @cd ${WRKSRC} ; ${FIND} * -type d | sort -r | ${AWK} '{ print "lib/webmin/" $$1 }' | ${SED} -e 's/^/@dirrm /g' >> ${WRKDIR}/PLIST.lib-webmin + @cd ${WRKSRC} ; ${FIND} * -type f -o -type l | ${SORT} | ${AWK} \ + '{ print "lib/webmin/" $$1 }' > ${WRKDIR}/PLIST.lib-webmin + @cd ${WRKSRC} ; ${FIND} * -type d | ${SORT} -r | ${AWK} \ + '{ print "lib/webmin/" $$1 }' | ${SED} -e 's/^/@dirrm /g' \ + >> ${WRKDIR}/PLIST.lib-webmin @${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script @${ECHO_CMD} "/Insert PLIST.lib-webmin" >> ${WRKDIR}/ex.script diff --git a/textproc/ispell/Makefile b/textproc/ispell/Makefile index 46c8b22a9acc..eea239fa426f 100644 --- a/textproc/ispell/Makefile +++ b/textproc/ispell/Makefile @@ -235,7 +235,7 @@ post-build: abkuerz.txt imperat.txt latein.txt informatik.txt \ infoabk.txt elektronik.txt orgabk.txt marken.txt \ alphabeta.txt roemisch.txt zusammen.txt | \ - sort -u > all.words && \ + ${SORT} -u > all.words && \ ${BUILDHASH} all.words deutsch.aff deutsch.hash .endif .if defined(ISPELL_BR) diff --git a/vietnamese/vi2vn/Makefile b/vietnamese/vi2vn/Makefile index 31367a414466..fbc6a995fbba 100644 --- a/vietnamese/vi2vn/Makefile +++ b/vietnamese/vi2vn/Makefile @@ -47,7 +47,7 @@ post-install: ${FIND} share/${PORTNAME} -type f -o -type l >${WRKDIR}/PLIST.share @cd ${PREFIX} ;\ ${FIND} share/${PORTNAME} -type d \ - | sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.share + | ${SORT} -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.share @${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script @${ECHO_CMD} "/Insert PLIST.share" >> ${WRKDIR}/ex.script @${ECHO_CMD} "d" >> ${WRKDIR}/ex.script diff --git a/www/linux-mozilla-devel/Makefile b/www/linux-mozilla-devel/Makefile index d1d3f8ef9fbc..ad7b9c2e9748 100644 --- a/www/linux-mozilla-devel/Makefile +++ b/www/linux-mozilla-devel/Makefile @@ -114,7 +114,7 @@ pre-install: ${ECHO_CMD} bin/${STARTUP_CMD} > ${PLIST} ${ECHO_CMD} "@unexec ${FIND} ${FULL_INSTALL_DIR}/plugins \ -type l -exec ${RM} {} \;" >> ${PLIST} - cd ${WRKSRC}/bin; for i in `${FIND} * \! -type d | sort`; do \ + cd ${WRKSRC}/bin; for i in `${FIND} * \! -type d | ${SORT}`; do \ ${ECHO_CMD} lib/${INSTALL_DIR}/$${i} >> ${PLIST}; \ done cd ${WRKSRC}/bin; \ diff --git a/www/linux-mozilla/Makefile b/www/linux-mozilla/Makefile index 88071cbc350a..6322ce1ccf61 100644 --- a/www/linux-mozilla/Makefile +++ b/www/linux-mozilla/Makefile @@ -115,7 +115,7 @@ pre-install: ${ECHO_CMD} bin/${STARTUP_CMD} > ${PLIST} ${ECHO_CMD} "@unexec ${FIND} ${PREFIX}/lib/linux-mozilla/plugins -type l \ -exec ${RM} {} \;" >> ${PLIST} - cd ${WRKSRC}/bin; for i in `${FIND} * \! -type d | sort`; do \ + cd ${WRKSRC}/bin; for i in `${FIND} * \! -type d | ${SORT}`; do \ ${ECHO_CMD} lib/linux-mozilla/$${i} >> ${PLIST}; \ done cd ${WRKSRC}/bin; \ |