summaryrefslogtreecommitdiff
path: root/math
diff options
context:
space:
mode:
authorfredb <fredb>2002-04-17 04:45:06 +0000
committerfredb <fredb>2002-04-17 04:45:06 +0000
commit80adf730e4f4f7bd43e06a3e29c7dd89950ea573 (patch)
treedc783e63ef8448e3a620be967f9233cff8ff8e71 /math
parente7de9bc919d9f30ebe6b6c0492f1843bc32c1937 (diff)
downloadpkgsrc-80adf730e4f4f7bd43e06a3e29c7dd89950ea573.tar.gz
Update dependency on xforms. We're mainly bumping the dependency
and package revision, since we may now link against the forms shared library, and because we also have to add a dependency on jpeg lib.
Diffstat (limited to 'math')
-rw-r--r--math/xldlas/Makefile7
-rw-r--r--math/xldlas/distinfo4
-rw-r--r--math/xldlas/patches/patch-aa108
3 files changed, 49 insertions, 70 deletions
diff --git a/math/xldlas/Makefile b/math/xldlas/Makefile
index 456ead307aa..689072aa195 100644
--- a/math/xldlas/Makefile
+++ b/math/xldlas/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2001/02/25 04:18:01 hubertf Exp $
+# $NetBSD: Makefile,v 1.13 2002/04/17 04:45:15 fredb Exp $
# FreeBSD Id: Makefile,v 1.5 1998/09/26 23:18:07 steve Exp
#
DISTNAME= xldlas-0.85
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/xldlas
CATEGORIES= math
MASTER_SITES= http://sunsite.math.klte.hu/mirrors/xldlas/ \
@@ -13,12 +14,14 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://sunsite.math.klte.hu/mirrors/xldlas/
COMMENT= XForms-based statistics package
-DEPENDS= xforms>=0.88nb1:../../x11/xforms
+DEPENDS+= jpeg-6b:../../graphics/jpeg
+DEPENDS+= xforms>=0.9999:../../x11/xforms
ONLY_FOR_PLATFORM= NetBSD-*-alpha NetBSD-*-arm32 NetBSD-*-i386 NetBSD-*-m68k \
NetBSD-*-mipsel NetBSD-*-ns32k NetBSD-*-sparc NetBSD-*-powerpc
USE_X11BASE= yes
+USE_XPM= yes
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/xldlas ${PREFIX}/bin
diff --git a/math/xldlas/distinfo b/math/xldlas/distinfo
index c655cb7a3f9..de806b3df31 100644
--- a/math/xldlas/distinfo
+++ b/math/xldlas/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 08:45:46 agc Exp $
+$NetBSD: distinfo,v 1.3 2002/04/17 04:45:15 fredb Exp $
SHA1 (xldlas-0.85-source.tgz) = 84434282d0fcba0745fe6d1bfdc8baf5d7842fbd
Size (xldlas-0.85-source.tgz) = 119146 bytes
-SHA1 (patch-aa) = b7ba66fab8258f54093065a920e287a44654fe6a
+SHA1 (patch-aa) = 97d150343be1a0e15372208984f238eead198612
SHA1 (patch-ab) = 88c45901cf3095e5f86ef0f1e50832292278cf46
diff --git a/math/xldlas/patches/patch-aa b/math/xldlas/patches/patch-aa
index dba3af48763..c38be34c35e 100644
--- a/math/xldlas/patches/patch-aa
+++ b/math/xldlas/patches/patch-aa
@@ -1,67 +1,43 @@
-$NetBSD: patch-aa,v 1.2 2000/05/14 00:57:41 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.3 2002/04/17 04:45:15 fredb Exp $
-*** Makefile.orig Tue Apr 1 12:13:32 1997
---- Makefile Mon Apr 27 01:10:50 1998
-***************
-*** 16,26 ****
- # want to remove the -DXFORMS86 declaration in the CCFLAG
- # assignment.
- #
-! CCFLAG = -O2 -Wall -DXFORMS86
-! CC = gcc
-! COMMONLIBS = -L/usr/X11R6/lib/ -lX11 -lm
-! SHAREDLIBS = -lforms
-! STATICLIBS = -lXpm /usr/X11R6/lib/libforms.a
- ECHO = echo
- RM = rm
- RMOPTS = -f
---- 16,26 ----
- # want to remove the -DXFORMS86 declaration in the CCFLAG
- # assignment.
- #
-! CCFLAG = ${CFLAGS} -DXFORMS86 -DPREFIX=\"${PREFIX}\" -I${PREFIX}/include -I${PREFIX}/include/X11
-! #CC = gcc
-! COMMONLIBS = -L${X11BASE}/lib/ -Wl,-R${X11BASE}/lib -lX11 -lm
-! SHAREDLIBS = -lxforms -lXpm
-! STATICLIBS = -lXpm ${PREFIX}/lib/libxforms.a
- ECHO = echo
- RM = rm
- RMOPTS = -f
-***************
-*** 29,37 ****
- INSTALL = install
- INSTALLOPTS = -d
-
-! BINDIR = /usr/local/bin
-! MANDIR = /usr/man/man1
-! HELPDIR = /usr/local/xldlas/help
- SRCDIR := $$PWD
- USER := $$LOGNAME
-
---- 29,37 ----
- INSTALL = install
- INSTALLOPTS = -d
-
-! BINDIR = ${PREFIX}/bin
-! MANDIR = ${PREFIX}/man/man1
-! HELPDIR = ${PREFIX}/share/xldlas/help
- SRCDIR := $$PWD
- USER := $$LOGNAME
-
-***************
-*** 115,121 ****
- so the following commands will probably fail"; fi
- @$(ECHO)
- @$(CP) $(CPOPTS) xldlas $(BINDIR)
-! @if test '/usr/local/xldlas' = $(SRCDIR); then \
- $(ECHO) Help Files Already in Place; else \
- $(INSTALL) $(INSTALLOPTS) ./help $(HELPDIR); fi
- install.man:
---- 115,121 ----
- so the following commands will probably fail"; fi
- @$(ECHO)
- @$(CP) $(CPOPTS) xldlas $(BINDIR)
-! @if test "${PREFIX}/share/xldlas" = $(SRCDIR); then \
- $(ECHO) Help Files Already in Place; else \
- $(INSTALL) $(INSTALLOPTS) ./help $(HELPDIR); fi
- install.man:
+--- Makefile.orig Tue Apr 1 11:13:32 1997
++++ Makefile
+@@ -16,11 +16,11 @@
+ # want to remove the -DXFORMS86 declaration in the CCFLAG
+ # assignment.
+ #
+-CCFLAG = -O2 -Wall -DXFORMS86
+-CC = gcc
+-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
++#CC = gcc
++COMMONLIBS = -L${X11BASE}/lib/ -Wl,-R${X11BASE}/lib -lX11 -lm
++SHAREDLIBS = -lforms -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -ljpeg -lXpm
++STATICLIBS = -lXpm ${PREFIX}/lib/libxforms.a ${LOCALBASE}/lib/libjpeg.a
+ ECHO = echo
+ RM = rm
+ RMOPTS = -f
+@@ -29,9 +29,9 @@
+ INSTALL = install
+ INSTALLOPTS = -d
+
+-BINDIR = /usr/local/bin
+-MANDIR = /usr/man/man1
+-HELPDIR = /usr/local/xldlas/help
++BINDIR = ${PREFIX}/bin
++MANDIR = ${PREFIX}/man/man1
++HELPDIR = ${PREFIX}/share/xldlas/help
+ SRCDIR := $$PWD
+ USER := $$LOGNAME
+
+@@ -115,7 +115,7 @@
+ so the following commands will probably fail"; fi
+ @$(ECHO)
+ @$(CP) $(CPOPTS) xldlas $(BINDIR)
+- @if test '/usr/local/xldlas' = $(SRCDIR); then \
++ @if test "${PREFIX}/share/xldlas" = $(SRCDIR); then \
+ $(ECHO) Help Files Already in Place; else \
+ $(INSTALL) $(INSTALLOPTS) ./help $(HELPDIR); fi
+ install.man: