pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk Reordered the conditions of checking for .tar files...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/9d4eb21c637a
branches:  trunk
changeset: 498190:9d4eb21c637a
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Mon Aug 15 12:57:07 2005 +0000

description:
Reordered the conditions of checking for .tar files in DISTFILES to improve
readability.

diffstat:

 mk/bsd.pkg.extract.mk |  11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diffs (26 lines):

diff -r 42e0404c1112 -r 9d4eb21c637a mk/bsd.pkg.extract.mk
--- a/mk/bsd.pkg.extract.mk     Mon Aug 15 12:44:45 2005 +0000
+++ b/mk/bsd.pkg.extract.mk     Mon Aug 15 12:57:07 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.extract.mk,v 1.10 2005/07/15 18:27:54 jlam Exp $
+# $NetBSD: bsd.pkg.extract.mk,v 1.11 2005/08/15 12:57:07 rillig Exp $
 #
 # This Makefile fragment is included to bsd.pkg.mk and defines the
 # relevant variables and targets for the "extract" phase.
@@ -49,11 +49,12 @@
 _EXTRACT_SUFFIXES+=    .bin
 _EXTRACT_SUFFIXES+=    .rar
 
-.if !empty(EXTRACT_ONLY:M*.tar) || !empty(EXTRACT_ONLY:M*.tar.*) || \
-    !empty(EXTRACT_SUFX:M*.tar) || !empty(EXTRACT_SUFX:M*.tar.*) || \
-    !empty(EXTRACT_ONLY:M*.tbz) || !empty(EXTRACT_ONLY:M*.tgz) || \
-    !empty(EXTRACT_SUFX:M*.tbz) || !empty(EXTRACT_SUFX:M*.tgz) || \
+.if !empty(EXTRACT_ONLY:M*.tar)    || !empty(EXTRACT_SUFX:M*.tar)   || \
+    !empty(EXTRACT_ONLY:M*.tar.*)  || !empty(EXTRACT_SUFX:M*.tar.*) || \
+    !empty(EXTRACT_ONLY:M*.tbz)    || !empty(EXTRACT_SUFX:M*.tbz)   || \
+    !empty(EXTRACT_ONLY:M*.tgz)    || !empty(EXTRACT_SUFX:M*.tgz)   || \
     !empty(EXTRACT_ONLY:M*_tar.gz) || !empty(EXTRACT_SUFX:M*_tar.gz)
+
 .  if !empty(EXTRACT_USING:Mgtar)
 USE_TOOLS+=    gtar
 .  elif !empty(EXTRACT_USING:Mnbtar)



Home | Main Index | Thread Index | Old Index