ports/186705: [patch] print/ghostscript9: fix iconv detection

[Tijl Coosemans]

>Number:         186705
>Category:       ports
>Synopsis:       [patch] print/ghostscript9: fix iconv detection
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Feb 12 20:50:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Tijl Coosemans
>Release:        FreeBSD 11.0-CURRENT i386
>Organization:
>Environment:
>Description:
Don't enforce the use of GNU libiconv on FreeBSD 10.
>How-To-Repeat:
>Fix:

--- ghostscript.patch begins here ---
Index: print/ghostscript8/Makefile
===================================================================
--- print/ghostscript8/Makefile	(revision 343867)
+++ print/ghostscript8/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	ghostscript
 PORTVERSION=	8.71
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	print
 MASTER_SITES=	http://downloads.ghostscript.com/public/:gs_srcs \
 		SF/ghostscript/GPL%20Ghostscript/${PORTVERSION}:gs_srcs \
@@ -47,7 +47,6 @@ GNU_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=	yes
 MAKE_ENV=	CFLAGS_STANDARD="${CFLAGS}" \
 		XCFLAGS="${XCFLAGS}" XLDFLAGS="${XLDFLAGS}" \
-		EXTRALIBS="${EXTRALIBS}" \
 		SOC_LOADER="dxmainc.c"
 CONFIGURE_ENV=	${MAKE_ENV}
 CONFIGURE_ARGS=	--disable-compile-inits \
Index: print/ghostscript8/files/Makefile.drivers_post
===================================================================
--- print/ghostscript8/files/Makefile.drivers_post	(revision 343867)
+++ print/ghostscript8/files/Makefile.drivers_post	(working copy)
@@ -109,8 +109,7 @@ PORT_OPTIONS:=	${PORT_OPTIONS:NGS_${D}}
 
 .if defined(_ICONV_DEVS)
 USES+=		iconv
-CONFIGURE_ARGS+=--with-libiconv=gnu
-EXTRALIBS+=	-liconv
+CONFIGURE_ARGS+=--with-libiconv=maybe
 .else
 CONFIGURE_ARGS+=--with-libiconv=no
 .endif
Index: print/ghostscript9/Makefile
===================================================================
--- print/ghostscript9/Makefile	(revision 343867)
+++ print/ghostscript9/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	ghostscript
 PORTVERSION=	9.06
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	print
 MASTER_SITES=	http://downloads.ghostscript.com/public/:gs_srcs \
 		SF/ghostscript/GPL%20Ghostscript/${PORTVERSION}:gs_srcs \
@@ -47,7 +47,6 @@ GNU_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=	yes
 MAKE_ENV=	CFLAGS_STANDARD="${CFLAGS}" \
 		XCFLAGS="${XCFLAGS}" XLDFLAGS="${XLDFLAGS}" \
-		EXTRALIBS="${EXTRALIBS}" \
 		SOC_LOADER="dxmainc.c"
 CONFIGURE_ENV=	${MAKE_ENV}
 CONFIGURE_ARGS=	--disable-compile-inits \
Index: print/ghostscript9/files/Makefile.drivers_post
===================================================================
--- print/ghostscript9/files/Makefile.drivers_post	(revision 343867)
+++ print/ghostscript9/files/Makefile.drivers_post	(working copy)
@@ -111,8 +111,7 @@ PORT_OPTIONS:=	${PORT_OPTIONS:NGS_${D}}
 
 .if defined(_ICONV_DEVS)
 USES+=		iconv
-CONFIGURE_ARGS+=--with-libiconv=gnu
-EXTRALIBS+=	-liconv
+CONFIGURE_ARGS+=--with-libiconv=maybe
 .else
 CONFIGURE_ARGS+=--with-libiconv=no
 .endif
Index: print/ghostscript9-agpl/Makefile
===================================================================
--- print/ghostscript9-agpl/Makefile	(revision 343867)
+++ print/ghostscript9-agpl/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	ghostscript
 PORTVERSION=	9.07
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	print
 MASTER_SITES=	http://downloads.ghostscript.com/public/:gs_srcs \
 		SF/ghostscript/GPL%20Ghostscript/${PORTVERSION}:gs_srcs \
@@ -44,7 +44,6 @@ GNU_CONFIGURE=	yes
 
 MAKE_ENV=	CFLAGS_STANDARD="${CFLAGS}" \
 		XCFLAGS="${XCFLAGS}" XLDFLAGS="${XLDFLAGS}" \
-		EXTRALIBS="${EXTRALIBS}" \
 		SOC_LOADER="dxmainc.c"
 CONFIGURE_ENV=	${MAKE_ENV}
 CONFIGURE_ARGS=	--disable-compile-inits \
Index: print/ghostscript9-agpl/files/Makefile.drivers_post
===================================================================
--- print/ghostscript9-agpl/files/Makefile.drivers_post	(revision 343867)
+++ print/ghostscript9-agpl/files/Makefile.drivers_post	(working copy)
@@ -111,8 +111,7 @@ PORT_OPTIONS:=	${PORT_OPTIONS:NGS_${D}}
 
 .if defined(_ICONV_DEVS)
 USES+=		iconv
-CONFIGURE_ARGS+=--with-libiconv=gnu
-EXTRALIBS+=	-liconv
+CONFIGURE_ARGS+=--with-libiconv=maybe
 .else
 CONFIGURE_ARGS+=--with-libiconv=no
 .endif
--- ghostscript.patch ends here ---

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