Attachment 41778 Details for Bug 65277 – imake-4.3.0_3.patch

[patch] imake-4.3.0_3.patch

imake-4.3.0_3.patch (text/plain), 2.51 KB, created by Michael Johnson on 2004-04-07 03:20:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Johnson

Created: 2004-04-07 03:20:21 UTC

Size: 2.51 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/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	7 Apr 2004 02:06:49 -0000
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	imake
> PORTVERSION=	4.3.0
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	devel
> MASTER_SITES=	${MASTER_SITE_XFREE}
> MASTER_SITE_SUBDIR=	${PORTVERSION}
>@@ -69,7 +69,8 @@
> 
> pre-configure:
> 	@${REINPLACE_CMD} -e 's|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|g ; \
>-		s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g' \
>+		s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g; \
>+		s|%%CC%%|${CC}|g; s|%%CXX%%|${CXX}|g' \
> 		${WRKSRC}/cf/FreeBSD.cf
> 
> post-install:
>Index: pkg-plist
>===================================================================
>RCS file: /home/ncvs/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	7 Apr 2004 01:57:54 -0000
>@@ -127,7 +127,6 @@
> 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
>Index: files/patch-d
>===================================================================
>RCS file: /home/ncvs/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	7 Apr 2004 02:04:43 -0000
>@@ -1,5 +1,5 @@
> --- cf/FreeBSD.cf.orig	Tue Jan 14 21:52:12 2003
>-+++ cf/FreeBSD.cf	Fri Feb  6 12:27:55 2004
>++++ cf/FreeBSD.cf	Tue Apr  6 22:04:40 2004
> @@ -89,14 +89,14 @@
>  # endif
>  # define HasPosixThreads	YES
>@@ -29,6 +29,22 @@
>  #  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

Actions: View | Diff

Attachments on bug 65277: 41778