[pkgsrc/trunk]: pkgsrc/devel/scmgit Only include non-meta-pkg-friendly defini...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/59e54476ceeb
branches:  trunk
changeset: 536384:59e54476ceeb
user:      bjs <bjs%pkgsrc.org@localhost>
date:      Wed Dec 12 04:21:45 2007 +0000

description:
Only include non-meta-pkg-friendly definitions if the meta-pkg is not being built.

diffstat:

 devel/scmgit/Makefile        |   9 +++------
 devel/scmgit/Makefile.common |  11 ++++++++---
 2 files changed, 11 insertions(+), 9 deletions(-)

diffs (65 lines):

diff -r a64eae834eba -r 59e54476ceeb devel/scmgit/Makefile
--- a/devel/scmgit/Makefile     Wed Dec 12 04:11:29 2007 +0000
+++ b/devel/scmgit/Makefile     Wed Dec 12 04:21:45 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2007/12/12 04:11:29 bjs Exp $
+# $NetBSD: Makefile,v 1.23 2007/12/12 04:21:45 bjs Exp $
 
 .include "Makefile.common"
 
@@ -10,19 +10,16 @@
 MAINTAINER=    bjs%NetBSD.org@localhost
 COMMENT=       GIT version control suite meta-package
 
-PKG_DESTDIR_SUPPORT=   user-destdir
-
 DEPENDS+=      scmgit-base-[0-9]*:../../devel/scmgit-base
 DEPENDS+=      scmgit-docs-[0-9]*:../../devel/scmgit-docs
 
-AUTO_MKDIRS=           no
 NO_CHECKSUM=           yes
 NO_CONFIGURE=          yes
+NO_PATCH=              yes
 NO_BUILD=              yes
+
 PLIST_SRC=             # empty (meta-package)
 
-do-patch:
-
 do-install:
 
 .include "../../mk/bsd.pkg.mk"
diff -r a64eae834eba -r 59e54476ceeb devel/scmgit/Makefile.common
--- a/devel/scmgit/Makefile.common      Wed Dec 12 04:11:29 2007 +0000
+++ b/devel/scmgit/Makefile.common      Wed Dec 12 04:21:45 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1.1.1 2007/12/12 04:05:27 bjs Exp $
+# $NetBSD: Makefile.common,v 1.2 2007/12/12 04:21:45 bjs Exp $
 #
 
 DISTNAME=      git-${GIT_VERSION}
@@ -8,13 +8,17 @@
 MAINTAINER?=   pancake%phreaker.net@localhost
 HOMEPAGE?=     http://git.or.cz/
 
-PATCHDIR=      ${.CURDIR}/../scmgit-base/patches
-DISTINFO_FILE= ${.CURDIR}/../scmgit-base/distinfo
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
 GIT_VERSION=   1.5.3.7
 
+.include "../../mk/bsd.fast.prefs.mk"
+
+.if "${PKGPATH}" != "devel/scmgit"
+PATCHDIR=      ${.CURDIR}/../scmgit-base/patches
+DISTINFO_FILE= ${.CURDIR}/../scmgit-base/distinfo
+
 MAKE_ENV+=     HOME=${PREFIX:Q}
 USE_TOOLS+=    gmake tar perl sh
 EXTRACT_USING?=        gtar
@@ -29,3 +33,4 @@
 CFLAGS.NetBSD+=        -D_NETBSD_SOURCE
 
 AUTO_MKDIRS?=  yes
+.endif