summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbjs <bjs>2007-12-12 04:21:45 +0000
committerbjs <bjs>2007-12-12 04:21:45 +0000
commitdd3c02261a5373520e6d4a313058d95f8b96893f (patch)
tree16da00542544cdfa178f96124765d6ffae79ae9a
parentbb54c989c782a88e88ef83cec7b1891a64296cee (diff)
downloadpkgsrc-dd3c02261a5373520e6d4a313058d95f8b96893f.tar.gz
Only include non-meta-pkg-friendly definitions if the meta-pkg is not being built.
-rw-r--r--devel/scmgit/Makefile9
-rw-r--r--devel/scmgit/Makefile.common11
2 files changed, 11 insertions, 9 deletions
diff --git a/devel/scmgit/Makefile b/devel/scmgit/Makefile
index 690ab1e5689..a1893dfc6c7 100644
--- a/devel/scmgit/Makefile
+++ b/devel/scmgit/Makefile
@@ -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,18 +10,15 @@ DISTFILES= # empty
MAINTAINER= bjs@NetBSD.org
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:
+PLIST_SRC= # empty (meta-package)
do-install:
diff --git a/devel/scmgit/Makefile.common b/devel/scmgit/Makefile.common
index d074e22efae..a2b272a78c7 100644
--- a/devel/scmgit/Makefile.common
+++ b/devel/scmgit/Makefile.common
@@ -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 @@ MASTER_SITES?= http://www.kernel.org/pub/software/scm/git/
MAINTAINER?= pancake@phreaker.net
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 @@ LIBS.SunOS+= -liconv
CFLAGS.NetBSD+= -D_NETBSD_SOURCE
AUTO_MKDIRS?= yes
+.endif