[pkgsrc/trunk]: pkgsrc/mk Simplify the _MASTER_SITE_{BACKUP,OVERRIDE} setting...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fdfc5b672d81
branches:  trunk
changeset: 503332:fdfc5b672d81
user:      tv <tv%pkgsrc.org@localhost>
date:      Fri Nov 18 14:31:54 2005 +0000

description:
Simplify the _MASTER_SITE_{BACKUP,OVERRIDE} settings a bit by using a :D
construct rather than .if defined(), and changing := to =.

diffstat:

 mk/bsd.pkg.mk |  15 +++------------
 1 files changed, 3 insertions(+), 12 deletions(-)

diffs (29 lines):

diff -r 2a161c3e7214 -r fdfc5b672d81 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Fri Nov 18 14:15:03 2005 +0000
+++ b/mk/bsd.pkg.mk     Fri Nov 18 14:31:54 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1758 2005/11/17 19:30:22 erh Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1759 2005/11/18 14:31:54 tv Exp $
 #
 # This file is in the public domain.
 #
@@ -664,17 +664,8 @@
 # Include popular master sites
 .include "../../mk/bsd.sites.mk"
 
-.if defined(DIST_SUBDIR)
-_MASTER_SITE_BACKUP:=  ${MASTER_SITE_BACKUP:=${DIST_SUBDIR}/}
-.  if defined(MASTER_SITE_OVERRIDE)
-_MASTER_SITE_OVERRIDE:=        ${MASTER_SITE_OVERRIDE:=${DIST_SUBDIR}/}
-.  endif # MASTER_SITE_OVERRIDE
-.else  # !DIST_SUBDIR
-_MASTER_SITE_BACKUP:=  ${MASTER_SITE_BACKUP}
-.  if defined(MASTER_SITE_OVERRIDE)
-_MASTER_SITE_OVERRIDE:= ${MASTER_SITE_OVERRIDE}
-.  endif # MASTER_SITE_OVERRIDE
-.endif # DIST_SUBDIR
+_MASTER_SITE_BACKUP=   ${MASTER_SITE_BACKUP:=${DIST_SUBDIR}${DIST_SUBDIR:D/}}
+_MASTER_SITE_OVERRIDE= ${MASTER_SITE_OVERRIDE:=${DIST_SUBDIR}${DIST_SUBDIR:D/}}
 
 # Where to put distfiles that don't have any other master site
 MASTER_SITE_LOCAL?=    ${MASTER_SITE_BACKUP:=LOCAL_PORTS/}