ports/109091 make Xorg from x11-servers/xorg-server port to work on 7-CURRENT

[Szilveszter Adam]

The following reply was made to PR ports/109091; it has been noted by GNATS.

From: Szilveszter Adam <sziszi at bsd.hu>
To: bug-followup at freebsd.org
Cc:  
Subject: Re: ports/109091 make Xorg from x11-servers/xorg-server port to work on 7-CURRENT
Date: Sun, 18 Feb 2007 07:20:04 +0100

 --x+6KMIRAuhnl3hBn
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 After some investigation I have found a hint to connect this problem to
 the removal of objformat(1) on -CURRENT.
 
 In short, the port needs the same patch that was applied to the
 devel/imake-6 port because it uses a private copy of the imake sources
 during build. I am not sure if it is needed for every xorg port, but
 probably all of them need it that build and install libraries.
 
 The patch is trivial and is attached to avoid mangling.
 -- 
 Regards:
 
 Szilveszter ADAM
 Budapest
 Hungary
 
 --x+6KMIRAuhnl3hBn
 Content-Type: text/x-csrc; charset=us-ascii
 Content-Disposition: attachment; filename="patch-imake.c"
 
 --- config/imake/imake.c.orig	Tue Jan 30 14:57:37 2007
 +++ config/imake/imake.c	Tue Jan 30 14:55:59 2007
 @@ -1153,29 +1153,17 @@
    int mib[2];
    size_t len;
    int osrel = 0;
 -  FILE *objprog = NULL;
    int iself = 0;
 -  char buf[10];
 -  char cmd[PATH_MAX];
  
    mib[0] = CTL_KERN;
    mib[1] = KERN_OSRELDATE;
    len = sizeof(osrel);
    sysctl(mib, 2, &osrel, &len, NULL, 0);
 -  if (CrossCompiling) {
 -      strcpy (cmd, CrossCompileDir);
 -      strcat (cmd, "/");
 -      strcat (cmd,"objformat");
 -  } else
 -      strcpy (cmd, "objformat");
  
 -  if (osrel >= 300004 &&
 -      (objprog = popen(cmd, "r")) != NULL &&
 -      fgets(buf, sizeof(buf), objprog) != NULL &&
 -      strncmp(buf, "elf", 3) == 0)
 +  if (osrel < 300004)
 +    iself = 0;
 +  else
      iself = 1;
 -  if (objprog)
 -    pclose(objprog);
  
    fprintf(inFile, "#define DefaultToElfFormat %s\n", iself ? "YES" : "NO");
  }
 
 --x+6KMIRAuhnl3hBn--