pkg/48479: [PATCH] ghostscript-cidfonts doesn't switch correctly ghostscript-agpl and -gpl

[Makoto.Fujiwara%t-105.i.ki.nu@localhost]

>Number:         48479
>Category:       pkg
>Synopsis:       [PATCH] ghostscript-cidfonts doesn't switch correctly 
>ghostscript-agpl and -gpl
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Wed Dec 25 03:10:00 +0000 2013
>Originator:     Makoto Fujiwara
>Release:        NetBSD 6.1.2
>Organization:
KINU Corporation
>Environment:
        
        
System: NetBSD t-105 6.1.2 NetBSD 6.1.2 (GENERIC) amd64
Architecture: x86_64
Machine: amd64
>Description:
For ghostscript, we have following three case:
   1 PKG_OPTIONS.gs_type=ghostscript-agpl
   2 PKG_OPTIONS.gs_type=ghostscript-gpl
   3 None of both above are set
     (defaults to 2 by following line in print/ghostscript/Makefile)
      PKG_SUGGESTED_OPTIONS+=         ghostscript-gpl
But ghostscript-cidfonts will package -gpl side even when option 1 is selected.
>How-To-Repeat:
(set one of three listed above)

cd pkgsrc/fonts/ghostscript-cidfonts

pkg_delete -r ghostscript-agpl
pkg_delete -r ghostscript-gpl
make clean-depends
   (You may notice case 1 will clean -gpl side at this stage)
make clean && make package
>Fix:
Index: fonts/ghostscript-cidfonts/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/fonts/ghostscript-cidfonts/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- fonts/ghostscript-cidfonts/Makefile 16 Mar 2013 23:02:18 -0000      1.18
+++ fonts/ghostscript-cidfonts/Makefile 25 Dec 2013 03:04:55 -0000
@@ -10,10 +10,9 @@
 COMMENT=       CIDFont resources for Ghostscript
 
 DEPENDS+=      adobe-cidfonts>=20000901:../../fonts/adobe-cidfonts
-DEPENDS+=      ghostscript-gpl-[0-9]*:../../print/ghostscript-gpl
+DEPENDS+=      ghostscript-[0-9]*:../../print/ghostscript
 
 GHOSTSCRIPT_REQD=      9.05
-.include       "../../print/ghostscript-gpl/Makefile.common"
 
 ADOBE_RESOURCEDIR=     ${PREFIX}/share/Adobe/Resource
 GS_RESOURCEDIR=                
${PREFIX}/share/ghostscript/${GS_VERSION}/Resource

>Unformatted:
 ghostscript-cidfonts doesn't switch correctly ghostscript-agpl and -gpl