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

6 files changed, 15 insertions, 21 deletions

diff --git a/misc/gnome-dirs/Makefile b/misc/gnome-dirs/Makefile
index 6cf4fbecf92..c8c640efec5 100644
--- a/misc/gnome-dirs/Makefile
+++ b/misc/gnome-dirs/Makefile
@@ -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 @@ NO_BUILD=	# defined
 .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 --git a/misc/gnome1-dirs/Makefile b/misc/gnome1-dirs/Makefile
index 1b127b903f4..03ce5dd6ad8 100644
--- a/misc/gnome1-dirs/Makefile
+++ b/misc/gnome1-dirs/Makefile
@@ -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 @@ NO_BUILD=	# defined
 .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 --git a/misc/gnome2-dirs/Makefile b/misc/gnome2-dirs/Makefile
index 087bc21ff32..ea504ed6ab1 100644
--- a/misc/gnome2-dirs/Makefile
+++ b/misc/gnome2-dirs/Makefile
@@ -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 @@ NO_BUILD=	# defined
 
 .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 --git a/misc/theme-dirs/Makefile b/misc/theme-dirs/Makefile
index 90039705cc3..babc16fce33 100644
--- a/misc/theme-dirs/Makefile
+++ b/misc/theme-dirs/Makefile
@@ -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 @@ WRKSRC=		${WRKDIR}
 .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 --git a/misc/xdg-dirs/Makefile b/misc/xdg-dirs/Makefile
index 8e30849f177..53b78ee3ff2 100644
--- a/misc/xdg-dirs/Makefile
+++ b/misc/xdg-dirs/Makefile
@@ -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 @@ WRKSRC=		${WRKDIR}
 .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 --git a/misc/xorg-dirs/Makefile b/misc/xorg-dirs/Makefile
index 1dfde2a2dd7..82613eb8b79 100644
--- a/misc/xorg-dirs/Makefile
+++ b/misc/xorg-dirs/Makefile
@@ -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 @@ XORG_ONLY_DIRS=		# defined
 .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