From edwin@mavetju.org  Tue Aug 14 04:14:39 2001
Return-Path: <edwin@mavetju.org>
Received: from topaz.mdcc.cx (topaz.mdcc.cx [212.204.230.141])
	by hub.freebsd.org (Postfix) with ESMTP id 7C7D537B401
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 14 Aug 2001 04:14:39 -0700 (PDT)
	(envelope-from edwin@mavetju.org)
Received: from k7.mavetju.org (topaz.mdcc.cx [212.204.230.141])
	by topaz.mdcc.cx (Postfix) with ESMTP id 1645E2B701
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 14 Aug 2001 13:14:36 +0200 (CEST)
Received: by k7.mavetju.org (Postfix, from userid 1001)
	id F03E014A; Tue, 14 Aug 2001 21:14:31 +1000 (EST)
Message-Id: <20010814111431.F03E014A@k7.mavetju.org>
Date: Tue, 14 Aug 2001 21:14:31 +1000 (EST)
From: edwin@mavetju.org
Reply-To: edwin@mavetju.org
To: FreeBSD-gnats-submit@freebsd.org
Subject: [patch] Repairing iwidgets-3.2
X-Send-Pr-Version: 3.2

>Number:         29703
>Category:       ports
>Synopsis:       [patch] Repairing iwidgets-3.2
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Aug 14 04:20:01 PDT 2001
>Closed-Date:    Fri Aug 17 08:14:01 PDT 2001
>Last-Modified:  Sat Aug 18 00:20:01 PDT 2001
>Originator:     Edwin Groothuis
>Release:        FreeBSD 4.2-RELEASE i386
>Organization:
n/a
>Environment:

# $FreeBSD: ports/x11-toolkits/iwidgets/Makefile,v 1.6 2001/07/28 14:53:46 mi Ex
p $


>Description:

With the upgrade of iwidgets to version 3.2 the port became broken
because the patches didn't work.

See also ports/29308.

>How-To-Repeat:

Go to ports/x11-toolkits/iwidgets and type make patch

>Fix:

- removed files: patch-aa
- added files: patch-iw220-Makefile.in and patch-iw300-Makefile.in

--- Makefile.orig       Tue Aug 14 21:10:00 2001
+++ Makefile    Tue Aug 14 18:54:12 2001
@@ -7,6 +7,7 @@
 
 PORTNAME=      iwidgets
 PORTVERSION=   3.2
+PORTREVISION=  1
 CATEGORIES=    x11-toolkits tk83
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=incrtcl

--- files.old/patch-iw220-Makefile.in	Thu Jan  1 10:00:00 1970
+++ files/patch-iw220-Makefile.in	Tue Aug 14 08:53:05 2001
@@ -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 -ur --new-file files.old/patch-iw300-Makefile.in files/patch-iw300-Makefile.in
--- files.old/patch-iw300-Makefile.in	Thu Jan  1 10:00:00 1970
+++ files/patch-iw300-Makefile.in	Tue Aug 14 08:53:12 2001
@@ -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 ; \
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: ijliao 
State-Changed-When: Fri Aug 17 08:14:01 PDT 2001 
State-Changed-Why:  
committed, thanks 

http://www.FreeBSD.org/cgi/query-pr.cgi?pr=29703 

From: Mikhail Teterin <mi@aldan.algebra.com>
To: ijliao@FreeBSD.org, edwin@mavetju.org,
	freebsd-gnats-submit@FreeBSD.org
Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: Re: ports/29703: cvs commit: ports/x11-toolkits/iwidgets Makefile ports/x11-toolkits/iwidgets/files         patch-iw220-Makefile.in patch-iw300-Makefile.in patch-aa
Date: Sat, 18 Aug 2001 03:13:53 -0400 (EDT)

 On 17 Aug, Ying-Chieh Liao wrote:
 > ijliao      2001/08/17 08:14:00 PDT
 > 
 >   Modified files:
 >     x11-toolkits/iwidgets Makefile 
 >   Added files:
 >     x11-toolkits/iwidgets/files patch-iw220-Makefile.in 
 >                                 patch-iw300-Makefile.in 
 >   Removed files:
 >     x11-toolkits/iwidgets/files patch-aa 
 >   Log:
 >   make patch work
 
 Well, although the patch-aa I left there by accident was, indeed, bogus,
 there is no need to patch any  makefiles at all. NO_BUILD is defined for
 the port, and the port's Makefile has its own do-install :-)
 
 I'll remove those  two files and the whole files/  subdirectory now... I
 guess, the PORTREVISION can be removed too, since nothing changed in the
 port...
 
 Regarding the  itclsh/itksh --  well, they  are no  longer built  by the
 distribution either.  And for good  reason: ``package require  Itcl'' is
 all you need to have the itclsh. Similarly, ``package require Itk' gives
 itksh equivalent.
 
 	-mi
 
 
>Unformatted:
