diff options
author | wiz <wiz@pkgsrc.org> | 2008-12-01 14:41:52 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2008-12-01 14:41:52 +0000 |
commit | 70afe9a1899b1188aa1a3604770ce738513e0eed (patch) | |
tree | 487b4ea9533daa104ff4cea8c6fb839740d0887d /sysutils | |
parent | 0f420f155059c082f5f9efbfe90c3de166d109a3 (diff) | |
download | pkgsrc-70afe9a1899b1188aa1a3604770ce738513e0eed.tar.gz |
Move options handling into options.mk file, and include that from Makefile,
not Makefile.common.
Fixes gnome-vfs-smb installation problem reported by Jared D. McNeill
on pkgsrc-changes.
Diffstat (limited to 'sysutils')
-rw-r--r-- | sysutils/gnome-vfs/Makefile | 3 | ||||
-rw-r--r-- | sysutils/gnome-vfs/Makefile.common | 33 | ||||
-rw-r--r-- | sysutils/gnome-vfs/options.mk | 36 |
3 files changed, 39 insertions, 33 deletions
diff --git a/sysutils/gnome-vfs/Makefile b/sysutils/gnome-vfs/Makefile index 588e21effbe..07d6bda3793 100644 --- a/sysutils/gnome-vfs/Makefile +++ b/sysutils/gnome-vfs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.71 2008/11/23 13:43:40 jmcneill Exp $ +# $NetBSD: Makefile,v 1.72 2008/12/01 14:41:52 wiz Exp $ PKGREVISION= 1 @@ -24,6 +24,7 @@ PKG_DESTDIR_SUPPORT= user-destdir MAKE_JOBS_SAFE= no .include "Makefile.common" +.include "options.mk" CONFIGURE_ARGS+= --enable-fam diff --git a/sysutils/gnome-vfs/Makefile.common b/sysutils/gnome-vfs/Makefile.common index 0f2f7172762..e3890ac8c80 100644 --- a/sysutils/gnome-vfs/Makefile.common +++ b/sysutils/gnome-vfs/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.14 2008/11/24 13:01:33 wiz Exp $ +# $NetBSD: Makefile.common,v 1.15 2008/12/01 14:41:52 wiz Exp $ # GNOME_VFS_VERSION= 2.24.0 @@ -44,38 +44,7 @@ EGDIR= ${PREFIX}/share/examples/gnome-vfs-2.0 CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} .endfor -PKG_OPTIONS_VAR= PKG_OPTIONS.gnome-vfs -PKG_SUPPORTED_OPTIONS+= inet6 gssapi hal -PKG_SUGGESTED_OPTIONS+= hal - .include "../../mk/bsd.prefs.mk" -.if ${OPSYS} == NetBSD -# Kerberos is built in - no additional dependency -PKG_SUGGESTED_OPTIONS+= gssapi -.endif - -.include "../../mk/bsd.options.mk" - -.if !empty(PKG_OPTIONS:Minet6) -CONFIGURE_ARGS+= --enable-ipv6 -.else -CONFIGURE_ARGS+= --disable-ipv6 -.endif - -.if !empty(PKG_OPTIONS:Mgssapi) -.include "../../mk/krb5.buildlink3.mk" -CONFIGURE_ENV+= KRB5_CONFIG=${SH_KRB5_CONFIG} -.else -CONFIGURE_ENV+= ac_cv_path_KRB5_CONFIG=none -.endif - -.if !empty(PKG_OPTIONS:Mhal) -MESSAGE_SRC+= MESSAGE.hal -.include "../../sysutils/hal/buildlink3.mk" -CONFIGURE_ARGS+= --enable-hal -.else -CONFIGURE_ARGS+= --disable-hal -.endif # XXX Work-around for a problem in the configure script which checks for # statvfs(2) having SVR4 in mind. Solving this in the script itself could diff --git a/sysutils/gnome-vfs/options.mk b/sysutils/gnome-vfs/options.mk new file mode 100644 index 00000000000..274c05f75bb --- /dev/null +++ b/sysutils/gnome-vfs/options.mk @@ -0,0 +1,36 @@ +# $NetBSD: options.mk,v 1.1 2008/12/01 14:41:52 wiz Exp $ +# + +PKG_OPTIONS_VAR= PKG_OPTIONS.gnome-vfs +PKG_SUPPORTED_OPTIONS= gssapi hal inet6 +PKG_SUGGESTED_OPTIONS= hal + +.include "../../mk/bsd.prefs.mk" + +.if ${OPSYS} == NetBSD +# Kerberos is built in - no additional dependency +PKG_SUGGESTED_OPTIONS+= gssapi +.endif + +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:Mgssapi) +.include "../../mk/krb5.buildlink3.mk" +CONFIGURE_ENV+= KRB5_CONFIG=${SH_KRB5_CONFIG} +.else +CONFIGURE_ENV+= ac_cv_path_KRB5_CONFIG=none +.endif + +.if !empty(PKG_OPTIONS:Mhal) +MESSAGE_SRC+= ${.CURDIR}/MESSAGE.hal +.include "../../sysutils/hal/buildlink3.mk" +CONFIGURE_ARGS+= --enable-hal +.else +CONFIGURE_ARGS+= --disable-hal +.endif + +.if !empty(PKG_OPTIONS:Minet6) +CONFIGURE_ARGS+= --enable-ipv6 +.else +CONFIGURE_ARGS+= --disable-ipv6 +.endif |