diff options
Diffstat (limited to 'misc')
-rw-r--r-- | misc/reed/Makefile | 20 | ||||
-rw-r--r-- | misc/reed/PLIST | 4 | ||||
-rw-r--r-- | misc/reed/distinfo | 11 | ||||
-rw-r--r-- | misc/reed/patches/patch-aa | 24 | ||||
-rw-r--r-- | misc/reed/patches/patch-ab | 22 | ||||
-rw-r--r-- | misc/reed/patches/patch-ac | 15 | ||||
-rw-r--r-- | misc/reed/patches/patch-ad | 12 |
7 files changed, 35 insertions, 73 deletions
diff --git a/misc/reed/Makefile b/misc/reed/Makefile index 47b516c840e..456a608224b 100644 --- a/misc/reed/Makefile +++ b/misc/reed/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.6 2002/10/25 17:54:55 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2002/11/09 13:37:19 wiz Exp $ -DISTNAME= reed-4.6 +DISTNAME= reed-5.4 CATEGORIES= misc MASTER_SITES= http://www.sacredchao.net/software/reed/ @@ -8,13 +8,25 @@ MAINTAINER= wiz@netbsd.org HOMEPAGE= http://www.sacredchao.net/software/reed/index.shtml COMMENT= auto-scrolling file viewer -GNU_CONFIGURE= YES +CONFIGURE_SCRIPT= ./configures +CONFIGURE_ARGS+= -p ${PREFIX} +HAS_CONFIGURE= YES USE_BUILDLINK2= YES USE_PERL5= YES -REPLACE_PERL= scripts/breed scripts/wrap +REPLACE_PERL= breed fix_bookmarks.pl wrap # wgetnstr() INCOMPAT_CURSES= NetBSD-1.5-* NetBSD-1.5.*-* NetBSD-1.5[A-U]-* +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/reed ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/breed ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/wrap ${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/breed.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/reed.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/wrap.1 ${PREFIX}/man/man1 + ${INSTALL_DATA_DIR} ${PREFIX}/share/reed + ${INSTALL_DATA} ${WRKSRC}/help ${PREFIX}/share/reed/ + .include "../../devel/ncurses/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/reed/PLIST b/misc/reed/PLIST index de0a5e23677..bd04fcf87fe 100644 --- a/misc/reed/PLIST +++ b/misc/reed/PLIST @@ -1,7 +1,9 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:29:22 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/11/09 13:37:19 wiz Exp $ bin/breed bin/reed bin/wrap man/man1/breed.1 man/man1/reed.1 man/man1/wrap.1 +share/reed/help +@dirrm share/reed diff --git a/misc/reed/distinfo b/misc/reed/distinfo index 854eaedaaf9..7d78f3ff40a 100644 --- a/misc/reed/distinfo +++ b/misc/reed/distinfo @@ -1,8 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2001/09/02 20:13:28 wiz Exp $ +$NetBSD: distinfo,v 1.2 2002/11/09 13:37:19 wiz Exp $ -SHA1 (reed-4.6.tar.gz) = 937e24cac4b4154b5f81af52a5a80f0c7a6c7953 -Size (reed-4.6.tar.gz) = 59431 bytes -SHA1 (patch-aa) = b8e9a197f7759193cb6dd3adbc1d67ffa9dc3df7 -SHA1 (patch-ab) = 9b78e396246019c225f6c0e517296953cc5bf8cd -SHA1 (patch-ac) = 34272ee863f6a0d8f7896c78e410675027f8fee5 -SHA1 (patch-ad) = 63feba2bca775d43524d1d53ce47d804129a593e +SHA1 (reed-5.4.tar.gz) = e8c43add662576590597c8989e06011a3e80e93f +Size (reed-5.4.tar.gz) = 32414 bytes +SHA1 (patch-aa) = b35a3066d11e8926834f492c425652c59fef1335 diff --git a/misc/reed/patches/patch-aa b/misc/reed/patches/patch-aa index b5c589dc878..3b74b69b5a5 100644 --- a/misc/reed/patches/patch-aa +++ b/misc/reed/patches/patch-aa @@ -1,13 +1,13 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/09/02 20:13:28 wiz Exp $ +$NetBSD: patch-aa,v 1.2 2002/11/09 13:37:20 wiz Exp $ ---- man/reed.1.orig Fri Dec 1 01:26:02 2000 -+++ man/reed.1 -@@ -106,7 +106,7 @@ - .IP r - Clear and redraw the screen. - .IP v --Start a text editor opened to the current file. Reed first tried $EDITOR, -+Start a text editor opened to the current file. Reed first tries $EDITOR, - then $VISUAL, and defaults to /bin/ed. - .IP :n - Go to the next buffer in the file list. +--- configures.orig Sat Nov 9 01:59:08 2002 ++++ configures +@@ -5,7 +5,7 @@ + NF="true" # Do not force install ('not force') + PREFIX="/usr/local" + +-OPTS=`getopt -n configure -o v,p:,h,f,b:,l:,m:,d: --longoptions=prefix:,version,help,force,bindir:,libdir:,moddir:,headdir: -- $@` ++OPTS=`getopt vp:hfb:l:m:d: $@` + if [ $? != 0 ] ; then exit 1; fi + eval set -- "$OPTS" + diff --git a/misc/reed/patches/patch-ab b/misc/reed/patches/patch-ab deleted file mode 100644 index 8b4a06a0b21..00000000000 --- a/misc/reed/patches/patch-ab +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2001/09/02 20:13:28 wiz Exp $ - ---- src/file.c.orig Wed Feb 21 01:13:56 2001 -+++ src/file.c -@@ -39,7 +39,8 @@ - wmove(m, 2, 0); - whline(m, '-', width); - wrefresh(m); -- wclear(w); -+ if (w) -+ wclear(w); - return node; - } - -@@ -155,6 +156,7 @@ - wclear(w); - } - -+ wmove(w, 0, 0); - fseek(node->file, node->fileLines[n], SEEK_SET); - /* wclear(w); */ - for (j = 0; j < WLINES; j++) { diff --git a/misc/reed/patches/patch-ac b/misc/reed/patches/patch-ac deleted file mode 100644 index 7d71a25f093..00000000000 --- a/misc/reed/patches/patch-ac +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ac,v 1.1.1.1 2001/09/02 20:13:28 wiz Exp $ - ---- src/reed.c.orig Wed Feb 21 01:14:55 2001 -+++ src/reed.c -@@ -30,8 +30,8 @@ - int main(int argc, char **argv) { - unsigned long speed = 5*TENTH_SECOND; - int jump = 1, index, retval = SAME_FILE; -- char opt, *fakefilename = NULL; -- int valid; -+ char *fakefilename = NULL; -+ int opt, valid; - struct stat st; - fileNode *node = NULL; - if (argc > 1 && !strcmp("--help", argv[1])) { diff --git a/misc/reed/patches/patch-ad b/misc/reed/patches/patch-ad deleted file mode 100644 index 368dc972077..00000000000 --- a/misc/reed/patches/patch-ad +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ad,v 1.1.1.1 2001/09/02 20:13:28 wiz Exp $ - ---- src/reed.h.orig Fri Dec 1 01:09:49 2000 -+++ src/reed.h -@@ -26,6 +26,7 @@ - #include <ctype.h> - #include <time.h> - #include <getopt.h> -+#include <limits.h> - - /* macros */ - #define clearLine(n) wmove(m, n, 0); whline(m, ' ', COLS); |