Date: Tue, 14 Aug 2001 21:14:31 +1000 (EST) From: edwin@mavetju.org To: FreeBSD-gnats-submit@freebsd.org Subject: ports/29703: [patch] Repairing iwidgets-3.2 Message-ID: <20010814111431.F03E014A@k7.mavetju.org>
next in thread | raw e-mail | index | archive | help
>Number: 29703
>Category: ports
>Synopsis: [patch] Repairing iwidgets-3.2
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Aug 14 04:20:01 PDT 2001
>Closed-Date:
>Last-Modified:
>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:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20010814111431.F03E014A>