[pkgsrc/trunk]: pkgsrc/misc We don't need to use ${SORT} to sort a list -- ju...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/15d1377cbdc4
branches:  trunk
changeset: 493180:15d1377cbdc4
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Apr 28 23:04:08 2005 +0000

description:
We don't need to use ${SORT} to sort a list -- just use the :O modifier.

diffstat:

 misc/gnome-dirs/Makefile  |  5 ++---
 misc/gnome1-dirs/Makefile |  7 +++----
 misc/gnome2-dirs/Makefile |  9 ++++-----
 misc/theme-dirs/Makefile  |  5 ++---
 misc/xdg-dirs/Makefile    |  5 ++---
 misc/xorg-dirs/Makefile   |  5 ++---
 6 files changed, 15 insertions(+), 21 deletions(-)

diffs (123 lines):

diff -r ada7a940b2cc -r 15d1377cbdc4 misc/gnome-dirs/Makefile
--- a/misc/gnome-dirs/Makefile  Thu Apr 28 22:57:55 2005 +0000
+++ b/misc/gnome-dirs/Makefile  Thu Apr 28 23:04:08 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:46:34 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/04/28 23:04:08 jlam Exp $
 #
 
 DISTNAME=      gnome-dirs-1.5
@@ -22,8 +22,7 @@
 .include "dirs.mk"
 .include "../../mk/bsd.prefs.mk"
 
-_SORTED!=      ${ECHO} ${GNOME_DIRS} | ${TR} -s ' \t' '\n' | ${SORT}
-MAKE_DIRS+=    ${_SORTED:S/^/${PREFIX}\//}
+MAKE_DIRS+=    ${GNOME_DIRS:O:S/^/${PREFIX}\//}
 
 do-install:    # nothing
 
diff -r ada7a940b2cc -r 15d1377cbdc4 misc/gnome1-dirs/Makefile
--- a/misc/gnome1-dirs/Makefile Thu Apr 28 22:57:55 2005 +0000
+++ b/misc/gnome1-dirs/Makefile Thu Apr 28 23:04:08 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/04/11 21:46:34 tv Exp $
+# $NetBSD: Makefile,v 1.17 2005/04/28 23:04:08 jlam Exp $
 #
 
 DISTNAME=      gnome1-dirs-1.5
@@ -24,9 +24,8 @@
 .include "dirs.mk"
 .include "../../mk/bsd.prefs.mk"
 
-_SORTED!=      ${ECHO} ${GNOME_DIRS} ${GNOME1_DIRS} | ${TR} -s ' \t' '\n' | \
-               ${SORT}
-MAKE_DIRS+=    ${_SORTED:S/^/${PREFIX}\//}
+ALL_GNOME_DIRS=        ${GNOME_DIRS} ${GNOME1_DIRS}
+MAKE_DIRS+=    ${ALL_GNOME_DIRS:O:S/^/${PREFIX}\//}
 
 do-install:    # nothing
 
diff -r ada7a940b2cc -r 15d1377cbdc4 misc/gnome2-dirs/Makefile
--- a/misc/gnome2-dirs/Makefile Thu Apr 28 22:57:55 2005 +0000
+++ b/misc/gnome2-dirs/Makefile Thu Apr 28 23:04:08 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/04/11 21:46:34 tv Exp $
+# $NetBSD: Makefile,v 1.21 2005/04/28 23:04:08 jlam Exp $
 #
 
 DISTNAME=      gnome2-dirs-1.5
@@ -23,13 +23,12 @@
 
 .if ${X11PREFIX} == ${LOCALBASE}
 DEPENDS+=      gnome-dirs>=1.0:../../misc/gnome-dirs
-_SORTED!=      ${ECHO} ${GNOME2_DIRS} | ${TR} -s ' \t' '\n' | ${SORT}
+ALL_GNOME_DIRS=        ${GNOME2_DIRS}
 .else
-_SORTED!=      ${ECHO} ${GNOME_DIRS} ${GNOME2_DIRS} | ${TR} -s ' \t' '\n' | \
-               ${SORT}
+ALL_GNOME_DIRS=        ${GNOME_DIRS} ${GNOME2_DIRS}
 .endif
 
-MAKE_DIRS+=    ${_SORTED:S/^/${PREFIX}\//}
+MAKE_DIRS+=    ${ALL_GNOME_DIRS:O:S/^/${PREFIX}\//}
 
 do-install:    # nothing
 
diff -r ada7a940b2cc -r 15d1377cbdc4 misc/theme-dirs/Makefile
--- a/misc/theme-dirs/Makefile  Thu Apr 28 22:57:55 2005 +0000
+++ b/misc/theme-dirs/Makefile  Thu Apr 28 23:04:08 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:40 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/04/28 23:04:08 jlam Exp $
 #
 
 DISTNAME=      theme-dirs-1.0
@@ -22,8 +22,7 @@
 .include "dirs.mk"
 .include "../../mk/bsd.prefs.mk"
 
-_SORTED!=      ${ECHO} ${THEME_DIRS} | ${TR} -s ' \t' '\n' | ${SORT}
-MAKE_DIRS+=    ${_SORTED:S/^/${PREFIX}\//}
+MAKE_DIRS+=    ${THEME_DIRS:O:S/^/${PREFIX}\//}
 
 do-install:    # nothing
 
diff -r ada7a940b2cc -r 15d1377cbdc4 misc/xdg-dirs/Makefile
--- a/misc/xdg-dirs/Makefile    Thu Apr 28 22:57:55 2005 +0000
+++ b/misc/xdg-dirs/Makefile    Thu Apr 28 23:04:08 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/19 10:52:26 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2005/04/28 23:04:08 jlam Exp $
 #
 
 DISTNAME=      xdg-dirs-1.2
@@ -23,8 +23,7 @@
 .include "dirs.mk"
 .include "../../mk/bsd.prefs.mk"
 
-_SORTED!=      ${ECHO} ${XDG_DIRS} | ${TR} -s ' \t' '\n' | ${SORT}
-MAKE_DIRS+=    ${_SORTED:S/^/${PREFIX}\//}
+MAKE_DIRS+=    ${XDG_DIRS:O:S/^/${PREFIX}\//}
 
 do-install:    # nothing
 
diff -r ada7a940b2cc -r 15d1377cbdc4 misc/xorg-dirs/Makefile
--- a/misc/xorg-dirs/Makefile   Thu Apr 28 22:57:55 2005 +0000
+++ b/misc/xorg-dirs/Makefile   Thu Apr 28 23:04:08 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:46:40 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/04/28 23:04:08 jlam Exp $
 #
 
 DISTNAME=      xorg-dirs-1.1
@@ -23,8 +23,7 @@
 .include "../../mk/bsd.prefs.mk"
 .include "dirs.mk"
 
-_SORTED!=      ${ECHO} ${XORG_DIRS} | ${TR} -s ' \t' '\n' | ${SORT}
-MAKE_DIRS+=    ${_SORTED:S/^/${X11ROOT}\//}
+MAKE_DIRS+=    ${XORG_DIRS:O:S/^/${X11ROOT}\//}
 
 do-install:    # nothing