- Sort the packing list

- Honour ${NOPORTDOCS}
- Use ${INFO} instead of install-info, and add patches to add section
  and dir-entry to info files
- Patch src/Makefile.in instead of installing files in the wrong
  location and removing them
- Move ${STRIP_CMD} commands to src/Makefile.in
- Pass maintainership to Renato Botelho <freebsd@galle.com.br>

PR:		ports/80441
Submitted by:	Renato Botelho <freebsd@galle.com.br> (new maintainer)
Approved by:	former maintainer

10 files changed, 239 insertions, 107 deletions

diff --git a/editors/jed/Makefile b/editors/jed/Makefile
index 57d593510623..7bbb0f38cb9f 100644
--- a/editors/jed/Makefile
+++ b/editors/jed/Makefile
@@ -12,15 +12,18 @@ CATEGORIES=	editors
 MASTER_SITES=	ftp://space.mit.edu/pub/davis/jed/v${PORTVERSION:R}/
 DISTNAME=	${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}
 
-MAINTAINER=	s_bschmi@ira.uka.de
+MAINTAINER=	freebsd@galle.com.br
 COMMENT=	A SLang-based text editor
 
 LIB_DEPENDS=	slang.1:${PORTSDIR}/devel/libslang
 
+USE_REINPLACE=	yes
+
 .if !defined(WITHOUT_X11)
 USE_XLIB=	yes
 XJED=		xjed
 PLIST_SUB+=	NOXJED=""
+MAKE_ENV+=	XJED=yes
 .else
 PLIST_SUB+=	NOXJED="@comment "
 .endif
@@ -30,35 +33,28 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	JED_ROOT=${PREFIX}/lib/jed \
 		CFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
+MAKE_ENV+=	DEST_INFO_DIR=${PREFIX}/${INFO_PATH} \
+		DEST_DOC_DIR=${DOCSDIR} \
+		STRIP_CMD=${STRIP_CMD}
+
+.if defined(NOPORTDOCS)
+MAKE_ENV+=	JED_WITHOUT_DOCS=yes
+.endif
+
 ALL_TARGET=	all getmail ${XJED}
 MAN1=		jed.1 rgrep.1
+INFO=		jed
 
-pre-install:
-	${LN} -sf ${WRKSRC}/autoconf/mkinsdir.sh  ${WRKSRC}/
+pre-configure:
+.for n in 1 2 3
+	@${MV} ${WRKSRC}/info/jed.${n}in ${WRKSRC}/info/jed.info-${n}
+.endfor
+	@${REINPLACE_CMD} 's|jed.\([0-9]\)in|jed.info-\1|' \
+		${WRKSRC}/info/jed.info
 
 post-install:
-	${STRIP_CMD} ${PREFIX}/bin/jed
-	${STRIP_CMD} ${PREFIX}/bin/rgrep
-	${STRIP_CMD} ${PREFIX}/lib/jed/bin/getmail
-.for f in ${XJED}
-	${STRIP_CMD} ${PREFIX}/bin/$f
-.endfor
-#	${CP} -R ${WRKSRC}/lib/* ${PREFIX}/lib/jed/lib
 	${INSTALL_DATA} ${WRKSRC}/lib/vms_shell.com ${PREFIX}/lib/jed/lib
 	${INSTALL_DATA} ${WRKSRC}/lib/README ${PREFIX}/lib/jed/lib
 	${INSTALL_DATA} ${WRKSRC}/lib/jed.conf ${PREFIX}/lib/jed/lib
