ports/123859: print/ghostscript-gpl-nox11: PKGNAMESUFFIX not being defined

[Scot Hetzel]

>Number:         123859
>Category:       ports
>Synopsis:       print/ghostscript-gpl-nox11: PKGNAMESUFFIX not being defined
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed May 21 13:00:07 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Scot Hetzel
>Release:        8.0-CURRENT
>Organization:
>Environment:
FreeBSD hp010 8.0-CURRENT FreeBSD 8.0-CURRENT #4: Sat May 17 20:53:07 CDT 2008     root at hp010:/usr/obj/usr/src/8x/sys/DV8135NR  amd64

>Description:
When rebuilding the INDEX with either make index or portsdb -Uu the following warning is generated:

Warning: Duplicate INDEX entry:  ghostscript-gpl-8.62_2

The cause of the warning is due to the OPTIONSFILE defines at least one of these:

 WITH_GS_x11
 WITH_GS_x11alpha
 WITH_GS_x11cmyk
 WITH_GS_x11cmyk2
 WITH_GS_x11cmyk4
 WITH_GS_x11cmyk8
 WITH_GS_x11gray2
 WITH_GS_x11gray4
 WITH_GS_x11mono
 WITH_GS_x11rg16x
 WITH_GS_x11rg32x

when WITHOUT_X11 is defined.  Which prevents -nox11 being added to PKGNAMESUFFIX.
>How-To-Repeat:
$ cd /usr/ports/print/ghoscript-gpl
$ make config

enable one or more of the GS_x11* option

$ make -V PKGNAME
ghostscript-gpl-8.62_2

$ cd ../ghostscript-gpl-nox11
$ make -V PKGNAME
"/usr/ports/print/ghostscript-gpl-nox11/../ghostscript-gpl/Makefile", line 132: warning: drivers incompatible with WITHOUT_X11 will be removed automatically
ghostscript-gpl-8.62_2


>Fix:
apply the attached patch.

Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/print/ghostscript-gpl/Makefile,v
retrieving revision 1.167
diff -u -r1.167 Makefile
--- Makefile	8 May 2008 18:54:22 -0000	1.167
+++ Makefile	21 May 2008 12:32:07 -0000
@@ -117,7 +117,8 @@
 . endif
 .endif
 
-.if defined(WITH_GS_x11) \
+.if defined(WITHOUT_X11)
+. if defined(WITH_GS_x11) \
 	|| defined(WITH_GS_x11alpha) \
 	|| defined(WITH_GS_x11cmyk) \
 	|| defined(WITH_GS_x11cmyk2) \
@@ -128,7 +129,6 @@
 	|| defined(WITH_GS_x11mono) \
 	|| defined(WITH_GS_x11rg16x) \
 	|| defined(WITH_GS_x11rg32x)
-. if defined(WITHOUT_X11)
 . warning drivers incompatible with WITHOUT_X11 will be removed automatically
 . undef WITH_GS_x11
 . undef WITH_GS_x11alpha
@@ -142,13 +142,27 @@
 . undef WITH_GS_x11rg16x
 . undef WITH_GS_x11rg32x
 . endif
+PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-nox11
+CONFIGURE_ARGS+=--without-x
+.else
+. if defined(WITH_GS_x11) \
+	|| defined(WITH_GS_x11alpha) \
+	|| defined(WITH_GS_x11cmyk) \
+	|| defined(WITH_GS_x11cmyk2) \
+	|| defined(WITH_GS_x11cmyk4) \
+	|| defined(WITH_GS_x11cmyk8) \
+	|| defined(WITH_GS_x11gray2) \
+	|| defined(WITH_GS_x11gray4) \
+	|| defined(WITH_GS_x11mono) \
+	|| defined(WITH_GS_x11rg16x) \
+	|| defined(WITH_GS_x11rg32x)
 USE_XORG=	xt xext
 CONFIGURE_ARGS+=--with-x \
 		--x-includes=${X11BASE}/include \
 		--x-libraries=${X11BASE}/lib
-.else
-PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-nox11
+. else
 CONFIGURE_ARGS+=--without-x
+. endif
 .endif
 
 .if defined(WITH_GS_oprp) \


>Release-Note:
>Audit-Trail:
>Unformatted: