From 9e9a5d0eb078bd6920b76863c2b15f2c81792e5e Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Fri, 17 Sep 1999 00:06:20 +0000
Subject: Don't make the static binary since it doesn't link correctly under
 1.4.x. Fix suggested by hubertf@netbsd.org in private mail.

---
 editors/abiword/files/patch-sum  |  4 ++--
 editors/abiword/patches/patch-ad | 14 +++++++++++---
 editors/abiword/pkg/PLIST        |  3 +--
 3 files changed, 14 insertions(+), 7 deletions(-)

(limited to 'editors/abiword')

diff --git a/editors/abiword/files/patch-sum b/editors/abiword/files/patch-sum
index f03b7064fe5..956eda8ffb7 100644
--- a/editors/abiword/files/patch-sum
+++ b/editors/abiword/files/patch-sum
@@ -1,9 +1,9 @@
-$NetBSD: patch-sum,v 1.2 1999/09/14 02:19:15 jlam Exp $
+$NetBSD: patch-sum,v 1.3 1999/09/17 00:06:20 jlam Exp $
 
 MD5 (patch-aa) = 9083af68a39aa7760c1d63776bad501f
 MD5 (patch-ab) = 8d985a606820cd5e8baf6bcc9f77b01f
 MD5 (patch-ac) = c12b687d99d2986e85e45dda6bbe0c8b
-MD5 (patch-ad) = 0c924572b32d9297251550633ff828be
+MD5 (patch-ad) = a34a0e862094a575f0c015601177d85b
 MD5 (patch-ae) = ff7d5b3bcbf315987ccc1f38c6024afe
 MD5 (patch-af) = b68e0ef50cca301a9e2e59a1902e1be8
 MD5 (patch-ag) = 29b8ee5c764e4800010240bd0f9b8d2a
diff --git a/editors/abiword/patches/patch-ad b/editors/abiword/patches/patch-ad
index 14aea32137b..abe5558a4bb 100644
--- a/editors/abiword/patches/patch-ad
+++ b/editors/abiword/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.2 1999/09/14 02:19:15 jlam Exp $
+$NetBSD: patch-ad,v 1.3 1999/09/17 00:06:21 jlam Exp $
 
 --- src/config/platforms/netbsd.mk.orig	Fri Jul  9 15:13:57 1999
-+++ src/config/platforms/netbsd.mk	Sat Sep 11 11:17:45 1999
++++ src/config/platforms/netbsd.mk	Thu Sep 16 11:50:53 1999
 @@ -30,8 +30,37 @@
  ## compiler/loader options are used.  It will probably also be used
  ## in constructing the name object file destination directory.
@@ -41,7 +41,7 @@ $NetBSD: patch-ad,v 1.2 1999/09/14 02:19:15 jlam Exp $
  
  # Define tools
  CC		= gcc
-@@ -65,17 +94,20 @@
+@@ -65,24 +94,27 @@
  endif
  
  # Includes
@@ -64,6 +64,14 @@ $NetBSD: patch-ad,v 1.2 1999/09/14 02:19:15 jlam Exp $
  # Shared library flags
  MKSHLIB			= $(LD) $(DSO_LDOPTS) -soname $(@:$(OBJDIR)/%.so=%.so)
  
+ # Which links can this platform create.  Define one or
+ # both of these options.
+ UNIX_CAN_BUILD_DYNAMIC=1
+-UNIX_CAN_BUILD_STATIC=1
++UNIX_CAN_BUILD_STATIC=0		# 1.4.x can't seem to build statically
+ 
+ # Compiler options for static and dynamic linkage
+ DL_LIBS			= 
 @@ -90,5 +122,12 @@
  
  ABI_NATIVE	= unix
diff --git a/editors/abiword/pkg/PLIST b/editors/abiword/pkg/PLIST
index 9065bc8cdb1..5a2fc8e3132 100644
--- a/editors/abiword/pkg/PLIST
+++ b/editors/abiword/pkg/PLIST
@@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/09/11 18:27:49 jlam Exp $
+@comment $NetBSD: PLIST,v 1.2 1999/09/17 00:06:21 jlam Exp $
 bin/AbiWord
 bin/abiword
 libexec/AbiSuite/AbiWord
 libexec/AbiSuite/AbiWord_d
-libexec/AbiSuite/AbiWord_s
 share/AbiSuite/COPYING
 share/AbiSuite/readme.txt
 share/AbiSuite/AbiWord/readme.txt
-- 
cgit v1.2.3