ports/166373: commit references a PR

dfilter service dfilter at FreeBSD.ORG
Sun Jul 29 18:30:06 UTC 2012


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

From: dfilter at FreeBSD.ORG (dfilter service)
To: bug-followup at FreeBSD.org
Cc:  
Subject: Re: ports/166373: commit references a PR
Date: Sun, 29 Jul 2012 18:26:14 +0000 (UTC)

 Author: zeising
 Date: Sun Jul 29 18:26:00 2012
 New Revision: 301687
 URL: http://svn.freebsd.org/changeset/ports/301687
 
 Log:
   Fix the build of xorg related ports when the base system is compiled with
   clang as system compiler and cpp is clang cpp (as opposed to GNU cpp).
   This is done by removing the configure test for cpp completely.  Using
   clang cpp will make some manual pages as well as some scripts get slightly
   wierd whitespace formatting.  However, it does not affect the function of
   the scripts or the instructions in the manual pages.
   
   PR:             ports/166373
   Submitted by:   Jakub Lach <jakub_lach at mailplus.pl> (PR)
   Patch by:       me (with ideas from PR and mailing list)
   Tested by:      Jakub Lach <jakub_lach at mailplus.pl>, me
   Approved by:    kwm (mentor)
   Obtained from:  xorg staging area
 
 Modified:
   head/x11-drivers/xf86-video-sis/Makefile
   head/x11-servers/xorg-server/Makefile
   head/x11-toolkits/libXt/Makefile
   head/x11/libX11/Makefile
   head/x11/xinit/Makefile
 
 Modified: head/x11-drivers/xf86-video-sis/Makefile
 ==============================================================================
 --- head/x11-drivers/xf86-video-sis/Makefile	Sun Jul 29 17:32:50 2012	(r301686)
 +++ head/x11-drivers/xf86-video-sis/Makefile	Sun Jul 29 18:26:00 2012	(r301687)
 @@ -20,4 +20,8 @@ XORG_CAT=	driver
  USE_XORG=	xf86dgaproto xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto
  MAN4=		sis.4x
  
 +post-patch:
 +	@${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' \
 +		${WRKSRC}/configure
 +	
  .include <bsd.port.mk>
 
 Modified: head/x11-servers/xorg-server/Makefile
 ==============================================================================
 --- head/x11-servers/xorg-server/Makefile	Sun Jul 29 17:32:50 2012	(r301686)
 +++ head/x11-servers/xorg-server/Makefile	Sun Jul 29 18:26:00 2012	(r301687)
 @@ -148,6 +148,10 @@ pre-everything::
  	@${ECHO_MSG} "xorg-server_UNSET=SUID in /etc/make.conf."
  .endif
  
 +post-patch:
 +	@${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' \
 +		${WRKSRC}/configure
 +
  .if defined(WITH_NEW_XORG)
  post-install:
  	@${MKDIR} ${PREFIX}/share/X11/xorg.conf.d
 
 Modified: head/x11-toolkits/libXt/Makefile
 ==============================================================================
 --- head/x11-toolkits/libXt/Makefile	Sun Jul 29 17:32:50 2012	(r301686)
 +++ head/x11-toolkits/libXt/Makefile	Sun Jul 29 18:26:00 2012	(r301687)
 @@ -285,4 +285,8 @@ MAN3=	MenuPopdown.3 \
  	XtWindowOfObject.3 \
  	XtWindowToWidget.3
  
 +post-patch:
 +	@${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' \
 +		${WRKSRC}/configure
 +
  .include <bsd.port.mk>
 
 Modified: head/x11/libX11/Makefile
 ==============================================================================
 --- head/x11/libX11/Makefile	Sun Jul 29 17:32:50 2012	(r301686)
 +++ head/x11/libX11/Makefile	Sun Jul 29 18:26:00 2012	(r301687)
 @@ -22,6 +22,7 @@ RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgco
  XORG_CAT=	lib
  USE_XORG=	bigreqsproto xau xcmiscproto xdmcp xextproto xtrans \
  		kbproto:both inputproto xf86bigfontproto xproto:both
 +
  CONFIGURE_ARGS+=	--datadir=${PREFIX}/lib \
  			--without-xmlto \
  			--disable-specs
 @@ -30,6 +31,8 @@ CONFIGURE_ENV+=	ac_cv_path_PS2PDF=""
  .include "${.CURDIR}/manpages"
  
  post-patch:
 +	@${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' \
 +		${WRKSRC}/configure
  	@${REINPLACE_CMD} '/^install-data-am:/,/^$$/ \
  		s/install-specDATA//' ${WRKSRC}/nls/Makefile.in
  
 
 Modified: head/x11/xinit/Makefile
 ==============================================================================
 --- head/x11/xinit/Makefile	Sun Jul 29 17:32:50 2012	(r301686)
 +++ head/x11/xinit/Makefile	Sun Jul 29 18:26:00 2012	(r301687)
 @@ -24,6 +24,7 @@ PLIST_DIRS=	lib/X11/xinit
  MAN1=		startx.1 xinit.1
  
  post-patch:
 +	@${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' ${WRKSRC}/configure
  	@${REINPLACE_CMD} -e 's|hexdump|/usr/bin/hexdump|' ${WRKSRC}/startx.cpp
  	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' ${WRKSRC}/man/xinit.man
  
 _______________________________________________
 svn-ports-all at freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe at freebsd.org"
 


More information about the freebsd-x11 mailing list