Fix parsing of options

Conflicts:
	libpkg/pkg_manifest.c