make patch work

PR:		29308, 29703
Submitted by:	Edwin Groothuis <edwin@mavetju.org>

4 files changed, 41 insertions, 33 deletions

diff --git a/x11-toolkits/iwidgets/Makefile b/x11-toolkits/iwidgets/Makefile
index 045ece82dac1..ab53df9b8abf 100644
--- a/x11-toolkits/iwidgets/Makefile
+++ b/x11-toolkits/iwidgets/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	iwidgets
 PORTVERSION=	3.2
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits tk83
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=incrtcl
diff --git a/x11-toolkits/iwidgets/files/patch-aa b/x11-toolkits/iwidgets/files/patch-aa
deleted file mode 100644
index 2f21a97b4907..000000000000
--- a/x11-toolkits/iwidgets/files/patch-aa
+++ /dev/null
@@ -1,33 +0,0 @@
---- Makefile.in~	Wed Aug 12 11:02:41 1998
-+++ Makefile.in	Sat Jan 16 17:37:42 1999
-@@ -49,7 +49,7 @@
- INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include
- 
- # Top-level directory in which to install manual entries:
--MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man
-+MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man
- 
- # Directory in which to install manual entry for itclsh:
- MAN1_INSTALL_DIR = $(MAN_INSTALL_DIR)/man1
-@@ -102,10 +102,10 @@
- # modify any of this stuff by hand.
- #----------------------------------------------------------------
- 
--INSTALL =		@INSTALL@
-+INSTALL =		install -c
- INSTALL_PROGRAM =	$(INSTALL)
- INSTALL_DATA =		$(INSTALL) -m 644
--MKINSTALLDIRS =		$(ITCL_SRC_DIR)/../config/mkinstalldirs
-+MKINSTALLDIRS =		../../config/mkinstalldirs
- RANLIB =		@RANLIB@
- LN_S =			ln -s
- TOP_DIR =		@IWIDGETS_SRC_DIR@
-@@ -148,8 +148,6 @@
- 
- install-libraries:
- 	@$(MKINSTALLDIRS) $(SCRIPT_INSTALL_DIR) $(LIB_INSTALL_DIR)
--	@rm -f $(LIB_INSTALL_DIR)/iwidgets
--	$(LN_S) iwidgets$(VERSION) $(LIB_INSTALL_DIR)/iwidgets
- 	@$(MKINSTALLDIRS) $(SCRIPT_INSTALL_DIR)/scripts
- 	@for i in $(GENERIC_DIR)/*.itk $(GENERIC_DIR)/*.itcl $(GENERIC_DIR)/tclIndex $(GENERIC_DIR)/*.gif ; \
- 	    do \
diff --git a/x11-toolkits/iwidgets/files/patch-iw220-Makefile.in b/x11-toolkits/iwidgets/files/patch-iw220-Makefile.in
new file mode 100644
index 000000000000..7adf379fcfb9
--- /dev/null
+++ b/x11-toolkits/iwidgets/files/patch-iw220-Makefile.in
@@ -0,0 +1,20 @@
+--- iwidgets2.2.0/Makefile.in.orig	Tue Aug 14 08:49:21 2001
++++ iwidgets2.2.0/Makefile.in	Tue Aug 14 08:50:46 2001
+@@ -110,7 +110,7 @@
+ INSTALL_PROGRAM =	$(INSTALL)
+ INSTALL_DATA =		$(INSTALL) -m 644
+ INSTALL_SCRIPT =	$(INSTALL) -m 555
+-MKINSTALLDIRS =		$(srcdir)/../config/mkinstalldirs
++MKINSTALLDIRS =		../../config/mkinstalldirs
+ RANLIB =		@RANLIB@
+ LN_S =			ln -s
+ TOP_DIR =		$(srcdir)
+@@ -163,8 +163,6 @@
+ 
+ install-libraries:
+ 	@$(MKINSTALLDIRS) $(SCRIPT_INSTALL_DIR)/win $(LIB_INSTALL_DIR)
+-	@rm -f $(LIB_INSTALL_DIR)/iwidgets
+-	$(LN_S) $(SCRIPT_INSTALL_DIR) $(LIB_INSTALL_DIR)/iwidgets
+ 	@$(MKINSTALLDIRS) $(SCRIPT_INSTALL_DIR)/scripts
+ 	@echo "Installing files from $(GENERIC_DIR) into $(SCRIPT_INSTALL_DIR)"
+ 	@for i in $(GENERIC_DIR)/*.itk $(GENERIC_DIR)/tclIndex $(GENERIC_DIR)/*.gif ; \
diff --git a/x11-toolkits/iwidgets/files/patch-iw300-Makefile.in b/x11-toolkits/iwidgets/files/patch-iw300-Makefile.in
new file mode 100644
index 000000000000..b0ba4d649f1d
--- /dev/null
+++ b/x11-toolkits/iwidgets/files/patch-iw300-Makefile.in
@@ -0,0 +1,20 @@
+--- iwidgets3.0.0/Makefile.in.orig	Tue Aug 14 08:51:49 2001
++++ iwidgets3.0.0/Makefile.in	Tue Aug 14 08:52:14 2001
+@@ -110,7 +110,7 @@
+ INSTALL_PROGRAM =	$(INSTALL)
+ INSTALL_DATA =		$(INSTALL) -m 644
+ INSTALL_SCRIPT =	$(INSTALL) -m 555
+-MKINSTALLDIRS =		$(srcdir)/../config/mkinstalldirs
++MKINSTALLDIRS =		../../config/mkinstalldirs
+ RANLIB =		@RANLIB@
+ LN_S =			ln -s
+ TOP_DIR =		$(srcdir)
+@@ -163,8 +163,6 @@
+ 
+ install-libraries:
+ 	@$(MKINSTALLDIRS) $(SCRIPT_INSTALL_DIR) $(LIB_INSTALL_DIR)
+-	@rm -f $(LIB_INSTALL_DIR)/iwidgets
+-	$(LN_S) $(SCRIPT_INSTALL_DIR) $(LIB_INSTALL_DIR)/iwidgets
+ 	@$(MKINSTALLDIRS) $(SCRIPT_INSTALL_DIR)/scripts
+ 	@echo "Installing files from $(GENERIC_DIR) into $(SCRIPT_INSTALL_DIR)"
+ 	@for i in $(GENERIC_DIR)/*.tcl $(GENERIC_DIR)/*.itk $(GENERIC_DIR)/*.itcl $(GENERIC_DIR)/tclIndex $(GENERIC_DIR)/*.gif ; \