pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk Move definition of PKGNAME and PKGNAME_NOREV higher...
details: https://anonhg.NetBSD.org/pkgsrc/rev/edcc8b14fb17
branches: trunk
changeset: 480586:edcc8b14fb17
user: jlam <jlam%pkgsrc.org@localhost>
date: Wed Sep 15 15:26:10 2004 +0000
description:
Move definition of PKGNAME and PKGNAME_NOREV higher in the file since their
expanded values are used somewhere in the middle.
diffstat:
mk/bsd.pkg.mk | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diffs (49 lines):
diff -r f221f2255841 -r edcc8b14fb17 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk Wed Sep 15 15:15:14 2004 +0000
+++ b/mk/bsd.pkg.mk Wed Sep 15 15:26:10 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1497 2004/09/11 07:26:03 agc Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1498 2004/09/15 15:26:10 jlam Exp $
#
# This file is in the public domain.
#
@@ -109,6 +109,19 @@
PKGBASE?= ${PKGNAME:C/-[^-]*$//}
PKGVERSION?= ${PKGNAME:C/^.*-//}
PKGWILDCARD?= ${PKGBASE}-[0-9]*
+.if defined(PKGREVISION) && !empty(PKGREVISION) && (${PKGREVISION} != "0")
+. if defined(PKGNAME)
+PKGNAME_NOREV:= ${PKGNAME}
+PKGNAME:= ${PKGNAME}nb${PKGREVISION}
+. else
+PKGNAME?= ${DISTNAME}nb${PKGREVISION}
+PKGNAME_NOREV= ${DISTNAME}
+. endif
+.else
+PKGNAME?= ${DISTNAME}
+PKGNAME_NOREV= ${PKGNAME}
+.endif
+SVR4_PKGNAME?= ${PKGNAME}
_DISTDIR?= ${DISTDIR}/${DIST_SUBDIR}
@@ -1023,19 +1036,6 @@
# Derived names so that they're easily overridable.
DISTFILES?= ${DISTNAME}${EXTRACT_SUFX}
-.if defined(PKGREVISION) && ${PKGREVISION} != "" && ${PKGREVISION} != "0"
-. if defined(PKGNAME)
-PKGNAME_NOREV:= ${PKGNAME}
-PKGNAME:= ${PKGNAME}nb${PKGREVISION}
-. else
-PKGNAME?= ${DISTNAME}nb${PKGREVISION}
-PKGNAME_NOREV= ${DISTNAME}
-. endif
-.else
-PKGNAME?= ${DISTNAME}
-PKGNAME_NOREV= ${PKGNAME}
-.endif
-SVR4_PKGNAME?= ${PKGNAME}
MAINTAINER?= tech-pkg%NetBSD.org@localhost
Home |
Main Index |
Thread Index |
Old Index