Attachment #43653 for bug #67733




#

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

MAINTAINER=	x11@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



.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 \

Lines 1-4 Link Here

(-)distinfo (-4 / +4 lines)
1	MD5 (xc/X430src-1.tgz) = 4f241a4f867363f40efa2b00dca292af	1	MD5 (xc/XFree86-4.4.0-src-1.tgz) = 97cea3d9e1197dde32ca34e3b6086469
2	SIZE (xc/X430src-1.tgz) = 10993622	2	SIZE (xc/XFree86-4.4.0-src-1.tgz) = 11760814
3	MD5 (xc/X430src-3.tgz) = b82a0443e1b7bf860e4343e6b6766cb6	3	MD5 (xc/XFree86-4.4.0-src-3.tgz) = 703404f48d3a15f58389a879d47c769d
4	SIZE (xc/X430src-3.tgz) = 12366363	4	SIZE (xc/XFree86-4.4.0-src-3.tgz) = 11239253




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




--- 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"},




--- config/cf/FreeBSD.cf.orig	Wed Jun  9 04:53:53 2004
+++ config/cf/FreeBSD.cf	Wed Jun  9 04:56:47 2004
@@ -108,14 +108,14 @@
 # endif
 # define HasPosixThreads	YES
 # define ThreadedX		YES

 # else
 #  if OSRelVersion >= 500043
 #   define BuildThreadStubLibrary  NO
@@ -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) $(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 GccAliasingArgs
+#define DefaultGcc2i386Opt
 #endif
 #endif

Removed Link Here

(-)files/patch-freetype (-11 lines)
1	--- cf/X11.tmpl.orig Tue Feb 25 13:57:52 2003
2	+++ cf/X11.tmpl Sun Mar 2 21:07:54 2003
3	@@ -3029,7 +3029,7 @@
4	#endif /* else BuildFreetype2Library */
5
6	#if BuildFreetype2Library \|\| HasFreetype2
7	-FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR)
8	+FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR) -I$(FREETYPE2DIR)/include
9	FREETYPE2DEFINES = -DFREETYPE2
10	#endif
11




--- ../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++);
 	 }

Return to bug 67733

Lines 6-22 Link Here

(-)Makefile (-9 / +4 lines)
6	#	6	#
7		7
8	PORTNAME= imake	8	PORTNAME= imake
9	PORTVERSION= 4.3.0	9	PORTVERSION= 4.4.0
10	PORTREVISION= 2
11	CATEGORIES= devel	10	CATEGORIES= devel
12	MASTER_SITES= ${MASTER_SITE_XFREE}	11	MASTER_SITES= ${MASTER_SITE_XFREE}
13	MASTER_SITE_SUBDIR= ${PORTVERSION}	12	MASTER_SITE_SUBDIR= ${PORTVERSION}
14	DISTFILES= X430src-1.tgz X430src-3.tgz	13	DISTFILES= XFree86-4.4.0-src-1.tgz \
		14	XFree86-4.4.0-src-3.tgz
15		15
16	MAINTAINER= x11@FreeBSD.org	16	MAINTAINER= x11@FreeBSD.org
17	COMMENT= Imake and other utilities from XFree86	17	COMMENT= Imake and other utilities from XFree86
18		18
19	PREFIX?= ${X11BASE}	19	PREFIX?= ${X11BASE}
		20	MTREE_FILE= /etc/mtree/BSD.x11-4.dist
20	USE_PERL5= YES	21	USE_PERL5= YES
21	USE_REINPLACE= yes	22	USE_REINPLACE= yes
22		23
Lines 26-39 Link Here
26		27
27	.include <bsd.port.pre.mk>	28	.include <bsd.port.pre.mk>
28		29
29	.if ${OSVERSION} < 500000
30	LATEST_LINK= imake4
31	.else
32	LATEST_LINK= imake
33	.endif
34	DIST_SUBDIR= xc	30	DIST_SUBDIR= xc
35	WRKSRC= ${WRKDIR}/xc/config	31	WRKSRC= ${WRKDIR}/xc/config
36	MTREE_FILE= /etc/mtree/BSD.x11-4.dist
37	PATCH_DIST_ARGS= --force -d ${WRKDIR} --forward --quiet -E ${PATCH_DIST_STRIP} 2>/dev/null \|\| true	32	PATCH_DIST_ARGS= --force -d ${WRKDIR} --forward --quiet -E ${PATCH_DIST_STRIP} 2>/dev/null \|\| true
38	MAN1= ccmakedep.1 \	33	MAN1= ccmakedep.1 \
39	cleanlinks.1 \	34	cleanlinks.1 \

Lines 119-137 Link Here

