Attachment #41778 for bug #65277

View | Details | Raw Unified | Return to bug 65277
Collapse All | Expand All

Lines 7-13 Link Here

(-)Makefile (-2 / +3 lines)
7		7
8	PORTNAME= imake	8	PORTNAME= imake
9	PORTVERSION= 4.3.0	9	PORTVERSION= 4.3.0
10	PORTREVISION= 2	10	PORTREVISION= 3
11	CATEGORIES= devel	11	CATEGORIES= devel
12	MASTER_SITES= ${MASTER_SITE_XFREE}	12	MASTER_SITES= ${MASTER_SITE_XFREE}
13	MASTER_SITE_SUBDIR= ${PORTVERSION}	13	MASTER_SITE_SUBDIR= ${PORTVERSION}
Lines 69-75 Link Here
69		69
70	pre-configure:	70	pre-configure:
71	@${REINPLACE_CMD} -e 's\|%%PTHREAD_CFLAGS%%\|${PTHREAD_CFLAGS}\|g ; \	71	@${REINPLACE_CMD} -e 's\|%%PTHREAD_CFLAGS%%\|${PTHREAD_CFLAGS}\|g ; \
72	s\|%%PTHREAD_LIBS%%\|${PTHREAD_LIBS}\|g' \	72	s\|%%PTHREAD_LIBS%%\|${PTHREAD_LIBS}\|g; \
		73	s\|%%CC%%\|${CC}\|g; s\|%%CXX%%\|${CXX}\|g' \
73	${WRKSRC}/cf/FreeBSD.cf	74	${WRKSRC}/cf/FreeBSD.cf
74		75
75	post-install:	76	post-install:

Lines 127-133 Link Here

(-)pkg-plist (-1 lines)
127	lib/X11/doc/html/makedepend.1.html	127	lib/X11/doc/html/makedepend.1.html
128	lib/X11/doc/html/makeg.1.html	128	lib/X11/doc/html/makeg.1.html
129	lib/X11/doc/html/makestrs.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	130	lib/X11/doc/html/mergelib.1.html
132	lib/X11/doc/html/mkdirhier.1.html	131	lib/X11/doc/html/mkdirhier.1.html
133	lib/X11/doc/html/mkhtmlindex.1.html	132	lib/X11/doc/html/mkhtmlindex.1.html




--- cf/FreeBSD.cf.orig	Tue Jan 14 21:52:12 2003
+++ cf/FreeBSD.cf	Tue Apr  6 22:04:40 2004
@@ -89,14 +89,14 @@
 # endif
 # define HasPosixThreads	YES

 #  endif
 #  define SharedX11Reqs		$(LDPRELIB) $(XTHRSTUBLIB)
 #  define SharedXtReqs		$(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB)
@@ -162,11 +162,11 @@
  *    ld: warning: libXThrStub.so.6, needed by libX11.so, not found
  */
 #if BuildThreadStubLibrary && (!defined(UseInstalledX11) || !UseInstalledX11)
-# define CcCmd			$(CLIENTENVSETUP) cc
-# define CplusplusCmd		$(CLIENTENVSETUP) c++
+# define CcCmd			$(CLIENTENVSETUP) %%CC%% 
+# define CplusplusCmd		$(CLIENTENVSETUP) %%CXX%% 
 #else
-# define CcCmd			cc
-# define CplusplusCmd		c++
+# define CcCmd			%%CC%%
+# define CplusplusCmd		%%CXX%%	
 #endif
 
 #define CppCmd			/usr/bin/cpp
@@ -485,14 +485,14 @@
 /* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */
 #ifndef DefaultGcc2i386Opt

Return to bug 65277

Lines 1-5 Link Here

(-)files/patch-d (-1 / +17 lines)
1	--- cf/FreeBSD.cf.orig Tue Jan 14 21:52:12 2003	1	--- cf/FreeBSD.cf.orig Tue Jan 14 21:52:12 2003
2	+++ cf/FreeBSD.cf Fri Feb 6 12:27:55 2004	2	+++ cf/FreeBSD.cf Tue Apr 6 22:04:40 2004
3	@@ -89,14 +89,14 @@	3	@@ -89,14 +89,14 @@
4	# endif	4	# endif
5	# define HasPosixThreads YES	5	# define HasPosixThreads YES
Lines 29-34 Link Here
29	# endif	29	# endif
30	# define SharedX11Reqs $(LDPRELIB) $(XTHRSTUBLIB)	30	# define SharedX11Reqs $(LDPRELIB) $(XTHRSTUBLIB)
31	# define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB)	31	# define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB)
		32	@@ -162,11 +162,11 @@
		33	* ld: warning: libXThrStub.so.6, needed by libX11.so, not found
		34	*/
		35	#if BuildThreadStubLibrary && (!defined(UseInstalledX11) \|\| !UseInstalledX11)
		36	-# define CcCmd $(CLIENTENVSETUP) cc
		37	-# define CplusplusCmd $(CLIENTENVSETUP) c++
		38	+# define CcCmd $(CLIENTENVSETUP) %%CC%%
		39	+# define CplusplusCmd $(CLIENTENVSETUP) %%CXX%%
		40	#else
		41	-# define CcCmd cc
		42	-# define CplusplusCmd c++
		43	+# define CcCmd %%CC%%
		44	+# define CplusplusCmd %%CXX%%
		45	#endif
		46
		47	#define CppCmd /usr/bin/cpp
32	@@ -485,14 +485,14 @@	48	@@ -485,14 +485,14 @@
33	/* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */	49	/* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */
34	#ifndef DefaultGcc2i386Opt	50	#ifndef DefaultGcc2i386Opt