Make the included programs and demos link against the package's "forms"

shared library, rather than any previously installed one.

4 files changed, 62 insertions, 16 deletions

diff --git a/x11/xforms/distinfo b/x11/xforms/distinfo
index 95dc35e07bd..e9d69edddf7 100644
--- a/x11/xforms/distinfo
+++ b/x11/xforms/distinfo
@@ -3,7 +3,7 @@
 SHA1 (xforms-0.9999.tgz) = d88d24a37ab4fe37fbcb8b85f0c6a727638db217
 Size (xforms-0.9999.tgz) = 1040128 bytes
 SHA1 (patch-aa) = 70eb79d4e724c8694aa6a5b1b5324cfc45d3c3da
-SHA1 (patch-ab) = 9e0ed487588d7df9293351b37c3a6065df3537a7
-SHA1 (patch-ac) = 618542e755d3ea6a9a7616422fe79cfec7527a96
-SHA1 (patch-ad) = 1cbf52d63b2538008e48e63fab1e090c7c03982d
+SHA1 (patch-ab) = aac66bfb7a549fd6235d4c20feb3f957cdcc2821
+SHA1 (patch-ac) = f6795e4ca9c1887522fa7595ef502d169c28b9c6
+SHA1 (patch-ad) = f17516b9292be07794a7ac184c985be66ba88834
 SHA1 (patch-ae) = ccf27ff1e0c2f95a26f4b4365825ae7d511081f6
diff --git a/x11/xforms/patches/patch-ab b/x11/xforms/patches/patch-ab
index 62e66ea0583..e19a830450c 100644
--- a/x11/xforms/patches/patch-ab
+++ b/x11/xforms/patches/patch-ab
@@ -1,26 +1,37 @@
-$NetBSD: patch-ab,v 1.3 2002/04/17 04:40:41 fredb Exp $
+$NetBSD: patch-ab,v 1.4 2002/04/17 18:18:53 fredb Exp $
 
 --- demos/Imakefile.orig	Mon Apr  1 10:56:26 2002
 +++ demos/Imakefile
-@@ -106,7 +106,7 @@
+@@ -106,7 +106,9 @@
  DEPOBJS		= $(DEPSRCS:.c=.o)
  PROGRAMS	= $(DEMOSRCS:.c=)
  
 -JPEGLIBLOC	= /usr/local/lib
++LDPRELIBS	=
 +JPEGLIBLOC	= ${BUILDLINK_DIR}/lib
++JPEGLIB		= -L${JPEGLIBLOC} -ljpeg
  
  #if Solaris64Bit
  LDPRELIB	= -L/usr/openwin/lib/sparcv9
-@@ -120,7 +120,7 @@
+@@ -120,7 +122,7 @@
  
  FORMSLIBDIR     = $(TOP)/lib
  FORMSINCDIR     = $(FORMSLIBDIR)       
 -FORMSLIB        = -L$(FORMSLIBDIR) -lforms
-+FORMSLIB        = -L$(FORMSLIBDIR) -lforms -ljpeg -lXpm $(LDFLAGS)
++FORMSLIB        = -L$(FORMSLIBDIR) -lforms $(JPEGLIB) $(XPMLIB) $(LDFLAGS)
  DEPFORMSLIB     = $(FORMSLIBDIR)/libforms.a
  
  #if !UseSystemXpm
-@@ -138,7 +138,7 @@
+@@ -130,7 +132,7 @@
+ DEPXPMLIB	= $(XPMLIBDIR)/libXpm.a
+ XPMINCLUDE	= -I$(XPMINCDIR)
+ #else	
+-XPMLIB		= -lXpm
++XPMLIB		= -L$(USRLIBDIR) -lXpm
+ #endif
+ 
+ EXTRA_INCLUDES  = \
+@@ -138,7 +140,7 @@
  		  -I$(FORMSINCDIR) \
  		  -Ifd \
  		  -I. \
diff --git a/x11/xforms/patches/patch-ac b/x11/xforms/patches/patch-ac
index e3842f4734e..0f25899fe8e 100644
--- a/x11/xforms/patches/patch-ac
+++ b/x11/xforms/patches/patch-ac
@@ -1,17 +1,32 @@
-$NetBSD: patch-ac,v 1.1 2002/04/17 04:40:42 fredb Exp $
+$NetBSD: patch-ac,v 1.2 2002/04/17 18:18:53 fredb Exp $
 
 --- fd2ps/Imakefile.orig	Tue Apr  2 11:34:02 2002
 +++ fd2ps/Imakefile
