Breaking the Drug-War Habit

In the last six months, two US states voted to legalize marijuana, and Mexican voters elected a president who wants to end his country's bloody campaign against drug lords. With the "war on drugs" apparently winding down, how should governments bolster international efforts to fight drug trafficking?