ports/67733: [patch] Update imake to 4.4 release of XFree86.

Mon Jun 14 02:01:07 GMT 2004

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

From: Dejan Lesjak <dejan.lesjak at guest.arnes.si>
To: freebsd-gnats-submit at FreeBSD.org, dejan.lesjak at ijs.si
Cc:  
Subject: Re: ports/67733: [patch] Update imake to 4.4 release of XFree86.
Date: Mon, 14 Jun 2004 03:59:36 +0200

 --Boundary-00=_IaQzAsmwzZElChn
 Content-Type: text/plain;
   charset="us-ascii"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline

 PRevious patch is wrong in way that will make patch-d not apply. I apologise 
 for inconvenience. Here is the proper patch.

 --Boundary-00=_IaQzAsmwzZElChn
 Content-Type: text/x-diff;
   charset="us-ascii";
   name="imake-4.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
 	filename="imake-4.diff"

 Index: Makefile
 ===================================================================
 RCS file: /usr/local/freebsd-cvs/ports/devel/imake-4/Makefile,v
 retrieving revision 1.29
 diff -u -r1.29 Makefile
 --- Makefile	6 Feb 2004 17:34:48 -0000	1.29
 +++ Makefile	9 Jun 2004 03:14:10 -0000
 @@ -6,17 +6,18 @@
  #

  PORTNAME=	imake
 -PORTVERSION=	4.3.0
 -PORTREVISION=	2
 +PORTVERSION=	4.4.0
  CATEGORIES=	devel
  MASTER_SITES=	${MASTER_SITE_XFREE}
  MASTER_SITE_SUBDIR=	${PORTVERSION}
 -DISTFILES=	X430src-1.tgz X430src-3.tgz
 +DISTFILES=	XFree86-4.4.0-src-1.tgz \
 +		XFree86-4.4.0-src-3.tgz

  MAINTAINER=	x11 at FreeBSD.org
  COMMENT=	Imake and other utilities from XFree86

  PREFIX?=	${X11BASE}
 +MTREE_FILE=	/etc/mtree/BSD.x11-4.dist
  USE_PERL5=	YES
  USE_REINPLACE=	yes

 @@ -26,14 +27,8 @@

  .include <bsd.port.pre.mk>

 -.if ${OSVERSION} < 500000
 -LATEST_LINK=	imake4
 -.else
 -LATEST_LINK=	imake
 -.endif
  DIST_SUBDIR=	xc
  WRKSRC=		${WRKDIR}/xc/config
 -MTREE_FILE=	/etc/mtree/BSD.x11-4.dist
  PATCH_DIST_ARGS=	--force -d ${WRKDIR} --forward --quiet -E ${PATCH_DIST_STRIP} 2>/dev/null || true
  MAN1=		ccmakedep.1 \
  		cleanlinks.1 \
 Index: distinfo
 ===================================================================
 RCS file: /usr/local/freebsd-cvs/ports/devel/imake-4/distinfo,v
 retrieving revision 1.9
 diff -u -r1.9 distinfo
 --- distinfo	31 Mar 2004 03:06:59 -0000	1.9
 +++ distinfo	3 Jun 2004 03:18:59 -0000
 @@ -1,4 +1,4 @@
 -MD5 (xc/X430src-1.tgz) = 4f241a4f867363f40efa2b00dca292af
 -SIZE (xc/X430src-1.tgz) = 10993622
 -MD5 (xc/X430src-3.tgz) = b82a0443e1b7bf860e4343e6b6766cb6
 -SIZE (xc/X430src-3.tgz) = 12366363
 +MD5 (xc/XFree86-4.4.0-src-1.tgz) = 97cea3d9e1197dde32ca34e3b6086469
 +SIZE (xc/XFree86-4.4.0-src-1.tgz) = 11760814
 +MD5 (xc/XFree86-4.4.0-src-3.tgz) = 703404f48d3a15f58389a879d47c769d
 +SIZE (xc/XFree86-4.4.0-src-3.tgz) = 11239253
 Index: pkg-plist
 ===================================================================
 RCS file: /usr/local/freebsd-cvs/ports/devel/imake-4/pkg-plist,v
 retrieving revision 1.8
 diff -u -r1.8 pkg-plist
 --- pkg-plist	12 Dec 2003 22:49:05 -0000	1.8
 +++ pkg-plist	3 Jun 2004 03:18:59 -0000
 @@ -119,19 +119,3 @@
  lib/X11/config/xf86site.def
  lib/X11/config/xfree86.cf
  lib/X11/config/xttMod.tmpl
 -lib/X11/doc/html/ccmakedep.1.html
 -lib/X11/doc/html/cleanlinks.1.html
 -lib/X11/doc/html/gccmakedep.1.html
 -lib/X11/doc/html/imake.1.html
 -lib/X11/doc/html/lndir.1.html
 -lib/X11/doc/html/makedepend.1.html
 -lib/X11/doc/html/makeg.1.html
 -lib/X11/doc/html/makestrs.1.html
 -lib/X11/doc/html/manindex1.html
 -lib/X11/doc/html/mergelib.1.html
 -lib/X11/doc/html/mkdirhier.1.html
 -lib/X11/doc/html/mkhtmlindex.1.html
 -lib/X11/doc/html/pswrap.1.html
 -lib/X11/doc/html/revpath.1.html
 -lib/X11/doc/html/rman.1.html
 -lib/X11/doc/html/xmkmf.1.html
 Index: files/patch-amd64
 ===================================================================
 RCS file: files/patch-amd64
 diff -N files/patch-amd64
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ files/patch-amd64	3 Jun 2004 03:18:14 -0000
 @@ -0,0 +1,22 @@
 +--- imake/imakemdep.h.orig	Mon Dec 29 20:53:52 2003
 ++++ imake/imakemdep.h	Tue Mar  2 11:05:16 2004
 +@@ -374,6 +374,9 @@
 + # ifdef __AMD64__
 + 	"-D__AMD64__",
 + # endif
 ++# ifdef __amd64__
 ++	"-D__amd64__",
 ++# endif
 + # ifdef __x86_64__
 + 	"-D__AMD64__",
 + # endif
 +@@ -1271,6 +1274,9 @@
 + # if defined (__AMD64__) || defined (__x86_64__)
 + 	{"__AMD64__", "1"},
 + 	{"__x86_64__", "1"},
 ++# endif
 ++# if defined (__amd64__)
 ++	{"__amd64__", "1"},
 + # endif
 + # ifdef __i386
 + 	{"__i386", "1"},
 Index: files/patch-d
 ===================================================================
 RCS file: /usr/local/freebsd-cvs/ports/devel/imake-4/files/patch-d,v
 retrieving revision 1.6
 diff -u -r1.6 patch-d
 --- files/patch-d	6 Feb 2004 17:34:48 -0000	1.6
 +++ files/patch-d	9 Jun 2004 03:14:04 -0000
 @@ -1,6 +1,6 @@
 ---- cf/FreeBSD.cf.orig	Tue Jan 14 21:52:12 2003
 -+++ cf/FreeBSD.cf	Fri Feb  6 12:27:55 2004
 -@@ -89,14 +89,14 @@
 +--- cf/FreeBSD.cf.orig	Wed Jun  9 04:53:53 2004
 ++++ cf/FreeBSD.cf	Wed Jun  9 04:56:47 2004
 +@@ -108,14 +108,14 @@
   # endif
   # define HasPosixThreads	YES
   # define ThreadedX		YES
 @@ -17,23 +17,24 @@
   # else
   #  if OSRelVersion >= 500043
   #   define BuildThreadStubLibrary  NO
 -@@ -106,9 +106,9 @@
 +@@ -125,10 +125,10 @@
   #   define NeedUIThrStubs          YES
   #  endif
   #  if (OSRelVersion >= 500016)
  -#   define ThreadsLibraries	-lc_r
  +#   define ThreadsLibraries	%%PTHREAD_LIBS%%
 + #   define SharedGLReqs		$(LDPRELIBS) $(XLIB) -lc
   #  else
  -#   define ThreadsLibraries	-pthread
  +#   define ThreadsLibraries	%%PTHREAD_LIBS%%
   #  endif
   #  define SharedX11Reqs		$(LDPRELIB) $(XTHRSTUBLIB)
 - #  define SharedXtReqs		$(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB)
 -@@ -485,14 +485,14 @@
 + #  define SharedXtReqs		$(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB)
 +@@ -442,14 +442,14 @@
   /* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */
   #ifndef DefaultGcc2i386Opt
   #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5)
 --#define DefaultGcc2i386Opt -O2
 +-#define DefaultGcc2i386Opt -O2 GccAliasingArgs
  +#define DefaultGcc2i386Opt
   #endif
   #endif
 Index: files/patch-freetype
 ===================================================================
 RCS file: files/patch-freetype
 diff -N files/patch-freetype
 --- files/patch-freetype	11 Mar 2003 23:38:11 -0000	1.2
 +++ /dev/null	1 Jan 1970 00:00:00 -0000
 @@ -1,11 +0,0 @@
 ---- cf/X11.tmpl.orig	Tue Feb 25 13:57:52 2003
 -+++ cf/X11.tmpl	Sun Mar  2 21:07:54 2003
 -@@ -3029,7 +3029,7 @@
 - #endif /* else BuildFreetype2Library */
 - 
 - #if BuildFreetype2Library || HasFreetype2
 --FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR)
 -+FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR) -I$(FREETYPE2DIR)/include
 - FREETYPE2DEFINES = -DFREETYPE2
 - #endif
 - 
 Index: files/patch-rman.c
 ===================================================================
 RCS file: files/patch-rman.c
 diff -N files/patch-rman.c
 --- files/patch-rman.c	16 Jul 2003 20:45:02 -0000	1.1
 +++ /dev/null	1 Jan 1970 00:00:00 -0000
 @@ -1,12 +0,0 @@
 ---- ../extras/rman/rman.c.orig	Tue Jul 15 23:53:53 2003
 -+++ ../extras/rman/rman.c	Tue Jul 15 23:44:21 2003
 -@@ -4104,6 +4104,9 @@
 - 	     }
 - 	   }
 - 	   break;
 -+	 case 0:
 -+	   /* ignore */
 -+	   break;
 - 	 default:		/* unknown escaped character */
 - 	   sputchar(*p++);
 - 	 }

 --Boundary-00=_IaQzAsmwzZElChn--