diff options
Diffstat (limited to 'x11-servers/xorg-server/Makefile')
| -rw-r--r-- | x11-servers/xorg-server/Makefile | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index cb2ba61..e29687b 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -6,15 +6,14 @@ # PORTNAME= xorg-server -PORTVERSION= 1.2.0 -PORTREVISION= 2 +PORTVERSION= 1.4 PORTEPOCH= 1 CATEGORIES= x11-servers MASTER_SITES= http://xorg.freedesktop.org/releases/individual/xserver/:fdo \ ${MASTER_SITE_SOURCEFORGE:S/$/:mesa/} MASTER_SITE_SUBDIR=mesa3d/:mesa DISTFILES= xorg-server-${PORTVERSION}.tar.bz2:fdo \ - MesaLib-6.5.2.tar.bz2:mesa + MesaLib-7.0.1.tar.bz2:mesa MAINTAINER= x11@FreeBSD.org COMMENT= X.Org X server and related programs @@ -32,13 +31,19 @@ USE_XORG= xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xaw7 \ xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \ resourceproto fontsproto inputproto xf86dgaproto \ videoproto compositeproto trapproto recordproto xineramaproto \ - evieproto xfont fontenc xkbui + evieproto xfont fontenc xkbui pixman USE_PERL5_BUILD=yes -CONFIGURE_ARGS= --with-mesa-source=${WRKDIR}/Mesa-6.5.2 \ +CONFIGURE_ARGS= --with-mesa-source=${WRKDIR}/Mesa-7.0.1 \ --disable-dmx --disable-xvfb --disable-xnest --disable-xprint \ --localstatedir=/var +.if !defined(WITHOUT_HAL) +LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal +.else +CONFIGURE_ARGS+= --disable-config-hal +.endif + .if !defined(WITHOUT_AIGLX) CONFIGURE_ARGS+= --enable-aiglx=yes .endif @@ -52,11 +57,11 @@ MAN1= Xorg.1 \ cvt.1 \ gtf.1 \ pcitweak.1 \ - xorgcfg.1 \ xorgconfig.1 MAN4= exa.4 \ fbdevhw.4 -MAN5= xorg.conf.5 +MAN5= xorg.conf.5 \ + SecurityPolicy.5 NOT_FOR_ARCHS= ia64 .include <bsd.port.pre.mk> @@ -90,7 +95,7 @@ PLIST_SUB+= AMD64_I386="@comment " .endif .if ${OSVERSION} > 700042 -EXTRA_PATCHES= ${PATCHDIR}/extra-patch-gcc42 +CFLAGS+= -O0 .endif .if !defined(NO_SUID_XSERVER) || ${NO_SUID_XSERVER} == NO @@ -103,4 +108,14 @@ pre-everything:: @${ECHO_MSG} "NO_SUID_XSERVER=YES in /etc/make.conf." .endif +#post-patch: +# ${ECHO_CMD} "XXX - Remove post-patch target!" +# ${REINPLACE_CMD} -e 's|pixman|pixman-1|' ${WRKSRC}/configure +# ${REINPLACE_CMD} -e 's|pixman/pixman.h|pixman.h|' \ +# ${WRKSRC}/fb/fb.h \ +# ${WRKSRC}/include/miscstruct.h \ +# ${WRKSRC}/mi/miregion.c \ +# ${WRKSRC}/render/picture.h +# ${CP} ${FILESDIR}/GL-glx-glxbyteorder.h ${WRKSRC}/GL/glx/glxbyteorder.h + .include <bsd.port.post.mk> |
