[pkgsrc/trunk]: pkgsrc/devel Add java option, defaulting to off. Make the su...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e5160ee1b8d3
branches:  trunk
changeset: 544007:e5160ee1b8d3
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Wed Jul 02 13:14:23 2008 +0000

description:
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:

 devel/subversion-base/options.mk |   4 ++--
 devel/subversion/Makefile        |  10 +++++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diffs (43 lines):

diff -r b50703a9c259 -r e5160ee1b8d3 devel/subversion-base/options.mk
--- a/devel/subversion-base/options.mk  Wed Jul 02 11:12:49 2008 +0000
+++ b/devel/subversion-base/options.mk  Wed Jul 02 13:14:23 2008 +0000
@@ -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 -r b50703a9c259 -r e5160ee1b8d3 devel/subversion/Makefile
--- a/devel/subversion/Makefile Wed Jul 02 11:12:49 2008 +0000
+++ b/devel/subversion/Makefile Wed Jul 02 13:14:23 2008 +0000
@@ -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 @@
 
 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