pkg/48024: PKG_OPTIONS.gtk2=-py-numpy doesn't work as expected

[Izumi Tsutsui <tsutsui%ceres.dti.ne.jp@localhost>]

>Number:         48024
>Category:       pkg
>Synopsis:       PKG_OPTIONS.gtk2=-py-numpy doesn't work as expected
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Jul 06 10:45:00 +0000 2013
>Originator:     Izumi Tsutsui
>Release:        NetBSD 6.1 + pkgsrc-2013Q2 updated around 201307060200Z
>Organization:
>Environment:
System: NetBSD 6.1 (MIRAGE)
Architecture: i386
Machine: i386
>Description:
pkgsrc/x11/py-gtk2 has an option py-numpy to disable fortran mess
but x11/py-gtk2/buildlink3.mk doesn't check the option
so build with PKG_OPTIONS.py-gtk2=-py-numpy fails on
packages that depend on py-gtk2.

>How-To-Repeat:
$ export PKG_OPTIONS.gtk2=-py-numpy
$ cd pkgsrc/sysutils/py-notify-python
$ make package

 :

===> Creating toolchain wrappers for py27-notify-python-0.1.1nb20
ERROR: py-27-numpy>=1.0 is not installed; can't buildlink files.
*** Error code 1

>Fix:
Check options rather than platforms in buildlink3.mk?
(not sure if options.mk should explicitly included or not)

Index: buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/py-gtk2/buildlink3.mk,v
retrieving revision 1.46
diff -u -p -r1.46 buildlink3.mk
--- buildlink3.mk       6 Jun 2013 12:53:56 -0000       1.46
+++ buildlink3.mk       6 Jul 2013 10:38:55 -0000
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=        pygtk2
 PYGTK2_BUILDLINK3_MK:=
 
 .include "../../lang/python/pyversion.mk"
+.include "../../mk/pkg-build-options.mk"
 
 BUILDLINK_API_DEPENDS.pygtk2+= ${PYPKGPREFIX}-gtk2>=2.8.4
 BUILDLINK_ABI_DEPENDS.pygtk2+= ${PYPKGPREFIX}-gtk2>=2.24.0nb13
@@ -13,10 +14,7 @@ BUILDLINK_PKGSRCDIR.pygtk2?= ../../x11/p
 
 .include "../../devel/py-gobject/buildlink3.mk"
 .include "../../devel/libglade/buildlink3.mk"
-.if (!empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Mx86_64) || \
-       !empty(MACHINE_ARCH:Mia64) || !empty(MACHINE_ARCH:Mpowerpc*) || \
-       !empty(MACHINE_ARCH:Mhppa) || !empty(MACHINE_ARCH:Msparc*) || \
-       !empty(MACHINE_ARCH:Malpha) || !empty(MACHINE_ARCH:Mmips*))
+.if !empty(PKG_OPTIONS:Mpy-numpy)
 .include "../../math/py-numpy/buildlink3.mk"
 .endif
 .include "../../x11/gtk2/buildlink3.mk"