From 178bc08e037532e0c361e94d92f3525738c31ab5 Mon Sep 17 00:00:00 2001
From: mikeh <mikeh@FreeBSD.org>
Date: Wed, 9 Oct 2002 00:41:26 +0000
Subject: Fix build for people who have xforms-1.0_1,1 already installed, by
 linking against the correct library.

PR:		ports/43842
---
 x11-toolkits/xforms/files/patch-ab | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'x11-toolkits')

diff --git a/x11-toolkits/xforms/files/patch-ab b/x11-toolkits/xforms/files/patch-ab
index 2d2e2227e60c..2415d92deefe 100644
--- a/x11-toolkits/xforms/files/patch-ab
+++ b/x11-toolkits/xforms/files/patch-ab
@@ -10,7 +10,7 @@
  		  $(SNPINC) \
  		  -I$(BUILDINCDIR) \
 --- demos/Imakefile.orig	Fri Sep 27 16:11:45 2002
-+++ demos/Imakefile	Mon Oct  7 01:27:39 2002
++++ demos/Imakefile	Tue Oct  8 18:33:33 2002
 @@ -97,6 +97,9 @@
  DEPOBJS		= $(DEPSRCS:.c=.o)
  PROGRAMS	= $(DEMOSRCS:.c=)
@@ -21,18 +21,25 @@
  #if Solaris64Bit
  LDPRELIB	= -L/usr/openwin/lib/sparcv9 -L/usr/local/lib/sparcv9
  CCENVSETUP	= LD_RUN_PATH=/usr/openwin/lib/sparcv9
-@@ -125,6 +128,8 @@
+@@ -125,6 +128,10 @@
  DEPSNPLIB	= $(SNPLIBDIR)/libformssnp.a
  #endif
  
-+EXTRA_LDOPTIONS	= $(FORMSLIB)
++EXTRA_LDOPTIONS	= $(FORMSLIB) \
++		  $(IMAGELIB) \
++		  $(SNPLIB)
 +
  EXTRA_INCLUDES  = \
  		  $(SNPINC) \
  		  -I$(BUILDINCDIR) \
-@@ -143,7 +148,7 @@
+@@ -138,12 +145,9 @@
+ 
+ EXTRA_LIBRARIES	= \
+ 		  $(STATIC) \
+-		  $(IMAGELIB) \
+-		  $(FORMSLIB) \
  		  $(XPMLIB) \
- 		  $(SNPLIB) \
+-		  $(SNPLIB) \
  		  $(UNSTATIC) \
 -		  $(JPEG) \
 +		  $(JPEGLIB) \
-- 
cgit