- Remove some patches and use REINPLACE_CMD, *_ARGS and *_ENV instead

- Use PORTDOCS
- Polish Makefile

6 files changed, 33 insertions, 194 deletions

diff --git a/editors/jed/Makefile b/editors/jed/Makefile
index bf7288fc9605..5f5a63437d3c 100644
--- a/editors/jed/Makefile
+++ b/editors/jed/Makefile
@@ -22,39 +22,55 @@ LIB_DEPENDS=	slang.1:${PORTSDIR}/devel/libslang
 
 CONFLICTS=	jed-devel-[0-9]*
 
-USE_REINPLACE=	yes
-
 OPTIONS=	X11 "Build xjed (depends of X11)" on
 
+DIST_SUBDIR=	jed
+USE_REINPLACE=	yes
 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}
+		DEST_DOC_DIR=${DOCSDIR}
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
+PORTDOCS=	*
 .if defined(NOPORTDOCS)
-MAKE_ENV+=	JED_WITHOUT_DOCS=yes
+MAKE_ENV+=	JED_DOC_FILES="" \
+		JED_DOC_TXT_FILES="" \
+		JED_DOC_MAN_FILES=""
 .endif
 
-ALL_TARGET=	all getmail ${XJED}
+ALL_TARGET=	all getmail
 MAN1=		jed.1 rgrep.1
 INFO=		jed
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITHOUT_X11)
-PLIST_SUB+=	NOXJED="@comment "
+PLIST_SUB+=	XJED="@comment "
 .else
 USE_XLIB=	yes
-XJED=		xjed
-PLIST_SUB+=	NOXJED=""
-MAKE_ENV+=	XJED=yes
+ALL_TARGET+=	xjed
+PLIST_SUB+=	XJED=""
 .endif
 
-DIST_SUBDIR=	jed
+post-patch:
+	@${REINPLACE_CMD} -e 's,0777,07777,g' \
+		${WRKSRC}/src/file.c \
+		${WRKSRC}/src/unix.c
+	@${REINPLACE_CMD} -e 's,<malloc.h>,<stdlib.h>,' \
+		${WRKSRC}/src/jdmacros.h \
+		${WRKSRC}/src/ledit.c
+	@${REINPLACE_CMD} -e 's,__linux__,__FreeBSD__,g' \
+		${WRKSRC}/src/pty.c
+	@${REINPLACE_CMD} -e 's,(DEST_JED_ROOT)/doc,(DEST_DOC_DIR),g' \
+			  -e 's,(DEST_JED_ROOT)/info,(DEST_INFO_DIR),g' \
+			  -e 's,\.\./info/\*,../info/jed.info ../info/jed.info-\[0-9\],' \
+			  -e 's,^\(JED_DOC_.*FILES\) =,\1 \?=,g' \
+			  -e 's,-lslang$$,-lslang -ltermcap,' \
+		${WRKSRC}/src/Makefile.in
+
 pre-configure:
 .for n in 1 2 3
 	@${MV} ${WRKSRC}/info/jed.${n}in ${WRKSRC}/info/jed.info-${n}
@@ -62,6 +78,10 @@ pre-configure:
 	@${REINPLACE_CMD} 's|jed.\([0-9]\)in|jed.info-\1|' \
 		${WRKSRC}/info/jed.info
 
+post-configure:
+	@${REINPLACE_CMD} -e 's,\(.usr.bin.install\) *-c,\1 -s -m 555,' \
+		${WRKSRC}/src/Makefile
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/lib/vms_shell.com ${PREFIX}/lib/jed/lib
 	${INSTALL_DATA} ${WRKSRC}/lib/README ${PREFIX}/lib/jed/lib
diff --git a/editors/jed/files/patch-src-file.c b/editors/jed/files/patch-src-file.c
deleted file mode 100644
index 274b382e2c56..000000000000
--- a/editors/jed/files/patch-src-file.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/file.c.orig	Wed Oct 13 14:52:57 2004
-+++ src/file.c	Wed Oct 13 14:53:07 2004
-@@ -173,7 +173,7 @@
- 	   case FAB$C_STMLF:  rfm = "stmlf"; break;
- 	   case FAB$C_STMCR:  rfm = "stmcr"; break;
- 	  }
--	mode = s.st_mode & 0777;
-+	mode = s.st_mode & 07777;
-      }
-    else strcpy (rat_buf, "rat=cr");
-    
-@@ -1729,7 +1729,7 @@
- #ifdef REAL_UNIX_SYSTEM
- 	int u;
- 	
--	u = umask (mask & 0777);
-+	u = umask (mask & 07777);
- 	if (default_umask == 0) default_umask = u;
- #endif
-      }
diff --git a/editors/jed/files/patch-src-unix.c b/editors/jed/files/patch-src-unix.c
deleted file mode 100644
index b6e7a0e0958e..000000000000
--- a/editors/jed/files/patch-src-unix.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/unix.c.orig	Wed Oct 13 14:52:19 2004
-+++ src/unix.c	Wed Oct 13 14:52:32 2004
-@@ -722,7 +722,7 @@
- # endif
- #endif
- 
--   *mode = m & 0777;
-+   *mode = m & 07777;
- 
-    if (S_ISDIR(m)) return (2);
-    return(1);
diff --git a/editors/jed/files/patch-src_Makefile.in b/editors/jed/files/patch-src_Makefile.in
deleted file mode 100644
index 17accea2c520..000000000000
--- a/editors/jed/files/patch-src_Makefile.in
+++ /dev/null
@@ -1,105 +0,0 @@
---- 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-src_jprocess.c b/editors/jed/files/patch-src_jprocess.c
deleted file mode 100644
index 455cc45ead23..000000000000
--- a/editors/jed/files/patch-src_jprocess.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/jprocess.c.orig	Thu Feb 20 20:19:47 2003
-+++ src/jprocess.c	Thu Feb 20 20:24:36 2003
-@@ -58,7 +58,9 @@
- 
- #ifdef REALLY_HAVE_TERMIOS_H
- # ifndef __os2__
--#  define USE_PTY
-+#  ifndef __FreeBSD__ 
-+#   define USE_PTY
-+#  endif
- # endif
- #endif
- 
diff --git a/editors/jed/pkg-plist b/editors/jed/pkg-plist
index feb42308f21b..dab96d9535d7 100644
--- a/editors/jed/pkg-plist
+++ b/editors/jed/pkg-plist
@@ -2,7 +2,7 @@
 bin/jed
 bin/jed-script
 bin/rgrep
-%%NOXJED%%bin/xjed
+%%XJED%%bin/xjed
 lib/jed/bin/getmail
 lib/jed/lib/README
 lib/jed/lib/abbrev.sl
@@ -164,41 +164,9 @@ lib/jed/lib/wmenu.sl
 lib/jed/lib/wordstar.hlp
 lib/jed/lib/wordstar.sl
 lib/jed/lib/yankpop.sl
-%%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/tm
 @dirrm lib/jed/lib
 @dirrm lib/jed