-@@ -32,7 +32,7 @@
+@@ -30,9 +30,13 @@
  
+ OBJS	= $(SRCS:.c=.o)
+ 
++LDPRELIBS	=
++JPEGLIBLOC	= ${BUILDLINK_DIR}/lib
++JPEGLIB		= -L${JPEGLIBLOC} -ljpeg
++
  FORMSLIBDIR     = $(TOP)/lib
  FORMSINCDIR     = $(FORMSLIBDIR)       
 -FORMSLIB        = -L$(FORMSLIBDIR) -lforms
-+FORMSLIB        = -L$(FORMSLIBDIR) -lforms -ljpeg -lXpm $(LDFLAGS)
++FORMSLIB        = -L$(FORMSLIBDIR) -lforms $(JPEGLIB) $(XPMLIB) $(LDFLAGS)
  DEPFORMSLIB     = $(FORMSLIBDIR)/libforms.a
  
  #if !UseSystemXpm
-@@ -55,7 +55,7 @@
+@@ -41,6 +45,8 @@
+ XPMLIB		= -L$(XPMLIBDIR)/lib -lXpm
+ DEPXPMLIB	= $(XPMLIBDIR)/lib/libXpm.a
+ XPMINCLUDE	= -I$(XPMINCDIR)
++#else	
++XPMLIB		= -L$(USRLIBDIR) -lXpm
+ #endif
+ 
+ #if Solaris64Bit
+@@ -55,7 +61,7 @@
  		  -Ispec \
  		  -Ixpm \
  		  -I. \
diff --git a/x11/xforms/patches/patch-ad b/x11/xforms/patches/patch-ad
index a0161cc1dbf..45fed6d9d96 100644
--- a/x11/xforms/patches/patch-ad
+++ b/x11/xforms/patches/patch-ad
@@ -1,17 +1,37 @@
-$NetBSD: patch-ad,v 1.1 2002/04/17 04:40:43 fredb Exp $
+$NetBSD: patch-ad,v 1.2 2002/04/17 18:18:53 fredb Exp $
 
 --- fdesign/Imakefile.orig	Tue Apr  2 11:33:21 2002
 +++ fdesign/Imakefile
-@@ -59,7 +61,7 @@
+@@ -47,6 +47,10 @@
+ 
+ OBJS	= $(SRCS:.c=.o)
+ 
++LDPRELIBS	=
++JPEGLIBLOC	= ${BUILDLINK_DIR}/lib
++JPEGLIB		= -L${JPEGLIBLOC} -ljpeg
++
+ #if Solaris64Bit
+ LDPRELIB	= -L/usr/openwin/lib/sparcv9
+ CCENVSETUP	= LD_RUN_PATH=/usr/openwin/lib/sparcv9
+@@ -59,7 +63,7 @@
  
  FORMSLIBDIR     = $(TOP)/lib
  FORMSINCDIR     = $(FORMSLIBDIR)       
 -FORMSLIB        = -L$(FORMSLIBDIR) -lforms
-+FORMSLIB        = -L$(FORMSLIBDIR) -lforms -ljpeg -lXpm $(LDFLAGS)
++FORMSLIB        = -L$(FORMSLIBDIR) -lforms $(JPEGLIB) $(XPMLIB) $(LDFLAGS)
  DEPFORMSLIB     = $(FORMSLIBDIR)/libforms.a
  
  #if !UseSystemXpm
-@@ -80,7 +82,7 @@
+@@ -69,7 +73,7 @@
+ DEPXPMLIB	= $(XPMLIBDIR)/lib/libXpm.a
+ XPMINCLUDE	= -I$(XPMINCDIR)
+ #else	
+-XPMLIB		= -lXpm
++XPMLIB		= -L$(USRLIBDIR) -lXpm
+ #endif
+ 
+ EXTRA_INCLUDES  = \
+@@ -80,7 +84,7 @@
  		  -Ispec \
  		  -Ixpm \
  		  -I. \