(-)pkg-plist (-16 lines)
119	lib/X11/config/xf86site.def	119	lib/X11/config/xf86site.def
120	lib/X11/config/xfree86.cf	120	lib/X11/config/xfree86.cf
121	lib/X11/config/xttMod.tmpl	121	lib/X11/config/xttMod.tmpl
122	lib/X11/doc/html/ccmakedep.1.html
123	lib/X11/doc/html/cleanlinks.1.html
124	lib/X11/doc/html/gccmakedep.1.html
125	lib/X11/doc/html/imake.1.html
126	lib/X11/doc/html/lndir.1.html
127	lib/X11/doc/html/makedepend.1.html
128	lib/X11/doc/html/makeg.1.html
129	lib/X11/doc/html/makestrs.1.html
130	lib/X11/doc/html/manindex1.html
131	lib/X11/doc/html/mergelib.1.html
132	lib/X11/doc/html/mkdirhier.1.html
133	lib/X11/doc/html/mkhtmlindex.1.html
134	lib/X11/doc/html/pswrap.1.html
135	lib/X11/doc/html/revpath.1.html
136	lib/X11/doc/html/rman.1.html
137	lib/X11/doc/html/xmkmf.1.html

Added Link Here

(-)files/patch-amd64 (+22 lines)
1	--- imake/imakemdep.h.orig Mon Dec 29 20:53:52 2003
2	+++ imake/imakemdep.h Tue Mar 2 11:05:16 2004
3	@@ -374,6 +374,9 @@
4	# ifdef __AMD64__
5	"-D__AMD64__",
6	# endif
7	+# ifdef __amd64__
8	+ "-D__amd64__",
9	+# endif
10	# ifdef __x86_64__
11	"-D__AMD64__",
12	# endif
13	@@ -1271,6 +1274,9 @@
14	# if defined (__AMD64__) \|\| defined (__x86_64__)
15	{"__AMD64__", "1"},
16	{"__x86_64__", "1"},
17	+# endif
18	+# if defined (__amd64__)
19	+ {"__amd64__", "1"},
20	# endif
21	# ifdef __i386
22	{"__i386", "1"},

Lines 1-6 Link Here

(-)files/patch-d (-7 / +8 lines)
1	--- cf/FreeBSD.cf.orig Tue Jan 14 21:52:12 2003	1	--- config/cf/FreeBSD.cf.orig Wed Jun 9 04:53:53 2004
2	+++ cf/FreeBSD.cf Fri Feb 6 12:27:55 2004	2	+++ config/cf/FreeBSD.cf Wed Jun 9 04:56:47 2004
3	@@ -89,14 +89,14 @@	3	@@ -108,14 +108,14 @@
4	# endif	4	# endif
5	# define HasPosixThreads YES	5	# define HasPosixThreads YES
6	# define ThreadedX YES	6	# define ThreadedX YES
Lines 17-39 Link Here
17	# else	17	# else
18	# if OSRelVersion >= 500043	18	# if OSRelVersion >= 500043
19	# define BuildThreadStubLibrary NO	19	# define BuildThreadStubLibrary NO
20	@@ -106,9 +106,9 @@	20	@@ -125,10 +125,10 @@
21	# define NeedUIThrStubs YES	21	# define NeedUIThrStubs YES
22	# endif	22	# endif
23	# if (OSRelVersion >= 500016)	23	# if (OSRelVersion >= 500016)
24	-# define ThreadsLibraries -lc_r	24	-# define ThreadsLibraries -lc_r
25	+# define ThreadsLibraries %%PTHREAD_LIBS%%	25	+# define ThreadsLibraries %%PTHREAD_LIBS%%
		26	# define SharedGLReqs $(LDPRELIBS) $(XLIB) -lc
26	# else	27	# else
27	-# define ThreadsLibraries -pthread	28	-# define ThreadsLibraries -pthread
28	+# define ThreadsLibraries %%PTHREAD_LIBS%%	29	+# define ThreadsLibraries %%PTHREAD_LIBS%%
29	# endif	30	# endif
30	# define SharedX11Reqs $(LDPRELIB) $(XTHRSTUBLIB)	31	# define SharedX11Reqs $(LDPRELIB) $(XTHRSTUBLIB)
31	# define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB)	32	# define SharedXtReqs $(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB)
32	@@ -485,14 +485,14 @@	33	@@ -442,14 +442,14 @@
33	/* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */	34	/* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */
34	#ifndef DefaultGcc2i386Opt	35	#ifndef DefaultGcc2i386Opt
35	#if OSMajorVersion > 2 \|\| (OSMajorVersion == 2 && OSMinorVersion > 1) \|\| (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5)	36	#if OSMajorVersion > 2 \|\| (OSMajorVersion == 2 && OSMinorVersion > 1) \|\| (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5)
36	-#define DefaultGcc2i386Opt -O2	37	-#define DefaultGcc2i386Opt -O2 GccAliasingArgs
37	+#define DefaultGcc2i386Opt	38	+#define DefaultGcc2i386Opt
38	#endif	39	#endif
39	#endif	40	#endif

Removed Link Here

(-)files/patch-rman.c (-12 lines)
1	--- ../extras/rman/rman.c.orig Tue Jul 15 23:53:53 2003
2	+++ ../extras/rman/rman.c Tue Jul 15 23:44:21 2003
3	@@ -4104,6 +4104,9 @@
4	}
5	}
6	break;
7	+ case 0:
8	+ /* ignore */
9	+ break;
10	default: /* unknown escaped character */
11	sputchar(*p++);
12	}