diff options
Diffstat (limited to 'x11/xforms/patches/patch-ac')
| -rw-r--r-- | x11/xforms/patches/patch-ac | 39 |
1 files changed, 12 insertions, 27 deletions
diff --git a/x11/xforms/patches/patch-ac b/x11/xforms/patches/patch-ac index 2de624bb3ed..0ef222471b8 100644 --- a/x11/xforms/patches/patch-ac +++ b/x11/xforms/patches/patch-ac @@ -1,37 +1,22 @@ -$NetBSD: patch-ac,v 1.3 2002/09/21 00:24:04 jlam Exp $ +$NetBSD: patch-ac,v 1.4 2002/12/28 19:49:09 jschauma Exp $ ---- fd2ps/Imakefile.orig Tue Apr 2 11:34:02 2002 -+++ fd2ps/Imakefile -@@ -30,9 +30,13 @@ - - OBJS = $(SRCS:.c=.o) - -+LDPRELIBS = -+JPEGLIBLOC = ${LOCALBASE}/lib -+JPEGLIB = -L${JPEGLIBLOC} -ljpeg -+ +--- fd2ps/Imakefile.orig 2002-10-01 09:40:02.000000000 -0700 ++++ fd2ps/Imakefile 2002-12-25 10:39:45.000000000 -0800 +@@ -32,7 +32,7 @@ + #if !defined( PpcDarwinArchitecture ) FORMSLIBDIR = $(TOP)/lib FORMSINCDIR = $(FORMSLIBDIR) -FORMSLIB = -L$(FORMSLIBDIR) -lforms +FORMSLIB = -L$(FORMSLIBDIR) -lforms $(JPEGLIB) $(XPMLIB) $(LDFLAGS) DEPFORMSLIB = $(FORMSLIBDIR)/libforms.a - - #if !UseSystemXpm -@@ -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. \ -- -I/usr/local/include \ -+ -I${LOCALBASE}/include \ - /* Don't remove this line */ +@@ -64,7 +64,7 @@ + -I. + + DEPEND_DEFINES = \ +- -I/usr/local/include ++ -I${LOCALBASE}/include EXTRA_LIBRARIES = \ + $(STATIC) \ |