diff options
| author | gdt <gdt@pkgsrc.org> | 2008-07-02 13:14:23 +0000 |
|---|---|---|
| committer | gdt <gdt@pkgsrc.org> | 2008-07-02 13:14:23 +0000 |
| commit | b2cf461775ca39c17a3b3dc79d6950e53dec6ed8 (patch) | |
| tree | b71d51dfbc247dd06526765072e445795ca559a7 /devel | |
| parent | d4c1c81c3050f6ed26cc36ccc07987db661789c6 (diff) | |
| download | pkgsrc-b2cf461775ca39c17a3b3dc79d6950e53dec6ed8.tar.gz | |
Add java option, defaulting to off. Make the subversion metapackage
not depend on java unless the option is selected. Resolves problem of
default dependency on non-portable and non-Free code in a Free
package. Approved in concept by epg. PKGREVISION++.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/subversion-base/options.mk | 4 | ||||
| -rw-r--r-- | devel/subversion/Makefile | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/devel/subversion-base/options.mk b/devel/subversion-base/options.mk index 50fdfcbd4fd..8c79586f9e0 100644 --- a/devel/subversion-base/options.mk +++ b/devel/subversion-base/options.mk @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.5 2008/03/08 21:00:53 gdt Exp $ +# $NetBSD: options.mk,v 1.6 2008/07/02 13:14:23 gdt Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.subversion -PKG_SUPPORTED_OPTIONS= apache22 apr1 serf +PKG_SUPPORTED_OPTIONS= apache22 apr1 serf java PKG_SUGGESTED_OPTIONS= apr1 # Note that this file is included as part of several packages. diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile index f087cff67da..1b8b8f026c0 100644 --- a/devel/subversion/Makefile +++ b/devel/subversion/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.35 2008/06/29 11:36:01 gdt Exp $ +# $NetBSD: Makefile,v 1.36 2008/07/02 13:14:23 gdt Exp $ PKGNAME= subversion-${SVNVER} -PKGREVISION= 1 +PKGREVISION= 2 COMMENT= Version control system, meta-package PKG_DESTDIR_SUPPORT= user-destdir @@ -10,11 +10,15 @@ PKG_DESTDIR_SUPPORT= user-destdir DEPENDS+= subversion-base-${SVNVER}{,nb[0-9]*}:../../devel/subversion-base DEPENDS+= ${APACHE_PKG_PREFIX}-subversion-${SVNVER}{,nb[0-9]*}:../../www/ap2-subversion -DEPENDS+= java-subversion-${SVNVER}{,nb[0-9]*}:../../devel/java-subversion DEPENDS+= p5-subversion-${SVNVER}{,nb[0-9]*}:../../devel/p5-subversion DEPENDS+= ${PYPKGPREFIX}-subversion-${SVNVER}{,nb[0-9]*}:../../devel/py-subversion DEPENDS+= ${RUBY_PKGPREFIX}-subversion-${SVNVER}{,nb[0-9]*}:../../devel/ruby-subversion +.if !empty(PKG_OPTIONS:Mjava) +# The standard implementation of java is non-portable and non-free, so +# we do not depend on it by default. +DEPENDS+= java-subversion-${SVNVER}{,nb[0-9]*}:../../devel/java-subversion +.endif CATEGORIES+= meta-pkgs |