Skip to content

Commit

Permalink
Make this package compile in the presence of xpkgwedge
Browse files Browse the repository at this point in the history
  • Loading branch information
agc committed Jun 28, 2002
1 parent 1bacc68 commit 8da784b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions math/xldlas/distinfo
@@ -1,6 +1,6 @@
$NetBSD: distinfo,v 1.3 2002/04/17 04:45:15 fredb Exp $
$NetBSD: distinfo,v 1.4 2002/06/28 12:11:01 agc Exp $

SHA1 (xldlas-0.85-source.tgz) = 84434282d0fcba0745fe6d1bfdc8baf5d7842fbd
Size (xldlas-0.85-source.tgz) = 119146 bytes
SHA1 (patch-aa) = 97d150343be1a0e15372208984f238eead198612
SHA1 (patch-aa) = bef0fed51b6081b5ff1d245695907f4853880fe4
SHA1 (patch-ab) = 88c45901cf3095e5f86ef0f1e50832292278cf46
8 changes: 4 additions & 4 deletions math/xldlas/patches/patch-aa
@@ -1,7 +1,7 @@
$NetBSD: patch-aa,v 1.3 2002/04/17 04:45:15 fredb Exp $
$NetBSD: patch-aa,v 1.4 2002/06/28 12:11:02 agc Exp $

--- Makefile.orig Tue Apr 1 11:13:32 1997
+++ Makefile
--- Makefile.orig Tue Apr 1 18:13:32 1997
+++ Makefile Fri Jun 28 13:07:11 2002
@@ -16,11 +16,11 @@
# want to remove the -DXFORMS86 declaration in the CCFLAG
# assignment.
Expand All @@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.3 2002/04/17 04:45:15 fredb Exp $
-COMMONLIBS = -L/usr/X11R6/lib/ -lX11 -lm
-SHAREDLIBS = -lforms
-STATICLIBS = -lXpm /usr/X11R6/lib/libforms.a
+CCFLAG = ${CFLAGS} -DXFORMS86 -DPREFIX=\"${PREFIX}\" -I${PREFIX}/include -I${PREFIX}/include/X11
+CCFLAG = ${CFLAGS} -DXFORMS86 -DPREFIX=\"${PREFIX}\" -I${PREFIX}/include -I${PREFIX}/include/X11 -I${X11BASE}/include
+#CC = gcc
+COMMONLIBS = -L${X11BASE}/lib/ -Wl,-R${X11BASE}/lib -lX11 -lm
+SHAREDLIBS = -lforms -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -ljpeg -lXpm
Expand Down

0 comments on commit 8da784b

Please sign in to comment.