From d87f0ffdbcb344ad1def252aebf0e4b5886fd037 Mon Sep 17 00:00:00 2001 From: brad Date: Thu, 7 Jun 2001 15:49:04 +0000 Subject: [PATCH] upgrade to jed 0.99.14 - DESTDIR patch integrated. --- editors/jed/Makefile | 6 +- editors/jed/files/md5 | 6 +- editors/jed/patches/patch-src_Makefile.in | 126 ++++------------------ editors/jed/pkg/PLIST | 19 ++-- 4 files changed, 39 insertions(+), 118 deletions(-) diff --git a/editors/jed/Makefile b/editors/jed/Makefile index ec36a100903..2ebbd97f991 100644 --- a/editors/jed/Makefile +++ b/editors/jed/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.20 2001/05/06 00:29:08 lebel Exp $ +# $OpenBSD: Makefile,v 1.21 2001/06/07 15:49:04 brad Exp $ COMMENT= "text editor" -DISTNAME= jed-B0.99-13 -PKGNAME= jed-0.99.13 +DISTNAME= jed-B0.99-14 +PKGNAME= jed-0.99.14 CATEGORIES= editors NEED_VERSION= 1.402 MASTER_SITES= ftp://space.mit.edu/pub/davis/jed/v0.99/ \ diff --git a/editors/jed/files/md5 b/editors/jed/files/md5 index c5a317b4654..5bf6278cb04 100644 --- a/editors/jed/files/md5 +++ b/editors/jed/files/md5 @@ -1,3 +1,3 @@ -MD5 (jed-B0.99-13.tar.gz) = 9e9e56a76d96550b07ebf39345dd7cbc -RMD160 (jed-B0.99-13.tar.gz) = 327e8eccce0990ba9f70978520c67257c598f513 -SHA1 (jed-B0.99-13.tar.gz) = 93afdf2e573485c5a6432043b1139286c9d235d8 +MD5 (jed-B0.99-14.tar.gz) = 15d5f560e6f74ac2a406f20a21fff340 +RMD160 (jed-B0.99-14.tar.gz) = 1e2a645ed54543ede15239dd234217642694f4d0 +SHA1 (jed-B0.99-14.tar.gz) = 1b317e6a6044691b61322714f9250f79fc73702b diff --git a/editors/jed/patches/patch-src_Makefile.in b/editors/jed/patches/patch-src_Makefile.in index 0bdbbf35fd8..3db194cf03b 100644 --- a/editors/jed/patches/patch-src_Makefile.in +++ b/editors/jed/patches/patch-src_Makefile.in @@ -1,131 +1,51 @@ ---- src/Makefile.in.orig Mon Feb 19 13:33:22 2001 -+++ src/Makefile.in Wed Feb 21 21:00:23 2001 -@@ -31,6 +31,14 @@ - JED_INFO_FILES = ../info/* - - #--------------------------------------------------------------------------- -+# DESTDIR is designed to facilitate making packages. Normally it is empty -+#--------------------------------------------------------------------------- -+DESTDIR = -+DEST_BIN_DIR = $(DESTDIR)$(BIN_DIR) -+DEST_MAN_DIR = $(DESTDIR)$(MAN_DIR) -+DEST_JED_ROOT = $(DESTDIR)$(JED_ROOT) -+ -+#--------------------------------------------------------------------------- - # Location of jed source code - #--------------------------------------------------------------------------- - # Location of jed source code (absolute path) -@@ -160,79 +168,79 @@ +--- src/Makefile.in.orig Thu Jun 7 11:03:12 2001 ++++ src/Makefile.in Thu Jun 7 11:08:45 2001 +@@ -168,14 +168,14 @@ distclean: clean /bin/rm -rf $(OBJDIR) Makefile sysconf.h install_directories: -- $(MKINSDIR) $(BIN_DIR) -- $(MKINSDIR) $(MAN_DIR) -- $(MKINSDIR) $(JED_ROOT) -- $(MKINSDIR) $(JED_ROOT)/bin -- $(MKINSDIR) $(JED_ROOT)/info -- $(MKINSDIR) $(JED_ROOT)/doc -- $(MKINSDIR) $(JED_ROOT)/doc/txt -- $(MKINSDIR) $(JED_ROOT)/doc/manual -- $(MKINSDIR) $(JED_ROOT)/lib -- $(MKINSDIR) $(JED_ROOT)/lib/colors -- $(MKINSDIR) $(JED_ROOT)/lib/colors/Xjed -- $(MKINSDIR) $(JED_ROOT)/lib/tm + $(MKINSDIR) $(DESTDIR)$(prefix)/info + $(MKINSDIR) $(DESTDIR)$(prefix)/share/doc/jed + $(MKINSDIR) $(DESTDIR)$(prefix)/share/doc/jed/txt + $(MKINSDIR) $(DESTDIR)$(prefix)/share/doc/jed/manual -+ $(MKINSDIR) $(DEST_BIN_DIR) -+ $(MKINSDIR) $(DEST_MAN_DIR) -+ $(MKINSDIR) $(DEST_JED_ROOT) -+ $(MKINSDIR) $(DEST_JED_ROOT)/bin -+ $(MKINSDIR) $(DEST_JED_ROOT)/lib -+ $(MKINSDIR) $(DEST_JED_ROOT)/lib/colors -+ $(MKINSDIR) $(DEST_JED_ROOT)/lib/colors/Xjed -+ $(MKINSDIR) $(DEST_JED_ROOT)/lib/tm - - install: all install_directories -- $(INSTALL) $(OBJDIR)/jed $(BIN_DIR)/ -- -$(INSTALL) $(OBJDIR)/xjed $(BIN_DIR)/ -- -$(INSTALL) $(OBJDIR)/rgrep $(BIN_DIR)/ -- -$(INSTALL) $(OBJDIR)/getmail $(JED_ROOT)/bin/ -+ $(INSTALL) $(OBJDIR)/jed $(DEST_BIN_DIR)/ -+ -$(INSTALL) $(OBJDIR)/xjed $(DEST_BIN_DIR)/ -+ -$(INSTALL) $(OBJDIR)/rgrep $(DEST_BIN_DIR)/ -+ -$(INSTALL) $(OBJDIR)/getmail $(DEST_JED_ROOT)/bin/ - @for i in $(JED_LIB_FILES); \ - do \ -- echo $(INSTALL_DATA) $$i $(JED_ROOT)/lib/; \ -- $(INSTALL_DATA) $$i $(JED_ROOT)/lib/; \ -+ echo $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/lib/; \ -+ $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/lib/; \ - if [ "$$?" != "0" ]; then \ - exit 1; \ - fi; \ - done -- $(INSTALL_DATA) $(JED_COLOR_FILES) $(JED_ROOT)/lib/colors/ -+ $(INSTALL_DATA) $(JED_COLOR_FILES) $(DEST_JED_ROOT)/lib/colors/ - @for i in $(JED_COLOR_FILES); \ - do \ -- echo $(INSTALL_DATA) $$i $(JED_ROOT)/lib/colors/; \ -- $(INSTALL_DATA) $$i $(JED_ROOT)/lib/colors/; \ -+ echo $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/lib/colors/; \ -+ $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/lib/colors/; \ - if [ "$$?" != "0" ]; then \ - exit 1; \ - fi; \ - done -- $(INSTALL_DATA) $(JED_COLOR_FILES) $(JED_ROOT)/lib/colors/ -+ $(INSTALL_DATA) $(JED_COLOR_FILES) $(DEST_JED_ROOT)/lib/colors/ - @for i in $(XJED_COLOR_FILES); \ - do \ -- echo $(INSTALL_DATA) $$i $(JED_ROOT)/lib/colors/Xjed/; \ -- $(INSTALL_DATA) $$i $(JED_ROOT)/lib/colors/Xjed/; \ -+ echo $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/lib/colors/Xjed/; \ -+ $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/lib/colors/Xjed/; \ - if [ "$$?" != "0" ]; then \ - exit 1; \ - fi; \ - done - @for i in $(JED_MAN_FILES); \ - do \ -- $(INSTALL_DATA) $$i $(MAN_DIR)/; \ -- echo $(INSTALL_DATA) $$i $(MAN_DIR)/; \ -+ $(INSTALL_DATA) $$i $(DEST_MAN_DIR)/; \ -+ echo $(INSTALL_DATA) $$i $(DEST_MAN_DIR)/; \ - done - @for i in $(JED_TM_FILES); \ - do \ -- $(INSTALL_DATA) $$i $(JED_ROOT)/lib/tm/; \ -- echo $(INSTALL_DATA) $$i $(JED_ROOT)/lib/tm/; \ -+ $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/lib/tm/; \ -+ echo $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/lib/tm/; \ + $(MKINSDIR) $(DEST_BIN_DIR) + $(MKINSDIR) $(DEST_MAN_DIR) + $(MKINSDIR) $(DEST_JED_ROOT) + $(MKINSDIR) $(DEST_JED_ROOT)/bin +- $(MKINSDIR) $(DEST_JED_ROOT)/info +- $(MKINSDIR) $(DEST_JED_ROOT)/doc +- $(MKINSDIR) $(DEST_JED_ROOT)/doc/txt +- $(MKINSDIR) $(DEST_JED_ROOT)/doc/manual + $(MKINSDIR) $(DEST_JED_ROOT)/lib + $(MKINSDIR) $(DEST_JED_ROOT)/lib/colors + $(MKINSDIR) $(DEST_JED_ROOT)/lib/colors/Xjed +@@ -222,23 +222,23 @@ install: all install_directories done @for i in $(JED_DOC_FILES); \ do \ -- $(INSTALL_DATA) $$i $(JED_ROOT)/doc/; \ -- echo $(INSTALL_DATA) $$i $(JED_ROOT)/doc/; \ +- $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/doc/; \ +- echo $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/doc/; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/share/doc/jed/; \ + echo $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/share/doc/jed/; \ done @for i in $(JED_DOC_TXT_FILES); \ do \ -- $(INSTALL_DATA) $$i $(JED_ROOT)/doc/txt; \ -- echo $(INSTALL_DATA) $$i $(JED_ROOT)/doc/txt; \ +- $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/doc/txt; \ +- echo $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/doc/txt; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/share/doc/jed/txt; \ + echo $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/share/doc/jed/txt; \ done @for i in $(JED_DOC_MAN_FILES); \ do \ -- $(INSTALL_DATA) $$i $(JED_ROOT)/doc/manual; \ -- echo $(INSTALL_DATA) $$i $(JED_ROOT)/doc/manual; \ +- $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/doc/manual; \ +- echo $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/doc/manual; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/share/doc/jed/manual; \ + echo $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/share/doc/jed/manual; \ done @for i in $(JED_INFO_FILES); \ do \ -- $(INSTALL_DATA) $$i $(JED_ROOT)/info/; \ -- echo $(INSTALL_DATA) $$i $(JED_ROOT)/info/; \ +- $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/info/; \ +- echo $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/info/; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/info/; \ + echo $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/info/; \ done diff --git a/editors/jed/pkg/PLIST b/editors/jed/pkg/PLIST index 7d214cd3796..518fd1944cb 100644 --- a/editors/jed/pkg/PLIST +++ b/editors/jed/pkg/PLIST @@ -1,13 +1,13 @@ -@comment $OpenBSD: PLIST,v 1.10 2001/02/22 02:45:17 brad Exp $ +@comment $OpenBSD: PLIST,v 1.11 2001/06/07 15:49:05 brad Exp $ bin/jed bin/rgrep !%%no_x11%% -@unexec install-info --delete %D/info/jed.info %D/info/dir +@unexec install-info --delete --info-dir=%D/info %D/info/jed.info info/jed.1in info/jed.2in info/jed.3in info/jed.info -@exec install-info --section "Editors" --entry "* JED: (jed). JED editor documentation" %D/info/jed.info %D/info/dir +@exec install-info --info-dir=%D/info %D/info/jed.info lib/jed/bin/getmail lib/jed/lib/abbrev.sl lib/jed/lib/abbrmisc.sl @@ -127,6 +127,7 @@ lib/jed/lib/pscript.sl lib/jed/lib/pushmode.sl lib/jed/lib/pymode.sl lib/jed/lib/rcs.sl +lib/jed/lib/recent.sl lib/jed/lib/regexp.sl lib/jed/lib/register.sl lib/jed/lib/replace.sl @@ -198,12 +199,12 @@ share/doc/jed/txt/wjed.txt share/doc/jed/txt/wordstar.txt share/doc/jed/txt/xjed.txt share/doc/jed/txt/yankpop.txt -@dirrm lib/jed/bin -@dirrm lib/jed/lib/colors/Xjed -@dirrm lib/jed/lib/colors -@dirrm lib/jed/lib/tm -@dirrm lib/jed/lib -@dirrm lib/jed @dirrm share/doc/jed/txt @dirrm share/doc/jed/manual @dirrm share/doc/jed +@dirrm lib/jed/lib/tm +@dirrm lib/jed/lib/colors/Xjed +@dirrm lib/jed/lib/colors +@dirrm lib/jed/lib +@dirrm lib/jed/bin +@dirrm lib/jed