- Remove patch-src_Makefile.in and use MAKE_* and CONFIGURE_* instead

- Polish Makefile

3 files changed, 26 insertions, 131 deletions

diff --git a/editors/jed-devel/Makefile b/editors/jed-devel/Makefile
index b178c7951e34..f5b196614a4b 100644
--- a/editors/jed-devel/Makefile
+++ b/editors/jed-devel/Makefile
@@ -20,41 +20,51 @@ LIB_DEPENDS=	slang.1:${PORTSDIR}/devel/libslang
 CONFLICTS=	jed-[0-9]*
 
 LATEST_LINK=	${PORTNAME}${PKGNAMESUFFIX}
-
-USE_REINPLACE=	yes
-
 OPTIONS=	X11 "Build xjed (depends of X11)" on
 
 DIST_SUBDIR=	jed
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-PORTDOCS=	*
 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}
 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
 
+post-patch:
+	@${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' \
+		${WRKSRC}/src/Makefile.in
+
 pre-configure:
 .for n in 1 2 3
 	@${MV} ${WRKSRC}/info/jed.${n}in ${WRKSRC}/info/jed.info-${n}
@@ -62,9 +72,9 @@ pre-configure:
 	@${REINPLACE_CMD} 's|jed.\([0-9]\)in|jed.info-\1|' \
 		${WRKSRC}/info/jed.info
 
-post-patch:
-	@${REINPLACE_CMD} -e 's,__linux__,__FreeBSD__,g' \
-		${WRKSRC}/src/pty.c
+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
diff --git a/editors/jed-devel/files/patch-src_Makefile.in b/editors/jed-devel/files/patch-src_Makefile.in
deleted file mode 100644
index 9ec8e813a028..000000000000
--- a/editors/jed-devel/files/patch-src_Makefile.in
+++ /dev/null
@@ -1,114 +0,0 @@
---- src/Makefile.in.orig	Sun Oct 23 23:56:54 2005
-+++ src/Makefile.in	Wed Oct 26 16:34:40 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
-@@ -121,7 +121,7 @@
- CTAGS_PGM = ctags
- 
- #---------------------------------------------------------------------------
--all: jed
-+all: jed rgrep
- 
- jed: $(OBJDIR) $(CONFIG_H) slangversion $(OBJDIR)/jed
- 	@echo jed created in $(OBJDIR)
-@@ -150,17 +150,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) $(RPATH) \
- 	   $(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) $(RPATH) $(SLANG_LIB) -lslang
-+	cd $(OBJDIR); $(CC) vfile.o rgrep.o -o rgrep $(LDFLAGS) $(RPATH) $(SLANG_LIB) -lslang $(TERMCAP_LIB)
- #
- getmail: $(OBJDIR)/getmail
- 	@echo getmail created in $(OBJDIR)
-@@ -179,20 +181,32 @@
- 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
-+.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)/
-+	$(INSTALL) $(OBJDIR)/rgrep $(DEST_BIN_DIR)/
- 	-cd $(DEST_BIN_DIR); ln -s jed jed-script
-+.ifdef XJED
- 	-$(INSTALL) $(OBJDIR)/xjed $(DEST_BIN_DIR)/
-+.endif
- 	-$(INSTALL) $(OBJDIR)/getmail $(DEST_JED_ROOT)/bin/
- 	@for i in $(JED_LIB_FILES); \
- 	do \
-@@ -223,25 +237,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
- #
- runtests: $(OBJDIR)/jed
diff --git a/editors/jed-devel/pkg-plist b/editors/jed-devel/pkg-plist
index 6f4af23f87b7..4997ae6a30b0 100644
--- a/editors/jed-devel/pkg-plist
+++ b/editors/jed-devel/pkg-plist
@@ -1,8 +1,7 @@
-@comment $FreeBSD: /tmp/pcvs/ports/editors/jed-devel/Attic/pkg-plist,v 1.1 2005-10-27 09:57:11 garga Exp $
+@comment $FreeBSD: /tmp/pcvs/ports/editors/jed-devel/Attic/pkg-plist,v 1.2 2005-10-27 16:46:54 garga Exp $
 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