Index: head/x11/XFree86-4-clients/Makefile =================================================================== --- head/x11/XFree86-4-clients/Makefile (revision 86851) +++ head/x11/XFree86-4-clients/Makefile (revision 86852) @@ -1,58 +1,58 @@ # New ports collection makefile for: XFree86-clients # Date created: 10 Oct 1999 # Whom: taguchi@tohoku.iij.ad.jp # # $FreeBSD$ # PORTNAME= clients PORTVERSION= 4.3.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= 4.3.0 PKGNAMEPREFIX= XFree86- DISTFILES= X430src-1.tgz \ X430src-2.tgz \ X430src-3.tgz \ X430src-4.tgz MAINTAINER= anholt@freebsd.org COMMENT= XFree86-4 client programs and related files LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ Xcursor.1:${PORTSDIR}/x11/XFree86-4-libraries \ png.5:${PORTSDIR}/graphics/png \ Xft.2:${PORTSDIR}/x11-fonts/Xft SCRIPTS_ENV= InstallXdmConfig=${InstallXdmConfig} \ InstallXinitConfig=${InstallXinitConfig} \ InstallAppDefFiles=${InstallAppDefFiles} MAKE_ENV= PKGNAMEPREFIX=${PKGNAMEPREFIX} \ PORTNAME=${PORTNAME} \ PORTVERSION=${PORTVERSION} XBUILD_DIRS= lib/xtrans lib/lbxutil programs fonts/util XINSTALL_DIRS= programs fonts/util XINSTALL_MAN_DIRS= programs # --- # XFree86 User Config: # Name Default Meaning # ---------------------------------------------------------------------------- # HasSecureRPC YES build with SecureRPC (require FreeBSD-3 or later) # HasPam YES support PAM (require FreeBSD-3.1 or later) # InstallXdmConfig YES install config files for xdm. # InstallXinitConfig YES install config files for xinit. # InstallAppDefFiles YES install resource files. # ---------------------------------------------------------------------------- # DEFAULT means ports will use values which set by ${PORTSDIR}/devel/imake-4 # InstallXdmConfig?= DEFAULT InstallXinitConfig?= DEFAULT InstallAppDefFiles?= DEFAULT .include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc" .include .include "${FILESDIR}/manpages" .include Property changes on: head/x11/XFree86-4-clients/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.113 \ No newline at end of property +1.114 \ No newline at end of property Index: head/x11/XFree86-4-libraries/files/patch-access.c =================================================================== --- head/x11/XFree86-4-libraries/files/patch-access.c (nonexistent) +++ head/x11/XFree86-4-libraries/files/patch-access.c (revision 86852) @@ -0,0 +1,16 @@ +Index: programs/Xserver/os/access.c +=================================================================== +RCS file: /home/ncvs/xfree/xc/programs/Xserver/os/access.c,v +retrieving revision 3.43 +retrieving revision 3.44 +diff -u -u -r3.43 -r3.44 +--- programs/Xserver/os/access.c 20 Apr 2003 18:35:12 -0000 3.43 ++++ programs/Xserver/os/access.c 25 May 2003 10:38:47 -0000 3.44 +@@ -745,6 +745,7 @@ + if (ifr->ifa_addr.sa_family == AF_DECnet) + continue; + #endif /* DNETCONN */ ++ len = sizeof(*(ifr->ifa_addr)); + family = ConvertAddr(ifr->ifa_addr, &len, (pointer *)&addr); + if (family == -1 || family == FamilyLocal) + continue; Property changes on: head/x11/XFree86-4-libraries/files/patch-access.c ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/x11-servers/XFree86-4-NestServer/Makefile =================================================================== --- head/x11-servers/XFree86-4-NestServer/Makefile (revision 86851) +++ head/x11-servers/XFree86-4-NestServer/Makefile (revision 86852) @@ -1,39 +1,39 @@ # New ports collection makefile for: XFree86-NestServer # Date created: 10 Oct 1999 # Whom: taguchi@tohoku.iij.ad.jp # # $FreeBSD$ # PORTNAME= NestServer PORTVERSION= 4.3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-servers MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \ ${MASTER_SITE_LOCAL:S/$/:local/} MASTER_SITE_SUBDIR= ${PORTVERSION}/:x \ anholt/:local PKGNAMEPREFIX= XFree86- DISTFILES= X430src-1.tgz:x \ X430src-2.tgz:x \ X430src-3.tgz:x \ Wraphelp2.gz:local EXTRACT_ONLY= X430src-1.tgz \ X430src-2.tgz \ X430src-3.tgz MAINTAINER= anholt@freebsd.org COMMENT= XFree86-4 nested X server MAN1= Xnest.1 Xserver.1 XBUILD_DIRS= lib/font lib/lbxutil lib/Xdmcp lib/Xau programs/Xserver XINCLUDE_DIRS= lib/xkbfile lib/xtrans XINSTALL_DIRS= programs/Xserver XINSTALL_MAN_DIRS= ${XINSTALL_DIRS} post-extract: ${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp2.gz > \ ${WRKSRC}/lib/Xdmcp/Wraphelp.c .include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc" .include Property changes on: head/x11-servers/XFree86-4-NestServer/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.22 \ No newline at end of property +1.23 \ No newline at end of property Index: head/x11-servers/XFree86-4-Server/Makefile =================================================================== --- head/x11-servers/XFree86-4-Server/Makefile (revision 86851) +++ head/x11-servers/XFree86-4-Server/Makefile (revision 86852) @@ -1,170 +1,170 @@ # New ports collection makefile for: XFree86-Server # Date created: 10 Oct 1999 # Whom: taguchi@tohoku.iij.ad.jp # # $FreeBSD$ # PORTNAME= Server PORTVERSION= 4.3.0 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= x11-servers MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \ ${MASTER_SITE_LOCAL:S/$/:local/} MASTER_SITE_SUBDIR= ${PORTVERSION}/:x \ anholt/:local PKGNAMEPREFIX= XFree86- DISTFILES= X430src-1.tgz:x \ X430src-2.tgz:x \ X430src-3.tgz:x \ Wraphelp2.gz:local EXTRACT_ONLY= X430src-1.tgz \ X430src-2.tgz \ X430src-3.tgz MAINTAINER= anholt@freebsd.org COMMENT= XFree86-4 X server and related programs .for pf in patch-savage-pci-id patch-alpha_video.c patch-Pci.h patch-radeondri \ patch-r128_driver.c patch-mga_driver.c patch-xkbInit.c patch-radeon_dri.c \ patch-mga_dri.c patch-nv_driver.c patch-nv_setup.c patch-int10-generic.c \ patch-radeon_cursor.c patch-radeon_reg.h patch-smi \ patch-libc_wrapper.c patch-xf86-common-Imakefile patch-loader-Imakefile \ patch-loader-elfloader.c patch-bsd-Imakefile patch-bsd-bsdResource.c \ patch-bus-Imakefile patch-r200_vtxtmp_x86.S patch-radeon_vtxtmp_x86.S \ patch-compiler.h patch-os-support_Imakefile patch-bsd_Imakefile \ patch-freebsdPci.c patch-bus_Imakefile patch-xf86Sbus.h patch-loader.c \ patch-Sbus.c patch-elfloader.c patch-xfree86.cf patch-FreeBSD.cf \ - patch-sunffb_Imakefile patch-xf86sym.c patch-xf86Events.c + patch-sunffb_Imakefile patch-xf86sym.c patch-xf86Events.c patch-ftfuncs.c EXTRA_PATCHES+= ${FILESDIR}/${pf} .endfor SCRIPTS_ENV= OSVERSION=${OSVERSION} \ BuildXF86DRI=${BuildXF86DRI} \ WITH_DEBUG="${WITH_DEBUG}" MAN1= XFree86.1 \ Xserver.1 \ gtf.1 \ kbd_mode.1 \ pcitweak.1 \ xf86cfg.1 \ xf86config.1 MAN3= XF86VidMode.3 \ XF86VidModeDeleteModeLine.3 \ XF86VidModeGetAllModeLines.3 \ XF86VidModeGetDotClocks.3 \ XF86VidModeGetGamma.3 \ XF86VidModeGetGammaRamp.3 \ XF86VidModeGetGammaRampSize.3 \ XF86VidModeGetModeLine.3 \ XF86VidModeGetMonitor.3 \ XF86VidModeGetPermissions.3 \ XF86VidModeGetViewPort.3 \ XF86VidModeLockModeSwitch.3 \ XF86VidModeModModeLine.3 \ XF86VidModeQueryExtension.3 \ XF86VidModeQueryVersion.3 \ XF86VidModeSetClientVersion.3 \ XF86VidModeSetGamma.3 \ XF86VidModeSetGammaRamp.3 \ XF86VidModeSetViewPort.3 \ XF86VidModeSwitchMode.3 \ XF86VidModeSwitchToMode.3 \ XF86VidModeValidateModeLine.3 MAN4= citron.4 \ dynapro.4 \ elographics.4 \ fbdevhw.4 \ kbd.4 \ keyboard.4 \ microtouch.4 \ mouse.4 \ mutouch.4 \ nv.4 \ r128.4 \ radeon.4 \ void.4 \ wacom.4 MAN5= XF86Config.5 PKGMESSAGE= ${WRKDIR}/.pkg-message XBUILD_DIRS= lib/font lib/lbxutil lib/Xdmcp lib/Xau programs/Xserver XINCLUDE_DIRS= lib/xkbfile lib/xtrans XINSTALL_DIRS= lib/font programs/Xserver XINSTALL_MAN_DIRS= programs/Xserver .include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc" .include .if ${ARCH} == i386 || ${ARCH} == alpha BuildXF86DRI= YES PLIST_SUB+= DRI="" XBUILD_DIRS+= lib/XThrStub lib/X11 lib/Xext lib/GL XINSTALL_DIRS+= lib/GL/mesa/src/drv .else BuildXF86DRI= NO PLIST_SUB+= DRI="@comment " .endif # i386 .if ${ARCH} == alpha PLIST_SUB+= ALPHA_NA="@comment " .else PLIST_SUB+= ALPHA_NA="" .if ${ARCH} != sparc64 MAN1+= scanpci.1 .endif .endif .if ${ARCH} == ia64 PLIST_SUB+= IA64_NA="@comment " .else PLIST_SUB+= IA64_NA="" .endif .if ${ARCH} == sparc64 PLIST_SUB+= SPARC64_NA="@comment " .else PLIST_SUB+= SPARC64_NA="" MAN4+= glint.4 \ mga.4 \ rendition.4 \ s3virge.4 \ savage.4 \ siliconmotion.4 \ tdfx.4 \ vga.4 .endif .if ${ARCH} == i386 PLIST_SUB+= I386="" MAN4+= apm.4 \ chips.4 \ cirrus.4 \ cyrix.4 \ i128.4 \ i740.4 \ i810.4 \ neomagic.4 \ nsc.4 \ sis.4 \ trident.4 \ tseng.4 \ vesa.4 \ vmware.4 .else PLIST_SUB+= I386="@comment " .endif post-extract:: ${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp2.gz > \ ${WRKSRC}/lib/Xdmcp/Wraphelp.c post-build: @${RM} -f ${PKGMESSAGE} @${CAT} ${.CURDIR}/pkg-message >> ${PKGMESSAGE} post-install:: @${SED} -e s,/usr/X11R6,${PREFIX}, ${PKGMESSAGE} @if [ -f ${PREFIX}/bin/Xwrapper-4 ] ; then \ ${LN} -sf Xwrapper-4 ${PREFIX}/bin/X; \ fi; .include Property changes on: head/x11-servers/XFree86-4-Server/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.143 \ No newline at end of property +1.144 \ No newline at end of property Index: head/x11-servers/XFree86-4-Server/files/patch-ftfuncs.c =================================================================== --- head/x11-servers/XFree86-4-Server/files/patch-ftfuncs.c (nonexistent) +++ head/x11-servers/XFree86-4-Server/files/patch-ftfuncs.c (revision 86852) @@ -0,0 +1,16 @@ +--- lib/font/FreeType/ftfuncs.c~ 2003-02-13 06:01:45.000000000 +0300 ++++ lib/font/FreeType/ftfuncs.c 2003-03-04 20:27:16.000000000 +0300 +@@ -959,11 +959,11 @@ + int underlinePosition, underlineThickness; + + if(post) { +- underlinePosition = TRANSFORM_FUNITS_Y(post->underlinePosition); ++ underlinePosition = TRANSFORM_FUNITS_Y(-post->underlinePosition); + underlineThickness = TRANSFORM_FUNITS_Y(post->underlineThickness); + } else { + underlinePosition = +- TRANSFORM_FUNITS_Y(t1info->underline_position); ++ TRANSFORM_FUNITS_Y(-t1info->underline_position); + underlineThickness = + TRANSFORM_FUNITS_Y(t1info->underline_thickness); + } \ No newline at end of file Property changes on: head/x11-servers/XFree86-4-Server/files/patch-ftfuncs.c ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile =================================================================== --- head/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile (revision 86851) +++ head/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile (revision 86852) @@ -1,43 +1,43 @@ # New ports collection makefile for: XFree86-VirtualFramebufferServer # Date created: 10 Oct 1999 # Whom: taguchi@tohoku.iij.ad.jp # # $FreeBSD$ # PORTNAME= VirtualFramebufferServer PORTVERSION= 4.3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-servers MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \ ${MASTER_SITE_LOCAL:S/$/:local/} MASTER_SITE_SUBDIR= ${PORTVERSION}/:x \ anholt/:local PKGNAMEPREFIX= XFree86- DISTFILES= X430src-1.tgz:x \ X430src-2.tgz:x \ X430src-3.tgz:x \ Wraphelp2.gz:local EXTRACT_ONLY= X430src-1.tgz \ X430src-2.tgz \ X430src-3.tgz MAINTAINER= anholt@freebsd.org COMMENT= XFree86-4 virtual framebuffer server RUN_DEPENDS= ${FONT}:${PORTSDIR}/x11-fonts/XFree86-4-fontDefaultBitmaps FONT= ${X11BASE}/lib/X11/fonts/misc/cursor.pcf.gz MAN1= Xserver.1 Xvfb.1 XBUILD_DIRS= lib/font lib/lbxutil/ lib/Xdmcp lib/Xau programs/Xserver XINCLUDE_DIRS= lib/xkbfile lib/xtrans XINSTALL_DIRS= programs/Xserver XINSTALL_MAN_DIRS= ${XINSTALL_DIRS} post-extract: ${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp2.gz > \ ${WRKSRC}/lib/Xdmcp/Wraphelp.c .include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc" .include Property changes on: head/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.23 \ No newline at end of property +1.24 \ No newline at end of property