Bug 25559 - MAINTAINER UPDATE : x3270 on XFree86 4.02
Summary: MAINTAINER UPDATE : x3270 on XFree86 4.02
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: freebsd-ports (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2001-03-05 19:10 UTC by Frank Volf
Modified: 2001-03-06 17:23 UTC (History)
1 user (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Frank Volf 2001-03-05 19:10:01 UTC 
I got a report that x3270 does not install on XFree86 4.02 because Imake
uses absolute pathname for MKFONTDIR on XFree86, while it is only the
basename in XFree86 3.3.6. 

The following patch to x11/x3270/files/patch-aa fixes this and tries to
be resilient to problems that might be caused by all kind of upgrade
schemes applied by users (i.e. it tries both the old and new path). 

The patch looks a little silly, because it is actually a diff of a diff.

Thanks to Christian Rauber <chrei@en.muc.de> for bringing the problem to 
my attention.

I don't know if a portversion update is required for this.

Frank

p.s.: it would be nice if this would make it into FreeBSD 4.3 :-)


Index: files/patch-aa
===================================================================
RCS file: /home/CVS/ports/x11/x3270/files/patch-aa,v
retrieving revision 1.1
diff -u -r1.1 patch-aa
--- files/patch-aa	1998/11/17 03:22:30	1.1
+++ files/patch-aa	2001/02/27 23:15:05
@@ -1,5 +1,5 @@
---- ./Imakefile.org	Thu Feb 13 14:04:51 1997
-+++ ./Imakefile	Mon Nov 16 19:11:53 1998
+--- Imakefile.orig	Thu Feb 13 23:04:51 1997
++++ Imakefile	Wed Feb 28 00:15:00 2001
 @@ -24,7 +24,7 @@
                    FontObj(3270gt24) FontObj(3270gt24b) \
                    FontObj(3270gt32) FontObj(3270gt32b)
@@ -9,3 +9,18 @@
  
      LIBX3270DIR = $(LIBDIR)/x3270
        HOSTSFILE = ibm_hosts
+@@ -104,7 +104,13 @@
+ install:: $(DESTDIR)$(FONTINSTDIR)/fonts.dir
+ $(DESTDIR)$(FONTINSTDIR)/fonts.dir::
+ 	-chmod u+w $(DESTDIR)$(FONTINSTDIR) $(DESTDIR)$(FONTINSTDIR)/fonts.dir
+-	$(BINDIR)/$(MKFONTDIR) $(DESTDIR)$(FONTINSTDIR)
++	if [ -x $(BINDIR)/$(MKFONTDIR) ]; then \
++		$(BINDIR)/$(MKFONTDIR) $(DESTDIR)$(FONTINSTDIR); \
++	elif [ -x $(MKFONTDIR) ]; then \
++		$(MKFONTDIR) $(DESTDIR)$(FONTINSTDIR); \
++	else \
++		echo "*** mkfontdir not found -- please run manually ***"; \
++	fi
+ 	chmod u=rwx,go=rx $(DESTDIR)$(FONTINSTDIR)
+ 	chmod a=r $(DESTDIR)$(FONTINSTDIR)/fonts.dir
+
Comment 1 FUJISHIMA Satsuki freebsd_committer freebsd_triage 2001-03-06 17:23:38 UTC 
State Changed
From-To: open->closed

Committed, thanks.