summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2001-05-17 20:17:27 +0000
committerjlam <jlam@pkgsrc.org>2001-05-17 20:17:27 +0000
commit1a3aef9c6f85ba15fee16c84e6143de181bf3fb6 (patch)
tree8c73549eae7e3cafc87d118b122a0dc21a477480 /misc
parent908eff725976f013402ce94fcf7bb8d6cb4ae19c (diff)
downloadpkgsrc-1a3aef9c6f85ba15fee16c84e6143de181bf3fb6.tar.gz
Use devel/readline/Makefile.readline to check for libedit readline
emulation.
Diffstat (limited to 'misc')
-rw-r--r--misc/chipmunk/Makefile22
-rw-r--r--misc/chipmunk/distinfo7
-rw-r--r--misc/chipmunk/patches/patch-aa13
-rw-r--r--misc/chipmunk/patches/patch-ab6
-rw-r--r--misc/chipmunk/patches/patch-ac17
5 files changed, 19 insertions, 46 deletions
diff --git a/misc/chipmunk/Makefile b/misc/chipmunk/Makefile
index 8d2a6625d9b..44648fe35c3 100644
--- a/misc/chipmunk/Makefile
+++ b/misc/chipmunk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/02/17 18:08:53 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/05/17 20:17:27 jlam Exp $
#
DISTNAME= chipmunk-1.4
@@ -9,20 +9,18 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.bitwizard.nl/chipmunk/index.html
COMMENT= shell-like tool for hardware debugging
-.if exists(/usr/include/readline.h)
-CPPFLAGS+= -DHAVE_READLINE_H=1
-LIBREADLINE= edit
-.else
-DEPENDS+= readline>=4.0:../../devel/readline
-CPPFLAGS+= -I${LOCALBASE}/include
-LIBREADLINE= readline
-.endif
-
ONLY_FOR_PLATFORM= NetBSD-*-i386
+.include "../../devel/readline/Makefile.readline"
+
ALL_TARGET= chipmunk
-MAKE_ENV+= CONFIG_OPTIONS="${CPPFLAGS}" EXTRA_LIBS=-li386 \
- LIBREADLINE=${LIBREADLINE}
+MAKE_ENV+= CONFIG_OPTIONS="${CPPFLAGS}"
+MAKE_ENV+= EXTRA_LIBS=-li386
+
+CPPFLAGS+= -I${WRKINCDIR}
+LDFLAGS+= -L${WRKLIBDIR}
+
+pre-configure: link-readline-headers link-readline-libs
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/chipmunk ${PREFIX}/sbin/chipmunk
diff --git a/misc/chipmunk/distinfo b/misc/chipmunk/distinfo
index 58930250106..0557f52802a 100644
--- a/misc/chipmunk/distinfo
+++ b/misc/chipmunk/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 13:52:08 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/05/17 20:17:27 jlam Exp $
SHA1 (chipmunk-1.4.tar.gz) = a59c58427a27118497d39778ab7ca6daa371e868
Size (chipmunk-1.4.tar.gz) = 62181 bytes
-SHA1 (patch-aa) = 6d3b0735d7974a07c51627faee81295869eacae1
-SHA1 (patch-ab) = 8d960276ef682f7e138f77ffac5bcf65bc04e7b3
-SHA1 (patch-ac) = ca12c4b5672269dbde2cb118d26e0840f5d72a9b
+SHA1 (patch-aa) = 6f883506ef85335ff896d662a4dae7ec7f299889
+SHA1 (patch-ab) = c42f11558eed1912bc98b6769baffaad7d33f3bb
diff --git a/misc/chipmunk/patches/patch-aa b/misc/chipmunk/patches/patch-aa
index bace85e0f70..12631a27a2c 100644
--- a/misc/chipmunk/patches/patch-aa
+++ b/misc/chipmunk/patches/patch-aa
@@ -1,15 +1,8 @@
-$NetBSD: patch-aa,v 1.2 1999/07/13 01:32:23 jlam Exp $
+$NetBSD: patch-aa,v 1.3 2001/05/17 20:17:28 jlam Exp $
--- Makefile.orig Sun Sep 1 08:21:16 1996
-+++ Makefile Thu Jul 8 16:34:01 1999
-@@ -24,13 +24,13 @@
- $(EXTRA_OBJS) \
- version.o
-
--LIBS = -lreadline -ltermcap
-+LIBS = -l$(LIBREADLINE) -ltermcap
- # mention version.o last. This causes
- # the version number to be increased only
++++ Makefile
+@@ -30,7 +30,7 @@
# on succesful compilations.
chipmunk: $(OBJS) version
diff --git a/misc/chipmunk/patches/patch-ab b/misc/chipmunk/patches/patch-ab
index 232688e0277..aa6b91143b3 100644
--- a/misc/chipmunk/patches/patch-ab
+++ b/misc/chipmunk/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/06/23 18:18:55 drochner Exp $
+$NetBSD: patch-ab,v 1.2 2001/05/17 20:17:28 jlam Exp $
---- config.h.orig Wed Jun 23 16:52:58 1999
-+++ config.h Wed Jun 23 18:09:29 1999
+--- config.h.orig Thu Mar 23 10:38:56 1995
++++ config.h
@@ -108,6 +108,25 @@
# define USE_TESTS
#endif
diff --git a/misc/chipmunk/patches/patch-ac b/misc/chipmunk/patches/patch-ac
deleted file mode 100644
index 69d0877c574..00000000000
--- a/misc/chipmunk/patches/patch-ac
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ac,v 1.1 1999/07/13 01:32:23 jlam Exp $
-
---- control.c.orig Thu Mar 23 10:37:15 1995
-+++ control.c Thu Jul 8 16:34:33 1999
-@@ -26,8 +26,12 @@
-
- #ifdef USE_READLINE
- #include <dirent.h>
-+#ifdef HAVE_READLINE_H
-+#include <readline.h>
-+#else
- #include <readline/readline.h>
- #include <readline/history.h>
-+#endif HAVE_READLINE_H
- #endif USE_READLINE
-
- #include <sys/times.h>