-	-${RM} -f ${PREFIX}/lib/jed/info/*
-	-${RMDIR} ${PREFIX}/lib/jed/info
-	-${RM} -f ${PREFIX}/lib/jed/doc/txt/*
-	-${RMDIR} ${PREFIX}/lib/jed/doc/txt
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/jed
-	${INSTALL_DATA} ${WRKSRC}/doc/txt/*.txt \
-		${PREFIX}/share/doc/jed
-	${INSTALL_DATA} ${WRKSRC}/info/jed.* ${PREFIX}/info
-	install-info --section="Miscellaneous" \
-		--entry="* JED: (jed).			JED editor documentation." \
-		${PREFIX}/info/jed.info ${PREFIX}/info/dir
-.endif
 
 .include <bsd.port.mk>
diff --git a/editors/jed/files/patch-aa b/editors/jed/files/patch-aa
deleted file mode 100644
index 4aa1fa83c084..000000000000
--- a/editors/jed/files/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/Makefile.in.orig	Sun Oct 20 06:55:30 2002
-+++ src/Makefile.in	Thu Feb 20 21:06:23 2003
-@@ -158,7 +158,7 @@
- rgrep: $(OBJDIR)/rgrep
- 	@echo rgrep created in $(OBJDIR)
- $(OBJDIR)/rgrep: $(OBJDIR)/vfile.o $(OBJDIR)/rgrep.o
--	cd $(OBJDIR); $(CC) vfile.o rgrep.o -o rgrep $(LDFLAGS) $(SLANG_LIB) -lslang
-+	cd $(OBJDIR); $(CC) vfile.o rgrep.o -o rgrep $(LDFLAGS) $(SLANG_LIB) -lslang $(TERMCAP_LIB)
- #
- getmail: $(OBJDIR)/getmail
- 	@echo getmail created in $(OBJDIR)
-@@ -186,7 +186,6 @@
- 	$(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 $(DEST_BIN_DIR)/
diff --git a/editors/jed/files/patch-info_jed.1in b/editors/jed/files/patch-info_jed.1in
new file mode 100644
index 000000000000..04461a9a2fb5
--- /dev/null
+++ b/editors/jed/files/patch-info_jed.1in
@@ -0,0 +1,14 @@
+--- info/jed.1in.orig	Thu Apr 28 15:48:52 2005
++++ info/jed.1in	Thu Apr 28 15:54:43 2005
+@@ -1,6 +1,11 @@
+ This is Info file jed.info, produced by Makeinfo-1.55 from the input
+ file jed.ti.
+ 
++INFO-DIR-SECTION Miscellaneous
++START-INFO-DIR-ENTRY
++* JED: (jed).                  JED editor documentation.
++END-INFO-DIR-ENTRY
++
+ 
+ File: jed.info,  Node: Top,  Next: Introduction,  Up: (dir)
+ 
diff --git a/editors/jed/files/patch-info_jed.2in b/editors/jed/files/patch-info_jed.2in
new file mode 100644
index 000000000000..de586bedb2c3
--- /dev/null
+++ b/editors/jed/files/patch-info_jed.2in
@@ -0,0 +1,11 @@
+--- info/jed.2in.orig	Thu Apr 28 15:48:58 2005
++++ info/jed.2in	Thu Apr 28 15:55:01 2005
+@@ -1,3 +1,8 @@
++INFO-DIR-SECTION Miscellaneous
++START-INFO-DIR-ENTRY
++* JED: (jed).                  JED editor documentation.
++END-INFO-DIR-ENTRY
++
+ 
+ File: jed.info,  Node: Tab Issues.,  Next: Searching,  Prev: Marking Text (Point and Mark),  Up: Basic Editing
+ 
diff --git a/editors/jed/files/patch-info_jed.3in b/editors/jed/files/patch-info_jed.3in
new file mode 100644
index 000000000000..c25a288e286a
--- /dev/null
+++ b/editors/jed/files/patch-info_jed.3in
@@ -0,0 +1,14 @@
+--- info/jed.3in.orig	Thu Apr 28 15:49:03 2005
++++ info/jed.3in	Thu Apr 28 15:55:09 2005
+@@ -1,6 +1,11 @@
+ This is Info file jed.info, produced by Makeinfo-1.55 from the input
+ file jed.ti.
+ 
++INFO-DIR-SECTION Miscellaneous
++START-INFO-DIR-ENTRY
++* JED: (jed).                  JED editor documentation.
++END-INFO-DIR-ENTRY
++
+ 
+ File: jed.info,  Node: Setting Keys,  Next: Predefined Variables,  Up: Customization
+ 
diff --git a/editors/jed/files/patch-info_jed.info b/editors/jed/files/patch-info_jed.info
new file mode 100644
index 000000000000..d429bb6ebc40
--- /dev/null
+++ b/editors/jed/files/patch-info_jed.info
@@ -0,0 +1,14 @@
+--- info/jed.info.orig	Thu Apr 28 15:48:43 2005
++++ info/jed.info	Thu Apr 28 15:54:22 2005
+@@ -1,6 +1,11 @@
+ This is Info file jed.info, produced by Makeinfo-1.55 from the input
+ file jed.ti.
+ 
++INFO-DIR-SECTION Miscellaneous
++START-INFO-DIR-ENTRY
++* JED: (jed).                  JED editor documentation.
++END-INFO-DIR-ENTRY
++
+ 
+ Indirect:
+ jed.1in: 83
diff --git a/editors/jed/files/patch-src_Makefile.in b/editors/jed/files/patch-src_Makefile.in
new file mode 100644
index 000000000000..17accea2c520
--- /dev/null
+++ b/editors/jed/files/patch-src_Makefile.in
@@ -0,0 +1,105 @@
+--- src/Makefile.in.orig	Sun Oct 20 03:55:30 2002
++++ src/Makefile.in	Mon May  2 11:38:08 2005
+@@ -27,7 +27,7 @@
+ JED_MAN_FILES = ../doc/manual/rgrep.1 ../doc/manual/jed.1 
+ JED_COLOR_FILES = ../lib/colors/*.sl ../lib/colors/README
+ XJED_COLOR_FILES = ../lib/colors/Xjed/*.sl
+-JED_INFO_FILES = ../info/*
++JED_INFO_FILES = ../info/jed.info ../info/jed.info-[0-9]
+ 
+ #---------------------------------------------------------------------------
+ # DESTDIR is designed to facilitate making packages.  Normally it is empty
+@@ -148,17 +148,19 @@
+ $(SRCDIR)/syntax.c: $(SRCDIR)/dfasyntx.c
+ 	touch $(SRCDIR)/syntax.c
+ #
++.ifdef XJED
+ xjed : $(OBJDIR) $(CONFIG_H) slangversion $(OBJDIR)/xjed
+ 	@echo xjed created in $(OBJDIR)
+ $(OBJDIR)/xjed : $(OBJS) $(OBJDIR)/xterm.o $(OBJDIR)/vterm.o
+ 	cd $(OBJDIR); \
+ 	$(CC) $(OFILES) xterm.o vterm.o -o xjed $(LDFLAGS) \
+ 	   $(SLANG_LIB) -lslang  $(XLIB) $(XRENDERFONTLIBS)
++.endif
+ #
+ rgrep: $(OBJDIR)/rgrep
+ 	@echo rgrep created in $(OBJDIR)
+ $(OBJDIR)/rgrep: $(OBJDIR)/vfile.o $(OBJDIR)/rgrep.o
+-	cd $(OBJDIR); $(CC) vfile.o rgrep.o -o rgrep $(LDFLAGS) $(SLANG_LIB) -lslang
++	cd $(OBJDIR); $(CC) vfile.o rgrep.o -o rgrep $(LDFLAGS) $(SLANG_LIB) -lslang $(TERMCAP_LIB)
+ #
+ getmail: $(OBJDIR)/getmail
+ 	@echo getmail created in $(OBJDIR)
+@@ -177,21 +179,31 @@
+ install_directories:
+ 	$(MKINSDIR) $(DEST_BIN_DIR)
+ 	$(MKINSDIR) $(DEST_MAN_DIR)
++	$(MKINSDIR) $(DEST_INFO_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
+-	$(MKINSDIR) $(DEST_JED_ROOT)/lib/tm
++.ifndef JED_WITHOUT_DOCS
++	$(MKINSDIR) $(DEST_DOC_DIR)
++	$(MKINSDIR) $(DEST_DOC_DIR)/manual
++	$(MKINSDIR) $(DEST_DOC_DIR)/txt
++.endif
+ 
+ install: all install_directories
++	@${STRIP_CMD} $(OBJDIR)/getmail
++	@${STRIP_CMD} $(OBJDIR)/jed
++	@${STRIP_CMD} $(OBJDIR)/rgrep
++.ifdef XJED
++	@${STRIP_CMD} $(OBJDIR)/xjed
++.endif
++
+ 	$(INSTALL) $(OBJDIR)/jed $(DEST_BIN_DIR)/
+ 	-cd $(DEST_BIN_DIR); ln -sf jed jed-script
++.ifdef XJED
+ 	-$(INSTALL) $(OBJDIR)/xjed $(DEST_BIN_DIR)/
++.endif
+ 	-$(INSTALL) $(OBJDIR)/rgrep $(DEST_BIN_DIR)/
+ 	-$(INSTALL) $(OBJDIR)/getmail $(DEST_JED_ROOT)/bin/
+ 	@for i in $(JED_LIB_FILES); \
+@@ -223,25 +235,27 @@
+ 		$(INSTALL_DATA) $$i $(DEST_MAN_DIR)/; \
+ 		echo $(INSTALL_DATA) $$i $(DEST_MAN_DIR)/; \
+ 	done
++.ifndef JED_WITHOUT_DOCS
+ 	@for i in $(JED_DOC_FILES); \
+ 	do \
+-		$(INSTALL_DATA) $$i $(DEST_JED_ROOT)/doc/; \
+-		echo $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/doc/; \
++		$(INSTALL_DATA) $$i $(DEST_DOC_DIR); \
++		echo $(INSTALL_DATA) $$i $(DEST_DOC_DIR); \
+ 	done
+ 	@for i in $(JED_DOC_TXT_FILES); \
+ 	do \
+-		$(INSTALL_DATA) $$i $(DEST_JED_ROOT)/doc/txt; \
+-		echo $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/doc/txt; \
++		$(INSTALL_DATA) $$i $(DEST_DOC_DIR)/txt; \
++		echo $(INSTALL_DATA) $$i $(DEST_DOC_DIR)/txt; \
+ 	done
+ 	@for i in $(JED_DOC_MAN_FILES); \
+ 	do \
+-		$(INSTALL_DATA) $$i $(DEST_JED_ROOT)/doc/manual; \
+-		echo $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/doc/manual; \
++		$(INSTALL_DATA) $$i $(DEST_DOC_DIR)/manual; \
++		echo $(INSTALL_DATA) $$i $(DEST_DOC_DIR)/manual; \
+ 	done
++.endif
+ 	@for i in $(JED_INFO_FILES); \
+ 	do \
+-		$(INSTALL_DATA) $$i $(DEST_JED_ROOT)/info/; \
+-		echo $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/info/; \
++		$(INSTALL_DATA) $$i $(DEST_INFO_DIR); \
++		echo $(INSTALL_DATA) $$i $(DEST_INFO_DIR); \
+ 	done
+ 
+ # The symlinks target is for my own private use.  It simply creates the object
diff --git a/editors/jed/files/patch-ab b/editors/jed/files/patch-src_jprocess.c
index 455cc45ead23..455cc45ead23 100644
--- a/editors/jed/files/patch-ab
+++ b/editors/jed/files/patch-src_jprocess.c
diff --git a/editors/jed/pkg-descr b/editors/jed/pkg-descr
index 074b0b01c0ce..de0e927737eb 100644
--- a/editors/jed/pkg-descr
+++ b/editors/jed/pkg-descr
@@ -4,3 +4,5 @@ configuration uses EMACS keystrokes, though WordStar keystrokes are
 available, and most any keystrokes can be programmed.n  JED is customizable 
 and programmable in the language SLANG, which can look like forth or c, 
 depending on your preferences.
+
+WWW: http://www.jedsoft.org/jed/
diff --git a/editors/jed/pkg-plist b/editors/jed/pkg-plist
index 34475672aacc..feb42308f21b 100644
--- a/editors/jed/pkg-plist
+++ b/editors/jed/pkg-plist
@@ -1,29 +1,13 @@
+@comment $FreeBSD$
 bin/jed
-bin/rgrep
 bin/jed-script
+bin/rgrep
 %%NOXJED%%bin/xjed
-%%PORTDOCS%%@unexec install-info --delete --section="Miscellaneous" --entry="* JED: (jed).			JED editor documentation." %D/info/jed.info %D/info/dir
-%%PORTDOCS%%info/jed.1in
-%%PORTDOCS%%info/jed.2in
-%%PORTDOCS%%info/jed.3in
-%%PORTDOCS%%info/jed.info
-%%PORTDOCS%%@exec install-info --section="Miscellaneous" --entry="* JED: (jed).			JED editor documentation." %D/info/jed.info %D/info/dir
 lib/jed/bin/getmail
-lib/jed/doc/manual/jed.tex
-lib/jed/doc/README
-lib/jed/lib/colors/Xjed/elegant.sl
-lib/jed/lib/colors/Xjed/pastel0.sl
-lib/jed/lib/colors/black1.sl
-lib/jed/lib/colors/black2.sl
-lib/jed/lib/colors/black3.sl
-lib/jed/lib/colors/blue1.sl
-lib/jed/lib/colors/blue2.sl
-lib/jed/lib/colors/blue3.sl
-lib/jed/lib/colors/default1.sl
-lib/jed/lib/colors/white1.sl
-lib/jed/lib/colors/README
+lib/jed/lib/README
 lib/jed/lib/abbrev.sl
 lib/jed/lib/abbrmisc.sl
+lib/jed/lib/aboutjed.hlp
 lib/jed/lib/acompile.sl
 lib/jed/lib/aprocess.sl
 lib/jed/lib/ashell.sl
@@ -39,10 +23,22 @@ lib/jed/lib/cal.sl
 lib/jed/lib/chglog.sl
 lib/jed/lib/cmisc.sl
 lib/jed/lib/cmode.sl
+lib/jed/lib/colors/README
+lib/jed/lib/colors/Xjed/elegant.sl
+lib/jed/lib/colors/Xjed/pastel0.sl
+lib/jed/lib/colors/black1.sl
+lib/jed/lib/colors/black2.sl
+lib/jed/lib/colors/black3.sl
+lib/jed/lib/colors/blue1.sl
+lib/jed/lib/colors/blue2.sl
+lib/jed/lib/colors/blue3.sl
+lib/jed/lib/colors/default1.sl
+lib/jed/lib/colors/white1.sl
 lib/jed/lib/comments.sl
 lib/jed/lib/compat.sl
 lib/jed/lib/compile.sl
 lib/jed/lib/compress.sl
+lib/jed/lib/cpright.hlp
 lib/jed/lib/ctags.sl
 lib/jed/lib/cua.sl
 lib/jed/lib/dabbrev.sl
@@ -53,7 +49,9 @@ lib/jed/lib/docbook.sl
 lib/jed/lib/dos437.sl
 lib/jed/lib/dos850.sl
 lib/jed/lib/dos852.sl
+lib/jed/lib/edt.hlp
 lib/jed/lib/edt.sl
+lib/jed/lib/emacs.hlp
 lib/jed/lib/emacs.sl
 lib/jed/lib/emacsmsc.sl
 lib/jed/lib/emul.sl
@@ -62,10 +60,12 @@ lib/jed/lib/ff90.sl
 lib/jed/lib/filter.sl
 lib/jed/lib/folding.sl
 lib/jed/lib/fortran.sl
+lib/jed/lib/generic.hlp
 lib/jed/lib/help.sl
 lib/jed/lib/history.sl
 lib/jed/lib/hooks.sl
 lib/jed/lib/html.sl
+lib/jed/lib/ide.hlp
 lib/jed/lib/ide.sl
 lib/jed/lib/idl.sl
 lib/jed/lib/info.sl
@@ -76,6 +76,9 @@ lib/jed/lib/iso-latin.sl
 lib/jed/lib/iso2xxx.sl
 lib/jed/lib/ispell.sl
 lib/jed/lib/javamode.sl
+lib/jed/lib/jed.conf
+lib/jed/lib/jed.hlp
+lib/jed/lib/jed.rc
 lib/jed/lib/jed.sl
 lib/jed/lib/jedhelp.sl
 lib/jed/lib/jedusage.sl
@@ -86,6 +89,7 @@ lib/jed/lib/latex.sl
 lib/jed/lib/latex209.sl
 lib/jed/lib/linux.sl
 lib/jed/lib/lisp.sl
+lib/jed/lib/ltx-comp.dat
 lib/jed/lib/ltx-math.sl
 lib/jed/lib/macro.sl
 lib/jed/lib/mail.sl
@@ -131,6 +135,7 @@ lib/jed/lib/seldisp.sl
 lib/jed/lib/sendmail.sl
 lib/jed/lib/shell.sl
 lib/jed/lib/shmode.sl
+lib/jed/lib/simple.hlp
 lib/jed/lib/site.sl
 lib/jed/lib/slmode.sl
 lib/jed/lib/sort.sl
@@ -151,59 +156,49 @@ lib/jed/lib/untab.sl
 lib/jed/lib/util.sl
 lib/jed/lib/verilog.sl
 lib/jed/lib/vhdlmode.sl
+lib/jed/lib/vms_shell.com
 lib/jed/lib/vmshelp.sl
 lib/jed/lib/win1250.sl
 lib/jed/lib/wmark.sl
 lib/jed/lib/wmenu.sl
+lib/jed/lib/wordstar.hlp
 lib/jed/lib/wordstar.sl
 lib/jed/lib/yankpop.sl
-lib/jed/lib/ltx-comp.dat
-lib/jed/lib/aboutjed.hlp
-lib/jed/lib/cpright.hlp
-lib/jed/lib/edt.hlp
-lib/jed/lib/emacs.hlp
-lib/jed/lib/generic.hlp
-lib/jed/lib/ide.hlp
-lib/jed/lib/jed.hlp
-lib/jed/lib/simple.hlp
-lib/jed/lib/wordstar.hlp
-lib/jed/lib/jed.rc
-lib/jed/lib/vms_shell.com
-lib/jed/lib/jed.conf
-lib/jed/lib/README
-%%PORTDOCS%%share/doc/jed/abbrev.txt
-%%PORTDOCS%%share/doc/jed/color.txt
-%%PORTDOCS%%share/doc/jed/compile.txt
-%%PORTDOCS%%share/doc/jed/dfa.txt
-%%PORTDOCS%%share/doc/jed/edt.txt
-%%PORTDOCS%%share/doc/jed/emacs.txt
-%%PORTDOCS%%share/doc/jed/filelock.txt
-%%PORTDOCS%%share/doc/jed/fold.txt
-%%PORTDOCS%%share/doc/jed/hooks.txt
-%%PORTDOCS%%share/doc/jed/ide-mode.txt
-%%PORTDOCS%%share/doc/jed/jed_faq.txt
-%%PORTDOCS%%share/doc/jed/jedfuns.txt
-%%PORTDOCS%%share/doc/jed/libfuns.txt
-%%PORTDOCS%%share/doc/jed/linux-keys.txt
-%%PORTDOCS%%share/doc/jed/menus.txt
-%%PORTDOCS%%share/doc/jed/mouse.txt
-%%PORTDOCS%%share/doc/jed/pc-keys.txt
-%%PORTDOCS%%share/doc/jed/program.txt
-%%PORTDOCS%%share/doc/jed/rgrep.txt
-%%PORTDOCS%%share/doc/jed/rmail.txt
-%%PORTDOCS%%share/doc/jed/script.txt
-%%PORTDOCS%%share/doc/jed/syntax.txt
-%%PORTDOCS%%share/doc/jed/undo.txt
-%%PORTDOCS%%share/doc/jed/wjed.txt
-%%PORTDOCS%%share/doc/jed/wordstar.txt
-%%PORTDOCS%%share/doc/jed/xjed.txt
-%%PORTDOCS%%share/doc/jed/xrenderfont.txt
-%%PORTDOCS%%share/doc/jed/yankpop.txt
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/manual/jed.tex
+%%PORTDOCS%%%%DOCSDIR%%/txt/abbrev.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/color.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/compile.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/dfa.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/edt.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/emacs.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/filelock.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/fold.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/hooks.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/ide-mode.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/jed_faq.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/jedfuns.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/libfuns.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/linux-keys.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/menus.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/mouse.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/pc-keys.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/program.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rgrep.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rmail.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/script.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/syntax.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/undo.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/wjed.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/wordstar.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/xjed.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/xrenderfont.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/yankpop.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/jed/bin
 @dirrm lib/jed/lib/colors/Xjed
 @dirrm lib/jed/lib/colors
 @dirrm lib/jed/lib
-@dirrm lib/jed/doc/manual
-@dirrm lib/jed/doc
 @dirrm lib/jed
-%%PORTDOCS%%@dirrm share/doc/jed