summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorjlam <jlam>1999-07-13 01:31:06 +0000
committerjlam <jlam>1999-07-13 01:31:06 +0000
commit8ee341e6dba9e15f44dcb39ac5aee7b7bea12062 (patch)
tree32b936513d96172633d3ebf37d9b0c7faa21a01f /misc
parentff9a5660a179dede7c9912b8ceef8234ff54846b (diff)
downloadpkgsrc-8ee341e6dba9e15f44dcb39ac5aee7b7bea12062.tar.gz
* Use libedit's readline wrapper instead of readline when possible.
* Update readline dependency.
Diffstat (limited to 'misc')
-rw-r--r--misc/chipmunk/Makefile17
-rw-r--r--misc/chipmunk/patches/patch-aa15
-rw-r--r--misc/chipmunk/patches/patch-ac17
3 files changed, 40 insertions, 9 deletions
diff --git a/misc/chipmunk/Makefile b/misc/chipmunk/Makefile
index d406e8f729f..9fe78abb361 100644
--- a/misc/chipmunk/Makefile
+++ b/misc/chipmunk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/06/23 18:18:53 drochner Exp $
+# $NetBSD: Makefile,v 1.2 1999/07/13 01:32:22 jlam Exp $
#
DISTNAME= chipmunk-1.4
@@ -8,15 +8,22 @@ MASTER_SITES= http://www.bitwizard.nl/chipmunk/
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.bitwizard.nl/chipmunk/index.html
-DEPENDS+= readline-2.2:../../devel/readline
+.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
ALL_TARGET= chipmunk
-MAKE_FLAGS= CONFIG_OPTIONS=-I$(PREFIX)/include \
- LDFLAGS=-L$(PREFIX)/lib EXTRA_LIBS=-li386
+MAKE_ENV+= CONFIG_OPTIONS="${CPPFLAGS}" EXTRA_LIBS=-li386 \
+ LIBREADLINE=${LIBREADLINE}
do-install:
- $(INSTALL_PROGRAM) $(WRKSRC)/chipmunk $(PREFIX)/sbin/chipmunk
+ ${INSTALL_PROGRAM} ${WRKSRC}/chipmunk ${PREFIX}/sbin/chipmunk
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/chipmunk/patches/patch-aa b/misc/chipmunk/patches/patch-aa
index 1252378677e..bace85e0f70 100644
--- a/misc/chipmunk/patches/patch-aa
+++ b/misc/chipmunk/patches/patch-aa
@@ -1,8 +1,15 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/06/23 18:18:55 drochner Exp $
+$NetBSD: patch-aa,v 1.2 1999/07/13 01:32:23 jlam Exp $
---- Makefile.orig Wed Jun 23 16:49:36 1999
-+++ Makefile Wed Jun 23 16:50:15 1999
-@@ -30,7 +30,7 @@
+--- 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
# on succesful compilations.
chipmunk: $(OBJS) version
diff --git a/misc/chipmunk/patches/patch-ac b/misc/chipmunk/patches/patch-ac
new file mode 100644
index 00000000000..69d0877c574
--- /dev/null
+++ b/misc/chipmunk/patches/patch-ac
@@ -0,0 +1,17 @@
+$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>