- Fix build when WITHOUT_X11=yes.

- Fix CONFLICTS.
- Build and install a dynamic module X11.so when !WITHOUT_X11.

5 files changed, 47 insertions, 5 deletions

diff --git a/print/ghostscript9/Makefile b/print/ghostscript9/Makefile
index 15dab49e4576..fb1c6809fada 100644
--- a/print/ghostscript9/Makefile
+++ b/print/ghostscript9/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ghostscript9
 PORTVERSION=	9.02
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	http://ghostscript.com/releases/:gs_srcs \
 		SF/ghostscript/files/GPL%20Ghostscript/${PORTVERSION}:gs_srcs \
@@ -67,7 +67,8 @@ XCFLAGS=	${PTHREAD_CFLAGS}
 XLDFLAGS=	${PTHREAD_LIBS}
 
 PLIST_SUB=	GS_VERSION="${PORTVERSION}" \
-		CIDFONTDIR="${CIDFONTDIR:S,^${PREFIX}/,,}"
+		CIDFONTDIR="${CIDFONTDIR:S,^${PREFIX}/,,}" \
+		X11BITS=${X11BITS}
 SUB_FILES=	pkg-message
 SUB_LIST=	DATADIR=${DATADIR} PORTVERSION=${PORTVERSION}
 PKGMESSAGE=	${WRKDIR}/pkg-message
diff --git a/print/ghostscript9/files/Makefile.drivers_post b/print/ghostscript9/files/Makefile.drivers_post
index f742282848d3..8a99e84be0c5 100644
--- a/print/ghostscript9/files/Makefile.drivers_post
+++ b/print/ghostscript9/files/Makefile.drivers_post
@@ -114,10 +114,11 @@ WITH_GS_${D}=yes
 
 .if defined(_X11_DEVS)
 USE_XORG=	xt xext
+X11BITS=	""
 CONFIGURE_ARGS+=--with-x \
 		--x-includes=${X11BASE}/include \
 		--x-libraries=${X11BASE}/lib
-CONFLICTS+=	ghostscript8-nox11-[0-9]*
+CONFLICTS+=	ghostscript9-nox11-[0-9]*
 .if defined(WITH_GTK)
 USE_GNOME=	atk gdkpixbuf glib20 gtk20
 CONFIGURE_ARGS+=--enable-gtk
@@ -127,7 +128,8 @@ CONFIGURE_ARGS+=--disable-gtk
 .else	# defined(_X11_DEVS)
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-nox11
 CONFIGURE_ARGS+=--without-x --disable-gtk
-CONFLICTS+=	ghostscript8-[0-9]*
+CONFLICTS+=	ghostscript9-[0-9]*
+X11BITS=	"@comment "
 .endif	# defined(_X11_DEVS)
 
 # iconv specific
diff --git a/print/ghostscript9/files/patch-base-configure.ac b/print/ghostscript9/files/patch-base-configure.ac
new file mode 100644
index 000000000000..60be403d058b
--- /dev/null
+++ b/print/ghostscript9/files/patch-base-configure.ac
@@ -0,0 +1,25 @@
+--- base/configure.ac.orig	2011-03-30 15:48:01.000000000 +0900
++++ base/configure.ac	2011-06-10 14:36:19.000000000 +0900
+@@ -1019,7 +1019,7 @@
+ X_DEVS=""
+ X_LIBS=""
+ 
+-if test x$no_x != xyes; then
++if test x$with_x != xno; then
+ 	if test "$x_libraries" = "/usr/lib"; then
+ 		echo "Ignoring X library directory \"$x_libraries\" requested by configure."
+ 		x_libraries="NONE"
+@@ -1412,7 +1412,12 @@
+ 		DBG_CFLAGS="$DYNAMIC_CFLAGS $DBG_CFLAGS"
+ 		;;
+ 		*BSD)
+-		DYNAMIC_DEVS="\$(GLOBJDIR)/X11.so"
++		if test "x$X_DEVS" != x; then
++			DYNAMIC_DEVS="\$(GLOBJDIR)/X11.so"
++			INSTALL_SHARED="install-shared"
++		else
++			DYNAMIC_DEVS=""
++		fi
+ 		DYNAMIC_FLAGS="-DGS_DEVS_SHARED -DGS_DEVS_SHARED_DIR=\\\"\$(gssharedir)\\\""
+ 		X11_DEVS=""
+ 		OPT_CFLAGS="$DYNAMIC_CFLAGS $OPT_CFLAGS"
diff --git a/print/ghostscript9/files/patch-base-lib.mak b/print/ghostscript9/files/patch-base-lib.mak
new file mode 100644
index 000000000000..13d1ff5daf8c
--- /dev/null
+++ b/print/ghostscript9/files/patch-base-lib.mak
@@ -0,0 +1,11 @@
+--- base/lib.mak.orig	2011-06-10 13:41:36.000000000 +0900
++++ base/lib.mak	2011-06-10 13:42:59.000000000 +0900
+@@ -25,7 +25,7 @@
+ GLI_=$(GLGENDIR) $(II)$(GLSRCDIR)
+ GLF_=
+ GLCCFLAGS=$(I_)$(GLI_)$(_I) $(GLF_)
+-GLCC=$(CC_) $(GLCCFLAGS)
++GLCC=$(GLCCSHARED)
+ GLJCC=$(CC_) $(I_)$(GLI_) $(II)$(JI_)$(_I) $(JCF_) $(GLF_)
+ GLZCC=$(CC_) $(I_)$(GLI_) $(II)$(ZI_)$(_I) $(ZCF_) $(GLF_)
+ GLJBIG2CC=$(CC_) $(I_)$(GLI_) $(II)$(JB2I_)$(_I) $(JB2CF_) $(GLF_)
diff --git a/print/ghostscript9/pkg-plist b/print/ghostscript9/pkg-plist
index 519ac9a4f3eb..0bb0a687b1e2 100644
--- a/print/ghostscript9/pkg-plist
+++ b/print/ghostscript9/pkg-plist
@@ -1,4 +1,4 @@
-@comment $FreeBSD: /tmp/pcvs/ports/print/ghostscript9/pkg-plist,v 1.2 2011-05-25 21:22:30 hrs Exp $
+@comment $FreeBSD: /tmp/pcvs/ports/print/ghostscript9/pkg-plist,v 1.3 2011-06-10 09:10:52 hrs Exp $
 bin/bdftops
 bin/dumphint
 bin/dvipdf
@@ -43,6 +43,9 @@ include/ghostscript/ierrors.h
 lib/libgs.so
 lib/libgs.so.%%SHLIB_VER%%
 lib/libgs.so.%%GS_VERSION%%
+%%X11BITS%%lib/ghostscript/%%GS_VERSION%%/X11.so
+%%X11BITS%%@dirrm lib/ghostscript/%%GS_VERSION%%
+%%X11BITS%%@dirrmtry lib/ghostscript
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/78-EUC-H
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/78-EUC-V
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/78-H