diff options
| author | flz <flz@FreeBSD.org> | 2009-01-24 00:28:36 +0800 |
|---|---|---|
| committer | flz <flz@FreeBSD.org> | 2009-01-24 00:28:36 +0800 |
| commit | e1fa8d8895aee835b4a658dd8fed60b6fe0166f2 (patch) | |
| tree | cf2e3d4f30a1b913cafbd708b8f9c5081f8aec9d | |
| parent | 7fd0312bdcb554dba77af4cae101782e5fb32587 (diff) | |
| download | freebsd-ports-gnome-e1fa8d8895aee835b4a658dd8fed60b6fe0166f2.tar.gz freebsd-ports-gnome-e1fa8d8895aee835b4a658dd8fed60b6fe0166f2.tar.zst freebsd-ports-gnome-e1fa8d8895aee835b4a658dd8fed60b6fe0166f2.zip | |
- Update X.org ports to 7.4+ (few ports are more recent than the katamari).
- Bump PORTREVISION for all ports depending on libglut since the shlib
version number went from 4 to 3.
- Bump PORTREVISION for all ports depending on libXaw as libXaw.so.8 isn't
installed anymore.
- Couple of ports fixes (mostly missing xorg components added to USE_XORG).
629 files changed, 1677 insertions, 2410 deletions
@@ -3765,4 +3765,6 @@ x11-toolkits/fxscintilla-fox10||2009-01-21|Removed deprecated port, use x11-tool x11-toolkits/py-fox||2009-01-21|Removed deprecated port, has a broken dependency x11-toolkits/ruby-fox10||2009-01-21|Removed deprecated port, use x11-toolkits/ruby-fox16 instead devel/linux-glib2||2009-01-21|Removed since the port is incorporated into all linux base ports +x11/xorg-protos||2009-XX-XX|Not really necessary +x11-drivers/synaptics|x11-drivers/xf86-input-synaptics|2009-XX-XX|Now an official X.org driver net/mpich|net/mpich2|2009-01-23|Broken and superseded by mpich2 diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk index 29d1f5b0e34e..5c9b3915836a 100644 --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -395,6 +395,7 @@ MOZ_OPTIONS+= --with-system-zlib=/usr \ --disable-pedantic \ --disable-bidi \ --disable-xterm-updates \ + --disable-xprint \ --enable-xinerama MOZ_MK_OPTIONS+= XP_UNIX=1 \ PERL=${PERL} diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 5fc6afc47783..dd96d3b677dc 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1373,7 +1373,7 @@ FILESDIR?= ${MASTERDIR}/files SCRIPTDIR?= ${MASTERDIR}/scripts PKGDIR?= ${MASTERDIR} -.if defined(USE_IMAKE) && !defined(USE_X_PREFIX) +.if defined(USE_IMAKE) && !defined(USE_X_PREFIX) && !defined(USE_XORG) USE_X_PREFIX= yes .endif .if defined(USE_X_PREFIX) && ${USE_X_PREFIX} == "no" @@ -1877,7 +1877,7 @@ PLIST_SUB+= XAWVER=${XAWVER} _GL_gl_LIB_DEPENDS= GL.1:${PORTSDIR}/graphics/libGL _GL_glu_LIB_DEPENDS= GLU.1:${PORTSDIR}/graphics/libGLU _GL_glw_LIB_DEPENDS= GLw.1:${PORTSDIR}/graphics/libGLw -_GL_glut_LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut +_GL_glut_LIB_DEPENDS= glut.3:${PORTSDIR}/graphics/libglut _GL_linux_RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_dri .if defined(USE_GL) diff --git a/Mk/bsd.xorg.mk b/Mk/bsd.xorg.mk index ff1b9db4211b..09814d942e17 100644 --- a/Mk/bsd.xorg.mk +++ b/Mk/bsd.xorg.mk @@ -133,6 +133,9 @@ DISTFILES?= xorg-server-${PORTVERSION}.tar.bz2 WRKSRC= ${WRKDIR}/xorg-server-${PORTVERSION} USE_GNOME+= gnomehack CONFIGURE_ARGS+= --with-xkb-path=${LOCALBASE}/share/X11/xkb + +LIB_PC_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/dri.pc:${PORTSDIR}/graphics/dri +USE_XORG+= pciaccess . endif .endif @@ -146,13 +149,14 @@ Xorg_Post_Include= bsd.xorg.mk # Register all xorg .pc files here. # foo_LIB_PC_DEPENDS means it should go to BUILD_DEPENDS *and* RUN_DEPENDS. -XORG_MODULES= bigreqsproto compositeproto damageproto dmx dmxproto evieproto fixesproto fontcacheproto fontenc fontsproto fontutil glproto ice inputproto kbproto libfs oldx pixman printproto randrproto recordproto renderproto resourceproto scrnsaverproto sm trapproto videoproto x11 xau xaw xaw6 xaw7 xaw8 xbitmaps xcmiscproto xcomposite xcursor xdamage xdmcp xevie xext xextproto xf86bigfontproto xf86dgaproto xf86driproto xf86miscproto xf86rushproto xf86vidmodeproto xfixes xfont xfontcache xft xi xinerama xineramaproto xkbfile xkbui xmu xmuu xorg-server xp xpm xprintapputil xprintutil xproto xproxymngproto xrandr xrender xres xscrnsaver xt xtrans xtrap xtst xv xvmc xxf86dga xxf86misc xxf86vm +XORG_MODULES= bigreqsproto compositeproto damageproto dmx dmxproto dri2proto evieproto fixesproto fontcacheproto fontenc fontsproto fontutil glproto ice inputproto kbproto libfs oldx pciaccess pixman printproto randrproto recordproto renderproto resourceproto scrnsaverproto sm trapproto videoproto x11 xau xaw xaw6 xaw7 xbitmaps xcmiscproto xcomposite xcursor xdamage xdmcp xevie xext xextproto xf86bigfontproto xf86dgaproto xf86driproto xf86miscproto xf86rushproto xf86vidmodeproto xfixes xfont xfontcache xft xi xinerama xineramaproto xkbfile xkbui xmu xmuu xorg-server xp xpm xprintapputil xprintutil xproto xproxymngproto xrandr xrender xres xscrnsaver xt xtrans xtrap xtst xv xvmc xxf86dga xxf86misc xxf86vm bigreqsproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/bigreqsproto.pc:${PORTSDIR}/x11/bigreqsproto compositeproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/compositeproto.pc:${PORTSDIR}/x11/compositeproto damageproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/damageproto.pc:${PORTSDIR}/x11/damageproto dmx_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dmx.pc:${PORTSDIR}/x11/libdmx dmxproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dmxproto.pc:${PORTSDIR}/x11/dmxproto +dri2proto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dri2proto.pc:${PORTSDIR}/x11/dri2proto evieproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/evieproto.pc:${PORTSDIR}/x11/evieext fixesproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/fixesproto.pc:${PORTSDIR}/x11/fixesproto fontcacheproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/fontcacheproto.pc:${PORTSDIR}/x11-fonts/fontcacheproto @@ -165,6 +169,7 @@ inputproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/inputproto.pc:${PORTSDI kbproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/kbproto.pc:${PORTSDIR}/x11/kbproto libfs_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/libfs.pc:${PORTSDIR}/x11-fonts/libFS oldx_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/oldx.pc:${PORTSDIR}/x11/liboldX +pciaccess_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/pciaccess.pc:${PORTSDIR}/devel/libpciaccess pixman_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/pixman-1.pc:${PORTSDIR}/x11/pixman printproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/printproto.pc:${PORTSDIR}/x11/printproto randrproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/randrproto.pc:${PORTSDIR}/x11/randrproto @@ -177,10 +182,9 @@ trapproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/trapproto.pc:${PORTSDIR} videoproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/videoproto.pc:${PORTSDIR}/x11/videoproto x11_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/x11.pc:${PORTSDIR}/x11/libX11 xau_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xau.pc:${PORTSDIR}/x11/libXau -xaw_LIB_PC_DEPENDS= ${xaw${XAWVER}_LIB_PC_DEPENDS} +xaw_LIB_PC_DEPENDS= ${xaw7_LIB_PC_DEPENDS} xaw6_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xaw6.pc:${PORTSDIR}/x11-toolkits/libXaw xaw7_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xaw7.pc:${PORTSDIR}/x11-toolkits/libXaw -xaw8_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xaw8.pc:${PORTSDIR}/x11-toolkits/libXaw xbitmaps_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xbitmaps.pc:${PORTSDIR}/x11/xbitmaps xcmiscproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xcmiscproto.pc:${PORTSDIR}/x11/xcmiscproto xcomposite_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xcomposite.pc:${PORTSDIR}/x11/libXcomposite diff --git a/astro/boinc-setiathome-enhanced/Makefile b/astro/boinc-setiathome-enhanced/Makefile index 32a719ae8421..faf5d0094e14 100644 --- a/astro/boinc-setiathome-enhanced/Makefile +++ b/astro/boinc-setiathome-enhanced/Makefile @@ -6,6 +6,7 @@ PORTNAME= boinc-setiathome-enhanced PORTVERSION= ${SETI_PORTVERSION_FULL}.${AP_PORTVERSION_FULL} +PORTREVISION= 1 CATEGORIES= astro MASTER_SITES= ftp://rene-ladan.nl/pub/distfiles/ DISTFILES= astropulse-${AP_PORTVERSION_FULL}.tar.bz2 setiathome-${SETI_PORTVERSION_FULL}.tar.bz2 @@ -24,7 +25,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3 \ RUN_DEPENDS= boinc_client:${PORTSDIR}/net/boinc-client LIB_DEPENDS= fftw3f:${PORTSDIR}/math/fftw3-float \ jpeg.9:${PORTSDIR}/graphics/jpeg \ - xcb.1:${PORTSDIR}/x11/libxcb + xcb.2:${PORTSDIR}/x11/libxcb USE_GL= gl glu glut USE_XORG= ice sm x11 xau xext xi xdamage xdmcp xfixes xmu xt xxf86vm diff --git a/astro/celestia/Makefile b/astro/celestia/Makefile index da05f8708e11..e272c753954b 100644 --- a/astro/celestia/Makefile +++ b/astro/celestia/Makefile @@ -7,7 +7,7 @@ PORTNAME= celestia PORTVERSION= 1.4.1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= astro MASTER_SITES= SF PKGNAMESUFFIX= -${CELESTIA_UI} @@ -21,6 +21,7 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes USE_GL= gl +USE_XORG= x11 xt xext xmu xi USE_GETTEXT= yes WANT_GNOME= yes @@ -35,7 +36,7 @@ CONFLICTS= ${UI_LIST:S|${CELESTIA_UI}||:S|^|celestia-|:S|$|-[0-9]*|} # lol .if ${CELESTIA_UI} == "glut" CONFIGURE_ARGS+= --with-glut -LIB_DEPENDS+= glut:${PORTSDIR}/graphics/libglut +USE_GL+= glut .elif ${CELESTIA_UI} == "gtk" CONFIGURE_ARGS+= --with-gtk USE_GNOME+= gtk20 diff --git a/astro/openuniverse/Makefile b/astro/openuniverse/Makefile index 74a482dc303d..c3dcb51c9322 100644 --- a/astro/openuniverse/Makefile +++ b/astro/openuniverse/Makefile @@ -7,7 +7,7 @@ PORTNAME= openuniverse DISTVERSION= 1.0beta3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= astro MASTER_SITES= SF diff --git a/astro/xtide/Makefile b/astro/xtide/Makefile index 94929245301b..9f97ba878d60 100644 --- a/astro/xtide/Makefile +++ b/astro/xtide/Makefile @@ -7,7 +7,7 @@ PORTNAME= xtide PORTVERSION= 2.10 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= astro geography MASTER_SITES= ftp://ftp.flaterco.com/xtide/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ diff --git a/audio/fmit/Makefile b/audio/fmit/Makefile index 33887f40c7aa..35236f5a1377 100644 --- a/audio/fmit/Makefile +++ b/audio/fmit/Makefile @@ -7,7 +7,7 @@ PORTNAME= fmit PORTVERSION= 0.97.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= http://download.gna.org/fmit/ diff --git a/audio/nas/Makefile b/audio/nas/Makefile index 7ebc0ce2be1b..a14e3d819e57 100644 --- a/audio/nas/Makefile +++ b/audio/nas/Makefile @@ -7,7 +7,7 @@ PORTNAME= nas PORTVERSION= 1.9.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio MASTER_SITES= SF EXTRACT_SUFX= .src.tar.gz diff --git a/audio/rosegarden/Makefile b/audio/rosegarden/Makefile index 61e53b5294a8..e4ca99816c91 100644 --- a/audio/rosegarden/Makefile +++ b/audio/rosegarden/Makefile @@ -7,7 +7,7 @@ PORTNAME= rosegarden PORTVERSION= 2.1.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio MASTER_SITES= http://www.cannam.demon.co.uk/rosegarden/distribution/ DISTNAME= ${PORTNAME}-2.1pl2 diff --git a/audio/xcdplayer/Makefile b/audio/xcdplayer/Makefile index cba3a3dbfda6..d949fc4823a7 100644 --- a/audio/xcdplayer/Makefile +++ b/audio/xcdplayer/Makefile @@ -7,7 +7,7 @@ PORTNAME= xcdplayer PORTVERSION= 2.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio MASTER_SITES= ftp://ftp.x.org/R5contrib/ EXTRACT_SUFX= .tar.Z diff --git a/audio/xmixer/Makefile b/audio/xmixer/Makefile index 11ca46389563..7bc22be038b0 100644 --- a/audio/xmixer/Makefile +++ b/audio/xmixer/Makefile @@ -7,7 +7,7 @@ PORTNAME= xmixer PORTVERSION= 0.9.4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= audio MASTER_SITES= http://mpx.freeshell.net/ diff --git a/audio/xwave/Makefile b/audio/xwave/Makefile index e8916014e7ef..a683d6cf2b3c 100644 --- a/audio/xwave/Makefile +++ b/audio/xwave/Makefile @@ -7,7 +7,7 @@ PORTNAME= xwave PORTVERSION= 2.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= trevor diff --git a/biology/L-Breeder/Makefile b/biology/L-Breeder/Makefile index 4eefcccaf53a..d9178dfda4ba 100644 --- a/biology/L-Breeder/Makefile +++ b/biology/L-Breeder/Makefile @@ -8,7 +8,7 @@ PORTNAME= LBreeder PORTVERSION= 1.0 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= biology MASTER_SITES= http://www.simonyi.ox.ac.uk/dawkins/software/yan/L-Breeder/ DISTNAME= ${PORTNAME}-source diff --git a/biology/phylip/Makefile b/biology/phylip/Makefile index 3781f018523b..d7ba23a2e78a 100644 --- a/biology/phylip/Makefile +++ b/biology/phylip/Makefile @@ -7,6 +7,7 @@ PORTNAME= phylip PORTVERSION= 3.68 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= biology MASTER_SITES= ftp://evolution.genetics.washington.edu/pub/phylip/ \ diff --git a/biology/protomol/Makefile b/biology/protomol/Makefile index 3280d957bf61..72a1cbdfa37b 100644 --- a/biology/protomol/Makefile +++ b/biology/protomol/Makefile @@ -6,7 +6,7 @@ PORTNAME= protomol PORTVERSION= 2.0.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= biology MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/biology/pymol/Makefile b/biology/pymol/Makefile index 4c9f043d1321..4de0aacb983b 100644 --- a/biology/pymol/Makefile +++ b/biology/pymol/Makefile @@ -6,7 +6,7 @@ PORTNAME= pymol PORTVERSION= 1.0r2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= biology python MASTER_SITES= ${MASTER_SITE_LOCAL:S|%SUBDIR%|maho/pymol|} @@ -16,11 +16,11 @@ COMMENT= Free and Open-Source molecular modeling system BUILD_DEPENDS= ${PYNUMERIC} RUN_DEPENDS= ${PYNUMERIC} \ ${PYTHON_SITELIBDIR}/Pmw:${PORTSDIR}/x11-toolkits/py-Pmw -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut \ - png.5:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ freetype.9:${PORTSDIR}/print/freetype2 WRKSRC= ${WRKDIR}/pymol-${PORTVERSION} +USE_GL= glut USE_GMAKE= yes USE_PYTHON= yes diff --git a/cad/cider/Makefile b/cad/cider/Makefile index 3367cc2400ca..2118055cb79e 100644 --- a/cad/cider/Makefile +++ b/cad/cider/Makefile @@ -7,7 +7,7 @@ PORTNAME= cider PORTVERSION= 1.b1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= cad MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= mita diff --git a/cad/jspice3/Makefile b/cad/jspice3/Makefile index d2ed545c77ce..09692f9f0d91 100644 --- a/cad/jspice3/Makefile +++ b/cad/jspice3/Makefile @@ -7,7 +7,7 @@ PORTNAME= jspice3 PORTVERSION= 2.5 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= cad MASTER_SITES= http://www.wrcad.com/ftp/pub/ \ ftp://ftp.srware.com/pub/ diff --git a/cad/leocad/Makefile b/cad/leocad/Makefile index c19331d2c163..2a4ce82550f6 100644 --- a/cad/leocad/Makefile +++ b/cad/leocad/Makefile @@ -7,7 +7,7 @@ PORTNAME= leocad PORTVERSION= 0.73 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= cad MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= arved @@ -19,9 +19,9 @@ COMMENT= A CAD program that uses bricks similar to those found in many toys EXTRACT_DEPENDS=unzip:${PORTSDIR}/archivers/unzip LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ - png.5:${PORTSDIR}/graphics/png \ - glut.4:${PORTSDIR}/graphics/libglut + png.5:${PORTSDIR}/graphics/png +USE_GL= glut USE_XORG= x11 USE_GMAKE= yes USE_GNOME= gtk12 diff --git a/cad/netgen/Makefile b/cad/netgen/Makefile index 29dd4e4a963a..c9e955f957a8 100644 --- a/cad/netgen/Makefile +++ b/cad/netgen/Makefile @@ -7,7 +7,7 @@ PORTNAME= netgen PORTVERSION= 4.4 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= cad MASTER_SITES= http://www.hpfem.jku.at/cgi/download.cgi?ID= DISTNAME= ngs${PORTVERSION:S/.//g} @@ -21,6 +21,7 @@ USE_GMAKE= yes USE_TK= yes USE_TK_BUILD= yes USE_GL= yes +USE_XORG= xmu xi ALL_TARGET= ng diff --git a/cad/opencascade/Makefile b/cad/opencascade/Makefile index ecf8cb48e573..fed93b66df46 100644 --- a/cad/opencascade/Makefile +++ b/cad/opencascade/Makefile @@ -7,6 +7,7 @@ PORTNAME= opencascade PORTVERSION= 6.3 +PORTREVISION= 1 CATEGORIES= cad science MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= thierry @@ -31,6 +32,7 @@ USE_TCL_BUILD= 84 USE_TCL_RUN= 84 USE_TCL_THREADS=yes USE_JAVA= yes +USE_XORG= xmu JAVA_VERSION= 1.4+ #.if defined(MAINTAINER_MODE) # linux-sun-jdk was required for 6.1, but 6.2 is OK with diablo-jdk. diff --git a/cad/slffea/Makefile b/cad/slffea/Makefile index 955bab8b2c57..554ed1cc6225 100644 --- a/cad/slffea/Makefile +++ b/cad/slffea/Makefile @@ -8,7 +8,7 @@ PORTNAME= slffea PORTVERSION= 1.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= cad MASTER_SITES= SF DISTNAME= ${PORTNAME}13 @@ -17,10 +17,10 @@ EXTRACT_SUFX= .tgz MAINTAINER= jmelo@FreeBSD.org COMMENT= San Le's Free Finite Element Analysis -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut - CONFLICTS= swi-pl-[0-9]* TenDRA-[0-9]* +USE_GL= glut + CFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} WRKSRC= ${WRKDIR}/${PORTNAME}-1.3 ALL_TARGET= everything diff --git a/cad/spice/Makefile b/cad/spice/Makefile index ada632a40935..4a4ec2379b94 100644 --- a/cad/spice/Makefile +++ b/cad/spice/Makefile @@ -7,7 +7,7 @@ PORTNAME= spice PORTVERSION= 3f5.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= cad MASTER_SITES= http://embedded.eecs.berkeley.edu/pubs/downloads/spice/:sources DISTFILES= spice3f5${EXTRACT_SUFX}:sources \ diff --git a/chinese/fqterm/Makefile b/chinese/fqterm/Makefile index c83e8576e16b..5792042adfce 100644 --- a/chinese/fqterm/Makefile +++ b/chinese/fqterm/Makefile @@ -7,6 +7,7 @@ PORTNAME= fqterm PORTVERSION= 0.9.3 +PORTREVISION= 1 CATEGORIES= chinese MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/chinese/qterm/Makefile b/chinese/qterm/Makefile index 024c327ba937..b8583d28009b 100644 --- a/chinese/qterm/Makefile +++ b/chinese/qterm/Makefile @@ -7,7 +7,7 @@ PORTNAME= qterm PORTVERSION= 0.4.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= chinese MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://www.yuanjue.net/download/ diff --git a/databases/grass/Makefile b/databases/grass/Makefile index 7bc1cb30b4b0..7e8cdd8a9687 100644 --- a/databases/grass/Makefile +++ b/databases/grass/Makefile @@ -7,7 +7,7 @@ PORTNAME= grass PORTVERSION= 6.2.3 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 2 CATEGORIES= databases geography MASTER_SITES= http://grass.itc.it/grass62/source/ \ diff --git a/databases/mysql-gui-tools/Makefile b/databases/mysql-gui-tools/Makefile index 9971a83e94cf..418a0c88e4e6 100644 --- a/databases/mysql-gui-tools/Makefile +++ b/databases/mysql-gui-tools/Makefile @@ -8,6 +8,7 @@ PORTNAME= mysql-gui-tools PORTVERSION= 5.0r12 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL} MASTER_SITE_SUBDIR= MySQLGUITools diff --git a/deskutils/aspostit/Makefile b/deskutils/aspostit/Makefile index 70e028cfd4af..bab76a2e59fe 100644 --- a/deskutils/aspostit/Makefile +++ b/deskutils/aspostit/Makefile @@ -7,7 +7,7 @@ PORTNAME= aspostit PORTVERSION= 1.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= deskutils MASTER_SITES= ${MASTER_SITE_AFTERSTEP} MASTER_SITE_SUBDIR= apps/aspostit diff --git a/deskutils/autocutsel/Makefile b/deskutils/autocutsel/Makefile index 8917968af14e..5b86cb32d8c2 100644 --- a/deskutils/autocutsel/Makefile +++ b/deskutils/autocutsel/Makefile @@ -7,7 +7,7 @@ PORTNAME= autocutsel PORTVERSION= 0.9.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= deskutils MASTER_SITES= ${MASTER_SITE_SAVANNAH} MASTER_SITE_SUBDIR= autocutsel diff --git a/deskutils/deskbar-applet/Makefile b/deskutils/deskbar-applet/Makefile index 9d9f1c0d2263..87ca4b72a245 100644 --- a/deskutils/deskbar-applet/Makefile +++ b/deskutils/deskbar-applet/Makefile @@ -25,6 +25,7 @@ USE_GETTEXT= yes USE_GNOME= gnomeprefix gnomehack pygnomedesktop intlhack USE_PYTHON= yes USE_GMAKE= yes +USE_DISPLAY= yes GNU_CONFIGURE= yes INSTALLS_ICONS= yes INSTALLS_OMF= yes diff --git a/deskutils/kmatrix3d/Makefile b/deskutils/kmatrix3d/Makefile index b67adeb99439..bffa41509c6b 100644 --- a/deskutils/kmatrix3d/Makefile +++ b/deskutils/kmatrix3d/Makefile @@ -7,7 +7,7 @@ PORTNAME= kmatrix3d PORTVERSION= 0.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= deskutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/devel/Makefile b/devel/Makefile index 051adf71b8b8..cf1c3d7b8328 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -692,6 +692,7 @@ SUBDIR += libowfat SUBDIR += libpasori SUBDIR += libpci + SUBDIR += libpciaccess SUBDIR += libpdel SUBDIR += libpeak SUBDIR += libphish diff --git a/devel/bullet/Makefile b/devel/bullet/Makefile index cea090960ddf..df72b3e7ea50 100644 --- a/devel/bullet/Makefile +++ b/devel/bullet/Makefile @@ -7,6 +7,7 @@ PORTNAME= bullet PORTVERSION= 2.73 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} DISTNAME= ${PORTNAME}-${PORTVERSION:S/$/-sp1/} diff --git a/devel/clanlib/Makefile b/devel/clanlib/Makefile index d512e82d40ab..a37373b1a71c 100644 --- a/devel/clanlib/Makefile +++ b/devel/clanlib/Makefile @@ -8,7 +8,7 @@ PORTNAME= clanlib PORTVERSION= 0.8.1 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= http://www.clanlib.org/download/releases-0.8/ \ @@ -33,7 +33,7 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --disable-clanJavaScript --disable-docs USE_GMAKE= yes -USE_XORG= x11 +USE_XORG= x11 xmu xi USE_GNOME= gnomehack gnometarget pkgconfig USE_LDCONFIG= yes USE_SDL= gfx diff --git a/devel/glui/Makefile b/devel/glui/Makefile index ee508df9d92f..3c13a139646c 100644 --- a/devel/glui/Makefile +++ b/devel/glui/Makefile @@ -7,7 +7,7 @@ PORTNAME= glui PORTVERSION= 2.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel graphics MASTER_SITES= http://www.cs.unc.edu/~rademach/glui/src/release/ DISTNAME= glui_v2_1_beta diff --git a/devel/libpciaccess/Makefile b/devel/libpciaccess/Makefile new file mode 100644 index 000000000000..f637194f14e6 --- /dev/null +++ b/devel/libpciaccess/Makefile @@ -0,0 +1,23 @@ +# New ports collection makefile for: libpciaccess +# Date Created: May 11 2008 +# Whom: Florent Thoumie <flz@FreeBSD.org> +# +# $FreeBSD$ +# + +PORTNAME= libpciaccess +PORTVERSION= 0.10.5 +CATEGORIES= devel + +MAINTAINER= x11@FreeBSD.org +COMMENT= Generic PCI access library + +BUILD_DEPENDS= ${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids +# XXX - Is it a runtime dep too? +RUN_DEPENDS= ${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids + +CONFIGURE_ARGS+= --with-pciids-path=${LOCALBASE}/share/pciids + +XORG_CAT= lib + +.include <bsd.port.mk> diff --git a/devel/libpciaccess/distinfo b/devel/libpciaccess/distinfo new file mode 100644 index 000000000000..e7bf98247e1b --- /dev/null +++ b/devel/libpciaccess/distinfo @@ -0,0 +1,3 @@ +MD5 (xorg/lib/libpciaccess-0.10.5.tar.bz2) = 617bebf31e5685c83f935009aeae5f38 +SHA256 (xorg/lib/libpciaccess-0.10.5.tar.bz2) = b6c5765a3994e59053cb3b46741b858bb56ea868baa5c48fba7e5c36ca4ae95d +SIZE (xorg/lib/libpciaccess-0.10.5.tar.bz2) = 260817 diff --git a/devel/libpciaccess/pkg-descr b/devel/libpciaccess/pkg-descr new file mode 100644 index 000000000000..77dbb5584df9 --- /dev/null +++ b/devel/libpciaccess/pkg-descr @@ -0,0 +1,6 @@ +This package contains the pciaccess library. + +WWW: http://www.freedesktop.org/Software/xlibs + +- Florent Thoumie +flz@FreeBSD.org diff --git a/devel/libpciaccess/pkg-plist b/devel/libpciaccess/pkg-plist new file mode 100644 index 000000000000..4fe963b655ee --- /dev/null +++ b/devel/libpciaccess/pkg-plist @@ -0,0 +1,6 @@ +include/pciaccess.h +lib/libpciaccess.a +lib/libpciaccess.la +lib/libpciaccess.so +lib/libpciaccess.so.0 +libdata/pkgconfig/pciaccess.pc diff --git a/devel/m17n-lib/Makefile b/devel/m17n-lib/Makefile index 6f3f8e0b8ad5..49b83fc60fc2 100644 --- a/devel/m17n-lib/Makefile +++ b/devel/m17n-lib/Makefile @@ -7,6 +7,7 @@ PORTNAME= m17n-lib PORTVERSION= 1.5.2 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://www.m17n.org/m17n-lib-download/ \ http://anthesphoria.net/FreeBSD/ports/distfiles/ diff --git a/devel/ois/Makefile b/devel/ois/Makefile index 83dfd037815f..88acd860e979 100644 --- a/devel/ois/Makefile +++ b/devel/ois/Makefile @@ -7,7 +7,7 @@ PORTNAME= ois PORTVERSION= 1.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= SF MASTER_SITE_SUBDIR= wgois diff --git a/devel/pdcurses-the/Makefile b/devel/pdcurses-the/Makefile index f6d7fa784042..1c7788000e12 100644 --- a/devel/pdcurses-the/Makefile +++ b/devel/pdcurses-the/Makefile @@ -7,7 +7,7 @@ PORTNAME= pdcurses PORTVERSION= 3.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= SF DISTNAME= PDCurses-${PORTVERSION} @@ -16,7 +16,7 @@ MAINTAINER= alepulver@FreeBSD.org COMMENT= Curses library implementation for Win32, DOS, OS/2 and X11 USE_LDCONFIG= yes -USE_XORG= x11 xext sm ice xt xaw8 +USE_XORG= x11 xext sm ice xt xaw GNU_CONFIGURE= yes OPTIONS= DEBUG "Enable debugging support" off \ diff --git a/devel/pdcurses/Makefile b/devel/pdcurses/Makefile index f6d7fa784042..1c7788000e12 100644 --- a/devel/pdcurses/Makefile +++ b/devel/pdcurses/Makefile @@ -7,7 +7,7 @@ PORTNAME= pdcurses PORTVERSION= 3.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= SF DISTNAME= PDCurses-${PORTVERSION} @@ -16,7 +16,7 @@ MAINTAINER= alepulver@FreeBSD.org COMMENT= Curses library implementation for Win32, DOS, OS/2 and X11 USE_LDCONFIG= yes -USE_XORG= x11 xext sm ice xt xaw8 +USE_XORG= x11 xext sm ice xt xaw GNU_CONFIGURE= yes OPTIONS= DEBUG "Enable debugging support" off \ diff --git a/devel/plan9port/Makefile b/devel/plan9port/Makefile index c706d721f180..ca87a48c3b31 100644 --- a/devel/plan9port/Makefile +++ b/devel/plan9port/Makefile @@ -7,6 +7,7 @@ PORTNAME= plan9port PORTVERSION= 20080909 +PORTREVISION= 1 CATEGORIES= devel plan9 MASTER_SITES= http://swtch.com/plan9port/ \ ftp://quenix2.dyndns.org/FreeBSD/ports/distfiles/ @@ -15,7 +16,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= serge.gagnon.1@ulaval.ca COMMENT= Port of the bulk of the Plan9 software build environment to Unix -USE_XORG= x11 xt xi xaw6 xaw7 xaw8 +USE_XORG= x11 xt xi xaw USE_PERL5_BUILD=YES WRKSRC= ${WRKDIR}/plan9 PLIST= ${WRKDIR}/.PLIST diff --git a/devel/simgear/Makefile b/devel/simgear/Makefile index 68f881658530..2ffe29f37d50 100644 --- a/devel/simgear/Makefile +++ b/devel/simgear/Makefile @@ -7,6 +7,7 @@ PORTNAME= SimGear PORTVERSION= 1.9.0 +PORTREVISION= 1 CATEGORIES= devel games MASTER_SITES= ftp://ftp.de.simgear.org/pub/simgear/Source/ \ ftp://ftp.simgear.org/pub/simgear/Source/ diff --git a/devel/t1lib/Makefile b/devel/t1lib/Makefile index 06aea59f3736..b067b766a01b 100644 --- a/devel/t1lib/Makefile +++ b/devel/t1lib/Makefile @@ -8,6 +8,7 @@ PORTNAME= t1lib PORTVERSION= 5.1.2 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SUNSITE} diff --git a/devel/xorg-macros/Makefile b/devel/xorg-macros/Makefile index bebaf71d52ba..89c4e3eccf9c 100644 --- a/devel/xorg-macros/Makefile +++ b/devel/xorg-macros/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xorg-macros -PORTVERSION= 1.1.5 +PORTVERSION= 1.2.1 CATEGORIES= devel x11 DISTNAME= util-macros-$(PORTVERSION) @@ -15,7 +15,6 @@ COMMENT= X.Org development aclocal macros XORG_CAT= util -PLIST_FILES= share/aclocal/xorgversion.m4 \ - share/aclocal/xorg-macros.m4 +PLIST_FILES= share/aclocal/xorg-macros.m4 .include <bsd.port.mk> diff --git a/devel/xorg-macros/distinfo b/devel/xorg-macros/distinfo index 9ceb0078fd5c..0d06bd097628 100644 --- a/devel/xorg-macros/distinfo +++ b/devel/xorg-macros/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/util/util-macros-1.1.5.tar.bz2) = 51952682d8b42aeda3af5cee0133ce2c -SHA256 (xorg/util/util-macros-1.1.5.tar.bz2) = 75939790e16b8bcc122e83f3f060d6f000ed1a98e97b4972fac0903142f5651b -SIZE (xorg/util/util-macros-1.1.5.tar.bz2) = 47165 +MD5 (xorg/util/util-macros-1.2.1.tar.bz2) = dc7ddaf9bea8b341510efe4dac125af4 +SHA256 (xorg/util/util-macros-1.2.1.tar.bz2) = 2863ce6c25a40a3c5d6f31721d496a8a8d5e99bb646e73b990d727623a208878 +SIZE (xorg/util/util-macros-1.2.1.tar.bz2) = 48602 diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile index 65dfca12f624..ce357d35557e 100644 --- a/editors/openoffice-3-devel/Makefile +++ b/editors/openoffice-3-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME?= openoffice.org PORTVERSION?= 3.1.${SNAPDATE} +PORTREVISION?= 1 CATEGORIES+= editors java MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \ http://ooopackages.good-day.net/pub/OpenOffice.org/cws/:cws \ diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile index cc5501b0db03..a07e6b4b091f 100644 --- a/editors/openoffice-3/Makefile +++ b/editors/openoffice-3/Makefile @@ -8,6 +8,7 @@ PORTNAME?= openoffice.org PORTVERSION?= ${OOOVERSION} +PORTREVISION?= 1 CATEGORIES+= editors java MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \ http://ooopackages.good-day.net/pub/OpenOffice.org/cws/:cws \ diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile index 6f9f1158df0e..bac782d20faa 100644 --- a/editors/openoffice.org-2-RC/Makefile +++ b/editors/openoffice.org-2-RC/Makefile @@ -7,6 +7,7 @@ PORTNAME?= openoffice.org PORTVERSION?= 2.4.${SNAPDATE} +PORTREVISION?= 1 CATEGORIES+= editors java MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \ http://openoffice.lunarshells.com/sources/ \ diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile index 50f5a3e827ab..41364b71bc6d 100644 --- a/editors/openoffice.org-2-devel/Makefile +++ b/editors/openoffice.org-2-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME?= openoffice.org PORTVERSION?= 2.4.${SNAPDATE} -PORTREVISION?= 5 +PORTREVISION?= 6 PORTEPOCH?= 1 CATEGORIES+= editors java MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \ diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile index bb4d0f6b073f..7bf6ed57a954 100644 --- a/editors/openoffice.org-2/Makefile +++ b/editors/openoffice.org-2/Makefile @@ -7,6 +7,7 @@ PORTNAME?= openoffice.org PORTVERSION?= ${OOOVERSION} +PORTREVISION?= 1 CATEGORIES+= editors java MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \ http://openoffice.lunarshells.com/sources/ \ diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile index 25b24c086b49..2e1d4cb9e0d3 100644 --- a/editors/openoffice.org-3-RC/Makefile +++ b/editors/openoffice.org-3-RC/Makefile @@ -8,6 +8,7 @@ PORTNAME?= openoffice.org PORTVERSION?= 3.0.${SNAPDATE} +PORTREVISION?= 1 CATEGORIES+= editors java MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \ http://openoffice.lunarshells.com/sources/ \ diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile index 65dfca12f624..ce357d35557e 100644 --- a/editors/openoffice.org-3-devel/Makefile +++ b/editors/openoffice.org-3-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME?= openoffice.org PORTVERSION?= 3.1.${SNAPDATE} +PORTREVISION?= 1 CATEGORIES+= editors java MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \ http://ooopackages.good-day.net/pub/OpenOffice.org/cws/:cws \ diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile index cc5501b0db03..a07e6b4b091f 100644 --- a/editors/openoffice.org-3/Makefile +++ b/editors/openoffice.org-3/Makefile @@ -8,6 +8,7 @@ PORTNAME?= openoffice.org PORTVERSION?= ${OOOVERSION} +PORTREVISION?= 1 CATEGORIES+= editors java MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \ http://ooopackages.good-day.net/pub/OpenOffice.org/cws/:cws \ diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile index 50f5a3e827ab..41364b71bc6d 100644 --- a/editors/openoffice.org-vcltesttool/Makefile +++ b/editors/openoffice.org-vcltesttool/Makefile @@ -7,7 +7,7 @@ PORTNAME?= openoffice.org PORTVERSION?= 2.4.${SNAPDATE} -PORTREVISION?= 5 +PORTREVISION?= 6 PORTEPOCH?= 1 CATEGORIES+= editors java MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \ diff --git a/editors/xed/Makefile b/editors/xed/Makefile index ab236bccac12..00a1dfdb0257 100644 --- a/editors/xed/Makefile +++ b/editors/xed/Makefile @@ -7,7 +7,7 @@ PORTNAME= xed PORTVERSION= 1.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors MASTER_SITES= ${MASTER_SITE_XCONTRIB} MASTER_SITE_SUBDIR= editors diff --git a/emulators/darcnes/Makefile b/emulators/darcnes/Makefile index 0ab2cab002f8..aa376fc09f92 100644 --- a/emulators/darcnes/Makefile +++ b/emulators/darcnes/Makefile @@ -7,7 +7,7 @@ PORTNAME= darcnes PORTVERSION= 9b0401 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= emulators MASTER_SITES= http://www.dridus.com/~nyef/darcnes/download/ DISTNAME= dn${PORTVERSION} diff --git a/emulators/mednafen/Makefile b/emulators/mednafen/Makefile index bd4035ecd410..87e938483716 100644 --- a/emulators/mednafen/Makefile +++ b/emulators/mednafen/Makefile @@ -7,7 +7,7 @@ PORTNAME= mednafen PORTVERSION= 0.8.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= emulators games MASTER_SITES= SF diff --git a/emulators/spim/Makefile b/emulators/spim/Makefile index cf5e6c6a2bd3..f5770b31cb43 100644 --- a/emulators/spim/Makefile +++ b/emulators/spim/Makefile @@ -8,6 +8,7 @@ PORTNAME= spim PORTVERSION= 7.3 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= http://pages.cs.wisc.edu/~larus/SPIM/ diff --git a/finance/opentaxsolver/Makefile b/finance/opentaxsolver/Makefile index 1689e09ddb33..5a1bdccbf9dd 100644 --- a/finance/opentaxsolver/Makefile +++ b/finance/opentaxsolver/Makefile @@ -7,6 +7,7 @@ PORTNAME= ${UPPORTNAME:L} PORTVERSION= 5.07 +PORTREVISION= 1 CATEGORIES= finance MASTER_SITES= SF/opentaxsolver DISTNAME= ${UPPORTNAME}2007_${PORTVERSION} @@ -16,6 +17,7 @@ MAINTAINER= jhein@timing.com COMMENT= US tax prep software USE_GL= yes +USE_XORG= xmu xext x11 UPPORTNAME= OpenTaxSolver post-patch: diff --git a/french/xtel/Makefile b/french/xtel/Makefile index 475bd797fc79..b6ab57749118 100644 --- a/french/xtel/Makefile +++ b/french/xtel/Makefile @@ -7,7 +7,7 @@ PORTNAME= xtel PORTVERSION= 3.3.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= french comms emulators MASTER_SITES= http://pficheux.free.fr/xtel/download/ diff --git a/games/BillardGL/Makefile b/games/BillardGL/Makefile index 08e6092a1b8b..1433f32c980e 100644 --- a/games/BillardGL/Makefile +++ b/games/BillardGL/Makefile @@ -7,7 +7,7 @@ PORTNAME= BillardGL PORTVERSION= 1.75 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MASTER_SITES= SF MASTER_SITE_SUBDIR= billardgl diff --git a/games/KnightCap/Makefile b/games/KnightCap/Makefile index 341d83e854a2..afc3284f05ee 100644 --- a/games/KnightCap/Makefile +++ b/games/KnightCap/Makefile @@ -7,7 +7,7 @@ PORTNAME= knightcap PORTVERSION= 3.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= ftp://ftp.samba.org/pub/KnightCap/ DISTNAME= KnightCap-${PORTVERSION} @@ -15,11 +15,9 @@ DISTNAME= KnightCap-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Chess program with 3D interface for X Window System -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut - WRKSRC= ${WRKDIR}/Export -USE_GL= yes +USE_GL= glut ALL_TARGET= KnightCap DOCSDIR= ${PREFIX}/share/doc/KnightCap diff --git a/games/actx/Makefile b/games/actx/Makefile index a60e5e474a8f..ab953e809f6d 100644 --- a/games/actx/Makefile +++ b/games/actx/Makefile @@ -7,7 +7,7 @@ PORTNAME= actx PORTVERSION= 1.23 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://rosegray.sakura.ne.jp/ActX/ diff --git a/games/airrox/Makefile b/games/airrox/Makefile index 8cb0d9b49dda..80e3d3afe5b3 100644 --- a/games/airrox/Makefile +++ b/games/airrox/Makefile @@ -7,7 +7,7 @@ PORTNAME= airrox PORTVERSION= 0.0.4 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= SF DISTNAME= ${PORTNAME}-0.04 @@ -15,11 +15,9 @@ DISTNAME= ${PORTNAME}-0.04 MAINTAINER= alepulver@FreeBSD.org COMMENT= An 3D Air Hockey, which uses SDL & OpenGL -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut - USE_GMAKE= yes USE_SDL= mixer net sdl -USE_GL= yes +USE_GL= glut REINPLACE_ARGS= -i '' ALL_TARGET= linux WRKSRC= ${WRKDIR}/${PORTNAME}/source diff --git a/games/atr3d/Makefile b/games/atr3d/Makefile index f4da14418e87..14ac1de581be 100644 --- a/games/atr3d/Makefile +++ b/games/atr3d/Makefile @@ -7,7 +7,7 @@ PORTNAME= atr3d PORTVERSION= 0.6 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= games MASTER_SITES= ftp://ftp.avoidtheroid.com/pub/${PORTNAME}/ DISTNAME= ${PORTNAME}_source_${PORTVERSION} diff --git a/games/brutalchess/Makefile b/games/brutalchess/Makefile index f48ab6f9cc5c..085d6161eec7 100644 --- a/games/brutalchess/Makefile +++ b/games/brutalchess/Makefile @@ -7,7 +7,7 @@ PORTNAME= brutalchess PORTVERSION= 0.5.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -19,7 +19,7 @@ MAINTAINER= gustau.perez@gmail.com COMMENT= Nice looking OpenGL chess game WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USE_XORG= x11 +USE_XORG= x11 xext xt xmu xi USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 diff --git a/games/burrtools/Makefile b/games/burrtools/Makefile index 5c0a78d384f3..769a65f7043f 100644 --- a/games/burrtools/Makefile +++ b/games/burrtools/Makefile @@ -8,6 +8,7 @@ PORTNAME= burrtools PORTVERSION= 0.4.2 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF @@ -19,6 +20,7 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ xmlwrapp.5:${PORTSDIR}/textproc/xmlwrapp USE_GL= yes +USE_XORG= x11 xt xext xmu xi GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/games/cake/Makefile b/games/cake/Makefile index b6ec34866145..d115b3fd54fe 100644 --- a/games/cake/Makefile +++ b/games/cake/Makefile @@ -7,7 +7,7 @@ PORTNAME= cake PORTVERSION= 2005.12.26 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= http://www.calodox.scene.org/morbac/cake/download/ \ ${MASTER_SITE_LOCAL} http://freebsd.nsu.ru/distfiles/ @@ -36,7 +36,7 @@ OPTIONS= FREEGLUT "Build with alternative GLUT library, FreeGLUT" off .if defined(WITH_FREEGLUT) LIB_DEPENDS= glut.11:${PORTSDIR}/graphics/freeglut .else -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut +USE_GL= glut .endif LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg diff --git a/games/connectfive/Makefile b/games/connectfive/Makefile index 7869f625347e..742366e05621 100644 --- a/games/connectfive/Makefile +++ b/games/connectfive/Makefile @@ -7,7 +7,7 @@ PORTNAME= connectfive PORTVERSION= 1.0.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= SF/connectfive DISTNAME= connectFive @@ -22,6 +22,7 @@ ALL_TARGET= default USE_SDL= sdl USE_GL= gl +USE_XORG= xmu xext x11 USE_GMAKE= yes WRKSRC= ${WRKDIR}/connectFive diff --git a/games/construo/Makefile b/games/construo/Makefile index 02bb2fc4ac97..f074c8819086 100644 --- a/games/construo/Makefile +++ b/games/construo/Makefile @@ -7,7 +7,7 @@ PORTNAME= construo PORTVERSION= 0.2.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SAVANNAH} MASTER_SITE_SUBDIR= construo diff --git a/games/crack-attack/Makefile b/games/crack-attack/Makefile index b79db21a9118..7ec5e3ac47c0 100644 --- a/games/crack-attack/Makefile +++ b/games/crack-attack/Makefile @@ -6,7 +6,7 @@ PORTNAME= crack-attack PORTVERSION= 1.1.14 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SAVANNAH} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/games/crossfire-server/Makefile b/games/crossfire-server/Makefile index a0f268f3ad4c..5bf4ea8d32c6 100644 --- a/games/crossfire-server/Makefile +++ b/games/crossfire-server/Makefile @@ -7,6 +7,7 @@ PORTNAME= crossfire PORTVERSION= 1.11.0 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF \ ftp://ftp.real-time.com/pub/games/crossfire/ diff --git a/games/cultivation/Makefile b/games/cultivation/Makefile index 304b8865993e..097a3da05b8f 100644 --- a/games/cultivation/Makefile +++ b/games/cultivation/Makefile @@ -7,6 +7,7 @@ PORTNAME= cultivation PORTVERSION= 8 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF DISTNAME= Cultivation_${PORTVERSION}_UnixSource @@ -14,9 +15,9 @@ DISTNAME= Cultivation_${PORTVERSION}_UnixSource MAINTAINER= amdmi3@FreeBSD.org COMMENT= Unique game of conflict and cooperation in a gardening community -LIB_DEPENDS= portaudio:${PORTSDIR}/audio/portaudio \ - glut.4:${PORTSDIR}/graphics/libglut +LIB_DEPENDS= portaudio:${PORTSDIR}/audio/portaudio +USE_GL= glut USE_GMAKE= yes WRKSRC= ${WRKDIR}/${DISTNAME}/game2 diff --git a/games/d2x/Makefile b/games/d2x/Makefile index 678054ab5d16..214a7c88ab88 100644 --- a/games/d2x/Makefile +++ b/games/d2x/Makefile @@ -7,7 +7,7 @@ PORTNAME= d2x PORTVERSION= 0.2.5 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= http://www.icculus.org/d2x/src/ diff --git a/games/ensemblist/Makefile b/games/ensemblist/Makefile index 01d1dad928e3..ab622fef412a 100644 --- a/games/ensemblist/Makefile +++ b/games/ensemblist/Makefile @@ -7,7 +7,7 @@ PORTNAME= ensemblist PORTVERSION= 040126 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SAVANNAH} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -15,12 +15,11 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= Assemble given shapes from primitives -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut \ - mikmod.2:${PORTSDIR}/audio/libmikmod \ +LIB_DEPENDS= mikmod.2:${PORTSDIR}/audio/libmikmod \ png.5:${PORTSDIR}/graphics/png USE_GMAKE= yes -USE_GL= gl +USE_GL= glut MAKE_ARGS= CC="${CC}" DATADIR="${DATADIR}" PLIST= ${WRKDIR}/pkg-plist diff --git a/games/etracer/Makefile b/games/etracer/Makefile index d9e2fdbba2f4..4ee2b16c6b98 100644 --- a/games/etracer/Makefile +++ b/games/etracer/Makefile @@ -7,6 +7,7 @@ PORTNAME= etracer PORTVERSION= 0.4 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF/extremetuxracer DISTNAME= extremetuxracer-${PORTVERSION} diff --git a/games/etuxracer/Makefile b/games/etuxracer/Makefile index cd5a1a1180f5..5d0bec63e2dd 100644 --- a/games/etuxracer/Makefile +++ b/games/etuxracer/Makefile @@ -7,7 +7,7 @@ PORTNAME= tuxracer PORTVERSION= 0.61 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= SF/tuxracer DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz \ @@ -20,6 +20,7 @@ LIB_DEPENDS= tcl83.1:${PORTSDIR}/lang/tcl83 USE_SDL= mixer sdl USE_GL= gl +USE_XORG= x11 xt xmu xi USE_GMAKE= yes USE_AUTOTOOLS= automake:14 autoconf:262 AUTOMAKE_ARGS= -a diff --git a/games/falconseye/Makefile b/games/falconseye/Makefile index a898c8589060..0432ea8e563a 100644 --- a/games/falconseye/Makefile +++ b/games/falconseye/Makefile @@ -7,7 +7,7 @@ PORTNAME= falconseye PORTVERSION= 1.9.3 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= SF/falconseye DISTNAME= nethack_source_331_jtp_${PORTVERSION:S/.//g} diff --git a/games/fgsd/Makefile b/games/fgsd/Makefile index e8a3dd1d1c8c..e10a1c3dcbc2 100644 --- a/games/fgsd/Makefile +++ b/games/fgsd/Makefile @@ -7,7 +7,7 @@ PORTNAME= fgsd DISTVERSION= 0.3.1a -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= SF diff --git a/games/flightgear-atlas/Makefile b/games/flightgear-atlas/Makefile index 220a3bd2191e..38ed90db1c54 100644 --- a/games/flightgear-atlas/Makefile +++ b/games/flightgear-atlas/Makefile @@ -7,7 +7,7 @@ PORTNAME= flightgear-atlas PORTVERSION= 0.3.0.20080504 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://contribs.martymac.com/FreeBSD-ports/distfiles/ \ http://freebsd.unixfreunde.de/sources/ diff --git a/games/flightgear/Makefile b/games/flightgear/Makefile index c56979bd2242..e110f63a6d3e 100644 --- a/games/flightgear/Makefile +++ b/games/flightgear/Makefile @@ -7,6 +7,7 @@ PORTNAME?= FlightGear PORTVERSION?= ${FGVERSION} +PORTREVISION= 1 CATEGORIES= games # see http://www.flightgear.org/templates.js MASTER_SITES= ftp://ftp.de.flightgear.org/pub/fgfs/Source/ \ diff --git a/games/foobillard/Makefile b/games/foobillard/Makefile index 2c36253ce243..22fa175b986b 100644 --- a/games/foobillard/Makefile +++ b/games/foobillard/Makefile @@ -7,6 +7,7 @@ PORTNAME= foobillard PORTVERSION= 3.0a +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://foobillard.sunsite.dk/dnl/ @@ -35,7 +36,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include" \ USE_SDL= yes CONFIGURE_ARGS+= --enable-SDL .else -LIB_DEPENDS+= glut.4:${PORTSDIR}/graphics/libglut +USE_GL= glut CONFIGURE_ARGS+= --enable-glut .endif diff --git a/games/gcompris/Makefile b/games/gcompris/Makefile index 983d7eeb2783..190fc9fc910a 100644 --- a/games/gcompris/Makefile +++ b/games/gcompris/Makefile @@ -31,6 +31,7 @@ GNU_CONFIGURE= yes USE_GSTREAMER= yes USE_PYTHON= yes USE_SDL= mixer +USE_DISPLAY= yes USE_GNOME= gnomehack intlhack gnomeprefix libgnomeui pygnome2 CONFIGURE_ARGS= --enable-gnet CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ @@ -42,14 +43,6 @@ INFO= gcompris .include <bsd.port.pre.mk> -.if !defined(DISPLAY) -BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT} \ - ${LOCALBASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT} -.if !defined(PACKAGE_BUILDING) -CONFIGURE_ENV+= DISPLAY="localhost:1001" -.endif -.endif - post-patch: @${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \ ${WRKSRC}/configure diff --git a/games/gl-117/Makefile b/games/gl-117/Makefile index f6159dc24b87..7d3b46de05d3 100644 --- a/games/gl-117/Makefile +++ b/games/gl-117/Makefile @@ -8,7 +8,7 @@ PORTNAME= gl-117 PORTVERSION= 1.3.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MASTER_SITES= SF DISTVERSIONSUFFIX= -src diff --git a/games/glasteroids/Makefile b/games/glasteroids/Makefile index 8fa233172030..2199b0993a0e 100644 --- a/games/glasteroids/Makefile +++ b/games/glasteroids/Makefile @@ -7,7 +7,7 @@ PORTNAME= glasteroids PORTVERSION= 1.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MASTER_SITES= http://www.honors.montana.edu/~jjc/Glasteroids/ DISTNAME= Glasteriods diff --git a/games/glaxium/Makefile b/games/glaxium/Makefile index 6f38e82e2732..e4d0938ff91c 100644 --- a/games/glaxium/Makefile +++ b/games/glaxium/Makefile @@ -7,7 +7,7 @@ PORTNAME= glaxium PORTVERSION= 0.5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MASTER_SITES= http://xhosxe.free.fr/glaxium/ DISTNAME= ${PORTNAME}_${PORTVERSION} diff --git a/games/glsfcave/Makefile b/games/glsfcave/Makefile index f6e0ea42a0cd..9ff723b9b0a3 100644 --- a/games/glsfcave/Makefile +++ b/games/glsfcave/Makefile @@ -7,6 +7,7 @@ PORTNAME= glsfcave PORTVERSION= 1.0 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://user.ecc.u-tokyo.ac.jp/~g650192/glsfcave/ \ http://mirror.amdmi3.ru/ @@ -15,10 +16,8 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= amdmi3@FreeBSD.org COMMENT= Control a ribbon to avoid hitting walls -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut - USE_BZIP2= yes -USE_GL= yes +USE_GL= glut WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/games/gracer/Makefile b/games/gracer/Makefile index c226fcaef7d9..6c6c31413149 100644 --- a/games/gracer/Makefile +++ b/games/gracer/Makefile @@ -7,7 +7,7 @@ PORTNAME= gracer PORTVERSION= 0.1.5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MASTER_SITES= SF diff --git a/games/kiki/Makefile b/games/kiki/Makefile index fe35b86d2bfa..6fb4230fd2aa 100644 --- a/games/kiki/Makefile +++ b/games/kiki/Makefile @@ -7,7 +7,7 @@ PORTNAME= kiki PORTVERSION= 1.0.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MASTER_SITES= SF DISTNAME= ${PORTNAME}-${PORTVERSION}-src @@ -16,11 +16,9 @@ EXTRACT_SUFX= .tgz MAINTAINER= amdmi3@FreeBSD.org COMMENT= Kiki the nanobot is a 3-D puzzle game -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut - USE_PYTHON= 2.3 USE_GMAKE= yes -USE_GL= gl +USE_GL= glut USE_SDL= sdl mixer image USE_DOS2UNIX= kodilib/linux/Makefile src/main/KikiController.cpp linux/Makefile kodilib/src/types/KVector.h src/main/KikiPythonWidget.h diff --git a/games/magiccube4d/Makefile b/games/magiccube4d/Makefile index 686c2b60e7d8..862ab2e755a7 100644 --- a/games/magiccube4d/Makefile +++ b/games/magiccube4d/Makefile @@ -7,7 +7,7 @@ PORTNAME= magiccube4d PORTVERSION= 2.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= http://www.superliminal.com/cube/ DISTNAME= mc4d-src-${PORTVERSION:S/./_/} diff --git a/games/nethack32/Makefile b/games/nethack32/Makefile index e88ec2c44ed1..90b7c35e06bb 100644 --- a/games/nethack32/Makefile +++ b/games/nethack32/Makefile @@ -7,7 +7,7 @@ PORTNAME= nethack PORTVERSION= 3.2.3 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/games/nethack33/Makefile b/games/nethack33/Makefile index f1065a5b9152..a65c74b15848 100644 --- a/games/nethack33/Makefile +++ b/games/nethack33/Makefile @@ -7,7 +7,7 @@ PORTNAME= nethack PORTVERSION= 3.3.1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES?= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= nethack diff --git a/games/nethack34/Makefile b/games/nethack34/Makefile index a3462c940ec1..5e897e80b88b 100644 --- a/games/nethack34/Makefile +++ b/games/nethack34/Makefile @@ -7,7 +7,7 @@ PORTNAME= nethack PORTVERSION= 3.4.3 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES?= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/games/netherearth/Makefile b/games/netherearth/Makefile index 13e1c644db74..0a21148f830a 100644 --- a/games/netherearth/Makefile +++ b/games/netherearth/Makefile @@ -7,6 +7,7 @@ PORTNAME= netherearth PORTVERSION= 0.51 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://move.kirishi.ru/soft/netherearth/ diff --git a/games/nexuiz/Makefile b/games/nexuiz/Makefile index 989d6d845650..8002759e13b3 100644 --- a/games/nexuiz/Makefile +++ b/games/nexuiz/Makefile @@ -7,7 +7,7 @@ PORTNAME= nexuiz PORTVERSION= 2.4.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= SF DISTNAME= ${PORTNAME}-${PORTVERSION:S/.//g} diff --git a/games/nighthawk/Makefile b/games/nighthawk/Makefile index d615d09c046b..e3ceb48f8c60 100644 --- a/games/nighthawk/Makefile +++ b/games/nighthawk/Makefile @@ -7,6 +7,7 @@ PORTNAME= nighthawk PORTVERSION= 3.0.0 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= games/arcade diff --git a/games/quakeforge/Makefile b/games/quakeforge/Makefile index 1d9342b300c4..35324f7f5093 100644 --- a/games/quakeforge/Makefile +++ b/games/quakeforge/Makefile @@ -7,7 +7,7 @@ PORTNAME= quakeforge PORTVERSION= 0.5.5 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S/$/:sf/} MASTER_SITE_SUBDIR= quake/:sf @@ -51,6 +51,7 @@ DATADIR= ${Q1DIR} .if !defined(WITHOUT_CLIENTS) USE_GL= yes +USE_XORG= x11 xt PLIST_SUB+= CLIENTS="" .if defined(WITH_SDL) diff --git a/games/quetoo/Makefile b/games/quetoo/Makefile index cf831f03d836..e5c610aedf94 100644 --- a/games/quetoo/Makefile +++ b/games/quetoo/Makefile @@ -7,7 +7,7 @@ PORTNAME= quetoo PORTVERSION= 0.6.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= http://jdolan.dyndns.org/jaydolan/files/ \ http://tastyspleen.net/~jdolan/ \ diff --git a/games/race/Makefile b/games/race/Makefile index 21c2f6095c34..1e28ecf4ddee 100644 --- a/games/race/Makefile +++ b/games/race/Makefile @@ -8,7 +8,7 @@ PORTNAME= race PORTVERSION= 0.5 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MASTER_SITES= ftp://users.freebsd.org.uk/pub/foobar2k/ diff --git a/games/sol/Makefile b/games/sol/Makefile index 940d9290d86f..a6640123de6c 100644 --- a/games/sol/Makefile +++ b/games/sol/Makefile @@ -7,7 +7,7 @@ PORTNAME= sol PORTVERSION= 1.0.7 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MASTER_SITES= http://shh.thathost.com/pub-unix/files/ diff --git a/games/stormbaancoureur/Makefile b/games/stormbaancoureur/Makefile index 8c6e4e2ad4a3..0d1385219d97 100644 --- a/games/stormbaancoureur/Makefile +++ b/games/stormbaancoureur/Makefile @@ -15,11 +15,10 @@ MASTER_SITES= http://bram.creative4vision.nl/stormbaancoureur/download/ \ MAINTAINER= amdmi3@FreeBSD.org COMMENT= Simulated obstacle course for automobiles -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \ ${LOCALBASE}/lib/libode.a:${PORTSDIR}/devel/ode -USE_GL= yes +USE_GL= glut MAKE_ENV= DATADIR="${DATADIR}" diff --git a/games/torcs/Makefile b/games/torcs/Makefile index 2b6c86fe9573..58c7733c4ae2 100644 --- a/games/torcs/Makefile +++ b/games/torcs/Makefile @@ -7,6 +7,7 @@ PORTNAME= torcs DISTVERSION= 1.3.1 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF @@ -53,8 +54,7 @@ BASH2FIX= src/linux/torcs.in src/tools/accc/accc.in \ .if defined(WITH_FREEGLUT) LIB_DEPENDS+= glut.11:${PORTSDIR}/graphics/freeglut .else -USE_GL= yes -LIB_DEPENDS+= glut.4:${PORTSDIR}/graphics/libglut +USE_GL= glut .endif EMPTYDIR= champ dtmrace endrace ncrace practice quickrace diff --git a/games/tux-aqfh/Makefile b/games/tux-aqfh/Makefile index 6d56190e345c..477de2a78e7c 100644 --- a/games/tux-aqfh/Makefile +++ b/games/tux-aqfh/Makefile @@ -7,7 +7,7 @@ PORTNAME= tux_aqfh PORTVERSION= 1.0.14 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MASTER_SITES= http://tuxaqfh.sourceforge.net/dist/ diff --git a/games/tuxracer/Makefile b/games/tuxracer/Makefile index cd5a1a1180f5..5d0bec63e2dd 100644 --- a/games/tuxracer/Makefile +++ b/games/tuxracer/Makefile @@ -7,7 +7,7 @@ PORTNAME= tuxracer PORTVERSION= 0.61 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= SF/tuxracer DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz \ @@ -20,6 +20,7 @@ LIB_DEPENDS= tcl83.1:${PORTSDIR}/lang/tcl83 USE_SDL= mixer sdl USE_GL= gl +USE_XORG= x11 xt xmu xi USE_GMAKE= yes USE_AUTOTOOLS= automake:14 autoconf:262 AUTOMAKE_ARGS= -a diff --git a/games/vamos/Makefile b/games/vamos/Makefile index d9546ee80da8..ebb5b2df508e 100644 --- a/games/vamos/Makefile +++ b/games/vamos/Makefile @@ -7,6 +7,7 @@ PORTNAME= vamos PORTVERSION= 0.6.1 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF diff --git a/games/vegastrike/Makefile b/games/vegastrike/Makefile index 4992d79eb4fd..d8146acf3451 100644 --- a/games/vegastrike/Makefile +++ b/games/vegastrike/Makefile @@ -7,7 +7,7 @@ PORTNAME= vegastrike PORTVERSION= 0.5.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= SF DISTNAME= vegastrike-source-${PORTVERSION} diff --git a/games/xbill/Makefile b/games/xbill/Makefile index f79898b5a324..0ae8f2b348f9 100644 --- a/games/xbill/Makefile +++ b/games/xbill/Makefile @@ -8,7 +8,7 @@ PORTNAME= xbill PORTVERSION= 2.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MASTER_SITES= http://www.xbill.org/download/ \ http://mirror.amdmi3.ru/ diff --git a/games/xboard/Makefile b/games/xboard/Makefile index 5b3b5678c57a..6fa76a3c0311 100644 --- a/games/xboard/Makefile +++ b/games/xboard/Makefile @@ -7,7 +7,7 @@ PORTNAME= xboard PORTVERSION= 4.2.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= http://www.tim-mann.org/xboard/ \ ${MASTER_SITE_GNU} diff --git a/games/xbomb/Makefile b/games/xbomb/Makefile index 0d6259197100..92834a2f58a7 100644 --- a/games/xbomb/Makefile +++ b/games/xbomb/Makefile @@ -7,6 +7,7 @@ PORTNAME= xbomb PORTVERSION= 2.2 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://www.gedanken.demon.co.uk/download-xbomb/ EXTRACT_SUFX= .tgz @@ -14,7 +15,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= Minesweeper with a couple of grid types -USE_XORG= xaw +USE_XORG= xaw7 MAN6= xbomb.6 PLIST_FILES= bin/xbomb \ @@ -26,8 +27,8 @@ PLIST_DIRS= lib/X11/xbomb do-build: cd ${BUILD_WRKSRC} && ${CC} ${CFLAGS} -DLOCALBASE=\"${LOCALBASE}\" \ - `pkg-config --cflags xaw8` *.c -o xbomb \ - `pkg-config --libs xaw8` + `pkg-config --cflags xaw7` *.c -o xbomb \ + `pkg-config --libs xaw7` do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xbomb ${PREFIX}/bin/xbomb diff --git a/games/xconq/Makefile b/games/xconq/Makefile index 4f034b39fd99..55e6a2f4b744 100644 --- a/games/xconq/Makefile +++ b/games/xconq/Makefile @@ -7,7 +7,7 @@ PORTNAME= xconq PORTVERSION= 7.4.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games tcl tk MASTER_SITES= ftp://sources.redhat.com/pub/xconq/ \ ftp://unix.hensa.ac.uk/mirrors/sources.redhat.com/pub/xconq/ diff --git a/games/xfrisk/Makefile b/games/xfrisk/Makefile index d9a048121c05..8aa024dbfddc 100644 --- a/games/xfrisk/Makefile +++ b/games/xfrisk/Makefile @@ -7,7 +7,7 @@ PORTNAME= xfrisk PORTVERSION= 1.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MASTER_SITES= http://tuxick.net/xfrisk/files/ DISTNAME= XFrisk-${PORTVERSION} diff --git a/games/xinvaders/Makefile b/games/xinvaders/Makefile index 05398fea4d20..791fd43e9de1 100644 --- a/games/xinvaders/Makefile +++ b/games/xinvaders/Makefile @@ -7,7 +7,7 @@ PORTNAME= xinvaders PORTVERSION= 2.1.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= games/arcade/invaders diff --git a/games/xjump/Makefile b/games/xjump/Makefile index 60364e1b68e7..5f69367a4d3f 100644 --- a/games/xjump/Makefile +++ b/games/xjump/Makefile @@ -7,7 +7,7 @@ PORTNAME= xjump PORTVERSION= 2.7.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL} DISTNAME= ${PORTNAME}_${PORTVERSION}.orig diff --git a/games/xjumpx/Makefile b/games/xjumpx/Makefile index d6a4b03ce235..2a44c62f5cf4 100644 --- a/games/xjumpx/Makefile +++ b/games/xjumpx/Makefile @@ -7,7 +7,7 @@ PORTNAME= xjumpx PORTVERSION= 1.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= http://fenix.ne.jp/~cdrtk/soft/dl/ diff --git a/games/xoj/Makefile b/games/xoj/Makefile index f54f79b9db3e..4b5fce6a65a2 100644 --- a/games/xoj/Makefile +++ b/games/xoj/Makefile @@ -7,7 +7,7 @@ PORTNAME= xoj PORTVERSION= 1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= X11/demos diff --git a/games/xonix/Makefile b/games/xonix/Makefile index 1425a8b15ec9..5d76f19c7b7d 100644 --- a/games/xonix/Makefile +++ b/games/xonix/Makefile @@ -7,7 +7,7 @@ PORTNAME= xonix PORTVERSION= 1.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= ftp://ftp.interface-business.de/pub/outgoing/ diff --git a/games/xonotic/Makefile b/games/xonotic/Makefile index 989d6d845650..8002759e13b3 100644 --- a/games/xonotic/Makefile +++ b/games/xonotic/Makefile @@ -7,7 +7,7 @@ PORTNAME= nexuiz PORTVERSION= 2.4.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= SF DISTNAME= ${PORTNAME}-${PORTVERSION:S/.//g} diff --git a/games/xpat2/Makefile b/games/xpat2/Makefile index f738e4fa96e5..a0fd765ab6fa 100644 --- a/games/xpat2/Makefile +++ b/games/xpat2/Makefile @@ -7,7 +7,7 @@ PORTNAME= xpat2 PORTVERSION= 1.07 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= games/solitaires diff --git a/games/xquarto/Makefile b/games/xquarto/Makefile index ee495b90acd1..ace1c19e80b7 100644 --- a/games/xquarto/Makefile +++ b/games/xquarto/Makefile @@ -7,7 +7,7 @@ PORTNAME= xquarto PORTVERSION= 1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://www.math.lsa.umich.edu/~mattiasj/games/xquarto/ diff --git a/games/xracer/Makefile b/games/xracer/Makefile index 18d8f52ab921..a6ac9b4bce4b 100644 --- a/games/xracer/Makefile +++ b/games/xracer/Makefile @@ -7,7 +7,7 @@ PORTNAME= xracer PORTVERSION= 0.94 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_FREEBSD_ORG} MASTER_SITE_SUBDIR= distfiles @@ -16,9 +16,9 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${PORTNAME}-data${EXTRACT_SUFX} MAINTAINER= bsdkaffee@gmail.com COMMENT= Awesome WipeOut clone for OpenGL and X11! -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ - glut.4:${PORTSDIR}/graphics/libglut +LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg +USE_GL= glut USE_GMAKE= yes USE_AUTOTOOLS= automake:14 autoconf:213 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ diff --git a/games/xscrabble/Makefile b/games/xscrabble/Makefile index 988bed5bc437..f18824d960f7 100644 --- a/games/xscrabble/Makefile +++ b/games/xscrabble/Makefile @@ -7,6 +7,7 @@ PORTNAME= xscrabble PORTVERSION= 2.12 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ftp://ftp.ac-grenoble.fr/ge/educational_games/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${PORTNAME}_en${EXTRACT_SUFX} diff --git a/games/xshogi/Makefile b/games/xshogi/Makefile index a4a0233d64a4..db8ca1287566 100644 --- a/games/xshogi/Makefile +++ b/games/xshogi/Makefile @@ -7,7 +7,7 @@ PORTNAME= xshogi PORTVERSION= ${GNUSHOGI_PORTVERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= ${GNUSHOGI_MASTER_SITES} MASTER_SITE_SUBDIR= ${GNUSHOGI_MASTER_SITE_SUBDIR} diff --git a/games/xtic/Makefile b/games/xtic/Makefile index 58d96f1997e2..de89209ebe4d 100644 --- a/games/xtic/Makefile +++ b/games/xtic/Makefile @@ -7,7 +7,7 @@ PORTNAME= xtic PORTVERSION= 1.12 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_XCONTRIB} MASTER_SITE_SUBDIR= games diff --git a/games/xtrojka/Makefile b/games/xtrojka/Makefile index 7fbc6c07ae8d..e528c9a51f4d 100644 --- a/games/xtrojka/Makefile +++ b/games/xtrojka/Makefile @@ -7,7 +7,7 @@ PORTNAME= xtrojka PORTVERSION= 1.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= ftp://ftp.funet.fi/pub/unix/games/ DISTNAME= ${PORTNAME} diff --git a/graphics/Coin/Makefile b/graphics/Coin/Makefile index d8bf2ff8941f..adf48cd8fd3a 100644 --- a/graphics/Coin/Makefile +++ b/graphics/Coin/Makefile @@ -7,6 +7,7 @@ PORTNAME= Coin PORTVERSION= 3.0.0 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://ftp.coin3d.org/coin/src/all/ \ ftp://ftp.coin3d.org/pub/coin/src/all/ @@ -18,6 +19,7 @@ LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal \ simage.26:${PORTSDIR}/graphics/simage USE_GL= yes +USE_XORG= xt x11 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-pthread=yes --enable-threadsafe \ --enable-3ds-import --enable-sound \ diff --git a/graphics/clutter/Makefile b/graphics/clutter/Makefile index a9ae51b27a9b..26097977513d 100644 --- a/graphics/clutter/Makefile +++ b/graphics/clutter/Makefile @@ -7,19 +7,20 @@ PORTNAME= clutter PORTVERSION= 0.8.4 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.clutter-project.org/sources/${PORTNAME}/0.8/ MAINTAINER= gnome@FreeBSD.org COMMENT= OpenGL based interactive canvas library -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut \ - json-glib-1.0:${PORTSDIR}/devel/json-glib +LIB_DEPENDS= json-glib-1.0:${PORTSDIR}/devel/json-glib USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 USE_GNOME= pkgconfig gtk20 gnomehack ltverhack gnomeprefix -USE_XORG= xp x11 +USE_GL= gl +USE_XORG= glproto x11 xfixes xdamage xcomposite xi USE_LDCONFIG= yes CONFIGURE_ARGS= --with-x --with-json=check CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" diff --git a/graphics/dri/Makefile b/graphics/dri/Makefile index 4923b70ec1f5..a0d4dde75dd7 100644 --- a/graphics/dri/Makefile +++ b/graphics/dri/Makefile @@ -7,7 +7,6 @@ PORTNAME= dri PORTVERSION= ${MESAVERSION} -PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= graphics @@ -19,40 +18,10 @@ BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend CONFLICTS= dri-6.2.2005* dri-6.5.2006* -MAKE_ENV+= FBSDCC="${CC}" FBSDCXX="${CXX}" \ - FBSDCFLAGS="${CFLAGS}" FBSDCXXFLAGS="${CXXFLAGS}" \ - PTHREAD_LIBS=${PTHREAD_LIBS} - -USE_XORG= x11 - -DRIMODDIR= ${PREFIX}/lib/dri -SRCDIR= mesa - -.if !defined(ARCH) -ARCH!= uname -p -.endif +USE_XORG= glproto x11 xext xxf86vm xdamage xfixes do-install: - ${MKDIR} ${DRIMODDIR} -.if ${ARCH} == i386 - ${INSTALL_PROGRAM} ${WRKSRC}/lib/i810_dri.so ${DRIMODDIR} - ${INSTALL_PROGRAM} ${WRKSRC}/lib/i915_dri.so ${DRIMODDIR} - ${INSTALL_PROGRAM} ${WRKSRC}/lib/i965_dri.so ${DRIMODDIR} - ${INSTALL_PROGRAM} ${WRKSRC}/lib/unichrome_dri.so ${DRIMODDIR} - ${INSTALL_PROGRAM} ${WRKSRC}/lib/tdfx_dri.so ${DRIMODDIR} -.elif ${ARCH} == amd64 - ${INSTALL_PROGRAM} ${WRKSRC}/lib/i915_dri.so ${DRIMODDIR} - ${INSTALL_PROGRAM} ${WRKSRC}/lib/i965_dri.so ${DRIMODDIR} -.endif - ${INSTALL_PROGRAM} ${WRKSRC}/lib/mach64_dri.so ${DRIMODDIR} - ${INSTALL_PROGRAM} ${WRKSRC}/lib/mga_dri.so ${DRIMODDIR} - ${INSTALL_PROGRAM} ${WRKSRC}/lib/r128_dri.so ${DRIMODDIR} - ${INSTALL_PROGRAM} ${WRKSRC}/lib/r200_dri.so ${DRIMODDIR} - ${INSTALL_PROGRAM} ${WRKSRC}/lib/r300_dri.so ${DRIMODDIR} - ${INSTALL_PROGRAM} ${WRKSRC}/lib/radeon_dri.so ${DRIMODDIR} - ${INSTALL_PROGRAM} ${WRKSRC}/lib/savage_dri.so ${DRIMODDIR} - ${INSTALL_PROGRAM} ${WRKSRC}/lib/sis_dri.so ${DRIMODDIR} + cd ${WRKSRC}/src/mesa; ${GMAKE} install-dri .include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk" - .include <bsd.port.mk> diff --git a/graphics/dri/distinfo b/graphics/dri/distinfo index c5fcdf9d65c2..da68c3af0e8a 100644 --- a/graphics/dri/distinfo +++ b/graphics/dri/distinfo @@ -1,3 +1,3 @@ -MD5 (MesaLib-7.0.3.tar.bz2) = e6e6379d7793af40a6bc3ce1bace572e -SHA256 (MesaLib-7.0.3.tar.bz2) = ebdf3448eac8abb56bbfc0b7c015efce8e5d88f10ee3123dcc62c1ff47b62d22 -SIZE (MesaLib-7.0.3.tar.bz2) = 3389327 +MD5 (MesaLib-7.2.tar.bz2) = 04d379292e023df0b0266825cb0dbde5 +SHA256 (MesaLib-7.2.tar.bz2) = a9cc62ab760afeebcb1319a193508734a2d470cab8effab2776a2d3c65bd9cd2 +SIZE (MesaLib-7.2.tar.bz2) = 3341919 diff --git a/graphics/dri/files/patch-sis_context.h b/graphics/dri/files/patch-sis_context.h index 1d79d5f32263..3152e2db0f7d 100644 --- a/graphics/dri/files/patch-sis_context.h +++ b/graphics/dri/files/patch-sis_context.h @@ -1,16 +1,16 @@ ---- src/mesa/drivers/dri/sis/sis_context.h.orig Tue Apr 11 13:41:11 2006 -+++ src/mesa/drivers/dri/sis/sis_context.h Wed Dec 20 18:32:46 2006 -@@ -401,8 +401,20 @@ +--- src/mesa/drivers/dri/sis/sis_context.h.orig 2008-09-22 13:38:53.000000000 +0100 ++++ src/mesa/drivers/dri/sis/sis_context.h 2008-09-22 13:40:51.000000000 +0100 +@@ -401,10 +401,20 @@ #define MMIO_READ(reg) *(volatile GLint *)(smesa->IOBase + (reg)) #define MMIO_READf(reg) *(volatile GLfloat *)(smesa->IOBase + (reg)) --#if defined(__i386__) || defined(__amd64__) +-#if defined(__i386__) || defined(__x86_64__) +#if defined(__alpha__) +#define MMIO_WMB() __asm __volatile("wmb" : : : "memory") -+#elif defined(__amd64__) || defined(__i386__) ++#elif defined(__i386__) || defined(__x86_64__) || defined(__amd64__) #define MMIO_WMB() __asm __volatile("" : : : "memory") -+#elif defined(__ia64__) -+#define MMIO_WMB() __asm __volatile("mf" : : : "memory") + #elif defined(__ia64__) + #define MMIO_WMB() __asm __volatile("mf" : : : "memory") +#elif defined(__powerpc__) +#define MMIO_WMB() __asm __volatile("eieio" : : : "memory") +#elif defined(__sparc64__) diff --git a/graphics/dri/pkg-plist b/graphics/dri/pkg-plist index 10f31ec1d29e..5da5f31f5dad 100644 --- a/graphics/dri/pkg-plist +++ b/graphics/dri/pkg-plist @@ -1,6 +1,8 @@ -%%I386%%lib/dri/i810_dri.so -%%I386_AMD64%%lib/dri/i915_dri.so -%%I386_AMD64%%lib/dri/i965_dri.so +include/GL/internal/dri_interface.h +include/GL/internal/dri_sarea.h +lib/dri/i810_dri.so +lib/dri/i915_dri.so +lib/dri/i965_dri.so lib/dri/mach64_dri.so lib/dri/mga_dri.so lib/dri/r128_dri.so @@ -9,6 +11,10 @@ lib/dri/r300_dri.so lib/dri/radeon_dri.so lib/dri/savage_dri.so lib/dri/sis_dri.so -%%I386%%lib/dri/tdfx_dri.so -%%I386%%lib/dri/unichrome_dri.so +lib/dri/swrast_dri.so +lib/dri/tdfx_dri.so +lib/dri/unichrome_dri.so +libdata/pkgconfig/dri.pc @dirrm lib/dri +@dirrmtry include/GL/internal +@dirrmtry include/GL diff --git a/graphics/driconf/Makefile b/graphics/driconf/Makefile index c20483c78282..729cb88cf606 100644 --- a/graphics/driconf/Makefile +++ b/graphics/driconf/Makefile @@ -7,16 +7,16 @@ PORTNAME= driconf PORTVERSION= 0.9.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://people.freedesktop.org/~fxkuehl/driconf/ MAINTAINER= ports@FreeBSD.org COMMENT= Configuration program for DRI drivers -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-toolkits/py-gtk2 +USE_GL= glut USE_PYTHON= yes NO_BUILD= yes USE_GETTEXT= yes diff --git a/graphics/dynamechs/Makefile b/graphics/dynamechs/Makefile index b4b0e4148769..bd3e16e3d741 100644 --- a/graphics/dynamechs/Makefile +++ b/graphics/dynamechs/Makefile @@ -8,7 +8,7 @@ PORTNAME= dynamechs PORTVERSION= 4.0.p1 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= graphics MASTER_SITES= SF diff --git a/graphics/enblend/Makefile b/graphics/enblend/Makefile index 295e4edfb7c1..66616bd12d30 100644 --- a/graphics/enblend/Makefile +++ b/graphics/enblend/Makefile @@ -7,6 +7,7 @@ PORTNAME= enblend PORTVERSION= 3.1.r20080615 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= vd/enblend diff --git a/graphics/f90gl/Makefile b/graphics/f90gl/Makefile index 74801fae0bab..0338cfb3bb27 100644 --- a/graphics/f90gl/Makefile +++ b/graphics/f90gl/Makefile @@ -7,7 +7,7 @@ PORTNAME= f90gl PORTVERSION= 1.2.13 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= http://math.nist.gov/f90gl/ \ http://math.nist.gov/~WMitchell/papers/:doc diff --git a/graphics/ffff/Makefile b/graphics/ffff/Makefile index d53c02dd6c17..5e57e8644767 100644 --- a/graphics/ffff/Makefile +++ b/graphics/ffff/Makefile @@ -7,7 +7,7 @@ PORTNAME= ffff PORTVERSION= 323 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= SFE DISTNAME= FFFF${PORTVERSION}-src diff --git a/graphics/flashplayer/Makefile b/graphics/flashplayer/Makefile index 5f08d37d39f5..f9fc41f82aa0 100644 --- a/graphics/flashplayer/Makefile +++ b/graphics/flashplayer/Makefile @@ -7,7 +7,7 @@ PORTNAME= flashplayer PORTVERSION= 0.4.13 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= SF/gplflash DISTNAME= gplflash-${PORTVERSION} diff --git a/graphics/fpc-opengl/Makefile b/graphics/fpc-opengl/Makefile index ee2b81495ef9..cbead3c8c2ff 100644 --- a/graphics/fpc-opengl/Makefile +++ b/graphics/fpc-opengl/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ # -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= graphics lang PKGNAMESUFFIX= -opengl diff --git a/graphics/fv/Makefile b/graphics/fv/Makefile index fd8ab4d7e78c..f97a57f0d144 100644 --- a/graphics/fv/Makefile +++ b/graphics/fv/Makefile @@ -7,6 +7,7 @@ PORTNAME= fv PORTVERSION= 1.02 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.eaflux.com/fv/sources/ DISTNAME= ${PORTNAME}-src-${PORTVERSION} diff --git a/graphics/gauche-gl/Makefile b/graphics/gauche-gl/Makefile index 47b7fd1d13b8..20e9b4c4f706 100644 --- a/graphics/gauche-gl/Makefile +++ b/graphics/gauche-gl/Makefile @@ -7,6 +7,7 @@ PORTNAME= gl PORTVERSION= 0.4.4 +PORTREVISION= 1 CATEGORIES= graphics scheme MASTER_SITES= SF PKGNAMEPREFIX= gauche- diff --git a/graphics/geomview/Makefile b/graphics/geomview/Makefile index e1d91044cbd0..4a4c670979c0 100644 --- a/graphics/geomview/Makefile +++ b/graphics/geomview/Makefile @@ -7,6 +7,7 @@ PORTNAME= geomview PORTVERSION= 1.9.4 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF diff --git a/graphics/gle/Makefile b/graphics/gle/Makefile index dcdba2a0d267..cc2f7cb366e7 100644 --- a/graphics/gle/Makefile +++ b/graphics/gle/Makefile @@ -7,7 +7,7 @@ PORTNAME= gle PORTVERSION= 3.1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= SF\ http://linas.org/gle/pub/ \ diff --git a/graphics/glean/Makefile b/graphics/glean/Makefile index 41f4fd4b8cf2..9c7111884a15 100644 --- a/graphics/glean/Makefile +++ b/graphics/glean/Makefile @@ -7,7 +7,7 @@ PORTNAME= glean PORTVERSION= 1.0.20030925 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics benchmarks MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= anholt @@ -22,7 +22,7 @@ LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff PLIST_FILES= bin/glean WRKSRC= ${WRKDIR}/glean/src USE_BZIP2= yes -USE_GL= yes +USE_GL= glut USE_GMAKE= yes MAKE_ENV+= GLEAN_ROOT="${WRKDIR}/glean" ALL_TARGET= install diff --git a/graphics/glexcess/Makefile b/graphics/glexcess/Makefile index 62751a9c98ec..be826cb435c2 100644 --- a/graphics/glexcess/Makefile +++ b/graphics/glexcess/Makefile @@ -7,7 +7,7 @@ PORTNAME= glexcess PORTVERSION= 1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= http://www.glexcess.com/files/ DISTNAME= ${PORTNAME} diff --git a/graphics/glitz/Makefile b/graphics/glitz/Makefile index d03b9af101ea..0eea8f3c2873 100644 --- a/graphics/glitz/Makefile +++ b/graphics/glitz/Makefile @@ -8,7 +8,7 @@ PORTNAME= glitz PORTVERSION= 0.5.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://cairographics.org/snapshots/ @@ -16,6 +16,7 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= OpenGL image compositing library USE_GL= yes +USE_XORG= xt USE_GNOME= pkgconfig gnometarget gnomehack GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/graphics/gltk/Makefile b/graphics/gltk/Makefile index 84fed5eb8141..df65a8ec9f58 100644 --- a/graphics/gltk/Makefile +++ b/graphics/gltk/Makefile @@ -7,7 +7,7 @@ PORTNAME= gltk PORTVERSION= 1.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= ftp://ftp.sgi.com/opengl/contrib/ \ ftp://ftp.u-aizu.ac.jp/pub/os/sgi/misc/ftp.sgi.com/pub/opengl/contrib/ @@ -17,8 +17,7 @@ EXTRACT_SUFX= .tar.Z MAINTAINER= ports@FreeBSD.org COMMENT= An OpenGL/Tk interface -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut - +USE_GL= glut USE_IMAKE= yes do-install: diff --git a/graphics/gltt/Makefile b/graphics/gltt/Makefile index 5e4d2d8da76e..8ed8347696f7 100644 --- a/graphics/gltt/Makefile +++ b/graphics/gltt/Makefile @@ -7,7 +7,7 @@ PORTNAME= gltt PORTVERSION= 2.5.2 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics MASTER_SITES= http://gltt.sourceforge.net/download/ diff --git a/graphics/ivtools/Makefile b/graphics/ivtools/Makefile index dfc16e1fad46..76cb2fe51e22 100644 --- a/graphics/ivtools/Makefile +++ b/graphics/ivtools/Makefile @@ -7,6 +7,7 @@ PORTNAME= ivtools PORTVERSION= 1.2.6 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF EXTRACT_SUFX= .tgz diff --git a/graphics/jasper/Makefile b/graphics/jasper/Makefile index c09c2352bf64..bffe13a42962 100644 --- a/graphics/jasper/Makefile +++ b/graphics/jasper/Makefile @@ -7,7 +7,7 @@ PORTNAME= jasper PORTVERSION= 1.900.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics MASTER_SITES= http://www.ece.uvic.ca/~mdadams/jasper/software/ \ ${MASTER_SITE_IMAGEMAGICK} diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile index eb52337507da..f96ffa253dbc 100644 --- a/graphics/kdegraphics3/Makefile +++ b/graphics/kdegraphics3/Makefile @@ -8,7 +8,7 @@ PORTNAME= kdegraphics PORTVERSION= ${KDE_VERSION} -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= graphics kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -22,7 +22,6 @@ LIB_DEPENDS= art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl \ fontconfig:${PORTSDIR}/x11-fonts/fontconfig \ freetype:${PORTSDIR}/print/freetype2 \ fribidi:${PORTSDIR}/converters/fribidi \ - glut:${PORTSDIR}/graphics/libglut \ lcms:${PORTSDIR}/graphics/lcms \ paper:${PORTSDIR}/print/libpaper \ poppler-qt:${PORTSDIR}/graphics/poppler-qt @@ -32,6 +31,7 @@ CONFLICTS= kolourpaint-[0-9]* USE_KDELIBS_VER=3 PREFIX= ${KDE_PREFIX} +USE_GL= glut USE_BZIP2= yes USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes diff --git a/graphics/kdegraphics4/Makefile b/graphics/kdegraphics4/Makefile index b11e999eb26f..a23cc2066aa2 100644 --- a/graphics/kdegraphics4/Makefile +++ b/graphics/kdegraphics4/Makefile @@ -6,6 +6,7 @@ PORTNAME= kdegraphics PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= graphics kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src diff --git a/graphics/landscape/Makefile b/graphics/landscape/Makefile index 625c332e5327..2faa8a8ff7f5 100644 --- a/graphics/landscape/Makefile +++ b/graphics/landscape/Makefile @@ -7,7 +7,7 @@ PORTNAME= landscape PORTVERSION= 0.7 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= graphics kde MASTER_SITES= http://www.witchspace.com/files/ @@ -15,8 +15,8 @@ MAINTAINER= jon@witchspace.com COMMENT= A program for generating and rendering fractal landscapes BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut +USE_GL= glut PLIST_FILES= bin/landscape USE_KDELIBS_VER= 3 QTDIR?= ${QT_PREFIX} diff --git a/graphics/lib3ds/Makefile b/graphics/lib3ds/Makefile index 8b4309a710c9..46dbd2e2e813 100644 --- a/graphics/lib3ds/Makefile +++ b/graphics/lib3ds/Makefile @@ -7,6 +7,7 @@ PORTNAME= lib3ds PORTVERSION= 1.3.0 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF diff --git a/graphics/libGL/Makefile b/graphics/libGL/Makefile index 78b5f0208d4a..2caa24c4735e 100644 --- a/graphics/libGL/Makefile +++ b/graphics/libGL/Makefile @@ -12,14 +12,14 @@ CATEGORIES= graphics COMMENT= OpenGL library that renders using GLX or DRI BUILD_DEPENDS+= makedepend:${PORTSDIR}/devel/makedepend -LIB_DEPENDS+= drm:${PORTSDIR}/graphics/libdrm +LIB_DEPENDS+= drm:${PORTSDIR}/graphics/libdrm \ + expat.6:${PORTSDIR}/textproc/expat2 -USE_XORG= glproto xxf86vm xext xfixes xdamage -CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/drm +USE_XORG= glproto x11 xext xxf86vm xdamage xfixes -SRCDIR= glx/x11 -HEADERS= gl.h glext.h glx.h glxext.h -HEADERSDIR= include/GL +do-install: + ${RM} ${WRKSRC}/include/GL/glu*.h + cd ${WRKSRC}/src/mesa; ${GMAKE} install-libgl .include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk" .include <bsd.port.mk> diff --git a/graphics/libGL/bsd.mesalib.mk b/graphics/libGL/bsd.mesalib.mk index 78245755aa90..e4860d4e1766 100644 --- a/graphics/libGL/bsd.mesalib.mk +++ b/graphics/libGL/bsd.mesalib.mk @@ -17,75 +17,90 @@ # $FreeBSD$ # -MESAVERSION= 7.0.3 +MESAVERSION= 7.2 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ ftp://ftp.fu-berlin.de/pub/unix/X11/graphics/Mesa/ MASTER_SITE_SUBDIR= mesa3d -DISTFILES= MesaLib-${PORTVERSION}${EXTRACT_SUFX} +DISTFILES= MesaLib-${MESAVERSION}${EXTRACT_SUFX} MAINTAINER= x11@FreeBSD.org USE_BZIP2= yes USE_GMAKE= yes USE_LDCONFIG= yes +GNU_CONFIGURE= yes -MAKE_ARGS= SHELL=${SH} -CFLAGS+= -DUSE_XSHM -DHZ=100 +CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include \ + LDFLAGS=-L${LOCALBASE}/lib -PREFIX= ${LOCALBASE} -FILESDIR= ${.CURDIR}/../../graphics/libGL/files -WRKSRC= ${WRKDIR}/Mesa-${PORTVERSION} -CONFDIR= ${WRKSRC}/configs +ALL_TARGET= default -SHVER?= 1 +#MAKE_ARGS= SHELL=${SH} +#CFLAGS+= -DUSE_XSHM -DHZ=100 + +#FILESDIR= ${.CURDIR}/../../graphics/libGL/files +WRKSRC= ${WRKDIR}/Mesa-${MESAVERSION} .if !defined(ARCH) ARCH!= uname -p .endif -.if ${ARCH} == i386 -PLIST_SUB+= I386="" -PLIST_SUB+= I386_AMD64="" -ALL_TARGET= freebsd-dri-x86 -.elif ${ARCH} == amd64 -PLIST_SUB+= I386="@comment " -PLIST_SUB+= I386_AMD64="" -ALL_TARGET= freebsd-dri-amd64 +.if ${ARCH} == alpha +FAST_MATH= .else -PLIST_SUB+= I386="@comment " -PLIST_SUB+= I386_AMD64="@comment " -ALL_TARGET= freebsd-dri +FAST_MATH= -ffast-math .endif -.if ${ARCH} == alpha -FAST_MATH= +COMPONENT= ${PORTNAME:L:C/^lib//:C/mesa-//} + +.if ${COMPONENT:Mglut} == "" +. if ${COMPONENT:Mglu} == "" +CONFIGURE_ARGS+= --disable-glu --disable-glut +. else +CONFIGURE_ARGS+= --disable-glut +. endif .else -FAST_MATH= -ffast-math +DISTFILES+= MesaGLUT-${MESAVERSION}${EXTRACT_SUFX} .endif -pre-patch: - @${REINPLACE_CMD} \ - -e '/^CC =/d' -e '/^CXX =/d' \ - -e 's|/usr/X11R6|${LOCALBASE}|g' \ - -e 's|/usr/local|${LOCALBASE}|g' \ - -e 's|-lpthread|${PTHREAD_LIBS}|g' \ - -e 's|-ffast-math|${FAST_MATH}|g' \ - -e 's|CFLAGS = |CFLAGS = ${CFLAGS} |g' \ - -e 's|OPT_FLAGS = .*|OPT_FLAGS = ${CFLAGS}|g' \ - -e "s|SRC_DIRS = .*|SRC_DIRS = ${SRCDIR}|g" \ - -e 's|-DHAVE_POSIX_MEMALIGN||' \ - ${CONFDIR}/freebsd-dri - @${REINPLACE_CMD} \ - -e 's|^\(MKDEP_OPTIONS.*\)|\1 -- -I${LOCALBASE}/include|' \ - -e 's|^\(MKLIB_OPTIONS.*\)|\1 -L${LOCALBASE}/lib|' \ - -e 's|^DRI_DRIVER_INSTALL_DIR.*|DRI_DRIVER_INSTALL_DIR = ${LOCALBASE}/lib/dri|' \ - ${CONFDIR}/default +.if ${COMPONENT:Mglw} == "" +CONFIGURE_ARGS+= --disable-glw +.else +CONFIGURE_ARGS+= --enable-motif +.endif -.if !target(do-install) -do-install: - ${MKDIR} ${PREFIX}/include/GL/ -.for i in ${HEADERS} - ${INSTALL_DATA} ${WRKSRC}/${HEADERSDIR}/${i} ${PREFIX}/include/GL/ -.endfor - ${INSTALL_PROGRAM} ${WRKSRC}/lib/${PORTNAME}.so.${SHVER} ${PREFIX}/lib - ${LN} -sf ${PORTNAME}.so.${SHVER} ${PREFIX}/lib/${PORTNAME}.so +.if ${COMPONENT:Mdemos} == "" +CONFIGURE_ARGS+= --with-demos=no +.else +DISTFILES+= MesaDemos-${MESAVERSION}${EXTRACT_SUFX} +CONFIGURE_ARGS+= --with-demos=demos,xdemos +.endif + +.if ${COMPONENT:Mdri} == "" +CONFIGURE_ARGS+= --with-dri-drivers=no +.endif + +.if defined(WITHOUT_XCB) +CONFIGURE_ARGS+= --disable-xcb +.else +CONFIGURE_ARGS+= --enable-xcb +.endif + +post-patch: + @${REINPLACE_CMD} -e 's|-ffast-math|${FAST_MATH}|' -e 's|x86_64|amd64|' \ + ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|[$$](INSTALL_LIB_DIR)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \ + ${WRKSRC}/src/glu/Makefile \ + ${WRKSRC}/src/glw/Makefile \ + ${WRKSRC}/src/mesa/Makefile \ + ${WRKSRC}/src/mesa/drivers/dri/Makefile +.if ${COMPONENT:Mglut} != "" + @${REINPLACE_CMD} -e 's|[$$](INSTALL_LIB_DIR)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \ + ${WRKSRC}/src/glut/glx/Makefile +.endif +.if ${COMPONENT:Mdemos} != "" + @${REINPLACE_CMD} -e 's|../images/|${DATADIR}/images/|g' \ + -e 's|geartrain.dat|${DATADIR}/data/geartrain.dat|g' \ + -e 's|terrain.dat|${DATADIR}/data/terrain.dat|g' \ + -e 's|isosurf.dat|${DATADIR}/data/isosurf.dat|g' \ + ${WRKSRC}/progs/demos/*.c ${WRKSRC}/progs/xdemos/*.c .endif diff --git a/graphics/libGL/distinfo b/graphics/libGL/distinfo index c5fcdf9d65c2..da68c3af0e8a 100644 --- a/graphics/libGL/distinfo +++ b/graphics/libGL/distinfo @@ -1,3 +1,3 @@ -MD5 (MesaLib-7.0.3.tar.bz2) = e6e6379d7793af40a6bc3ce1bace572e -SHA256 (MesaLib-7.0.3.tar.bz2) = ebdf3448eac8abb56bbfc0b7c015efce8e5d88f10ee3123dcc62c1ff47b62d22 -SIZE (MesaLib-7.0.3.tar.bz2) = 3389327 +MD5 (MesaLib-7.2.tar.bz2) = 04d379292e023df0b0266825cb0dbde5 +SHA256 (MesaLib-7.2.tar.bz2) = a9cc62ab760afeebcb1319a193508734a2d470cab8effab2776a2d3c65bd9cd2 +SIZE (MesaLib-7.2.tar.bz2) = 3341919 diff --git a/graphics/libGL/pkg-plist b/graphics/libGL/pkg-plist index f3fd7c6a6ea7..e3ab0eb7c6be 100644 --- a/graphics/libGL/pkg-plist +++ b/graphics/libGL/pkg-plist @@ -1,7 +1,26 @@ +include/GL/amesa.h +include/GL/dmesa.h +include/GL/fxmesa.h +include/GL/ggimesa.h +include/GL/gl_mangle.h include/GL/gl.h include/GL/glext.h +include/GL/glfbdev.h +include/GL/glx_mangle.h include/GL/glx.h include/GL/glxext.h +include/GL/mesa_wgl.h +include/GL/mglmesa.h +include/GL/osmesa.h +include/GL/svgamesa.h +include/GL/uglglutshapes.h +include/GL/uglmesa.h +include/GL/vms_x_fix.h +include/GL/wmesa.h +include/GL/xmesa.h +include/GL/xmesa_x.h +include/GL/xmesa_xf86.h lib/libGL.so lib/libGL.so.1 +libdata/pkgconfig/gl.pc @dirrmtry include/GL diff --git a/graphics/libGLU/Makefile b/graphics/libGLU/Makefile index e808d6ac3e3e..dace0ab723c7 100644 --- a/graphics/libGLU/Makefile +++ b/graphics/libGLU/Makefile @@ -12,11 +12,12 @@ CATEGORIES= graphics COMMENT= OpenGL utility library USE_GL= gl -USE_XORG= xmu xi +USE_XORG= glproto x11 xext xxf86vm xdamage xfixes -SRCDIR= glu/sgi -HEADERS= glu.h -HEADERSDIR= include/GL +do-install: + cd ${WRKSRC}/src/glu; ${GMAKE} install + ${INSTALL_DATA} ${WRKSRC}/include/GL/glu*.h ${PREFIX}/include/GL/ + cd ${WRKSRC}/src/glu; ${GMAKE} install .include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk" .include <bsd.port.mk> diff --git a/graphics/libGLU/distinfo b/graphics/libGLU/distinfo index c5fcdf9d65c2..da68c3af0e8a 100644 --- a/graphics/libGLU/distinfo +++ b/graphics/libGLU/distinfo @@ -1,3 +1,3 @@ -MD5 (MesaLib-7.0.3.tar.bz2) = e6e6379d7793af40a6bc3ce1bace572e -SHA256 (MesaLib-7.0.3.tar.bz2) = ebdf3448eac8abb56bbfc0b7c015efce8e5d88f10ee3123dcc62c1ff47b62d22 -SIZE (MesaLib-7.0.3.tar.bz2) = 3389327 +MD5 (MesaLib-7.2.tar.bz2) = 04d379292e023df0b0266825cb0dbde5 +SHA256 (MesaLib-7.2.tar.bz2) = a9cc62ab760afeebcb1319a193508734a2d470cab8effab2776a2d3c65bd9cd2 +SIZE (MesaLib-7.2.tar.bz2) = 3341919 diff --git a/graphics/libGLU/pkg-plist b/graphics/libGLU/pkg-plist index addb2a1722dc..330c54e13885 100644 --- a/graphics/libGLU/pkg-plist +++ b/graphics/libGLU/pkg-plist @@ -1,3 +1,5 @@ include/GL/glu.h +include/GL/glu_mangle.h lib/libGLU.so lib/libGLU.so.1 +libdata/pkgconfig/glu.pc diff --git a/graphics/libGLw/Makefile b/graphics/libGLw/Makefile index 691d6bb4a341..b08d22647935 100644 --- a/graphics/libGLw/Makefile +++ b/graphics/libGLw/Makefile @@ -15,13 +15,10 @@ BUILD_DEPENDS+= makedepend:${PORTSDIR}/devel/makedepend LIB_DEPENDS+= Xm.3:${PORTSDIR}/x11-toolkits/open-motif USE_GL= gl -USE_XORG= xt +USE_XORG= glproto xt x11 xext xxf86vm xdamage xfixes -CFLAGS+= -D__GLX_MOTIF=1 -SRCDIR= glw - -HEADERS= GLwDrawA.h GLwDrawAP.h GLwMDrawA.h GLwMDrawAP.h -HEADERSDIR= src/glw +do-install: + cd ${WRKSRC}/src/glw; ${GMAKE} install .include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk" .include <bsd.port.mk> diff --git a/graphics/libGLw/distinfo b/graphics/libGLw/distinfo index c5fcdf9d65c2..da68c3af0e8a 100644 --- a/graphics/libGLw/distinfo +++ b/graphics/libGLw/distinfo @@ -1,3 +1,3 @@ -MD5 (MesaLib-7.0.3.tar.bz2) = e6e6379d7793af40a6bc3ce1bace572e -SHA256 (MesaLib-7.0.3.tar.bz2) = ebdf3448eac8abb56bbfc0b7c015efce8e5d88f10ee3123dcc62c1ff47b62d22 -SIZE (MesaLib-7.0.3.tar.bz2) = 3389327 +MD5 (MesaLib-7.2.tar.bz2) = 04d379292e023df0b0266825cb0dbde5 +SHA256 (MesaLib-7.2.tar.bz2) = a9cc62ab760afeebcb1319a193508734a2d470cab8effab2776a2d3c65bd9cd2 +SIZE (MesaLib-7.2.tar.bz2) = 3341919 diff --git a/graphics/libGLw/files/patch-glw-GLwDrawA.c b/graphics/libGLw/files/patch-glw-GLwDrawA.c deleted file mode 100644 index fac6f15b4823..000000000000 --- a/graphics/libGLw/files/patch-glw-GLwDrawA.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/glw/GLwDrawA.c.orig Tue Mar 13 21:11:41 2007 -+++ src/glw/GLwDrawA.c Tue Mar 13 21:12:38 2007 -@@ -668,7 +668,7 @@ - #endif - - --#ifndef __GLX_MOTIF -+#ifdef __GLX_MOTIF - - /* Make context current */ - void GLwDrawingAreaMakeCurrent(Widget w,GLXContext ctx){ diff --git a/graphics/libGLw/pkg-plist b/graphics/libGLw/pkg-plist index a3105d8fd45f..211b58674677 100644 --- a/graphics/libGLw/pkg-plist +++ b/graphics/libGLw/pkg-plist @@ -4,3 +4,5 @@ include/GL/GLwMDrawA.h include/GL/GLwMDrawAP.h lib/libGLw.so lib/libGLw.so.1 +libdata/pkgconfig/glw.pc +@dirrmtry include/GL diff --git a/graphics/libaux/Makefile b/graphics/libaux/Makefile index f7dbfac48e51..b6be89de1dd0 100644 --- a/graphics/libaux/Makefile +++ b/graphics/libaux/Makefile @@ -7,7 +7,7 @@ PORTNAME= libaux PORTVERSION= 1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= http://www.freebsdbrasil.com.br/~jmelo/ DISTFILES= libaux${EXTRACT_SUFX} libtk${EXTRACT_SUFX} @@ -15,10 +15,9 @@ DISTFILES= libaux${EXTRACT_SUFX} libtk${EXTRACT_SUFX} MAINTAINER= ports@FreeBSD.org COMMENT= A Nano Window Toolkit and Auxiliary Library for OpenGL -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut - WRKSRC= ${WRKDIR}/${PORTNAME} +USE_GL= glut USE_IMAKE= yes do-install: diff --git a/graphics/libdrm/Makefile b/graphics/libdrm/Makefile index 8d66b0357aac..42c700bcdef6 100644 --- a/graphics/libdrm/Makefile +++ b/graphics/libdrm/Makefile @@ -6,19 +6,22 @@ # PORTNAME= libdrm -PORTVERSION= 2.3.1 +PORTVERSION= 2.4.3 CATEGORIES= graphics x11 MASTER_SITES= http://dri.freedesktop.org/libdrm/ MAINTAINER= x11@FreeBSD.org COMMENT= Userspace interface to kernel Direct Rendering Module services +BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:${PORTSDIR}/devel/libpthread-stubs +RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:${PORTSDIR}/devel/libpthread-stubs + USE_BZIP2= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes pre-patch: - ${REINPLACE_CMD} 's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|g' \ + @${REINPLACE_CMD} 's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|g' \ ${WRKSRC}/configure .include <bsd.port.mk> diff --git a/graphics/libdrm/distinfo b/graphics/libdrm/distinfo index 985728ce3a8f..0ebb35f8ef91 100644 --- a/graphics/libdrm/distinfo +++ b/graphics/libdrm/distinfo @@ -1,3 +1,3 @@ -MD5 (libdrm-2.3.1.tar.bz2) = 620fe7dd02c3236c3e9881a3a238173d -SHA256 (libdrm-2.3.1.tar.bz2) = ddfd398383729707846e1f1689e9acb3bc672e4f255a632c8f0d0c55ddf8718c -SIZE (libdrm-2.3.1.tar.bz2) = 306013 +MD5 (libdrm-2.4.3.tar.bz2) = 8a4a46eb3dfcccc70af64b5ea240e71f +SHA256 (libdrm-2.4.3.tar.bz2) = f884594f29df157e11aabbc8574972c9132dd85edfc0f6de30a4311c2f36c409 +SIZE (libdrm-2.4.3.tar.bz2) = 340298 diff --git a/graphics/libdrm/pkg-plist b/graphics/libdrm/pkg-plist index 4e76f5cc5923..cc5bd8425d37 100644 --- a/graphics/libdrm/pkg-plist +++ b/graphics/libdrm/pkg-plist @@ -1,8 +1,10 @@ include/drm/drm.h +include/drm/drm_mode.h include/drm/drm_sarea.h include/drm/i915_drm.h include/drm/mach64_drm.h include/drm/mga_drm.h +include/drm/nouveau_drm.h include/drm/r128_drm.h include/drm/r300_reg.h include/drm/radeon_drm.h @@ -10,9 +12,15 @@ include/drm/savage_drm.h include/drm/sis_drm.h include/drm/via_3d_reg.h include/drm/via_drm.h +include/drm/xgi_drm.h +include/intel_bufmgr.h include/xf86drm.h +include/xf86drmMode.h lib/libdrm.la lib/libdrm.so lib/libdrm.so.2 +lib/libdrm_intel.la +lib/libdrm_intel.so +lib/libdrm_intel.so.1 libdata/pkgconfig/libdrm.pc @dirrm include/drm diff --git a/graphics/libglut/Makefile b/graphics/libglut/Makefile index 1a045801d818..e56f68625fe2 100644 --- a/graphics/libglut/Makefile +++ b/graphics/libglut/Makefile @@ -6,25 +6,18 @@ # PORTNAME= libglut -PORTVERSION= 7.0.3 +PORTVERSION= ${MESAVERSION} CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= mesa3d -DISTNAME= MesaGLUT-${PORTVERSION} MAINTAINER= shaun@FreeBSD.org COMMENT= OpenGL utility toolkit -USE_BZIP2= yes USE_LDCONFIG= yes USE_GL= glu +USE_XORG= glproto x11 xext xxf86vm xdamage xfixes xi xmu -WRKSRC= ${WRKDIR}/Mesa-${PORTVERSION}/src/glut/glx - -pre-patch: - ${CP} ${FILESDIR}/Makefile ${WRKSRC}/ - -pre-install: - @${MKDIR} ${PREFIX}/include/GL +do-install: + cd ${WRKSRC}/src/glut/glx; ${GMAKE} install +.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk" .include <bsd.port.mk> diff --git a/graphics/libglut/distinfo b/graphics/libglut/distinfo index 21ac8e0ba807..799cf9fc2dbe 100644 --- a/graphics/libglut/distinfo +++ b/graphics/libglut/distinfo @@ -1,3 +1,6 @@ -MD5 (MesaGLUT-7.0.3.tar.bz2) = 0ff23c4e91b238abae63a5fc9fa003e7 -SHA256 (MesaGLUT-7.0.3.tar.bz2) = edb40aec6c5af1b59a6cac05e7e93040c74500818681d288c89b5c5d56a45cae -SIZE (MesaGLUT-7.0.3.tar.bz2) = 329421 +MD5 (MesaLib-7.2.tar.bz2) = 04d379292e023df0b0266825cb0dbde5 +SHA256 (MesaLib-7.2.tar.bz2) = a9cc62ab760afeebcb1319a193508734a2d470cab8effab2776a2d3c65bd9cd2 +SIZE (MesaLib-7.2.tar.bz2) = 3341919 +MD5 (MesaGLUT-7.2.tar.bz2) = f67daf93e12c4a459703bbf3e4004e31 +SHA256 (MesaGLUT-7.2.tar.bz2) = 33c51e5f0971c0da568c13b6a7f68d77ef3e0b0ec5c5758f8198ef37320daafe +SIZE (MesaGLUT-7.2.tar.bz2) = 327717 diff --git a/graphics/libglut/pkg-plist b/graphics/libglut/pkg-plist index bd3da1fab8b1..27f711bdc740 100644 --- a/graphics/libglut/pkg-plist +++ b/graphics/libglut/pkg-plist @@ -1,6 +1,5 @@ include/GL/glut.h -include/GL/glutf90.h -lib/libglut.a lib/libglut.so -lib/libglut.so.4 +lib/libglut.so.3 +libdata/pkgconfig/glut.pc @dirrmtry include/GL diff --git a/graphics/libv3d/Makefile b/graphics/libv3d/Makefile index 8edbc87d4803..d6b589ea674f 100644 --- a/graphics/libv3d/Makefile +++ b/graphics/libv3d/Makefile @@ -8,7 +8,7 @@ PORTNAME= libv3d PORTVERSION= 0.1.14 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= http://wolfpack.twu.net/users/wolfpack/ EXTRACT_SUFX= .tgz @@ -16,8 +16,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= V3D IO Library -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut - +USE_GL= glut HAS_CONFIGURE= yes CONFIGURE_ARGS= UNIX --prefix=${PREFIX} USE_GMAKE= yes diff --git a/graphics/libwpcg/Makefile b/graphics/libwpcg/Makefile index 45ac3a23eba3..ef60c9788d8f 100644 --- a/graphics/libwpcg/Makefile +++ b/graphics/libwpcg/Makefile @@ -8,7 +8,7 @@ PORTNAME= libwpcg PORTVERSION= 0.9.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= http://www.paassen.tmfweb.nl/ DISTNAME= libWPCG-${PORTVERSION} diff --git a/graphics/makehuman/Makefile b/graphics/makehuman/Makefile index b5b527b45a5b..0b24d16e3d87 100644 --- a/graphics/makehuman/Makefile +++ b/graphics/makehuman/Makefile @@ -7,7 +7,7 @@ PORTNAME= makehuman DISTVERSION= 0.9.1-rc1a -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= SF diff --git a/graphics/mesa-demos/Makefile b/graphics/mesa-demos/Makefile index 203bdc13ec1b..518a4261e661 100644 --- a/graphics/mesa-demos/Makefile +++ b/graphics/mesa-demos/Makefile @@ -6,88 +6,39 @@ # PORTNAME= demos -PORTVERSION= 7.0.4 +PORTVERSION= ${MESAVERSION} CATEGORIES= graphics -MASTER_SITES= SF -MASTER_SITE_SUBDIR= mesa3d PKGNAMEPREFIX= mesa- -DISTFILES= MesaDemos-${PORTVERSION}${EXTRACT_SUFX} \ - MesaLib-${PORTVERSION}${EXTRACT_SUFX} MAINTAINER= araujo@FreeBSD.org COMMENT= OpenGL demos distributed with Mesa -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut +USE_GL= glu glut +USE_XORG= glproto x11 xext xxf86vm xdamage xfixes -USE_BZIP2= yes -USE_GMAKE= yes -MAKE_ARGS= SHELL=${SH} \ - SUBDIRS="progs/demos progs/xdemos" -MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" -ALL_TARGET= default -WRKSRC= ${WRKDIR}/Mesa-${PORTVERSION} -DATADIR= ${PREFIX}/share/mesa-demos - -DEMO_PROGS= arbfplight arbfslight arbocclude bounce clearspd cubemap \ - drawpix engine fire fogcoord fplight fslight gamma gearbox \ - gears geartrain glinfo gloss glslnoise gltestperf glutfx \ - ipers isosurf lodbias morph3d multiarb paltex pointblast \ - ray readpix reflect renormal shadowtex singlebuffer spectex \ - spriteblast stex3d streaming_rect teapot terrain tessdemo \ - texcyl texdown texenv texobj trispd tunnel tunnel2 vao_demo \ - winpos - -DEMO_IMAGES= arch.rgb bw.rgb girl.rgb girl2.rgb reflect.rgb s128.rgb \ - tile.rgb tree2.rgba tree3.rgb wrs_logo.rgb -DEMO_DATA= geartrain.dat isosurf.dat terrain.dat - -XDEMO_PROGS= glthreads glxcontexts glxdemo glxgears glxgears_fbconfig \ - glxheads glxinfo glxpbdemo glxpixmap glxswapcontrol manywin \ - offset overlay pbdemo pbinfo wincopy xfont xrotfontdemo - -# Generate packing list -PLIST_FILES= -.for prog in ${DEMO_PROGS} -PLIST_FILES+= bin/${prog} -.endfor -.for prog in ${XDEMO_PROGS} -PLIST_FILES+= bin/${prog} -.endfor -.for img in ${DEMO_IMAGES} -PLIST_FILES+= %%DATADIR%%/images/${img} -.endfor -.for dat in ${DEMO_DATA} -PLIST_FILES+= %%DATADIR%%/data/${dat} -.endfor -PLIST_DIRS= %%DATADIR%%/images %%DATADIR%%/data %%DATADIR%% - -post-extract: - ${CP} ${FILESDIR}/config ${WRKSRC}/configs/current - ${REINPLACE_CMD} -e 's|../images/|${DATADIR}/images/|g' \ - -e 's|geartrain.dat|${DATADIR}/data/geartrain.dat|g' \ - -e 's|terrain.dat|${DATADIR}/data/terrain.dat|g' \ - -e 's|isosurf.dat|${DATADIR}/data/isosurf.dat|g' \ - ${WRKSRC}/progs/demos/*.c ${WRKSRC}/progs/xdemos/*.c +DATADIR= ${PREFIX}/share/${PKGNAMEPREFIX}${PORTNAME} do-install: - @for prog in ${DEMO_PROGS}; do \ - ${INSTALL_PROGRAM} ${WRKSRC}/progs/demos/$$prog \ - ${PREFIX}/bin ; \ - done - @for prog in ${XDEMO_PROGS}; do \ - ${INSTALL_PROGRAM} ${WRKSRC}/progs/xdemos/$$prog \ - ${PREFIX}/bin ; \ + @for i in demos xdemos; do \ + cd ${WRKSRC}/progs/$$i; \ + for j in `${MAKE} -V PROGS`; do \ + echo ${INSTALL_PROGRAM} $$j ${PREFIX}/bin; \ + ${INSTALL_PROGRAM} $$j ${PREFIX}/bin; \ + done; \ done ${MKDIR} ${DATADIR}/images ${DATADIR}/data - @for img in ${DEMO_IMAGES}; do \ - ${INSTALL_DATA} ${WRKSRC}/progs/images/$$img \ - ${DATADIR}/images ; \ - done - @for dat in ${DEMO_DATA}; do \ - ${INSTALL_DATA} ${WRKSRC}/progs/demos/$$dat ${DATADIR}/data ; \ - done - + @cd ${WRKSRC}/progs/images; \ + for i in `ls *.rgb*`; do \ + echo ${INSTALL_DATA} $$i ${DATADIR}/images; \ + ${INSTALL_DATA} $$i ${DATADIR}/images; \ + done + @cd ${WRKSRC}/progs/demos; \ + for i in `ls *.dat`; do \ + echo ${INSTALL_DATA} $$i ${DATADIR}/data; \ + ${INSTALL_DATA} $$i ${DATADIR}/data; \ + done + +.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk" .include <bsd.port.pre.mk> .if defined(WITH_NVIDIA_GL) diff --git a/graphics/mesa-demos/distinfo b/graphics/mesa-demos/distinfo index dc4d90323853..f30869aa90e4 100644 --- a/graphics/mesa-demos/distinfo +++ b/graphics/mesa-demos/distinfo @@ -1,6 +1,6 @@ -MD5 (MesaDemos-7.0.4.tar.bz2) = c1215b31c5f7b85f81eed3bfba07d556 -SHA256 (MesaDemos-7.0.4.tar.bz2) = 90830d6771821ac519a160cf7065119fcdb4e077ee5a66ce30bf0d4988b0e77a -SIZE (MesaDemos-7.0.4.tar.bz2) = 1341624 -MD5 (MesaLib-7.0.4.tar.bz2) = 8d7bacbe0234742a5d08c8088c4619e9 -SHA256 (MesaLib-7.0.4.tar.bz2) = 93fc5f882defc02537e972c6c31616d271d174090179b1697701044989fe29cd -SIZE (MesaLib-7.0.4.tar.bz2) = 3414357 +MD5 (MesaLib-7.2.tar.bz2) = 04d379292e023df0b0266825cb0dbde5 +SHA256 (MesaLib-7.2.tar.bz2) = a9cc62ab760afeebcb1319a193508734a2d470cab8effab2776a2d3c65bd9cd2 +SIZE (MesaLib-7.2.tar.bz2) = 3341919 +MD5 (MesaDemos-7.2.tar.bz2) = 22e03dc4038cd63f32c21eb60994892b +SHA256 (MesaDemos-7.2.tar.bz2) = 3d73988ad3e87f6084a4593cc6b3aac63aca3e893d3e9409d892a6f51558e4c4 +SIZE (MesaDemos-7.2.tar.bz2) = 1360304 diff --git a/graphics/mesa-demos/pkg-plist b/graphics/mesa-demos/pkg-plist new file mode 100644 index 000000000000..ac2bb139d53d --- /dev/null +++ b/graphics/mesa-demos/pkg-plist @@ -0,0 +1,92 @@ +bin/arbfplight +bin/arbfslight +bin/arbocclude +bin/bounce +bin/clearspd +bin/copypix +bin/corender +bin/cubemap +bin/drawpix +bin/engine +bin/fbo_firecube +bin/fire +bin/fogcoord +bin/fplight +bin/fslight +bin/gamma +bin/gearbox +bin/gears +bin/geartrain +bin/glinfo +bin/gloss +bin/glslnoise +bin/gltestperf +bin/glthreads +bin/glutfx +bin/glxcontexts +bin/glxdemo +bin/glxgears +bin/glxgears_fbconfig +bin/glxgears_pixmap +bin/glxheads +bin/glxinfo +bin/glxpbdemo +bin/glxpixmap +bin/glxsnoop +bin/glxswapcontrol +bin/ipers +bin/isosurf +bin/lodbias +bin/manywin +bin/morph3d +bin/multiarb +bin/offset +bin/overlay +bin/paltex +bin/pbdemo +bin/pbinfo +bin/pointblast +bin/rain +bin/ray +bin/readpix +bin/reflect +bin/renormal +bin/shadowtex +bin/sharedtex +bin/singlebuffer +bin/spectex +bin/spriteblast +bin/stex3d +bin/streaming_rect +bin/teapot +bin/terrain +bin/tessdemo +bin/texcyl +bin/texdown +bin/texenv +bin/texobj +bin/texture_from_pixmap +bin/trispd +bin/tunnel +bin/tunnel2 +bin/vao_demo +bin/wincopy +bin/winpos +bin/xfont +bin/xrotfontdemo +%%DATADIR%%/data/geartrain.dat +%%DATADIR%%/data/isosurf.dat +%%DATADIR%%/data/terrain.dat +%%DATADIR%%/images/arch.rgb +%%DATADIR%%/images/bw.rgb +%%DATADIR%%/images/girl.rgb +%%DATADIR%%/images/girl2.rgb +%%DATADIR%%/images/reflect.rgb +%%DATADIR%%/images/s128.rgb +%%DATADIR%%/images/tile.rgb +%%DATADIR%%/images/tree2.rgba +%%DATADIR%%/images/tree3.rgb +%%DATADIR%%/images/wrs_logo.rgb +@dirrm %%DATADIR%%/images +@dirrm %%DATADIR%%/data +@dirrm %%DATADIR%% diff --git a/graphics/mhgui/Makefile b/graphics/mhgui/Makefile index d1aba141bba7..482d93314e11 100644 --- a/graphics/mhgui/Makefile +++ b/graphics/mhgui/Makefile @@ -7,6 +7,7 @@ PORTNAME= mhgui PORTVERSION= 0.2 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF MASTER_SITE_SUBDIR= makehuman @@ -14,15 +15,14 @@ MASTER_SITE_SUBDIR= makehuman MAINTAINER= amdmi3@FreeBSD.org COMMENT= GUI widget library for MakeHuman -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut \ - animorph.0:${PORTSDIR}/graphics/animorph \ +LIB_DEPENDS= animorph.0:${PORTSDIR}/graphics/animorph \ png.5:${PORTSDIR}/graphics/png GNU_CONFIGURE= yes USE_GMAKE= yes USE_GNOME= pkgconfig USE_LDCONFIG= yes -USE_GL= yes +USE_GL= glut CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \ CPPFLAGS="-I${LOCALBASE}/include" diff --git a/graphics/morpheus/Makefile b/graphics/morpheus/Makefile index 1779a1efdbc4..b532c3c598b9 100644 --- a/graphics/morpheus/Makefile +++ b/graphics/morpheus/Makefile @@ -7,7 +7,7 @@ PORTNAME= morpheus PORTVERSION= 0.3 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics gnome MASTER_SITES= http://www.winnicki.net/morpheus/meat/ diff --git a/graphics/mxp/Makefile b/graphics/mxp/Makefile index 8b5d3dbfe066..9c42174cea7b 100644 --- a/graphics/mxp/Makefile +++ b/graphics/mxp/Makefile @@ -7,7 +7,7 @@ PORTNAME= mxp PORTVERSION= 1.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR=apps/math/fractals diff --git a/graphics/ocaml-lablgl/Makefile b/graphics/ocaml-lablgl/Makefile index b39adf17ae9c..4dd337ee6ca5 100644 --- a/graphics/ocaml-lablgl/Makefile +++ b/graphics/ocaml-lablgl/Makefile @@ -7,7 +7,7 @@ PORTNAME= lablgl PORTVERSION= 1.03 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/ PKGNAMEPREFIX= ocaml- diff --git a/graphics/ogre3d/Makefile b/graphics/ogre3d/Makefile index 2a9dc6a92a00..6d5f3b5416c7 100644 --- a/graphics/ogre3d/Makefile +++ b/graphics/ogre3d/Makefile @@ -7,7 +7,7 @@ PORTNAME= ogre3d PORTVERSION= 1.4.9 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR=ogre diff --git a/graphics/pixmap/Makefile b/graphics/pixmap/Makefile index b3e3cf394845..67676901169a 100644 --- a/graphics/pixmap/Makefile +++ b/graphics/pixmap/Makefile @@ -7,7 +7,7 @@ PORTNAME= pixmap PORTVERSION= 2.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_XCONTRIB} MASTER_SITE_SUBDIR= applications/pixmap diff --git a/graphics/py-opengl/Makefile b/graphics/py-opengl/Makefile index c75c75093396..60773e60482a 100644 --- a/graphics/py-opengl/Makefile +++ b/graphics/py-opengl/Makefile @@ -7,6 +7,7 @@ PORTNAME= opengl PORTVERSION= 3.0.0.b8 +PORTREVISION= 1 CATEGORIES= graphics python MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= py${PORTNAME} @@ -20,12 +21,11 @@ BUILD_DEPENDS= ${PYNUMERIC} \ ${PYTHON_SITELIBDIR}/PIL.pth:${PORTSDIR}/graphics/py-imaging RUN_DEPENDS= ${PYNUMERIC} \ ${PYTHON_SITELIBDIR}/PIL.pth:${PORTSDIR}/graphics/py-imaging -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut OPTIONS= TKINTER "Build with tkinter for X support" On OPTIONSFILE?= ${PORT_DBDIR}/${PORTNAME}/options -USE_GL= yes +USE_GL= glut USE_PYTHON= yes USE_PYDISTUTILS= yes PYDISTUTILS_PKGNAME= PyOpenGL diff --git a/graphics/pyro/Makefile b/graphics/pyro/Makefile index 67e9c2f09382..14d03c5f4a7f 100644 --- a/graphics/pyro/Makefile +++ b/graphics/pyro/Makefile @@ -7,7 +7,7 @@ PORTNAME= pyro PORTVERSION= 1.5 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= http://nostatic.org/pyro/ EXTRACT_SUFX= .tgz diff --git a/graphics/quat-gui/Makefile b/graphics/quat-gui/Makefile index 8cfdfe8407b4..df5ff1253a89 100644 --- a/graphics/quat-gui/Makefile +++ b/graphics/quat-gui/Makefile @@ -7,7 +7,7 @@ PORTNAME= quat PORTVERSION= 1.20 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= http://www.physcip.uni-stuttgart.de/phy11733/download/ PKGNAMESUFFIX= -gui diff --git a/graphics/quesa/Makefile b/graphics/quesa/Makefile index 1d5a41583bac..4aa68d227aab 100644 --- a/graphics/quesa/Makefile +++ b/graphics/quesa/Makefile @@ -7,7 +7,7 @@ PORTNAME= quesa PORTVERSION= 1.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= SF .ifdef (WITH_EXAMPLES) @@ -19,8 +19,8 @@ MAINTAINER= ports@FreeBSD.org COMMENT= High level 3D graphics library compatible with Apple's QuickDraw(TM) USE_AUTOTOOLS= libtool:15 -USE_GL= glu -USE_XORG= x11 ice +USE_GL= glut +USE_XORG= x11 ice xmu xi .ifdef (WITH_EXAMPLES) USE_GNOME= gtk12 .endif diff --git a/graphics/renderpark/Makefile b/graphics/renderpark/Makefile index 0cbbc5bab440..c67e3640a325 100644 --- a/graphics/renderpark/Makefile +++ b/graphics/renderpark/Makefile @@ -7,7 +7,7 @@ PORTNAME= renderpark PORTVERSION= 3.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= ftp://ftp.cs.kuleuven.ac.be/pub/graphics/software/RenderPark/ DISTNAME= RenderPark diff --git a/graphics/ruby-opengl/Makefile b/graphics/ruby-opengl/Makefile index b21535f861a7..8750f71fe43b 100644 --- a/graphics/ruby-opengl/Makefile +++ b/graphics/ruby-opengl/Makefile @@ -7,7 +7,7 @@ PORTNAME= opengl PORTVERSION= 0.32b -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics ruby MASTER_SITES= http://www2.giganet.net/~yoshi/ PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} diff --git a/graphics/sced/Makefile b/graphics/sced/Makefile index 702a9885b003..555656cb8454 100644 --- a/graphics/sced/Makefile +++ b/graphics/sced/Makefile @@ -7,7 +7,7 @@ PORTNAME= sced PORTVERSION= 1.03 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= http://www.cs.wisc.edu/~schenney/sced/src/ diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile index 49ef6d7b7cda..8285c8cc461d 100644 --- a/graphics/tiff/Makefile +++ b/graphics/tiff/Makefile @@ -9,7 +9,7 @@ PORTNAME= tiff PORTVERSION= 3.8.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= ftp://ftp.remotesensing.org/pub/libtiff/ \ http://dl1.maptools.org/dl/libtiff/ diff --git a/graphics/togl/Makefile b/graphics/togl/Makefile index 1a3caae430d5..9020da0b5cfe 100644 --- a/graphics/togl/Makefile +++ b/graphics/togl/Makefile @@ -7,6 +7,7 @@ PORTNAME= togl PORTVERSION= 1.7 +PORTREVISION= 1 CATEGORIES= graphics tk MASTER_SITES= SF DISTNAME= Togl-${PORTVERSION} @@ -20,6 +21,7 @@ LIB_DEPENDS= tk84.1:${PORTSDIR}/x11-toolkits/tk84 \ USE_GMAKE= yes GNU_CONFIGURE= yes USE_GL= yes +USE_XORG= x11 xt xmu MAKE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include/tk8.4" \ diff --git a/graphics/tulip/Makefile b/graphics/tulip/Makefile index d264a9244d5f..bd49f18f973e 100644 --- a/graphics/tulip/Makefile +++ b/graphics/tulip/Makefile @@ -8,6 +8,7 @@ PORTNAME= tulip PORTVERSION= 3.0.3 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF/auber:src \ http://tulip.labri.fr/userHandbook/:doc diff --git a/graphics/view3ds/Makefile b/graphics/view3ds/Makefile index 4941c1c3fa27..4d81925d2655 100644 --- a/graphics/view3ds/Makefile +++ b/graphics/view3ds/Makefile @@ -7,7 +7,7 @@ PORTNAME= view3ds PORTVERSION= 1.0.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL} DISTNAME= ${PORTNAME}_${PORTVERSION}.orig diff --git a/graphics/visionegg/Makefile b/graphics/visionegg/Makefile index 233e8f19a3f2..f4943455a55e 100644 --- a/graphics/visionegg/Makefile +++ b/graphics/visionegg/Makefile @@ -8,7 +8,7 @@ PORTNAME= visionegg PORTVERSION= 1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= SF @@ -25,9 +25,8 @@ RUN_DEPENDS= \ ${PYTHON_SITELIBDIR}/PIL/Image.py:${PORTSDIR}/graphics/py-imaging \ ${PYTHON_SITELIBDIR}/OpenGL/__init__.py:${PORTSDIR}/graphics/py-opengl \ ${PYTHON_SITELIBDIR}/pygame/__init__.py:${PORTSDIR}/devel/py-game -LIB_DEPENDS= \ - glut.4:${PORTSDIR}/graphics/libglut +USE_GL= glut USE_PYTHON= yes USE_PYDISTUTILS= yes PYDISTUTILS_BUILDARGS= -L${LOCALBASE}/lib diff --git a/graphics/vvv/Makefile b/graphics/vvv/Makefile index 28bc58227b61..ded5c0e47d73 100644 --- a/graphics/vvv/Makefile +++ b/graphics/vvv/Makefile @@ -7,7 +7,7 @@ PORTNAME= vvv PORTVERSION= 1.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= http://www.inf.ufes.br/~thomas/graphics/vvv/ \ ${MASTER_SITE_LOCAL} diff --git a/graphics/white_dune/Makefile b/graphics/white_dune/Makefile index 442171fc2829..f784b3fb2af6 100644 --- a/graphics/white_dune/Makefile +++ b/graphics/white_dune/Makefile @@ -9,6 +9,7 @@ PORTNAME= white_dune PORTVERSION= ${DISTVERSION:S/pl/./} DISTVERSION= 0.28pl14 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= graphics MASTER_SITES= http://vrml.cip.ica.uni-stuttgart.de/dune/ CENKES diff --git a/graphics/wildmagic/Makefile b/graphics/wildmagic/Makefile index 0082824ae6d4..f3692925dce7 100644 --- a/graphics/wildmagic/Makefile +++ b/graphics/wildmagic/Makefile @@ -7,6 +7,7 @@ PORTNAME= WildMagic DISTVERSION= 4p8 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.geometrictools.com/Downloads/ DISTNAME= ${PORTNAME}${DISTVERSION} diff --git a/graphics/xbmbrowser/Makefile b/graphics/xbmbrowser/Makefile index 688ea079ecd9..58a75b527a1f 100644 --- a/graphics/xbmbrowser/Makefile +++ b/graphics/xbmbrowser/Makefile @@ -7,7 +7,7 @@ PORTNAME= xbmbrowser PORTVERSION= 5.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_XCONTRIB} MASTER_SITE_SUBDIR= utilities diff --git a/graphics/xmms-dancingparticles/Makefile b/graphics/xmms-dancingparticles/Makefile index fe00670cfe40..5c5bcc0367a1 100644 --- a/graphics/xmms-dancingparticles/Makefile +++ b/graphics/xmms-dancingparticles/Makefile @@ -7,7 +7,7 @@ PORTNAME= dancingparticles PORTVERSION= 0.6 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= graphics MASTER_SITES= http://tardyp.free.fr/dancingparticles/ PKGNAMEPREFIX= xmms- @@ -18,10 +18,9 @@ MAINTAINER= alepulver@FreeBSD.org COMMENT= Makes particles dance with very pretty neon colors LIB_DEPENDS= t1.5:${PORTSDIR}/devel/t1lib \ - glut.4:${PORTSDIR}/graphics/libglut \ xmms.4:${PORTSDIR}/multimedia/xmms -USE_GL= yes +USE_GL= glut USE_GNOME= gtk12 USE_SDL= sdl CFLAGS+= -I${PREFIX}/include diff --git a/graphics/xmms-fishmatic/Makefile b/graphics/xmms-fishmatic/Makefile index af4a007d3591..ca23967fd80e 100644 --- a/graphics/xmms-fishmatic/Makefile +++ b/graphics/xmms-fishmatic/Makefile @@ -7,7 +7,7 @@ PORTNAME= xmms-fishmatic PORTVERSION= 0.0.1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= graphics MASTER_SITES= http://stukach.com/hosted/ DISTNAME= fishmatic diff --git a/graphics/xmms-paranormal/Makefile b/graphics/xmms-paranormal/Makefile index 387fa7b94a6f..d09fa6949a3f 100644 --- a/graphics/xmms-paranormal/Makefile +++ b/graphics/xmms-paranormal/Makefile @@ -7,7 +7,7 @@ PORTNAME= xmms-paranormal PORTVERSION= 0.2.0 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= graphics MASTER_SITES= SF MASTER_SITE_SUBDIR= paranormal @@ -16,13 +16,13 @@ DISTNAME= paranormal-${PORTVERSION:S/.p/pre/} MAINTAINER= dyeske@gmail.com COMMENT= An adaptation of the "OpenGL Spectrum Analyzer" from XMMS -LIB_DEPENDS= xml2:${PORTSDIR}/textproc/libxml2 \ - glut.4:${PORTSDIR}/graphics/libglut +LIB_DEPENDS= xml2:${PORTSDIR}/textproc/libxml2 BUILD_DEPENDS= xmms-config:${PORTSDIR}/multimedia/xmms RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms CONFIGURE_ENV+= CFLAGS="-I${LOCALBASE}/include/libxml2/libxml" +USE_GL= glut GNU_CONFIGURE= yes USE_SDL= sdl USE_LDCONFIG= yes diff --git a/graphics/xmms-scivi/Makefile b/graphics/xmms-scivi/Makefile index 0b28df856589..f0fb200fe188 100644 --- a/graphics/xmms-scivi/Makefile +++ b/graphics/xmms-scivi/Makefile @@ -7,7 +7,7 @@ PORTNAME= scivi DISTVERSION= 0.2.0-rc3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PKGNAMEPREFIX}${PORTNAME} @@ -20,6 +20,7 @@ LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms USE_BZIP2= yes USE_GL= yes +USE_XORG= x11 xt USE_GNOME= gtk12 GNU_CONFIGURE= yes diff --git a/graphics/xmorph/Makefile b/graphics/xmorph/Makefile index e6728da53dee..429b99bd4f4c 100644 --- a/graphics/xmorph/Makefile +++ b/graphics/xmorph/Makefile @@ -7,7 +7,7 @@ PORTNAME= xmorph PORTVERSION= 2006.08.17 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= SF DISTNAME= ${PORTNAME}_${PORTVERSION:S/.//g} diff --git a/japanese/nethack32/Makefile b/japanese/nethack32/Makefile index 79377ec4a0b9..a90399ae9967 100644 --- a/japanese/nethack32/Makefile +++ b/japanese/nethack32/Makefile @@ -7,7 +7,7 @@ PORTNAME= nethack PORTVERSION= 1.0.5.19970924 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= japanese games MASTER_SITES= ftp://ftp.nethack.org/pub/nethack/nh322/src/ \ ftp://ftp.wtower.com/nethack/sources/ diff --git a/japanese/nethack34/Makefile b/japanese/nethack34/Makefile index 34c89e8ca017..4b2bb35228e2 100644 --- a/japanese/nethack34/Makefile +++ b/japanese/nethack34/Makefile @@ -7,7 +7,7 @@ PORTNAME= nethack PORTVERSION= 3.4.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= japanese games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/java/classpath/Makefile b/java/classpath/Makefile index 0afb211fe896..64a3ac8e8d64 100644 --- a/java/classpath/Makefile +++ b/java/classpath/Makefile @@ -8,6 +8,7 @@ PORTNAME= classpath PORTVERSION= 0.97.2 +PORTREVISION= 1 CATEGORIES= java devel MASTER_SITES= ${MASTER_SITE_GNU} \ ${MASTER_SITE_SAVANNAH} diff --git a/korean/hanIM/Makefile b/korean/hanIM/Makefile index 0bc6d2b2bfff..3f04c2ed8432 100644 --- a/korean/hanIM/Makefile +++ b/korean/hanIM/Makefile @@ -17,7 +17,7 @@ COMMENT= Mizi Research's Korean X11 Input Method RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/local/gulim12.pcf.gz:${PORTSDIR}/korean/baekmukfonts-bdf USE_IMAKE= YES -USE_XORG= xpm +USE_XORG= xpm xmu xaw WRKSRC= ${WRKDIR}/hanIM post-install: diff --git a/korean/hanterm-xf86/Makefile b/korean/hanterm-xf86/Makefile index 5ea04ee3f60a..9f4c404fcd11 100644 --- a/korean/hanterm-xf86/Makefile +++ b/korean/hanterm-xf86/Makefile @@ -7,7 +7,7 @@ PORTNAME= hanterm PORTVERSION= 2.0.5.173 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= korean x11 MASTER_SITES= http://kldp.net/frs/download.php/282/ PKGNAMESUFFIX= -xf diff --git a/lang/drscheme/Makefile b/lang/drscheme/Makefile index b3e2c4e497da..1f8dbb680c01 100644 --- a/lang/drscheme/Makefile +++ b/lang/drscheme/Makefile @@ -7,7 +7,7 @@ PORTNAME= drscheme PORTVERSION= 370 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= lang scheme MASTER_SITES= http://download.plt-scheme.org/bundles/${PORTVERSION}/plt/ \ http://www.cs.utah.edu/plt/download/${PORTVERSION}/plt/ \ diff --git a/lang/fpc/Makefile.units b/lang/fpc/Makefile.units index eb4c7aa961a2..d58ba73ac76c 100644 --- a/lang/fpc/Makefile.units +++ b/lang/fpc/Makefile.units @@ -180,8 +180,7 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png .if ${PKGNAMESUFFIX} == "-opengl" . if defined(WITH_OPENGL) -USE_GL= yes -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut +USE_GL= glut . endif HAVE_EXAMPLES= true .endif diff --git a/lang/hugs/Makefile b/lang/hugs/Makefile index 8d582cb8e9db..c46226157478 100644 --- a/lang/hugs/Makefile +++ b/lang/hugs/Makefile @@ -7,7 +7,7 @@ PORTNAME= hugs98 PORTVERSION= 200609 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= lang haskell MASTER_SITES= http://cvs.haskell.org/Hugs/downloads/2006-09/ DISTNAME= ${PORTNAME}-plus-${HUGS_DATE} diff --git a/lang/lush/Makefile b/lang/lush/Makefile index f3e10000ecd2..aa99719bb081 100644 --- a/lang/lush/Makefile +++ b/lang/lush/Makefile @@ -14,6 +14,7 @@ MAINTAINER= dyeske@gmail.com COMMENT= A high level object-oriented programming language USE_GETTEXT= yes +USE_XORG= xt xft USE_GL= yes USE_SDL= sdl image GNU_CONFIGURE= yes diff --git a/lang/plt-scheme/Makefile b/lang/plt-scheme/Makefile index 2d72cd948e27..a5221a9200fa 100644 --- a/lang/plt-scheme/Makefile +++ b/lang/plt-scheme/Makefile @@ -7,6 +7,7 @@ PORTNAME= plt-scheme PORTVERSION= 4.1.4 +PORTREVISION= 1 CATEGORIES= lang scheme MASTER_SITES= http://download.plt-scheme.org/bundles/${PORTVERSION}/plt/\ http://plt.cs.uchicago.edu/bundles/${PORTVERSION}/plt/\ diff --git a/lang/racket-textual/Makefile b/lang/racket-textual/Makefile index 2d72cd948e27..a5221a9200fa 100644 --- a/lang/racket-textual/Makefile +++ b/lang/racket-textual/Makefile @@ -7,6 +7,7 @@ PORTNAME= plt-scheme PORTVERSION= 4.1.4 +PORTREVISION= 1 CATEGORIES= lang scheme MASTER_SITES= http://download.plt-scheme.org/bundles/${PORTVERSION}/plt/\ http://plt.cs.uchicago.edu/bundles/${PORTVERSION}/plt/\ diff --git a/lang/racket/Makefile b/lang/racket/Makefile index 2d72cd948e27..a5221a9200fa 100644 --- a/lang/racket/Makefile +++ b/lang/racket/Makefile @@ -7,6 +7,7 @@ PORTNAME= plt-scheme PORTVERSION= 4.1.4 +PORTREVISION= 1 CATEGORIES= lang scheme MASTER_SITES= http://download.plt-scheme.org/bundles/${PORTVERSION}/plt/\ http://plt.cs.uchicago.edu/bundles/${PORTVERSION}/plt/\ diff --git a/lang/ypsilon/Makefile b/lang/ypsilon/Makefile index f9b03e8ec422..090ad5289028 100644 --- a/lang/ypsilon/Makefile +++ b/lang/ypsilon/Makefile @@ -7,6 +7,7 @@ PORTNAME= ypsilon PORTVERSION= 0.9.6.3 +PORTREVISION= 1 CATEGORIES= lang scheme MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} DISTNAME= ${PORTNAME}-0.9.6.update3 @@ -14,6 +15,7 @@ DISTNAME= ${PORTNAME}-0.9.6.update3 MAINTAINER= vmagerya@gmail.com COMMENT= Scheme implementation for real-time applications +USE_GL= glut USE_GMAKE= yes MAKE_ARGS= DATADIR="${DATADIR}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" diff --git a/mail/exim/Makefile b/mail/exim/Makefile index ac852e675c63..aef92d1ffeb1 100644 --- a/mail/exim/Makefile +++ b/mail/exim/Makefile @@ -7,7 +7,7 @@ PORTNAME= exim PORTVERSION?= ${EXIM_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_EXIM:S/$/:exim/} MASTER_SITE_SUBDIR= exim4/:exim diff --git a/mail/glbiff/Makefile b/mail/glbiff/Makefile index 0b1c76cd2a09..653b436dde21 100644 --- a/mail/glbiff/Makefile +++ b/mail/glbiff/Makefile @@ -7,7 +7,7 @@ PORTNAME= glbiff PORTVERSION= 0.3.5 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= mail MASTER_SITES= http://www.dgp.utoronto.ca/~mac/code/projects/ \ http://freebsd.unixfreunde.de/sources/ @@ -16,8 +16,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= Xbiff-like program for X Window System with nice 3D output -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut - +USE_GL= glut GNU_CONFIGURE= yes CFLAGS+= ${PTHREAD_CFLAGS} ${PTHREAD_LIBS:S/"//g} diff --git a/mail/xbuffy/Makefile b/mail/xbuffy/Makefile index d7c2722cff57..136bfb2fbb94 100644 --- a/mail/xbuffy/Makefile +++ b/mail/xbuffy/Makefile @@ -7,7 +7,7 @@ PORTNAME= xbuffy PORTVERSION= 3.3.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= mail MASTER_SITES= http://www.fiction.net/blong/programs/xbuffy/ DISTNAME= ${PORTNAME}-3.3.bl.3 diff --git a/mail/xfce4-mailwatch-plugin/Makefile b/mail/xfce4-mailwatch-plugin/Makefile index f7c1c1ee807b..24ccf5dc2853 100644 --- a/mail/xfce4-mailwatch-plugin/Makefile +++ b/mail/xfce4-mailwatch-plugin/Makefile @@ -7,6 +7,7 @@ PORTNAME= xfce4-mailwatch-plugin PORTVERSION= 1.1.0 +PORTREVISION= 1 CATEGORIES= mail xfce MASTER_SITES= http://spuriousinterrupt.org/files/mailwatch/ \ http://freebsd.unixfreunde.de/sources/ diff --git a/mail/xmail/Makefile b/mail/xmail/Makefile index 2479d834bc7c..6ab7dffbc459 100644 --- a/mail/xmail/Makefile +++ b/mail/xmail/Makefile @@ -7,7 +7,7 @@ PORTNAME= xmail PORTVERSION= 1.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_XCONTRIB} MASTER_SITE_SUBDIR= applications diff --git a/mail/xmailbox/Makefile b/mail/xmailbox/Makefile index 01a895aa3926..815eb21b4e9a 100644 --- a/mail/xmailbox/Makefile +++ b/mail/xmailbox/Makefile @@ -7,7 +7,7 @@ PORTNAME= xmailbox PORTVERSION= 2.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_XCONTRIB} MASTER_SITE_SUBDIR= applications diff --git a/math/abs/Makefile b/math/abs/Makefile index 88b0e4f29fda..f7a091a09a65 100644 --- a/math/abs/Makefile +++ b/math/abs/Makefile @@ -7,7 +7,7 @@ PORTNAME= abs PORTVERSION= 0908 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math MASTER_SITES= http://utenti.gufi.org/~gmarco/files/distfiles/ \ http://fresh.t-systems-sfr.com/unix/src/privat2/ diff --git a/math/asir2000/Makefile b/math/asir2000/Makefile index 9890b8a27693..4797e6945b08 100644 --- a/math/asir2000/Makefile +++ b/math/asir2000/Makefile @@ -7,7 +7,7 @@ PORTNAME= asir PORTVERSION= 20070806 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math MASTER_SITES= ftp://ftp.jssac.org/pub/distfiles/asir/ \ ftp://ftp.asir.org/pub/asir/src/ \ diff --git a/math/femlab/Makefile b/math/femlab/Makefile index a0426f0acf5f..8dd3637b6c81 100644 --- a/math/femlab/Makefile +++ b/math/femlab/Makefile @@ -7,7 +7,7 @@ PORTNAME= femlab PORTVERSION= 1.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= math science # mastersite disappeared in April 2000 MASTER_SITES= # ftp://ftp.md.chalmers.se/pub/Femlab/ diff --git a/math/fung-calc/Makefile b/math/fung-calc/Makefile index 678a2922ddbd..5557a35759d6 100644 --- a/math/fung-calc/Makefile +++ b/math/fung-calc/Makefile @@ -6,7 +6,7 @@ PORTNAME= fung-calc PORTVERSION= 1.3.2b -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= math kde MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -14,10 +14,8 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= markus@FreeBSD.org COMMENT= Advanced graphic calculator -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut - USE_KDELIBS_VER=3 -USE_GL= yes +USE_GL= glut USE_GMAKE= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 diff --git a/math/snns/Makefile b/math/snns/Makefile index 1968d473b221..386abfd58ee8 100644 --- a/math/snns/Makefile +++ b/math/snns/Makefile @@ -7,6 +7,7 @@ PORTNAME= snns PORTVERSION= 4.3 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= http://www.ra.cs.uni-tuebingen.de/downloads/SNNS/ DISTNAME= SNNSv${PORTVERSION} diff --git a/math/vtk/Makefile b/math/vtk/Makefile index 785e5a027e6c..38e43cb50836 100644 --- a/math/vtk/Makefile +++ b/math/vtk/Makefile @@ -15,7 +15,7 @@ PORTNAME= vtk PORTVERSION= 4.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math graphics MASTER_SITES= http://ovt.irfu.se/vtk/files/ DISTFILES?= VTK-${PORTVERSION}-LatestRelease.tar.gz @@ -57,6 +57,7 @@ BUILD_DEPENDS+= ${VTKDATAROOT}/VTKData.readme:${PORTSDIR}/math/vtk-data USE_GMAKE= yes USE_GL= yes USE_LDCONFIG= yes +USE_XORG= xt CMAKE?= ${LOCALBASE}/bin/cmake CXXFLAGS+= -Wno-deprecated diff --git a/math/xgobi/Makefile b/math/xgobi/Makefile index b7a9f341238a..7b497d91b831 100644 --- a/math/xgobi/Makefile +++ b/math/xgobi/Makefile @@ -7,7 +7,7 @@ PORTNAME= xgobi PORTVERSION= 2002.06.20 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math graphics MASTER_SITES= http://public.research.att.com/~stat/xgobi/ DISTNAME= xgobi diff --git a/misc/xpns/Makefile b/misc/xpns/Makefile index 156708e328be..840a231575dd 100644 --- a/misc/xpns/Makefile +++ b/misc/xpns/Makefile @@ -7,7 +7,7 @@ PORTNAME= xpns PORTVERSION= 1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= misc cad MASTER_SITES= http://robotics.ee.uwa.edu.au/pns/ftp/ DISTFILES= pns_source.tar.Z diff --git a/multimedia/dtv/Makefile b/multimedia/dtv/Makefile index 6427a276ab25..6297f7d236ea 100644 --- a/multimedia/dtv/Makefile +++ b/multimedia/dtv/Makefile @@ -20,6 +20,6 @@ USE_XORG= xau x11 xext xxf86dga NOT_FOR_ARCHS= sparc64 post-patch: - @${REINPLACE_CMD} 's|^\(LDADD +=.*\)|\1 -lXau -lXdmcp|' ${WRKSRC}/Makefile + @${REINPLACE_CMD} 's|^\(LDADD +=.*\)|\1 -lxcb -lXau -lXdmcp|' ${WRKSRC}/Makefile .include <bsd.port.mk> diff --git a/multimedia/gxine/Makefile b/multimedia/gxine/Makefile index 6b8ff705bd07..b8de65d66f8b 100644 --- a/multimedia/gxine/Makefile +++ b/multimedia/gxine/Makefile @@ -7,7 +7,7 @@ PORTNAME= gxine PORTVERSION= 0.5.903 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= SF MASTER_SITE_SUBDIR= xine @@ -91,7 +91,7 @@ PLIST_SUB+= MOZILLA_PLUGIN="" .endif .if defined(WITH_XCB) -LIB_DEPENDS+= xcb.1:${PORTSDIR}/x11/libxcb +LIB_DEPENDS+= xcb.2:${PORTSDIR}/x11/libxcb .else CONFIGURE_ARGS+=--without-xcb .endif diff --git a/multimedia/jahshaka/Makefile b/multimedia/jahshaka/Makefile index 8161171b0cf1..be66ad338e6b 100644 --- a/multimedia/jahshaka/Makefile +++ b/multimedia/jahshaka/Makefile @@ -7,7 +7,7 @@ PORTNAME= jahshaka PORTVERSION= 1.9a9 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= multimedia MASTER_SITES= SF/${PORTNAME}fx DISTNAME= ${PORTNAME}_${PORTVERSION} diff --git a/multimedia/kaffeine/Makefile b/multimedia/kaffeine/Makefile index 75a891b00b22..2ba787d34bc0 100644 --- a/multimedia/kaffeine/Makefile +++ b/multimedia/kaffeine/Makefile @@ -6,6 +6,7 @@ PORTNAME= kaffeine PORTVERSION= 0.8.7 +PORTREVISION= 1 CATEGORIES= multimedia kde MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= kaffeine @@ -15,7 +16,7 @@ COMMENT= A xine-base multimedia player LIB_DEPENDS= xine.1:${PORTSDIR}/multimedia/libxine \ cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia \ - xcb.1:${PORTSDIR}/x11/libxcb + xcb.2:${PORTSDIR}/x11/libxcb USE_BZIP2= yes USE_KDELIBS_VER= 3 diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile index 71859257423d..1e63e55cf76c 100644 --- a/multimedia/libquicktime/Makefile +++ b/multimedia/libquicktime/Makefile @@ -7,6 +7,7 @@ PORTNAME= libquicktime PORTVERSION= 1.0.3 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= SFE diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile index 217fcf31ab39..cda236b732ff 100644 --- a/multimedia/libxine/Makefile +++ b/multimedia/libxine/Makefile @@ -7,7 +7,7 @@ PORTNAME= xine PORTVERSION= 1.1.15 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia ipv6 MASTER_SITES= SF PKGNAMEPREFIX= lib @@ -138,7 +138,7 @@ PLIST_SUB+= WITH_XVMC="@comment " .endif .if defined(WITH_XCB) -LIB_DEPENDS+= xcb.1:${PORTSDIR}/x11/libxcb +LIB_DEPENDS+= xcb.2:${PORTSDIR}/x11/libxcb PLIST_SUB+= WITH_XCB="" .else PLIST_SUB+= WITH_XCB="@comment " diff --git a/multimedia/quodlibet/Makefile b/multimedia/quodlibet/Makefile index c737ad6efda9..8d258e701477 100644 --- a/multimedia/quodlibet/Makefile +++ b/multimedia/quodlibet/Makefile @@ -22,6 +22,7 @@ USE_PYTHON= 2.4+ USE_GNOME= pygtk2 USE_GETTEXT= yes USE_GMAKE= yes +USE_DISPLAY= yes USE_GSTREAMER= gconf good python MAN1= exfalso.1 quodlibet.1 @@ -104,11 +105,6 @@ PLIST_SUB+= EXTENSIONS="" PLIST_SUB+= EXTENSIONS="@comment " .endif -.if defined(PACKAGE_BUILDING) -BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT} \ - ${LOCALBASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT} -.endif - do-configure: @${PYTHON_CMD} ${WRKSRC}/check.py diff --git a/multimedia/subtitlecomposer-kde4/Makefile b/multimedia/subtitlecomposer-kde4/Makefile index 9256d1b63af1..c385ef91abd6 100644 --- a/multimedia/subtitlecomposer-kde4/Makefile +++ b/multimedia/subtitlecomposer-kde4/Makefile @@ -7,6 +7,7 @@ PORTNAME= subtitlecomposer PORTVERSION= 0.4.3 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= SF MASTER_SITE_SUBDIR=subcomposer @@ -45,7 +46,7 @@ IGNORE= needs XCB support in libxine . endif LIB_DEPENDS+= xine.1:${PORTSDIR}/multimedia/libxine \ - xcb.1:${PORTSDIR}/x11/libxcb + xcb.2:${PORTSDIR}/x11/libxcb .else CONFIGURE_ARGS+=--without-xine --without-xcb .endif diff --git a/multimedia/subtitlecomposer/Makefile b/multimedia/subtitlecomposer/Makefile index 9256d1b63af1..c385ef91abd6 100644 --- a/multimedia/subtitlecomposer/Makefile +++ b/multimedia/subtitlecomposer/Makefile @@ -7,6 +7,7 @@ PORTNAME= subtitlecomposer PORTVERSION= 0.4.3 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= SF MASTER_SITE_SUBDIR=subcomposer @@ -45,7 +46,7 @@ IGNORE= needs XCB support in libxine . endif LIB_DEPENDS+= xine.1:${PORTSDIR}/multimedia/libxine \ - xcb.1:${PORTSDIR}/x11/libxcb + xcb.2:${PORTSDIR}/x11/libxcb .else CONFIGURE_ARGS+=--without-xine --without-xcb .endif diff --git a/multimedia/xawtv/Makefile b/multimedia/xawtv/Makefile index 43cff382e2f2..30377ec87851 100644 --- a/multimedia/xawtv/Makefile +++ b/multimedia/xawtv/Makefile @@ -7,7 +7,7 @@ PORTNAME= xawtv PORTVERSION= 3.95 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= multimedia MASTER_SITES= http://dl.bytesex.org/releases/xawtv/ diff --git a/multimedia/xine/Makefile b/multimedia/xine/Makefile index a5db8849febf..75d469f79b36 100644 --- a/multimedia/xine/Makefile +++ b/multimedia/xine/Makefile @@ -7,7 +7,7 @@ PORTNAME= xine PORTVERSION= 0.99.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -19,6 +19,7 @@ COMMENT= An X11 multimedia player LIB_DEPENDS= xine.1:${PORTSDIR}/multimedia/libxine \ png.5:${PORTSDIR}/graphics/png +USE_XORG= x11 xt xv xinerama xxf86vm USE_GETTEXT= yes USE_GMAKE= yes INSTALLS_ICONS= yes @@ -61,7 +62,7 @@ PLIST_SUB+= NLS="" .endif .if !defined(WITHOUT_XFT) -LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft +USE_XORG+= xft .else CONFIGURE_ARGS+= --disable-xft .endif diff --git a/net-im/sim-im-devel/Makefile b/net-im/sim-im-devel/Makefile index c2325249798c..2f9b92d5babd 100644 --- a/net-im/sim-im-devel/Makefile +++ b/net-im/sim-im-devel/Makefile @@ -6,6 +6,7 @@ PORTNAME= sim-im-devel PORTVERSION= 0.9.5.2236 +PORTREVISION= 1 CATEGORIES= net-im MASTER_SITES= http://sim-im.lehis.ru/dist/ \ http://www.sim-im.lehis.ru/dist/ @@ -22,7 +23,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 USE_QT_VER= 3 -USE_XORG= x11 xext +USE_XORG= x11 xext xscrnsaver USE_OPENSSL= yes USE_PERL5_BUILD= yes USE_GETTEXT= yes diff --git a/net-im/sim-im/Makefile b/net-im/sim-im/Makefile index 8c8948da84a8..834c569d2740 100644 --- a/net-im/sim-im/Makefile +++ b/net-im/sim-im/Makefile @@ -6,7 +6,7 @@ PORTNAME= sim-im PORTVERSION= 0.9.4.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-im MASTER_SITES= ${MASTER_SITE_BERLIOS} \ http://sim-im.lehis.ru/dist/ \ @@ -33,7 +33,7 @@ USE_OPENSSL= yes USE_LDCONFIG= yes USE_GETTEXT= yes INSTALLS_ICONS= yes -USE_XORG= x11 xext ice +USE_XORG= x11 xext ice xscrnsaver .if !defined(WITH_KDE) CONFIGURE_ARGS+=--disable-kde --enable-mt diff --git a/net-im/xfce4-messenger-plugin/Makefile b/net-im/xfce4-messenger-plugin/Makefile index cfeed612dcbd..86db7032b98e 100644 --- a/net-im/xfce4-messenger-plugin/Makefile +++ b/net-im/xfce4-messenger-plugin/Makefile @@ -7,7 +7,7 @@ PORTNAME= xfce4-messenger-plugin PORTVERSION= 0.1.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net-im xfce MASTER_SITES= ftp://ftp.berlios.de/pub/xfce-goodies/panel-plugins/4.4/ DIST_SUBDIR= xfce4 diff --git a/net/boinc-client/Makefile b/net/boinc-client/Makefile index a907aeaeaffa..a32062cb34c3 100644 --- a/net/boinc-client/Makefile +++ b/net/boinc-client/Makefile @@ -44,14 +44,14 @@ OPTIONS= X11 "Build Boinc Manager GUI" on \ .include <bsd.port.pre.mk> .if !defined(WITHOUT_X11) +USE_GL= glut USE_XORG= x11 USE_WX= 2.6+ WX_CONF_ARGS= absolute CPPFLAGS+= -I${LOCALBASE}/include USE_ICONV= yes -LIB_DEPENDS+= jpeg:${PORTSDIR}/graphics/jpeg \ - glut:${PORTSDIR}/graphics/libglut +LIB_DEPENDS+= jpeg:${PORTSDIR}/graphics/jpeg PLIST_SUB+= BOINC_GUI="" .else diff --git a/net/ssvnc/Makefile b/net/ssvnc/Makefile index d9cbde39e5ed..fe145ef10f46 100644 --- a/net/ssvnc/Makefile +++ b/net/ssvnc/Makefile @@ -7,7 +7,7 @@ PORTNAME= ssvnc PORTVERSION= 1.0.20 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= net security MASTER_SITES= http://www.karlrunge.com/x11vnc/etv/ diff --git a/net/tightvnc/Makefile b/net/tightvnc/Makefile index d41164b485a4..d38a27621ebb 100644 --- a/net/tightvnc/Makefile +++ b/net/tightvnc/Makefile @@ -8,7 +8,7 @@ PORTNAME= tightvnc PORTVERSION= 1.3.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= SF MASTER_SITE_SUBDIR= vnc-tight diff --git a/net/vnc2swf/Makefile b/net/vnc2swf/Makefile index fa2cbfa68b4a..1b286e64e119 100644 --- a/net/vnc2swf/Makefile +++ b/net/vnc2swf/Makefile @@ -7,7 +7,7 @@ PORTNAME= vnc2swf PORTVERSION= 0.5.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net MASTER_SITES= http://www.unixuser.org/~euske/${PORTNAME}/ \ ftp://ftp.rewt.org.uk/pub/distfiles/ diff --git a/net/xipdump/Makefile b/net/xipdump/Makefile index 403598a7f017..1e18be7bad76 100644 --- a/net/xipdump/Makefile +++ b/net/xipdump/Makefile @@ -7,7 +7,7 @@ PORTNAME= xipdump PORTVERSION= 1.5.4 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net MASTER_SITES= http://www.lse.epita.fr/twiki/pub/Projects/XipDump/ EXTRACT_SUFX= .tgz diff --git a/polish/gnugadu2/Makefile b/polish/gnugadu2/Makefile index ff7986afdf2e..e9d055e92d7b 100644 --- a/polish/gnugadu2/Makefile +++ b/polish/gnugadu2/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnugadu2 PORTVERSION= 2.3.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= polish net-im MASTER_SITES= SF/ggadu DISTNAME= gg2-${PORTVERSION} diff --git a/print/asprint/Makefile b/print/asprint/Makefile index 984daeeec700..7e8e222578af 100644 --- a/print/asprint/Makefile +++ b/print/asprint/Makefile @@ -7,7 +7,7 @@ PORTNAME= asprint PORTVERSION= 1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_AFTERSTEP} MASTER_SITE_SUBDIR= apps/asprint diff --git a/print/ghostview/Makefile b/print/ghostview/Makefile index b471c08c852f..de7de1a41470 100644 --- a/print/ghostview/Makefile +++ b/print/ghostview/Makefile @@ -7,7 +7,7 @@ PORTNAME= ghostview PORTVERSION= 1.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= ghostview diff --git a/print/gl2ps/Makefile b/print/gl2ps/Makefile index bf6a1fd7603d..1220146acaad 100644 --- a/print/gl2ps/Makefile +++ b/print/gl2ps/Makefile @@ -7,7 +7,7 @@ PORTNAME= gl2ps PORTVERSION= 1.3.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= print graphics MASTER_SITES= http://www.geuz.org/gl2ps/src/ EXTRACT_SUFX= .tgz @@ -16,6 +16,7 @@ MAINTAINER= araujo@FreeBSD.org COMMENT= A C library providing vector output for OpenGL application USE_GL= yes +USE_XORG= x11 xmu xi USE_LDCONFIG= yes pre-build: diff --git a/print/pdfcube/Makefile b/print/pdfcube/Makefile index 4f8f3f0c98e3..e027484129c6 100644 --- a/print/pdfcube/Makefile +++ b/print/pdfcube/Makefile @@ -7,17 +7,17 @@ PORTNAME= pdfcube PORTVERSION= 0.0.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= print MASTER_SITES= http://code.100allora.it/releases/pdfcube/ MAINTAINER= lwhsu@FreeBSD.org COMMENT= An OpenGL presentation viewer on a spinning cube -LIB_DEPENDS= glut:${PORTSDIR}/graphics/libglut \ - gtkglext:${PORTSDIR}/x11-toolkits/gtkglext \ +LIB_DEPENDS= gtkglext:${PORTSDIR}/x11-toolkits/gtkglext \ poppler-glib:${PORTSDIR}/graphics/poppler-gtk +USE_GL= glut GNU_CONFIGURE= yes PLIST_FILES= bin/pdfcube diff --git a/russian/prawda/Makefile b/russian/prawda/Makefile index 595367bb40c5..723d01b94742 100644 --- a/russian/prawda/Makefile +++ b/russian/prawda/Makefile @@ -7,7 +7,7 @@ PORTNAME= prawda PORTVERSION= 0.3.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= russian MASTER_SITES= http://www.prawda.newmail.ru/ diff --git a/science/elmerpost/Makefile b/science/elmerpost/Makefile index 281e22c9df81..1955cc3ec4bb 100644 --- a/science/elmerpost/Makefile +++ b/science/elmerpost/Makefile @@ -7,7 +7,7 @@ PORTNAME= elmerpost PORTVERSION= 5.4.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= science MASTER_SITES= SF/elmerfem @@ -23,6 +23,7 @@ RUN_DEPENDS= wish8.4:${PORTSDIR}/x11-toolkits/tk84 CXXFLAGS+= -Wno-deprecated USE_GL= yes +USE_XORG= x11 xt xi GNU_CONFIGURE= yes USE_GMAKE= yes ALL_TARGET= diff --git a/science/flounder/Makefile b/science/flounder/Makefile index 9fefe700faa5..67ef6317eee4 100644 --- a/science/flounder/Makefile +++ b/science/flounder/Makefile @@ -8,7 +8,7 @@ PORTNAME= flounder PORTVERSION= 0.40 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= science MASTER_SITES= http://www2.enel.ucalgary.ca/~vigmond/flounder/ EXTRACT_SUFX= .tgz @@ -18,9 +18,9 @@ COMMENT= A quick way to visualize regularly spaced 4D data LIB_DEPENDS= fltk:${PORTSDIR}/x11-toolkits/fltk \ ungif:${PORTSDIR}/graphics/libungif \ - png:${PORTSDIR}/graphics/png \ - glut.4:${PORTSDIR}/graphics/libglut + png:${PORTSDIR}/graphics/png +USE_GL= glut GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lstdc++" diff --git a/science/liboglappth/Makefile b/science/liboglappth/Makefile index b9f4b45ef3b9..fb0c489d0855 100644 --- a/science/liboglappth/Makefile +++ b/science/liboglappth/Makefile @@ -6,7 +6,7 @@ PORTNAME= liboglappth PORTVERSION= 0.98 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= science MASTER_SITES= http://www.uku.fi/~thassine/projects/download/current/ \ http://bioinformatics.org/ghemical/download/ diff --git a/science/medit/Makefile b/science/medit/Makefile index 8f607c16b51a..7945db3a6649 100644 --- a/science/medit/Makefile +++ b/science/medit/Makefile @@ -6,7 +6,7 @@ PORTNAME= medit PORTVERSION= 2006.09.24 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= science graphics MASTER_SITES= ${MASTER_SITE_LOCAL} \ http://www.ann.jussieu.fr/~frey/logiciels/:author @@ -47,10 +47,8 @@ PLIST_DIRS= %%EXAMPLESDIR%% . endif .endif -LIB_DEPENDS+= glut.4:${PORTSDIR}/graphics/libglut - NO_WRKSUBDIR= yes -USE_GL= yes +USE_GL= glut .include <bsd.port.pre.mk> diff --git a/science/paraview/Makefile b/science/paraview/Makefile index 1f1ad40fc4ce..a1584628a5cd 100644 --- a/science/paraview/Makefile +++ b/science/paraview/Makefile @@ -7,7 +7,7 @@ PORTNAME= paraview PORTVERSION= 2.4.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= science graphics MASTER_SITES= http://www.paraview.org/files/v2.4/ @@ -22,6 +22,7 @@ LIB_DEPENDS= hdf5.0:${PORTSDIR}/science/hdf5 \ expat.6:${PORTSDIR}/textproc/expat2 USE_GL= yes +USE_XORG= x11 xt USE_GMAKE= yes USE_LDCONFIG= yes USE_CMAKE= yes diff --git a/science/xmakemol/Makefile b/science/xmakemol/Makefile index cbb898fe5cf5..9ed927cd5501 100644 --- a/science/xmakemol/Makefile +++ b/science/xmakemol/Makefile @@ -6,6 +6,7 @@ PORTNAME= xmakemol PORTVERSION= 5.16 +PORTREVISION= 1 CATEGORIES= science MASTER_SITES= SAVANNAH diff --git a/security/mypasswordsafe/Makefile b/security/mypasswordsafe/Makefile index b330c8e1bced..1fded54ad8b2 100644 --- a/security/mypasswordsafe/Makefile +++ b/security/mypasswordsafe/Makefile @@ -7,7 +7,7 @@ PORTNAME= MyPasswordSafe PORTVERSION= 20061216 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security MASTER_SITES= http://www.semanticgap.com/myps/release/ EXTRACT_SUFX= .src.tgz @@ -19,6 +19,7 @@ BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake USE_GMAKE= yes USE_QT_VER= 3 +USE_XORG= xscrnsaver MAKE_ENV= QTDIR="${QT_PREFIX}" \ QMAKESPEC="${LOCALBASE}/share/qt/mkspecs/freebsd-g++" diff --git a/security/revelation/Makefile b/security/revelation/Makefile index 1e3ea30f65c1..d642957a305e 100644 --- a/security/revelation/Makefile +++ b/security/revelation/Makefile @@ -29,11 +29,7 @@ USE_PYTHON= yes GCONF_SCHEMAS= revelation.schemas revelation-applet.schemas INSTALLS_ICONS= yes USE_GETTEXT= yes - -.if defined(PACKAGE_BUILDING) -BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT} \ - ${LOCALBASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT} -.endif +USE_DISPLAY= yes post-patch: @${REINPLACE_CMD} -e 's|\(rvl_py_version=\)".*$$|\1""|' \ diff --git a/sysutils/asfsm/Makefile b/sysutils/asfsm/Makefile index 7694fd845718..39135ffad384 100644 --- a/sysutils/asfsm/Makefile +++ b/sysutils/asfsm/Makefile @@ -6,7 +6,7 @@ PORTNAME= asfsm PORTVERSION= 1.0.p15 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils afterstep MASTER_SITES= http://www.tigr.net/afterstep/download/asfsm/ DISTNAME= asfsm-1.0pre15 diff --git a/sysutils/glload/Makefile b/sysutils/glload/Makefile index 19308c720538..86d87e207b19 100644 --- a/sysutils/glload/Makefile +++ b/sysutils/glload/Makefile @@ -7,7 +7,7 @@ PORTNAME= glload PORTVERSION= 0.4.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MASTER_SITES= http://reality.exsgi.org/eile/misc/ diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile index 1acc47eee67a..d3372ff0fe02 100644 --- a/sysutils/hal/Makefile +++ b/sysutils/hal/Makefile @@ -8,7 +8,7 @@ PORTNAME= hal DISTVERSION= 0.5.11 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= sysutils MASTER_SITES= http://hal.freedesktop.org/releases/ diff --git a/sysutils/hal/files/patch-fdi_policy_10osvendor_10-x11-input.fdi b/sysutils/hal/files/patch-fdi_policy_10osvendor_10-x11-input.fdi index f7af321c0943..00781db1dd6d 100644 --- a/sysutils/hal/files/patch-fdi_policy_10osvendor_10-x11-input.fdi +++ b/sysutils/hal/files/patch-fdi_policy_10osvendor_10-x11-input.fdi @@ -1,6 +1,6 @@ ---- fdi/policy/10osvendor/10-x11-input.fdi.orig 2008-03-27 13:42:31.000000000 -0400 -+++ fdi/policy/10osvendor/10-x11-input.fdi 2008-03-27 13:48:06.000000000 -0400 -@@ -1,15 +1,6 @@ +--- fdi/policy/10osvendor/10-x11-input.fdi.orig 2008-09-24 14:32:26.000000000 +0100 ++++ fdi/policy/10osvendor/10-x11-input.fdi 2008-09-24 14:34:22.000000000 +0100 +@@ -1,19 +1,10 @@ <?xml version="1.0" encoding="ISO-8859-1"?> <deviceinfo version="0.2"> <device> @@ -13,6 +13,12 @@ - </match> - </match> - - <match key="info.capabilities" contains="input.keys"> +- <match key="info.capabilities" contains="input.keys"> ++ <match key="info.capabilities" contains="input.keyboard"> <!-- If we're using Linux, we use evdev by default (falling back to keyboard otherwise). --> +- <merge key="input.x11_driver" type="string">keyboard</merge> ++ <merge key="input.x11_driver" type="string">kbd</merge> + <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" + string="Linux"> + <merge key="input.x11_driver" type="string">evdev</merge> diff --git a/textproc/gxditview/Makefile b/textproc/gxditview/Makefile index 7812b72254e0..6b319085f9b9 100644 --- a/textproc/gxditview/Makefile +++ b/textproc/gxditview/Makefile @@ -7,7 +7,7 @@ PORTNAME= gxditview PORTVERSION= ${GXDVVERSION}${GXDVREVISION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc DISTFILES= # none diff --git a/www/xfce4-smartbookmark-plugin/Makefile b/www/xfce4-smartbookmark-plugin/Makefile index a89b95800dbe..b2ddc4195f9a 100644 --- a/www/xfce4-smartbookmark-plugin/Makefile +++ b/www/xfce4-smartbookmark-plugin/Makefile @@ -7,7 +7,7 @@ PORTNAME= xfce4-smartbookmark-plugin PORTVERSION= 0.4.2 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= www xfce MASTER_SITES= http://goodies.xfce.org/releases/${PORTNAME}/ DIST_SUBDIR= xfce4 diff --git a/x11-clocks/glclock/Makefile b/x11-clocks/glclock/Makefile index 7b9be9668e5a..f59e8d3c7fe0 100644 --- a/x11-clocks/glclock/Makefile +++ b/x11-clocks/glclock/Makefile @@ -7,16 +7,14 @@ PORTNAME= glclock DISTVERSION= 6.0b6.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-clocks MASTER_SITES= http://www.daionet.gr.jp/~masa/archives/ MAINTAINER= trasz@FreeBSD.org COMMENT= OpenGL spinning pocket watch demo and benchmark utility -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut - -USE_GL= yes +USE_GL= glut MAKEFILE= makefile MAKE_ARGS= CC="${CXX}" LN="${CXX}" OPT="${OPT}" \ INCLUDE_PATH="-I${LOCALBASE}/include" \ diff --git a/x11-clocks/xclock/Makefile b/x11-clocks/xclock/Makefile index e7861d5d94bd..2e9e950548d6 100644 --- a/x11-clocks/xclock/Makefile +++ b/x11-clocks/xclock/Makefile @@ -7,6 +7,7 @@ PORTNAME= xclock PORTVERSION= 1.0.3 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11-clocks/xmms-alarm/Makefile b/x11-clocks/xmms-alarm/Makefile index 8164c9c30b93..83ced2cf5be7 100644 --- a/x11-clocks/xmms-alarm/Makefile +++ b/x11-clocks/xmms-alarm/Makefile @@ -7,7 +7,7 @@ PORTNAME= xmms-alarm PORTVERSION= 0.3.7 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-clocks MASTER_SITES= http://www.snika.uklinux.net/xmms-alarm/ diff --git a/x11-drivers/Makefile b/x11-drivers/Makefile index 1b0bc5670bfb..075f104b8316 100644 --- a/x11-drivers/Makefile +++ b/x11-drivers/Makefile @@ -4,7 +4,6 @@ COMMENT = X11 drivers SUBDIR += input-wacom - SUBDIR += synaptics SUBDIR += xf86-input-acecad SUBDIR += xf86-input-calcomp SUBDIR += xf86-input-citron @@ -27,6 +26,7 @@ SUBDIR += xf86-input-penmount SUBDIR += xf86-input-spaceorb SUBDIR += xf86-input-summa + SUBDIR += xf86-input-synaptics SUBDIR += xf86-input-tek4957 SUBDIR += xf86-input-vmmouse SUBDIR += xf86-input-void diff --git a/x11-drivers/synaptics/Makefile b/x11-drivers/synaptics/Makefile deleted file mode 100644 index a7c3ee4e49c4..000000000000 --- a/x11-drivers/synaptics/Makefile +++ /dev/null @@ -1,61 +0,0 @@ -# New ports collection makefile for: synaptics -# Date created: 2004-01-02 -# Whom: nork@FreeBSD.org -# -# $FreeBSD$ -# - -PORTNAME= synaptics -PORTVERSION= 0.14.6 -PORTREVISION= 6 -CATEGORIES= x11-drivers -MASTER_SITES= http://web.telia.com/~u89404340/touchpad/files/:synaptics -DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:synaptics \ - ${X_DISTFILES:C/$/:x11/} -EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} - -MAINTAINER= nork@FreeBSD.org -COMMENT= The Synaptics touchpad X driver - -USE_XORG= xorg-server xi xproto -USE_BZIP2= yes -USE_GMAKE= yes - -.include <bsd.port.pre.mk> - -MASTER_SITES+= ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/:x11 \ - http://xorg.freedesktop.org/releases/individual/xserver/:x11 -DIST_SUBDIR= xorg/xserver -X_DISTFILES= xorg-server-1.4.2.tar.bz2 -EXTRA_PATCHES= ${FILESDIR}/extra-xorg-server-1.4 - -post-patch: - @${REINPLACE_CMD} 's|\(ALLINCLUDES = -I.\)|\1 -I${LOCALBASE}/include -I${LOCALBASE}/include/pixman-1|' \ - ${WRKSRC}/Makefile - -MAKE_ENV= TOP=${WRKDIR}/xc CFLAGSCLIENT="${CFLAGS}" - -MAN1= synclient.1 # syndaemon.1 -MAN5= synaptics.5 -PORTDOCS= COMPATIBILITY FILES INSTALL INSTALL.DE INSTALL.FR \ - README README.alps TODO - -post-extract: -.for FILE in ${X_DISTFILES} - @cd ${WRKDIR} && \ - ${GZIP_CMD} -dc ${_DISTDIR}/${FILE} | ${TAR} -xf - -.endfor - -pre-install: - ${MKDIR} ${LOCALBASE}/lib/xorg/modules/input/ - -post-install: -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -.for FILE in ${PORTDOCS} - @${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR} -.endfor -.endif - @${CAT} ${PKGMESSAGE} - -.include <bsd.port.post.mk> diff --git a/x11-drivers/synaptics/distinfo b/x11-drivers/synaptics/distinfo deleted file mode 100644 index 1712be2a2998..000000000000 --- a/x11-drivers/synaptics/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -MD5 (xorg/xserver/synaptics-0.14.6.tar.bz2) = 1102cd575045640a064ab6f9b1e391af -SHA256 (xorg/xserver/synaptics-0.14.6.tar.bz2) = f88b967258a0484b0aa02f26acfb31a70cc8afd4872608b7f81c44dc29ae8429 -SIZE (xorg/xserver/synaptics-0.14.6.tar.bz2) = 126833 -MD5 (xorg/xserver/xorg-server-1.4.2.tar.bz2) = fa2915ae377f61c340a18ebef484b64b -SHA256 (xorg/xserver/xorg-server-1.4.2.tar.bz2) = 829c66ec4c295822700067c87afae796b8e67530cc65a7b83060ea29a4ff316d -SIZE (xorg/xserver/xorg-server-1.4.2.tar.bz2) = 6216638 diff --git a/x11-drivers/synaptics/files/extra-xorg-server-1.4 b/x11-drivers/synaptics/files/extra-xorg-server-1.4 deleted file mode 100644 index d6f2ab11f0a7..000000000000 --- a/x11-drivers/synaptics/files/extra-xorg-server-1.4 +++ /dev/null @@ -1,63 +0,0 @@ -diff -u Makefile.orig Makefile ---- Makefile.orig 2006-07-15 17:58:26.000000000 +0200 -+++ Makefile 2007-09-07 15:03:17.386179198 +0200 -@@ -34,10 +34,9 @@ - LDCOMBINEFLAGS = -shared -lc - PICFLAG = $(call check_gcc,-fPIC,) - X_INCLUDES_ROOT = $(INSTALLED_X) -- SDKDIR = $(shell pkg-config xorg-server --variable=sdkdir) - ALLINCLUDES = -I. -I$(INSTALLED_X)/include/X11 \ - -I$(INSTALLED_X)/include/X11/extensions \ -- -I$(SDKDIR) -+ `pkg-config xorg-server --cflags` - else - INSTALLED_X = /usr/X11R6 - INPUT_MODULE_DIR = $(DESTDIR)/$(INSTALLED_X)/$(LIBDIR)/modules/input -diff -u synaptics.c.orig synaptics.c ---- synaptics.c.orig 2006-07-15 17:54:29.000000000 +0200 -+++ synaptics.c 2007-09-07 15:10:24.910542275 +0200 -@@ -321,7 +321,9 @@ - local->private_flags = 0; - local->flags = XI86_POINTER_CAPABLE | XI86_SEND_DRAG_EVENTS; - local->conf_idev = dev; -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 - local->motion_history_proc = xf86GetMotionEvents; -+#endif - local->history_size = 0; - local->always_core_feedback = 0; - -@@ -613,8 +615,17 @@ - - InitPointerDeviceStruct((DevicePtr)dev, map, - SYN_MAX_BUTTONS, -- miPointerGetMotionEvents, SynapticsCtrl, -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 -+ miPointerGetMotionEvents, -+#else -+ GetMotionHistory, -+#endif -+ SynapticsCtrl, -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 - miPointerGetMotionBufferSize()); -+#else -+ GetMotionHistorySize(), 2); -+#endif - - /* X valuator */ - xf86InitValuatorAxisStruct(dev, 0, 0, -1, 1, 0, 1); -diff -u synaptics.h.orig synaptics.h ---- synaptics.h.orig 2006-07-15 17:54:29.000000000 +0200 -+++ synaptics.h 2007-09-07 15:10:12.409829887 +0200 -@@ -226,5 +226,11 @@ - - #endif /* SYNAPTICS_PRIVATE */ - -+/* Previously found in xf86Xinput.h */ -+#ifdef DBG -+#undef DBG -+#endif -+ -+#define DBG(lvl, f) {if ((lvl) <= xf86GetVerbosity()) f;} - - #endif /* _SYNAPTICS_H_ */ - diff --git a/x11-drivers/synaptics/files/patch-Makefile b/x11-drivers/synaptics/files/patch-Makefile deleted file mode 100644 index 58bc8c599b5d..000000000000 --- a/x11-drivers/synaptics/files/patch-Makefile +++ /dev/null @@ -1,100 +0,0 @@ ---- Makefile.orig Sun Jul 16 00:58:26 2006 -+++ Makefile Sun Aug 13 10:47:35 2006 -@@ -12,14 +12,14 @@ - MANDIR = $(DESTDIR)$(PREFIX)/man - - ifeq ($(ARCH),) -- ARCH = $(shell /bin/arch) -+ ARCH = $(shell uname -m) - endif - ifeq ($(ARCH),amd64) -- ARCH = x86_64 -+ override ARCH = x86_64 - endif - ifeq ($(ARCH),x86_64) - ARCH_DEFINES = -D__x86_64__ -D_XSERVER64 -- LIBDIR = lib64 -+ LIBDIR = lib - else - ARCH_DEFINES = -D__i386__ - LIBDIR = lib -@@ -39,7 +39,7 @@ - -I$(INSTALLED_X)/include/X11/extensions \ - -I$(SDKDIR) - else -- INSTALLED_X = /usr/X11R6 -+ INSTALLED_X = ${LOCALBASE} - INPUT_MODULE_DIR = $(DESTDIR)/$(INSTALLED_X)/$(LIBDIR)/modules/input - SYNAPTICS_DRV = synaptics_drv.o - LDCOMBINEFLAGS = -r -@@ -62,12 +62,16 @@ - else - SERVERSRC = $(TOP)/programs/Xserver - ALLINCLUDES = -I. \ -+ -I${LOCALBASE}/include \ -+ -I${LOCALBASE}/include/X11 \ -+ -I$(SERVERSRC)/hw/xfree86 \ - -I$(SERVERSRC)/hw/xfree86/common \ - -I$(SERVERSRC)/hw/xfree86/os-support \ -+ -I$(SERVERSRC)/hw/xfree86/os-support/bus \ - -I$(SERVERSRC)/mi \ - -I$(SERVERSRC)/include \ - -I$(TOP)/include -- X_INCLUDES_ROOT = $(TOP) -+ X_INCLUDES_ROOT = $(LOCALBASE) - endif - endif - -@@ -81,11 +85,11 @@ - - CCOPTIONS := -pedantic -Wall -Wpointer-arith - CCOPTIONS += $(call check_gcc,-fno-merge-constants,) --CDEBUGFLAGS = -O2 --CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(PICFLAG) $(ALLDEFINES) -DVERSION="\"$(VERSION)\"" -DVERSION_ID="$(VERSION_ID)" --CFLAGSCLIENT = $(CDEBUGFLAGS) $(CCOPTIONS) -DVERSION="\"$(VERSION)\"" -DVERSION_ID="$(VERSION_ID)" -I$(X_INCLUDES_ROOT)/include -+#CDEBUGFLAGS = -O2 -+CFLAGS += $(CDEBUGFLAGS) $(CCOPTIONS) $(PICFLAG) $(ALLDEFINES) -DVERSION="\"$(VERSION)\"" -DVERSION_ID="$(VERSION_ID)" -+CFLAGSCLIENT += $(CCOPTIONS) -DVERSION="\"$(VERSION)\"" -DVERSION_ID="$(VERSION_ID)" -I$(X_INCLUDES_ROOT)/include - --CC = gcc -+#CC = gcc - - SRCS = synaptics.c ps2comm.c eventcomm.c psmcomm.c alpscomm.c - OBJS = synaptics.o ps2comm.o eventcomm.o psmcomm.o alpscomm.o -@@ -94,29 +98,29 @@ - $(RM) $@ - $(CC) -c $(CFLAGS) $(_NOOP_) $*.c - --all:: $(SYNAPTICS_DRV) synclient syndaemon -+all:: $(SYNAPTICS_DRV) synclient - --install: $(BINDIR)/synclient $(BINDIR)/syndaemon $(INPUT_MODULE_DIR)/$(SYNAPTICS_DRV) install-man -+install: $(BINDIR)/synclient $(INPUT_MODULE_DIR)/$(SYNAPTICS_DRV) install-man - --install-man: $(MANDIR)/man1/synclient.1 $(MANDIR)/man1/syndaemon.1 $(MANDIR)/man5/synaptics.5 -+install-man: $(MANDIR)/man1/synclient.1 $(MANDIR)/man5/synaptics.5 - - $(MANDIR)/man1/synclient.1: manpages/synclient.1 -- install --mode=0644 -D $< $@ -+ ${BSD_INSTALL_MAN} $< $@ - - $(MANDIR)/man1/syndaemon.1: manpages/syndaemon.1 - install --mode=0644 -D $< $@ - - $(MANDIR)/man5/synaptics.5: manpages/synaptics.5 -- install --mode=0644 -D $< $@ -+ ${BSD_INSTALL_MAN} $< $@ - - $(BINDIR)/synclient : synclient -- install -D $< $@ -+ ${BSD_INSTALL_PROGRAM} $< $@ - - $(BINDIR)/syndaemon : syndaemon - install -D $< $@ - - $(INPUT_MODULE_DIR)/$(SYNAPTICS_DRV) : $(SYNAPTICS_DRV) -- install --mode=0644 -D $< $@ -+ ${BSD_INSTALL_DATA} $< $@ - - $(SYNAPTICS_DRV): $(OBJS) - $(RM) $@ diff --git a/x11-drivers/synaptics/files/patch-eventcomm.c b/x11-drivers/synaptics/files/patch-eventcomm.c deleted file mode 100644 index 0fbcfefe6d27..000000000000 --- a/x11-drivers/synaptics/files/patch-eventcomm.c +++ /dev/null @@ -1,20 +0,0 @@ ---- eventcomm.c.orig Mon Aug 8 04:44:04 2005 -+++ eventcomm.c Sat Mar 18 18:54:22 2006 -@@ -55,6 +55,7 @@ - static Bool - event_query_is_touchpad(int fd) - { -+#if 0 - int ret; - unsigned long evbits[NBITS(KEY_MAX)]; - -@@ -83,6 +84,9 @@ - return FALSE; - - return TRUE; -+#else -+ return FALSE; -+#endif - } - - static Bool diff --git a/x11-drivers/synaptics/pkg-descr b/x11-drivers/synaptics/pkg-descr deleted file mode 100644 index 009694de864a..000000000000 --- a/x11-drivers/synaptics/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -This is a driver for the Synaptics TouchPad for XOrg/XFree86 4.x. -A Synaptics touchpad by default operates in compatibility mode by -emulating a standard mouse. However, by using a dedicated driver, -more advanced features of the touchpad becomes available. - -WWW: http://web.telia.com/~u89404340/touchpad/ diff --git a/x11-drivers/synaptics/pkg-message b/x11-drivers/synaptics/pkg-message deleted file mode 100644 index fb6808b99934..000000000000 --- a/x11-drivers/synaptics/pkg-message +++ /dev/null @@ -1,92 +0,0 @@ -=============================================================================== - - * SETUP NOTE * SETUP NOTE * - -o Add boot time tunable to /boot/loader.conf. - Set hw.psm.synaptics_support=1 and shutdown -r now! - -/boot/loader.conf --------------------------------- -hw.psm.synaptics_support=1 ---------------------------------------------------- - -o Don't run moused(8) daemon. - Dont' set moused_enable="YES" in /etc/rc.conf. - -/etc/rc.conf -------------------------------------- -moused_enable="NO" ---------------------------------------------------- - -o Set your /etc/xorg.conf (or /etc/XF86Config) - Adopt your environment. This is a sample configration, and - following setting is mine. You may want to change the - values of *Edge and *Delta. - - *NOTE* - Please disable your existing "CorePointer" in "ServerLayout" - section, only use "Synaptics_Touchpad" CorePointer. - - * IMPORTANT NOTICE * - Please set *AllowEmptyInput* option at ServerFlags section. - -/etc/xorg.conf (or /etc/XF86Config) --------------- - : -Section "Module" - : - Load "synaptics" -EndSection - -Section "ServerFlags" - : - Option "AllowEmptyInput" -EndSection - -Section "ServerLayout" - : -# InputDevice "Standard_PS/2_Mouse" "CorePointer" - InputDevice "Synaptics_Touchpad" "CorePointer" -EndSection - -Section "InputDevice" - Identifier "Synaptics_Touchpad" - Driver "synaptics" - - Option "Device" "/dev/psm0" - Option "Protocol" "psm" - - Option "LeftEdge" "1700" - Option "RightEdge" "5300" - Option "TopEdge" "1700" - Option "BottomEdge" "4200" - - Option "FingerLow" "25" - Option "FingerHigh" "30" - - Option "MaxTapTime" "180" - Option "MaxTapMove" "220" - - Option "VertScrollDelta" "100" - Option "HorizScrollDelta" "100" - - Option "MinSpeed" "0.06" - Option "MaxSpeed" "0.06" - Option "AccelFactor" "0.0010" - - Option "ScrollButtonRepeat" "100" - Option "UpDownScrolling" "on" - Option "UpDownRepeat" "on" - Option "LeftRightScrolling" "on" - Option "LeftRightRepeat" "on" - - # "SHMConfig on" seems good works with synclient(1). But this - # options is insecure. I recommended "off" as default. - Option "SHMConfig" "off" - - # If you use circular touchpad, uncomment them. -# Option "CircularPad" "on" -# Option "CircularScrolling" "on" -# Option "CircScrollDelta" "0.5" -EndSection - : -/etc/xorg.conf (or /etc/XF86Config) --------------- - -=============================================================================== diff --git a/x11-drivers/synaptics/pkg-plist b/x11-drivers/synaptics/pkg-plist deleted file mode 100644 index 342a06bea1e8..000000000000 --- a/x11-drivers/synaptics/pkg-plist +++ /dev/null @@ -1,6 +0,0 @@ -bin/synclient -@comment bin/syndaemon -lib/xorg/modules/input/synaptics_drv.so -@dirrmtry lib/xorg/modules/input -@dirrmtry lib/xorg/modules -@dirrmtry lib/xorg diff --git a/x11-drivers/xf86-input-acecad/Makefile b/x11-drivers/xf86-input-acecad/Makefile index e9050aa93506..85fd64117c6a 100644 --- a/x11-drivers/xf86-input-acecad/Makefile +++ b/x11-drivers/xf86-input-acecad/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-input-acecad -PORTVERSION= 1.2.1 -PORTREVISION= 1 +PORTVERSION= 1.2.2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-acecad/distinfo b/x11-drivers/xf86-input-acecad/distinfo index b76810fe5bcd..78a38abe0e7e 100644 --- a/x11-drivers/xf86-input-acecad/distinfo +++ b/x11-drivers/xf86-input-acecad/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-input-acecad-1.2.1.tar.bz2) = 2c371317f2aae34c04db63c19759a44e -SHA256 (xorg/driver/xf86-input-acecad-1.2.1.tar.bz2) = 07d2f8a1153d34a6516b8f1129fc32a18f2862bbb58c9bad4637fb282d60385a -SIZE (xorg/driver/xf86-input-acecad-1.2.1.tar.bz2) = 230394 +MD5 (xorg/driver/xf86-input-acecad-1.2.2.tar.bz2) = 2d6596b2b0cfa527b5ed4df2014684bf +SHA256 (xorg/driver/xf86-input-acecad-1.2.2.tar.bz2) = 953ebb7d7ed579ce648dd6f6a25307c37ad8230a0336ec6fc58247732835f26e +SIZE (xorg/driver/xf86-input-acecad-1.2.2.tar.bz2) = 230781 diff --git a/x11-drivers/xf86-input-calcomp/Makefile b/x11-drivers/xf86-input-calcomp/Makefile index ab057ab8adce..c574814367ca 100644 --- a/x11-drivers/xf86-input-calcomp/Makefile +++ b/x11-drivers/xf86-input-calcomp/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-input-calcomp -PORTVERSION= 1.1.1 -PORTREVISION= 1 +PORTVERSION= 1.1.2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-calcomp/distinfo b/x11-drivers/xf86-input-calcomp/distinfo index c41442399067..6d652532cf60 100644 --- a/x11-drivers/xf86-input-calcomp/distinfo +++ b/x11-drivers/xf86-input-calcomp/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-input-calcomp-1.1.1.tar.bz2) = 689099e2ade8a8c9f68f82fdf569b3ad -SHA256 (xorg/driver/xf86-input-calcomp-1.1.1.tar.bz2) = 8117b37da2e031eb983e1e98034710a1511299496fcf235f936caff252fa8957 -SIZE (xorg/driver/xf86-input-calcomp-1.1.1.tar.bz2) = 225927 +MD5 (xorg/driver/xf86-input-calcomp-1.1.2.tar.bz2) = ebc9a64dc72ae3015c16011bbd2d3557 +SHA256 (xorg/driver/xf86-input-calcomp-1.1.2.tar.bz2) = bf6edb9d78c90952a16c8bab9e69aebb3e1361e4423ec90e47df57e8c873254b +SIZE (xorg/driver/xf86-input-calcomp-1.1.2.tar.bz2) = 244642 diff --git a/x11-drivers/xf86-input-digitaledge/Makefile b/x11-drivers/xf86-input-digitaledge/Makefile index 0fa62ba51d45..5d4282a92b3b 100644 --- a/x11-drivers/xf86-input-digitaledge/Makefile +++ b/x11-drivers/xf86-input-digitaledge/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-input-digitaledge -PORTVERSION= 1.1.0 -PORTREVISION= 1 +PORTVERSION= 1.1.1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-digitaledge/distinfo b/x11-drivers/xf86-input-digitaledge/distinfo index 8fe3d8ba77a6..ee055fffbcd2 100644 --- a/x11-drivers/xf86-input-digitaledge/distinfo +++ b/x11-drivers/xf86-input-digitaledge/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-input-digitaledge-1.1.0.tar.bz2) = 53461c34cc0712aacab92b820b9fcb84 -SHA256 (xorg/driver/xf86-input-digitaledge-1.1.0.tar.bz2) = 24001f19b46b5bc2fcf8212f04863e4efa90175fac797350525e14848ab98a38 -SIZE (xorg/driver/xf86-input-digitaledge-1.1.0.tar.bz2) = 232925 +MD5 (xorg/driver/xf86-input-digitaledge-1.1.1.tar.bz2) = 4c27e0f3c6447e76df39a837fd46a00f +SHA256 (xorg/driver/xf86-input-digitaledge-1.1.1.tar.bz2) = ded010f82b1dbb57b1ee0ad6707902b31540e0592c94d6bbf3b43a7a35220775 +SIZE (xorg/driver/xf86-input-digitaledge-1.1.1.tar.bz2) = 242609 diff --git a/x11-drivers/xf86-input-dmc/Makefile b/x11-drivers/xf86-input-dmc/Makefile index 45c87e5012b4..da424c4c6d02 100644 --- a/x11-drivers/xf86-input-dmc/Makefile +++ b/x11-drivers/xf86-input-dmc/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-input-dmc -PORTVERSION= 1.1.1 -PORTREVISION= 1 +PORTVERSION= 1.1.2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-dmc/distinfo b/x11-drivers/xf86-input-dmc/distinfo index cc33e98bfbf4..401682bebc4c 100644 --- a/x11-drivers/xf86-input-dmc/distinfo +++ b/x11-drivers/xf86-input-dmc/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-input-dmc-1.1.1.tar.bz2) = f21f008220bc7687ce1c34ab557ec32f -SHA256 (xorg/driver/xf86-input-dmc-1.1.1.tar.bz2) = f98c5a7010fa71cee88b4c2470e5cd804e42dfbc5292cf1c20eb75e9b1814002 -SIZE (xorg/driver/xf86-input-dmc-1.1.1.tar.bz2) = 223565 +MD5 (xorg/driver/xf86-input-dmc-1.1.2.tar.bz2) = 91021ea8f3593221c0d9ee9cc14deb48 +SHA256 (xorg/driver/xf86-input-dmc-1.1.2.tar.bz2) = b6f4eb367ab1aa7da5ac5218953d7cdde409c9ddf59f6cb6b2e1aa2789b3f361 +SIZE (xorg/driver/xf86-input-dmc-1.1.2.tar.bz2) = 241971 diff --git a/x11-drivers/xf86-input-dynapro/Makefile b/x11-drivers/xf86-input-dynapro/Makefile index 61950944fb99..5acfa4954158 100644 --- a/x11-drivers/xf86-input-dynapro/Makefile +++ b/x11-drivers/xf86-input-dynapro/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-input-dynapro -PORTVERSION= 1.1.1 -PORTREVISION= 1 +PORTVERSION= 1.1.2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-dynapro/distinfo b/x11-drivers/xf86-input-dynapro/distinfo index 4bf7cc30a455..0ae43f0a7e23 100644 --- a/x11-drivers/xf86-input-dynapro/distinfo +++ b/x11-drivers/xf86-input-dynapro/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-input-dynapro-1.1.1.tar.bz2) = d47be12a230c44a05d56d6b79ebcfc38 -SHA256 (xorg/driver/xf86-input-dynapro-1.1.1.tar.bz2) = ed0f1ba81febf8e7a20cfaf32b021fcaa102af37f3070d67d6a101eeb6964992 -SIZE (xorg/driver/xf86-input-dynapro-1.1.1.tar.bz2) = 222619 +MD5 (xorg/driver/xf86-input-dynapro-1.1.2.tar.bz2) = ceb5efbd3d62e24ab3a5f9f180777f7c +SHA256 (xorg/driver/xf86-input-dynapro-1.1.2.tar.bz2) = 55b7b2e950331292ec05c81d566af6d1000ac3cf904068964c3b9d43cea4deec +SIZE (xorg/driver/xf86-input-dynapro-1.1.2.tar.bz2) = 241219 diff --git a/x11-drivers/xf86-input-elo2300/Makefile b/x11-drivers/xf86-input-elo2300/Makefile index 9e383316ca00..2282f38804b9 100644 --- a/x11-drivers/xf86-input-elo2300/Makefile +++ b/x11-drivers/xf86-input-elo2300/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-input-elo2300 -PORTVERSION= 1.1.1 -PORTREVISION= 1 +PORTVERSION= 1.1.2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-elo2300/distinfo b/x11-drivers/xf86-input-elo2300/distinfo index 3dc0e127131c..1e47179274b0 100644 --- a/x11-drivers/xf86-input-elo2300/distinfo +++ b/x11-drivers/xf86-input-elo2300/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-input-elo2300-1.1.1.tar.bz2) = 4eef20f44954d49571a10b9134fdb663 -SHA256 (xorg/driver/xf86-input-elo2300-1.1.1.tar.bz2) = cc2cd97f49cce1795ea74034b1416ff7cd5107e1a69258b09a741d55a98ba005 -SIZE (xorg/driver/xf86-input-elo2300-1.1.1.tar.bz2) = 225191 +MD5 (xorg/driver/xf86-input-elo2300-1.1.2.tar.bz2) = 611d0a77a80286bc926dd3c414e59555 +SHA256 (xorg/driver/xf86-input-elo2300-1.1.2.tar.bz2) = ce575f79a5a93f4129a4e63572911d54cdc6640abc303afeb3c74741bb3c9627 +SIZE (xorg/driver/xf86-input-elo2300-1.1.2.tar.bz2) = 244443 diff --git a/x11-drivers/xf86-input-elographics/Makefile b/x11-drivers/xf86-input-elographics/Makefile index 326554f7b41f..b079eab95732 100644 --- a/x11-drivers/xf86-input-elographics/Makefile +++ b/x11-drivers/xf86-input-elographics/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-input-elographics -PORTVERSION= 1.1.0 -PORTREVISION= 1 +PORTVERSION= 1.2.3 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-elographics/distinfo b/x11-drivers/xf86-input-elographics/distinfo index ad1f75673b19..9d554d838b7e 100644 --- a/x11-drivers/xf86-input-elographics/distinfo +++ b/x11-drivers/xf86-input-elographics/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-input-elographics-1.1.0.tar.bz2) = ecb2bf1f800d4f5f4c295f2a0e6b1de7 -SHA256 (xorg/driver/xf86-input-elographics-1.1.0.tar.bz2) = 1583e1dae6e3ecd34ba55deae7dfc052efede0378f852de6224308d7e7d5b2d8 -SIZE (xorg/driver/xf86-input-elographics-1.1.0.tar.bz2) = 236648 +MD5 (xorg/driver/xf86-input-elographics-1.2.3.tar.bz2) = cc2923460c8eff9652b01889a063058d +SHA256 (xorg/driver/xf86-input-elographics-1.2.3.tar.bz2) = 67550c8f4a85a8029f08880adf487e2efd4585e7adbe8da357fbd49750b08d8f +SIZE (xorg/driver/xf86-input-elographics-1.2.3.tar.bz2) = 251743 diff --git a/x11-drivers/xf86-input-fpit/Makefile b/x11-drivers/xf86-input-fpit/Makefile index 292a8a0ce12f..92cb18099d4d 100644 --- a/x11-drivers/xf86-input-fpit/Makefile +++ b/x11-drivers/xf86-input-fpit/Makefile @@ -6,14 +6,15 @@ # PORTNAME= xf86-input-fpit -PORTVERSION= 1.1.0 -PORTREVISION= 1 +PORTVERSION= 1.2.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org fpit input driver XORG_CAT= driver +USE_XORG= xrandr + MAN4= fpit.4x .include <bsd.port.mk> diff --git a/x11-drivers/xf86-input-fpit/distinfo b/x11-drivers/xf86-input-fpit/distinfo index a4c1fbe0592f..86316bbd0151 100644 --- a/x11-drivers/xf86-input-fpit/distinfo +++ b/x11-drivers/xf86-input-fpit/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-input-fpit-1.1.0.tar.bz2) = a31066a2076d18619ceaea67f6d89698 -SHA256 (xorg/driver/xf86-input-fpit-1.1.0.tar.bz2) = 8ee3b2df90516182460fbda025153aa7fb2c6ba343e4239d225963a287f694f8 -SIZE (xorg/driver/xf86-input-fpit-1.1.0.tar.bz2) = 232340 +MD5 (xorg/driver/xf86-input-fpit-1.2.0.tar.bz2) = 0f3e013d5ff58e0aba3d9e1d18830291 +SHA256 (xorg/driver/xf86-input-fpit-1.2.0.tar.bz2) = 87e3dd97d57ddb520cafa5e68fa7846cfc3d9d71cb054cdf0e1d650c7b1cff7e +SIZE (xorg/driver/xf86-input-fpit-1.2.0.tar.bz2) = 242815 diff --git a/x11-drivers/xf86-input-hyperpen/Makefile b/x11-drivers/xf86-input-hyperpen/Makefile index 8444423558f0..31e2fb3036c7 100644 --- a/x11-drivers/xf86-input-hyperpen/Makefile +++ b/x11-drivers/xf86-input-hyperpen/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-input-hyperpen -PORTVERSION= 1.1.0 -PORTREVISION= 1 +PORTVERSION= 1.2.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-hyperpen/distinfo b/x11-drivers/xf86-input-hyperpen/distinfo index bdff1d50303b..c6af6e015c5b 100644 --- a/x11-drivers/xf86-input-hyperpen/distinfo +++ b/x11-drivers/xf86-input-hyperpen/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-input-hyperpen-1.1.0.tar.bz2) = 1dfccb75069e61e0c6f990b47eb58c40 -SHA256 (xorg/driver/xf86-input-hyperpen-1.1.0.tar.bz2) = d1c20a3340e06c5634759832dcf2edc6acb41476a4f637eba6880730e607f493 -SIZE (xorg/driver/xf86-input-hyperpen-1.1.0.tar.bz2) = 235132 +MD5 (xorg/driver/xf86-input-hyperpen-1.2.0.tar.bz2) = 175c1e1ad668ebbbe212c1e975dd14f9 +SHA256 (xorg/driver/xf86-input-hyperpen-1.2.0.tar.bz2) = 689d1c5c1f21eed00ae03a01c57482f7bbef36d7e07156556c99febe28c7d413 +SIZE (xorg/driver/xf86-input-hyperpen-1.2.0.tar.bz2) = 244682 diff --git a/x11-drivers/xf86-input-jamstudio/Makefile b/x11-drivers/xf86-input-jamstudio/Makefile index 2b770e12281a..83605d9684c6 100644 --- a/x11-drivers/xf86-input-jamstudio/Makefile +++ b/x11-drivers/xf86-input-jamstudio/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-input-jamstudio -PORTVERSION= 1.1.0 -PORTREVISION= 1 +PORTVERSION= 1.2.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-jamstudio/distinfo b/x11-drivers/xf86-input-jamstudio/distinfo index 6bb120620b44..b6e86cc94a2d 100644 --- a/x11-drivers/xf86-input-jamstudio/distinfo +++ b/x11-drivers/xf86-input-jamstudio/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-input-jamstudio-1.1.0.tar.bz2) = a32e36a24545791a3408cdc5563b6523 -SHA256 (xorg/driver/xf86-input-jamstudio-1.1.0.tar.bz2) = ce41b360bd08ea31036b79cfc25a32c854147522e4580f5ca1a203233e657e1a -SIZE (xorg/driver/xf86-input-jamstudio-1.1.0.tar.bz2) = 226459 +MD5 (xorg/driver/xf86-input-jamstudio-1.2.0.tar.bz2) = 8011f90d7dd801d26e8c3dd058633978 +SHA256 (xorg/driver/xf86-input-jamstudio-1.2.0.tar.bz2) = c5bbade96f1849b45f665a54e08ac8f9d5a94d31a8a680edc4d3c9361d164ac0 +SIZE (xorg/driver/xf86-input-jamstudio-1.2.0.tar.bz2) = 236377 diff --git a/x11-drivers/xf86-input-joystick/Makefile b/x11-drivers/xf86-input-joystick/Makefile index 86062993af94..01c962317e95 100644 --- a/x11-drivers/xf86-input-joystick/Makefile +++ b/x11-drivers/xf86-input-joystick/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-input-joystick -PORTVERSION= 1.2.3 -PORTREVISION= 1 +PORTVERSION= 1.4.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org @@ -17,4 +16,8 @@ XORG_CAT= driver MAN4= joystick.4x +post-patch: + @${REINPLACE_CMD} -e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \ + ${WRKSRC}/Makefile.in + .include <bsd.port.mk> diff --git a/x11-drivers/xf86-input-joystick/distinfo b/x11-drivers/xf86-input-joystick/distinfo index b15366ed7b32..0c801d16cec8 100644 --- a/x11-drivers/xf86-input-joystick/distinfo +++ b/x11-drivers/xf86-input-joystick/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-input-joystick-1.2.3.tar.bz2) = 41f33b1a18c576433222d8b6ca22c738 -SHA256 (xorg/driver/xf86-input-joystick-1.2.3.tar.bz2) = 708e01ca0f0e12a94f20566c18edc8ca71063dbc4c00e2cd78300236ee5954f7 -SIZE (xorg/driver/xf86-input-joystick-1.2.3.tar.bz2) = 239917 +MD5 (xorg/driver/xf86-input-joystick-1.4.0.tar.bz2) = 600bca5bd96a0dee90e20b606aa1eb93 +SHA256 (xorg/driver/xf86-input-joystick-1.4.0.tar.bz2) = 789d9a3e1346ad24cc41c4f466de3eda08473772305c5e4bef2afa159e66c4c2 +SIZE (xorg/driver/xf86-input-joystick-1.4.0.tar.bz2) = 305610 diff --git a/x11-drivers/xf86-input-joystick/pkg-plist b/x11-drivers/xf86-input-joystick/pkg-plist index 358a463f054f..2c94a5896b99 100644 --- a/x11-drivers/xf86-input-joystick/pkg-plist +++ b/x11-drivers/xf86-input-joystick/pkg-plist @@ -1,5 +1,8 @@ +include/xorg/joystick-properties.h lib/xorg/modules/input/joystick_drv.la lib/xorg/modules/input/joystick_drv.so +libdata/pkgconfig/xorg-joystick.pc @dirrmtry lib/xorg/modules/input @dirrmtry lib/xorg/modules @dirrmtry lib/xorg +@dirrmtry include/xorg diff --git a/x11-drivers/xf86-input-keyboard/Makefile b/x11-drivers/xf86-input-keyboard/Makefile index 46aad51de982..5b6e29dd7510 100644 --- a/x11-drivers/xf86-input-keyboard/Makefile +++ b/x11-drivers/xf86-input-keyboard/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-input-keyboard -PORTVERSION= 1.2.2 -PORTREVISION= 2 +PORTVERSION= 1.3.2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-keyboard/distinfo b/x11-drivers/xf86-input-keyboard/distinfo index 616768134029..87aab6634f0c 100644 --- a/x11-drivers/xf86-input-keyboard/distinfo +++ b/x11-drivers/xf86-input-keyboard/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-input-keyboard-1.2.2.tar.bz2) = ab3122921f6359c54e250879288ffd47 -SHA256 (xorg/driver/xf86-input-keyboard-1.2.2.tar.bz2) = c25b35524eaf00928d97bd0d8bf9e489d92993b133461b5f4d8d9655d37ec072 -SIZE (xorg/driver/xf86-input-keyboard-1.2.2.tar.bz2) = 245665 +MD5 (xorg/driver/xf86-input-keyboard-1.3.2.tar.bz2) = d6fe929c4f6085d6dd67f197ae9c42f6 +SHA256 (xorg/driver/xf86-input-keyboard-1.3.2.tar.bz2) = 33939ec65dbf56f49e1e7de854a1cf95446e40c533950431901567e67112aef2 +SIZE (xorg/driver/xf86-input-keyboard-1.3.2.tar.bz2) = 269634 diff --git a/x11-drivers/xf86-input-magellan/Makefile b/x11-drivers/xf86-input-magellan/Makefile index 6cf2f290ac99..8dcbdc33cbcb 100644 --- a/x11-drivers/xf86-input-magellan/Makefile +++ b/x11-drivers/xf86-input-magellan/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-input-magellan -PORTVERSION= 1.1.1 -PORTREVISION= 1 +PORTVERSION= 1.2.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-magellan/distinfo b/x11-drivers/xf86-input-magellan/distinfo index 736cfcd6f7f1..d2378448b995 100644 --- a/x11-drivers/xf86-input-magellan/distinfo +++ b/x11-drivers/xf86-input-magellan/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-input-magellan-1.1.1.tar.bz2) = 8a966d3b74dc2a801ff09b895037090c -SHA256 (xorg/driver/xf86-input-magellan-1.1.1.tar.bz2) = 06da7d1b222ba47ba0c7fd561965d78f2c8e46f44c998cb768e98bdc3c0e1741 -SIZE (xorg/driver/xf86-input-magellan-1.1.1.tar.bz2) = 223055 +MD5 (xorg/driver/xf86-input-magellan-1.2.0.tar.bz2) = 9801ba10f15f8be2420dfb3f3b5d5d27 +SHA256 (xorg/driver/xf86-input-magellan-1.2.0.tar.bz2) = c5285147a4df0b5b0fd5dcb7c0e5953bc982d3d6f2a2ed2e7767ead909a510e4 +SIZE (xorg/driver/xf86-input-magellan-1.2.0.tar.bz2) = 241520 diff --git a/x11-drivers/xf86-input-magictouch/Makefile b/x11-drivers/xf86-input-magictouch/Makefile index 41fa07c14e1f..87df92e41e84 100644 --- a/x11-drivers/xf86-input-magictouch/Makefile +++ b/x11-drivers/xf86-input-magictouch/Makefile @@ -13,6 +13,8 @@ CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org magictouch input driver +IGNORE= needs xf86_ansic.h which doesn't exist with recent xserver + XORG_CAT= driver MAN4= magictouch.4x USE_AUTOTOOLS= libtool:15 diff --git a/x11-drivers/xf86-input-microtouch/Makefile b/x11-drivers/xf86-input-microtouch/Makefile index da27791fd7ae..c4a0aa3dbc85 100644 --- a/x11-drivers/xf86-input-microtouch/Makefile +++ b/x11-drivers/xf86-input-microtouch/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-input-microtouch -PORTVERSION= 1.1.1 -PORTREVISION= 1 +PORTVERSION= 1.2.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-microtouch/distinfo b/x11-drivers/xf86-input-microtouch/distinfo index 149e9286096d..9b68bdae014f 100644 --- a/x11-drivers/xf86-input-microtouch/distinfo +++ b/x11-drivers/xf86-input-microtouch/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-input-microtouch-1.1.1.tar.bz2) = 9843fbea6cc0c4129e96ce9a6c893cf6 -SHA256 (xorg/driver/xf86-input-microtouch-1.1.1.tar.bz2) = 5f2f0b16705c6226081a452f9f876508c388b384fca69106d377cd134cfddfd3 -SIZE (xorg/driver/xf86-input-microtouch-1.1.1.tar.bz2) = 226034 +MD5 (xorg/driver/xf86-input-microtouch-1.2.0.tar.bz2) = 1ad1aee7d8df84b9ea832d1e75963257 +SHA256 (xorg/driver/xf86-input-microtouch-1.2.0.tar.bz2) = b3034e0a768c4f646ea954d59dd414d00df3238e845848081221af6efe864f3b +SIZE (xorg/driver/xf86-input-microtouch-1.2.0.tar.bz2) = 244712 diff --git a/x11-drivers/xf86-input-mouse/Makefile b/x11-drivers/xf86-input-mouse/Makefile index e271d315f120..b3cd5b4e4463 100644 --- a/x11-drivers/xf86-input-mouse/Makefile +++ b/x11-drivers/xf86-input-mouse/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-input-mouse -PORTVERSION= 1.2.3 -PORTREVISION= 2 +PORTVERSION= 1.4.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-mouse/distinfo b/x11-drivers/xf86-input-mouse/distinfo index f34123fe51b5..9864f5a0bfcf 100644 --- a/x11-drivers/xf86-input-mouse/distinfo +++ b/x11-drivers/xf86-input-mouse/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-input-mouse-1.2.3.tar.bz2) = 47da1fa52584933d045528109f094eff -SHA256 (xorg/driver/xf86-input-mouse-1.2.3.tar.bz2) = a07cb2169f43018c90b7889781c0db30cda0da03811edccb8c4db533166357ab -SIZE (xorg/driver/xf86-input-mouse-1.2.3.tar.bz2) = 272961 +MD5 (xorg/driver/xf86-input-mouse-1.4.0.tar.bz2) = e7dc0759c14a9bfd373917a49e5f7c7d +SHA256 (xorg/driver/xf86-input-mouse-1.4.0.tar.bz2) = e6e1dbd64d41c826619a5881c5aeed46095bfdcb87c3e27d65292fc12a5bb7c7 +SIZE (xorg/driver/xf86-input-mouse-1.4.0.tar.bz2) = 292626 diff --git a/x11-drivers/xf86-input-mouse/files/patch-dont-flush-buttons-6a03e8bd b/x11-drivers/xf86-input-mouse/files/patch-dont-flush-buttons-6a03e8bd deleted file mode 100644 index d1a21ed5f306..000000000000 --- a/x11-drivers/xf86-input-mouse/files/patch-dont-flush-buttons-6a03e8bd +++ /dev/null @@ -1,38 +0,0 @@ -From 6a03e8bd9699a33dabcdd2bbcf51a001ddfd5534 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer <peter@cs.unisa.edu.au> -Date: Fri, 16 Nov 2007 06:15:45 +0000 -Subject: Bug #13144: Don't flush buttons, release events can cause paste events. - ---- -diff --git src/mouse.c src/mouse.c -index ff52d2b..bd98a80 100644 ---- src/mouse.c -+++ src/mouse.c -@@ -1853,26 +1853,17 @@ MouseConvert(InputInfoPtr pInfo, int first, int num, int v0, int v1, int v2, - - /********************************************************************** - * -- * FlushButtons -- send button up events for sanity. -+ * FlushButtons -- reset button states. - * - **********************************************************************/ - - static void - FlushButtons(MouseDevPtr pMse) - { -- -- /* If no button down is pending xf86PostButtonEvent() -- * will discard them. So we are on the safe side. */ -- - int i, blocked; - - pMse->lastButtons = 0; - pMse->lastMappedButtons = 0; -- -- blocked = xf86BlockSIGIO (); -- for (i = 1; i <= 5; i++) -- xf86PostButtonEvent(pMse->device,0,i,0,0,0); -- xf86UnblockSIGIO (blocked); - } - - /********************************************************************** diff --git a/x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c b/x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c new file mode 100644 index 000000000000..b3258c653ad4 --- /dev/null +++ b/x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c @@ -0,0 +1,200 @@ +--- src/bsd_mouse.c.orig 2008-12-13 18:24:06.000000000 -0500 ++++ src/bsd_mouse.c 2008-12-14 22:50:40.000000000 -0500 +@@ -1,4 +1,3 @@ +- + /* + * Copyright (c) 1999-2003 by The XFree86 Project, Inc. + * +@@ -75,11 +74,15 @@ + #define DEFAULT_MOUSE_DEV "/dev/mouse" + #define DEFAULT_SYSMOUSE_DEV "/dev/sysmouse" + #define DEFAULT_PS2_DEV "/dev/psm0" ++#define DEFAULT_USB_DEV "/dev/ums0" + + static const char *mouseDevs[] = { + DEFAULT_MOUSE_DEV, + DEFAULT_SYSMOUSE_DEV, ++#ifndef CONFIG_HAL + DEFAULT_PS2_DEV, ++ DEFAULT_USB_DEV, ++#endif + NULL + }; + #elif (defined(__OpenBSD__) || defined(__NetBSD__)) && defined(WSCONS_SUPPORT) +@@ -100,7 +103,11 @@ + #if defined(__NetBSD__) + return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO; + #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) +- return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO | MSE_MISC; ++ return MSE_SERIAL | MSE_BUS | MSE_PS2 | ++#ifdef XPS2_SUPPORT ++ MSE_XPS2 | ++#endif ++ MSE_AUTO | MSE_MISC; + #else + return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_XPS2 | MSE_AUTO; + #endif +@@ -179,10 +186,31 @@ + { MOUSE_PROTO_THINK, "ThinkingMouse" }, + { MOUSE_PROTO_SYSMOUSE, "SysMouse" } + }; +- ++ ++#ifdef XPS2_SUPPORT ++static struct { ++ int dmodel; ++ char *name; ++} ps2proto[] = { ++ { MOUSE_MODEL_NETSCROLL, "NetScrollPS/2" }, ++ { MOUSE_MODEL_NET, "NetMousePS/2" }, ++ { MOUSE_MODEL_GLIDEPOINT, "GlidePointPS/2" }, ++ { MOUSE_MODEL_THINK, "ThinkingMousePS/2" }, ++ { MOUSE_MODEL_INTELLI, "IMPS/2" }, ++ { MOUSE_MODEL_MOUSEMANPLUS, "MouseManPlusPS/2" }, ++ { MOUSE_MODEL_EXPLORER, "ExplorerPS/2" }, ++ { MOUSE_MODEL_4D, "IMPS/2" }, ++ { MOUSE_MODEL_4DPLUS, "IMPS/2" }, ++}; ++#endif ++ + static const char * + SetupAuto(InputInfoPtr pInfo, int *protoPara) + { ++#ifdef XPS2_SUPPORT ++ char *dev; ++#endif ++ const char *proto; + int i; + mousehw_t hw; + mousemode_t mode; +@@ -190,10 +218,20 @@ + if (pInfo->fd == -1) + return NULL; + ++#ifdef XPS2_SUPPORT + /* set the driver operation level, if applicable */ ++ if ((dev = xf86FindOptionValue(pInfo->options, "Device"))) { ++ if (!strncmp(dev, DEFAULT_PS2_DEV, 8)) ++ i = 2; ++ else ++ i = 1; ++ ioctl(pInfo->fd, MOUSE_SETLEVEL, &i); ++ } ++#else + i = 1; + ioctl(pInfo->fd, MOUSE_SETLEVEL, &i); +- ++#endif ++ + /* interrogate the driver and get some intelligence on the device. */ + hw.iftype = MOUSE_IF_UNKNOWN; + hw.model = MOUSE_MODEL_GENERIC; +@@ -209,9 +247,18 @@ + protoPara[0] = mode.syncmask[0]; + protoPara[1] = mode.syncmask[1]; + } ++ proto = devproto[i].name; ++#ifdef XPS2_SUPPORT ++ if (mode.protocol == MOUSE_PROTO_PS2) ++ for (i = 0; i < sizeof(ps2proto)/sizeof(ps2proto[0]); ++i) ++ if (hw.model == ps2proto[i].dmodel) { ++ proto = ps2proto[i].name; ++ break; ++ } ++#endif + xf86MsgVerb(X_INFO, 3, "%s: SetupAuto: protocol is %s\n", +- pInfo->name, devproto[i].name); +- return devproto[i].name; ++ pInfo->name, proto); ++ return proto; + } + } + } +@@ -234,41 +281,41 @@ + (protocol && xf86NameCmp(protocol, "SysMouse") == 0)) { + /* + * As the FreeBSD sysmouse driver defaults to protocol level 0 +- * everytime it is opened we enforce protocol level 1 again at ++ * everytime it is closed we enforce protocol level 1 again at + * this point. + */ + mode.level = 1; + } else +- mode.level = -1; +-#else +- mode.level = -1; + #endif ++ mode.level = -1; + ioctl(pInfo->fd, MOUSE_SETMODE, &mode); + } + #endif + + #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) +- +-#define MOUSED_PID_FILE "/var/run/moused.pid" +- + /* + * Try to check if moused is running. DEFAULT_SYSMOUSE_DEV is useless without +- * it. There doesn't seem to be a better way of checking. ++ * it. Also, try to check if the device is used by moused. If it is opened ++ * by moused, we do not want to use it directly. There doesn't seem to be ++ * a better way of checking. + */ + static Bool +-MousedRunning(void) ++MousedRunning(const char *dev) + { ++ char cmd[128]; + FILE *f = NULL; +- unsigned int pid; ++ unsigned int i; + +- if ((f = fopen(MOUSED_PID_FILE, "r")) != NULL) { +- if (fscanf(f, "%u", &pid) == 1 && pid > 0) { +- if (kill(pid, 0) == 0) { +- fclose(f); +- return TRUE; +- } ++ if (dev) ++ sprintf(cmd, "sh -c 'fstat %s | grep -c moused' 2>/dev/null", dev); ++ else ++ sprintf(cmd, "sh -c 'pgrep -nx moused' 2>/dev/null"); ++ if ((f = popen(cmd, "r")) != NULL) { ++ if (fscanf(f, "%u", &i) == 1 && i > 0) { ++ pclose(f); ++ return TRUE; + } +- fclose(f); ++ pclose(f); + } + return FALSE; + } +@@ -308,15 +355,12 @@ + devMouse = FALSE; + } + close(fd); +- if (MousedRunning()) ++ if (MousedRunning(NULL)) + break; +- else { +-#ifdef DEBUG +- ErrorF("moused isn't running\n"); +-#endif +- } + } else { + close(fd); ++ if (MousedRunning(*pdev)) ++ continue; + break; + } + } +@@ -782,7 +826,9 @@ + p->CheckProtocol = CheckProtocol; + #if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)) && defined(MOUSE_PROTO_SYSMOUSE) + p->SetupAuto = SetupAuto; ++#ifndef XPS2_SUPPORT + p->SetPS2Res = SetSysMouseRes; ++#endif + p->SetBMRes = SetSysMouseRes; + p->SetMiscRes = SetSysMouseRes; + #endif diff --git a/x11-drivers/xf86-input-mutouch/Makefile b/x11-drivers/xf86-input-mutouch/Makefile index bf3b5608f9e9..ddc8cd1d13d3 100644 --- a/x11-drivers/xf86-input-mutouch/Makefile +++ b/x11-drivers/xf86-input-mutouch/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-input-mutouch -PORTVERSION= 1.1.0 -PORTREVISION= 1 +PORTVERSION= 1.2.1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-mutouch/distinfo b/x11-drivers/xf86-input-mutouch/distinfo index 591d113a6c22..f0c1f7a390b8 100644 --- a/x11-drivers/xf86-input-mutouch/distinfo +++ b/x11-drivers/xf86-input-mutouch/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-input-mutouch-1.1.0.tar.bz2) = 98ae915c67cabf0e6d40a425dbdbe10b -SHA256 (xorg/driver/xf86-input-mutouch-1.1.0.tar.bz2) = cc67e0dd4f4fcc8d798f0bfe42b975132c5739bdd80809580a74182e4d1b62ea -SIZE (xorg/driver/xf86-input-mutouch-1.1.0.tar.bz2) = 236844 +MD5 (xorg/driver/xf86-input-mutouch-1.2.1.tar.bz2) = f28998cdfae2a4c41589299a4ee1f459 +SHA256 (xorg/driver/xf86-input-mutouch-1.2.1.tar.bz2) = 53bfe976042de69f87e28261ad581cf418c67b5cb69a09cfe1eea169021db35b +SIZE (xorg/driver/xf86-input-mutouch-1.2.1.tar.bz2) = 246240 diff --git a/x11-drivers/xf86-input-palmax/Makefile b/x11-drivers/xf86-input-palmax/Makefile index 93bf2ed288b8..6d58bb0999b8 100644 --- a/x11-drivers/xf86-input-palmax/Makefile +++ b/x11-drivers/xf86-input-palmax/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-input-palmax -PORTVERSION= 1.1.0 -PORTREVISION= 1 +PORTVERSION= 1.2.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-palmax/distinfo b/x11-drivers/xf86-input-palmax/distinfo index 6becf1468b7f..a1c9a27814a9 100644 --- a/x11-drivers/xf86-input-palmax/distinfo +++ b/x11-drivers/xf86-input-palmax/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-input-palmax-1.1.0.tar.bz2) = 0959dbf7972dfb95f56e4bd3f56447cf -SHA256 (xorg/driver/xf86-input-palmax-1.1.0.tar.bz2) = 5c00c85eed2950a575362bee2f21c2fa68eb8af81e7f1d451273a1302eac4145 -SIZE (xorg/driver/xf86-input-palmax-1.1.0.tar.bz2) = 229673 +MD5 (xorg/driver/xf86-input-palmax-1.2.0.tar.bz2) = 9655d2235569c5a6ac321c6fb89a6f3b +SHA256 (xorg/driver/xf86-input-palmax-1.2.0.tar.bz2) = 02177c339ba60fb6cc942d3bc93a322e94247f36a6fe90c7c1121694c929b05b +SIZE (xorg/driver/xf86-input-palmax-1.2.0.tar.bz2) = 239602 diff --git a/x11-drivers/xf86-input-penmount/Makefile b/x11-drivers/xf86-input-penmount/Makefile index ebf79348e1ef..4bc49793d353 100644 --- a/x11-drivers/xf86-input-penmount/Makefile +++ b/x11-drivers/xf86-input-penmount/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-input-penmount -PORTVERSION= 1.2.1 -PORTREVISION= 1 +PORTVERSION= 1.3.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-penmount/distinfo b/x11-drivers/xf86-input-penmount/distinfo index af64b1649286..df02c34efa7c 100644 --- a/x11-drivers/xf86-input-penmount/distinfo +++ b/x11-drivers/xf86-input-penmount/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-input-penmount-1.2.1.tar.bz2) = 268af4dceda544d8c815b9b7e87d4536 -SHA256 (xorg/driver/xf86-input-penmount-1.2.1.tar.bz2) = fab08de727da6f56b82d8ecee451a52e7129ff80522e711c5322f1bd2fa9970a -SIZE (xorg/driver/xf86-input-penmount-1.2.1.tar.bz2) = 224350 +MD5 (xorg/driver/xf86-input-penmount-1.3.0.tar.bz2) = 24594c0222e631fedccc7c540c420b03 +SHA256 (xorg/driver/xf86-input-penmount-1.3.0.tar.bz2) = 9cb4e0e83dcefe1ece814d638bd186785b6bc1debe1aa2101ce2a4ea0376805a +SIZE (xorg/driver/xf86-input-penmount-1.3.0.tar.bz2) = 243048 diff --git a/x11-drivers/xf86-input-summa/Makefile b/x11-drivers/xf86-input-summa/Makefile index 1be8dc58b240..ade2466a8f8a 100644 --- a/x11-drivers/xf86-input-summa/Makefile +++ b/x11-drivers/xf86-input-summa/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-input-summa -PORTVERSION= 1.1.0 -PORTREVISION= 1 +PORTVERSION= 1.2.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-summa/distinfo b/x11-drivers/xf86-input-summa/distinfo index 1c67f94379c3..7f4890c3d07d 100644 --- a/x11-drivers/xf86-input-summa/distinfo +++ b/x11-drivers/xf86-input-summa/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-input-summa-1.1.0.tar.bz2) = b37a432fd87bb9f46d011622d6fce6b3 -SHA256 (xorg/driver/xf86-input-summa-1.1.0.tar.bz2) = f10f2cadd4120b40b3658000c87f910e3005f4d787441c7dd83b48ebbf2a11f2 -SIZE (xorg/driver/xf86-input-summa-1.1.0.tar.bz2) = 235031 +MD5 (xorg/driver/xf86-input-summa-1.2.0.tar.bz2) = 7e17468c0d90dcbbb6202a8242efff4b +SHA256 (xorg/driver/xf86-input-summa-1.2.0.tar.bz2) = 3e8bcd89b4b3f86677f338a4584f41acb2a3cca7fe492cbea32664aa6f4f8cd8 +SIZE (xorg/driver/xf86-input-summa-1.2.0.tar.bz2) = 244435 diff --git a/x11-drivers/xf86-input-synaptics/Makefile b/x11-drivers/xf86-input-synaptics/Makefile new file mode 100644 index 000000000000..fad50514a67b --- /dev/null +++ b/x11-drivers/xf86-input-synaptics/Makefile @@ -0,0 +1,29 @@ +# New ports collection makefile for: xf86-input-synaptics +# Date Created: 25 Sep 2008 +# Whom: Florent Thoumie <flz@FreeBSD.org> +# +# $FreeBSD$ +# + +PORTNAME= xf86-input-synaptics +PORTVERSION= 0.99.3 +CATEGORIES= x11-drivers + +MAINTAINER= x11@FreeBSD.org +COMMENT= X.Org synaptics input driver + +CONFLICTS= synaptics-[0-9]* + +USE_GNOME= gnomehack +USE_XORG= x11 +XORG_CAT= driver + +MAN1= syndaemon.1 \ + synclient.1 +MAN4= synaptics.4x + +post-install: + ${INSTALL_DATA} ${WRKSRC}/fdi/11-x11-synaptics.fdi \ + ${PREFIX}/share/hal/fdi/policy/10osvendor/ + +.include <bsd.port.mk> diff --git a/x11-drivers/xf86-input-synaptics/distinfo b/x11-drivers/xf86-input-synaptics/distinfo new file mode 100644 index 000000000000..b7ce9b8f78d8 --- /dev/null +++ b/x11-drivers/xf86-input-synaptics/distinfo @@ -0,0 +1,3 @@ +MD5 (xorg/driver/xf86-input-synaptics-0.99.3.tar.bz2) = 735a798e0f68c65d98e3d6b092b56d29 +SHA256 (xorg/driver/xf86-input-synaptics-0.99.3.tar.bz2) = 1a31962e05ff8480e1d97e0cd33b071fdc9a128cf71c5ad05428e5761be4f4b2 +SIZE (xorg/driver/xf86-input-synaptics-0.99.3.tar.bz2) = 284946 diff --git a/x11-drivers/xf86-input-synaptics/pkg-descr b/x11-drivers/xf86-input-synaptics/pkg-descr new file mode 100644 index 000000000000..2272145a738f --- /dev/null +++ b/x11-drivers/xf86-input-synaptics/pkg-descr @@ -0,0 +1,4 @@ +This package contains the X.Org xf86-input-synaptics driver. + +- Florent Thoumie +flz@FreeBSD.org diff --git a/x11-drivers/xf86-input-synaptics/pkg-plist b/x11-drivers/xf86-input-synaptics/pkg-plist new file mode 100644 index 000000000000..b270639d245e --- /dev/null +++ b/x11-drivers/xf86-input-synaptics/pkg-plist @@ -0,0 +1,12 @@ +bin/synclient +bin/syndaemon +include/xorg/synaptics-properties.h +include/xorg/synaptics.h +lib/xorg/modules/input/synaptics_drv.la +lib/xorg/modules/input/synaptics_drv.so +libdata/pkgconfig/xorg-synaptics.pc +share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi +@dirrmtry lib/xorg/modules/input +@dirrmtry lib/xorg/modules +@dirrmtry lib/xorg +@dirrmtry include/xorg diff --git a/x11-drivers/xf86-input-tek4957/Makefile b/x11-drivers/xf86-input-tek4957/Makefile index 5bc6b4d9a630..e4b59f2902ca 100644 --- a/x11-drivers/xf86-input-tek4957/Makefile +++ b/x11-drivers/xf86-input-tek4957/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-input-tek4957 -PORTVERSION= 1.1.0 -PORTREVISION= 1 +PORTVERSION= 1.2.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-tek4957/distinfo b/x11-drivers/xf86-input-tek4957/distinfo index 7defb616273d..adb7e92babc5 100644 --- a/x11-drivers/xf86-input-tek4957/distinfo +++ b/x11-drivers/xf86-input-tek4957/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-input-tek4957-1.1.0.tar.bz2) = be8a4bd474ad6c85b93f66dd6fcfa6ee -SHA256 (xorg/driver/xf86-input-tek4957-1.1.0.tar.bz2) = 09b9506d1bb1deaaf69872392bc56e1d75997bb8157e85a9121749bf5fe15727 -SIZE (xorg/driver/xf86-input-tek4957-1.1.0.tar.bz2) = 229426 +MD5 (xorg/driver/xf86-input-tek4957-1.2.0.tar.bz2) = 8103db1ca5c55726e0b58148e4b1fc06 +SHA256 (xorg/driver/xf86-input-tek4957-1.2.0.tar.bz2) = b097a5b1acbd732d9ca5d28c13003a1f1c8a3465f4fa77c1578d36330f3358a2 +SIZE (xorg/driver/xf86-input-tek4957-1.2.0.tar.bz2) = 239405 diff --git a/x11-drivers/xf86-input-vmmouse/Makefile b/x11-drivers/xf86-input-vmmouse/Makefile index 9889986d8eb2..6a02f58a174e 100644 --- a/x11-drivers/xf86-input-vmmouse/Makefile +++ b/x11-drivers/xf86-input-vmmouse/Makefile @@ -6,14 +6,16 @@ # PORTNAME= xf86-input-vmmouse -PORTVERSION= 12.4.3 -PORTREVISION= 2 +PORTVERSION= 12.6.3 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org vmmouse input driver XORG_CAT= driver +CONFIGURE_ARGS= --with-hal-callouts-dir=${PREFIX}/libexec/hal/scripts + +MAN1= vmmouse_detect.1 MAN4= vmmouse.4x ONLY_FOR_ARCHS= i386 amd64 diff --git a/x11-drivers/xf86-input-vmmouse/distinfo b/x11-drivers/xf86-input-vmmouse/distinfo index 64f21f5552ff..f7fa6a5e46aa 100644 --- a/x11-drivers/xf86-input-vmmouse/distinfo +++ b/x11-drivers/xf86-input-vmmouse/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-input-vmmouse-12.4.3.tar.bz2) = 44730af795616ed4d4a0cd9a3a07935d -SHA256 (xorg/driver/xf86-input-vmmouse-12.4.3.tar.bz2) = d668c4cacd4be6d56608fbdf7779d60120f38f3315e6385a7cc87339124e77ab -SIZE (xorg/driver/xf86-input-vmmouse-12.4.3.tar.bz2) = 248239 +MD5 (xorg/driver/xf86-input-vmmouse-12.6.3.tar.bz2) = f5933143d7789557983ecb527092d14e +SHA256 (xorg/driver/xf86-input-vmmouse-12.6.3.tar.bz2) = c39fe6f2a17c8c609421ed17447221209dd416ca142d6f3d0b1052808ef7d604 +SIZE (xorg/driver/xf86-input-vmmouse-12.6.3.tar.bz2) = 252631 diff --git a/x11-drivers/xf86-input-vmmouse/files/patch-src_vmmouse.c b/x11-drivers/xf86-input-vmmouse/files/patch-src_vmmouse.c deleted file mode 100644 index 94d61e4e9c0d..000000000000 --- a/x11-drivers/xf86-input-vmmouse/files/patch-src_vmmouse.c +++ /dev/null @@ -1,28 +0,0 @@ ---- src/vmmouse.c.orig Wed Sep 26 08:11:47 2007 -+++ src/vmmouse.c Sun Jan 20 17:10:54 2008 -@@ -964,8 +964,11 @@ - VMMOUSE_INPUT_DATA vmmouseInput; - int ps2Buttons = 0; - int numPackets; -+ VMMousePrivPtr mPriv; -+ double factorX, factorY; - - pMse = pInfo->private; -+ mPriv = pMse->mousePriv; - while((numPackets = VMMouseClient_GetInput(&vmmouseInput))){ - if (numPackets == VMMOUSE_ERROR) { - VMMouseClient_Disable(); -@@ -990,6 +993,13 @@ - dy = vmmouseInput.Y; - dz = (char)vmmouseInput.Z; - dw = 0; -+ -+ /* X server 1.4.0 does not call VMMouseConvertProc() so we scale coordinates here */ -+ factorX = ((double) screenInfo.screens[mPriv->screenNum]->width) / (double) 65535; -+ factorY = ((double) screenInfo.screens[mPriv->screenNum]->height) / (double) 65535; -+ dx = dx * factorX + 0.5; -+ dy = dy * factorY + 0.5; -+ - /* post an event */ - pMse->PostEvent(pInfo, buttons, dx, dy, dz, dw); - } diff --git a/x11-drivers/xf86-input-vmmouse/pkg-plist b/x11-drivers/xf86-input-vmmouse/pkg-plist index 2a9d937472a8..d5ba6a3115a6 100644 --- a/x11-drivers/xf86-input-vmmouse/pkg-plist +++ b/x11-drivers/xf86-input-vmmouse/pkg-plist @@ -1,5 +1,8 @@ +bin/vmmouse_detect +libexec/hal/scripts/hal-probe-vmmouse lib/xorg/modules/input/vmmouse_drv.la lib/xorg/modules/input/vmmouse_drv.so +share/hal/fdi/policy/20thirdparty/11-x11-vmmouse.fdi @dirrmtry lib/xorg/modules/input @dirrmtry lib/xorg/modules @dirrmtry lib/xorg diff --git a/x11-drivers/xf86-video-apm/Makefile b/x11-drivers/xf86-video-apm/Makefile index c9701dd2e2e4..01f95f216ca5 100644 --- a/x11-drivers/xf86-video-apm/Makefile +++ b/x11-drivers/xf86-video-apm/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-video-apm -PORTVERSION= 1.1.1 -PORTREVISION= 2 +PORTVERSION= 1.2.1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-apm/distinfo b/x11-drivers/xf86-video-apm/distinfo index 6255b59dc11d..9515277f34f0 100644 --- a/x11-drivers/xf86-video-apm/distinfo +++ b/x11-drivers/xf86-video-apm/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-apm-1.1.1.tar.bz2) = ac7e05f0dfc7e02cac0bf17b9eb89b11 -SHA256 (xorg/driver/xf86-video-apm-1.1.1.tar.bz2) = 09d7e6cf30b94f141f8ebe2560b301a058f645e74108edc28c908e750865dcec -SIZE (xorg/driver/xf86-video-apm-1.1.1.tar.bz2) = 268210 +MD5 (xorg/driver/xf86-video-apm-1.2.1.tar.bz2) = 673c93df004bb857dc89ae9c78ccf907 +SHA256 (xorg/driver/xf86-video-apm-1.2.1.tar.bz2) = f88e2550f970135b535febc180407b92f6cd0b3b0997fb6f0ce282e3a675c4fe +SIZE (xorg/driver/xf86-video-apm-1.2.1.tar.bz2) = 282068 diff --git a/x11-drivers/xf86-video-ark/Makefile b/x11-drivers/xf86-video-ark/Makefile index e4a21423353c..fc40144a68c6 100644 --- a/x11-drivers/xf86-video-ark/Makefile +++ b/x11-drivers/xf86-video-ark/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-video-ark -PORTVERSION= 0.6.0 -PORTREVISION= 2 +PORTVERSION= 0.7.1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-ark/distinfo b/x11-drivers/xf86-video-ark/distinfo index 2e32a0bbc272..e7f2a3b8b6ea 100644 --- a/x11-drivers/xf86-video-ark/distinfo +++ b/x11-drivers/xf86-video-ark/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-ark-0.6.0.tar.bz2) = 6921479baca8f7b156029489fd335854 -SHA256 (xorg/driver/xf86-video-ark-0.6.0.tar.bz2) = e5abc4f4ae643ce56d5773f052515196f05786235e4afd155a3232e20dbc84d7 -SIZE (xorg/driver/xf86-video-ark-0.6.0.tar.bz2) = 231223 +MD5 (xorg/driver/xf86-video-ark-0.7.1.tar.bz2) = be91391f061863617018403cdbd2944f +SHA256 (xorg/driver/xf86-video-ark-0.7.1.tar.bz2) = 14c34fb3fc894aad7ca24141cbc2283d955849eec920d058ba1aca2a1f5e3b86 +SIZE (xorg/driver/xf86-video-ark-0.7.1.tar.bz2) = 237009 diff --git a/x11-drivers/xf86-video-ati/Makefile b/x11-drivers/xf86-video-ati/Makefile index 049af109c5fb..bcd873fe5458 100644 --- a/x11-drivers/xf86-video-ati/Makefile +++ b/x11-drivers/xf86-video-ati/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xf86-video-ati -PORTVERSION= 6.9.0 +PORTVERSION= 6.10.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-ati/distinfo b/x11-drivers/xf86-video-ati/distinfo index 2dba90ba75e3..a7665b42ae36 100644 --- a/x11-drivers/xf86-video-ati/distinfo +++ b/x11-drivers/xf86-video-ati/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-ati-6.9.0.tar.bz2) = afa4873f58ae6fa31fedeb9ed31531db -SHA256 (xorg/driver/xf86-video-ati-6.9.0.tar.bz2) = 682cd1916c386c192dd83d22d07529a247e72a1052c4a008c5466a155413d7c2 -SIZE (xorg/driver/xf86-video-ati-6.9.0.tar.bz2) = 777455 +MD5 (xorg/driver/xf86-video-ati-6.10.0.tar.bz2) = 6445815b12ffa4ccd1aafd43640f466d +SHA256 (xorg/driver/xf86-video-ati-6.10.0.tar.bz2) = dd92bfff4e10d79f98844a9c2962ee9bb8d0cfd863e1e764941749aabe6d4ebd +SIZE (xorg/driver/xf86-video-ati-6.10.0.tar.bz2) = 823540 diff --git a/x11-drivers/xf86-video-ati613/Makefile b/x11-drivers/xf86-video-ati613/Makefile index 049af109c5fb..bcd873fe5458 100644 --- a/x11-drivers/xf86-video-ati613/Makefile +++ b/x11-drivers/xf86-video-ati613/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xf86-video-ati -PORTVERSION= 6.9.0 +PORTVERSION= 6.10.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-ati613/distinfo b/x11-drivers/xf86-video-ati613/distinfo index 2dba90ba75e3..a7665b42ae36 100644 --- a/x11-drivers/xf86-video-ati613/distinfo +++ b/x11-drivers/xf86-video-ati613/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-ati-6.9.0.tar.bz2) = afa4873f58ae6fa31fedeb9ed31531db -SHA256 (xorg/driver/xf86-video-ati-6.9.0.tar.bz2) = 682cd1916c386c192dd83d22d07529a247e72a1052c4a008c5466a155413d7c2 -SIZE (xorg/driver/xf86-video-ati-6.9.0.tar.bz2) = 777455 +MD5 (xorg/driver/xf86-video-ati-6.10.0.tar.bz2) = 6445815b12ffa4ccd1aafd43640f466d +SHA256 (xorg/driver/xf86-video-ati-6.10.0.tar.bz2) = dd92bfff4e10d79f98844a9c2962ee9bb8d0cfd863e1e764941749aabe6d4ebd +SIZE (xorg/driver/xf86-video-ati-6.10.0.tar.bz2) = 823540 diff --git a/x11-drivers/xf86-video-chips/Makefile b/x11-drivers/xf86-video-chips/Makefile index b6b27784630a..853acc905dd3 100644 --- a/x11-drivers/xf86-video-chips/Makefile +++ b/x11-drivers/xf86-video-chips/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-video-chips -PORTVERSION= 1.1.1 -PORTREVISION= 2 +PORTVERSION= 1.2.1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-chips/distinfo b/x11-drivers/xf86-video-chips/distinfo index cd1bd89ac0fd..b2d97d5f4784 100644 --- a/x11-drivers/xf86-video-chips/distinfo +++ b/x11-drivers/xf86-video-chips/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-chips-1.1.1.tar.bz2) = 3182d43439ca4cbf08ff9aa76990bba3 -SHA256 (xorg/driver/xf86-video-chips-1.1.1.tar.bz2) = 16a81cdb6b311176936c3326d279c0d75530adbcf9a3489eea55992ac5bc7494 -SIZE (xorg/driver/xf86-video-chips-1.1.1.tar.bz2) = 324093 +MD5 (xorg/driver/xf86-video-chips-1.2.1.tar.bz2) = 2f2643fca6335f18024bffa6c4e0c12f +SHA256 (xorg/driver/xf86-video-chips-1.2.1.tar.bz2) = ed3531c5b283b9b0df7e8fc4aa1b42df89c65a5b48889f786c1a9066190833f3 +SIZE (xorg/driver/xf86-video-chips-1.2.1.tar.bz2) = 340894 diff --git a/x11-drivers/xf86-video-cirrus/Makefile b/x11-drivers/xf86-video-cirrus/Makefile index cab61a7322fe..053095df6234 100644 --- a/x11-drivers/xf86-video-cirrus/Makefile +++ b/x11-drivers/xf86-video-cirrus/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-video-cirrus -PORTVERSION= 1.1.0 -PORTREVISION= 2 +PORTVERSION= 1.2.1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-cirrus/distinfo b/x11-drivers/xf86-video-cirrus/distinfo index f6d5c31b4749..f831f1d7e3cb 100644 --- a/x11-drivers/xf86-video-cirrus/distinfo +++ b/x11-drivers/xf86-video-cirrus/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-cirrus-1.1.0.tar.bz2) = 66344e315def275605dafb314ce59851 -SHA256 (xorg/driver/xf86-video-cirrus-1.1.0.tar.bz2) = 5988962199d5013274f6a6952939e4f405df658bb6616ebf9954c993b1179b1b -SIZE (xorg/driver/xf86-video-cirrus-1.1.0.tar.bz2) = 264167 +MD5 (xorg/driver/xf86-video-cirrus-1.2.1.tar.bz2) = bc28fdedaee9059180e2534f9dbcd2f6 +SHA256 (xorg/driver/xf86-video-cirrus-1.2.1.tar.bz2) = e7c99ed66326df5fadf6e5d875859a430fec4369415a27cde72a91109f78bb9c +SIZE (xorg/driver/xf86-video-cirrus-1.2.1.tar.bz2) = 274458 diff --git a/x11-drivers/xf86-video-cyrix/Makefile b/x11-drivers/xf86-video-cyrix/Makefile index 136ceeeaf50e..cf1796bb2a25 100644 --- a/x11-drivers/xf86-video-cyrix/Makefile +++ b/x11-drivers/xf86-video-cyrix/Makefile @@ -13,6 +13,8 @@ CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org cyrix display driver +IGNORE= requires pciVideoPtr typedef + XORG_CAT= driver USE_XORG= xextproto xf86dgaproto MAN4= cyrix.4x diff --git a/x11-drivers/xf86-video-dummy/Makefile b/x11-drivers/xf86-video-dummy/Makefile index 62d6bd64f6f2..6a6fc581d2b3 100644 --- a/x11-drivers/xf86-video-dummy/Makefile +++ b/x11-drivers/xf86-video-dummy/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-video-dummy -PORTVERSION= 0.2.0 -PORTREVISION= 2 +PORTVERSION= 0.3.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-dummy/distinfo b/x11-drivers/xf86-video-dummy/distinfo index 180edab7c5b5..333cd7427b53 100644 --- a/x11-drivers/xf86-video-dummy/distinfo +++ b/x11-drivers/xf86-video-dummy/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-dummy-0.2.0.tar.bz2) = 22b7cc20a33443cbd218bd2521850cfe -SHA256 (xorg/driver/xf86-video-dummy-0.2.0.tar.bz2) = 46013885696f3c1a5e05c5d503abc69e691443319a97cf2c6a01ec031e06c910 -SIZE (xorg/driver/xf86-video-dummy-0.2.0.tar.bz2) = 229159 +MD5 (xorg/driver/xf86-video-dummy-0.3.0.tar.bz2) = 3d96297556846bee02a74166ffb5d052 +SHA256 (xorg/driver/xf86-video-dummy-0.3.0.tar.bz2) = 5a4bbde0b7f0334bb63b159e5ef6e164be3699e3424734c2bd9823f20a30a278 +SIZE (xorg/driver/xf86-video-dummy-0.3.0.tar.bz2) = 239002 diff --git a/x11-drivers/xf86-video-fbdev/Makefile b/x11-drivers/xf86-video-fbdev/Makefile index 66ad94f328a4..b861a3c339b4 100644 --- a/x11-drivers/xf86-video-fbdev/Makefile +++ b/x11-drivers/xf86-video-fbdev/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-video-fbdev -PORTVERSION= 0.3.1 -PORTREVISION= 2 +PORTVERSION= 0.4.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-fbdev/distinfo b/x11-drivers/xf86-video-fbdev/distinfo index 26ed50186775..c9115eba6f52 100644 --- a/x11-drivers/xf86-video-fbdev/distinfo +++ b/x11-drivers/xf86-video-fbdev/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-fbdev-0.3.1.tar.bz2) = 9ae810c6c6c3c9713a67866fe794d4ff -SHA256 (xorg/driver/xf86-video-fbdev-0.3.1.tar.bz2) = 309d1f618c77559ea494c05d45b09577790c44900685e17bc812e4e1b19df6e7 -SIZE (xorg/driver/xf86-video-fbdev-0.3.1.tar.bz2) = 217635 +MD5 (xorg/driver/xf86-video-fbdev-0.4.0.tar.bz2) = 6572b39fec77b8e6de1c858a93992924 +SHA256 (xorg/driver/xf86-video-fbdev-0.4.0.tar.bz2) = bba725daeb2a313b83f2b92855a9ae8aa72c4cc8581f9f62f101ebdf00ac359d +SIZE (xorg/driver/xf86-video-fbdev-0.4.0.tar.bz2) = 242435 diff --git a/x11-drivers/xf86-video-glint/Makefile b/x11-drivers/xf86-video-glint/Makefile index 0f915a8fcf8a..029389bda32f 100644 --- a/x11-drivers/xf86-video-glint/Makefile +++ b/x11-drivers/xf86-video-glint/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-video-glint -PORTVERSION= 1.1.1 -PORTREVISION= 4 +PORTVERSION= 1.2.2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-glint/distinfo b/x11-drivers/xf86-video-glint/distinfo index 8cb471c608ec..0a29c808517c 100644 --- a/x11-drivers/xf86-video-glint/distinfo +++ b/x11-drivers/xf86-video-glint/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-glint-1.1.1.tar.bz2) = 2cf49f701024a145bd25aff9da11d479 -SHA256 (xorg/driver/xf86-video-glint-1.1.1.tar.bz2) = d63e0dd3f5cecebaf1915193a68ac83e90c1e973e3276a71bd14651d67115e6d -SIZE (xorg/driver/xf86-video-glint-1.1.1.tar.bz2) = 347413 +MD5 (xorg/driver/xf86-video-glint-1.2.2.tar.bz2) = 4295a46a75fa98470c6dfb0e1a4f7e9f +SHA256 (xorg/driver/xf86-video-glint-1.2.2.tar.bz2) = 41df8be5719a96abd7de5343925023296491fad10a3a9e691acf50f976970bad +SIZE (xorg/driver/xf86-video-glint-1.2.2.tar.bz2) = 348742 diff --git a/x11-drivers/xf86-video-i128/Makefile b/x11-drivers/xf86-video-i128/Makefile index adc77b56888f..fef57b4064a4 100644 --- a/x11-drivers/xf86-video-i128/Makefile +++ b/x11-drivers/xf86-video-i128/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-video-i128 -PORTVERSION= 1.2.1 -PORTREVISION= 2 +PORTVERSION= 1.3.1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-i128/distinfo b/x11-drivers/xf86-video-i128/distinfo index a575c50907c9..b04208191181 100644 --- a/x11-drivers/xf86-video-i128/distinfo +++ b/x11-drivers/xf86-video-i128/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-i128-1.2.1.tar.bz2) = d0080732eaa15059b0a953aa3522185a -SHA256 (xorg/driver/xf86-video-i128-1.2.1.tar.bz2) = 0d023cacf8134241cd8efcd5744eb156399406c92f59d3895392f2b5fd055eb1 -SIZE (xorg/driver/xf86-video-i128-1.2.1.tar.bz2) = 264809 +MD5 (xorg/driver/xf86-video-i128-1.3.1.tar.bz2) = 3b170a6df5114420cd4021a057918a09 +SHA256 (xorg/driver/xf86-video-i128-1.3.1.tar.bz2) = 49bb23625654ebcd74d0d23f534b074188f4b21c3cd443b06ac83b9485bf9a75 +SIZE (xorg/driver/xf86-video-i128-1.3.1.tar.bz2) = 265350 diff --git a/x11-drivers/xf86-video-i740/Makefile b/x11-drivers/xf86-video-i740/Makefile index 9d40a9016dfe..cd723b2a861e 100644 --- a/x11-drivers/xf86-video-i740/Makefile +++ b/x11-drivers/xf86-video-i740/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-video-i740 -PORTVERSION= 1.1.0 -PORTREVISION= 2 +PORTVERSION= 1.2.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-i740/distinfo b/x11-drivers/xf86-video-i740/distinfo index 91af48cfdf8d..a75899d29888 100644 --- a/x11-drivers/xf86-video-i740/distinfo +++ b/x11-drivers/xf86-video-i740/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-i740-1.1.0.tar.bz2) = 57302e225060a7286ae1a970c87a589b -SHA256 (xorg/driver/xf86-video-i740-1.1.0.tar.bz2) = b8f2144c987d8a14f8b477ee3aa43fc1c76d040a77e40938c3c97c8e34e2b7c5 -SIZE (xorg/driver/xf86-video-i740-1.1.0.tar.bz2) = 258461 +MD5 (xorg/driver/xf86-video-i740-1.2.0.tar.bz2) = d0e5a805c546b29b1dd3b55a68d16dc4 +SHA256 (xorg/driver/xf86-video-i740-1.2.0.tar.bz2) = 59c8f6ee465bef033c1c20bfff8121a318efda9656d5dc29f674bb655f18486f +SIZE (xorg/driver/xf86-video-i740-1.2.0.tar.bz2) = 268468 diff --git a/x11-drivers/xf86-video-imstt/Makefile b/x11-drivers/xf86-video-imstt/Makefile index 3ce73562cfa5..ff71d0732f94 100644 --- a/x11-drivers/xf86-video-imstt/Makefile +++ b/x11-drivers/xf86-video-imstt/Makefile @@ -13,6 +13,8 @@ CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org imstt display driver +IGNORE= requires pciVideoPtr typedef + XORG_CAT= driver MAN4= imstt.4x diff --git a/x11-drivers/xf86-video-intel/Makefile b/x11-drivers/xf86-video-intel/Makefile index bcf84df20e2d..5e2b5f5c59e0 100644 --- a/x11-drivers/xf86-video-intel/Makefile +++ b/x11-drivers/xf86-video-intel/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xf86-video-intel -PORTVERSION= 2.4.3 +PORTVERSION= 2.5.1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-intel/distinfo b/x11-drivers/xf86-video-intel/distinfo index c9fd35b33b9c..9011801415b4 100644 --- a/x11-drivers/xf86-video-intel/distinfo +++ b/x11-drivers/xf86-video-intel/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-intel-2.4.3.tar.bz2) = a664819288b98a37f77ab6ae1e14c9d9 -SHA256 (xorg/driver/xf86-video-intel-2.4.3.tar.bz2) = 1752a0f6f5fd28f5c8581f6411f37df7fde5fd4a0bbedc4bf423f9824423afcd -SIZE (xorg/driver/xf86-video-intel-2.4.3.tar.bz2) = 661105 +MD5 (xorg/driver/xf86-video-intel-2.5.1.tar.bz2) = 62e96948860b7a8507963300f56d0d16 +SHA256 (xorg/driver/xf86-video-intel-2.5.1.tar.bz2) = c203b728f1203d6d52b2963cdc6bfd87fb83eb12ab786c8122ea26c7984ac313 +SIZE (xorg/driver/xf86-video-intel-2.5.1.tar.bz2) = 716182 diff --git a/x11-drivers/xf86-video-intel29/Makefile b/x11-drivers/xf86-video-intel29/Makefile index bcf84df20e2d..5e2b5f5c59e0 100644 --- a/x11-drivers/xf86-video-intel29/Makefile +++ b/x11-drivers/xf86-video-intel29/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xf86-video-intel -PORTVERSION= 2.4.3 +PORTVERSION= 2.5.1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-intel29/distinfo b/x11-drivers/xf86-video-intel29/distinfo index c9fd35b33b9c..9011801415b4 100644 --- a/x11-drivers/xf86-video-intel29/distinfo +++ b/x11-drivers/xf86-video-intel29/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-intel-2.4.3.tar.bz2) = a664819288b98a37f77ab6ae1e14c9d9 -SHA256 (xorg/driver/xf86-video-intel-2.4.3.tar.bz2) = 1752a0f6f5fd28f5c8581f6411f37df7fde5fd4a0bbedc4bf423f9824423afcd -SIZE (xorg/driver/xf86-video-intel-2.4.3.tar.bz2) = 661105 +MD5 (xorg/driver/xf86-video-intel-2.5.1.tar.bz2) = 62e96948860b7a8507963300f56d0d16 +SHA256 (xorg/driver/xf86-video-intel-2.5.1.tar.bz2) = c203b728f1203d6d52b2963cdc6bfd87fb83eb12ab786c8122ea26c7984ac313 +SIZE (xorg/driver/xf86-video-intel-2.5.1.tar.bz2) = 716182 diff --git a/x11-drivers/xf86-video-mga/Makefile b/x11-drivers/xf86-video-mga/Makefile index 3f52135f5e51..409d5a5c27a0 100644 --- a/x11-drivers/xf86-video-mga/Makefile +++ b/x11-drivers/xf86-video-mga/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-video-mga -PORTVERSION= 1.4.9 -#PORTREVISION= 1 +PORTVERSION= 1.9.100 PORTEPOCH= 1 CATEGORIES= x11-drivers diff --git a/x11-drivers/xf86-video-mga/distinfo b/x11-drivers/xf86-video-mga/distinfo index 2b6ca8de43c3..7dd87686dccd 100644 --- a/x11-drivers/xf86-video-mga/distinfo +++ b/x11-drivers/xf86-video-mga/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-mga-1.4.9.tar.bz2) = 11066b84b949cd04300ec819c9c51532 -SHA256 (xorg/driver/xf86-video-mga-1.4.9.tar.bz2) = d57dd2323052f064092167a232fb7576f46e5d62e98bc9cc6a7f270cc8d0fdc0 -SIZE (xorg/driver/xf86-video-mga-1.4.9.tar.bz2) = 419781 +MD5 (xorg/driver/xf86-video-mga-1.9.100.tar.bz2) = 3e80cfb84b62866d2f94774ecbf3e46c +SHA256 (xorg/driver/xf86-video-mga-1.9.100.tar.bz2) = e8efee8d5269eb29f9bd499db3d47a6a4d3c320d4b0a24874cdf7b598ad77a5c +SIZE (xorg/driver/xf86-video-mga-1.9.100.tar.bz2) = 369119 diff --git a/x11-drivers/xf86-video-neomagic/Makefile b/x11-drivers/xf86-video-neomagic/Makefile index aaafa129b37d..d5128cf5afac 100644 --- a/x11-drivers/xf86-video-neomagic/Makefile +++ b/x11-drivers/xf86-video-neomagic/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-video-neomagic -PORTVERSION= 1.1.1 -PORTREVISION= 2 +PORTVERSION= 1.2.2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-neomagic/distinfo b/x11-drivers/xf86-video-neomagic/distinfo index 8111104ec84d..7bf3dd043bc6 100644 --- a/x11-drivers/xf86-video-neomagic/distinfo +++ b/x11-drivers/xf86-video-neomagic/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-neomagic-1.1.1.tar.bz2) = 7a3d3d6e60b9686d955c45d9ebbd5c1b -SHA256 (xorg/driver/xf86-video-neomagic-1.1.1.tar.bz2) = d6497080967b8285b663fedd7cafd4457578282ebd7da0b216b6fa214dd88a86 -SIZE (xorg/driver/xf86-video-neomagic-1.1.1.tar.bz2) = 263711 +MD5 (xorg/driver/xf86-video-neomagic-1.2.2.tar.bz2) = 896864e1a2d7333c16333a24eac17d00 +SHA256 (xorg/driver/xf86-video-neomagic-1.2.2.tar.bz2) = 1c0dfeb749ad2faacb74cc75e865878e4dde2c6c3dace04be4f65286e6ae966a +SIZE (xorg/driver/xf86-video-neomagic-1.2.2.tar.bz2) = 278452 diff --git a/x11-drivers/xf86-video-rendition/Makefile b/x11-drivers/xf86-video-rendition/Makefile index 4b5c762cb9b3..57c0addfdf6e 100644 --- a/x11-drivers/xf86-video-rendition/Makefile +++ b/x11-drivers/xf86-video-rendition/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-video-rendition -PORTVERSION= 4.1.3 -PORTREVISION= 2 +PORTVERSION= 4.2.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-rendition/distinfo b/x11-drivers/xf86-video-rendition/distinfo index 5e6d96c83221..900f5d1de58e 100644 --- a/x11-drivers/xf86-video-rendition/distinfo +++ b/x11-drivers/xf86-video-rendition/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-rendition-4.1.3.tar.bz2) = a8b97feccb32184820d5856fe78d34db -SHA256 (xorg/driver/xf86-video-rendition-4.1.3.tar.bz2) = 37e7aef72f7466485f5a3bafd0d43190cb7439de16868bfba2c59bb4c9df4408 -SIZE (xorg/driver/xf86-video-rendition-4.1.3.tar.bz2) = 292618 +MD5 (xorg/driver/xf86-video-rendition-4.2.0.tar.bz2) = 7c03de3804d4c4f6ff59f74050d24b2b +SHA256 (xorg/driver/xf86-video-rendition-4.2.0.tar.bz2) = b57b62f707d87534a799170e31b33311449cfd7019a56e6b4fa85a4c7faaae15 +SIZE (xorg/driver/xf86-video-rendition-4.2.0.tar.bz2) = 299330 diff --git a/x11-drivers/xf86-video-s3/Makefile b/x11-drivers/xf86-video-s3/Makefile index 249cddb85ef0..7170e400803a 100644 --- a/x11-drivers/xf86-video-s3/Makefile +++ b/x11-drivers/xf86-video-s3/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-video-s3 -PORTVERSION= 0.5.0 -PORTREVISION= 2 +PORTVERSION= 0.6.1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-s3/distinfo b/x11-drivers/xf86-video-s3/distinfo index bb59a8349108..edf7adc3f184 100644 --- a/x11-drivers/xf86-video-s3/distinfo +++ b/x11-drivers/xf86-video-s3/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-s3-0.5.0.tar.bz2) = d95ab6445cab477f39adfbbc81006f67 -SHA256 (xorg/driver/xf86-video-s3-0.5.0.tar.bz2) = 4a1206cb1a200aad8881216547d9913d0e24928138f3b1bb912a3336b9c05c97 -SIZE (xorg/driver/xf86-video-s3-0.5.0.tar.bz2) = 240067 +MD5 (xorg/driver/xf86-video-s3-0.6.1.tar.bz2) = a5f1f2f93a50e56bd3aeed009c407337 +SHA256 (xorg/driver/xf86-video-s3-0.6.1.tar.bz2) = 66646138dcc7ebdf84abc3566802fcd3bf86709a1e34abd78741565e4a786596 +SIZE (xorg/driver/xf86-video-s3-0.6.1.tar.bz2) = 264633 diff --git a/x11-drivers/xf86-video-s3virge/Makefile b/x11-drivers/xf86-video-s3virge/Makefile index a55c42e88217..d8ccf9783e32 100644 --- a/x11-drivers/xf86-video-s3virge/Makefile +++ b/x11-drivers/xf86-video-s3virge/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-video-s3virge -PORTVERSION= 1.9.1 -PORTREVISION= 2 +PORTVERSION= 1.10.2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-s3virge/distinfo b/x11-drivers/xf86-video-s3virge/distinfo index 28c1a680972f..93aac418c6ad 100644 --- a/x11-drivers/xf86-video-s3virge/distinfo +++ b/x11-drivers/xf86-video-s3virge/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-s3virge-1.9.1.tar.bz2) = a91c73285ef67ee7cd9e2da28acb6cc4 -SHA256 (xorg/driver/xf86-video-s3virge-1.9.1.tar.bz2) = cef5702963f49e737fb8b1472dc0241f7a5da49f844ac77f2df3e693a84bc822 -SIZE (xorg/driver/xf86-video-s3virge-1.9.1.tar.bz2) = 279913 +MD5 (xorg/driver/xf86-video-s3virge-1.10.2.tar.bz2) = 69784e4964d75487d81be4eae3d467dd +SHA256 (xorg/driver/xf86-video-s3virge-1.10.2.tar.bz2) = f96bc804b123f8371f22b0ca99d77b2d209e6f46d0426d7a4f98fe57b778cb52 +SIZE (xorg/driver/xf86-video-s3virge-1.10.2.tar.bz2) = 297071 diff --git a/x11-drivers/xf86-video-savage/Makefile b/x11-drivers/xf86-video-savage/Makefile index 8b4a8f04676e..13a776bccd66 100644 --- a/x11-drivers/xf86-video-savage/Makefile +++ b/x11-drivers/xf86-video-savage/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-video-savage -PORTVERSION= 2.1.3 -PORTREVISION= 1 +PORTVERSION= 2.2.1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-savage/distinfo b/x11-drivers/xf86-video-savage/distinfo index 39e16869811c..e33089f37e45 100644 --- a/x11-drivers/xf86-video-savage/distinfo +++ b/x11-drivers/xf86-video-savage/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-savage-2.1.3.tar.bz2) = 9c5e541613b07de6e7b2b2df3a2e35b1 -SHA256 (xorg/driver/xf86-video-savage-2.1.3.tar.bz2) = f5f154df377cb445935d1453d6b7095d63912d5776dcb44f8d3c2f10ab1a3cc5 -SIZE (xorg/driver/xf86-video-savage-2.1.3.tar.bz2) = 310709 +MD5 (xorg/driver/xf86-video-savage-2.2.1.tar.bz2) = 62b8aba48b54eaefeae87df502bf219c +SHA256 (xorg/driver/xf86-video-savage-2.2.1.tar.bz2) = adf95cae0fbaf72326c51c4c9e61486eef062bb1706f6ab46d942f2c36d8a37e +SIZE (xorg/driver/xf86-video-savage-2.2.1.tar.bz2) = 305286 diff --git a/x11-drivers/xf86-video-siliconmotion/Makefile b/x11-drivers/xf86-video-siliconmotion/Makefile index 468a2b0983d4..4f69f49551ca 100644 --- a/x11-drivers/xf86-video-siliconmotion/Makefile +++ b/x11-drivers/xf86-video-siliconmotion/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-video-siliconmotion -PORTVERSION= 1.5.1 -PORTREVISION= 1 +PORTVERSION= 1.7.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-siliconmotion/distinfo b/x11-drivers/xf86-video-siliconmotion/distinfo index a8822e45239b..e09890b78ab4 100644 --- a/x11-drivers/xf86-video-siliconmotion/distinfo +++ b/x11-drivers/xf86-video-siliconmotion/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-siliconmotion-1.5.1.tar.bz2) = ee35d7714ce44a2b5ac7ad7b7b7dd75a -SHA256 (xorg/driver/xf86-video-siliconmotion-1.5.1.tar.bz2) = 54cf791695a53d4836d32f899b7d34b969edf5415f02e36956b6e72993e21cd7 -SIZE (xorg/driver/xf86-video-siliconmotion-1.5.1.tar.bz2) = 265829 +MD5 (xorg/driver/xf86-video-siliconmotion-1.7.0.tar.bz2) = f9acffba89d8be200f91bab3d1df80da +SHA256 (xorg/driver/xf86-video-siliconmotion-1.7.0.tar.bz2) = c1ee0111e2b903f1060cd07d0c971c09511d71241e0a355bf0a3bc5506942a99 +SIZE (xorg/driver/xf86-video-siliconmotion-1.7.0.tar.bz2) = 328748 diff --git a/x11-drivers/xf86-video-sis-intel/Makefile b/x11-drivers/xf86-video-sis-intel/Makefile index fb9fdb082b3c..a0a6c8389aa8 100644 --- a/x11-drivers/xf86-video-sis-intel/Makefile +++ b/x11-drivers/xf86-video-sis-intel/Makefile @@ -15,6 +15,8 @@ DISTNAME= sis_drv_src_300407 MAINTAINER= littlesavage@orionet.ru COMMENT= X.Org sis display driver provided by Intel +IGNORE= requires pciVideoPtr typedef + CONFLICTS= xf86-video-sis-[0-9]* WRKSRC= ${WRKDIR}/2d-driver diff --git a/x11-drivers/xf86-video-sis/Makefile b/x11-drivers/xf86-video-sis/Makefile index 230d0815dd1a..73f43c750844 100644 --- a/x11-drivers/xf86-video-sis/Makefile +++ b/x11-drivers/xf86-video-sis/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-video-sis -PORTVERSION= 0.10.0 -#PORTREVISION= 1 +PORTVERSION= 0.10.1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-sis/distinfo b/x11-drivers/xf86-video-sis/distinfo index 3fae8012c91c..dfb418922f61 100644 --- a/x11-drivers/xf86-video-sis/distinfo +++ b/x11-drivers/xf86-video-sis/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-sis-0.10.0.tar.bz2) = 331d432dccccca91ec7da39ff6bf1218 -SHA256 (xorg/driver/xf86-video-sis-0.10.0.tar.bz2) = bcc0dcde5d469cc2500676e0ad29dcd12b1370066289902387ead762260e4b40 -SIZE (xorg/driver/xf86-video-sis-0.10.0.tar.bz2) = 630049 +MD5 (xorg/driver/xf86-video-sis-0.10.1.tar.bz2) = 9f57c2f5ccbd8340db32da1c74083771 +SHA256 (xorg/driver/xf86-video-sis-0.10.1.tar.bz2) = 11529f094cbdcdaba505596488eda623e0f0bd3c51139359d587ea58b6527307 +SIZE (xorg/driver/xf86-video-sis-0.10.1.tar.bz2) = 637423 diff --git a/x11-drivers/xf86-video-sunffb/Makefile b/x11-drivers/xf86-video-sunffb/Makefile index 777e45c9fcd5..9c91c51d7ae1 100644 --- a/x11-drivers/xf86-video-sunffb/Makefile +++ b/x11-drivers/xf86-video-sunffb/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-video-sunffb -PORTVERSION= 1.1.0 -PORTREVISION= 5 +PORTVERSION= 1.2.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-sunffb/distinfo b/x11-drivers/xf86-video-sunffb/distinfo index b5c0eaa23b0e..072277c3434d 100644 --- a/x11-drivers/xf86-video-sunffb/distinfo +++ b/x11-drivers/xf86-video-sunffb/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-sunffb-1.1.0.tar.bz2) = dee23564c0d8069f52c7cd29c78be667 -SHA256 (xorg/driver/xf86-video-sunffb-1.1.0.tar.bz2) = f897a427e83cf6965fd82724e3298aea44eb3131ba62f904cb514dfd0a879029 -SIZE (xorg/driver/xf86-video-sunffb-1.1.0.tar.bz2) = 268148 +MD5 (xorg/driver/xf86-video-sunffb-1.2.0.tar.bz2) = 816842de26bce8a935f3c9c3cfedbc42 +SHA256 (xorg/driver/xf86-video-sunffb-1.2.0.tar.bz2) = 59f2f8fc2399a4d6b0ce733481c58694e723a989f4712c00436d35e27c059292 +SIZE (xorg/driver/xf86-video-sunffb-1.2.0.tar.bz2) = 277524 diff --git a/x11-drivers/xf86-video-tdfx/Makefile b/x11-drivers/xf86-video-tdfx/Makefile index ce0f637b5780..7ee3467f62f3 100644 --- a/x11-drivers/xf86-video-tdfx/Makefile +++ b/x11-drivers/xf86-video-tdfx/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-video-tdfx -PORTVERSION= 1.3.0 -PORTREVISION= 3 +PORTVERSION= 1.4.1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-tdfx/distinfo b/x11-drivers/xf86-video-tdfx/distinfo index 1fb963e32cf3..ab907ff4c5ed 100644 --- a/x11-drivers/xf86-video-tdfx/distinfo +++ b/x11-drivers/xf86-video-tdfx/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-tdfx-1.3.0.tar.bz2) = 04c49acb5c5dbde14eabd32d06df6e73 -SHA256 (xorg/driver/xf86-video-tdfx-1.3.0.tar.bz2) = 6b1a00df5c9628817d08f07c6f18f578950744f3eb63b4397be8b0754e728624 -SIZE (xorg/driver/xf86-video-tdfx-1.3.0.tar.bz2) = 261448 +MD5 (xorg/driver/xf86-video-tdfx-1.4.1.tar.bz2) = 59acf2a4f721f9b7abbd121748467b16 +SHA256 (xorg/driver/xf86-video-tdfx-1.4.1.tar.bz2) = d741c68a9a90b8bec4dd94e43844346237e9c5cffec98fee8719ec92933b9498 +SIZE (xorg/driver/xf86-video-tdfx-1.4.1.tar.bz2) = 286452 diff --git a/x11-drivers/xf86-video-tga/Makefile b/x11-drivers/xf86-video-tga/Makefile index 1d78f11ac159..836f1a5711b8 100644 --- a/x11-drivers/xf86-video-tga/Makefile +++ b/x11-drivers/xf86-video-tga/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-video-tga -PORTVERSION= 1.1.0 -PORTREVISION= 2 +PORTVERSION= 1.2.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-tga/distinfo b/x11-drivers/xf86-video-tga/distinfo index df6f9124213f..2375ee35d233 100644 --- a/x11-drivers/xf86-video-tga/distinfo +++ b/x11-drivers/xf86-video-tga/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-tga-1.1.0.tar.bz2) = 9eda4d4490706b2dd8f4ecdbaf779856 -SHA256 (xorg/driver/xf86-video-tga-1.1.0.tar.bz2) = 50143dfdd259fd114dc2f41518a4898d5407bf55422251df75812b96a1fa6e9b -SIZE (xorg/driver/xf86-video-tga-1.1.0.tar.bz2) = 260342 +MD5 (xorg/driver/xf86-video-tga-1.2.0.tar.bz2) = f3bddf0a64932ca9bd72041ccd3b5501 +SHA256 (xorg/driver/xf86-video-tga-1.2.0.tar.bz2) = a92f8cad0e21318be465719a9f30a50d5719b0b70bf8e15f3937e7850cf1aea6 +SIZE (xorg/driver/xf86-video-tga-1.2.0.tar.bz2) = 269406 diff --git a/x11-drivers/xf86-video-trident/Makefile b/x11-drivers/xf86-video-trident/Makefile index 69441bc67042..df1f14669afc 100644 --- a/x11-drivers/xf86-video-trident/Makefile +++ b/x11-drivers/xf86-video-trident/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-video-trident -PORTVERSION= 1.2.3 -PORTREVISION= 2 +PORTVERSION= 1.3.1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-trident/distinfo b/x11-drivers/xf86-video-trident/distinfo index 9a37d95edf96..8ea730bbbda8 100644 --- a/x11-drivers/xf86-video-trident/distinfo +++ b/x11-drivers/xf86-video-trident/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-trident-1.2.3.tar.bz2) = c0e8b2f54942b6902b7dd4f30defe800 -SHA256 (xorg/driver/xf86-video-trident-1.2.3.tar.bz2) = d23eb8fa165d238ddf64da63dcd60c70a01cd761608a18402cfb95aed6722495 -SIZE (xorg/driver/xf86-video-trident-1.2.3.tar.bz2) = 288372 +MD5 (xorg/driver/xf86-video-trident-1.3.1.tar.bz2) = 9f280bef235426394013cb5e1854b823 +SHA256 (xorg/driver/xf86-video-trident-1.3.1.tar.bz2) = c74b2af84c4b4f11ea2068ec056574a1ba0402459bada3518c4800307ab7c8bf +SIZE (xorg/driver/xf86-video-trident-1.3.1.tar.bz2) = 293180 diff --git a/x11-drivers/xf86-video-tseng/Makefile b/x11-drivers/xf86-video-tseng/Makefile index b26865e033f1..7ce9b00f4b93 100644 --- a/x11-drivers/xf86-video-tseng/Makefile +++ b/x11-drivers/xf86-video-tseng/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-video-tseng -PORTVERSION= 1.1.1 -PORTREVISION= 2 +PORTVERSION= 1.2.1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-tseng/distinfo b/x11-drivers/xf86-video-tseng/distinfo index 9d86bd5720c5..888a56163072 100644 --- a/x11-drivers/xf86-video-tseng/distinfo +++ b/x11-drivers/xf86-video-tseng/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-tseng-1.1.1.tar.bz2) = 488aa9c3ec7a95e6589afa4b50bec8b4 -SHA256 (xorg/driver/xf86-video-tseng-1.1.1.tar.bz2) = c9c1f3318715b7268068bc733d00bcab93924e97eb38f94548e442fd6cdfd56e -SIZE (xorg/driver/xf86-video-tseng-1.1.1.tar.bz2) = 273211 +MD5 (xorg/driver/xf86-video-tseng-1.2.1.tar.bz2) = 2f687eddae5dafa5dcc05116561e267c +SHA256 (xorg/driver/xf86-video-tseng-1.2.1.tar.bz2) = 540bb96efb0f2ec61e08fe1cc6e2e887fba34a6332ddf7e947ace59f0fad34ba +SIZE (xorg/driver/xf86-video-tseng-1.2.1.tar.bz2) = 280383 diff --git a/x11-drivers/xf86-video-vesa/Makefile b/x11-drivers/xf86-video-vesa/Makefile index d7f886851b56..ed65d0edccc9 100644 --- a/x11-drivers/xf86-video-vesa/Makefile +++ b/x11-drivers/xf86-video-vesa/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-video-vesa -PORTVERSION= 1.3.0 -PORTREVISION= 2 +PORTVERSION= 2.1.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-vesa/distinfo b/x11-drivers/xf86-video-vesa/distinfo index 307da5ea252a..1309765ad9e6 100644 --- a/x11-drivers/xf86-video-vesa/distinfo +++ b/x11-drivers/xf86-video-vesa/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-vesa-1.3.0.tar.bz2) = 4a307852f3b4850e436a41dab2a73676 -SHA256 (xorg/driver/xf86-video-vesa-1.3.0.tar.bz2) = b96c80ae81f5123ecef344dac4c734b2e281143d3ab7a7e633d6bf04c893e203 -SIZE (xorg/driver/xf86-video-vesa-1.3.0.tar.bz2) = 237759 +MD5 (xorg/driver/xf86-video-vesa-2.1.0.tar.bz2) = d813269613b4d63ff6dbfbfbd104cc84 +SHA256 (xorg/driver/xf86-video-vesa-2.1.0.tar.bz2) = de06caf86d3c1a1f086b8b55c054d60218fdf3956e93e411d9ee0d96bb42a6f8 +SIZE (xorg/driver/xf86-video-vesa-2.1.0.tar.bz2) = 245147 diff --git a/x11-drivers/xf86-video-via/Makefile b/x11-drivers/xf86-video-via/Makefile index a133dfb0e6ff..ccef504b4920 100644 --- a/x11-drivers/xf86-video-via/Makefile +++ b/x11-drivers/xf86-video-via/Makefile @@ -13,10 +13,12 @@ CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org via display driver -USE_GL= gl +IGNORE= requires pciVideoPtr typedef +USE_GL= gl XORG_CAT= driver USE_XORG= xvmc xf86driproto xextproto x11 glproto + MAN4= via.4x .include <bsd.port.pre.mk> diff --git a/x11-drivers/xf86-video-vmware/Makefile b/x11-drivers/xf86-video-vmware/Makefile index 874381c2f419..d1700668ebe6 100644 --- a/x11-drivers/xf86-video-vmware/Makefile +++ b/x11-drivers/xf86-video-vmware/Makefile @@ -6,15 +6,15 @@ # PORTNAME= xf86-video-vmware -PORTVERSION= 10.15.2 -PORTREVISION= 1 +PORTVERSION= 10.16.5 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org vmware display driver XORG_CAT= driver -USE_XORG= xextproto xineramaproto +USE_XORG= xextproto xineramaproto videoproto + MAN4= vmware.4x .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-vmware/distinfo b/x11-drivers/xf86-video-vmware/distinfo index c911c4abb014..0988761da421 100644 --- a/x11-drivers/xf86-video-vmware/distinfo +++ b/x11-drivers/xf86-video-vmware/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-vmware-10.15.2.tar.bz2) = 99322cbcc9081ad44e9cba63e3df8f7e -SHA256 (xorg/driver/xf86-video-vmware-10.15.2.tar.bz2) = edae155c82d348b76dabe1373605bf6715b577cdd7a95f8b54ad534dc47c71ff -SIZE (xorg/driver/xf86-video-vmware-10.15.2.tar.bz2) = 269346 +MD5 (xorg/driver/xf86-video-vmware-10.16.5.tar.bz2) = 6d78c82ea7c2bb0fcb587d7bb4e8f60a +SHA256 (xorg/driver/xf86-video-vmware-10.16.5.tar.bz2) = 3e4e9abfd806b36076083ef6cacc93b713bfa4ddefe7005edfc15c64f5174366 +SIZE (xorg/driver/xf86-video-vmware-10.16.5.tar.bz2) = 278790 diff --git a/x11-drivers/xf86-video-voodoo/Makefile b/x11-drivers/xf86-video-voodoo/Makefile index 0dd14663ac82..66e963c23a2f 100644 --- a/x11-drivers/xf86-video-voodoo/Makefile +++ b/x11-drivers/xf86-video-voodoo/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-video-voodoo -PORTVERSION= 1.1.1 -PORTREVISION= 2 +PORTVERSION= 1.2.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-voodoo/distinfo b/x11-drivers/xf86-video-voodoo/distinfo index 671498aacf80..e980065889a0 100644 --- a/x11-drivers/xf86-video-voodoo/distinfo +++ b/x11-drivers/xf86-video-voodoo/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-voodoo-1.1.1.tar.bz2) = bc878e795688b49a595b355482d27174 -SHA256 (xorg/driver/xf86-video-voodoo-1.1.1.tar.bz2) = 3975601baee674b2bad0dfe696586f17cc913f1dc7f1d5c4e184623e0461751c -SIZE (xorg/driver/xf86-video-voodoo-1.1.1.tar.bz2) = 248401 +MD5 (xorg/driver/xf86-video-voodoo-1.2.0.tar.bz2) = 7c681d9b57f5e1f798263fc1a9d99245 +SHA256 (xorg/driver/xf86-video-voodoo-1.2.0.tar.bz2) = b79ba6d5d4300570c00f8be37c536f47f2d78c18845f70f525da2a29e47c4b8c +SIZE (xorg/driver/xf86-video-voodoo-1.2.0.tar.bz2) = 256472 diff --git a/x11-drivers/xorg-drivers/Makefile b/x11-drivers/xorg-drivers/Makefile index 9c8bdfbe0d8a..2087c2c3852b 100644 --- a/x11-drivers/xorg-drivers/Makefile +++ b/x11-drivers/xorg-drivers/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xorg-drivers -PORTVERSION= 7.3 -PORTREVISION= 3 +PORTVERSION= 7.4 CATEGORIES= x11-drivers MASTER_SITES= # none DISTFILES= # none @@ -31,12 +30,12 @@ VIDEO_ON= ati \ nv \ r128 \ radeonhd \ - vesa vga + vesa .if ${ARCH} == "sparc64" VIDEO_ON+= sunffb .else -VIDEO_ON+= via +VIDEO_ON+= openchrome .endif VIDEO_OFF= apm ark \ @@ -47,11 +46,10 @@ VIDEO_OFF= apm ark \ i128 i740 imstt \ mga \ neomagic newport nsc \ - openchrome \ rendition \ s3 s3virge savage siliconmotion sis \ tdfx tga trident tseng \ - vmware voodoo + via vmware voodoo VIDEO_EXCL= via:openchrome @@ -66,7 +64,7 @@ INPUT_OFF= acecad \ jamstudio joystick \ magellan magictouch microtouch mutouch \ palmax penmount \ - spaceorb summa \ + spaceorb summa synaptics \ tek4957 \ vmmouse void diff --git a/x11-fm/rox-filer/Makefile b/x11-fm/rox-filer/Makefile index 8a6b63d008fd..e9f524c9bb1a 100644 --- a/x11-fm/rox-filer/Makefile +++ b/x11-fm/rox-filer/Makefile @@ -6,7 +6,7 @@ PORTNAME= rox-filer PORTVERSION= 2.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-fm gnome MASTER_SITES= SF/rox DISTNAME= rox-filer-${PORTVERSION} diff --git a/x11-fm/tdfsb/Makefile b/x11-fm/tdfsb/Makefile index fa0614596ad1..14bdd7867952 100644 --- a/x11-fm/tdfsb/Makefile +++ b/x11-fm/tdfsb/Makefile @@ -7,17 +7,16 @@ PORTNAME= tdfsb PORTVERSION= 0.0.9 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-fm MASTER_SITES= http://www.determinate.net/webdata/data/ MAINTAINER= alepulver@FreeBSD.org COMMENT= A 3D filesystem browser -LIB_DEPENDS= smpeg.1:${PORTSDIR}/multimedia/smpeg \ - glut.4:${PORTSDIR}/graphics/libglut +LIB_DEPENDS= smpeg.1:${PORTSDIR}/multimedia/smpeg -USE_GL= yes +USE_GL= glut USE_SDL= image sdl PLIST_FILES= bin/${PORTNAME} diff --git a/x11-fonts/font-xfree86-type1/Makefile b/x11-fonts/font-xfree86-type1/Makefile index 9d61e65426d0..0afa526c7828 100644 --- a/x11-fonts/font-xfree86-type1/Makefile +++ b/x11-fonts/font-xfree86-type1/Makefile @@ -6,7 +6,7 @@ # PORTNAME= font-xfree86-type1 -PORTVERSION= 1.0.0 +PORTVERSION= 1.0.1 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/font-xfree86-type1/distinfo b/x11-fonts/font-xfree86-type1/distinfo index 9c5ec95368fe..ce450b89f0cd 100644 --- a/x11-fonts/font-xfree86-type1/distinfo +++ b/x11-fonts/font-xfree86-type1/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/font/font-xfree86-type1-1.0.0.tar.bz2) = e66f36a6d68203cc4cf7b56ebbb192dd -SHA256 (xorg/font/font-xfree86-type1-1.0.0.tar.bz2) = ef76d3b91d1bdaa9ff73cc1e5905ad4bbdc028f06157d0d2319d38e7b7f84a4d -SIZE (xorg/font/font-xfree86-type1-1.0.0.tar.bz2) = 66079 +MD5 (xorg/font/font-xfree86-type1-1.0.1.tar.bz2) = d7e965776c7f0c30b0f09742176fb77a +SHA256 (xorg/font/font-xfree86-type1-1.0.1.tar.bz2) = 8fd9f9b81120d8afc25ea8901a8a91d7428c45cd9cfe7a7bef2b15c8b8d5f341 +SIZE (xorg/font/font-xfree86-type1-1.0.1.tar.bz2) = 71607 diff --git a/x11-fonts/fslsfonts/Makefile b/x11-fonts/fslsfonts/Makefile index a9fb10a95160..5097104bf085 100644 --- a/x11-fonts/fslsfonts/Makefile +++ b/x11-fonts/fslsfonts/Makefile @@ -6,7 +6,7 @@ # PORTNAME= fslsfonts -PORTVERSION= 1.0.1 +PORTVERSION= 1.0.2 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/fslsfonts/distinfo b/x11-fonts/fslsfonts/distinfo index 702f70488962..8461314aa681 100644 --- a/x11-fonts/fslsfonts/distinfo +++ b/x11-fonts/fslsfonts/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/fslsfonts-1.0.1.tar.bz2) = c7b2f8a938749d41dc86db6bd1e6a4ca -SHA256 (xorg/app/fslsfonts-1.0.1.tar.bz2) = 3feb006a25f36856924e26249fe84b27142678f97175780960f085e1e263a62e -SIZE (xorg/app/fslsfonts-1.0.1.tar.bz2) = 76928 +MD5 (xorg/app/fslsfonts-1.0.2.tar.bz2) = a61be25c87ee42169ee4dc8344acc9e2 +SHA256 (xorg/app/fslsfonts-1.0.2.tar.bz2) = 9c8e7d573284272c633b5cf18e3358830b27bde72f4bc1ae83a1ab337d463a92 +SIZE (xorg/app/fslsfonts-1.0.2.tar.bz2) = 88561 diff --git a/x11-fonts/libFS/Makefile b/x11-fonts/libFS/Makefile index c3ca72db2f17..5bd36b982de0 100644 --- a/x11-fonts/libFS/Makefile +++ b/x11-fonts/libFS/Makefile @@ -6,8 +6,7 @@ # PORTNAME= libFS -PORTVERSION= 1.0.0 -PORTREVISION= 1 +PORTVERSION= 1.0.1 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/libFS/distinfo b/x11-fonts/libFS/distinfo index 78c9b5bf3c3d..e8a9b43f9a97 100644 --- a/x11-fonts/libFS/distinfo +++ b/x11-fonts/libFS/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/lib/libFS-1.0.0.tar.bz2) = dfd5de47e232db0891410bec8ee6707b -SHA256 (xorg/lib/libFS-1.0.0.tar.bz2) = 2f18f9fa0e18a3eab3c154ba820ad64b5c6ee364e147524055a553a130ccfdde -SIZE (xorg/lib/libFS-1.0.0.tar.bz2) = 236606 +MD5 (xorg/lib/libFS-1.0.1.tar.bz2) = 81521249353fa33be7a4bb0062c2fbb9 +SHA256 (xorg/lib/libFS-1.0.1.tar.bz2) = 9bf92ffdb51e69e07682cd1a6c0101f2a833b16b9bfa5d601491ff46a35a2cf5 +SIZE (xorg/lib/libFS-1.0.1.tar.bz2) = 239934 diff --git a/x11-fonts/libXfont/Makefile b/x11-fonts/libXfont/Makefile index a3b0d68e6b29..89e6afb89459 100644 --- a/x11-fonts/libXfont/Makefile +++ b/x11-fonts/libXfont/Makefile @@ -6,8 +6,7 @@ # PORTNAME= libXfont -PORTVERSION= 1.3.1 -PORTREVISION= 3 +PORTVERSION= 1.3.4 PORTEPOCH= 1 CATEGORIES= x11-fonts @@ -17,6 +16,6 @@ COMMENT= X font libary LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 XORG_CAT= lib -USE_XORG= fontcacheproto xproto:both xtrans fontsproto:both fontenc +USE_XORG= xproto:both xtrans fontsproto:both fontenc .include <bsd.port.mk> diff --git a/x11-fonts/libXfont/distinfo b/x11-fonts/libXfont/distinfo index bf35c32dadf0..a7cd75698b08 100644 --- a/x11-fonts/libXfont/distinfo +++ b/x11-fonts/libXfont/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/lib/libXfont-1.3.1.tar.bz2) = b2f396b62633819bbdd9748383876e21 -SHA256 (xorg/lib/libXfont-1.3.1.tar.bz2) = dcfb7dc980a16ad98ac984b98321148864ea8b4637d3dd3773e483a14158a9b1 -SIZE (xorg/lib/libXfont-1.3.1.tar.bz2) = 564235 +MD5 (xorg/lib/libXfont-1.3.4.tar.bz2) = 788371ee566ef97ed4ca0794873b38cf +SHA256 (xorg/lib/libXfont-1.3.4.tar.bz2) = b09f23f1fd758fe25336d084455229e6847fab9dcaec839846431f0f4fe7d9f0 +SIZE (xorg/lib/libXfont-1.3.4.tar.bz2) = 571087 diff --git a/x11-fonts/libXfont/files/patch-CVE-2008-0006 b/x11-fonts/libXfont/files/patch-CVE-2008-0006 deleted file mode 100644 index 95f7b2f28019..000000000000 --- a/x11-fonts/libXfont/files/patch-CVE-2008-0006 +++ /dev/null @@ -1,24 +0,0 @@ -diff --git src/bitmap/pcfread.c src/bitmap/pcfread.c -index fd41849..c5db255 100644 ---- src/bitmap/pcfread.c -+++ src/bitmap/pcfread.c -@@ -588,6 +588,9 @@ pcfReadFont(FontPtr pFont, FontFilePtr file, - pFont->info.lastRow = pcfGetINT16(file, format); - pFont->info.defaultCh = pcfGetINT16(file, format); - if (IS_EOF(file)) goto Bail; -+ if (pFont->info.firstCol > pFont->info.lastCol || -+ pFont->info.firstRow > pFont->info.lastRow || -+ pFont->info.lastCol-pFont->info.firstCol > 255) goto Bail; - - nencoding = (pFont->info.lastCol - pFont->info.firstCol + 1) * - (pFont->info.lastRow - pFont->info.firstRow + 1); -@@ -726,6 +729,9 @@ pcfReadFontInfo(FontInfoPtr pFontInfo, FontFilePtr file) - pFontInfo->lastRow = pcfGetINT16(file, format); - pFontInfo->defaultCh = pcfGetINT16(file, format); - if (IS_EOF(file)) goto Bail; -+ if (pFontInfo->firstCol > pFontInfo->lastCol || -+ pFontInfo->firstRow > pFontInfo->lastRow || -+ pFontInfo->lastCol-pFontInfo->firstCol > 255) goto Bail; - - nencoding = (pFontInfo->lastCol - pFontInfo->firstCol + 1) * - (pFontInfo->lastRow - pFontInfo->firstRow + 1); diff --git a/x11-fonts/libXfont/files/patch-src_fontfile_catalogue.c b/x11-fonts/libXfont/files/patch-src_fontfile_catalogue.c deleted file mode 100644 index f25280eef906..000000000000 --- a/x11-fonts/libXfont/files/patch-src_fontfile_catalogue.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/fontfile/catalogue.c.orig -+++ src/fontfile/catalogue.c -@@ -156,7 +156,7 @@ CatalogueRescan (FontPathElementPtr fpe) - while (entry = readdir(dir), entry != NULL) - { - snprintf(link, sizeof link, "%s/%s", path, entry->d_name); -- len = readlink(link, dest, sizeof dest); -+ len = readlink(link, dest, sizeof dest - 1); - if (len < 0) - continue; - diff --git a/x11-fonts/mkfontdir/Makefile b/x11-fonts/mkfontdir/Makefile index b7d609430d11..8ec6333babaf 100644 --- a/x11-fonts/mkfontdir/Makefile +++ b/x11-fonts/mkfontdir/Makefile @@ -6,8 +6,7 @@ # PORTNAME= mkfontdir -PORTVERSION= 1.0.3 -PORTREVISION= 1 +PORTVERSION= 1.0.4 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/mkfontdir/distinfo b/x11-fonts/mkfontdir/distinfo index b1c479e324a7..a9ac5fe880fc 100644 --- a/x11-fonts/mkfontdir/distinfo +++ b/x11-fonts/mkfontdir/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/mkfontdir-1.0.3.tar.bz2) = 4d0f89a23f77e22f1671a77bf0898955 -SHA256 (xorg/app/mkfontdir-1.0.3.tar.bz2) = 2a786e03611a53c7f6263db446c0c9ef76e94bcf930b0b5867cc6a9c19653074 -SIZE (xorg/app/mkfontdir-1.0.3.tar.bz2) = 62898 +MD5 (xorg/app/mkfontdir-1.0.4.tar.bz2) = 35394bf3f746a57fba624dba52fdbba3 +SHA256 (xorg/app/mkfontdir-1.0.4.tar.bz2) = 6f9a3cc70d27704ee8e4ff01d5d69c974b059fd7e470172b68cfa477c7caf8e3 +SIZE (xorg/app/mkfontdir-1.0.4.tar.bz2) = 70506 diff --git a/x11-fonts/mkfontscale/Makefile b/x11-fonts/mkfontscale/Makefile index 2cc4301f0e91..f893dc8386fc 100644 --- a/x11-fonts/mkfontscale/Makefile +++ b/x11-fonts/mkfontscale/Makefile @@ -6,7 +6,7 @@ # PORTNAME= mkfontscale -PORTVERSION= 1.0.3 +PORTVERSION= 1.0.6 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/mkfontscale/distinfo b/x11-fonts/mkfontscale/distinfo index d7a2771bbd83..f557bbb00a0b 100644 --- a/x11-fonts/mkfontscale/distinfo +++ b/x11-fonts/mkfontscale/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/mkfontscale-1.0.3.tar.bz2) = 1d608771aca9695b828cec1e34178fd1 -SHA256 (xorg/app/mkfontscale-1.0.3.tar.bz2) = 0458a3a5525b4ab458a018648ef8575afc191f904364c00e27876a7bd53af020 -SIZE (xorg/app/mkfontscale-1.0.3.tar.bz2) = 94674 +MD5 (xorg/app/mkfontscale-1.0.6.tar.bz2) = 0d0752af232054b720febcc1b2fd6c57 +SHA256 (xorg/app/mkfontscale-1.0.6.tar.bz2) = 273512f86fdc46689e9295409982dff0fb5b2ab0cac1690c0d973907bb7b6776 +SIZE (xorg/app/mkfontscale-1.0.6.tar.bz2) = 105475 diff --git a/x11-fonts/showfont/Makefile b/x11-fonts/showfont/Makefile index 1a42e2b69d7b..b85dfe5db725 100644 --- a/x11-fonts/showfont/Makefile +++ b/x11-fonts/showfont/Makefile @@ -6,8 +6,7 @@ # PORTNAME= showfont -PORTVERSION= 1.0.1 -PORTREVISION= 1 +PORTVERSION= 1.0.2 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/showfont/distinfo b/x11-fonts/showfont/distinfo index 1a91304f82ed..7f6b846fc197 100644 --- a/x11-fonts/showfont/distinfo +++ b/x11-fonts/showfont/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/showfont-1.0.1.tar.bz2) = 339b2faf1ca5114fda414338e15b6e21 -SHA256 (xorg/app/showfont-1.0.1.tar.bz2) = 87db3cf12914abc6b074d12b35c7f39c8fd7b5d3933b339e2c1260a51061760c -SIZE (xorg/app/showfont-1.0.1.tar.bz2) = 77016 +MD5 (xorg/app/showfont-1.0.2.tar.bz2) = 8f83d774ed4cc2a6dca86edd856d820a +SHA256 (xorg/app/showfont-1.0.2.tar.bz2) = 9bd0373659b2f24120dba887fd155f99aed02e4a7c2afae69e7db1c1fa05e88c +SIZE (xorg/app/showfont-1.0.2.tar.bz2) = 90582 diff --git a/x11-fonts/xfontsel/Makefile b/x11-fonts/xfontsel/Makefile index 7714d539dfb6..abb90afebec3 100644 --- a/x11-fonts/xfontsel/Makefile +++ b/x11-fonts/xfontsel/Makefile @@ -7,6 +7,7 @@ PORTNAME= xfontsel PORTVERSION= 1.0.2 +PORTREVISION= 1 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/xfs/Makefile b/x11-fonts/xfs/Makefile index 69954987ba16..de1419eddd92 100644 --- a/x11-fonts/xfs/Makefile +++ b/x11-fonts/xfs/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xfs -PORTVERSION= 1.0.5 -PORTREVISION= 1 +PORTVERSION= 1.0.8 PORTEPOCH= 1 CATEGORIES= x11-fonts @@ -21,18 +20,16 @@ ALL_TARGET= all config MAN1= xfs.1 -.if !defined(WITHOUT_XFS_CACHE) -USE_XORG+= fontcacheproto x11 -CFLAGS+= -DFONTCACHE -.else post-patch: + ${REINPLACE_CMD} '/^config_DATA/d' ${WRKSRC}/Makefile.in +.if defined(WITHOUT_XFS_CACHE) ${REINPLACE_CMD} -e 's|^cache|XCOMM &|' ${WRKSRC}/config.cpp .endif post-install: - ${INSTALL_SCRIPT} ${WRKSRC}/config ${PREFIX}/lib/X11/fs/config.default - @if [ ! -f ${PREFIX}/lib/X11/fs/config ]; then \ - ${INSTALL_SCRIPT} ${WRKSRC}/config ${PREFIX}/lib/X11/fs/config; \ + ${INSTALL_SCRIPT} ${WRKSRC}/config ${PREFIX}/etc/X11/fs/config.default + @if [ ! -f ${PREFIX}/etc/X11/fs/config ]; then \ + ${INSTALL_SCRIPT} ${WRKSRC}/config ${PREFIX}/etc/X11/fs/config; \ fi .include <bsd.port.mk> diff --git a/x11-fonts/xfs/distinfo b/x11-fonts/xfs/distinfo index d0f8c8540432..3484d5eac284 100644 --- a/x11-fonts/xfs/distinfo +++ b/x11-fonts/xfs/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/xfs-1.0.5.tar.bz2) = 3fc73b5e39a1fe8b8d96563c8144cffe -SHA256 (xorg/app/xfs-1.0.5.tar.bz2) = f586f2101d42e512e7d20a6a6715c3c2cad19cacbee3b4034a0818de349e38f9 -SIZE (xorg/app/xfs-1.0.5.tar.bz2) = 152131 +MD5 (xorg/app/xfs-1.0.8.tar.bz2) = f10717e45535b64eb45226aac571dac2 +SHA256 (xorg/app/xfs-1.0.8.tar.bz2) = 34b5040b3db7552fc1cdfa46f926ce5b7217ea5d77cfafbbddf94fbae6b4f482 +SIZE (xorg/app/xfs-1.0.8.tar.bz2) = 161279 diff --git a/x11-fonts/xfs/files/patch-Makefile.in b/x11-fonts/xfs/files/patch-Makefile.in deleted file mode 100644 index 2fecfe5ad0ee..000000000000 --- a/x11-fonts/xfs/files/patch-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig Sat Jul 8 12:35:19 2006 -+++ Makefile.in Sat Jul 8 12:35:21 2006 -@@ -289,7 +289,7 @@ - FSERRORS = /var/log/xfs.log - FONTDIR = $(libdir)/X11/fonts - FONTPATH = $(FONTDIR)/misc/,$(FONTDIR)/TTF/,$(FONTDIR)/Type1/,$(FONTDIR)/CID/,$(FONTDIR)/100dpi/,$(FONTDIR)/75dpi/ --config_DATA = config -+#config_DATA = config - EXTRA_DIST = xfs.def config.cpp $(appman_PRE) - CLEANFILES = config $(appman_DATA) - appmandir = $(APP_MAN_DIR) diff --git a/x11-fonts/xfs/pkg-install b/x11-fonts/xfs/pkg-install index 183fcb6dd3f9..9979ff9a1e1a 100644 --- a/x11-fonts/xfs/pkg-install +++ b/x11-fonts/xfs/pkg-install @@ -6,7 +6,7 @@ fi PKG_PREFIX=${PKG_PREFIX:=/usr/X11R6} -XINITCONFDIR=${PKG_PREFIX}/lib/X11/fs +XINITCONFDIR=${PKG_PREFIX}/etc/X11/fs if [ ! -f ${XINITCONFDIR}/config ]; then cp ${XINITCONFDIR}/config.default ${XINITCONFDIR}/config fi diff --git a/x11-fonts/xfs/pkg-plist b/x11-fonts/xfs/pkg-plist index 02c0cee1f5f5..e2378ab6db01 100644 --- a/x11-fonts/xfs/pkg-plist +++ b/x11-fonts/xfs/pkg-plist @@ -1,5 +1,6 @@ bin/xfs -@unexec if cmp -s %D/lib/X11/fs/config.default %D/lib/X11/fs/config; then rm -f %D/lib/X11/fs/config; fi -lib/X11/fs/config.default -@exec if [ ! -f %D/lib/X11/fs/config ] ; then cp -p %D/%F %B/config; fi -@dirrmtry lib/X11/fs +@unexec if cmp -s %D/etc/X11/fs/config.default %D/etc/X11/fs/config; then rm -f %D/etc/X11/fs/config; fi +etc/X11/fs/config.default +@exec if [ ! -f %D/etc/X11/fs/config ] ; then cp -p %D/%F %B/config; fi +@dirrmtry etc/X11/fs +@dirrmtry etc/X11 diff --git a/x11-fonts/xfsinfo/Makefile b/x11-fonts/xfsinfo/Makefile index 858ad2b44157..d1456bab4220 100644 --- a/x11-fonts/xfsinfo/Makefile +++ b/x11-fonts/xfsinfo/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xfsinfo -PORTVERSION= 1.0.1 +PORTVERSION= 1.0.2 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/xfsinfo/distinfo b/x11-fonts/xfsinfo/distinfo index 2a37289742ee..f95281dbdffd 100644 --- a/x11-fonts/xfsinfo/distinfo +++ b/x11-fonts/xfsinfo/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/xfsinfo-1.0.1.tar.bz2) = e98b18fbce1261de30b1de819d86f48a -SHA256 (xorg/app/xfsinfo-1.0.1.tar.bz2) = adc33443b3a7f334d2407de702004a0491f24708e0e1abe74cd8ae114cd60cd9 -SIZE (xorg/app/xfsinfo-1.0.1.tar.bz2) = 74335 +MD5 (xorg/app/xfsinfo-1.0.2.tar.bz2) = e6c0071f6d5436113982f4a575d3f94b +SHA256 (xorg/app/xfsinfo-1.0.2.tar.bz2) = 95aaca84f948fc7e25d82c58d3fdbba44911b99f3e205378ce82a786c11bb96f +SIZE (xorg/app/xfsinfo-1.0.2.tar.bz2) = 87787 diff --git a/x11-fonts/xorg-fonts-100dpi/Makefile b/x11-fonts/xorg-fonts-100dpi/Makefile index be413b06e564..3e74cb97fddc 100644 --- a/x11-fonts/xorg-fonts-100dpi/Makefile +++ b/x11-fonts/xorg-fonts-100dpi/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xorg-fonts-100dpi -PORTVERSION= 7.3 +PORTVERSION= 7.4 CATEGORIES= x11-fonts MASTER_SITES= # none DISTFILES= # none diff --git a/x11-fonts/xorg-fonts-75dpi/Makefile b/x11-fonts/xorg-fonts-75dpi/Makefile index 0981f2d82729..e72bce6792dc 100644 --- a/x11-fonts/xorg-fonts-75dpi/Makefile +++ b/x11-fonts/xorg-fonts-75dpi/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xorg-fonts-75dpi -PORTVERSION= 7.3 +PORTVERSION= 7.4 CATEGORIES= x11-fonts MASTER_SITES= # none DISTFILES= # none diff --git a/x11-fonts/xorg-fonts-cyrillic/Makefile b/x11-fonts/xorg-fonts-cyrillic/Makefile index 3ee0e6454351..546547d44e21 100644 --- a/x11-fonts/xorg-fonts-cyrillic/Makefile +++ b/x11-fonts/xorg-fonts-cyrillic/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xorg-fonts-cyrillic -PORTVERSION= 7.3 +PORTVERSION= 7.4 CATEGORIES= x11-fonts MASTER_SITES= # none DISTFILES= # none diff --git a/x11-fonts/xorg-fonts-miscbitmaps/Makefile b/x11-fonts/xorg-fonts-miscbitmaps/Makefile index 2d89072e96b7..3939118788be 100644 --- a/x11-fonts/xorg-fonts-miscbitmaps/Makefile +++ b/x11-fonts/xorg-fonts-miscbitmaps/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xorg-fonts-miscbitmaps -PORTVERSION= 7.3 +PORTVERSION= 7.4 CATEGORIES= x11-fonts MASTER_SITES= # none DISTFILES= # none diff --git a/x11-fonts/xorg-fonts-truetype/Makefile b/x11-fonts/xorg-fonts-truetype/Makefile index 684022a20695..b01829e8098d 100644 --- a/x11-fonts/xorg-fonts-truetype/Makefile +++ b/x11-fonts/xorg-fonts-truetype/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xorg-fonts-truetype -PORTVERSION= 7.3 +PORTVERSION= 7.4 CATEGORIES= x11-fonts MASTER_SITES= # none DISTFILES= # none diff --git a/x11-fonts/xorg-fonts-type1/Makefile b/x11-fonts/xorg-fonts-type1/Makefile index bf10b17a3a74..0648a55d79c9 100644 --- a/x11-fonts/xorg-fonts-type1/Makefile +++ b/x11-fonts/xorg-fonts-type1/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xorg-fonts-type1 -PORTVERSION= 7.3 +PORTVERSION= 7.4 CATEGORIES= x11-fonts MASTER_SITES= # none DISTFILES= # none diff --git a/x11-fonts/xorg-fonts/Makefile b/x11-fonts/xorg-fonts/Makefile index 9640236c8fc2..7a8c707ef3fb 100644 --- a/x11-fonts/xorg-fonts/Makefile +++ b/x11-fonts/xorg-fonts/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xorg-fonts -PORTVERSION= 7.3 -PORTREVISION= 1 +PORTVERSION= 7.4 CATEGORIES= x11-fonts MASTER_SITES= # none DISTFILES= # none diff --git a/x11-servers/xephyr/Makefile b/x11-servers/xephyr/Makefile index 05e3e587143c..bd43c1ec697f 100644 --- a/x11-servers/xephyr/Makefile +++ b/x11-servers/xephyr/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xephyr -PORTVERSION= 1.4 -PORTREVISION= 1 +PORTVERSION= 1.5.3 CATEGORIES= x11-servers MAINTAINER= x11@FreeBSD.org @@ -16,13 +15,15 @@ COMMENT= A kdrive based X server from X.Org XORG_CAT= xserver LIB_DEPENDS= drm:${PORTSDIR}/graphics/libdrm + +USE_GL= gl USE_XORG= x11 xf86driproto glproto randrproto renderproto fixesproto \ damageproto xcmiscproto xtrans inputproto \ xf86bigfontproto scrnsaverproto bigreqsproto \ resourceproto fontsproto videoproto \ compositeproto trapproto recordproto \ xineramaproto evieproto xkbfile xfont \ - xau xdmcp xext fontenc pixman + xau xdmcp xext fontenc xv pixman CONFIGURE_ARGS= --enable-kdrive --enable-xephyr --disable-dmx --disable-xvfb \ --disable-xorg --disable-xnest --disable-xprint \ diff --git a/x11-servers/xephyr/distinfo b/x11-servers/xephyr/distinfo index 70c76c2b2663..0a7c42acf73d 100644 --- a/x11-servers/xephyr/distinfo +++ b/x11-servers/xephyr/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/xserver/xorg-server-1.4.tar.bz2) = a06d9fe4f9f1d459ae02657f9ce64220 -SHA256 (xorg/xserver/xorg-server-1.4.tar.bz2) = 51b142df328d427143705371f139a08ff3bcd6efe0eab91f4178ca4017c0ebc2 -SIZE (xorg/xserver/xorg-server-1.4.tar.bz2) = 6179392 +MD5 (xorg/xserver/xorg-server-1.5.3.tar.bz2) = 308971036e25250e7fe3cccfd5a120f8 +SHA256 (xorg/xserver/xorg-server-1.5.3.tar.bz2) = a680174f54be7763819e5275c5d5d44fc9e9b6f8e9351dd45c150eb4c182d5bb +SIZE (xorg/xserver/xorg-server-1.5.3.tar.bz2) = 5622625 diff --git a/x11-servers/xorg-dmx/Makefile b/x11-servers/xorg-dmx/Makefile index fa947a219ec4..191dc638d379 100644 --- a/x11-servers/xorg-dmx/Makefile +++ b/x11-servers/xorg-dmx/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xorg-dmx -PORTVERSION= 1.4 -PORTREVISION= 3 +PORTVERSION= 1.5.3 PORTEPOCH= 1 CATEGORIES= x11-servers @@ -19,6 +18,8 @@ CONFLICTS= XFree86-dmx-[0-9]* XORG_CAT= xserver LIB_DEPENDS= drm:${PORTSDIR}/graphics/libdrm + +USE_GL= gl USE_XORG= x11 xf86driproto glproto randrproto renderproto fixesproto \ damageproto xcmiscproto xextproto xf86miscproto \ xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \ diff --git a/x11-servers/xorg-dmx/distinfo b/x11-servers/xorg-dmx/distinfo index 70c76c2b2663..0a7c42acf73d 100644 --- a/x11-servers/xorg-dmx/distinfo +++ b/x11-servers/xorg-dmx/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/xserver/xorg-server-1.4.tar.bz2) = a06d9fe4f9f1d459ae02657f9ce64220 -SHA256 (xorg/xserver/xorg-server-1.4.tar.bz2) = 51b142df328d427143705371f139a08ff3bcd6efe0eab91f4178ca4017c0ebc2 -SIZE (xorg/xserver/xorg-server-1.4.tar.bz2) = 6179392 +MD5 (xorg/xserver/xorg-server-1.5.3.tar.bz2) = 308971036e25250e7fe3cccfd5a120f8 +SHA256 (xorg/xserver/xorg-server-1.5.3.tar.bz2) = a680174f54be7763819e5275c5d5d44fc9e9b6f8e9351dd45c150eb4c182d5bb +SIZE (xorg/xserver/xorg-server-1.5.3.tar.bz2) = 5622625 diff --git a/x11-servers/xorg-dmx/files/patch-hw_dmx_Makefile.in b/x11-servers/xorg-dmx/files/patch-hw_dmx_Makefile.in deleted file mode 100644 index be7571e1aefa..000000000000 --- a/x11-servers/xorg-dmx/files/patch-hw_dmx_Makefile.in +++ /dev/null @@ -1,10 +0,0 @@ ---- hw/dmx/Makefile.in.orig 2007-12-12 17:55:26.000000000 +0000 -+++ hw/dmx/Makefile.in 2007-12-12 17:55:56.000000000 +0000 -@@ -476,6 +476,7 @@ - Xdmx_LDADD = $(XORG_CORE_LIBS) \ - $(XDMX_LIBS) \ - $(GLX_LIBS) \ -+ $(XSERVER_LIBS) \ - input/libdmxinput.a \ - config/libdmxconfig.a \ - @DMXMODULES_LIBS@ diff --git a/x11-servers/xorg-dmx/files/patch-hw_dmx_dmxinput.c b/x11-servers/xorg-dmx/files/patch-hw_dmx_dmxinput.c deleted file mode 100644 index c860dc10b278..000000000000 --- a/x11-servers/xorg-dmx/files/patch-hw_dmx_dmxinput.c +++ /dev/null @@ -1,17 +0,0 @@ ---- hw/dmx/dmxinput.c.orig 2007-12-12 17:52:53.000000000 +0000 -+++ hw/dmx/dmxinput.c 2007-12-12 17:53:22.000000000 +0000 -@@ -105,3 +105,14 @@ - if (!dmxInput->detached && dmxInput->updateWindowInfo) - dmxInput->updateWindowInfo(dmxInput, type, pWindow); - } -+ -+int -+NewInputDeviceRequest(InputOption *options, DeviceIntPtr *pdev) -+{ -+ return BadValue; -+} -+ -+void -+DeleteInputDeviceRequest(DeviceIntPtr dev) -+{ -+} diff --git a/x11-servers/xorg-nestserver/Makefile b/x11-servers/xorg-nestserver/Makefile index 7546cb56a54c..992c65780fca 100644 --- a/x11-servers/xorg-nestserver/Makefile +++ b/x11-servers/xorg-nestserver/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xorg-nestserver -PORTVERSION= 1.4 -PORTREVISION= 1 +PORTVERSION= 1.5.3 PORTEPOCH= 1 CATEGORIES= x11-servers @@ -19,6 +18,8 @@ CONFLICTS= XFree86-NestServer-* XORG_CAT= xserver LIB_DEPENDS= drm:${PORTSDIR}/graphics/libdrm + +USE_GL= gl USE_XORG= x11 xf86driproto glproto randrproto renderproto fixesproto \ damageproto xcmiscproto xextproto xf86miscproto inputproto \ xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \ diff --git a/x11-servers/xorg-nestserver/distinfo b/x11-servers/xorg-nestserver/distinfo index 70c76c2b2663..0a7c42acf73d 100644 --- a/x11-servers/xorg-nestserver/distinfo +++ b/x11-servers/xorg-nestserver/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/xserver/xorg-server-1.4.tar.bz2) = a06d9fe4f9f1d459ae02657f9ce64220 -SHA256 (xorg/xserver/xorg-server-1.4.tar.bz2) = 51b142df328d427143705371f139a08ff3bcd6efe0eab91f4178ca4017c0ebc2 -SIZE (xorg/xserver/xorg-server-1.4.tar.bz2) = 6179392 +MD5 (xorg/xserver/xorg-server-1.5.3.tar.bz2) = 308971036e25250e7fe3cccfd5a120f8 +SHA256 (xorg/xserver/xorg-server-1.5.3.tar.bz2) = a680174f54be7763819e5275c5d5d44fc9e9b6f8e9351dd45c150eb4c182d5bb +SIZE (xorg/xserver/xorg-server-1.5.3.tar.bz2) = 5622625 diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index fcc7e476f1f1..ba94e80c09fd 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -6,48 +6,45 @@ # PORTNAME= xorg-server -PORTVERSION= 1.4.2 +PORTVERSION= 1.5.3 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-7.0.1.tar.bz2:mesa +MASTER_SITES= http://xorg.freedesktop.org/releases/individual/xserver/ +DISTFILES= xorg-server-${PORTVERSION}.tar.bz2 MAINTAINER= x11@FreeBSD.org COMMENT= X.Org X server and related programs LIB_DEPENDS= drm:${PORTSDIR}/graphics/libdrm + RUN_DEPENDS= ${LOCALBASE}/share/X11/xkb/rules/base.xml:${PORTSDIR}/x11/xkeyboard-config CONFLICTS= XFree86-Server-* XORG_CAT= xserver +USE_GL= gl USE_XORG= xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xaw7 \ xmu xt xpm xext randrproto renderproto fixesproto damageproto \ xcmiscproto xextproto xproto xtrans xf86miscproto \ xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \ resourceproto fontsproto inputproto xf86dgaproto \ videoproto compositeproto trapproto recordproto xineramaproto \ - evieproto xfont fontenc xkbui pixman + evieproto xfont fontenc xkbui pixman pciaccess +USE_OPENSSL= yes USE_PERL5_BUILD=yes -CONFIGURE_ARGS= --with-mesa-source=${WRKDIR}/Mesa-7.0.1 \ - --disable-dmx --disable-xvfb --disable-xnest --disable-xprint \ - --localstatedir=/var --without-dtrace +CONFIGURE_ARGS= --disable-dmx --disable-xvfb --disable-xnest --disable-xprint \ + --localstatedir=/var --without-dtrace --disable-xephyr MAN1= Xorg.1 \ Xserver.1 \ cvt.1 \ gtf.1 \ - pcitweak.1 \ xorgconfig.1 MAN4= exa.4 \ fbdevhw.4 -MAN5= xorg.conf.5 \ - SecurityPolicy.5 +MAN5= xorg.conf.5 NOT_FOR_ARCHS= ia64 alpha @@ -57,6 +54,13 @@ OPTIONS= HAL "Compile with HAL config support" on \ .include <bsd.port.pre.mk> +.if defined(WITH_OPENSSL_BASE) +# The reason why I use this is cause openssl from base doesn't install a .pc file +# and configure will fail trying to find it. Setting both of those variables to +# a *non-empty* value by-passes the pkg-config check. +CONFIGURE_ENV= SHA1_LIB="-L/usr/lib -lcrypto" SHA1_CFLAGS="-I/usr/include" +.endif + .if !defined(WITHOUT_HAL) LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal CONFIGURE_ARGS+= --enable-config-hal=yes @@ -101,7 +105,6 @@ PLIST_SUB+= SPARC64_NA="" .if ${ARCH} == amd64 || ${ARCH} == i386 || ${ARCH} == sparc64 PLIST_SUB+= AMD64_I386_SPARC64="" -MAN1+= scanpci.1 .else PLIST_SUB+= AMD64_I386_SPARC64="@comment " .endif diff --git a/x11-servers/xorg-server/distinfo b/x11-servers/xorg-server/distinfo index 03b4020c6793..0a7c42acf73d 100644 --- a/x11-servers/xorg-server/distinfo +++ b/x11-servers/xorg-server/distinfo @@ -1,6 +1,3 @@ -MD5 (xorg/xserver/xorg-server-1.4.2.tar.bz2) = fa2915ae377f61c340a18ebef484b64b -SHA256 (xorg/xserver/xorg-server-1.4.2.tar.bz2) = 829c66ec4c295822700067c87afae796b8e67530cc65a7b83060ea29a4ff316d -SIZE (xorg/xserver/xorg-server-1.4.2.tar.bz2) = 6216638 -MD5 (xorg/xserver/MesaLib-7.0.1.tar.bz2) = c056abd763e899114bf745c9eedbf9ad -SHA256 (xorg/xserver/MesaLib-7.0.1.tar.bz2) = 5190ffac157882d9129d31f262339512f4a45dcf95ccdad213760a7d54d82de7 -SIZE (xorg/xserver/MesaLib-7.0.1.tar.bz2) = 3343538 +MD5 (xorg/xserver/xorg-server-1.5.3.tar.bz2) = 308971036e25250e7fe3cccfd5a120f8 +SHA256 (xorg/xserver/xorg-server-1.5.3.tar.bz2) = a680174f54be7763819e5275c5d5d44fc9e9b6f8e9351dd45c150eb4c182d5bb +SIZE (xorg/xserver/xorg-server-1.5.3.tar.bz2) = 5622625 diff --git a/x11-servers/xorg-server/files/patch-Pci.h b/x11-servers/xorg-server/files/patch-Pci.h deleted file mode 100644 index 0d6991b41700..000000000000 --- a/x11-servers/xorg-server/files/patch-Pci.h +++ /dev/null @@ -1,88 +0,0 @@ ---- hw/xfree86/os-support/bus/Pci.h.orig 2007-09-06 02:48:26.000000000 +0200 -+++ hw/xfree86/os-support/bus/Pci.h 2007-09-28 21:43:06.000000000 +0200 -@@ -112,6 +112,10 @@ - #include "xf86Pci.h" - #include "xf86PciInfo.h" - -+#if defined(__FreeBSD__) -+#include <osreldate.h> -+#endif -+ - /* - * Global Definitions - */ -@@ -123,6 +127,10 @@ - # define MAX_PCI_DOMAINS 512 - # define PCI_DOM_MASK 0x01fful - # define MAX_PCI_BUSES (MAX_PCI_DOMAINS*256) /* 256 per domain */ -+#elif defined(FreeBSD) && __FreeBSD_version >= 700053 && !defined(__i386__) -+# define MAX_PCI_DOMAINS 256 /* limited by 32-bit xf86 PCITAG */ -+# define PCI_DOM_MASK (MAX_PCI_DOMAINS - 1) -+# define MAX_PCI_BUSES (MAX_PCI_DOMAINS*256) /* 256 per domain */ - #else - # define MAX_PCI_BUSES 256 /* Max number of PCI buses */ - #endif -@@ -238,7 +246,9 @@ - # elif defined(__FreeBSD__) || defined(__OpenBSD__) - # define ARCH_PCI_INIT freebsdPciInit - # define INCLUDE_XF86_MAP_PCI_MEM --# define INCLUDE_XF86_NO_DOMAIN -+# if __FreeBSD_version < 700053 || defined(__OpenBSD__) -+# define INCLUDE_XF86_NO_DOMAIN -+# endif - # elif defined(__NetBSD__) - # define ARCH_PCI_INIT netbsdPciInit - # define INCLUDE_XF86_MAP_PCI_MEM -@@ -260,10 +270,12 @@ - # if defined(linux) - # define ARCH_PCI_INIT ia64linuxPciInit - # define INCLUDE_XF86_MAP_PCI_MEM --# elif defined(FreeBSD) -+# elif defined(FreeBSD) || defined(__OpenBSD__) - # define ARCH_PCI_INIT freebsdPciInit - # define INCLUDE_XF86_MAP_PCI_MEM --# define INCLUDE_XF86_NO_DOMAIN -+# if __FreeBSD_version < 700053 || defined(__OpenBSD__) -+# define INCLUDE_XF86_NO_DOMAIN -+# endif - # endif - # define XF86SCANPCI_WRAPPER ia64ScanPCIWrapper - #elif defined(__i386__) || defined(i386) -@@ -293,7 +305,9 @@ - # elif defined(__FreeBSD__) || defined(__OpenBSD__) - # define ARCH_PCI_INIT freebsdPciInit - # define INCLUDE_XF86_MAP_PCI_MEM --# define INCLUDE_XF86_NO_DOMAIN -+# if __FreeBSD_version < 700053 || defined(__OpenBSD__) -+# define INCLUDE_XF86_NO_DOMAIN -+# endif - # elif defined(__NetBSD__) - # define ARCH_PCI_INIT netbsdPciInit - # define INCLUDE_XF86_MAP_PCI_MEM -@@ -325,7 +339,9 @@ - # elif (defined(__OpenBSD__) || defined(__FreeBSD__)) && defined(__sparc64__) - # define ARCH_PCI_INIT freebsdPciInit - # define INCLUDE_XF86_MAP_PCI_MEM --# define INCLUDE_XF86_NO_DOMAIN -+# if __FreeBSD_version < 700053 || defined(__OpenBSD__) -+# define INCLUDE_XF86_NO_DOMAIN -+# endif - # endif - # if !defined(__FreeBSD__) && !defined(linux) - # define ARCH_PCI_PCI_BRIDGE sparcPciPciBridge -@@ -333,11 +349,14 @@ - #elif defined(__amd64__) || defined(__amd64) - # if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - # define ARCH_PCI_INIT freebsdPciInit -+# if __FreeBSD_version < 700053 || defined(__FreeBSD_kernel__) -+# define INCLUDE_XF86_NO_DOMAIN -+# endif - # else - # define ARCH_PCI_INIT ix86PciInit -+# define INCLUDE_XF86_NO_DOMAIN - # endif - # define INCLUDE_XF86_MAP_PCI_MEM --# define INCLUDE_XF86_NO_DOMAIN - # if defined(linux) - # define ARCH_PCI_OS_INIT linuxPciInit - # endif diff --git a/x11-servers/xorg-server/files/patch-bsdResource.c b/x11-servers/xorg-server/files/patch-bsdResource.c index 44388bb0a393..67eef5985730 100644 --- a/x11-servers/xorg-server/files/patch-bsdResource.c +++ b/x11-servers/xorg-server/files/patch-bsdResource.c @@ -1,15 +1,15 @@ ---- hw/xfree86/os-support/bsd/bsdResource.c.orig Fri Apr 23 21:54:07 2004 -+++ hw/xfree86/os-support/bsd/bsdResource.c Tue May 17 00:48:36 2005 -@@ -18,7 +18,7 @@ +--- hw/xfree86/os-support/bsd/bsdResource.c.orig 2008-07-19 12:47:13.000000000 +0100 ++++ hw/xfree86/os-support/bsd/bsdResource.c 2008-07-19 12:52:03.000000000 +0100 +@@ -19,7 +19,7 @@ #ifdef INCLUDE_XF86_NO_DOMAIN --#if defined(__alpha__) || defined(__sparc64__) || defined(__amd64__) -+#if defined(__alpha__) || defined(__amd64__) +-#if defined(__alpha__) || defined(__sparc64__) || defined(__amd64__) || defined(__x86_64__) ++#if defined(__alpha__) || defined(__amd64__) || defined(__x86_64__) resPtr - xf86BusAccWindowsFromOS(void) -@@ -112,7 +112,7 @@ + xf86AccResFromOS(resPtr ret) +@@ -60,7 +60,7 @@ return ret; } @@ -17,44 +17,8 @@ +#elif defined(__powerpc__) || defined(__sparc__) || defined(__sparc64__) resPtr - xf86BusAccWindowsFromOS(void) -@@ -123,7 +123,11 @@ - RANGE(range, 0x00000000, 0xffffffff, ResExcMemBlock); - ret = xf86AddResToList(ret, &range, -1); - -+#if defined(__sparc__) || defined(__sparc64__) -+ RANGE(range, 0x00000000, 0x00ffffff, ResExcIoBlock); -+#else - RANGE(range, 0x00000000, 0x0000ffff, ResExcIoBlock); -+#endif - ret = xf86AddResToList(ret, &range, -1); - return ret; - } -@@ -137,7 +141,11 @@ - RANGE(range, 0x00000000, 0xffffffff, ResExcMemBlock); - ret = xf86AddResToList(ret, &range, -1); - -+#if defined(__sparc__) || defined(__sparc64__) -+ RANGE(range, 0x00000000, 0x00ffffff, ResExcIoBlock); -+#else - RANGE(range, 0x00000000, 0x0000ffff, ResExcIoBlock); -+#endif - ret = xf86AddResToList(ret, &range, -1); - return ret; - } -@@ -153,7 +161,11 @@ - RANGE(range, 0x00000000, 0xffffffff, ResExcMemBlock); - ret = xf86AddResToList(ret, &range, -1); - -+#if defined(__sparc__) || defined(__sparc64__) -+ RANGE(range, 0x00000000, 0x00ffffff, ResExcIoBlock); -+#else - RANGE(range, 0x00000000, 0x0000ffff, ResExcIoBlock); -+#endif - ret = xf86AddResToList(ret, &range, -1); - return ret; - } -@@ -175,7 +187,11 @@ + xf86AccResFromOS(resPtr ret) +@@ -77,7 +77,11 @@ ret = xf86AddResToList(ret, &range, -1); RANGE(range, 0x00000000, 0x00000000, ResExcIoBlock); ret = xf86AddResToList(ret, &range, -1); diff --git a/x11-servers/xorg-server/files/patch-config-hal.c b/x11-servers/xorg-server/files/patch-config-hal.c deleted file mode 100644 index bbe6cb07aff5..000000000000 --- a/x11-servers/xorg-server/files/patch-config-hal.c +++ /dev/null @@ -1,10 +0,0 @@ ---- config/hal.c.orig 2007-08-23 15:04:52.000000000 -0400 -+++ config/hal.c 2008-03-27 18:36:36.000000000 -0400 -@@ -212,6 +212,7 @@ - } - - add_option(&options, "path", path); -+ add_option(&options, "device", path); - add_option(&options, "driver", driver); - add_option(&options, "name", name); - config_info = xalloc(strlen(udi) + 5); /* "hal:" and NULL */ diff --git a/x11-servers/xorg-server/files/patch-configure b/x11-servers/xorg-server/files/patch-configure deleted file mode 100644 index 1c8c8f38d3a1..000000000000 --- a/x11-servers/xorg-server/files/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig 2008-02-28 16:08:55.000000000 -0500 -+++ configure 2008-02-28 16:11:19.000000000 -0500 -@@ -30376,7 +30376,7 @@ - else - cat >conftest.$ac_ext <<_ACEOF - --#define _POSIX_C_SOURCE 199309L -+#define _POSIX_C_SOURCE 200112L - #include <time.h> - - int main(int argc, char *argv[]) { diff --git a/x11-servers/xorg-server/files/patch-dix_devices.c b/x11-servers/xorg-server/files/patch-dix_devices.c deleted file mode 100644 index f02738d39a20..000000000000 --- a/x11-servers/xorg-server/files/patch-dix_devices.c +++ /dev/null @@ -1,20 +0,0 @@ ---- dix/devices.c.orig 2007-10-19 17:04:51.000000000 -0200 -+++ dix/devices.c 2007-10-23 17:50:38.000000000 -0200 -@@ -294,7 +294,17 @@ CoreKeyboardBell(int volume, DeviceIntPt - static void - CoreKeyboardCtl(DeviceIntPtr pDev, KeybdCtrl *ctrl) - { -+#ifdef XKB -+ if (!noXkbExtension) { -+ DeviceIntPtr dev = (DeviceIntPtr) -+ pDev->devPrivates[CoreDevicePrivatesIndex].ptr; -+ -+ if (dev && dev->key && dev->key->xkbInfo && dev->key->xkbInfo->kbdProc) -+ (*dev->key->xkbInfo->kbdProc)(dev, ctrl); -+ } -+#else - return; -+#endif - } - - /** diff --git a/x11-servers/xorg-server/files/patch-freebsdPci.c b/x11-servers/xorg-server/files/patch-freebsdPci.c deleted file mode 100644 index 83b034fc9a3e..000000000000 --- a/x11-servers/xorg-server/files/patch-freebsdPci.c +++ /dev/null @@ -1,306 +0,0 @@ ---- hw/xfree86/os-support/bus/freebsdPci.c.orig Thu Sep 6 02:48:26 2007 -+++ hw/xfree86/os-support/bus/freebsdPci.c Sat Sep 29 12:22:56 2007 -@@ -109,10 +109,6 @@ - #define PCI_CPU(val) (val) - #endif - -- --#define BUS(tag) (((tag)>>16)&0xff) --#define DFN(tag) (((tag)>>8)&0xff) -- - static int pciFd = -1; - - void -@@ -133,9 +129,12 @@ - { - struct pci_io io; - int error; -- io.pi_sel.pc_bus = BUS(tag); -- io.pi_sel.pc_dev = DFN(tag) >> 3; -- io.pi_sel.pc_func = DFN(tag) & 7; -+#ifndef INCLUDE_XF86_NO_DOMAIN -+ io.pi_sel.pc_domain = PCI_DOM_FROM_TAG(tag); -+#endif -+ io.pi_sel.pc_bus = PCI_BUS_NO_DOMAIN(PCI_BUS_FROM_TAG(tag)); -+ io.pi_sel.pc_dev = PCI_DEV_FROM_TAG(tag); -+ io.pi_sel.pc_func = PCI_FUNC_FROM_TAG(tag); - io.pi_reg = off; - io.pi_width = 4; - error = ioctl(pciFd, PCIOCREAD, &io); -@@ -148,9 +147,12 @@ - freebsdPciCfgWrite(PCITAG tag, int off, CARD32 val) - { - struct pci_io io; -- io.pi_sel.pc_bus = BUS(tag); -- io.pi_sel.pc_dev = DFN(tag) >> 3; -- io.pi_sel.pc_func = DFN(tag) & 7; -+#ifndef INCLUDE_XF86_NO_DOMAIN -+ io.pi_sel.pc_domain = PCI_DOM_FROM_TAG(tag); -+#endif -+ io.pi_sel.pc_bus = PCI_BUS_NO_DOMAIN(PCI_BUS_FROM_TAG(tag)); -+ io.pi_sel.pc_dev = PCI_DEV_FROM_TAG(tag); -+ io.pi_sel.pc_func = PCI_FUNC_FROM_TAG(tag); - io.pi_reg = off; - io.pi_width = 4; - io.pi_data = PCI_CPU(val); -@@ -164,3 +166,260 @@ - val = (val & ~mask) | (bits & mask); - freebsdPciCfgWrite(tag, off, val); - } -+ -+#ifndef INCLUDE_XF86_NO_DOMAIN -+ -+/* This probably shouldn't be FreeBSD-specific. */ -+static pciConfigPtr -+xf86GetPciHostConfigFromTag(PCITAG Tag) -+{ -+ int bus = PCI_BUS_FROM_TAG(Tag); -+ pciBusInfo_t *pBusInfo; -+ -+ while ((bus < pciNumBuses) && (pBusInfo = pciBusInfo[bus])) { -+ if (bus == pBusInfo->primary_bus) -+ return pBusInfo->bridge; -+ bus = pBusInfo->primary_bus; -+ } -+ -+ return NULL; /* Bad data */ -+} -+ -+/* -+ * This is ugly, but until I can extract this information from the kernel, -+ * it'll have to do. The default I/O space size is 64K, and 4G for memory. -+ * Anything else needs to go in this table. (PowerPC folk take note.) -+ * -+ * Please keep this table in ascending vendor/device order. -+ */ -+static const struct pciSizes { -+ unsigned short vendor, device; -+ unsigned long io_size, mem_size; -+} pciControllerSizes[] = { -+ { -+ PCI_VENDOR_SUN, PCI_CHIP_PSYCHO, -+ 1U << 16, 1U << 31 -+ }, -+ { -+ PCI_VENDOR_SUN, PCI_CHIP_SCHIZO, -+ 1U << 24, 1U << 31 /* ??? */ -+ }, -+ { -+ PCI_VENDOR_SUN, PCI_CHIP_SABRE, -+ 1U << 24, (unsigned long)(1ULL << 32) -+ }, -+ { -+ PCI_VENDOR_SUN, PCI_CHIP_HUMMINGBIRD, -+ 1U << 24, (unsigned long)(1ULL << 32) -+ } -+}; -+#define NUM_SIZES (sizeof(pciControllerSizes) / sizeof(pciControllerSizes[0])) -+ -+static const struct pciSizes * -+freebsdGetSizesStruct(PCITAG Tag) -+{ -+ static const struct pciSizes default_size = { -+ 0, 0, 1U << 16, (unsigned long)(1ULL << 32) -+ }; -+ pciConfigPtr pPCI; -+ int i; -+ -+ /* Find host bridge */ -+ if ((pPCI = xf86GetPciHostConfigFromTag(Tag))) { -+ /* Look up vendor/device */ -+ for (i = 0; i < NUM_SIZES; i++) { -+ if ((pPCI->pci_vendor == -+ pciControllerSizes[i].vendor) && -+ (pPCI->pci_device == -+ pciControllerSizes[i].device)) { -+ return & pciControllerSizes[i]; -+ } -+ } -+ } -+ -+ /* Default to 64KB I/O and 4GB memory. */ -+ return & default_size; -+} -+ -+static __inline__ unsigned long -+freebsdGetIOSize(PCITAG Tag) -+{ -+ const struct pciSizes * const sizes = freebsdGetSizesStruct(Tag); -+ return sizes->io_size; -+} -+ -+static __inline__ void -+freebsdGetSizes(PCITAG Tag, unsigned long *io_size, unsigned long *mem_size) -+{ -+ const struct pciSizes * const sizes = freebsdGetSizesStruct(Tag); -+ -+ *io_size = sizes->io_size; -+ *mem_size = sizes->mem_size; -+} -+ -+_X_EXPORT int -+xf86GetPciDomain(PCITAG Tag) -+{ -+ return PCI_DOM_FROM_TAG(Tag); -+} -+ -+_X_EXPORT pointer -+xf86MapDomainMemory(int ScreenNum, int Flags, PCITAG Tag, ADDRESS Base, -+ unsigned long Size) -+{ -+ return xf86MapVidMem(ScreenNum, Flags, Base, Size); -+} -+ -+_X_EXPORT IOADDRESS -+xf86MapDomainIO(int ScreenNum, int Flags, PCITAG Tag, IOADDRESS Base, -+ unsigned long Size) -+{ -+ return Base; -+} -+ -+_X_EXPORT int -+xf86ReadDomainMemory(PCITAG Tag, ADDRESS Base, int Len, unsigned char *Buf) -+{ -+ int ret, length, rlength; -+ -+ /* Read in 64kB chunks. */ -+ ret = 0; -+ while ((length = Len) > 0) { -+ if (length > 0x010000) length = 0x010000; -+ rlength = xf86ReadBIOS(Base, 0, Buf, length); -+ if (rlength < 0) { -+ ret = rlength; -+ break; -+ } -+ ret += rlength; -+ if (rlength < length) break; -+ Base += rlength; -+ Buf += rlength; -+ Len -= rlength; -+ } -+ -+ return ret; -+} -+ -+resPtr -+xf86BusAccWindowsFromOS(void) -+{ -+ pciConfigPtr *ppPCI, pPCI; -+ resPtr pRes = NULL; -+ resRange range; -+ unsigned long io_size, mem_size; -+ int domain; -+ -+ if ((ppPCI = xf86scanpci(0))) { -+ for (; (pPCI = *ppPCI); ppPCI++) { -+ if ((pPCI->pci_base_class != PCI_CLASS_BRIDGE) || -+ (pPCI->pci_sub_class != PCI_SUBCLASS_BRIDGE_HOST)) -+ continue; -+ -+ domain = xf86GetPciDomain(pPCI->tag); -+ freebsdGetSizes(pPCI->tag, &io_size, &mem_size); -+ -+ RANGE(range, 0, (ADDRESS)(mem_size - 1), -+ RANGE_TYPE(ResExcMemBlock, domain)); -+ pRes = xf86AddResToList(pRes, &range, -1); -+ -+ RANGE(range, 0, (IOADDRESS)(io_size - 1), -+ RANGE_TYPE(ResExcIoBlock, domain)); -+ pRes = xf86AddResToList(pRes, &range, -1); -+ -+ if (domain <= 0) -+ break; -+ } -+ } -+ -+ return pRes; -+} -+ -+resPtr -+xf86PciBusAccWindowsFromOS(void) -+{ -+ pciConfigPtr *ppPCI, pPCI; -+ resPtr pRes = NULL; -+ resRange range; -+ unsigned long io_size, mem_size; -+ int domain; -+ -+ if ((ppPCI = xf86scanpci(0))) { -+ for (; (pPCI = *ppPCI); ppPCI++) { -+ if ((pPCI->pci_base_class != PCI_CLASS_BRIDGE) || -+ (pPCI->pci_sub_class != PCI_SUBCLASS_BRIDGE_HOST)) -+ continue; -+ -+ domain = xf86GetPciDomain(pPCI->tag); -+ freebsdGetSizes(pPCI->tag, &io_size, &mem_size); -+ -+ RANGE(range, 0, (ADDRESS)(mem_size - 1), -+ RANGE_TYPE(ResExcMemBlock, domain)); -+ pRes = xf86AddResToList(pRes, &range, -1); -+ -+ RANGE(range, 0, (IOADDRESS)(io_size - 1), -+ RANGE_TYPE(ResExcIoBlock, domain)); -+ pRes = xf86AddResToList(pRes, &range, -1); -+ -+ if (domain <= 0) -+ break; -+ } -+ } -+ -+ return pRes; -+} -+ -+resPtr -+xf86AccResFromOS(resPtr pRes) -+{ -+ pciConfigPtr *ppPCI, pPCI; -+ resRange range; -+ unsigned long io_size, mem_size; -+ int domain; -+ -+ if ((ppPCI = xf86scanpci(0))) { -+ for (; (pPCI = *ppPCI); ppPCI++) { -+ if ((pPCI->pci_base_class != PCI_CLASS_BRIDGE) || -+ (pPCI->pci_sub_class != PCI_SUBCLASS_BRIDGE_HOST)) -+ continue; -+ -+ domain = xf86GetPciDomain(pPCI->tag); -+ freebsdGetSizes(pPCI->tag, &io_size, &mem_size); -+ -+ /* -+ * At minimum, the top and bottom resources must be -+ * claimed, so that resources that are (or appear to -+ * be) unallocated can be relocated. -+ */ -+ RANGE(range, 0x00000000u, 0x0009ffffu, -+ RANGE_TYPE(ResExcMemBlock, domain)); -+ pRes = xf86AddResToList(pRes, &range, -1); -+ RANGE(range, 0x000c0000u, 0x000effffu, -+ RANGE_TYPE(ResExcMemBlock, domain)); -+ pRes = xf86AddResToList(pRes, &range, -1); -+ RANGE(range, 0x000f0000u, 0x000fffffu, -+ RANGE_TYPE(ResExcMemBlock, domain)); -+ pRes = xf86AddResToList(pRes, &range, -1); -+ -+ RANGE(range, (ADDRESS)(mem_size - 1), -+ (ADDRESS)(mem_size - 1), -+ RANGE_TYPE(ResExcMemBlock, domain)); -+ pRes = xf86AddResToList(pRes, &range, -1); -+ -+ RANGE(range, 0x00000000u, 0x00000000u, -+ RANGE_TYPE(ResExcIoBlock, domain)); -+ pRes = xf86AddResToList(pRes, &range, -1); -+ RANGE(range, (IOADDRESS)(io_size - 1), -+ (IOADDRESS)(io_size - 1), -+ RANGE_TYPE(ResExcIoBlock, domain)); -+ pRes = xf86AddResToList(pRes, &range, -1); -+ -+ if (domain <= 0) -+ break; -+ } -+ } -+ -+ return pRes; -+} -+ -+#endif /* !INCLUDE_XF86_NO_DOMAIN */ diff --git a/x11-servers/xorg-server/pkg-plist b/x11-servers/xorg-server/pkg-plist index 1dc5f28c943b..11a219543338 100644 --- a/x11-servers/xorg-server/pkg-plist +++ b/x11-servers/xorg-server/pkg-plist @@ -9,8 +9,6 @@ bin/gtf %%PPC_NA%%bin/outb %%PPC_NA%%bin/outl %%PPC_NA%%bin/outw -bin/pcitweak -%%AMD64_I386_SPARC64%%bin/scanpci bin/xorgconfig include/xorg/BT.h include/xorg/IBM.h @@ -42,6 +40,7 @@ include/xorg/damagestr.h include/xorg/dbestruct.h include/xorg/dgaproc.h include/xorg/dix.h +include/xorg/dixaccess.h include/xorg/dixevents.h include/xorg/dixfont.h include/xorg/dixfontstr.h @@ -98,11 +97,13 @@ include/xorg/picture.h include/xorg/picturestr.h include/xorg/pixmap.h include/xorg/pixmapstr.h +include/xorg/privates.h include/xorg/property.h include/xorg/propertyst.h include/xorg/randrstr.h include/xorg/region.h include/xorg/regionstr.h +include/xorg/registry.h include/xorg/renderedge.h include/xorg/resource.h include/xorg/rgb.h @@ -157,8 +158,6 @@ include/xorg/xf86Version.h include/xorg/xf86Xinput.h include/xorg/xf86_OSlib.h include/xorg/xf86_OSproc.h -include/xorg/xf86_ansic.h -include/xorg/xf86_libc.h include/xorg/xf86cmap.h include/xorg/xf86fbman.h include/xorg/xf86i2c.h @@ -169,15 +168,15 @@ include/xorg/xf86xv.h include/xorg/xf86xvmc.h include/xorg/xf86xvpriv.h include/xorg/xisb.h +include/xorg/xkbfile.h include/xorg/xkbsrv.h +include/xorg/xkbstr.h include/xorg/xorg-server.h include/xorg/xorgVersion.h include/xorg/xvdix.h include/xorg/xvmcext.h lib/X11/Cards lib/X11/Options -lib/xorg/modules/extensions/libGLcore.la -lib/xorg/modules/extensions/libGLcore.so lib/xorg/modules/extensions/libdbe.la lib/xorg/modules/extensions/libdbe.so lib/xorg/modules/extensions/libdri.la @@ -186,14 +185,8 @@ lib/xorg/modules/extensions/libextmod.la lib/xorg/modules/extensions/libextmod.so lib/xorg/modules/extensions/libglx.la lib/xorg/modules/extensions/libglx.so -lib/xorg/modules/extensions/librecord.la -lib/xorg/modules/extensions/librecord.so -lib/xorg/modules/extensions/libxtrap.la -lib/xorg/modules/extensions/libxtrap.so lib/xorg/modules/fonts/libfreetype.la lib/xorg/modules/fonts/libfreetype.so -lib/xorg/modules/fonts/libtype1.la -lib/xorg/modules/fonts/libtype1.so %%ALPHA_NA%%lib/xorg/modules/libafb.la %%ALPHA_NA%%lib/xorg/modules/libafb.so lib/xorg/modules/libcfb.la @@ -208,10 +201,6 @@ lib/xorg/modules/libint10.la lib/xorg/modules/libint10.so lib/xorg/modules/libmfb.la lib/xorg/modules/libmfb.so -lib/xorg/modules/libpcidata.la -lib/xorg/modules/libpcidata.so -lib/xorg/modules/libscanpci.la -lib/xorg/modules/libscanpci.so lib/xorg/modules/libshadow.la lib/xorg/modules/libshadow.so lib/xorg/modules/libshadowfb.la @@ -248,7 +237,7 @@ lib/xorg/modules/multimedia/tda9885_drv.la lib/xorg/modules/multimedia/tda9885_drv.so lib/xorg/modules/multimedia/uda1380_drv.la lib/xorg/modules/multimedia/uda1380_drv.so -lib/xserver/SecurityPolicy +lib/xorg/protocol.txt libdata/pkgconfig/xorg-server.pc share/X11/xkb/compiled/README.compiled share/aclocal/xorg-server.m4 @@ -259,7 +248,6 @@ share/aclocal/xorg-server.m4 @dirrm lib/xorg/modules/multimedia @dirrm lib/xorg/modules @dirrm lib/xorg -@dirrm lib/xserver @dirrmtry include/X11/bitmaps @dirrmtry include/X11/pixmaps @dirrmtry lib/X11/doc diff --git a/x11-servers/xorg-vfbserver/Makefile b/x11-servers/xorg-vfbserver/Makefile index b68eb7fd8187..b267cd774745 100644 --- a/x11-servers/xorg-vfbserver/Makefile +++ b/x11-servers/xorg-vfbserver/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xorg-vfbserver -PORTVERSION= 1.4 -PORTREVISION= 1 +PORTVERSION= 1.5.3 PORTEPOCH= 1 CATEGORIES= x11-servers @@ -19,6 +18,8 @@ CONFLICTS= XFree86-VirtualFramebufferServer-* XORG_CAT= xserver LIB_DEPENDS= drm:${PORTSDIR}/graphics/libdrm + +USE_GL= gl USE_XORG= x11 xf86driproto glproto randrproto renderproto fixesproto \ damageproto xcmiscproto xextproto xf86miscproto inputproto \ xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \ diff --git a/x11-servers/xorg-vfbserver/distinfo b/x11-servers/xorg-vfbserver/distinfo index 70c76c2b2663..0a7c42acf73d 100644 --- a/x11-servers/xorg-vfbserver/distinfo +++ b/x11-servers/xorg-vfbserver/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/xserver/xorg-server-1.4.tar.bz2) = a06d9fe4f9f1d459ae02657f9ce64220 -SHA256 (xorg/xserver/xorg-server-1.4.tar.bz2) = 51b142df328d427143705371f139a08ff3bcd6efe0eab91f4178ca4017c0ebc2 -SIZE (xorg/xserver/xorg-server-1.4.tar.bz2) = 6179392 +MD5 (xorg/xserver/xorg-server-1.5.3.tar.bz2) = 308971036e25250e7fe3cccfd5a120f8 +SHA256 (xorg/xserver/xorg-server-1.5.3.tar.bz2) = a680174f54be7763819e5275c5d5d44fc9e9b6f8e9351dd45c150eb4c182d5bb +SIZE (xorg/xserver/xorg-server-1.5.3.tar.bz2) = 5622625 diff --git a/x11-toolkits/XawPlus/Makefile b/x11-toolkits/XawPlus/Makefile index 806eb835f7b5..5a2ceb1cb2e0 100644 --- a/x11-toolkits/XawPlus/Makefile +++ b/x11-toolkits/XawPlus/Makefile @@ -7,7 +7,7 @@ PORTNAME= XawPlus PORTVERSION= 3.1.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-toolkits MASTER_SITES= http://people.freenet.de/kra/XawPlus/ DISTNAME= ${PORTNAME:L}-${PORTVERSION} diff --git a/x11-toolkits/fltk2/Makefile b/x11-toolkits/fltk2/Makefile index c94e5679e5b8..f3984c0b0116 100644 --- a/x11-toolkits/fltk2/Makefile +++ b/x11-toolkits/fltk2/Makefile @@ -7,6 +7,7 @@ PORTNAME= fltk PORTVERSION= 2.0.${SNAPSHOT} +PORTREVISION= 1 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_EASYSW} MASTER_SITE_SUBDIR= fltk/snapshots @@ -42,6 +43,7 @@ LATEST_LINK= fltk2 USE_BZIP2= yes USE_GMAKE= yes USE_GL= yes +USE_XORG= xi GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include diff --git a/x11-toolkits/flvw/Makefile b/x11-toolkits/flvw/Makefile index bfd84de4c20d..af191e88ecea 100644 --- a/x11-toolkits/flvw/Makefile +++ b/x11-toolkits/flvw/Makefile @@ -7,7 +7,7 @@ PORTNAME= flvw PORTVERSION= 20000224 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -21,6 +21,7 @@ LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk WRKSRC= ${WRKDIR}/${PORTNAME}/1.0 GNU_CONFIGURE= yes USE_GMAKE= yes +USE_XORG= x11 xt MAKE_ARGS= DIRS=src PLIST_SUB= INCSDIR="${INCSDIR:S,^${PREFIX}/,,}" diff --git a/x11-toolkits/gtkglext/Makefile b/x11-toolkits/gtkglext/Makefile index f54b2f2a5a21..9a5c0c428aa4 100644 --- a/x11-toolkits/gtkglext/Makefile +++ b/x11-toolkits/gtkglext/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtkglext PORTVERSION= 1.2.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -19,6 +19,7 @@ COMMENT= An OpenGL extension to GTK USE_BZIP2= yes USE_GNOME= gnomehack gnomeprefix gnometarget gtk20 USE_GL= yes +USE_XORG= xt USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 USE_LDCONFIG= yes diff --git a/x11-toolkits/hs-GLUT/Makefile b/x11-toolkits/hs-GLUT/Makefile index dba8db895184..3bad9aeb14ec 100644 --- a/x11-toolkits/hs-GLUT/Makefile +++ b/x11-toolkits/hs-GLUT/Makefile @@ -6,7 +6,7 @@ PORTNAME= glut PORTVERSION= 2.1.1.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/GLUT/${PORTVERSION}/ PKGNAMEPREFIX= hs- diff --git a/x11-toolkits/hs-OpenGL/Makefile b/x11-toolkits/hs-OpenGL/Makefile index 4f1af9e9f244..4d1546019e95 100644 --- a/x11-toolkits/hs-OpenGL/Makefile +++ b/x11-toolkits/hs-OpenGL/Makefile @@ -6,7 +6,7 @@ PORTNAME= opengl PORTVERSION= 2.2.1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits haskell MASTER_SITES= http://www.haskell.org/ghc/dist/${GHC_VERSION}/ PKGNAMEPREFIX= hs- @@ -21,6 +21,7 @@ COMMENT= OpenGL bindings for Haskell programs USE_BZIP2= yes USE_GL= yes +USE_XORG= x11 xt GHC_VERSION= 6.8.3 PLIST_SUB+= GHC_VERSION=${GHC_VERSION} \ diff --git a/x11-toolkits/hs-glut-ghc/Makefile b/x11-toolkits/hs-glut-ghc/Makefile index dba8db895184..3bad9aeb14ec 100644 --- a/x11-toolkits/hs-glut-ghc/Makefile +++ b/x11-toolkits/hs-glut-ghc/Makefile @@ -6,7 +6,7 @@ PORTNAME= glut PORTVERSION= 2.1.1.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/GLUT/${PORTVERSION}/ PKGNAMEPREFIX= hs- diff --git a/x11-toolkits/hs-opengl-ghc/Makefile b/x11-toolkits/hs-opengl-ghc/Makefile index 4f1af9e9f244..4d1546019e95 100644 --- a/x11-toolkits/hs-opengl-ghc/Makefile +++ b/x11-toolkits/hs-opengl-ghc/Makefile @@ -6,7 +6,7 @@ PORTNAME= opengl PORTVERSION= 2.2.1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits haskell MASTER_SITES= http://www.haskell.org/ghc/dist/${GHC_VERSION}/ PKGNAMEPREFIX= hs- @@ -21,6 +21,7 @@ COMMENT= OpenGL bindings for Haskell programs USE_BZIP2= yes USE_GL= yes +USE_XORG= x11 xt GHC_VERSION= 6.8.3 PLIST_SUB+= GHC_VERSION=${GHC_VERSION} \ diff --git a/x11-toolkits/libXaw/Makefile b/x11-toolkits/libXaw/Makefile index fa438018306a..b4f75c2ea341 100644 --- a/x11-toolkits/libXaw/Makefile +++ b/x11-toolkits/libXaw/Makefile @@ -6,7 +6,7 @@ # PORTNAME= libXaw -PORTVERSION= 1.0.4 +PORTVERSION= 1.0.5 PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= x11-toolkits diff --git a/x11-toolkits/libXaw/distinfo b/x11-toolkits/libXaw/distinfo index e99e5c7481e4..2c2e16094895 100644 --- a/x11-toolkits/libXaw/distinfo +++ b/x11-toolkits/libXaw/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/lib/libXaw-1.0.4.tar.bz2) = 73671d8f1cf36fdd81395328cc3539c9 -SHA256 (xorg/lib/libXaw-1.0.4.tar.bz2) = 11f4ab184fb8dc853fd95238d4de7b251427dd036643d11fd2a669232fa35af9 -SIZE (xorg/lib/libXaw-1.0.4.tar.bz2) = 517275 +MD5 (xorg/lib/libXaw-1.0.5.tar.bz2) = 64e7782db4653cb57c7f7e660b2431c3 +SHA256 (xorg/lib/libXaw-1.0.5.tar.bz2) = 2503f3e3348ee3cf38368161dfab8112d3aea2a26deea34f3136898c13cfb88d +SIZE (xorg/lib/libXaw-1.0.5.tar.bz2) = 513408 diff --git a/x11-toolkits/libXaw/pkg-plist b/x11-toolkits/libXaw/pkg-plist index 75a563df538b..ae9f9425ed95 100644 --- a/x11-toolkits/libXaw/pkg-plist +++ b/x11-toolkits/libXaw/pkg-plist @@ -32,8 +32,6 @@ include/X11/Xaw/Panner.h include/X11/Xaw/PannerP.h include/X11/Xaw/Porthole.h include/X11/Xaw/PortholeP.h -include/X11/Xaw/Print.h -include/X11/Xaw/PrintSP.h include/X11/Xaw/Repeater.h include/X11/Xaw/RepeaterP.h include/X11/Xaw/Reports.h @@ -74,7 +72,6 @@ include/X11/Xaw/XawInit.h lib/libXaw.so lib/libXaw.so.6 lib/libXaw.so.7 -lib/libXaw.so.8 lib/libXaw6.a lib/libXaw6.la lib/libXaw6.so @@ -83,12 +80,6 @@ lib/libXaw7.a lib/libXaw7.la lib/libXaw7.so lib/libXaw7.so.7 -lib/libXaw8.a -lib/libXaw8.la -lib/libXaw8.so -lib/libXaw8.so.8 libdata/pkgconfig/xaw6.pc libdata/pkgconfig/xaw7.pc -libdata/pkgconfig/xaw8.pc -share/aclocal/xaw.m4 @dirrm include/X11/Xaw diff --git a/x11-toolkits/libXmu/Makefile b/x11-toolkits/libXmu/Makefile index 9c876068e346..ae15ab4c5dd2 100644 --- a/x11-toolkits/libXmu/Makefile +++ b/x11-toolkits/libXmu/Makefile @@ -6,7 +6,7 @@ # PORTNAME= libXmu -PORTVERSION= 1.0.3 +PORTVERSION= 1.0.4 PORTEPOCH= 1 CATEGORIES= x11-toolkits diff --git a/x11-toolkits/libXmu/distinfo b/x11-toolkits/libXmu/distinfo index 4cf9425d699e..98c90347ba31 100644 --- a/x11-toolkits/libXmu/distinfo +++ b/x11-toolkits/libXmu/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/lib/libXmu-1.0.3.tar.bz2) = b926b95b811ece3e19cd590db85ee615 -SHA256 (xorg/lib/libXmu-1.0.3.tar.bz2) = b56e308e36da8d9cb48433ddb81fd04e26b4f1c695586ac8106ac48a35466d66 -SIZE (xorg/lib/libXmu-1.0.3.tar.bz2) = 296622 +MD5 (xorg/lib/libXmu-1.0.4.tar.bz2) = fb372a5f3ab42b5ba16d7af4d833a0cb +SHA256 (xorg/lib/libXmu-1.0.4.tar.bz2) = f83c00d6ed8f4c08effa9dcc2d7f1ff6f5a753f2b9fe1babda16618c2afa18f0 +SIZE (xorg/lib/libXmu-1.0.4.tar.bz2) = 305347 diff --git a/x11-toolkits/nucleo/Makefile b/x11-toolkits/nucleo/Makefile index fb347139fb1d..2af4c60a67c9 100644 --- a/x11-toolkits/nucleo/Makefile +++ b/x11-toolkits/nucleo/Makefile @@ -7,7 +7,7 @@ PORTNAME= nucleo PORTVERSION= 0.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits MASTER_SITES= http://insitu.lri.fr/metisse/download/latest/ \ http://freebsd.nsu.ru/distfiles/metisse/ @@ -22,6 +22,7 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ USE_BZIP2= yes USE_GMAKE= yes USE_GL= glu +USE_XORG= x11 xt GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/x11-toolkits/open-motif/Makefile b/x11-toolkits/open-motif/Makefile index d9fe43d32308..3b9b0b689d55 100644 --- a/x11-toolkits/open-motif/Makefile +++ b/x11-toolkits/open-motif/Makefile @@ -8,7 +8,7 @@ PORTNAME= open-motif PORTVERSION= 2.2.3 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-toolkits MASTER_SITES= http://ftp.motifzone.com/%SUBDIR%/ MASTER_SITE_SUBDIR= om${PORTVERSION}/src diff --git a/x11-toolkits/otk/Makefile b/x11-toolkits/otk/Makefile index 94513e19010c..6e71af3a97ef 100644 --- a/x11-toolkits/otk/Makefile +++ b/x11-toolkits/otk/Makefile @@ -7,6 +7,7 @@ PORTNAME= otk PORTVERSION= 0.64 +PORTREVISION= 1 CATEGORIES= x11-toolkits graphics MASTER_SITES= SF DISTNAME= ${PORTNAME}_lib_${DISTVERSION} @@ -15,9 +16,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= Widget library based on OpenGL -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut - -USE_GL= glu gl +USE_GL= glut glu gl USE_LDCONFIG= yes USE_XORG= xmu xext x11 WRKSRC= ${WRKDIR}/${PORTNAME}_lib diff --git a/x11-toolkits/plib/Makefile b/x11-toolkits/plib/Makefile index d0f7119336ad..28f0cf36f89f 100644 --- a/x11-toolkits/plib/Makefile +++ b/x11-toolkits/plib/Makefile @@ -13,6 +13,7 @@ MASTER_SITES= http://plib.sourceforge.net/dist/ MAINTAINER= ports@FreeBSD.org COMMENT= A portable library for joystick/sound/OpenGL GUI/3D math +USE_XORG= xt xi xmu xext x11 USE_GNOME= gnometarget USE_GL= glu USE_GMAKE= yes diff --git a/x11-toolkits/tk84/Makefile b/x11-toolkits/tk84/Makefile index 08196d9f038b..31259fdabf29 100644 --- a/x11-toolkits/tk84/Makefile +++ b/x11-toolkits/tk84/Makefile @@ -7,6 +7,7 @@ PORTNAME= tk PORTVERSION= 8.4.19 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= x11-toolkits tk MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -381,6 +382,7 @@ pre-everything:: @if ${TEST} -e "${NONEXISTENT}"; then ${ECHO_MSG} "=== Aborted, please remove ${NONEXISTENT}"; exit 1; fi post-patch: + @(cd ${WRKSRC}/..; ${PATCH} -p0 < ${PATCHDIR}/extra-lastevent-patch) @${REINPLACE_CMD} -e 's|X11/Intrinsic.h|X11/Xlib.h|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|@TK_SHARED_BUILD@|#@TK_SHARED_BUILD@|g' ${WRKSRC}/Makefile.in .if defined(BUILDING_TK_THREADS) diff --git a/x11-toolkits/tk84/files/extra-lastevent-patch b/x11-toolkits/tk84/files/extra-lastevent-patch new file mode 100644 index 000000000000..77c7f757a705 --- /dev/null +++ b/x11-toolkits/tk84/files/extra-lastevent-patch @@ -0,0 +1,25 @@ +--- generic/tk.h.orig 2008-02-06 16:31:40.000000000 +0100 ++++ generic/tk.h 2008-07-24 08:21:46.000000000 +0200 +@@ -635,17 +635,15 @@ + * + *--------------------------------------------------------------------------- + */ +-#define VirtualEvent (LASTEvent) +-#define ActivateNotify (LASTEvent + 1) +-#define DeactivateNotify (LASTEvent + 2) +-#define MouseWheelEvent (LASTEvent + 3) +-#define TK_LASTEVENT (LASTEvent + 4) ++#define VirtualEvent (MappingNotify + 1) ++#define ActivateNotify (MappingNotify + 2) ++#define DeactivateNotify (MappingNotify + 3) ++#define MouseWheelEvent (MappingNotify + 4) ++#define TK_LASTEVENT (MappingNotify + 5) + + #define MouseWheelMask (1L << 28) +- + #define ActivateMask (1L << 29) + #define VirtualEventMask (1L << 30) +-#define TK_LASTEVENT (LASTEvent + 4) + + + /* diff --git a/x11-toolkits/v/Makefile b/x11-toolkits/v/Makefile index 254d1a9cd889..988636d2826c 100644 --- a/x11-toolkits/v/Makefile +++ b/x11-toolkits/v/Makefile @@ -7,7 +7,7 @@ PORTNAME= v PORTVERSION= 1.90 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits devel graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= vgui diff --git a/x11-wm/aewm/Makefile b/x11-wm/aewm/Makefile index f96a15dada99..c4e67eaa3415 100644 --- a/x11-wm/aewm/Makefile +++ b/x11-wm/aewm/Makefile @@ -7,7 +7,7 @@ PORTNAME= aewm PORTVERSION= 1.2.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-wm MASTER_SITES= http://www.red-bean.com/~decklin/software/aewm/ diff --git a/x11-wm/epplets/Makefile b/x11-wm/epplets/Makefile index 86c7b324c025..95363adc80f9 100644 --- a/x11-wm/epplets/Makefile +++ b/x11-wm/epplets/Makefile @@ -7,7 +7,7 @@ PORTNAME= epplets PORTVERSION= 0.11 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm MASTER_SITES= SF MASTER_SITE_SUBDIR= enlightenment diff --git a/x11-wm/fluxter/Makefile b/x11-wm/fluxter/Makefile index 3cb56191423c..d4b04c701d2b 100644 --- a/x11-wm/fluxter/Makefile +++ b/x11-wm/fluxter/Makefile @@ -7,7 +7,7 @@ PORTNAME= fluxter PORTVERSION= 0.1.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-wm MASTER_SITES= http://benedict.isomedia.com/homes/stevencooper/files/ diff --git a/x11-wm/flwm/Makefile b/x11-wm/flwm/Makefile index c0e06cae151d..84f1dac2143b 100644 --- a/x11-wm/flwm/Makefile +++ b/x11-wm/flwm/Makefile @@ -7,6 +7,7 @@ PORTNAME= flwm PORTVERSION= 1.02 +PORTREVISION= 1 CATEGORIES= x11-wm MASTER_SITES= SF EXTRACT_SUFX= .tgz @@ -16,6 +17,7 @@ COMMENT= The Fast Light Window Manager LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk +USE_XORG= x11 xt GNU_CONFIGURE= yes MAN1= flwm.1 diff --git a/x11-wm/twm/Makefile b/x11-wm/twm/Makefile index 764a923d533a..9993a54a9ca9 100644 --- a/x11-wm/twm/Makefile +++ b/x11-wm/twm/Makefile @@ -6,8 +6,7 @@ # PORTNAME= twm -PORTVERSION= 1.0.3 -PORTREVISION= 3 +PORTVERSION= 1.0.4 CATEGORIES= x11-wm MAINTAINER= x11@FreeBSD.org diff --git a/x11-wm/twm/distinfo b/x11-wm/twm/distinfo index a6184713af64..5fad235d6cd3 100644 --- a/x11-wm/twm/distinfo +++ b/x11-wm/twm/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/twm-1.0.3.tar.bz2) = a56b71dc40249195b32b304633c28a3e -SHA256 (xorg/app/twm-1.0.3.tar.bz2) = 5b41550477a893bf2b82ab73fc7fb6c839ba52d0deac059be1a473dd7bb92a4e -SIZE (xorg/app/twm-1.0.3.tar.bz2) = 238448 +MD5 (xorg/app/twm-1.0.4.tar.bz2) = 0865e14c73c08fa8c501ae877298ee9f +SHA256 (xorg/app/twm-1.0.4.tar.bz2) = daa088f9ae231508929b7bd4746e942212b53f2802ca4cee450139fabc8de1fa +SIZE (xorg/app/twm-1.0.4.tar.bz2) = 241944 diff --git a/x11-wm/xcompmgr/Makefile b/x11-wm/xcompmgr/Makefile index 3f84134b48e7..31edb1f89cc6 100644 --- a/x11-wm/xcompmgr/Makefile +++ b/x11-wm/xcompmgr/Makefile @@ -6,16 +6,14 @@ # PORTNAME= xcompmgr -PORTVERSION= 1.1.3 -PORTREVISION= 2 +PORTVERSION= 1.1.4 CATEGORIES= x11-wm -MASTER_SITES= http://xapps.freedesktop.org/release/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= x11@FreeBSD.org COMMENT= A sample X compositing manager +XORG_CAT= app USE_XORG= x11 xcomposite xfixes xdamage xrender -GNU_CONFIGURE= yes MAN1= xcompmgr.1 diff --git a/x11-wm/xcompmgr/distinfo b/x11-wm/xcompmgr/distinfo index b493b0aec4eb..f372f9b427ad 100644 --- a/x11-wm/xcompmgr/distinfo +++ b/x11-wm/xcompmgr/distinfo @@ -1,3 +1,3 @@ -MD5 (xcompmgr-1.1.3.tar.gz) = 44ccbafa8484b7e0c00e5c83cd915adc -SHA256 (xcompmgr-1.1.3.tar.gz) = 5d4b1fb063876c7b3883e45b69d3a07845a62a132c8a9994de16bf8d6c199d44 -SIZE (xcompmgr-1.1.3.tar.gz) = 79840 +MD5 (xorg/app/xcompmgr-1.1.4.tar.bz2) = 3eb1c2b7a6ceaec4ee872cb06d202d91 +SHA256 (xorg/app/xcompmgr-1.1.4.tar.bz2) = 4bf647745b4de940ef75796fc8ad4e1f83c276e474f7b6779f317fcd070de884 +SIZE (xorg/app/xcompmgr-1.1.4.tar.bz2) = 78389 diff --git a/x11/3ddesktop/Makefile b/x11/3ddesktop/Makefile index b1601ff969cb..509c815b36f9 100644 --- a/x11/3ddesktop/Makefile +++ b/x11/3ddesktop/Makefile @@ -7,7 +7,7 @@ PORTNAME= 3ddesktop PORTVERSION= 0.2.9 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= desk3d @@ -15,9 +15,7 @@ MASTER_SITE_SUBDIR= desk3d MAINTAINER= ports@FreeBSD.org COMMENT= 3D Virtual Desktop Switcher -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut - -USE_GL= yes +USE_GL= glut USE_EFL= imlib2 GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" diff --git a/x11/Makefile b/x11/Makefile index 4cda51ce71c3..7da34271a3d3 100644 --- a/x11/Makefile +++ b/x11/Makefile @@ -35,6 +35,7 @@ SUBDIR += dgs SUBDIR += dmenu SUBDIR += dmxproto + SUBDIR += dri2proto SUBDIR += docker SUBDIR += dxpc SUBDIR += dynamag @@ -423,8 +424,6 @@ SUBDIR += xorg-edit SUBDIR += xorg-libraries SUBDIR += xorg-minimal - SUBDIR += xorg-protos - SUBDIR += xphelloworld SUBDIR += xplsprinters SUBDIR += xpr SUBDIR += xprehashprinterlist diff --git a/x11/beforelight/Makefile b/x11/beforelight/Makefile index f79b5def73d5..67e9593b9548 100644 --- a/x11/beforelight/Makefile +++ b/x11/beforelight/Makefile @@ -6,7 +6,8 @@ # PORTNAME= beforelight -PORTVERSION= 1.0.2 +PORTVERSION= 1.0.3 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/beforelight/distinfo b/x11/beforelight/distinfo index 06c9a62d2edd..358c03298561 100644 --- a/x11/beforelight/distinfo +++ b/x11/beforelight/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/beforelight-1.0.2.tar.bz2) = 8bc2e35cdcd2e6a80eab1b77c41f2a46 -SHA256 (xorg/app/beforelight-1.0.2.tar.bz2) = 00e217559c93779fe04fd948017820af118a3981d6b4371ace95107cb3b047a7 -SIZE (xorg/app/beforelight-1.0.2.tar.bz2) = 85526 +MD5 (xorg/app/beforelight-1.0.3.tar.bz2) = d55b0e7196dafcfeb4db3886af2e1969 +SHA256 (xorg/app/beforelight-1.0.3.tar.bz2) = cae9427fa083a0ec3f2d1a3a6391508b31a2cf0220cb8d732c5d473a8c995c4e +SIZE (xorg/app/beforelight-1.0.3.tar.bz2) = 85067 diff --git a/x11/bitmap/Makefile b/x11/bitmap/Makefile index 5e750fc2ffc0..e88e35318ec6 100644 --- a/x11/bitmap/Makefile +++ b/x11/bitmap/Makefile @@ -7,6 +7,7 @@ PORTNAME= bitmap PORTVERSION= 1.0.3 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/bricons/Makefile b/x11/bricons/Makefile index 7056be518050..f430fbe72262 100644 --- a/x11/bricons/Makefile +++ b/x11/bricons/Makefile @@ -7,7 +7,7 @@ PORTNAME= bricons PORTVERSION= 3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= ftp://ftp.x.org/R5contrib/ DISTNAME= ${PORTNAME} diff --git a/x11/dri2proto/Makefile b/x11/dri2proto/Makefile new file mode 100644 index 000000000000..d8e961c26601 --- /dev/null +++ b/x11/dri2proto/Makefile @@ -0,0 +1,17 @@ +# New ports collection makefile for: dri2proto +# Date Created: Jul 28 2008 +# Whom: Florent Thoumie <flz@FreeBSD.org> +# +# $FreeBSD$ +# + +PORTNAME= dri2proto +PORTVERSION= 1.1 +CATEGORIES= x11 + +MAINTAINER= x11@FreeBSD.org +COMMENT= DRI2 prototype headers + +XORG_CAT= proto + +.include <bsd.port.mk> diff --git a/x11/dri2proto/distinfo b/x11/dri2proto/distinfo new file mode 100644 index 000000000000..becfbaddec43 --- /dev/null +++ b/x11/dri2proto/distinfo @@ -0,0 +1,3 @@ +MD5 (xorg/proto/dri2proto-1.1.tar.bz2) = 1d70f0653b0b3a837853262dc5d34da4 +SHA256 (xorg/proto/dri2proto-1.1.tar.bz2) = 69def6d1f64b3699ec9c729596d8b096623a62bdda6bbea78ed690421d174c11 +SIZE (xorg/proto/dri2proto-1.1.tar.bz2) = 40610 diff --git a/x11/dri2proto/pkg-descr b/x11/dri2proto/pkg-descr new file mode 100644 index 000000000000..1e57ddbf8fb2 --- /dev/null +++ b/x11/dri2proto/pkg-descr @@ -0,0 +1,4 @@ +This package contains X.Org DRI2 prototype headers. + +- Florent Thoumie +flz@FreeBSD.org diff --git a/x11/dri2proto/pkg-plist b/x11/dri2proto/pkg-plist new file mode 100644 index 000000000000..830f3f03f108 --- /dev/null +++ b/x11/dri2proto/pkg-plist @@ -0,0 +1,3 @@ +include/X11/extensions/dri2proto.h +libdata/pkgconfig/dri2proto.pc +@dirrmtry include/X11/extensions diff --git a/x11/editres/Makefile b/x11/editres/Makefile index e1306e904635..389b9c9f9b74 100644 --- a/x11/editres/Makefile +++ b/x11/editres/Makefile @@ -7,6 +7,7 @@ PORTNAME= editres PORTVERSION= 1.0.3 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/fstobdf/Makefile b/x11/fstobdf/Makefile index 868ad2b5c237..a265ea6075ce 100644 --- a/x11/fstobdf/Makefile +++ b/x11/fstobdf/Makefile @@ -6,7 +6,7 @@ # PORTNAME= fstobdf -PORTVERSION= 1.0.2 +PORTVERSION= 1.0.3 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/fstobdf/distinfo b/x11/fstobdf/distinfo index 56ea2a179e6d..9216579332e9 100644 --- a/x11/fstobdf/distinfo +++ b/x11/fstobdf/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/fstobdf-1.0.2.tar.bz2) = 99144743ab3cbb9cf37090fdc9e747db -SHA256 (xorg/app/fstobdf-1.0.2.tar.bz2) = 690e45b252cd96036dd9b89af8624eb423e16d4bd662b07d264a3f876ce7ac22 -SIZE (xorg/app/fstobdf-1.0.2.tar.bz2) = 82861 +MD5 (xorg/app/fstobdf-1.0.3.tar.bz2) = 49a6225380f6c18fff664a043cd569b1 +SHA256 (xorg/app/fstobdf-1.0.3.tar.bz2) = f2242720045c69f69dc9e18320a1c6402e92234d40c237367560fae3d210f7b0 +SIZE (xorg/app/fstobdf-1.0.3.tar.bz2) = 90507 diff --git a/x11/glproto/Makefile b/x11/glproto/Makefile index 14edaf1fda84..6dba4d673f91 100644 --- a/x11/glproto/Makefile +++ b/x11/glproto/Makefile @@ -6,7 +6,7 @@ # PORTNAME= glproto -PORTVERSION= 1.4.8 +PORTVERSION= 1.4.9 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/glproto/distinfo b/x11/glproto/distinfo index e35b268fe67f..d26a42f41e14 100644 --- a/x11/glproto/distinfo +++ b/x11/glproto/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/proto/glproto-1.4.8.tar.bz2) = 3dfbd17203c0c88b94b6f579f24c11cc -SHA256 (xorg/proto/glproto-1.4.8.tar.bz2) = 2f5d84413853b688b7bb46c66fee108a499190e1f7810afffb775910778f053c -SIZE (xorg/proto/glproto-1.4.8.tar.bz2) = 53852 +MD5 (xorg/proto/glproto-1.4.9.tar.bz2) = e60951628422663e60faeb400f27bac1 +SHA256 (xorg/proto/glproto-1.4.9.tar.bz2) = 69d7fb7be4f0f56bd3a67b6c8c88dc677892eb99fd1b13e166b43b39d64764a3 +SIZE (xorg/proto/glproto-1.4.9.tar.bz2) = 57658 diff --git a/x11/gsynaptics/Makefile b/x11/gsynaptics/Makefile index a2ae14285c3e..1302b406f20c 100644 --- a/x11/gsynaptics/Makefile +++ b/x11/gsynaptics/Makefile @@ -7,7 +7,7 @@ PORTNAME= gsynaptics PORTVERSION= 0.9.9 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP} MASTER_SITE_SUBDIR= gsynaptics/21527 @@ -33,6 +33,6 @@ post-install: .include <bsd.port.pre.mk> -RUN_DEPENDS+= ${LOCALBASE}/lib/xorg/modules/input/synaptics_drv.so:${PORTSDIR}/x11-drivers/synaptics +RUN_DEPENDS+= ${LOCALBASE}/lib/xorg/modules/input/synaptics_drv.so:${PORTSDIR}/x11-drivers/xf86-input-synaptics .include <bsd.port.post.mk> diff --git a/x11/inputproto/Makefile b/x11/inputproto/Makefile index b21dc4d9d485..4f9336765ec2 100644 --- a/x11/inputproto/Makefile +++ b/x11/inputproto/Makefile @@ -6,7 +6,7 @@ # PORTNAME= inputproto -PORTVERSION= 1.4.2.1 +PORTVERSION= 1.5.0 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/inputproto/distinfo b/x11/inputproto/distinfo index f3852aa8b815..2488042f8d40 100644 --- a/x11/inputproto/distinfo +++ b/x11/inputproto/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/proto/inputproto-1.4.2.1.tar.bz2) = aa948a7469168ddd9c33f11c5dff55ac -SHA256 (xorg/proto/inputproto-1.4.2.1.tar.bz2) = 9b6db77037de7c52b9a17862b99bc435bd5c20e5d3faf5aec943b206cdaff3ed -SIZE (xorg/proto/inputproto-1.4.2.1.tar.bz2) = 47663 +MD5 (xorg/proto/inputproto-1.5.0.tar.bz2) = dcc36554aea1338b3813943daf1e9988 +SHA256 (xorg/proto/inputproto-1.5.0.tar.bz2) = ef90f7e4c151095cc75a573acd86355aa65c5bc7fd1dcce4a1483b64788e1461 +SIZE (xorg/proto/inputproto-1.5.0.tar.bz2) = 57358 diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile index 37e9ce10b601..9c9b84157b75 100644 --- a/x11/kde4-runtime/Makefile +++ b/x11/kde4-runtime/Makefile @@ -8,6 +8,7 @@ PORTNAME= kdebase-runtime PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -17,7 +18,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Basic applications for the KDE system LIB_DEPENDS= usb-0.1.8:${PORTSDIR}/devel/libusb \ - xcb.1:${PORTSDIR}/x11/libxcb \ + xcb.2:${PORTSDIR}/x11/libxcb \ xine.1:${PORTSDIR}/multimedia/libxine \ xklavier.12:${PORTSDIR}/x11/libxklavier RUN_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile index 37e9ce10b601..9c9b84157b75 100644 --- a/x11/kdebase4-runtime/Makefile +++ b/x11/kdebase4-runtime/Makefile @@ -8,6 +8,7 @@ PORTNAME= kdebase-runtime PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -17,7 +18,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Basic applications for the KDE system LIB_DEPENDS= usb-0.1.8:${PORTSDIR}/devel/libusb \ - xcb.1:${PORTSDIR}/x11/libxcb \ + xcb.2:${PORTSDIR}/x11/libxcb \ xine.1:${PORTSDIR}/multimedia/libxine \ xklavier.12:${PORTSDIR}/x11/libxklavier RUN_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme diff --git a/x11/libSM/Makefile b/x11/libSM/Makefile index 6bc29012c235..9a2d8965412c 100644 --- a/x11/libSM/Makefile +++ b/x11/libSM/Makefile @@ -6,14 +6,16 @@ # PORTNAME= libSM -PORTVERSION= 1.0.3 -PORTREVISION= 1 +PORTVERSION= 1.1.0 PORTEPOCH= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= Session Management library for X11 +BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/uuid.pc:${PORTSDIR}/misc/e2fsprogs-libuuid +RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/uuid.pc:${PORTSDIR}/misc/e2fsprogs-libuuid + XORG_CAT= lib USE_XORG= ice xproto:both xtrans diff --git a/x11/libSM/distinfo b/x11/libSM/distinfo index 459be289bb37..fdaef1635659 100644 --- a/x11/libSM/distinfo +++ b/x11/libSM/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/lib/libSM-1.0.3.tar.bz2) = 184cbf502b3cd5d7ba5f9d1290a99606 -SHA256 (xorg/lib/libSM-1.0.3.tar.bz2) = 57f42d3557effe452cd348362977ff90fa61009885c23b3aca8cb0219b5dec04 -SIZE (xorg/lib/libSM-1.0.3.tar.bz2) = 223906 +MD5 (xorg/lib/libSM-1.1.0.tar.bz2) = 05a04c2b6382fb0054f6c70494e22733 +SHA256 (xorg/lib/libSM-1.1.0.tar.bz2) = 7536ac382e1ff82014d3a0defba0c61b3a30984f4e5bc7707960d6debcb92a82 +SIZE (xorg/lib/libSM-1.1.0.tar.bz2) = 252599 diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile index 4d7cfb970daa..b6121cefb694 100644 --- a/x11/libX11/Makefile +++ b/x11/libX11/Makefile @@ -6,15 +6,14 @@ # PORTNAME= libX11 -PORTVERSION= 1.1.3 -PORTREVISION= 1 +PORTVERSION= 1.1.99.2 PORTEPOCH= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= X11 library -OPTIONS= XCB "use XCB for low-level protocol implementation" off +OPTIONS= XCB "use XCB for low-level protocol implementation" on XORG_CAT= lib USE_XORG= bigreqsproto xau xcmiscproto xdmcp xextproto xtrans \ @@ -25,8 +24,8 @@ CONFIGURE_ARGS+= --enable-xdmauth --datadir=${PREFIX}/lib .include <bsd.port.pre.mk> .if defined(WITH_XCB) -BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xcb-xlib.pc:${PORTSDIR}/x11/libxcb -RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xcb-xlib.pc:${PORTSDIR}/x11/libxcb +BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb +RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb CONFIGURE_ARGS+= --with-xcb=yes PLIST_SUB+= XCB="" .else diff --git a/x11/libX11/distinfo b/x11/libX11/distinfo index 9fb62bb72a68..f6c92131de8d 100644 --- a/x11/libX11/distinfo +++ b/x11/libX11/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/lib/libX11-1.1.3.tar.bz2) = 4d43d3e472c552d2f191ecdd4e75112c -SHA256 (xorg/lib/libX11-1.1.3.tar.bz2) = 4a2f566e2ea5dd955c875cb8fa9c18dd725324fc5cf4e23c803442e31ab8917a -SIZE (xorg/lib/libX11-1.1.3.tar.bz2) = 1526958 +MD5 (xorg/lib/libX11-1.1.99.2.tar.bz2) = 2450f861d39939e46f8a4ced1abc3504 +SHA256 (xorg/lib/libX11-1.1.99.2.tar.bz2) = b910fa3ce9fd6c571ce13ab536284d5e532ec022e247da5f553eae4c0b5c25b1 +SIZE (xorg/lib/libX11-1.1.99.2.tar.bz2) = 1567842 diff --git a/x11/libX11/pkg-plist b/x11/libX11/pkg-plist index 8244c232c2a6..7f6547521c5d 100644 --- a/x11/libX11/pkg-plist +++ b/x11/libX11/pkg-plist @@ -23,6 +23,9 @@ libdata/pkgconfig/x11.pc %%XCB%%libdata/pkgconfig/x11-xcb.pc lib/X11/XErrorDB lib/X11/XKeysymDB +lib/X11/locale/am_ET.UTF-8/XI18N_OBJS +lib/X11/locale/am_ET.UTF-8/XLC_LOCALE +lib/X11/locale/am_ET.UTF-8/Compose lib/X11/locale/armscii-8/XI18N_OBJS lib/X11/locale/armscii-8/XLC_LOCALE lib/X11/locale/armscii-8/Compose @@ -254,4 +257,5 @@ lib/X11/locale/compose.dir @dirrm lib/X11/locale/el_GR.UTF-8 @dirrm lib/X11/locale/C @dirrm lib/X11/locale/armscii-8 +@dirrm lib/X11/locale/am_ET.UTF-8 @dirrm lib/X11/locale diff --git a/x11/libXScrnSaver/Makefile b/x11/libXScrnSaver/Makefile index d0bf8314a38b..4a8704ce1f86 100644 --- a/x11/libXScrnSaver/Makefile +++ b/x11/libXScrnSaver/Makefile @@ -6,7 +6,7 @@ # PORTNAME= libXScrnSaver -PORTVERSION= 1.1.2 +PORTVERSION= 1.1.3 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/libXScrnSaver/distinfo b/x11/libXScrnSaver/distinfo index ee971b219267..401b30f193b1 100644 --- a/x11/libXScrnSaver/distinfo +++ b/x11/libXScrnSaver/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/lib/libXScrnSaver-1.1.2.tar.bz2) = ac2d697dd02f51e5c15f7104f4be5328 -SHA256 (xorg/lib/libXScrnSaver-1.1.2.tar.bz2) = 6c75debca746060e0c2408a6ca119613ae02d1054adebd4b26ff8beee79bcc67 -SIZE (xorg/lib/libXScrnSaver-1.1.2.tar.bz2) = 219728 +MD5 (xorg/lib/libXScrnSaver-1.1.3.tar.bz2) = 93f84b6797f2f29cae1ce23b0355d00d +SHA256 (xorg/lib/libXScrnSaver-1.1.3.tar.bz2) = 4b90245093c15a24aaaf2fc6e09f075137aad994f72043e098597997d9b2c988 +SIZE (xorg/lib/libXScrnSaver-1.1.3.tar.bz2) = 219568 diff --git a/x11/libXau/Makefile b/x11/libXau/Makefile index 03efb67c84a6..f7494c8bd50f 100644 --- a/x11/libXau/Makefile +++ b/x11/libXau/Makefile @@ -6,8 +6,7 @@ # PORTNAME= libXau -PORTVERSION= 1.0.3 -PORTREVISION= 2 +PORTVERSION= 1.0.4 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/libXau/distinfo b/x11/libXau/distinfo index bc2977594ca8..9f908d675730 100644 --- a/x11/libXau/distinfo +++ b/x11/libXau/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/lib/libXau-1.0.3.tar.bz2) = 75a9f2b85cd1617b5ca98c9095323853 -SHA256 (xorg/lib/libXau-1.0.3.tar.bz2) = d6c30a88770a720e96e0bd7e13e0334f9ef60f1b475a92556764828005c19e3b -SIZE (xorg/lib/libXau-1.0.3.tar.bz2) = 229619 +MD5 (xorg/lib/libXau-1.0.4.tar.bz2) = 0f2b88d857e0a3f5898e4759c541af46 +SHA256 (xorg/lib/libXau-1.0.4.tar.bz2) = 10d3ffa5f00d0c0a4083309ba68bdfa01dfdf912ef4cf2141e3f260b2edeb22c +SIZE (xorg/lib/libXau-1.0.4.tar.bz2) = 227753 diff --git a/x11/libXext/Makefile b/x11/libXext/Makefile index eae965a1947f..fb858946836c 100644 --- a/x11/libXext/Makefile +++ b/x11/libXext/Makefile @@ -6,7 +6,7 @@ # PORTNAME= libXext -PORTVERSION= 1.0.3 +PORTVERSION= 1.0.4 PORTEPOCH= 1 CATEGORIES= x11 diff --git a/x11/libXext/distinfo b/x11/libXext/distinfo index 5f63d025110a..a219911a0efb 100644 --- a/x11/libXext/distinfo +++ b/x11/libXext/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/lib/libXext-1.0.3.tar.bz2) = 1bf6fa1c26f9957d7cc0bd90b038dfa6 -SHA256 (xorg/lib/libXext-1.0.3.tar.bz2) = 2d706baf206d1cb422c8e0ceb6c5a8546bc3f0587cf090eba51e75a295d9c3f0 -SIZE (xorg/lib/libXext-1.0.3.tar.bz2) = 262116 +MD5 (xorg/lib/libXext-1.0.4.tar.bz2) = a91f1f722ac80c597cf0b75dcb8b48c0 +SHA256 (xorg/lib/libXext-1.0.4.tar.bz2) = 2dfd8eace1cafacc87b4055c57efeb771a740e24141d3f113de58c2a9eebd21f +SIZE (xorg/lib/libXext-1.0.4.tar.bz2) = 264491 diff --git a/x11/libXi/Makefile b/x11/libXi/Makefile index 0b0615b4ce1e..0e5bb2a7d3f5 100644 --- a/x11/libXi/Makefile +++ b/x11/libXi/Makefile @@ -6,7 +6,7 @@ # PORTNAME= libXi -PORTVERSION= 1.1.3 +PORTVERSION= 1.2.0 PORTEPOCH= 1 CATEGORIES= x11 @@ -20,10 +20,12 @@ MAN3= XAllowDeviceEvents.3 \ XChangeDeviceControl.3 \ XChangeDeviceDontPropagateList.3 \ XChangeDeviceKeyMapping.3 \ + XChangeDeviceProperty.3 \ XChangeFeedbackControl.3 \ XChangeKeyboardDevice.3 \ XChangePointerDevice.3 \ XCloseDevice.3 \ + XDeleteDeviceProperty.3 \ XDeviceBell.3 \ XDeviceTimeCoord.3 \ XFreeDeviceList.3 \ @@ -31,6 +33,7 @@ MAN3= XAllowDeviceEvents.3 \ XGetDeviceKeyMapping.3 \ XGetDeviceModifierMapping.3 \ XGetDeviceMotionEvents.3 \ + XGetDeviceProperty.3 \ XGetExtensionVersion.3 \ XGetFeedbackControl.3 \ XGetDeviceButtonMapping.3 \ @@ -40,6 +43,7 @@ MAN3= XAllowDeviceEvents.3 \ XGrabDevice.3 \ XGrabDeviceButton.3 \ XGrabDeviceKey.3 \ + XListDeviceProperties.3 \ XListInputDevices.3 \ XOpenDevice.3 \ XQueryDeviceState.3 \ diff --git a/x11/libXi/distinfo b/x11/libXi/distinfo index 82a7ca5a9395..5e121f0b9f3e 100644 --- a/x11/libXi/distinfo +++ b/x11/libXi/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/lib/libXi-1.1.3.tar.bz2) = 7c510abb0cad8dc20493fb27ff7859d8 -SHA256 (xorg/lib/libXi-1.1.3.tar.bz2) = c77a5bbe97d0d0a6493adefcf1bd57aca91bc33279633b3f6cf1d2bb8812153f -SIZE (xorg/lib/libXi-1.1.3.tar.bz2) = 248007 +MD5 (xorg/lib/libXi-1.2.0.tar.bz2) = 4b88e07d7dd77ca1e786f09066b58c02 +SHA256 (xorg/lib/libXi-1.2.0.tar.bz2) = 7c0125ffb864e121ebfb5a20b1cfdff60562c2f2dfbb4e77c5eac81f36e15f3a +SIZE (xorg/lib/libXi-1.2.0.tar.bz2) = 278230 diff --git a/x11/libXinerama/Makefile b/x11/libXinerama/Makefile index 225afe5c4ae6..60e3f47df1f0 100644 --- a/x11/libXinerama/Makefile +++ b/x11/libXinerama/Makefile @@ -6,7 +6,7 @@ # PORTNAME= libXinerama -PORTVERSION= 1.0.2 +PORTVERSION= 1.0.3 PORTEPOCH= 1 CATEGORIES= x11 diff --git a/x11/libXinerama/distinfo b/x11/libXinerama/distinfo index 43db74100cfb..0955c5e2ae1c 100644 --- a/x11/libXinerama/distinfo +++ b/x11/libXinerama/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/lib/libXinerama-1.0.2.tar.bz2) = f6fb08eafd3c2909d515f1a07bfca8fd -SHA256 (xorg/lib/libXinerama-1.0.2.tar.bz2) = d245d7ae4c766ecbc4e5cc2666e2e78198d8386dbaa06b35c3d1b1457ee5d03d -SIZE (xorg/lib/libXinerama-1.0.2.tar.bz2) = 214046 +MD5 (xorg/lib/libXinerama-1.0.3.tar.bz2) = cd9f7c46439ac40e0517a302d2434d2c +SHA256 (xorg/lib/libXinerama-1.0.3.tar.bz2) = 07b3564cd56154c20580b56230b7a95d74fe6582c80cedf0550d8d7955181219 +SIZE (xorg/lib/libXinerama-1.0.3.tar.bz2) = 236386 diff --git a/x11/libXrandr/Makefile b/x11/libXrandr/Makefile index 5f3b30fcd96b..43fb571bf9ab 100644 --- a/x11/libXrandr/Makefile +++ b/x11/libXrandr/Makefile @@ -6,8 +6,7 @@ # PORTNAME= libXrandr -PORTVERSION= 1.2.2 -PORTREVISION= 1 +PORTVERSION= 1.2.3 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org @@ -17,7 +16,6 @@ XORG_CAT= lib USE_XORG= x11 randrproto:both xext xextproto xrender renderproto xproto:both MAN3= Xrandr.3 \ - XRRConfig.3 \ XRRConfigCurrentConfiguration.3 \ XRRConfigCurrentRate.3 \ XRRConfigRates.3 \ @@ -29,7 +27,6 @@ MAN3= Xrandr.3 \ XRRQueryExtension.3 \ XRRQueryVersion.3 \ XRRRootToScreen.3 \ - XRRScreenConfig.3 \ XRRSelectInput.3 \ XRRSetScreenConfig.3 \ XRRSetScreenConfigAndRate.3 diff --git a/x11/libXrandr/distinfo b/x11/libXrandr/distinfo index d9f575f08bb5..3744d06f7c72 100644 --- a/x11/libXrandr/distinfo +++ b/x11/libXrandr/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/lib/libXrandr-1.2.2.tar.bz2) = 1b244b5d19f0ccab01d7083436cd3558 -SHA256 (xorg/lib/libXrandr-1.2.2.tar.bz2) = 206f8dc850f12b1213fb73dbef09fafa1bb8fb8c3ddfe4d39721c1e2dec12a98 -SIZE (xorg/lib/libXrandr-1.2.2.tar.bz2) = 224302 +MD5 (xorg/lib/libXrandr-1.2.3.tar.bz2) = 5cd67cc02a50c9644ba0a1846ea3b08e +SHA256 (xorg/lib/libXrandr-1.2.3.tar.bz2) = f8edfe26b8c4c3677a3a949f81a8b09a5fad62972020bfd230401e11cc0ed267 +SIZE (xorg/lib/libXrandr-1.2.3.tar.bz2) = 251814 diff --git a/x11/libXv/Makefile b/x11/libXv/Makefile index ca1050811ca3..6924e39ca93d 100644 --- a/x11/libXv/Makefile +++ b/x11/libXv/Makefile @@ -6,8 +6,7 @@ # PORTNAME= libXv -PORTVERSION= 1.0.3 -PORTREVISION= 1 +PORTVERSION= 1.0.4 PORTEPOCH= 1 CATEGORIES= x11 diff --git a/x11/libXv/distinfo b/x11/libXv/distinfo index dee2747c6299..839e7857cf8b 100644 --- a/x11/libXv/distinfo +++ b/x11/libXv/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/lib/libXv-1.0.3.tar.bz2) = f1c4109fa804aeaf7188b66c5cdd9f57 -SHA256 (xorg/lib/libXv-1.0.3.tar.bz2) = f87ae65be39a3c26dc3c87159d9126daf2af1b8c5e7f2ffc38b9f72b9236261b -SIZE (xorg/lib/libXv-1.0.3.tar.bz2) = 231715 +MD5 (xorg/lib/libXv-1.0.4.tar.bz2) = 723a0275227165383e967a1ca8899b52 +SHA256 (xorg/lib/libXv-1.0.4.tar.bz2) = 4d3cc49b6f4da6d396196054eca23a91df1a41001c736dcfd22fec5a5c7428c8 +SIZE (xorg/lib/libXv-1.0.4.tar.bz2) = 229227 diff --git a/x11/libXxf86vm/Makefile b/x11/libXxf86vm/Makefile index fc9f3e02e720..f164840f92e2 100644 --- a/x11/libXxf86vm/Makefile +++ b/x11/libXxf86vm/Makefile @@ -6,7 +6,7 @@ # PORTNAME= libXxf86vm -PORTVERSION= 1.0.1 +PORTVERSION= 1.0.2 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/libXxf86vm/distinfo b/x11/libXxf86vm/distinfo index 852a685b3d3a..5f6d92ebe9ea 100644 --- a/x11/libXxf86vm/distinfo +++ b/x11/libXxf86vm/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/lib/libXxf86vm-1.0.1.tar.bz2) = 8de1ca6c55aaad7d8cae19b4f0b3da32 -SHA256 (xorg/lib/libXxf86vm-1.0.1.tar.bz2) = e08fc2c1611c422f751ed02810491b45bf7faa4207d762a11f11815263c9285a -SIZE (xorg/lib/libXxf86vm-1.0.1.tar.bz2) = 227928 +MD5 (xorg/lib/libXxf86vm-1.0.2.tar.bz2) = 304d37bd0a10d9b58aa9b64469ad73e5 +SHA256 (xorg/lib/libXxf86vm-1.0.2.tar.bz2) = 3cb3c3c6552a4fbc686ba6c2dbeb6e4ba2a27103279908831d56363de73951de +SIZE (xorg/lib/libXxf86vm-1.0.2.tar.bz2) = 240637 diff --git a/x11/libdnd/Makefile b/x11/libdnd/Makefile index c8ad43156626..8b6dcb63a79f 100644 --- a/x11/libdnd/Makefile +++ b/x11/libdnd/Makefile @@ -7,7 +7,7 @@ PORTNAME= libdnd PORTVERSION= 1.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11 MASTER_SITES= http://leb.net/offix/ DISTNAME= dnd.${PORTVERSION} diff --git a/x11/libxcb/Makefile b/x11/libxcb/Makefile index 59089c2d17a2..011af27421a4 100644 --- a/x11/libxcb/Makefile +++ b/x11/libxcb/Makefile @@ -6,7 +6,7 @@ # PORTNAME= libxcb -PORTVERSION= 1.1.90.1 +PORTVERSION= 1.1.93 CATEGORIES= x11 python #MASTER_SITES= XORG/current/src/extras MASTER_SITES= http://xcb.freedesktop.org/dist/ diff --git a/x11/libxcb/distinfo b/x11/libxcb/distinfo index 2a9d0a3a2d35..a007b6596693 100644 --- a/x11/libxcb/distinfo +++ b/x11/libxcb/distinfo @@ -1,3 +1,3 @@ -MD5 (libxcb-1.1.90.1.tar.bz2) = c4b67c5576ed58e2fd4a2855c0b21aa6 -SHA256 (libxcb-1.1.90.1.tar.bz2) = 7ccd862a295562412e9fe75cb83cc593db5c88d162b3ce1f7a326dd116381e88 -SIZE (libxcb-1.1.90.1.tar.bz2) = 475250 +MD5 (libxcb-1.1.93.tar.bz2) = 1e401dd361c38ccaa97a3a835da4caa3 +SHA256 (libxcb-1.1.93.tar.bz2) = b675393e2a0a54b9ccb147826042a4016f158788b2f7c47067832b125059e9f4 +SIZE (libxcb-1.1.93.tar.bz2) = 463825 diff --git a/x11/libxcb/pkg-plist b/x11/libxcb/pkg-plist index b35b552c9b1f..53f423c6eecf 100644 --- a/x11/libxcb/pkg-plist +++ b/x11/libxcb/pkg-plist @@ -14,7 +14,6 @@ include/xcb/sync.h include/xcb/xc_misc.h include/xcb/xcb.h include/xcb/xcbext.h -include/xcb/xcbxlib.h include/xcb/xevie.h include/xcb/xf86dri.h include/xcb/xfixes.h @@ -90,10 +89,6 @@ lib/libxcb-xinerama.a lib/libxcb-xinerama.la lib/libxcb-xinerama.so lib/libxcb-xinerama.so.0 -lib/libxcb-xlib.a -lib/libxcb-xlib.la -lib/libxcb-xlib.so -lib/libxcb-xlib.so.0 lib/libxcb-xprint.a lib/libxcb-xprint.la lib/libxcb-xprint.so @@ -113,7 +108,7 @@ lib/libxcb-xvmc.so.0 lib/libxcb.a lib/libxcb.la lib/libxcb.so -lib/libxcb.so.1 +lib/libxcb.so.2 libdata/pkgconfig/xcb-composite.pc libdata/pkgconfig/xcb-damage.pc libdata/pkgconfig/xcb-dpms.pc @@ -130,7 +125,6 @@ libdata/pkgconfig/xcb-xevie.pc libdata/pkgconfig/xcb-xf86dri.pc libdata/pkgconfig/xcb-xfixes.pc libdata/pkgconfig/xcb-xinerama.pc -libdata/pkgconfig/xcb-xlib.pc libdata/pkgconfig/xcb-xprint.pc libdata/pkgconfig/xcb-xtest.pc libdata/pkgconfig/xcb-xv.pc diff --git a/x11/libxkbfile/Makefile b/x11/libxkbfile/Makefile index edee2b77ac5e..a51273a6dfc8 100644 --- a/x11/libxkbfile/Makefile +++ b/x11/libxkbfile/Makefile @@ -6,7 +6,7 @@ # PORTNAME= libxkbfile -PORTVERSION= 1.0.4 +PORTVERSION= 1.0.5 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/libxkbfile/distinfo b/x11/libxkbfile/distinfo index a1594e5cb3b1..106e9f45c522 100644 --- a/x11/libxkbfile/distinfo +++ b/x11/libxkbfile/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/lib/libxkbfile-1.0.4.tar.bz2) = 12b4ceb5d42b520228b5fb40a96ae6c5 -SHA256 (xorg/lib/libxkbfile-1.0.4.tar.bz2) = 468ade4eaa3951a7c34b6ae1c290ab1a1d364ee36c5c455ef0df15550825b8ae -SIZE (xorg/lib/libxkbfile-1.0.4.tar.bz2) = 273537 +MD5 (xorg/lib/libxkbfile-1.0.5.tar.bz2) = 0726a845fe5a56551de2718c9f6b0e35 +SHA256 (xorg/lib/libxkbfile-1.0.5.tar.bz2) = 0ab628271fc9cb6d05f861d9823573088d81d510aca95b87ac0504b2e558965f +SIZE (xorg/lib/libxkbfile-1.0.5.tar.bz2) = 259790 diff --git a/x11/listres/Makefile b/x11/listres/Makefile index 782af42a2bca..a2722836ff4f 100644 --- a/x11/listres/Makefile +++ b/x11/listres/Makefile @@ -7,6 +7,7 @@ PORTNAME= listres PORTVERSION= 1.0.1 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/luit/Makefile b/x11/luit/Makefile index cec83e4da244..40610108ecb4 100644 --- a/x11/luit/Makefile +++ b/x11/luit/Makefile @@ -6,8 +6,7 @@ # PORTNAME= luit -PORTVERSION= 1.0.2 -PORTREVISION= 2 +PORTVERSION= 1.0.3 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/luit/distinfo b/x11/luit/distinfo index 092103b77a7f..054a7b31af39 100644 --- a/x11/luit/distinfo +++ b/x11/luit/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/luit-1.0.2.tar.bz2) = aacda46598ce3af8ca16e2a8132db1b2 -SHA256 (xorg/app/luit-1.0.2.tar.bz2) = c0c4d76df0350c626df7ce62bf3df7915f9959557d76abce96222857d782389c -SIZE (xorg/app/luit-1.0.2.tar.bz2) = 99235 +MD5 (xorg/app/luit-1.0.3.tar.bz2) = b01e4f71c20fc1c79ed727759c1df40c +SHA256 (xorg/app/luit-1.0.3.tar.bz2) = 2010f2152eee89a67f02edc3041574fb07442d075ca46fbcf84f981f0977a5d7 +SIZE (xorg/app/luit-1.0.3.tar.bz2) = 104642 diff --git a/x11/pixman/Makefile b/x11/pixman/Makefile index d86ce102c670..59881a79ddb1 100644 --- a/x11/pixman/Makefile +++ b/x11/pixman/Makefile @@ -6,7 +6,7 @@ # PORTNAME= pixman -PORTVERSION= 0.12.0 +PORTVERSION= 0.13.2 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/pixman/distinfo b/x11/pixman/distinfo index e45e92f7d5db..8a5f7519320f 100644 --- a/x11/pixman/distinfo +++ b/x11/pixman/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/lib/pixman-0.12.0.tar.bz2) = 494af78c1c7d825c9ad6815d7b91f17d -SHA256 (xorg/lib/pixman-0.12.0.tar.bz2) = a82b54382a82c2fb42f7ad2c8f363e945602a5183f6df685b69a584d3b25b228 -SIZE (xorg/lib/pixman-0.12.0.tar.bz2) = 364262 +MD5 (xorg/lib/pixman-0.13.2.tar.bz2) = 4b03b556bb0da245eedf74437c3a6158 +SHA256 (xorg/lib/pixman-0.13.2.tar.bz2) = 7b6b9fdd2104c7fed450a0d0da26fa906cb49544c25c53377084eea8fefb7cdc +SIZE (xorg/lib/pixman-0.13.2.tar.bz2) = 337769 diff --git a/x11/printproto/Makefile b/x11/printproto/Makefile index 82049577ad59..bce224c8253c 100644 --- a/x11/printproto/Makefile +++ b/x11/printproto/Makefile @@ -6,7 +6,7 @@ # PORTNAME= printproto -PORTVERSION= 1.0.3 +PORTVERSION= 1.0.4 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/printproto/distinfo b/x11/printproto/distinfo index 638a4e42bbc3..ad847aa6c35d 100644 --- a/x11/printproto/distinfo +++ b/x11/printproto/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/proto/printproto-1.0.3.tar.bz2) = 0f4e7982c6d4ec3b2cf38502dd1293a3 -SHA256 (xorg/proto/printproto-1.0.3.tar.bz2) = 8b375f8cda83dfc7d84be44af41eedd484d0e2499acbd19bdca5b4056dec7235 -SIZE (xorg/proto/printproto-1.0.3.tar.bz2) = 43560 +MD5 (xorg/proto/printproto-1.0.4.tar.bz2) = 7321847a60748b4d2f1fa16db4b6ede8 +SHA256 (xorg/proto/printproto-1.0.4.tar.bz2) = f059a93188e7143dbb6cc55e31ccf81b976776aa3023bfa57f47501fd1bfd3be +SIZE (xorg/proto/printproto-1.0.4.tar.bz2) = 49579 diff --git a/x11/sessreg/Makefile b/x11/sessreg/Makefile index b20546b36df7..b82f9894233d 100644 --- a/x11/sessreg/Makefile +++ b/x11/sessreg/Makefile @@ -6,7 +6,7 @@ # PORTNAME= sessreg -PORTVERSION= 1.0.3 +PORTVERSION= 1.0.4 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/sessreg/distinfo b/x11/sessreg/distinfo index 15eadc003898..d300de9c3d59 100644 --- a/x11/sessreg/distinfo +++ b/x11/sessreg/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/sessreg-1.0.3.tar.bz2) = 07665816f2623ec82e665fb7d31c6cef -SHA256 (xorg/app/sessreg-1.0.3.tar.bz2) = 7d0c145d53246ddf09fc749f91324897ed9a3da0064808f99b789c37470080dc -SIZE (xorg/app/sessreg-1.0.3.tar.bz2) = 94690 +MD5 (xorg/app/sessreg-1.0.4.tar.bz2) = 839e968d7197b9563f0fd8a5a3aac2e3 +SHA256 (xorg/app/sessreg-1.0.4.tar.bz2) = 23e163502e208ac16f04a12b15f7f8dcd9919f0149c714353b7f92539b7e9802 +SIZE (xorg/app/sessreg-1.0.4.tar.bz2) = 96209 diff --git a/x11/tycoon/Makefile b/x11/tycoon/Makefile index ec1a363e5873..181527e808b4 100644 --- a/x11/tycoon/Makefile +++ b/x11/tycoon/Makefile @@ -7,7 +7,7 @@ PORTNAME= tycoon PORTVERSION= 1.07o -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= X11/desktop diff --git a/x11/viewres/Makefile b/x11/viewres/Makefile index ef09510911c0..abcd108d8eab 100644 --- a/x11/viewres/Makefile +++ b/x11/viewres/Makefile @@ -7,6 +7,7 @@ PORTNAME= viewres PORTVERSION= 1.0.1 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/x11perf/Makefile b/x11/x11perf/Makefile index 627fd24d7605..3137317a9e43 100644 --- a/x11/x11perf/Makefile +++ b/x11/x11perf/Makefile @@ -6,7 +6,7 @@ # PORTNAME= x11perf -PORTVERSION= 1.4.1 +PORTVERSION= 1.5 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/x11perf/distinfo b/x11/x11perf/distinfo index 62ad1a0226d0..2ad476a138e3 100644 --- a/x11/x11perf/distinfo +++ b/x11/x11perf/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/x11perf-1.4.1.tar.bz2) = fd06c8b8e3572a0e14af65a49e0dd7d1 -SHA256 (xorg/app/x11perf-1.4.1.tar.bz2) = c81819618ec596fda55b950ef80f2ee02e5ce149ea99f1f741cedb459b4d3064 -SIZE (xorg/app/x11perf-1.4.1.tar.bz2) = 126784 +MD5 (xorg/app/x11perf-1.5.tar.bz2) = 31283bfc3c78718ac1bd71e510d4e774 +SHA256 (xorg/app/x11perf-1.5.tar.bz2) = 4729da53dde0b7e1748db4bb771f9b7aaf2e2b1e67293a3a5b96d54043ce1233 +SIZE (xorg/app/x11perf-1.5.tar.bz2) = 142378 diff --git a/x11/xauth/Makefile b/x11/xauth/Makefile index 65007f16644b..29702575169f 100644 --- a/x11/xauth/Makefile +++ b/x11/xauth/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xauth -PORTVERSION= 1.0.2 +PORTVERSION= 1.0.3 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xauth/distinfo b/x11/xauth/distinfo index 9573c12bf938..14a99ab151a0 100644 --- a/x11/xauth/distinfo +++ b/x11/xauth/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/xauth-1.0.2.tar.bz2) = 31b956edaeb453ddaa640420e97b25b2 -SHA256 (xorg/app/xauth-1.0.2.tar.bz2) = 569e5a581e5eb16abf1c04a66da22c6dade14578ab34e5e78b8724bb655f1f17 -SIZE (xorg/app/xauth-1.0.2.tar.bz2) = 110215 +MD5 (xorg/app/xauth-1.0.3.tar.bz2) = e91e10ace1df0d5f2cbc74ead256407a +SHA256 (xorg/app/xauth-1.0.3.tar.bz2) = 1fd18b53fda74ea4649eb9577b1cf86538a25d171f10251eeb30d11cdd5bda8c +SIZE (xorg/app/xauth-1.0.3.tar.bz2) = 112331 diff --git a/x11/xballoon/Makefile b/x11/xballoon/Makefile index 47fd7111109e..f09d8f5e75e4 100644 --- a/x11/xballoon/Makefile +++ b/x11/xballoon/Makefile @@ -7,7 +7,7 @@ PORTNAME= xballoon PORTVERSION= 1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 MASTER_SITES= http://www.saturn.dti.ne.jp/~hsakai/myfreesoft/ diff --git a/x11/xbiff/Makefile b/x11/xbiff/Makefile index 5199eee6e1fe..463d3b17e0df 100644 --- a/x11/xbiff/Makefile +++ b/x11/xbiff/Makefile @@ -7,6 +7,7 @@ PORTNAME= xbiff PORTVERSION= 1.0.1 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xcalc/Makefile b/x11/xcalc/Makefile index 72b23a14478f..b55debe03f1c 100644 --- a/x11/xcalc/Makefile +++ b/x11/xcalc/Makefile @@ -7,6 +7,7 @@ PORTNAME= xcalc PORTVERSION= 1.0.2 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xcb-proto/Makefile b/x11/xcb-proto/Makefile index 6cb3a16082cf..a637df92bf61 100644 --- a/x11/xcb-proto/Makefile +++ b/x11/xcb-proto/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xcb-proto -PORTVERSION= 1.2 +PORTVERSION= 1.3 CATEGORIES= x11 python MASTER_SITES= http://xcb.freedesktop.org/dist/ diff --git a/x11/xcb-proto/distinfo b/x11/xcb-proto/distinfo index 08460e2efffb..c258313abbcc 100644 --- a/x11/xcb-proto/distinfo +++ b/x11/xcb-proto/distinfo @@ -1,3 +1,3 @@ -MD5 (xcb-proto-1.2.tar.bz2) = 09f912486d8a2353bb4b99ddc28ba3c7 -SHA256 (xcb-proto-1.2.tar.bz2) = 54252e3543064b1b263b8880c5a549404486c95daa5da8656f5286c80e006be5 -SIZE (xcb-proto-1.2.tar.bz2) = 86506 +MD5 (xcb-proto-1.3.tar.bz2) = d9275a714e83ab9c1f9b260c6eff1609 +SHA256 (xcb-proto-1.3.tar.bz2) = 3f09fd80360316f5282e8062d09457370e4c1e25c161e07aaa928a074ce8d1ac +SIZE (xcb-proto-1.3.tar.bz2) = 87190 diff --git a/x11/xcb-util/Makefile b/x11/xcb-util/Makefile index bfa7f940eab9..e67ee04c3df3 100644 --- a/x11/xcb-util/Makefile +++ b/x11/xcb-util/Makefile @@ -6,14 +6,14 @@ # PORTNAME= xcb-util -PORTVERSION= 0.3.0 +PORTVERSION= 0.3.2 CATEGORIES= x11 MASTER_SITES= http://xcb.freedesktop.org/dist/ MAINTAINER= ntarmos@ceid.upatras.gr COMMENT= A module with libxcb/libX11 extension/replacement libraries -LIB_DEPENDS= xcb.1:${PORTSDIR}/x11/libxcb +LIB_DEPENDS= xcb.2:${PORTSDIR}/x11/libxcb BUILD_DEPENDS= ${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf USE_BZIP2= yes diff --git a/x11/xcb-util/distinfo b/x11/xcb-util/distinfo index 40073d03f3b8..db2fa6d592f5 100644 --- a/x11/xcb-util/distinfo +++ b/x11/xcb-util/distinfo @@ -1,3 +1,3 @@ -MD5 (xcb-util-0.3.0.tar.bz2) = 5f2188492a7d12142d83f73cf0054c59 -SHA256 (xcb-util-0.3.0.tar.bz2) = f85adfc10e4540fb294fe14806f8d711a7ac30ea4a5661b68225e7fdaa1708ab -SIZE (xcb-util-0.3.0.tar.bz2) = 264896 +MD5 (xcb-util-0.3.2.tar.bz2) = fa41a147f5a63b01207cfd975fecc45c +SHA256 (xcb-util-0.3.2.tar.bz2) = c72bd0df78778698720a19382a38d12b4943d023d27f9106a510c7dfd17438fd +SIZE (xcb-util-0.3.2.tar.bz2) = 271223 diff --git a/x11/xclipboard/Makefile b/x11/xclipboard/Makefile index 83492f24b0d6..809edc066678 100644 --- a/x11/xclipboard/Makefile +++ b/x11/xclipboard/Makefile @@ -7,6 +7,7 @@ PORTNAME= xclipboard PORTVERSION= 1.0.1 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xclock/Makefile b/x11/xclock/Makefile index e7861d5d94bd..2e9e950548d6 100644 --- a/x11/xclock/Makefile +++ b/x11/xclock/Makefile @@ -7,6 +7,7 @@ PORTNAME= xclock PORTVERSION= 1.0.3 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xcolors/Makefile b/x11/xcolors/Makefile index f86cbf8345b9..5b77edf07551 100644 --- a/x11/xcolors/Makefile +++ b/x11/xcolors/Makefile @@ -7,7 +7,7 @@ PORTNAME= xcolors PORTVERSION= 1.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= markp diff --git a/x11/xconsole/Makefile b/x11/xconsole/Makefile index 02a2731c2036..9be64372edb3 100644 --- a/x11/xconsole/Makefile +++ b/x11/xconsole/Makefile @@ -7,6 +7,7 @@ PORTNAME= xconsole PORTVERSION= 1.0.3 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xditview/Makefile b/x11/xditview/Makefile index fbf4b6d49182..232e9c6d7b9c 100644 --- a/x11/xditview/Makefile +++ b/x11/xditview/Makefile @@ -7,6 +7,7 @@ PORTNAME= xditview PORTVERSION= 1.0.1 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xdm/Makefile b/x11/xdm/Makefile index ae0f04ae16ea..d79721f2e824 100644 --- a/x11/xdm/Makefile +++ b/x11/xdm/Makefile @@ -6,8 +6,8 @@ # PORTNAME= xdm -PORTVERSION= 1.1.6 -PORTREVISION= 3 +PORTVERSION= 1.1.8 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org @@ -29,6 +29,7 @@ post-patch: ${WRKSRC}/config/xdm-config.cpp \ ${WRKSRC}/config/Xstartup.cpp \ ${WRKSRC}/config/Xreset.cpp + @${REINPLACE_CMD} -e "s|@DESTDIR@||" ${WRKSRC}/Makefile.in post-configure: @${REINPLACE_CMD} -e "s|${EXAMPLESDIR}|${PREFIX}/lib/X11/xdm|" \ diff --git a/x11/xdm/distinfo b/x11/xdm/distinfo index e689ef94eb86..b4d588de261c 100644 --- a/x11/xdm/distinfo +++ b/x11/xdm/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/xdm-1.1.6.tar.bz2) = c89f8bc74fda4d19e5f374f59c88810f -SHA256 (xorg/app/xdm-1.1.6.tar.bz2) = c41ac89d9da5c3f5424e9c4871d363ff17acf0fd2a46830931c447ba0b5a8bcd -SIZE (xorg/app/xdm-1.1.6.tar.bz2) = 394175 +MD5 (xorg/app/xdm-1.1.8.tar.bz2) = cc1816bc62a3722ad509373b0b7f30fe +SHA256 (xorg/app/xdm-1.1.8.tar.bz2) = e1169058775a44b0898351d2f645039b4d8946360285831e553587a147b735e9 +SIZE (xorg/app/xdm-1.1.8.tar.bz2) = 401712 diff --git a/x11/xdm/files/patch-config_Xresources.cpp b/x11/xdm/files/patch-config_Xresources.cpp deleted file mode 100644 index 79f43ad08150..000000000000 --- a/x11/xdm/files/patch-config_Xresources.cpp +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/config/Xresources.cpp b/config/Xresources.cpp -index a98287b..8c04efc 100644 ---- config/Xresources.cpp.orig -+++ config/Xresources.cpp -@@ -36,6 +36,16 @@ xlogin*greetFace: Serif-24:bold:italic - xlogin*face: Helvetica-18 - xlogin*promptFace: Helvetica-18:bold - xlogin*failFace: Helvetica-18:bold -+XHASHelse -+xlogin*greetFont: -adobe-helvetica-bold-o-normal--17-120-100-100-p-92-iso8859-1 -+xlogin*font: -adobe-helvetica-medium-r-normal--12-120-75-75-p-67-iso8859-1 -+xlogin*promptFont: -adobe-helvetica-bold-r-normal--12-120-75-75-p-70-iso8859-1 -+xlogin*failFont: -adobe-helvetica-bold-o-normal--14-140-75-75-p-82-iso8859-1 -+xlogin*greetFace: Serif-18:bold:italic -+xlogin*face: Helvetica-12 -+xlogin*promptFace: Helvetica-12:bold -+xlogin*failFace: Helvetica-14:bold -+XHASHendif - - XHASHifdef COLOR - xlogin*borderWidth: 1 diff --git a/x11/xdpyinfo/Makefile b/x11/xdpyinfo/Makefile index c5ceaeb343c3..b01fd1ad6821 100644 --- a/x11/xdpyinfo/Makefile +++ b/x11/xdpyinfo/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xdpyinfo -PORTVERSION= 1.0.2 -PORTREVISION= 1 +PORTVERSION= 1.0.3 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xdpyinfo/distinfo b/x11/xdpyinfo/distinfo index c514e41cc9a8..53dd02d960b2 100644 --- a/x11/xdpyinfo/distinfo +++ b/x11/xdpyinfo/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/xdpyinfo-1.0.2.tar.bz2) = c9ee60ae52c97c51d4ca327e53f0cb61 -SHA256 (xorg/app/xdpyinfo-1.0.2.tar.bz2) = c9927fc33e8a4422d74b1ebee0d19dd5a16d9ebc435e8f47f0aa546501ccfed3 -SIZE (xorg/app/xdpyinfo-1.0.2.tar.bz2) = 100024 +MD5 (xorg/app/xdpyinfo-1.0.3.tar.bz2) = b7cbab6cbcd12bf7ad65dbc12d86e104 +SHA256 (xorg/app/xdpyinfo-1.0.3.tar.bz2) = 4294768751bd4ffb47e5ebacfc7b5b9f95a1a2f4d221d8af64474382473e1962 +SIZE (xorg/app/xdpyinfo-1.0.3.tar.bz2) = 103116 diff --git a/x11/xdtm/Makefile b/x11/xdtm/Makefile index bee1f199c387..c6b3dd5f37b9 100644 --- a/x11/xdtm/Makefile +++ b/x11/xdtm/Makefile @@ -7,7 +7,7 @@ PORTNAME= xdtm PORTVERSION= 2.5.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XCONTRIB} MASTER_SITE_SUBDIR= applications diff --git a/x11/xedit/Makefile b/x11/xedit/Makefile index afffb6232202..784daadd393a 100644 --- a/x11/xedit/Makefile +++ b/x11/xedit/Makefile @@ -6,14 +6,14 @@ # PORTNAME= xedit -PORTVERSION= 1.0.2 +PORTVERSION= 1.1.2 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= Simple text editor for X XORG_CAT= app -USE_XORG= xt xaw xp xprintutil +USE_XORG= xt xaw7 MAN1= xedit.1 diff --git a/x11/xedit/distinfo b/x11/xedit/distinfo index c99bb879f4cc..f73ad9bcdea3 100644 --- a/x11/xedit/distinfo +++ b/x11/xedit/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/xedit-1.0.2.tar.bz2) = c56160e93c24ddf17e69891ed50deb72 -SHA256 (xorg/app/xedit-1.0.2.tar.bz2) = 2658d78bbaf8c9effac261f3c229c035fbfda817fa9636dea1e46078213362df -SIZE (xorg/app/xedit-1.0.2.tar.bz2) = 455400 +MD5 (xorg/app/xedit-1.1.2.tar.bz2) = 67193be728414d45a1922911e6437991 +SHA256 (xorg/app/xedit-1.1.2.tar.bz2) = a38823a8b7919e2efa689bc4c279e12314e45b41131c39ce9ca523e54f42fa1f +SIZE (xorg/app/xedit-1.1.2.tar.bz2) = 484563 diff --git a/x11/xedit/pkg-plist b/x11/xedit/pkg-plist index 22caffb89358..1bd6252ee24b 100644 --- a/x11/xedit/pkg-plist +++ b/x11/xedit/pkg-plist @@ -1,4 +1,5 @@ bin/xedit +lib/X11/xedit/lisp/progmodes/auto.lsp lib/X11/xedit/lisp/progmodes/c.lsp lib/X11/xedit/lisp/progmodes/html.lsp lib/X11/xedit/lisp/progmodes/imake.lsp @@ -6,6 +7,8 @@ lib/X11/xedit/lisp/progmodes/lisp.lsp lib/X11/xedit/lisp/progmodes/make.lsp lib/X11/xedit/lisp/progmodes/man.lsp lib/X11/xedit/lisp/progmodes/patch.lsp +lib/X11/xedit/lisp/progmodes/perl.lsp +lib/X11/xedit/lisp/progmodes/python.lsp lib/X11/xedit/lisp/progmodes/rpm.lsp lib/X11/xedit/lisp/progmodes/sgml.lsp lib/X11/xedit/lisp/progmodes/sh.lsp diff --git a/x11/xev/Makefile b/x11/xev/Makefile index 1f265b8c37e0..09bb49017558 100644 --- a/x11/xev/Makefile +++ b/x11/xev/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xev -PORTVERSION= 1.0.2 +PORTVERSION= 1.0.3 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xev/distinfo b/x11/xev/distinfo index 0d51b68173fa..bd2ca1d458f3 100644 --- a/x11/xev/distinfo +++ b/x11/xev/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/xev-1.0.2.tar.bz2) = e3008eb0655da3026c162a5597d70869 -SHA256 (xorg/app/xev-1.0.2.tar.bz2) = cac2771b67942d9a00b46532176feb18b2f82c434e0f6ece578d95953ef33053 -SIZE (xorg/app/xev-1.0.2.tar.bz2) = 84097 +MD5 (xorg/app/xev-1.0.3.tar.bz2) = a9532c3d1683c99bb5df1895cb3a60b1 +SHA256 (xorg/app/xev-1.0.3.tar.bz2) = d4ac7ae154ee9733be27a5f55586abb9362c768f5fb8a4fc7fd2645100a9313a +SIZE (xorg/app/xev-1.0.3.tar.bz2) = 92292 diff --git a/x11/xextproto/Makefile b/x11/xextproto/Makefile index fcf8b6a457a3..1ed6eded2c44 100644 --- a/x11/xextproto/Makefile +++ b/x11/xextproto/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xextproto -PORTVERSION= 7.0.2 +PORTVERSION= 7.0.4 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xextproto/distinfo b/x11/xextproto/distinfo index 3be185fe3d90..d3cfc7681330 100644 --- a/x11/xextproto/distinfo +++ b/x11/xextproto/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/proto/xextproto-7.0.2.tar.bz2) = 242388ab65dde3a3dd313eeee265e429 -SHA256 (xorg/proto/xextproto-7.0.2.tar.bz2) = 53f3039ae769b08bd139d4474a7debe0b6f24048e7c514c835c8a1880f11e0d9 -SIZE (xorg/proto/xextproto-7.0.2.tar.bz2) = 68323 +MD5 (xorg/proto/xextproto-7.0.4.tar.bz2) = 64c19cbf368f053cfc689609589dacfe +SHA256 (xorg/proto/xextproto-7.0.4.tar.bz2) = e27f723f4218908be96c28a8e0e740e9b31a00c97dad6aaa9a57b79fc0295614 +SIZE (xorg/proto/xextproto-7.0.4.tar.bz2) = 79268 diff --git a/x11/xextproto/pkg-plist b/x11/xextproto/pkg-plist index e997f23be10d..30e106267b84 100644 --- a/x11/xextproto/pkg-plist +++ b/x11/xextproto/pkg-plist @@ -5,16 +5,18 @@ include/X11/extensions/XLbx.h include/X11/extensions/XShm.h include/X11/extensions/XTest.h include/X11/extensions/Xag.h -include/X11/extensions/Xagsrv.h include/X11/extensions/Xagstr.h include/X11/extensions/Xcup.h include/X11/extensions/Xcupstr.h include/X11/extensions/Xdbe.h include/X11/extensions/Xdbeproto.h include/X11/extensions/Xext.h +include/X11/extensions/Xge.h include/X11/extensions/dpms.h include/X11/extensions/dpmsstr.h include/X11/extensions/extutil.h +include/X11/extensions/ge.h +include/X11/extensions/geproto.h include/X11/extensions/lbxbuf.h include/X11/extensions/lbxbufstr.h include/X11/extensions/lbxdeltastr.h diff --git a/x11/xf86dga/Makefile b/x11/xf86dga/Makefile index 3ee9a942aff2..ed9b8150777d 100644 --- a/x11/xf86dga/Makefile +++ b/x11/xf86dga/Makefile @@ -7,6 +7,7 @@ PORTNAME= xf86dga PORTVERSION= 1.0.2 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xf86driproto/Makefile b/x11/xf86driproto/Makefile index 5050dc0d49f8..1104a6b57f89 100644 --- a/x11/xf86driproto/Makefile +++ b/x11/xf86driproto/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xf86driproto -PORTVERSION= 2.0.3 +PORTVERSION= 2.0.4 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xf86driproto/distinfo b/x11/xf86driproto/distinfo index 8bc28ed9ccc2..e32be9fa367d 100644 --- a/x11/xf86driproto/distinfo +++ b/x11/xf86driproto/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/proto/xf86driproto-2.0.3.tar.bz2) = e4a282cfd708b8892fca4425fee9cd7b -SHA256 (xorg/proto/xf86driproto-2.0.3.tar.bz2) = 111c469a24374803b08104c725d8318760b226cedccd12b199c83d1b2756b8d6 -SIZE (xorg/proto/xf86driproto-2.0.3.tar.bz2) = 42828 +MD5 (xorg/proto/xf86driproto-2.0.4.tar.bz2) = 01470d088da3a8a3deefa8e1f45d69cb +SHA256 (xorg/proto/xf86driproto-2.0.4.tar.bz2) = f57da66bec8563502fe95c0e3f6ed297d9985862f5b64a5c9d3039719ac7f9da +SIZE (xorg/proto/xf86driproto-2.0.4.tar.bz2) = 43814 diff --git a/x11/xf86driproto/pkg-plist b/x11/xf86driproto/pkg-plist index ad29f350c9d3..93dac2da7258 100644 --- a/x11/xf86driproto/pkg-plist +++ b/x11/xf86driproto/pkg-plist @@ -1,4 +1,3 @@ -include/GL/internal/dri_interface.h include/X11/dri/xf86dri.h include/X11/dri/xf86dristr.h libdata/pkgconfig/xf86driproto.pc diff --git a/x11/xfd/Makefile b/x11/xfd/Makefile index 9dae7d24052f..10122494509b 100644 --- a/x11/xfd/Makefile +++ b/x11/xfd/Makefile @@ -7,6 +7,7 @@ PORTNAME= xfd PORTVERSION= 1.0.1 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xgc/Makefile b/x11/xgc/Makefile index fd106632376c..b4dec16e2638 100644 --- a/x11/xgc/Makefile +++ b/x11/xgc/Makefile @@ -7,6 +7,7 @@ PORTNAME= xgc PORTVERSION= 1.0.1 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xinit/Makefile b/x11/xinit/Makefile index f64a7f709e52..cadb0200ca19 100644 --- a/x11/xinit/Makefile +++ b/x11/xinit/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xinit -PORTVERSION= 1.0.7 +PORTVERSION= 1.1.1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xinit/distinfo b/x11/xinit/distinfo index fc2450087aeb..1d65aebe28e7 100644 --- a/x11/xinit/distinfo +++ b/x11/xinit/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/xinit-1.0.7.tar.bz2) = 8b882d9e2deed9d85469a3beaec566a3 -SHA256 (xorg/app/xinit-1.0.7.tar.bz2) = 15781cf2b15af8a2535ecc49acce77cc16573571344a71dcbe198ec12e5bb774 -SIZE (xorg/app/xinit-1.0.7.tar.bz2) = 110908 +MD5 (xorg/app/xinit-1.1.1.tar.bz2) = 93c73705ed9eb1e1a6b6938405672f2b +SHA256 (xorg/app/xinit-1.1.1.tar.bz2) = b103d2cf9e1cd8b049e28bb1109f3da3a14287bbce3ab8b2f427d55a6e5f4785 +SIZE (xorg/app/xinit-1.1.1.tar.bz2) = 129365 diff --git a/x11/xinput/Makefile b/x11/xinput/Makefile index bcf6ece6fcc9..b68044f7c544 100644 --- a/x11/xinput/Makefile +++ b/x11/xinput/Makefile @@ -6,18 +6,17 @@ # PORTNAME= xinput -PORTVERSION= 1.2 -PORTREVISION= 1 +PORTVERSION= 1.4.0 CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_XCONTRIB} -MASTER_SITE_SUBDIR=utilities -MAINTAINER= ports@FreeBSD.org +MAINTAINER= x11@FreeBSD.org COMMENT= Very useful utility for configuring and testing XInput devices -USE_IMAKE= yes +XORG_CAT= app +USE_XORG= inputproto x11 xi xext -MAN1= xinput.1 PLIST_FILES= bin/xinput +MAN1= xinput.1 + .include <bsd.port.mk> diff --git a/x11/xinput/distinfo b/x11/xinput/distinfo index f12b6f7e0d3e..b277b77da684 100644 --- a/x11/xinput/distinfo +++ b/x11/xinput/distinfo @@ -1,3 +1,3 @@ -MD5 (xinput-1.2.tar.gz) = 0ee7ad8dca7a3add2b63b1c96bc87399 -SHA256 (xinput-1.2.tar.gz) = 4529443553a50f8508b0c63555bd8405e49f7648f60fd41b16176ada2420b223 -SIZE (xinput-1.2.tar.gz) = 8354 +MD5 (xorg/app/xinput-1.4.0.tar.bz2) = ef43538bb3b445d2d69d5adbf76c149e +SHA256 (xorg/app/xinput-1.4.0.tar.bz2) = 503e73d10482496af57226454c09f44afe63ee5dd4240deb81f5ca27337cf119 +SIZE (xorg/app/xinput-1.4.0.tar.bz2) = 103854 diff --git a/x11/xkbcomp/Makefile b/x11/xkbcomp/Makefile index 14882d8276f5..58ce09c89e75 100644 --- a/x11/xkbcomp/Makefile +++ b/x11/xkbcomp/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xkbcomp -PORTVERSION= 1.0.3 +PORTVERSION= 1.0.5 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xkbcomp/distinfo b/x11/xkbcomp/distinfo index 89f85b369efc..db401baa9923 100644 --- a/x11/xkbcomp/distinfo +++ b/x11/xkbcomp/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/xkbcomp-1.0.3.tar.bz2) = 2fbcae1323c266edf5b6c61751f2e343 -SHA256 (xorg/app/xkbcomp-1.0.3.tar.bz2) = 0635bae5dae3c933ebba997475ae14fa213aee1f2ea8aaff2ca76c50f8aec716 -SIZE (xorg/app/xkbcomp-1.0.3.tar.bz2) = 189992 +MD5 (xorg/app/xkbcomp-1.0.5.tar.bz2) = 6cc96c3e4ed5d9802fe717beac008f19 +SHA256 (xorg/app/xkbcomp-1.0.5.tar.bz2) = 204403e0388e83127212109310037d17f56c3c3fd3c96d7dcaa0df99684f00c1 +SIZE (xorg/app/xkbcomp-1.0.5.tar.bz2) = 201382 diff --git a/x11/xkbutils/Makefile b/x11/xkbutils/Makefile index 47166b1708e6..c622f3f9e182 100644 --- a/x11/xkbutils/Makefile +++ b/x11/xkbutils/Makefile @@ -7,7 +7,7 @@ PORTNAME= xkbutils PORTVERSION= 1.0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xkeycaps/Makefile b/x11/xkeycaps/Makefile index baf49f86ba5f..a81ca4057327 100644 --- a/x11/xkeycaps/Makefile +++ b/x11/xkeycaps/Makefile @@ -7,7 +7,7 @@ PORTNAME= xkeycaps PORTVERSION= 2.46 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 MASTER_SITES= http://www.jwz.org/xkeycaps/ EXTRACT_SUFX= .tar.Z diff --git a/x11/xload/Makefile b/x11/xload/Makefile index 91539c322247..d84d61d5b2da 100644 --- a/x11/xload/Makefile +++ b/x11/xload/Makefile @@ -7,6 +7,7 @@ PORTNAME= xload PORTVERSION= 1.0.2 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile index 5862088b0449..dbe640e72615 100644 --- a/x11/xlockmore/Makefile +++ b/x11/xlockmore/Makefile @@ -7,6 +7,7 @@ PORTNAME= xlockmore PORTVERSION= 5.27 +PORTREVISION= 1 CATEGORIES?= x11 MASTER_SITES= ftp://ibiblio.org/pub/Linux/X11/screensavers/ \ CRITICAL diff --git a/x11/xlogo/Makefile b/x11/xlogo/Makefile index c599b449df1a..0704a6d8a089 100644 --- a/x11/xlogo/Makefile +++ b/x11/xlogo/Makefile @@ -7,6 +7,7 @@ PORTNAME= xlogo PORTVERSION= 1.0.1 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xlupe/Makefile b/x11/xlupe/Makefile index 23487937c628..b4ab13338a55 100644 --- a/x11/xlupe/Makefile +++ b/x11/xlupe/Makefile @@ -7,7 +7,7 @@ PORTNAME= xlupe PORTVERSION= 1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 accessibility MASTER_SITES= http://www.core.de/~coto/projects/xlupe/ diff --git a/x11/xmag/Makefile b/x11/xmag/Makefile index 64c47ea40b81..b6fa26726734 100644 --- a/x11/xmag/Makefile +++ b/x11/xmag/Makefile @@ -7,6 +7,7 @@ PORTNAME= xmag PORTVERSION= 1.0.2 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xman/Makefile b/x11/xman/Makefile index 069964b6bbb9..b44407a9b1d1 100644 --- a/x11/xman/Makefile +++ b/x11/xman/Makefile @@ -7,6 +7,7 @@ PORTNAME= xman PORTVERSION= 1.0.3 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xmangekyou/Makefile b/x11/xmangekyou/Makefile index 901d6dc4c7d9..fa56fe1d1414 100644 --- a/x11/xmangekyou/Makefile +++ b/x11/xmangekyou/Makefile @@ -7,7 +7,7 @@ PORTNAME= xmangekyou PORTVERSION= 2.0.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 MASTER_SITES= http://hp.vector.co.jp/authors/VA014157/myfreesoft/ \ ftp://ftp.vector.co.jp/pack/unix/art/anime/ diff --git a/x11/xmessage/Makefile b/x11/xmessage/Makefile index 61f40ff22dae..d31818d631e2 100644 --- a/x11/xmessage/Makefile +++ b/x11/xmessage/Makefile @@ -7,6 +7,7 @@ PORTNAME= xmessage PORTVERSION= 1.0.2 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xmh/Makefile b/x11/xmh/Makefile index 803fe7b177a0..ad97b1bff38d 100644 --- a/x11/xmh/Makefile +++ b/x11/xmh/Makefile @@ -7,6 +7,7 @@ PORTNAME= xmh PORTVERSION= 1.0.1 +PORTREVISION= 1 CATEGORIES= x11 mail MAINTAINER= x11@FreeBSD.org diff --git a/x11/xmore/Makefile b/x11/xmore/Makefile index 9bd0d42e3336..34199cc2900e 100644 --- a/x11/xmore/Makefile +++ b/x11/xmore/Makefile @@ -7,6 +7,7 @@ PORTNAME= xmore PORTVERSION= 1.0.1 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xorg-apps/Makefile b/x11/xorg-apps/Makefile index ec91aac278fe..1db73a3ec15f 100644 --- a/x11/xorg-apps/Makefile +++ b/x11/xorg-apps/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xorg-apps -PORTVERSION= 7.3 +PORTVERSION= 7.4 CATEGORIES= x11 MASTER_SITES= # none DISTFILES= # none @@ -15,100 +15,15 @@ EXTRACT_ONLY= # none MAINTAINER= x11@FreeBSD.org COMMENT= X.org apps meta-port -RUN_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ - mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ - mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale \ - appres:${PORTSDIR}/x11/appres \ - beforelight:${PORTSDIR}/x11/beforelight \ - bitmap:${PORTSDIR}/x11/bitmap \ - editres:${PORTSDIR}/x11/editres \ - fonttosfnt:${PORTSDIR}/x11-fonts/fonttosfnt \ - fslsfonts:${PORTSDIR}/x11-fonts/fslsfonts \ - fstobdf:${PORTSDIR}/x11/fstobdf \ - iceauth:${PORTSDIR}/x11/iceauth \ - ico:${PORTSDIR}/x11/ico \ - listres:${PORTSDIR}/x11/listres \ - luit:${PORTSDIR}/x11/luit \ - ${PREFIX}/sbin/mkcomposecache:${PORTSDIR}/x11/mkcomposecache \ - oclock:${PORTSDIR}/x11/oclock \ - showrgb:${PORTSDIR}/x11/rgb \ - rstart:${PORTSDIR}/x11/rstart \ - xon:${PORTSDIR}/x11/scripts \ - sessreg:${PORTSDIR}/x11/sessreg \ - setxkbmap:${PORTSDIR}/x11/setxkbmap \ - showfont:${PORTSDIR}/x11-fonts/showfont \ - smproxy:${PORTSDIR}/x11/smproxy \ - twm:${PORTSDIR}/x11-wm/twm \ - viewres:${PORTSDIR}/x11/viewres \ - x11perf:${PORTSDIR}/x11/x11perf \ - xauth:${PORTSDIR}/x11/xauth \ - xbacklight:${PORTSDIR}/x11/xbacklight \ - xbiff:${PORTSDIR}/x11/xbiff \ - xcalc:${PORTSDIR}/x11/xcalc \ - xclipboard:${PORTSDIR}/x11/xclipboard \ - xclock:${PORTSDIR}/x11/xclock \ - xcmsdb:${PORTSDIR}/x11/xcmsdb \ - xconsole:${PORTSDIR}/x11/xconsole \ - xcursorgen:${PORTSDIR}/x11/xcursorgen \ - xdbedizzy:${PORTSDIR}/x11/xdbedizzy \ - xditview:${PORTSDIR}/x11/xditview \ - xdm:${PORTSDIR}/x11/xdm \ - xdpyinfo:${PORTSDIR}/x11/xdpyinfo \ - xdriinfo:${PORTSDIR}/x11/xdriinfo \ - xedit:${PORTSDIR}/x11/xedit \ - xev:${PORTSDIR}/x11/xev \ - xeyes:${PORTSDIR}/x11/xeyes \ - dga:${PORTSDIR}/x11/xf86dga \ - xfd:${PORTSDIR}/x11/xfd \ - xfindproxy:${PORTSDIR}/x11/xfindproxy \ - xfontsel:${PORTSDIR}/x11-fonts/xfontsel \ - xfs:${PORTSDIR}/x11-fonts/xfs \ - xfsinfo:${PORTSDIR}/x11-fonts/xfsinfo \ - xfwp:${PORTSDIR}/x11/xfwp \ - xgamma:${PORTSDIR}/x11/xgamma \ - xgc:${PORTSDIR}/x11/xgc \ - xhost:${PORTSDIR}/x11/xhost \ - xinit:${PORTSDIR}/x11/xinit \ - xkbcomp:${PORTSDIR}/x11/xkbcomp \ - xkbevd:${PORTSDIR}/x11/xkbevd \ - xkbprint:${PORTSDIR}/x11/xkbprint \ - xkbvleds:${PORTSDIR}/x11/xkbutils \ - xkill:${PORTSDIR}/x11/xkill \ - xload:${PORTSDIR}/x11/xload \ - xlogo:${PORTSDIR}/x11/xlogo \ - xlsatoms:${PORTSDIR}/x11/xlsatoms \ - xlsclients:${PORTSDIR}/x11/xlsclients \ - xlsfonts:${PORTSDIR}/x11-fonts/xlsfonts \ - xmag:${PORTSDIR}/x11/xmag \ - xman:${PORTSDIR}/x11/xman \ - xmessage:${PORTSDIR}/x11/xmessage \ - xmodmap:${PORTSDIR}/x11/xmodmap \ - xmore:${PORTSDIR}/x11/xmore \ - xphelloworld:${PORTSDIR}/x11/xphelloworld \ - xplsprinters:${PORTSDIR}/x11/xplsprinters \ - xpr:${PORTSDIR}/x11/xpr \ - xprehashprinterlist:${PORTSDIR}/x11/xprehashprinterlist \ - xprop:${PORTSDIR}/x11/xprop \ - xrandr:${PORTSDIR}/x11/xrandr \ - xrdb:${PORTSDIR}/x11/xrdb \ - xrefresh:${PORTSDIR}/x11/xrefresh \ - xrx:${PORTSDIR}/x11/xrx \ - xset:${PORTSDIR}/x11/xset \ - xsetmode:${PORTSDIR}/x11/xsetmode \ - xsetpointer:${PORTSDIR}/x11/xsetpointer \ - xsetroot:${PORTSDIR}/x11/xsetroot \ - xstdcmap:${PORTSDIR}/x11/xstdcmap \ - xtrapchar:${PORTSDIR}/x11/xtrap \ - xvidtune:${PORTSDIR}/x11/xvidtune \ - xvinfo:${PORTSDIR}/x11/xvinfo \ - xwd:${PORTSDIR}/x11/xwd \ - xwininfo:${PORTSDIR}/x11/xwininfo \ - xwud:${PORTSDIR}/x11/xwud \ - xterm:${PORTSDIR}/x11/xterm - -.if exists(/usr/bin/rsh) -RUN_DEPENDS+= xsm:${PORTSDIR}/x11/xsm -.endif +COMPONENTS= appres bitmap xf86dga:dga iceauth luit \ + x11-fonts/mkfontdir:mkfontdir \ + x11-fonts/mkfontscale:mkfontscale sessreg \ + setxkbmap smproxy x11perf xauth xbacklight xcalc \ + xcmsdb xcursorgen xdpyinfo xdriinfo xev xgamma xgc \ + xhost xinput xkbcomp xkbevd xkbutils:xkbvleds xkill \ + xlsatoms xlsclients xmodmap xpr xprop xrandr xrdb \ + xrefresh xset xsetmode xsetroot xvinfo xwd xwininfo \ + xwud NO_BUILD= yes @@ -116,4 +31,26 @@ do-install: ${MKDIR} ${PREFIX}/libdata/xorg ${TOUCH} ${PREFIX}/libdata/xorg/apps -.include <bsd.port.mk> +.for comp in ${COMPONENTS} +OPTIONS+= ${comp:C/:.*//:C/.*\///:U} "Install ${comp:C/:.*//:C/.*\///} application" on +.endfor + +.include <bsd.port.pre.mk> + +.for comp in ${COMPONENTS} +. if !defined(WITHOUT_${comp:C/:.*//:C/.*\///:U}) +. if ${comp:M:}=="" +port=${comp} +check=${comp:C/.*\///} # doesn't work +. else +port=${comp:C/:.*//} +check=${comp:C/.*://} +. endif +. if ${port:M*/*}=="" +port:=x11/${port} +. endif +RUN_DEPENDS:= ${RUN_DEPENDS} ${check}:${PORTSDIR}/${port} +. endif +.endfor + +.include <bsd.port.post.mk> diff --git a/x11/xorg-cf-files/Makefile b/x11/xorg-cf-files/Makefile index cd59bc22f74e..27d30b73587a 100644 --- a/x11/xorg-cf-files/Makefile +++ b/x11/xorg-cf-files/Makefile @@ -7,7 +7,7 @@ PORTNAME= xorg-cf-files PORTVERSION= 1.0.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org @@ -15,4 +15,8 @@ COMMENT= X.org cf files for use with imake builds XORG_CAT= util +post-patch: + @${REINPLACE_CMD} 's|\(define ExtraXaw[^ ]*\) [$$].*|\1 /**/|' \ + ${WRKSRC}/X11.tmpl + .include <bsd.port.mk> diff --git a/x11/xorg-libraries/Makefile b/x11/xorg-libraries/Makefile index d791a81da42b..1bf7d561b2a4 100644 --- a/x11/xorg-libraries/Makefile +++ b/x11/xorg-libraries/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xorg-libraries -PORTVERSION= 7.3 -PORTREVISION= 2 +PORTVERSION= 7.4 CATEGORIES= x11 MASTER_SITES= # none DISTFILES= # none @@ -18,15 +17,16 @@ COMMENT= X.org libraries meta-port NO_BUILD= yes -RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/x11.pc:${PORTSDIR}/x11/libX11 \ - ${LOCALBASE}/libdata/pkgconfig/xfont.pc:${PORTSDIR}/x11-fonts/libXfont \ - ${LOCALBASE}/libdata/pkgconfig/xfontcache.pc:${PORTSDIR}/x11-fonts/libXfontcache \ +RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dmx.pc:${PORTSDIR}/x11/libdmx \ + ${LOCALBASE}/libdata/pkgconfig/fontenc.pc:${PORTSDIR}/x11-fonts/libfontenc \ ${LOCALBASE}/libdata/pkgconfig/ice.pc:${PORTSDIR}/x11/libICE \ + ${LOCALBASE}/libdata/pkgconfig/libfs.pc:${PORTSDIR}/x11-fonts/libFS \ + ${LOCALBASE}/libdata/pkgconfig/oldx.pc:${PORTSDIR}/x11/liboldX \ + ${LOCALBASE}/libdata/pkgconfig/pixman-1.pc:${PORTSDIR}/x11/pixman \ ${LOCALBASE}/libdata/pkgconfig/sm.pc:${PORTSDIR}/x11/libSM \ - ${LOCALBASE}/libdata/pkgconfig/xres.pc:${PORTSDIR}/x11/libXres \ - ${LOCALBASE}/libdata/pkgconfig/xtrap.pc:${PORTSDIR}/x11/libXTrap \ + ${LOCALBASE}/libdata/pkgconfig/x11.pc:${PORTSDIR}/x11/libX11 \ ${LOCALBASE}/libdata/pkgconfig/xau.pc:${PORTSDIR}/x11/libXau \ - ${LOCALBASE}/libdata/pkgconfig/xaw8.pc:${PORTSDIR}/x11-toolkits/libXaw \ + ${LOCALBASE}/libdata/pkgconfig/xaw7.pc:${PORTSDIR}/x11-toolkits/libXaw \ ${LOCALBASE}/libdata/pkgconfig/xcomposite.pc:${PORTSDIR}/x11/libXcomposite \ ${LOCALBASE}/libdata/pkgconfig/xcursor.pc:${PORTSDIR}/x11/libXcursor \ ${LOCALBASE}/libdata/pkgconfig/xdamage.pc:${PORTSDIR}/x11/libXdamage \ @@ -35,32 +35,28 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/x11.pc:${PORTSDIR}/x11/libX11 \ ${LOCALBASE}/libdata/pkgconfig/xext.pc:${PORTSDIR}/x11/libXext \ ${LOCALBASE}/libdata/pkgconfig/xfixes.pc:${PORTSDIR}/x11/libXfixes \ ${LOCALBASE}/libdata/pkgconfig/xfont.pc:${PORTSDIR}/x11-fonts/libXfont \ + ${LOCALBASE}/libdata/pkgconfig/xfont.pc:${PORTSDIR}/x11-fonts/libXfont \ + ${LOCALBASE}/libdata/pkgconfig/xfontcache.pc:${PORTSDIR}/x11-fonts/libXfontcache \ + ${LOCALBASE}/libdata/pkgconfig/xft.pc:${PORTSDIR}/x11-fonts/libXft \ ${LOCALBASE}/libdata/pkgconfig/xi.pc:${PORTSDIR}/x11/libXi \ ${LOCALBASE}/libdata/pkgconfig/xinerama.pc:${PORTSDIR}/x11/libXinerama \ + ${LOCALBASE}/libdata/pkgconfig/xkbfile.pc:${PORTSDIR}/x11/libxkbfile \ + ${LOCALBASE}/libdata/pkgconfig/xkbui.pc:${PORTSDIR}/x11/libxkbui \ ${LOCALBASE}/libdata/pkgconfig/xmu.pc:${PORTSDIR}/x11-toolkits/libXmu \ - ${LOCALBASE}/libdata/pkgconfig/xp.pc:${PORTSDIR}/x11/libXp \ ${LOCALBASE}/libdata/pkgconfig/xpm.pc:${PORTSDIR}/x11/libXpm \ ${LOCALBASE}/libdata/pkgconfig/xrandr.pc:${PORTSDIR}/x11/libXrandr \ ${LOCALBASE}/libdata/pkgconfig/xrender.pc:${PORTSDIR}/x11/libXrender \ + ${LOCALBASE}/libdata/pkgconfig/xres.pc:${PORTSDIR}/x11/libXres \ ${LOCALBASE}/libdata/pkgconfig/xscrnsaver.pc:${PORTSDIR}/x11/libXScrnSaver \ ${LOCALBASE}/libdata/pkgconfig/xt.pc:${PORTSDIR}/x11-toolkits/libXt \ + ${LOCALBASE}/libdata/pkgconfig/xtrans.pc:${PORTSDIR}/x11/xtrans \ + ${LOCALBASE}/libdata/pkgconfig/xtrap.pc:${PORTSDIR}/x11/libXTrap \ ${LOCALBASE}/libdata/pkgconfig/xtst.pc:${PORTSDIR}/x11/libXtst \ ${LOCALBASE}/libdata/pkgconfig/xv.pc:${PORTSDIR}/x11/libXv \ ${LOCALBASE}/libdata/pkgconfig/xvmc.pc:${PORTSDIR}/x11/libXvMC \ ${LOCALBASE}/libdata/pkgconfig/xxf86dga.pc:${PORTSDIR}/x11/libXxf86dga \ ${LOCALBASE}/libdata/pkgconfig/xxf86misc.pc:${PORTSDIR}/x11/libXxf86misc \ - ${LOCALBASE}/libdata/pkgconfig/xxf86vm.pc:${PORTSDIR}/x11/libXxf86vm \ - ${LOCALBASE}/libdata/pkgconfig/xkbfile.pc:${PORTSDIR}/x11/libxkbfile \ - ${LOCALBASE}/libdata/pkgconfig/xkbui.pc:${PORTSDIR}/x11/libxkbui \ - ${LOCALBASE}/libdata/pkgconfig/xft.pc:${PORTSDIR}/x11-fonts/libXft \ - ${LOCALBASE}/libdata/pkgconfig/xprintutil.pc:${PORTSDIR}/x11/libXprintUtil \ - ${LOCALBASE}/libdata/pkgconfig/xprintapputil.pc:${PORTSDIR}/x11/libXprintAppUtil \ - ${LOCALBASE}/libdata/pkgconfig/fontenc.pc:${PORTSDIR}/x11-fonts/libfontenc \ - ${LOCALBASE}/libdata/pkgconfig/dmx.pc:${PORTSDIR}/x11/libdmx \ - ${LOCALBASE}/libdata/pkgconfig/xtrans.pc:${PORTSDIR}/x11/xtrans \ - ${LOCALBASE}/libdata/pkgconfig/libfs.pc:${PORTSDIR}/x11-fonts/libFS \ - ${LOCALBASE}/libdata/pkgconfig/oldx.pc:${PORTSDIR}/x11/liboldX \ - ${LOCALBASE}/libdata/pkgconfig/pixman-1.pc:${PORTSDIR}/x11/pixman + ${LOCALBASE}/libdata/pkgconfig/xxf86vm.pc:${PORTSDIR}/x11/libXxf86vm .if !defined(XORG_UPGRADE) && !defined(PACKAGE_BUILDING) && exists(/usr/X11R6) pre-everything:: diff --git a/x11/xorg-minimal/Makefile b/x11/xorg-minimal/Makefile index 51dbb257c19b..36e45bdc5df9 100644 --- a/x11/xorg-minimal/Makefile +++ b/x11/xorg-minimal/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xorg -PORTVERSION= 7.3 +PORTVERSION= 7.4 CATEGORIES= x11 x11-servers MASTER_SITES= # none PKGNAMESUFFIX= -minimal diff --git a/x11/xorg-protos/Makefile b/x11/xorg-protos/Makefile deleted file mode 100644 index 9cd01dcae685..000000000000 --- a/x11/xorg-protos/Makefile +++ /dev/null @@ -1,56 +0,0 @@ -# New ports collection makefile for: xorg-protos -# Date created: Sep 29 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= xorg-protos -PORTVERSION= 7.3 -PORTREVISION= 2 -CATEGORIES= x11 -MASTER_SITES= # none -DISTFILES= # none -EXTRACT_ONLY= # none - -MAINTAINER= x11@FreeBSD.org -COMMENT= X.org protos meta-port - -BUILD_DEPENDS= ${PREFIX}/include/X11/extensions/bigreqstr.h:${PORTSDIR}/x11/bigreqsproto \ - ${PREFIX}/include/X11/extensions/composite.h:${PORTSDIR}/x11/compositeproto \ - ${PREFIX}/include/X11/extensions/damageproto.h:${PORTSDIR}/x11/damageproto \ - ${PREFIX}/include/X11/extensions/dmxproto.h:${PORTSDIR}/x11/dmxproto \ - ${PREFIX}/include/X11/extensions/xfixesproto.h:${PORTSDIR}/x11/fixesproto \ - ${PREFIX}/include/X11/extensions/fontcache.h:${PORTSDIR}/x11-fonts/fontcacheproto \ - ${PREFIX}/include/X11/fonts/FS.h:${PORTSDIR}/x11-fonts/fontsproto \ - ${PREFIX}/include/GL/glxproto.h:${PORTSDIR}/x11/glproto \ - ${PREFIX}/include/X11/extensions/XIproto.h:${PORTSDIR}/x11/inputproto \ - ${PREFIX}/include/X11/extensions/XKB.h:${PORTSDIR}/x11/kbproto \ - ${PREFIX}/include/X11/extensions/Print.h:${PORTSDIR}/x11/printproto \ - ${PREFIX}/include/X11/extensions/randr.h:${PORTSDIR}/x11/randrproto \ - ${PREFIX}/include/X11/extensions/recordstr.h:${PORTSDIR}/x11/recordproto \ - ${PREFIX}/include/X11/extensions/render.h:${PORTSDIR}/x11/renderproto \ - ${PREFIX}/include/X11/extensions/XResproto.h:${PORTSDIR}/x11/resourceproto \ - ${PREFIX}/include/X11/extensions/saver.h:${PORTSDIR}/x11/scrnsaverproto \ - ${PREFIX}/include/X11/extensions/xtrapproto.h:${PORTSDIR}/x11/trapproto \ - ${PREFIX}/include/X11/extensions/Xv.h:${PORTSDIR}/x11/videoproto \ - ${PREFIX}/include/X11/extensions/xcmiscstr.h:${PORTSDIR}/x11/xcmiscproto \ - ${PREFIX}/include/X11/extensions/MITMisc.h:${PORTSDIR}/x11/xextproto \ - ${PREFIX}/include/X11/extensions/xf86bigfont.h:${PORTSDIR}/x11-fonts/xf86bigfontproto \ - ${PREFIX}/include/X11/extensions/xf86dga.h:${PORTSDIR}/x11/xf86dgaproto \ - ${PREFIX}/include/GL/internal/dri_interface.h:${PORTSDIR}/x11/xf86driproto \ - ${PREFIX}/include/X11/extensions/xf86misc.h:${PORTSDIR}/x11/xf86miscproto \ - ${PREFIX}/include/X11/extensions/xf86rush.h:${PORTSDIR}/x11/xf86rushproto \ - ${PREFIX}/include/X11/extensions/xf86vmode.h:${PORTSDIR}/x11/xf86vidmodeproto \ - ${PREFIX}/include/X11/extensions/panoramiXproto.h:${PORTSDIR}/x11/xineramaproto \ - ${PREFIX}/include/X11/DECkeysym.h:${PORTSDIR}/x11/xproto \ - ${PREFIX}/include/X11/PM/PM.h:${PORTSDIR}/x11/xproxymanagementprotocol -RUN_DEPENDS= ${BUILD_DEPENDS} - -NO_BUILD= yes - -do-install: - ${MKDIR} ${PREFIX}/libdata/xorg - ${TOUCH} ${PREFIX}/libdata/xorg/protos - -.include <bsd.port.mk> diff --git a/x11/xorg-protos/pkg-descr b/x11/xorg-protos/pkg-descr deleted file mode 100644 index 4c499da5f573..000000000000 --- a/x11/xorg-protos/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -This meta-package installs all X.Org protocol headers. - -WWW: http://www.x.org/ - -- Florent Thoumie -flz@FreeBSD.org diff --git a/x11/xorg-protos/pkg-plist b/x11/xorg-protos/pkg-plist deleted file mode 100644 index 9bd1d3f01034..000000000000 --- a/x11/xorg-protos/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -libdata/xorg/protos -@dirrmtry libdata/xorg diff --git a/x11/xorg/Makefile b/x11/xorg/Makefile index e074397e7cc3..db63a0e488d1 100644 --- a/x11/xorg/Makefile +++ b/x11/xorg/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xorg -PORTVERSION= 7.3 -PORTREVISION= 2 +PORTVERSION= 7.4 CATEGORIES= x11 MASTER_SITES= # none DISTFILES= # none @@ -29,12 +28,11 @@ RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xbitmaps.pc:${PORTSDIR}/x11/xbitmap RUN_DEPENDS+= ${LOCALBASE}/share/X11/doc/hardcopy/BDF/bdf.PS.gz:${PORTSDIR}/x11/xorg-docs .endif -# app, lib, font, driver, proto +# app, lib, font, driver RUN_DEPENDS+= ${LOCALBASE}/libdata/xorg/apps:${PORTSDIR}/x11/xorg-apps \ ${LOCALBASE}/libdata/xorg/libraries:${PORTSDIR}/x11/xorg-libraries \ ${LOCALBASE}/libdata/xorg/fonts:${PORTSDIR}/x11-fonts/xorg-fonts \ - ${LOCALBASE}/libdata/xorg/drivers:${PORTSDIR}/x11-drivers/xorg-drivers \ - ${LOCALBASE}/libdata/xorg/protos:${PORTSDIR}/x11/xorg-protos + ${LOCALBASE}/libdata/xorg/drivers:${PORTSDIR}/x11-drivers/xorg-drivers .if defined(XORG_COMPLETE) RUN_DEPENDS+= Xnest:${PORTSDIR}/x11-servers/xorg-nestserver \ diff --git a/x11/xphelloworld/Makefile b/x11/xphelloworld/Makefile deleted file mode 100644 index f3ca2bfb588f..000000000000 --- a/x11/xphelloworld/Makefile +++ /dev/null @@ -1,37 +0,0 @@ -# New ports collection makefile for: xphelloworld -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= xphelloworld -PORTVERSION= 1.0.1 -PORTREVISION= 1 -CATEGORIES= x11 - -MAINTAINER= x11@FreeBSD.org -COMMENT= Sends a test page to an Xprint printer - -XORG_CAT= app -USE_XORG= x11 xaw8 xprintutil xp xprintapputil xt - -PLIST_FILES= bin/xphelloworld \ - bin/xpsimplehelloworld \ - bin/xpxthelloworld - -MAN1= xphelloworld.1 \ - xpsimplehelloworld.1 \ - xpxthelloworld.1 - -post-build: - ${REINPLACE_CMD} \ - -e "s/__appmansuffix__/1/g" \ - -e "s/__miscmansuffix__/7/g" \ - -e "s/__libmansuffix__/3Xp/g" \ - ${WRKSRC}/xphelloworld/xphelloworld.man \ - ${WRKSRC}/xpsimplehelloworld/xpsimplehelloworld.man \ - ${WRKSRC}/xpxmhelloworld/xpxmhelloworld.man \ - ${WRKSRC}/xpxthelloworld/xpxthelloworld.man - -.include <bsd.port.mk> diff --git a/x11/xphelloworld/distinfo b/x11/xphelloworld/distinfo deleted file mode 100644 index 86bca85f8672..000000000000 --- a/x11/xphelloworld/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (xorg/app/xphelloworld-1.0.1.tar.bz2) = 5c7fd1e35dd63089229e357c46e4f407 -SHA256 (xorg/app/xphelloworld-1.0.1.tar.bz2) = b1ca08e3ba4e5b135ee9d8675e717a6f88eafa53b031b2b821d2760897e35426 -SIZE (xorg/app/xphelloworld-1.0.1.tar.bz2) = 73111 diff --git a/x11/xphelloworld/pkg-descr b/x11/xphelloworld/pkg-descr deleted file mode 100644 index 4a69cd4b1984..000000000000 --- a/x11/xphelloworld/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -This package contains xphelloworld, an utility that sends a test page to -an Xprint printer. - -- Joel Dahl -joel@FreeBSD.org diff --git a/x11/xprop/Makefile b/x11/xprop/Makefile index 65912f744dba..ce521badd5c9 100644 --- a/x11/xprop/Makefile +++ b/x11/xprop/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xprop -PORTVERSION= 1.0.3 +PORTVERSION= 1.0.4 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xprop/distinfo b/x11/xprop/distinfo index d134e1589102..4db994cbd5ee 100644 --- a/x11/xprop/distinfo +++ b/x11/xprop/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/xprop-1.0.3.tar.bz2) = e7b16eeb4bab974e3592d62f415aa6a5 -SHA256 (xorg/app/xprop-1.0.3.tar.bz2) = ddda23b888a3b4cf96a508af7ae07e3b2f1e9f2f2f0d5f6b2684cfa162337fa6 -SIZE (xorg/app/xprop-1.0.3.tar.bz2) = 106686 +MD5 (xorg/app/xprop-1.0.4.tar.bz2) = 48aa8fd78802f477dcbf9ef0dfd9f783 +SHA256 (xorg/app/xprop-1.0.4.tar.bz2) = daa47cba7d5a919ca1bd053d8a8b6af4904f77eded4bdb055cd915aa5f5cd772 +SIZE (xorg/app/xprop-1.0.4.tar.bz2) = 109102 diff --git a/x11/xproto/Makefile b/x11/xproto/Makefile index a6ede19eda32..73ef13ca02a3 100644 --- a/x11/xproto/Makefile +++ b/x11/xproto/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xproto -PORTVERSION= 7.0.10 -PORTREVISION= 1 +PORTVERSION= 7.0.14 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xproto/distinfo b/x11/xproto/distinfo index 02bf99a09908..ab4b41ef66c4 100644 --- a/x11/xproto/distinfo +++ b/x11/xproto/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/proto/xproto-7.0.10.tar.bz2) = 2ed80e90992e7455eaac4c3e977ebd01 -SHA256 (xorg/proto/xproto-7.0.10.tar.bz2) = 6d659920262d41e48714184f94ff9cd2608515e0f3d2f074892fe0c048784df4 -SIZE (xorg/proto/xproto-7.0.10.tar.bz2) = 142954 +MD5 (xorg/proto/xproto-7.0.14.tar.bz2) = 5bbf47f4ad6eb3b3f3a119231abe8e5e +SHA256 (xorg/proto/xproto-7.0.14.tar.bz2) = 24274af4e800fd32702c5258dabe16eccf96f50a4b4feb4a14780c85f3e786df +SIZE (xorg/proto/xproto-7.0.14.tar.bz2) = 152503 diff --git a/x11/xpyb/Makefile b/x11/xpyb/Makefile index 2994a17bb82b..7f8c5cfc6106 100644 --- a/x11/xpyb/Makefile +++ b/x11/xpyb/Makefile @@ -6,7 +6,8 @@ # PORTNAME= xpyb -PORTVERSION= 1.0 +PORTVERSION= 1.0 +PORTREVISION= 1 CATEGORIES= x11 python MASTER_SITES= http://xcb.freedesktop.org/%SUBDIR%/ MASTER_SITE_SUBDIR= dist @@ -16,7 +17,7 @@ MAINTAINER= wahjava@gmail.com COMMENT= Python bindings to access X Window System protocol via libxcb BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xcb-proto.pc:${PORTSDIR}/x11/xcb-proto -LIB_DEPENDS= xcb.1:${PORTSDIR}/x11/libxcb +LIB_DEPENDS= xcb.2:${PORTSDIR}/x11/libxcb USE_BZIP2= yes USE_PYTHON= 2.5+ diff --git a/x11/xrandr/Makefile b/x11/xrandr/Makefile index c289a5bf1de6..d66f68ee095a 100644 --- a/x11/xrandr/Makefile +++ b/x11/xrandr/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xrandr -PORTVERSION= 1.2.2 +PORTVERSION= 1.2.3 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xrandr/distinfo b/x11/xrandr/distinfo index bf733e1702dd..2c2fd69b7dea 100644 --- a/x11/xrandr/distinfo +++ b/x11/xrandr/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/xrandr-1.2.2.tar.bz2) = c6ec9dc42396e3b3a2da932f3feca6ec -SHA256 (xorg/app/xrandr-1.2.2.tar.bz2) = 632f3ff492a07f8279807ffbafe4f89af069bb0e7b4934b3ddf7379509aa9303 -SIZE (xorg/app/xrandr-1.2.2.tar.bz2) = 96462 +MD5 (xorg/app/xrandr-1.2.3.tar.bz2) = 41a9d0cc073fa6165a31fbf9e85f68a6 +SHA256 (xorg/app/xrandr-1.2.3.tar.bz2) = ab06b77f3a2b8866279e096f9d2702ac644681424eb0aec39e4eb7199f152207 +SIZE (xorg/app/xrandr-1.2.3.tar.bz2) = 111121 diff --git a/x11/xrdb/Makefile b/x11/xrdb/Makefile index e0d38abe4dbf..bbd25bc386fd 100644 --- a/x11/xrdb/Makefile +++ b/x11/xrdb/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xrdb -PORTVERSION= 1.0.4 +PORTVERSION= 1.0.5 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xrdb/distinfo b/x11/xrdb/distinfo index edc775def489..a0467d148b27 100644 --- a/x11/xrdb/distinfo +++ b/x11/xrdb/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/xrdb-1.0.4.tar.bz2) = 34eb2311a0c5279e7b4f492e826f63d1 -SHA256 (xorg/app/xrdb-1.0.4.tar.bz2) = 3f8cde77e8cbeb6d0a5f232b7a2ee51dd49b677916d52ab0986d320a5f9e8000 -SIZE (xorg/app/xrdb-1.0.4.tar.bz2) = 100792 +MD5 (xorg/app/xrdb-1.0.5.tar.bz2) = 9c30b8e1709d5367beb7706146640c07 +SHA256 (xorg/app/xrdb-1.0.5.tar.bz2) = c24d08939250f10238fd1b984707bfa0901ba9c55fa36b67d91eb12b500500aa +SIZE (xorg/app/xrdb-1.0.5.tar.bz2) = 101484 diff --git a/x11/xrx/Makefile b/x11/xrx/Makefile index e6116c9af12c..b64bb6925d3c 100644 --- a/x11/xrx/Makefile +++ b/x11/xrx/Makefile @@ -7,7 +7,7 @@ PORTNAME= xrx PORTVERSION= 1.0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xsel/Makefile b/x11/xsel/Makefile index 40675f576b24..428c3eb45c61 100644 --- a/x11/xsel/Makefile +++ b/x11/xsel/Makefile @@ -7,7 +7,7 @@ PORTNAME= xsel PORTVERSION= 0.04.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11 MASTER_SITES= CENKES #http://www.niksula.cs.hut.fi/~vherva/xsel/xsel.{c,man} diff --git a/x11/xset/Makefile b/x11/xset/Makefile index e6f03e2782fd..b0f144e6ac24 100644 --- a/x11/xset/Makefile +++ b/x11/xset/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xset -PORTVERSION= 1.0.3 +PORTVERSION= 1.0.4 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xset/distinfo b/x11/xset/distinfo index accb4a2412eb..0202548cfcb1 100644 --- a/x11/xset/distinfo +++ b/x11/xset/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/xset-1.0.3.tar.bz2) = 657bbb43ce5470c33665d187c1740566 -SHA256 (xorg/app/xset-1.0.3.tar.bz2) = 0e3fd7d9902442df13c954316a194251e9b9acc197ae939d8b2fae66b8864d11 -SIZE (xorg/app/xset-1.0.3.tar.bz2) = 102742 +MD5 (xorg/app/xset-1.0.4.tar.bz2) = 2f41fd983ba4d89419204854936025e2 +SHA256 (xorg/app/xset-1.0.4.tar.bz2) = 6c3e74bb36beab92b918f0db12198d2526675276c724558a1de71d7789d0bdad +SIZE (xorg/app/xset-1.0.4.tar.bz2) = 103613 diff --git a/x11/xsm/Makefile b/x11/xsm/Makefile index ef4ac255f415..90b2328abd5c 100644 --- a/x11/xsm/Makefile +++ b/x11/xsm/Makefile @@ -7,6 +7,7 @@ PORTNAME= xsm PORTVERSION= 1.0.1 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xstarroll/Makefile b/x11/xstarroll/Makefile index a90a8d1ccf82..1a9134c6f178 100644 --- a/x11/xstarroll/Makefile +++ b/x11/xstarroll/Makefile @@ -7,7 +7,7 @@ PORTNAME= xstarroll PORTVERSION= 1.1b -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= x11 MASTER_SITES= http://www.saturn.dti.ne.jp/~hsakai/myfreesoft/ diff --git a/x11/xstroke/Makefile b/x11/xstroke/Makefile index 24b937cc61c5..16b1d3f62c07 100644 --- a/x11/xstroke/Makefile +++ b/x11/xstroke/Makefile @@ -7,7 +7,7 @@ PORTNAME= xstroke PORTVERSION= 0.5.12 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= x11 MASTER_SITES= ftp://ftp.handhelds.org/projects/xstroke/release-0.5/ \ http://www.handhelds.org/download/projects/xstroke/release-0.5/ @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Fullscreen gesture recognition USE_BISON= build -USE_XORG= xft x11 +USE_XORG= xft x11 xext xi USE_IMAKE= yes CFLAGS+= ${PTHREAD_CFLAGS} CPPFLAGS= -I${LOCALBASE}/include -I. diff --git a/x11/xterm/Makefile b/x11/xterm/Makefile index 9e46715b6b15..d69fe5773780 100644 --- a/x11/xterm/Makefile +++ b/x11/xterm/Makefile @@ -7,6 +7,7 @@ PORTNAME= xterm PORTVERSION= 238 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= ftp://invisible-island.net/xterm/ \ http://voodoo.bawue.com/download/ diff --git a/x11/xtrans/Makefile b/x11/xtrans/Makefile index d351b70d8340..598e49e6ffe4 100644 --- a/x11/xtrans/Makefile +++ b/x11/xtrans/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xtrans -PORTVERSION= 1.0.4 +PORTVERSION= 1.2.3 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xtrans/distinfo b/x11/xtrans/distinfo index bc5bfd6f7588..4a936d325253 100644 --- a/x11/xtrans/distinfo +++ b/x11/xtrans/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/lib/xtrans-1.0.4.tar.bz2) = 8b36cdf08df12be96615e3d550236626 -SHA256 (xorg/lib/xtrans-1.0.4.tar.bz2) = 765219fa822edeffb0650e93458e4ebf63c23176e58fce06806fb251fbfe7d8c -SIZE (xorg/lib/xtrans-1.0.4.tar.bz2) = 103761 +MD5 (xorg/lib/xtrans-1.2.3.tar.bz2) = f9cf791dfad59cf044e276aab3a71e1d +SHA256 (xorg/lib/xtrans-1.2.3.tar.bz2) = a67a8b09d9530021e2bd4b93136f385e72a8d8e4f2c26a99aeb169bee88facf0 +SIZE (xorg/lib/xtrans-1.2.3.tar.bz2) = 104280 diff --git a/x11/xtrans/pkg-plist b/x11/xtrans/pkg-plist index 55608d359f26..e0184a46f275 100644 --- a/x11/xtrans/pkg-plist +++ b/x11/xtrans/pkg-plist @@ -1,9 +1,7 @@ include/X11/Xtrans/Xtrans.c include/X11/Xtrans/Xtrans.h -include/X11/Xtrans/Xtransdnet.c include/X11/Xtrans/Xtransint.h include/X11/Xtrans/Xtranslcl.c -include/X11/Xtrans/Xtransos2.c include/X11/Xtrans/Xtranssock.c include/X11/Xtrans/Xtranstli.c include/X11/Xtrans/Xtransutil.c diff --git a/x11/xvidtune/Makefile b/x11/xvidtune/Makefile index 6dee29c6e96f..776e444287eb 100644 --- a/x11/xvidtune/Makefile +++ b/x11/xvidtune/Makefile @@ -7,6 +7,7 @@ PORTNAME= xvidtune PORTVERSION= 1.0.1 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xwd/Makefile b/x11/xwd/Makefile index f210903a732b..b909d9460c29 100644 --- a/x11/xwd/Makefile +++ b/x11/xwd/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xwd -PORTVERSION= 1.0.1 +PORTVERSION= 1.0.2 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xwd/distinfo b/x11/xwd/distinfo index 450cba2ddf56..0ba03d387318 100644 --- a/x11/xwd/distinfo +++ b/x11/xwd/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/xwd-1.0.1.tar.bz2) = 911addfb7fa402217ddac63e5c1d97c7 -SHA256 (xorg/app/xwd-1.0.1.tar.bz2) = c8bd9bcd64df439c2cd09eaa3e83a1297fbfed5c7d3dd8117342b3a25eeae131 -SIZE (xorg/app/xwd-1.0.1.tar.bz2) = 97079 +MD5 (xorg/app/xwd-1.0.2.tar.bz2) = 0a6ef08a2ac08ad5c4dd1522eb3788a3 +SHA256 (xorg/app/xwd-1.0.2.tar.bz2) = ab8974e010c1957a9a65a54656215463dea324adcaa9954147ecdcc6e9307f61 +SIZE (xorg/app/xwd-1.0.2.tar.bz2) = 111673 diff --git a/x11/xwininfo/Makefile b/x11/xwininfo/Makefile index 9c2760db07d0..0ac45befdcd4 100644 --- a/x11/xwininfo/Makefile +++ b/x11/xwininfo/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xwininfo -PORTVERSION= 1.0.3 +PORTVERSION= 1.0.4 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xwininfo/distinfo b/x11/xwininfo/distinfo index e419fc49aec8..ddf5cfda9e93 100644 --- a/x11/xwininfo/distinfo +++ b/x11/xwininfo/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/xwininfo-1.0.3.tar.bz2) = 721f84332c98c33152460bb22ba9ded6 -SHA256 (xorg/app/xwininfo-1.0.3.tar.bz2) = fbe3a1aafbc6fa113e58971ff2a82605a7e106af8b810eea4b7512de58a5478a -SIZE (xorg/app/xwininfo-1.0.3.tar.bz2) = 98632 +MD5 (xorg/app/xwininfo-1.0.4.tar.bz2) = e2a9bf5ab7f2a0866700a3b49dd8c6bf +SHA256 (xorg/app/xwininfo-1.0.4.tar.bz2) = df9a52788632cd3338e7bd7107ac732b11b8e2c367d4600578cd77e350428ee4 +SIZE (xorg/app/xwininfo-1.0.4.tar.bz2) = 101541 |