diff options
| -rw-r--r-- | math/pspp/Makefile | 14 | ||||
| -rw-r--r-- | math/pspp/files/patch-sum | 11 | ||||
| -rw-r--r-- | math/pspp/patches/patch-aa | 24 | ||||
| -rw-r--r-- | math/pspp/patches/patch-ac | 30 | ||||
| -rw-r--r-- | math/pspp/patches/patch-ad | 29 | ||||
| -rw-r--r-- | math/pspp/patches/patch-ae | 15 | ||||
| -rw-r--r-- | math/pspp/patches/patch-af | 20 | ||||
| -rw-r--r-- | math/pspp/patches/patch-ag | 14 | ||||
| -rw-r--r-- | math/pspp/patches/patch-ah | 25 | ||||
| -rw-r--r-- | math/pspp/patches/patch-ai | 40 | ||||
| -rw-r--r-- | misc/chipmunk/Makefile | 17 | ||||
| -rw-r--r-- | misc/chipmunk/patches/patch-aa | 15 | ||||
| -rw-r--r-- | misc/chipmunk/patches/patch-ac | 17 |
13 files changed, 254 insertions, 17 deletions
diff --git a/math/pspp/Makefile b/math/pspp/Makefile index 5154d7a8d11..1e8398f270d 100644 --- a/math/pspp/Makefile +++ b/math/pspp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 1999/07/06 08:03:46 jlam Exp $ +# $NetBSD: Makefile,v 1.6 1999/07/13 01:31:06 jlam Exp $ # DISTNAME= pspp-0.2.3 @@ -15,12 +15,20 @@ MASTER_SITES= ftp://franz.stat.wisc.edu/pub/PSPP/ \ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.gnu.org/software/pspp/ +BUILD_DEPENDS+= autoconf:../../devel/autoconf DEPENDS+= gettext-0.10.35:../../devel/gettext -DEPENDS+= readline-2.2:../../devel/readline DEPENDS+= ncurses-4.2:../../devel/ncurses +.if !exists(/usr/include/readline.h) +DEPENDS+= readline-4.0:../../devel/readline +.endif + GNU_CONFIGURE= yes USE_GTEXINFO= yes -CONFIGURE_ENV= CPPFLAGS="-Dunix -I${LOCALBASE}/include" +CPPFLAGS+= -Dunix=1 -I${LOCALBASE}/include +CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" + +pre-configure: + ( cd ${WRKSRC}; autoconf ) .include "../../mk/bsd.pkg.mk" diff --git a/math/pspp/files/patch-sum b/math/pspp/files/patch-sum index 0e58f60bb55..8b521b951cd 100644 --- a/math/pspp/files/patch-sum +++ b/math/pspp/files/patch-sum @@ -1,4 +1,11 @@ -$NetBSD: patch-sum,v 1.1 1999/07/09 14:09:09 agc Exp $ +$NetBSD: patch-sum,v 1.2 1999/07/13 01:31:07 jlam Exp $ -MD5 (patch-aa) = ff5e9c80d9cf0b5cf6da17d4302fc28d +MD5 (patch-aa) = 9968f7f4de23ea02b29876c7747c6674 MD5 (patch-ab) = 2161f75ea660dc822ca8932adefbd41c +MD5 (patch-ac) = 4b672f9e3362f831a189c081ecac77c0 +MD5 (patch-ad) = 2475cc1df4ae97f3ac75faa0ec03e4eb +MD5 (patch-ae) = 76b940b16ed37b2f4f9ee4953728efd4 +MD5 (patch-af) = 904e1c38c142db62f227bde29175d4b4 +MD5 (patch-ag) = 77ce889c1f8583baf79bfa436c2053c5 +MD5 (patch-ah) = 445fdcab1dbe499faf36eed9ca31a942 +MD5 (patch-ai) = 1c40dcac24606d3a162cb4943738d123 diff --git a/math/pspp/patches/patch-aa b/math/pspp/patches/patch-aa index adf5d055408..5681b9a9350 100644 --- a/math/pspp/patches/patch-aa +++ b/math/pspp/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.1.1.1 1998/10/26 18:54:43 frueauf Exp $ +$NetBSD: patch-aa,v 1.2 1999/07/13 01:31:08 jlam Exp $ ---- Makefile.in.orig Sun Oct 18 01:59:38 1998 -+++ Makefile.in Mon Oct 26 10:51:34 1998 +--- Makefile.in.orig Tue Mar 9 14:02:32 1999 ++++ Makefile.in Thu Jul 8 15:06:23 1999 @@ -97,7 +97,7 @@ SUBDIRS = doc intl po lib src config tests @@ -11,3 +11,21 @@ $NetBSD: patch-aa,v 1.1.1.1 1998/10/26 18:54:43 frueauf Exp $ pkgdoc_DATA = NEWS README TODO noinst_DATA = AUTHORS THANKS +@@ -132,7 +132,7 @@ + && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status + + $(ACLOCAL_M4): configure.in acinclude.m4 +- cd $(srcdir) && $(ACLOCAL) ++# cd $(srcdir) && $(ACLOCAL) + + config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + $(SHELL) ./config.status --recheck +@@ -155,7 +155,7 @@ + $(MAKE) $(srcdir)/stamp-h.in; \ + else :; fi + $(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h +- cd $(top_srcdir) && $(AUTOHEADER) ++# cd $(top_srcdir) && $(AUTOHEADER) + @echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null + + mostlyclean-hdr: diff --git a/math/pspp/patches/patch-ac b/math/pspp/patches/patch-ac new file mode 100644 index 00000000000..b85a5b7d47f --- /dev/null +++ b/math/pspp/patches/patch-ac @@ -0,0 +1,30 @@ +$NetBSD: patch-ac,v 1.1 1999/07/13 01:31:08 jlam Exp $ + +--- config.h.in.orig Tue Mar 9 14:02:30 1999 ++++ config.h.in Thu Jul 8 14:41:55 1999 +@@ -274,9 +274,15 @@ + /* Define if you have the <nl_types.h> header file. */ + #undef HAVE_NL_TYPES_H + ++/* Define if you have the <history.h> header file. */ ++#undef HAVE_HISTORY_H ++ + /* Define if you have the <readline/history.h> header file. */ + #undef HAVE_READLINE_HISTORY_H + ++/* Define if you have the <readline.h> header file. */ ++#undef HAVE_READLINE_H ++ + /* Define if you have the <readline/readline.h> header file. */ + #undef HAVE_READLINE_READLINE_H + +@@ -312,6 +318,9 @@ + + /* Define if you have the readline library (-lreadline). */ + #undef HAVE_LIBREADLINE ++ ++/* Define if you have the tilde_expand function. */ ++#undef HAVE_TILDE_EXPAND + + /* Name of package */ + #undef PACKAGE diff --git a/math/pspp/patches/patch-ad b/math/pspp/patches/patch-ad new file mode 100644 index 00000000000..382172e085f --- /dev/null +++ b/math/pspp/patches/patch-ad @@ -0,0 +1,29 @@ +$NetBSD: patch-ad,v 1.1 1999/07/13 01:31:09 jlam Exp $ + +--- configure.in.orig Tue Mar 9 14:02:08 1999 ++++ configure.in Thu Jul 8 14:40:47 1999 +@@ -49,14 +49,19 @@ + AC_DEFINE(HAVE_LIBTERMCAP) + fi + +-AC_CHECK_LIB(readline, readline) +-if test "$ac_cv_lib_readline_readline" = yes; then +- AC_CHECK_HEADERS(readline/readline.h) +- AC_CHECK_LIB(readline, add_history, history=yes, ++AC_CHECK_LIB(edit, readline, readlinelib=edit have_readline=yes, ++ AC_CHECK_LIB(readline, readline, readlinelib=readline have_readline=yes, ++ readline=no)) ++if test "$have_readline" = yes; then ++ LIBS="-l$readlinelib $LIBS" ++ AC_CHECK_HEADERS(readline.h readline/readline.h) ++ AC_DEFINE(HAVE_LIBREADLINE) ++ AC_CHECK_LIB($readlinelib, tilde_expand, AC_DEFINE(HAVE_TILDE_EXPAND)) ++ AC_CHECK_LIB($readlinelib, add_history, history=yes, + AC_CHECK_LIB(history, add_history, LIBS="-lhistory" history=yes, + history=no)) + if test "$history" = yes; then +- AC_CHECK_HEADERS(readline/history.h) ++ AC_CHECK_HEADERS(history.h readline/history.h) + AC_DEFINE(HAVE_LIBHISTORY) + fi + fi diff --git a/math/pspp/patches/patch-ae b/math/pspp/patches/patch-ae new file mode 100644 index 00000000000..b77ae926b84 --- /dev/null +++ b/math/pspp/patches/patch-ae @@ -0,0 +1,15 @@ +$NetBSD: patch-ae,v 1.1 1999/07/13 01:31:09 jlam Exp $ + +--- src/error.c.orig Fri Aug 14 10:39:09 1998 ++++ src/error.c Thu Jul 8 14:31:59 1999 +@@ -50,7 +50,9 @@ + #include "command.h" + + #if HAVE_LIBHISTORY +-#if HAVE_READLINE_HISTORY_H ++#if HAVE_HISTORY_H ++#include <history.h> ++#elif HAVE_READLINE_HISTORY_H + #include <readline/history.h> + #else + int write_history (char *); diff --git a/math/pspp/patches/patch-af b/math/pspp/patches/patch-af new file mode 100644 index 00000000000..fb219fc4473 --- /dev/null +++ b/math/pspp/patches/patch-af @@ -0,0 +1,20 @@ +$NetBSD: patch-af,v 1.1 1999/07/13 01:31:09 jlam Exp $ + +--- src/filename.c.orig Mon Jan 18 13:00:08 1999 ++++ src/filename.c Thu Jul 8 14:44:06 1999 +@@ -209,6 +209,7 @@ + } + } + ++#if !HAVE_TILDE_EXPAND + #if unix + /* Expands csh tilde notation from the path INPUT into a malloc()'d + returned string. */ +@@ -293,6 +294,7 @@ + return xstrdup (input); + } + #endif /* !unix */ ++#endif + + /* normalize_filename(): This very OS-dependent routine canonicalizes + filename FN1. The filename should not need to be the name of an diff --git a/math/pspp/patches/patch-ag b/math/pspp/patches/patch-ag new file mode 100644 index 00000000000..c72f97e2f3f --- /dev/null +++ b/math/pspp/patches/patch-ag @@ -0,0 +1,14 @@ +$NetBSD: patch-ag,v 1.1 1999/07/13 01:31:10 jlam Exp $ + +--- src/filename.h.orig Fri Aug 14 10:40:39 1998 ++++ src/filename.h Thu Jul 8 14:44:29 1999 +@@ -31,7 +31,9 @@ + const char *getenv_default (const char *key, const char *def); + char *interp_vars (const char *, const char *(*)(const char *)); + ++#if !HAVE_TILDE_EXPAND + char *tilde_expand (const char *); ++#endif + char *search_path (const char *name, const char *path, const char *prepend); + + char *gnu_getcwd (void); diff --git a/math/pspp/patches/patch-ah b/math/pspp/patches/patch-ah new file mode 100644 index 00000000000..2900b33f224 --- /dev/null +++ b/math/pspp/patches/patch-ah @@ -0,0 +1,25 @@ +$NetBSD: patch-ah,v 1.1 1999/07/13 01:31:11 jlam Exp $ + +--- src/getline.c.orig Thu Jan 21 19:54:44 1999 ++++ src/getline.c Thu Jul 8 14:34:13 1999 +@@ -354,14 +354,18 @@ + /* PORTME: Adapt to your local system's idea of the terminal. */ + #if HAVE_LIBREADLINE + +-#if HAVE_READLINE_READLINE_H ++#if HAVE_READLINE_H ++#include <readline.h> ++#elif HAVE_READLINE_READLINE_H + #include <readline/readline.h> + #else /* no readline/readline.h */ + extern char *readline (char *); + #endif /* no readline/readline.h */ + + #if HAVE_LIBHISTORY +-#if HAVE_READLINE_HISTORY_H ++#if HAVE_HISTORY_H ++#include <history.h> ++#elif HAVE_READLINE_HISTORY_H + #include <readline/history.h> + #else /* no readline/history.h */ + extern void add_history (char *); diff --git a/math/pspp/patches/patch-ai b/math/pspp/patches/patch-ai new file mode 100644 index 00000000000..4de3d021ffa --- /dev/null +++ b/math/pspp/patches/patch-ai @@ -0,0 +1,40 @@ +$NetBSD: patch-ai,v 1.1 1999/07/13 01:31:11 jlam Exp $ + +--- src/glob.c.orig Fri Aug 14 10:39:16 1998 ++++ src/glob.c Thu Jul 8 15:10:52 1999 +@@ -42,16 +42,6 @@ + #endif /* !HAVE_TERMCAP_H */ + #endif /* !HAVE_LIBTERMCAP */ + +-#if HAVE_LIBHISTORY +-#if HAVE_READLINE_HISTORY_H +-#include <readline/history.h> +-#else /* no readline/history.h */ +-extern void using_history (); +-extern int read_history (); +-extern void stifle_history (); +-#endif /* no readline/history.h */ +-#endif /* -lhistory */ +- + #if HAVE_FPU_CONTROL_H + #include <fpu_control.h> + #elif __BORLANDC__ +@@ -86,6 +76,18 @@ + #include "avl.h" + #include "vfm.h" + #include "command.h" ++ ++#if HAVE_LIBHISTORY ++#if HAVE_HISTORY_H ++#include <history.h> ++#elif HAVE_READLINE_HISTORY_H ++#include <readline/history.h> ++#else /* no readline/history.h */ ++extern void using_history (); ++extern int read_history (); ++extern void stifle_history (); ++#endif /* no readline/history.h */ ++#endif /* -lhistory */ + + /* var.h */ + dictionary default_dict; 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> |