summaryrefslogtreecommitdiff
path: root/math
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2001-05-16 20:28:40 +0000
committerjlam <jlam@pkgsrc.org>2001-05-16 20:28:40 +0000
commit345f7a105a83c92bd45e03fd71b958948345bc71 (patch)
treedd96671c318ecf75f9145479924fd1b4db91283e /math
parent90709cc4dfd2854feffa7021dffe3d60281fc01c (diff)
downloadpkgsrc-345f7a105a83c92bd45e03fd71b958948345bc71.tar.gz
Use devel/readline/Makefile.readline to handle using libedit readline
emulation or depending on the readline package.
Diffstat (limited to 'math')
-rw-r--r--math/capc-calc/Makefile16
-rw-r--r--math/capc-calc/distinfo4
-rw-r--r--math/capc-calc/patches/patch-aa20
3 files changed, 27 insertions, 13 deletions
diff --git a/math/capc-calc/Makefile b/math/capc-calc/Makefile
index d9a2143bb05..900b04ed903 100644
--- a/math/capc-calc/Makefile
+++ b/math/capc-calc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/02/17 18:22:16 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/05/16 20:28:40 jlam Exp $
#
DISTNAME= calc-2.11.4t2
@@ -13,12 +13,12 @@ COMMENT= C arbitrary precision calculator
NO_CONFIGURE= # defined
-.if exists(/usr/include/readline.h) && !exists(/usr/include/readline/readline.h)
-post-patch:
- ${SED} -e "s|readline/readline.h|readline.h|" \
- -e "s|readline/history.h|history.h|" ${WRKSRC}/hist.c > \
- ${WRKSRC}/hist.c.new && \
- ${MV} -f ${WRKSRC}/hist.c.new ${WRKSRC}/hist.c
-.endif
+.include "../../devel/readline/Makefile.readline"
+
+MAKE_ENV+= CPPFLAGS="${CPPFLAGS}"
+CPPFLAGS+= -I${WRKINCDIR}
+LDFLAGS+= -L${WRKLIBDIR}
+
+pre-build: link-readline-headers link-readline-libs
.include "../../mk/bsd.pkg.mk"
diff --git a/math/capc-calc/distinfo b/math/capc-calc/distinfo
index 4415cffd063..20b910c08a1 100644
--- a/math/capc-calc/distinfo
+++ b/math/capc-calc/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 08:45:38 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/05/16 20:28:40 jlam Exp $
SHA1 (calc-2.11.4t2.tar.gz) = 4df87a5e5343ba57fd7026f434a5980aff48ed89
Size (calc-2.11.4t2.tar.gz) = 905897 bytes
-SHA1 (patch-aa) = 822a44d62c6ea6f8fc8aeef2f371da24cbd8f38b
+SHA1 (patch-aa) = fffd5464cf05d6efce48ba54fb21d9dd530fa46e
diff --git a/math/capc-calc/patches/patch-aa b/math/capc-calc/patches/patch-aa
index bb37e647b44..bafffccbc25 100644
--- a/math/capc-calc/patches/patch-aa
+++ b/math/capc-calc/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/02/08 10:25:56 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2001/05/16 20:28:41 jlam Exp $
---- Makefile.orig Sun Dec 17 14:09:39 2000
+--- Makefile.orig Sun Dec 17 08:09:39 2000
+++ Makefile
@@ -348,18 +348,18 @@
# ${CUSTOMHELPDIR} where custom help files are installed.
@@ -63,7 +63,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/02/08 10:25:56 wiz Exp $
+USE_READLINE= -DUSE_READLINE
#
-READLINE_LIB=
-+READLINE_LIB= -ledit -ltermcap
++READLINE_LIB= -lreadline -ltermcap
#READLINE_LIB= -L/usr/gnu/lib -lreadline -lhistory
#READLINE_LIB= -lreadline -lhistory
#READLINE_LIB= -L/usr/local/lib -lreadline -lhistory
@@ -89,3 +89,17 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/02/08 10:25:56 wiz Exp $
#DEBUG= -O2 -ipa
#DEBUG= -O2 -g3 -ipa
#
+@@ -636,10 +636,10 @@
+ CCOPT= ${DEBUG} ${NO_SHARED}
+ CCMISC=
+ #
+-CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC}
+-ICFLAGS= ${CCWARN} ${CCMISC}
++CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC} ${CPPFLAGS}
++ICFLAGS= ${CCWARN} ${CCMISC} ${CPPFLAGS}
+ #
+-LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED}
++LDFLAGS+= ${NO_SHARED} ${LD_NO_SHARED}
+ ILDFLAGS=
+ #
+ LCC= gcc