Fix build on OpenBSD 5.3.

* Pass LDFLAGS to gsx build etc.
* Pass -lxcb to LDFLAGS for OpenBSD

3 files changed, 13 insertions, 10 deletions

diff --git a/print/ghostscript-gpl/Makefile b/print/ghostscript-gpl/Makefile
index 2560a663898..f5b87f8fd00 100644
--- a/print/ghostscript-gpl/Makefile
+++ b/print/ghostscript-gpl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2013/06/04 22:16:58 tron Exp $
+# $NetBSD: Makefile,v 1.6 2013/10/05 05:13:07 ryoon Exp $
 
 DISTNAME=	ghostscript-${GS_VERSION}
 PKGNAME=	${DISTNAME:S/ghostscript/ghostscript-gpl/}
@@ -82,6 +82,9 @@ BUILDLINK_TRANSFORM+=	l:fontconfig:fontconfig:iconv
 
 CONFIGURE_ENV+=	LPLIBDIR=${PREFIX}/lib
 
+# On OpenBSD 5.3, libxcb is required libXt.
+LDFLAGS.OpenBSD+=	-lxcb
+
 .include "options.mk"
 
 post-extract:
diff --git a/print/ghostscript-gpl/distinfo b/print/ghostscript-gpl/distinfo
index 6fb6d422b1d..64bf33ec9e4 100644
--- a/print/ghostscript-gpl/distinfo
+++ b/print/ghostscript-gpl/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.1 2013/03/16 21:32:00 dholland Exp $
+$NetBSD: distinfo,v 1.2 2013/10/05 05:13:07 ryoon Exp $
 
 SHA1 (ghostscript-9.05.tar.bz2) = 1a54a846e90ae95b5307f4f0459d044b9597d8cf
 RMD160 (ghostscript-9.05.tar.bz2) = 27935f60083b788b2793b19ee42f3663082ba084
 Size (ghostscript-9.05.tar.bz2) = 28279634 bytes
 SHA1 (patch-CVE-2012-4405) = 1dcb4cfeceb366c144e0a1337c6ccc2d8e13e4ca
-SHA1 (patch-af) = 79af4d253001f879f1b5d3ef93584ae7300361de
+SHA1 (patch-af) = 79b06a2b5b73486a0b7e0a6e2b14e105579f8a1f
 SHA1 (patch-ah) = 35d6e3a4623bb28e59526f61a3062874cc363429
 SHA1 (patch-ai) = 8a3de7e097d3d893a0de4ea2936acf192f770c65
 SHA1 (patch-aj) = 620d921210b5c0efec0a84e33bc416e4ab4bd11c
diff --git a/print/ghostscript-gpl/patches/patch-af b/print/ghostscript-gpl/patches/patch-af
index fff05edd1fd..e0d6da205c8 100644
--- a/print/ghostscript-gpl/patches/patch-af
+++ b/print/ghostscript-gpl/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1 2013/03/16 21:32:01 dholland Exp $
+$NetBSD: patch-af,v 1.2 2013/10/05 05:13:07 ryoon Exp $
 
 (From the log for revision 1.4 of print/ghostscript/patches/patch-af)
 date: 2008/11/13 17:36:54;  author: chuck;  state: Exp;  lines: +22 -4
@@ -14,9 +14,9 @@ XXX: this still leaves the issue of libgs.so (et al.) being hardwired
 in PLIST, instead of using libgs.dylib (et al.).   i'm not sure of
 the best way to fix that.   at least it compiles now....
 
---- base/unix-dll.mak.orig	2012-08-08 17:01:36.000000000 +0900
-+++ base/unix-dll.mak	2012-10-10 10:03:50.000000000 +0900
-@@ -59,13 +59,12 @@
+--- base/unix-dll.mak.orig	2012-02-08 08:48:48.000000000 +0000
++++ base/unix-dll.mak
+@@ -58,13 +58,12 @@ LDFLAGS_SO=-shared -Wl,$(LD_SET_DT_SONAM
  
  
  # MacOS X
@@ -35,17 +35,17 @@ the best way to fix that.   at least it compiles now....
  
  GS_SO=$(BINDIR)/$(GS_SONAME)
  GS_SO_MAJOR=$(BINDIR)/$(GS_SONAME_MAJOR) 
-@@ -86,11 +85,11 @@
+@@ -85,11 +84,11 @@ $(GS_SO_MAJOR): $(GS_SO_MAJOR_MINOR)
  # Build the small Ghostscript loaders, with Gtk+ and without
  $(GSSOC_XE): $(GS_SO) $(PSSRC)$(SOC_LOADER)
  	$(GLCC) -g -o $(GSSOC_XE) $(PSSRC)dxmainc.c \
 -	-L$(BINDIR) -l$(GS)
-+	-L$(BINDIR) -Wl,-R$(PREFIX)/lib -l$(GS)
++	-L$(BINDIR) -Wl,-R$(PREFIX)/lib -l$(GS) ${LDFLAGS}
  
  $(GSSOX_XE): $(GS_SO) $(PSSRC)$(SOC_LOADER)
  	$(GLCC) -g $(SOC_CFLAGS) -o $(GSSOX_XE) $(PSSRC)$(SOC_LOADER) \
 -	-L$(BINDIR) -l$(GS) $(SOC_LIBS)
-+	-L$(BINDIR) -l$(GS) -Wl,-R$(PREFIX)/lib -l$(GS) $(SOC_LIBS)
++	-L$(BINDIR) -l$(GS) -Wl,-R$(PREFIX)/lib -l$(GS) $(SOC_LIBS) ${LDFLAGS}
  
  # ------------------------- Recursive make targets ------------------------- #