svn commit: r303635 - in head/print: ghostscript8 ghostscript9

[Chris Rees]

On 4 Sep 2012 06:21, "Hiroki Sato" <hrs at freebsd.org> wrote:
>
> Author: hrs
> Date: Tue Sep  4 05:21:38 2012
> New Revision: 303635
> URL: http://svn.freebsd.org/changeset/ports/303635
>
> Log:
>   Fix build on !i386 && !amd64.
>
>   PR:   ports/171253  http://www.FreeBSD.org/cgi/query-pr.cgi?pr=171253
>
> Modified:
>   head/print/ghostscript8/Makefile
>   head/print/ghostscript8/Makefile.drivers
>   head/print/ghostscript9/Makefile
>   head/print/ghostscript9/Makefile.drivers
>
> Modified: head/print/ghostscript8/Makefile
>
==============================================================================
> --- head/print/ghostscript8/Makefile    Tue Sep  4 03:05:23 2012
 (r303634)
> +++ head/print/ghostscript8/Makefile    Tue Sep  4 05:21:38 2012
 (r303635)
> @@ -90,8 +90,8 @@ MLINKS=               gslp.1 gsbj.1 \
>  CIDFONTDIR=    ${DATADIR}/${PORTVERSION}/Resource
>  EXCLUDE_DIRS=  jbig2dec jpeg expat jasper libpng tiff zlib
>
> -.include "Makefile.drivers"
>  .include <bsd.port.pre.mk>
> +.include "Makefile.drivers"
>  .include "${FILESDIR}/Makefile.drivers_post"
>
>  .for D in ${OPTIONS_DEFINE:MGS_*:S/^GS_//}
>
> Modified: head/print/ghostscript8/Makefile.drivers
>
==============================================================================
> --- head/print/ghostscript8/Makefile.drivers    Tue Sep  4 03:05:23 2012
       (r303634)
> +++ head/print/ghostscript8/Makefile.drivers    Tue Sep  4 05:21:38 2012
       (r303635)
> @@ -13,9 +13,11 @@ OPTIONS_X11= \
>         GS_x11rg16x \
>         GS_x11rg32x
>
> +.if ${ARCH:Mamd64} || ${ARCH:Mi386}
>  OPTIONS_SVGALIB= \
>         GS_lvga256 \
>         GS_vgalib
> +.endif
>
>  OPTIONS_ICONV= \
>         GS_oprp \
>
> Modified: head/print/ghostscript9/Makefile
>
==============================================================================
> --- head/print/ghostscript9/Makefile    Tue Sep  4 03:05:23 2012
 (r303634)
> +++ head/print/ghostscript9/Makefile    Tue Sep  4 05:21:38 2012
 (r303635)
> @@ -95,8 +95,8 @@ MLINKS=               gslp.1 gsbj.1 \
>
>  EXCLUDE_DIRS=  freetype jbig2dec jpeg expat jasper libpng tiff zlib
>
> -.include "Makefile.drivers"
>  .include <bsd.port.pre.mk>
> +.include "Makefile.drivers"

You can't introduce OPTIONS after
bsd.port.pre.mk; this has broken INDEX because the options are no longer
properly recognised.

Please revert!

Chris