diff --git a/shared/lib/PackagesMacro/extension.rb b/shared/lib/PackagesMacro/extension.rb --- a/shared/lib/PackagesMacro/extension.rb +++ b/shared/lib/PackagesMacro/extension.rb @@ -6,14 +6,23 @@ use_dsl named :package + name_positional_attributes 'pkgname' def process parent, target, attrs - packagename = target + pkgorigin = target - target = %(https://cgit.freebsd.org/ports/tree/#{target}/pkg-descr) - parent.document.register :links, target + if pkgorigin.include?("@") + pkgorigin = pkgorigin[0..pkgorigin.index("@")-1] + end - %(#{packagename}) + pkgname = if (pkgname = attrs['pkgname']) + "#{pkgname}" + else + "#{target}" + end + + url = %(https://cgit.freebsd.org/ports/tree/#{pkgorigin}/) + + %(#{pkgname}) end end -