kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add java option, defaulting to off. Make the subversion metapackage

Browse source 
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++.
This commit is contained in:
gdt 2008-07-02 13:14:23 +00:00
parent d4c1c81c30
commit b2cf461775
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
devel/subversion-base/options.mk
View file

@ -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.

10
devel/subversion/Makefile
View file

@ -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