Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 31 Dec 2013 14:15:43 +0100
From:      John Marino <freebsd.contact@marino.st>
To:        Koop Mast <kwm@FreeBSD.org>
Cc:        svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org
Subject:   Re: svn commit: r338291 - in head/x11-servers: xorg-nestserver xorg-vfbserver
Message-ID:  <52C2C37F.7040501@marino.st>
In-Reply-To: <201312311258.rBVCwo00093086@svn.freebsd.org>
References:  <201312311258.rBVCwo00093086@svn.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
On 12/31/2013 13:58, Koop Mast wrote:
> Author: kwm
> Date: Tue Dec 31 12:58:50 2013
> New Revision: 338291
> URL: http://svnweb.freebsd.org/changeset/ports/338291
> 
> Log:
>   Remove extra bsd.port.options.mk, it already defined in the master port.
>   Fix typo in vfbserver port.
>   
>   Obtained from:	xorg-dev repo
> 
> Modified:
>   head/x11-servers/xorg-nestserver/Makefile
>   head/x11-servers/xorg-vfbserver/Makefile
> 
> Modified: head/x11-servers/xorg-nestserver/Makefile
> ==============================================================================
> --- head/x11-servers/xorg-nestserver/Makefile	Tue Dec 31 12:56:33 2013	(r338290)
> +++ head/x11-servers/xorg-nestserver/Makefile	Tue Dec 31 12:58:50 2013	(r338291)
> @@ -22,8 +22,6 @@ CONFIGURE_ARGS=	--disable-dmx --disable-
>  SLAVE_PORT=	yes
>  PLIST_FILES=	bin/Xnest man/man1/Xnest.1.gz
>  
> -.include <bsd.port.options.mk>
> -
>  do-install:
>  	${INSTALL_PROGRAM} ${WRKSRC}/hw/xnest/Xnest ${STAGEDIR}${PREFIX}/bin/
>  .if defined(WITH_NEW_XORG)
> 
> Modified: head/x11-servers/xorg-vfbserver/Makefile
> ==============================================================================
> --- head/x11-servers/xorg-vfbserver/Makefile	Tue Dec 31 12:56:33 2013	(r338290)
> +++ head/x11-servers/xorg-vfbserver/Makefile	Tue Dec 31 12:58:50 2013	(r338291)
> @@ -16,14 +16,12 @@ USE_XORG=	x11 xf86driproto glproto randr
>  		xkbui xxf86misc xxf86vm xaw7 xmu xpm xext pixman xtrans
>  
>  CONFIGURE_ARGS=	--disable-dmx --disable-xnest \
> -		--without-xmlto --disable-docs --disable-devel1-docs \
> +		--without-xmlto --disable-docs --disable-devel-docs \
>  		--localstatedir=/var --without-dtrace
>  
>  SLAVE_PORT=	yes
>  PLIST_FILES=	bin/Xvfb man/man1/Xvfb.1.gz
>  
> -.include <bsd.port.options.mk>
> -
>  do-install:
>  	${INSTALL_PROGRAM} ${WRKSRC}/hw/vfb/Xvfb ${STAGEDIR}${PREFIX}/bin/
>  .if defined(WITH_NEW_XORG)
> 

Koop,
Could you take over ports/184952?
Your commit is incomplete.  Xephyr is affected too.  And then the PR can
be closed.  I've brought up this issue numerous times.

Regards,
John



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?52C2C37F.7040501>