[pkgsrc/trunk]: pkgsrc/mk Replaced some `if's with `case's to make the code s...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3ab464f1d067
branches:  trunk
changeset: 500387:3ab464f1d067
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Fri Oct 07 16:57:14 2005 +0000

description:
Replaced some `if's with `case's to make the code simpler. Merged
multiple ${ECHO_N} into one ${ECHO}.

diffstat:

 mk/bsd.pkg.mk |  14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)

diffs (41 lines):

diff -r 7dada9342d56 -r 3ab464f1d067 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Fri Oct 07 16:52:06 2005 +0000
+++ b/mk/bsd.pkg.mk     Fri Oct 07 16:57:14 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1726 2005/10/06 15:25:47 reed Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1727 2005/10/07 16:57:14 rillig Exp $
 #
 # This file is in the public domain.
 #
@@ -1280,7 +1280,7 @@
 _CHECK_DIST_PATH=                                                      \
        if [ "X${DIST_PATH}" != "X" ]; then                             \
                for d in "" ${DIST_PATH:S/:/ /g}; do                    \
-                       if [ "X$$d" = "X" -o "X$$d" = "X${DISTDIR}" ]; then continue; fi; \
+                       case $$d in "" | ${DISTDIR}) continue;; esac;   \
                        if [ -f $$d/${DIST_SUBDIR}/$$bfile ]; then      \
                                ${ECHO} "Using $$d/${DIST_SUBDIR}/$$bfile"; \
                                ${RM} -f $$bfile;                       \
@@ -3380,19 +3380,15 @@
        if [ -f ${DISTINFO_FILE} ]; then                                \
                ${AWK} '$$2 !~ /\(patch-[a-z0-9]+\)/ { print $$0 }' < ${DISTINFO_FILE} >> $$newfile; \
        else \
-               ${ECHO_N} "$$" > $$newfile;                             \
-               ${ECHO_N} "NetBSD" >> $$newfile;                        \
-               ${ECHO} "$$" >> $$newfile;                              \
+               ${ECHO} "\$$""NetBSD""\$$" > $$newfile;                 \
                ${ECHO} "" >> $$newfile;                                \
        fi;                                                             \
        if [ -d ${PATCHDIR} ]; then                                     \
                (cd ${PATCHDIR};                                        \
                for sumfile in "" patch-*; do                           \
-                       if [ "X$$sumfile" = "X" ]; then continue; fi;   \
-                       if [ "X$$sumfile" = "Xpatch-*" ]; then break; fi; \
                        case $$sumfile in                               \
-                               patch-local-*) ;;                       \
-                               *.orig|*.rej|*~) continue ;;            \
+                               "" | "patch-*") ;;                      \
+                               patch-local-* | *.orig | *.rej | *~) ;; \
                                *)      ${ECHO} "${PATCH_DIGEST_ALGORITHM} ($$sumfile) = `${SED} -e '/\$$NetBSD.*/d' $$sumfile | ${DIGEST} ${PATCH_DIGEST_ALGORITHM}`" >> $$newfile;; \
                        esac;                                           \
                done);                                                  \