From owner-freebsd-x11@FreeBSD.ORG Sun Dec 30 11:55:44 2012 Return-Path: Delivered-To: freebsd-x11@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5667665D for ; Sun, 30 Dec 2012 11:55:44 +0000 (UTC) (envelope-from ml@netfence.it) Received: from smtp.eutelia.it (mp1-smtp-6.eutelia.it [62.94.10.166]) by mx1.freebsd.org (Postfix) with ESMTP id ECE2E8FC0C for ; Sun, 30 Dec 2012 11:55:43 +0000 (UTC) Received: from ns2.biolchim.it (ip-188-188.sn2.eutelia.it [83.211.188.188]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.eutelia.it (Eutelia) with ESMTP id 9BCC863765F for ; Sun, 30 Dec 2012 12:55:41 +0100 (CET) Received: from soth.ventu (adsl-ull-13-147.41-151.net24.it [151.41.147.13]) (authenticated bits=0) by ns2.biolchim.it (8.14.5/8.14.5) with ESMTP id qBUBtbtO032679 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL) for ; Sun, 30 Dec 2012 12:55:38 +0100 (CET) (envelope-from ml@netfence.it) Received: from alamar.ventu (alamar.ventu [10.1.2.18]) by soth.ventu (8.14.6/8.14.5) with ESMTP id qBUBtSPx005668; Sun, 30 Dec 2012 12:55:29 +0100 (CET) (envelope-from ml@netfence.it) Message-ID: <50E02BB0.2050804@netfence.it> Date: Sun, 30 Dec 2012 12:55:28 +0100 From: Andrea Venturoli User-Agent: Mozilla/5.0 (X11; FreeBSD i386; rv:17.0) Gecko/17.0 Thunderbird/17.0 MIME-Version: 1.0 To: archibald Subject: Re: Radeon and OpenGL version References: <50DF5217.5060408@netfence.it> <2cd1edb9882d56f3babaa5226710f551@ethernull.org> In-Reply-To: <2cd1edb9882d56f3babaa5226710f551@ethernull.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.73 X-Scanned-By: MIMEDefang 2.73 on 10.1.2.13 X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (ns2.biolchim.it [192.168.2.203]); Sun, 30 Dec 2012 12:55:38 +0100 (CET) X-Spam-Score: 5.128 (*****) BAYES_05, RCVD_IN_PBL, RCVD_IN_RP_RNBL, RCVD_IN_SORBS_DUL, RDNS_DYNAMIC Cc: freebsd-x11@freebsd.org X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Dec 2012 11:55:44 -0000 On 12/29/12 23:37, archibald wrote: > To provide a particular version of OpenGL it not only needs to be > supported by your card, but also by mesa (graphics/libGL). In order to > have better OpenGL support your version of mesa needs to be more up to > date. I know that mesa 7.6 supports OpenGL 1.5, but not necessarily with > your graphics card. > > If you define WITH_NEW_XORG in /etc/mk.conf (create a line saying > "WITH_NEW_XORG=yes") and rebuild your ports you should end up with mesa > 7.11, which supports OpenGL 2.1 with your graphics card (I think - don't > quote me!). I looked into which ports use this flags and matched them with the ones I have installed; they are: _ libGL; _ libdrm; _ xorg-server. Surprisingly not xf86-video-ati. Would it be enough to put "WITH_NEW_XORG=yes" in /etc/make.conf and recompile the above three ports? Or do I need to rebuild something else too? bye & Thanks av. From owner-freebsd-x11@FreeBSD.ORG Mon Dec 31 11:06:55 2012 Return-Path: Delivered-To: freebsd-x11@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D4383D36 for ; Mon, 31 Dec 2012 11:06:55 +0000 (UTC) (envelope-from owner-bugmaster@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id AFCE08FC18 for ; Mon, 31 Dec 2012 11:06:55 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id qBVB6tpi081098 for ; Mon, 31 Dec 2012 11:06:55 GMT (envelope-from owner-bugmaster@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id qBVB6tUT081096 for freebsd-x11@FreeBSD.org; Mon, 31 Dec 2012 11:06:55 GMT (envelope-from owner-bugmaster@FreeBSD.org) Date: Mon, 31 Dec 2012 11:06:55 GMT Message-Id: <201212311106.qBVB6tUT081096@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: gnats set sender to owner-bugmaster@FreeBSD.org using -f From: FreeBSD bugmaster To: freebsd-x11@FreeBSD.org Subject: Current problem reports assigned to freebsd-x11@FreeBSD.org X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Dec 2012 11:06:55 -0000 Note: to view an individual PR, use: http://www.freebsd.org/cgi/query-pr.cgi?pr=(number). The following is a listing of current problems submitted by FreeBSD users. These represent problem reports covering all versions including experimental development code and obsolete releases. S Tracker Resp. Description -------------------------------------------------------------------------------- o ports/174725 x11 graphics/libGL graphics/libGLU graphics/libGLw: disabl o ports/174524 x11 [PATCH] devel/gccmakedep o ports/174446 x11 [patch] fix hang on startup in x11-drivers/xf86-video- o ports/173492 x11 X --configure dies when using 2 video cards but only 1 o ports/173406 x11 [PATCH] Update x11-drivers/xorg-drivers to use options o ports/173304 x11 libxcb breaks other applications runtine/build o ports/172379 x11 x11/Xorg errors: drmOpenDevice, /dev/dri/, /dev/dri/ca o ports/172102 x11 [PATCH] devel/gccmakedep build error with clang-cpp o ports/172101 x11 [PATCH] devel/imake build error with clang-cpp o ports/171422 x11 graphics/libGL build error with python3.2 o ports/171242 x11 x11-drivers/xf86-input-mouse: fail to detect moused(8) o ports/170852 x11 [PATCH] x11-fonts/encodings: encodings.dir includes bo o ports/170690 x11 x11-servers/xorg-server eats memory o ports/170232 x11 x11-drivers/xf86-video-intel package building error wi o ports/170108 x11 x11-fonts/libfontenc: library in the package searches o ports/169875 x11 x11/xorg: vesa on 9-BETA1/Xorg 7.7 with radeon 6450 ca o ports/169794 x11 x11/xdm, several /usr/local/lib/X11/xdm/ files missing o ports/169561 x11 [patch] x11-toolkits/libXmu: disable specs o ports/169560 x11 [patch] x11/libICE: disable specs o ports/169559 x11 [patch] x11-fonts/fontsproto: disable specs o ports/168901 x11 New port: textproc/xorg-sgml-doctools o ports/168645 x11 [UPDATE] x11/luit to 1.1.1 f ports/167797 x11 graphics/gthumb crashes, dumps core f ports/167654 x11 x11-wm/twm - no mouse cursor o ports/167596 x11 [patch] I have rolled back x11-drivers/xf86-video-vmwa o ports/167228 x11 x11-drivers/xf86-video-intel : Missing dependency (x1 o ports/167194 x11 x11-drivers/xf86-input-synaptics 1.5.0 trackpoint(LENO o ports/166163 x11 graphics/dri: gthumb port crashes (SIGSEGV) within the o ports/165981 x11 devel/imake doesn't play nice with current xorg o ports/165599 x11 [x11/xkeyboard-config] x11/xkbcomp as a RUN_DEPENDS f power/165585 x11 x11-servers/xorg-server: Both Xorg and Xorg-server por p ports/164349 x11 [PATCH] x11/libXinerama :1 LeftOf or Above :0 mouse is o ports/161480 x11 [patch] x11/luit: don't depend on pty(4), use openpty( o ports/160968 x11 [patch] ports/x11/libXi broken manpages o ports/160963 x11 [patch] x11/bigreqsproto: disable specs o ports/159792 x11 [patch] USB HID devices support for x11-drivers/xf86-i o ports/158529 x11 [patch] x11-servers/xorg-server: conditionalize --with o ports/158513 x11 Broken Xvideo in x11-drivers/xf86-video-intel drivers o ports/156949 x11 x11-drivers/xf86-video-ati 6.14.1 produce black blank f ports/156424 x11 8.2R xrandr & xf86-video-intel & xorg-server packages o ports/156405 x11 x11-drivers/xf86-video-ati driver: no hardware renderi o ports/156042 x11 x11/xorg hang in combination with KWin-Tiling o ports/155696 x11 [patch] x11-servers/xorg-server: chase AIGLX altered d o ports/155683 x11 x11/xdm [patch] Enabling IPv6 support breaks IPv4 f ports/154510 x11 [patch] x11/xorg: xorg servers have Motif-crippling bu o ports/154502 x11 x11/xdm authorization failure when used with E17 windo o ports/154423 x11 x11-drivers/xf86-video-radeonhd: radeon xorg driver ca o ports/153593 x11 graphics/dri: clutter segfault, something to do with i o ports/153495 x11 x11-drivers/xf86-video-ati wavy line problem for lenov o ports/153358 x11 x11-drivers/xf86-video-intel: Intel driver freeze with o ports/152159 x11 [hang] xorg/x11: X11 freezes with Intel Mobile 965 and o ports/151596 x11 x11/xorg: wacom bamboo button 1 no longer works o ports/150633 x11 x11-servers/xorg-server: KVM switching causing X serve o ports/150155 x11 x11/xorg hangs after xrandr(1) usage o ports/149743 x11 x11/xorg: garbled window since Xorg-7.5 o ports/149636 x11 x11/xorg: buffer overflow in pci_device_freebsd_read_r o ports/148591 x11 information note for x11-drivers/xf86-input-synaptics o ports/148444 x11 [hang] x11-drivers/xf86-video-intel: intel driver free f ports/148340 x11 x11-drivers/xf86-video-neomagic: unresolved symbol xf8 o ports/146256 x11 x11/xorg does fails to start after upgrade from 7.4 to o ports/145649 x11 x11/xorg: X server crashes when starting opengl compos o ports/142069 x11 x11/xorg: After adding on a laptop Toshiba Sattelite L o ports/141660 x11 x11/xorg: X can't determine amount of video memory on o ports/139011 x11 [patch] Add options to support GLX TLS in x11-servers o ports/135276 x11 x11/xorg: GUI running first time only while using Free o ports/134132 x11 x11-servers/xorg-server: Intel i845 - xorg.conf with U o ports/131930 x11 [PATCH] x11-servers/xorg-server coredumps on exit o ports/131726 x11 x11-servers/xorg-server: xorg server messes with my eh o ports/122830 x11 x11/xorg: Error in I830WaitLpRing() o ports/120947 x11 x11/xsm ignores system.xsm and .xsmstartup 70 problems total. From owner-freebsd-x11@FreeBSD.ORG Mon Dec 31 13:33:56 2012 Return-Path: Delivered-To: x11@freebsd.org Received: from mandree.no-ip.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by hub.freebsd.org (Postfix) with ESMTP id B80D3A6F; Mon, 31 Dec 2012 13:33:55 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from [127.0.0.1] (localhost.localdomain [127.0.0.1]) by apollo.emma.line.org (Postfix) with ESMTP id 572BE23CEA9; Mon, 31 Dec 2012 14:33:55 +0100 (CET) Message-ID: <50E19443.30204@FreeBSD.org> Date: Mon, 31 Dec 2012 14:33:55 +0100 From: Matthias Andree User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/17.0 Thunderbird/17.0 MIME-Version: 1.0 To: x11@freebsd.org Subject: Fwd: xfig build failure on amd64 with clang, possibly imake problem? References: In-Reply-To: X-Enigmail-Version: 1.4.6 X-Forwarded-Message-Id: Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Dec 2012 13:33:56 -0000 I can confirm that on FreeBSD 9.1-RELEASE amd64, imake does not work properly if compiled with Clang (instead of GCC). Can we please either have this debugged and fixed, or can someone from x11@ set USE_GCC=any in devel/imake's Makefile? -------- Original-Nachricht -------- Betreff: Re: xfig build failure on amd64 with clang, possibly imake problem? Datum: Mon, 31 Dec 2012 13:16:09 +0000 Von: Chris Rees An: Anton Shterenlikht Kopie (CC): FreeBSD Mailing List , mjl@luckie.org.nz Yes. imake doesn't run properly if built with clang; you must build with GCC/g++. Chris On 31 Dec 2012 13:11, "Anton Shterenlikht" wrote: > > Something wrong with imake/clang? Thanks Anton Script started on Sun Dec 30 22:08:55 2012 command: make ===> Found saved configuration for xfig-3.2.5b_1 ===> xfig-3.2.5b_1 depends on file: /usr/local/sbin/pkg - found ===> Extracting for xfig-3.2.5b_1 => SHA256 Checksum OK for xfig.3.2.5b.full.tar.gz. ===> Patching for xfig-3.2.5b_1 ===> Applying FreeBSD patches for xfig-3.2.5b_1 ===> xfig-3.2.5b_1 depends on executable: imake - found ===> xfig-3.2.5b_1 depends on file: /usr/local/libdata/pkgconfig/ice.pc - found ===> xfig-3.2.5b_1 depends on file: /usr/local/libdata/pkgconfig/sm.pc - found ===> xfig-3.2.5b_1 depends on file: /usr/local/libdata/pkgconfig/x11.pc - found ===> xfig-3.2.5b_1 depends on file: /usr/local/libdata/pkgconfig/xaw7.pc - found ===> xfig-3.2.5b_1 depends on file: /usr/local/libdata/pkgconfig/xext.pc - found ===> xfig-3.2.5b_1 depends on file: /usr/local/libdata/pkgconfig/xi.pc - found ===> xfig-3.2.5b_1 depends on file: /usr/local/libdata/pkgconfig/xmu.pc - found ===> xfig-3.2.5b_1 depends on file: /usr/local/libdata/pkgconfig/xpm.pc - found ===> xfig-3.2.5b_1 depends on file: /usr/local/libdata/pkgconfig/xt.pc - found ===> xfig-3.2.5b_1 depends on shared library: jpeg.11 - found ===> xfig-3.2.5b_1 depends on shared library: png15 - found ===> xfig-3.2.5b_1 depends on shared library: Xaw3d.8 - found ===> Configuring for xfig-3.2.5b_1 imake -DUseInstalled -I/usr/local/lib/X11/config In file included from Imakefile.c:16: In file included from /usr/local/lib/X11/config/Imake.tmpl:109: [1m/usr/local/lib/X11/config/FreeBSD.cf:451:35: [0;1;31merror: [1m'#' is not followed by a macro parameter #define IncludeMakefile(file) @@# dependencies are in .depend [0;1;32m ^ [0mIn file included from Imakefile.c:16: In file included from /usr/local/lib/X11/config/Imake.tmpl:316: [1m/usr/local/lib/X11/config/Imake.rules:1674:27: [0;1;35mwarning: [1mempty character constant [-Winvalid-pp-token] for flag in ${MAKEFLAGS} ''; do \ @@\ [0;1;32m ^ [1m/usr/local/lib/X11/config/Imake.rules:1897:35: [0;1;31merror: [1m'#' is not followed by a macro parameter #define IncludeMakefile(file) @@# dependencies are in .depend [0;1;32m ^ [0mIn file included from Imakefile.c:16: [1m/usr/local/lib/X11/config/Imake.tmpl:2144:10: [0;1;31mfatal error: [1m' X11 .rules' file not found #include ProjectRulesFile [0;1;32m ^ [1m/usr/local/lib/X11/config/Imake.tmpl:2142:35: [0;1;30mnote: [0mexpanded from macro 'ProjectRulesFile' # define ProjectRulesFile Concat3(<,TopLevelProject,.rules>) [0;1;32m ^ [1m/usr/local/lib/X11/config/Imake.rules:256:23: [0;1;30mnote: [0mexpanded from macro 'Concat3' #define Concat3(a,b,c)a/**/b/**/c [0;1;32m ^ [0m1 warning and 3 errors generated. imake: Exit code 1. Stop. ===> Building for xfig-3.2.5b_1 "Makefile", line 11: Need an operator "Makefile", line 12: Need an operator "Makefile", line 15: Need an operator "Makefile", line 16: Need an operator "Makefile", line 17: Need an operator "Makefile", line 18: Need an operator "Makefile", line 20: Need an operator "Makefile", line 38: Need an operator "Makefile", line 39: Need an operator "Makefile", line 40: Need an operator "Makefile", line 56: Need an operator "Makefile", line 57: Need an operator "Makefile", line 62: Need an operator "Makefile", line 63: Need an operator "Makefile", line 64: Need an operator "Makefile", line 147: Need an operator "Makefile", line 148: Need an operator "Makefile", line 149: Need an operator "Makefile", line 162: Need an operator "Makefile", line 163: Need an operator "Makefile", line 166: Need an operator "Makefile", line 167: Need an operator "Makefile", line 168: Need an operator "Makefile", line 169: Need an operator "Makefile", line 256: Need an operator "Makefile", line 475: Need an operator "Makefile", line 516: Need an operator "Makefile", line 517: Need an operator "Makefile", line 815: Inconsistent operator for xfig "Makefile", line 817: Missing dependency operator "Makefile", line 823: Need an operator "Makefile", line 825: Need an operator "Makefile", line 826: Need an operator "Makefile", line 830: Need an operator "Makefile", line 831: Need an operator "Makefile", line 832: Need an operator "Makefile", line 835: Need an operator "Makefile", line 836: Need an operator "Makefile", line 840: Need an operator "Makefile", line 841: Need an operator "Makefile", line 842: Need an operator "Makefile", line 843: Need an operator "Makefile", line 846: Need an operator "Makefile", line 857: Need an operator "Makefile", line 861: Need an operator "Makefile", line 862: Need an operator "Makefile", line 866: Need an operator "Makefile", line 867: Need an operator "Makefile", line 869: Need an operator "Makefile", line 949: Need an operator "Makefile", line 954: Need an operator "Makefile", line 959: Need an operator "Makefile", line 962: Need an operator "Makefile", line 999: Need an operator "Makefile", line 1002: Need an operator "Makefile", line 1005: Need an operator "Makefile", line 1018: Need an operator "Makefile", line 1023: Missing dependency operator make: fatal errors encountered -- cannot continue *** [do-build] Error code 1 Stop in /usr/ports/graphics/xfig. *** [build] Error code 1 Stop in /usr/ports/graphics/xfig. Script done on Sun Dec 30 22:09:02 2012 From owner-freebsd-x11@FreeBSD.ORG Mon Dec 31 18:47:51 2012 Return-Path: Delivered-To: freebsd-x11@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0CBAAC1; Mon, 31 Dec 2012 18:47:51 +0000 (UTC) (envelope-from jbeich@tormail.org) Received: from outgoing.tormail.org (outgoing.tormail.org [82.221.96.22]) by mx1.freebsd.org (Postfix) with ESMTP id ADF528FC08; Mon, 31 Dec 2012 18:47:50 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=internal.tormail.org) by outgoing.tormail.org with esmtp (Exim 4.72) (envelope-from ) id 1TpkOk-0006b0-9k; Mon, 31 Dec 2012 21:47:43 +0300 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tormail.org; s=tm; h=Message-Id:X-TorMail-User:Content-Type:MIME-Version:References:Date:In-Reply-To:Subject:Cc:To:From; bh=nTNLIZBXzkgJClOd24B5EO9Pri5tLo8Mh1gUoGrtDGQ=; b=L8E+ucLmy1BzW9y1kenJyOnJLxT1OEndLaxhYNEjj5tzZKBitoFQJ5b9N2LpZuVnXPeE/WbkPeuQSfi3RalNaECA+riocbscnRffr/BYWNT3Ui2UEEwAbtzCrq6OTa0Q8dPRznmKjiiemCkw63IZOJc9LYdmdGydA26zHSiKkuA=; Received: from jbeich by internal.tormail.org with local (Exim 4.63) (envelope-from ) id 1TpkMf-000Naf-V0; Mon, 31 Dec 2012 18:45:35 +0000 From: Jan Beich To: Matthias Andree Subject: Re: Fwd: xfig build failure on amd64 with clang, possibly imake problem? In-Reply-To: <50E19443.30204@FreeBSD.org> (Matthias Andree's message of "Mon, 31 Dec 2012 14:33:55 +0100") Date: Mon, 31 Dec 2012 14:45:43 -0400 References: <50E19443.30204@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain X-TorMail-User: jbeich Message-Id: <1TpkMf-000Naf-V0@internal.tormail.org> Cc: freebsd-x11@freebsd.org X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Dec 2012 18:47:51 -0000 Matthias Andree writes: > I can confirm that on FreeBSD 9.1-RELEASE amd64, imake does not work > properly if compiled with Clang (instead of GCC). > > Can we please either have this debugged and fixed, > or can someone from x11@ set USE_GCC=any in devel/imake's Makefile? Why not use GNU cpp just for imake? It's not like imake uses cpp for anything other than generating makefiles. For example, Xaw3d and NAS build just fine with clang this way. While xfig fails due to other errors. http://paste.debian.net/220640 # Xaw3d-1.5E_4.log http://paste.debian.net/220639 # xfig-3.2.5b_1.log http://pastebin.com/Mk9GKgXV # nas-1.9.3.log Index: Mk/bsd.port.mk =================================================================== --- Mk/bsd.port.mk (revision 309596) +++ Mk/bsd.port.mk (working copy) @@ -1953,8 +1964,15 @@ X_FONTS_TYPE1_PORT= ${PORTSDIR}/x11-fonts/xorg-fon X_FONTS_ALIAS_PORT= ${PORTSDIR}/x11-fonts/font-alias .if defined(USE_IMAKE) +.if ${CC:T:M*clang*} == "clang" || ${OSVERSION} >= 1000024 +BUILD_DEPENDS+= cpp46:${PORTSDIR}/lang/gcc +# don't set CPP to allow non-imake users to use non-gnu cpp +CONFIGURE_ENV+= IMAKECPP="cpp46" +MAKE_ENV+= IMAKECPP="cpp46" +.else CONFIGURE_ENV+= IMAKECPP="${CPP}" -MAKE_ENV+= IMAKECPP="${CPP}" +MAKE_ENV+= IMAKECPP="${CPP}" +.endif MAKE_FLAGS?= CC="${CC}" CXX="${CXX}" BUILD_DEPENDS+= imake:${X_IMAKE_PORT} .endif Index: devel/gccmakedep/Makefile =================================================================== --- devel/gccmakedep/Makefile (revision 309596) +++ devel/gccmakedep/Makefile (working copy) @@ -14,12 +14,8 @@ MAN1= gccmakedep.1 PLIST_FILES= bin/gccmakedep -.include +post-patch: + @${REINPLACE_CMD} -e 's/test.*-traditional.*;/true;/' \ + ${WRKSRC}/configure -.if defined(CC) && ${CC:T:M*clang*} == "clang" || ${OSVERSION} >= 1000024 -BUILD_DEPENDS+= ucpp:${PORTSDIR}/devel/ucpp -RUN_DEPENDS+= ucpp:${PORTSDIR}/devel/ucpp -CONFIGURE_ENV+= ac_cv_path_RAWCPP="ucpp -s" -.endif - -.include +.include Index: devel/gccmakedep/files/patch-Makefile.in =================================================================== --- devel/gccmakedep/files/patch-Makefile.in (revision 0) +++ devel/gccmakedep/files/patch-Makefile.in (working copy) @@ -0,0 +1,11 @@ +--- Makefile.in~ ++++ Makefile.in +@@ -211,7 +211,7 @@ + # output lines with trailing backslashes. + # Allow XHASH to always be substituted, even in cases where XCOMM isn't. + CPP_SED_MAGIC = $(SED) -e '/^\# *[0-9][0-9]* *.*$$/d' \ +- -e '/^\#line *[0-9][0-9]* *.*$$/d' \ ++ -e '/^$$/d' \ + -e '/^[ ]*XCOMM$$/s/XCOMM/\#/' \ + -e '/^[ ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \ + -e '/^[ ]*XHASH/s/XHASH/\#/' \ Index: devel/imake/Makefile =================================================================== --- devel/imake/Makefile (revision 309596) +++ devel/imake/Makefile (working copy) @@ -33,17 +33,9 @@ MAN1= ccmakedep.1 \ xmkmf.1 post-patch: - @${PERL} -pi -e 's,^#!/usr/bin/perl,#!${PERL},' ${WRKSRC}/mkhtmlindex.pl + @${REINPLACE_CMD} -e 's,^#!/usr/bin/perl,#!${PERL},' \ + ${WRKSRC}/mkhtmlindex.pl + @${REINPLACE_CMD} -e 's/test.*-traditional.*;/true;/' \ + ${WRKSRC}/configure -.include - -.if defined(CC) && ${CC:T:M*clang*} == "clang" || ${OSVERSION} >= 1000024 -BUILD_DEPENDS+= ucpp:${PORTSDIR}/devel/ucpp -RUN_DEPENDS+= ucpp:${PORTSDIR}/devel/ucpp -CONFIGURE_ENV+= ac_cv_path_RAWCPP="ucpp -s" - -post-build: - ${REINPLACE_CMD} -e 's|^configdirspec= *|configdirspec=|' ${WRKSRC}/xmkmf -.endif - -.include +.include Index: devel/imake/files/patch-Makefile.in =================================================================== --- devel/imake/files/patch-Makefile.in (revision 0) +++ devel/imake/files/patch-Makefile.in (working copy) @@ -0,0 +1,19 @@ +--- Makefile.in~ ++++ Makefile.in +@@ -845,13 +845,13 @@ uninstall-am: uninstall-appmanDATA unins + + + xmkmf: xmkmf.cpp +- $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) -DCONFIGDIRSPEC='"-I$(XCONFDIR)"' < $(srcdir)/xmkmf.cpp | $(SED) -e /^\#/d | $(SED) -e s/XCOMM/\#/ > $@ ++ $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) -DCONFIGDIRSPEC='"-I$(XCONFDIR)"' < $(srcdir)/xmkmf.cpp | $(SED) -e '/^$$/d' -e /^\#/d | $(SED) -e s/XCOMM/\#/ > $@ + + ccmakedep: mdepend.cpp +- $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) -DPREPROC='"$(PREPROCESSCMD_MKDEPEND)"' < $(srcdir)/mdepend.cpp | $(SED) -e /^\#/d | $(SED) -e s/XCOMM/\#/ > $@ ++ $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) -DPREPROC='"$(PREPROCESSCMD_MKDEPEND)"' < $(srcdir)/mdepend.cpp | $(SED) -e '/^$$/d' -e /^\#/d | $(SED) -e s/XCOMM/\#/ > $@ + + mergelib: mergelib.cpp +- $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) -DARCMD="$(ARCMD)" -DRANLIB="$(RANLIB)" < $(srcdir)/mergelib.cpp | $(SED) -e /^\#/d | $(SED) -e s/XCOMM/\#/ > $@ ++ $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) -DARCMD="$(ARCMD)" -DRANLIB="$(RANLIB)" < $(srcdir)/mergelib.cpp | $(SED) -e '/^$$/d' -e /^\#/d | $(SED) -e s/XCOMM/\#/ > $@ + + mkhtmlindex: $(MKHTMLINDEX_SCRIPT) + $(AM_V_GEN)cp $(MKHTMLINDEX_SCRIPT) $@