diff options
35 files changed, 513 insertions, 393 deletions
diff --git a/x11-servers/XFree86-4-FontServer/Makefile b/x11-servers/XFree86-4-FontServer/Makefile index b718cf624a1b..f786a05b3c65 100644 --- a/x11-servers/XFree86-4-FontServer/Makefile +++ b/x11-servers/XFree86-4-FontServer/Makefile @@ -8,12 +8,10 @@ PORTNAME= FontServer PORTVERSION= 4.2.0 CATEGORIES= x11-servers x11-fonts -MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \ - ${MASTER_SITE_LOCAL:S/$/:local/} -MASTER_SITE_SUBDIR= ${PORTVERSION}/:x \ - anholt/:local +MASTER_SITES= ${MASTER_SITE_XFREE} +MASTER_SITE_SUBDIR= ${PORTVERSION}/ PKGNAMEPREFIX= XFree86- -DISTFILES= X${PORTVERSION:S/.//g}src-1.tgz:x Wraphelp.gz:local +DISTFILES= X${PORTVERSION:S/.//g}src-1.tgz EXTRACT_ONLY= X${PORTVERSION:S/.//g}src-1.tgz MAINTAINER= anholt@freebsd.org @@ -23,17 +21,11 @@ USE_IMAKE= YES DIST_SUBDIR= xc WRKSRC= ${WRKDIR}/xc PATCHDIR= ${.CURDIR}/../../x11/XFree86-4-libraries/files -MAKE_ENV= MAN_INSTALL_TARGET=FreeBSDPortsInstall.man -ALL_TARGET= FreeBSDPortsBuild -INSTALL_TARGET= FreeBSDPortsInstall installXserver.man MAN1= Xserver.1 xfs.1 +XBUILD_DIRS= programs/xfs +XINCLUDE_DIRS= lib/xtrans programs/Xserver +XINSTALL_MAN_DIRS= programs/Xserver programs/xfs -post-extract: - ${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp.gz > \ - ${WRKSRC}/lib/Xdmcp/Wraphelp.c - -do-configure: - cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure - @cd ${WRKSRC}; ${MAKE} FreeBSDPortsConfigure +.include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc" .include <bsd.port.mk> diff --git a/x11-servers/XFree86-4-FontServer/scripts/configure b/x11-servers/XFree86-4-FontServer/scripts/configure index 3eabe6a46cd4..38581aaadf57 100644 --- a/x11-servers/XFree86-4-FontServer/scripts/configure +++ b/x11-servers/XFree86-4-FontServer/scripts/configure @@ -57,6 +57,7 @@ configure () { echo "#define BuildServersOnly YES" >> $LOCALDEF echo "#define InstallFSConfig $InstallFSConfig" >> $LOCALDEF echo "#define FreeBSDBuildXfs YES" >> $LOCALDEF + echo "#define UseInstalledPrograms YES" >> $LOCALDEF # Copy ORIGDEF to DESTDEF rm -f $DESTDEF diff --git a/x11-servers/XFree86-4-NestServer/Makefile b/x11-servers/XFree86-4-NestServer/Makefile index d158fba086b6..f7a348973303 100644 --- a/x11-servers/XFree86-4-NestServer/Makefile +++ b/x11-servers/XFree86-4-NestServer/Makefile @@ -23,18 +23,16 @@ USE_IMAKE= YES DIST_SUBDIR= xc WRKSRC= ${WRKDIR}/xc PATCHDIR= ${.CURDIR}/../../x11/XFree86-4-libraries/files -MAKE_ENV= MAN_INSTALL_TARGET=installXnest.man -ALL_TARGET= FreeBSDPortsBuild -INSTALL_TARGET= installXnest installXserver.man MANCOMPRESSED= yes 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}/Wraphelp.gz > \ ${WRKSRC}/lib/Xdmcp/Wraphelp.c -do-configure: - cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure - @cd ${WRKSRC}; ${MAKE} FreeBSDPortsConfigure - +.include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc" .include <bsd.port.mk> diff --git a/x11-servers/XFree86-4-NestServer/scripts/configure b/x11-servers/XFree86-4-NestServer/scripts/configure index a7ac5359f3be..a05984bb5a3a 100644 --- a/x11-servers/XFree86-4-NestServer/scripts/configure +++ b/x11-servers/XFree86-4-NestServer/scripts/configure @@ -48,6 +48,7 @@ configure () { echo "#define BuildServer YES" >> $LOCALDEF echo "#define XnestServer YES" >> $LOCALDEF echo "#define BuildServersOnly YES" >> $LOCALDEF + echo "#define UseInstalledPrograms YES" >> $LOCALDEF # Copy ORIGDEF to DESTDEF rm -f $DESTDEF diff --git a/x11-servers/XFree86-4-PrintServer/Makefile b/x11-servers/XFree86-4-PrintServer/Makefile index 445b8d052554..1553f3e63944 100644 --- a/x11-servers/XFree86-4-PrintServer/Makefile +++ b/x11-servers/XFree86-4-PrintServer/Makefile @@ -23,16 +23,16 @@ USE_IMAKE= YES DIST_SUBDIR= xc WRKSRC= ${WRKDIR}/xc PATCHDIR= ${.CURDIR}/../../x11/XFree86-4-libraries/files -MAKE_ENV= MAN_INSTALL_TARGET=NOOP -ALL_TARGET= FreeBSDPortsBuild -INSTALL_TARGET= installXprt +XBUILD_DIRS= lib/font lib/lbxutil lib/Xdmcp lib/Xau programs/Xserver +XINCLUDE_DIRS= lib/xkbfile lib/xtrans +XINSTALL_DIRS= programs/Xserver post-extract: ${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp.gz > \ ${WRKSRC}/lib/Xdmcp/Wraphelp.c -do-configure: - cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure - @cd ${WRKSRC}; ${MAKE} FreeBSDPortsConfigure +do-install: + $(INSTALL_PROGRAM) ${WRKSRC}/programs/Xserver/Xprt ${PREFIX}/bin/Xprt +.include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc" .include <bsd.port.mk> diff --git a/x11-servers/XFree86-4-PrintServer/scripts/configure b/x11-servers/XFree86-4-PrintServer/scripts/configure index a6aba9c72614..3855d175046b 100644 --- a/x11-servers/XFree86-4-PrintServer/scripts/configure +++ b/x11-servers/XFree86-4-PrintServer/scripts/configure @@ -48,6 +48,7 @@ configure () { echo "#define BuildServer YES" >> $LOCALDEF echo "#define XprtServer YES" >> $LOCALDEF echo "#define BuildServersOnly YES" >> $LOCALDEF + echo "#define UseInstalledPrograms YES" >> $LOCALDEF # Copy ORIGDEF to DESTDEF rm -f $DESTDEF diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile index db54468fa6ce..10eb5a67b5e2 100644 --- a/x11-servers/XFree86-4-Server-snap/Makefile +++ b/x11-servers/XFree86-4-Server-snap/Makefile @@ -7,6 +7,7 @@ PORTNAME= Server PORTVERSION= 4.2.1 +PORTREVISION= 1 CATEGORIES= x11-servers MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \ ${MASTER_SITE_XFREE:S/source//g:S/$/:x421patch/} \ @@ -41,9 +42,6 @@ SCRIPTS_ENV= OSVERSION=${OSVERSION} \ BuildXF86DRI=${BuildXF86DRI} \ HasGlide3=${HasGlide3} \ HaveMatroxHal=${HaveMatroxHal} -MAKE_ENV= MAN_INSTALL_TARGET=FreeBSDPortsInstall.man -ALL_TARGET= FreeBSDPortsBuild -INSTALL_TARGET= FreeBSDPortsInstall FreeBSDPortsInstall.man MAN1= XFree86.1 \ Xserver.1 \ kbd_mode.1 \ @@ -78,6 +76,10 @@ MAN4= mga.4 \ mouse.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 <bsd.port.pre.mk> @@ -97,7 +99,8 @@ BuildXF86DRI= YES PLIST_SUB+= DRI="" DISTFILES+= freebsd-glide3headers.tar.gz:local HasGlide3= YES - +XBUILD_DIRS+= lib/XThrStub lib/X11 lib/GL +XINSTALL_DIRS+= lib/GL/mesa/src/drv post-extract:: @(cd ${WRKSRC}/lib/GL/mesa/src/drv/tdfx/ ; \ tar xfpz ${DISTDIR}/${DIST_SUBDIR}/freebsd-glide3headers.tar.gz) @@ -204,10 +207,6 @@ pre-patch:: -@${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/4.2.0-4.2.1.diff.gz \ | ${PATCH} -d ${PATCH_WRKSRC} --forward --quiet -E -p1 --batch -do-configure: - cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure - @cd ${WRKSRC}; ${MAKE} FreeBSDPortsConfigure - post-build: @${RM} -f ${PKGMESSAGE} @${CAT} ${.CURDIR}/pkg-message >> ${PKGMESSAGE} @@ -216,4 +215,5 @@ post-install:: @${SED} -e s,/usr/X11R6,${PREFIX}, ${PKGMESSAGE} strip ${PREFIX}/bin/XFree86 +.include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc" .include <bsd.port.post.mk> diff --git a/x11-servers/XFree86-4-Server-snap/pkg-plist b/x11-servers/XFree86-4-Server-snap/pkg-plist index a52cea5e9f79..1baaee262b6e 100644 --- a/x11-servers/XFree86-4-Server-snap/pkg-plist +++ b/x11-servers/XFree86-4-Server-snap/pkg-plist @@ -6,6 +6,23 @@ bin/pcitweak %%ALPHA_NA%%bin/scanpci bin/xf86cfg bin/xf86config +include/X11/bitmaps/card.xbm +include/X11/bitmaps/down.xbm +include/X11/bitmaps/keyboard.xbm +include/X11/bitmaps/left.xbm +include/X11/bitmaps/monitor.xbm +include/X11/bitmaps/mouse.xbm +include/X11/bitmaps/narrower.xbm +include/X11/bitmaps/right.xbm +include/X11/bitmaps/shorter.xbm +include/X11/bitmaps/taller.xbm +include/X11/bitmaps/up.xbm +include/X11/bitmaps/wider.xbm +include/X11/pixmaps/card.xpm +include/X11/pixmaps/computer.xpm +include/X11/pixmaps/keyboard.xpm +include/X11/pixmaps/monitor.xpm +include/X11/pixmaps/mouse.xpm lib/X11/app-defaults/XF86Cfg lib/X11/Cards lib/X11/Options diff --git a/x11-servers/XFree86-4-Server-snap/scripts/configure b/x11-servers/XFree86-4-Server-snap/scripts/configure index 362a07d9e67b..19fdf2092e4d 100644 --- a/x11-servers/XFree86-4-Server-snap/scripts/configure +++ b/x11-servers/XFree86-4-Server-snap/scripts/configure @@ -79,6 +79,8 @@ configure () { echo "#define XF86Server YES" >> $LOCALDEF echo "#define BuildServersOnly YES" >> $LOCALDEF echo "#define BuildXFree86ConfigTools YES" >> $LOCALDEF + echo "#define UseInstalledPrograms YES" >> $LOCALDEF + echo "#define StandardIncludes -I${PREFIX}/include" >> $LOCALDEF # More of the i386 drivers could probably move to XF86CardDrivers. # Is fbdev driver useful to us? diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile index db54468fa6ce..10eb5a67b5e2 100644 --- a/x11-servers/XFree86-4-Server/Makefile +++ b/x11-servers/XFree86-4-Server/Makefile @@ -7,6 +7,7 @@ PORTNAME= Server PORTVERSION= 4.2.1 +PORTREVISION= 1 CATEGORIES= x11-servers MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \ ${MASTER_SITE_XFREE:S/source//g:S/$/:x421patch/} \ @@ -41,9 +42,6 @@ SCRIPTS_ENV= OSVERSION=${OSVERSION} \ BuildXF86DRI=${BuildXF86DRI} \ HasGlide3=${HasGlide3} \ HaveMatroxHal=${HaveMatroxHal} -MAKE_ENV= MAN_INSTALL_TARGET=FreeBSDPortsInstall.man -ALL_TARGET= FreeBSDPortsBuild -INSTALL_TARGET= FreeBSDPortsInstall FreeBSDPortsInstall.man MAN1= XFree86.1 \ Xserver.1 \ kbd_mode.1 \ @@ -78,6 +76,10 @@ MAN4= mga.4 \ mouse.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 <bsd.port.pre.mk> @@ -97,7 +99,8 @@ BuildXF86DRI= YES PLIST_SUB+= DRI="" DISTFILES+= freebsd-glide3headers.tar.gz:local HasGlide3= YES - +XBUILD_DIRS+= lib/XThrStub lib/X11 lib/GL +XINSTALL_DIRS+= lib/GL/mesa/src/drv post-extract:: @(cd ${WRKSRC}/lib/GL/mesa/src/drv/tdfx/ ; \ tar xfpz ${DISTDIR}/${DIST_SUBDIR}/freebsd-glide3headers.tar.gz) @@ -204,10 +207,6 @@ pre-patch:: -@${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/4.2.0-4.2.1.diff.gz \ | ${PATCH} -d ${PATCH_WRKSRC} --forward --quiet -E -p1 --batch -do-configure: - cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure - @cd ${WRKSRC}; ${MAKE} FreeBSDPortsConfigure - post-build: @${RM} -f ${PKGMESSAGE} @${CAT} ${.CURDIR}/pkg-message >> ${PKGMESSAGE} @@ -216,4 +215,5 @@ post-install:: @${SED} -e s,/usr/X11R6,${PREFIX}, ${PKGMESSAGE} strip ${PREFIX}/bin/XFree86 +.include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc" .include <bsd.port.post.mk> diff --git a/x11-servers/XFree86-4-Server/pkg-plist b/x11-servers/XFree86-4-Server/pkg-plist index a52cea5e9f79..1baaee262b6e 100644 --- a/x11-servers/XFree86-4-Server/pkg-plist +++ b/x11-servers/XFree86-4-Server/pkg-plist @@ -6,6 +6,23 @@ bin/pcitweak %%ALPHA_NA%%bin/scanpci bin/xf86cfg bin/xf86config +include/X11/bitmaps/card.xbm +include/X11/bitmaps/down.xbm +include/X11/bitmaps/keyboard.xbm +include/X11/bitmaps/left.xbm +include/X11/bitmaps/monitor.xbm +include/X11/bitmaps/mouse.xbm +include/X11/bitmaps/narrower.xbm +include/X11/bitmaps/right.xbm +include/X11/bitmaps/shorter.xbm +include/X11/bitmaps/taller.xbm +include/X11/bitmaps/up.xbm +include/X11/bitmaps/wider.xbm +include/X11/pixmaps/card.xpm +include/X11/pixmaps/computer.xpm +include/X11/pixmaps/keyboard.xpm +include/X11/pixmaps/monitor.xpm +include/X11/pixmaps/mouse.xpm lib/X11/app-defaults/XF86Cfg lib/X11/Cards lib/X11/Options diff --git a/x11-servers/XFree86-4-Server/scripts/configure b/x11-servers/XFree86-4-Server/scripts/configure index 362a07d9e67b..19fdf2092e4d 100644 --- a/x11-servers/XFree86-4-Server/scripts/configure +++ b/x11-servers/XFree86-4-Server/scripts/configure @@ -79,6 +79,8 @@ configure () { echo "#define XF86Server YES" >> $LOCALDEF echo "#define BuildServersOnly YES" >> $LOCALDEF echo "#define BuildXFree86ConfigTools YES" >> $LOCALDEF + echo "#define UseInstalledPrograms YES" >> $LOCALDEF + echo "#define StandardIncludes -I${PREFIX}/include" >> $LOCALDEF # More of the i386 drivers could probably move to XF86CardDrivers. # Is fbdev driver useful to us? diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile index 4f3a5c314ab8..ec41d619b12f 100644 --- a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile +++ b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile @@ -28,17 +28,15 @@ USE_IMAKE= YES DIST_SUBDIR= xc WRKSRC= ${WRKDIR}/xc PATCHDIR= ${.CURDIR}/../../x11/XFree86-4-libraries/files -ALL_TARGET= FreeBSDPortsBuild -INSTALL_TARGET= installXvfb installXserver.man -MAKE_ENV= MAN_INSTALL_TARGET=installXvfb.man 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}/Wraphelp.gz > \ ${WRKSRC}/lib/Xdmcp/Wraphelp.c -do-configure: - cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure - @cd ${WRKSRC}; ${MAKE} FreeBSDPortsConfigure - +.include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc" .include <bsd.port.mk> diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/scripts/configure b/x11-servers/XFree86-4-VirtualFramebufferServer/scripts/configure index 95477973f61f..efba0bbf0d11 100644 --- a/x11-servers/XFree86-4-VirtualFramebufferServer/scripts/configure +++ b/x11-servers/XFree86-4-VirtualFramebufferServer/scripts/configure @@ -48,6 +48,8 @@ configure () { echo "#define BuildServer YES" >> $LOCALDEF echo "#define XVirtualFramebufferServer YES" >> $LOCALDEF echo "#define BuildServersOnly YES" >> $LOCALDEF + echo "#define UseInstalledPrograms YES" >> $LOCALDEF + echo "#define StandardIncludes -I${PREFIX}/include" >> $LOCALDEF # Copy ORIGDEF to DESTDEF rm -f $DESTDEF diff --git a/x11/XFree86-4-clients/Makefile b/x11/XFree86-4-clients/Makefile index 959798ed7cd2..b77dd5d00a35 100644 --- a/x11/XFree86-4-clients/Makefile +++ b/x11/XFree86-4-clients/Makefile @@ -7,18 +7,17 @@ PORTNAME= clients PORTVERSION= 4.2.1 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \ - ${MASTER_SITE_XFREE:S/source//g:S/$/:x421patch/} \ - ${MASTER_SITE_LOCAL:S/$/:local/} + ${MASTER_SITE_XFREE:S/source//g:S/$/:x421patch/} MASTER_SITE_SUBDIR= 4.2.0/:x \ ${PORTVERSION}/patches/:x421patch \ anholt/:local PKGNAMEPREFIX= XFree86- DISTFILES= X420src-1.tgz:x \ X420src-2.tgz:x \ - 4.2.0-4.2.1.diff.gz:x421patch \ - Wraphelp.gz:local + 4.2.0-4.2.1.diff.gz:x421patch EXTRACT_ONLY= X420src-1.tgz PATCH_DIST_STRIP= -p1 @@ -41,8 +40,9 @@ SCRIPTS_ENV= InstallXdmConfig=${InstallXdmConfig} \ MAKE_ENV= PKGNAMEPREFIX=${PKGNAMEPREFIX} \ PORTNAME=${PORTNAME} \ PORTVERSION=${PORTVERSION} -ALL_TARGET= FreeBSDPortsBuild -INSTALL_TARGET= FreeBSDPortsInstall FreeBSDPortsInstall.man +XBUILD_DIRS= lib/xtrans lib/lbxutil programs fonts/util +XINSTALL_DIRS= programs fonts/util +XINSTALL_MAN_DIRS= programs # --- # XFree86 User Config: @@ -67,8 +67,6 @@ post-extract: ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \ ${DISTDIR}/${DIST_SUBDIR}/X420src-2.tgz \ | ${TAR} -xf - xc/fonts/util ) - ${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp.gz > \ - ${WRKSRC}/lib/Xdmcp/Wraphelp.c pre-patch: -@${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/4.2.0-4.2.1.diff.gz \ | ${PATCH} ${PATCH_DIST_ARGS} --batch @@ -79,10 +77,7 @@ post-patch: ${LN} -s zh_TW.big5 $$i/zh_TW.Big5; \ done -do-configure: - cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure - @cd ${WRKSRC}; ${MAKE} FreeBSDPortsConfigure - +.include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc" .include <bsd.port.pre.mk> .include "${FILESDIR}/manpages" .include <bsd.port.post.mk> diff --git a/x11/XFree86-4-clients/pkg-plist b/x11/XFree86-4-clients/pkg-plist index 6b7b9781e75a..f8772e3c973c 100644 --- a/x11/XFree86-4-clients/pkg-plist +++ b/x11/XFree86-4-clients/pkg-plist @@ -125,8 +125,6 @@ include/X11/bitmaps/black6 include/X11/bitmaps/box6 include/X11/bitmaps/ldblarrow include/X11/bitmaps/rdblarrow -lib/X11/XErrorDB -lib/X11/XKeysymDB lib/X11/app-defaults/Beforelight lib/X11/app-defaults/Bitmap lib/X11/app-defaults/Bitmap-color diff --git a/x11/XFree86-4-clients/scripts/configure b/x11/XFree86-4-clients/scripts/configure index c562846bc8bb..3a792aa57e49 100644 --- a/x11/XFree86-4-clients/scripts/configure +++ b/x11/XFree86-4-clients/scripts/configure @@ -70,6 +70,11 @@ configure () { echo "#define LibInstallBuild YES" >> $LOCALDEF echo "#define FreeBSDBuildXlib NO" >> $LOCALDEF echo "#define FreeBSDBuildXbin YES" >> $LOCALDEF + echo "#define StandardIncludes -I$PREFIX/include" >> $LOCALDEF + echo "#define DontUseLibPathVar YES" >> $LOCALDEF + echo "#define PreloadSetup" >> $LOCALDEF + echo "#define BuildPlugin NO" >> $LOCALDEF + echo "#define UseInstalledPrograms YES" >> $LOCALDEF # Copy ORIGDEF to DESTDEF rm -f $DESTDEF diff --git a/x11/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile index 8fb1cdccdd12..53beecc618a9 100644 --- a/x11/XFree86-4-libraries/Makefile +++ b/x11/XFree86-4-libraries/Makefile @@ -7,6 +7,7 @@ PORTNAME= libraries PORTVERSION= 4.2.1 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \ ${MASTER_SITE_XFREE:S/source//g:S/$/:x421patch/} \ @@ -46,10 +47,16 @@ SCRIPTS_ENV= HasSecureRPC=${HasSecureRPC} \ MAKE_ENV= PKGNAMEPREFIX=${PKGNAMEPREFIX} \ PORTNAME=${PORTNAME} \ PORTVERSION=${PORTVERSION} -ALL_TARGET= FreeBSDPortsBuild -INSTALL_TARGET= FreeBSDPortsInstall FreeBSDPortsInstall.man installXlib -MAN1= libxrx.1 -MAN3= Xaw.3 Xft.3 +MAN1= libxrx.1 +MAN3= Xaw.3 Xft.3 +XBUILD_DIRS= lib nls programs/Xserver/include \ + programs/Xserver/hw/xfree86/parser \ + programs/xrx +XINCLUDE_DIRS= programs/proxymngr +XINSTALL_DIRS= include lib nls programs/Xserver/include \ + programs/xrx/plugin \ + programs/Xserver/hw/xfree86/parser +XINSTALL_MAN_DIRS= ${XINSTALL_DIRS} # XFree86 User Config: # --- @@ -101,11 +108,12 @@ post-patch: ${LN} -s zh_TW.big5 $$i/zh_TW.Big5; \ done -do-configure: - cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure - @cd ${WRKSRC}; ${MAKE} FreeBSDPortsConfigure - post-install: + ${INSTALL_DATA} ${WRKSRC}/programs/proxymngr/PM.h \ + ${PREFIX}/include/X11/PM + ${INSTALL_DATA} ${WRKSRC}/programs/proxymngr/PMproto.h \ + ${PREFIX}/include/X11/PM @${MKHTMLINDEX} ${X11BASE}/lib/X11/doc/html +.include "Makefile.inc" .include <bsd.port.post.mk> diff --git a/x11/XFree86-4-libraries/Makefile.inc b/x11/XFree86-4-libraries/Makefile.inc new file mode 100644 index 000000000000..6db280300b78 --- /dev/null +++ b/x11/XFree86-4-libraries/Makefile.inc @@ -0,0 +1,52 @@ +# include for XFree86-4 ports which share XFree86-4-libraries's patches. +# +# XBUILD_DIRS is the group of directories under ${WRKSRC} that will +# be built in. +# XINCLUDE_DIRS is the group of directories under ${WRKSRC} that need +# to be Makefilesed or included in besides XBUILD_DIRS +# XINSTALL_DIRS is the group of directories which will have +# their install targets run. +# XINSTALL_MAN_DIRS is the group of directories which will have +# their install.man targets run. + +MAKE_ENV+= FBSDCC="${CC}" FBSDCXX="${CXX}" +_XBUILD_DIRS= include ${XBUILD_DIRS} +XINSTALL_DIRS?= ${XBUILD_DIRS} +_XINCLUDE_DIRS= ${_XBUILD_DIRS} ${XINCLUDE_DIRS} + +.if !target(do-configure) +do-configure: + @cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure + @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} Makefile.boot + +.for i in ${_XINCLUDE_DIRS} + @cd ${WRKSRC}/${i} && ${WRKSRC}/config/imake/imake \ + -DTOPDIR=${WRKSRC} -DCURDIR=${i} -I${WRKSRC}/config/cf +.endfor +.for i in ${_XINCLUDE_DIRS} + @cd ${WRKSRC}/${i} && ${SETENV} ${MAKE_ENV} ${MAKE} Makefiles +.endfor +.for i in ${_XINCLUDE_DIRS} + @cd ${WRKSRC}/${i} && ${SETENV} ${MAKE_ENV} ${MAKE} includes +.endfor +.for i in ${_XBUILD_DIRS} + @cd ${WRKSRC}/${i} && ${SETENV} ${MAKE_ENV} ${MAKE} depend +.endfor +.endif + +.if !target(do-build) +do-build: +.for i in ${XBUILD_DIRS} + @cd ${WRKSRC}/${i} && ${SETENV} ${MAKE_ENV} ${MAKE} all +.endfor +.endif + +.if !target(do-install) +do-install: +.for i in ${XINSTALL_DIRS} + @cd ${WRKSRC}/${i} && ${SETENV} ${MAKE_ENV} ${MAKE} install +.endfor +.for i in ${XINSTALL_MAN_DIRS} + @cd ${WRKSRC}/${i} && ${SETENV} ${MAKE_ENV} ${MAKE} install.man +.endfor +.endif diff --git a/x11/XFree86-4-libraries/files/patch-c b/x11/XFree86-4-libraries/files/patch-c index 62ce9190aabd..268c3604a167 100644 --- a/x11/XFree86-4-libraries/files/patch-c +++ b/x11/XFree86-4-libraries/files/patch-c @@ -1,17 +1,83 @@ ---- config/cf/Imake.tmpl.orig Fri Apr 27 06:09:38 2001 -+++ config/cf/Imake.tmpl Mon Jun 4 19:29:44 2001 -@@ -1487,7 +1487,7 @@ +--- config/cf/Imake.tmpl.orig Tue Jan 15 13:22:33 2002 ++++ config/cf/Imake.tmpl Tue Sep 3 23:37:40 2002 +@@ -220,7 +220,7 @@ + + #ifndef RmanCmd + #if BuildRman +-#ifdef UseInstalled /* assume BINDIR in path */ ++#if defined(UseInstalled) || defined(UseInstalledPrograms) /* assume BINDIR in path */ + #define RmanCmd rman + #else + #define RmanCmd $(TOP)/config/util/rman +@@ -1273,7 +1273,7 @@ + #define LoaderLibPrefix /**/ + #endif + #ifndef ImakeCmd +-#ifdef UseInstalled /* assume BINDIR in path */ ++#if defined(UseInstalled) || defined(UseInstalledPrograms) /* assume BINDIR in path */ + #define ImakeCmd imake + #else + #define ImakeCmd $(IMAKESRC)/imake +@@ -1281,19 +1281,19 @@ + #endif + #ifndef DependCmd + #if UseGccMakeDepend +-#ifdef UseInstalled /* assume BINDIR in path */ ++#if defined(UseInstalled) || defined(UseInstalledPrograms) /* assume BINDIR in path */ + #define DependCmd gccmakedep + #else + #define DependCmd $(DEPENDSRC)/gccmakedep + #endif + #elif UseCCMakeDepend +-#ifdef UseInstalled /* assume BINDIR in path */ ++#if defined(UseInstalled) || defined(UseInstalledPrograms) /* assume BINDIR in path */ + #define DependCmd ccmakedep + #else + #define DependCmd $(DEPENDSRC)/ccmakedep + #endif + #else +-#ifdef UseInstalled /* assume BINDIR in path */ ++#if defined(UseInstalled) || defined(UseInstalledPrograms) /* assume BINDIR in path */ + #define DependCmd makedepend + #else + #define DependCmd $(DEPENDSRC)/makedepend +@@ -1320,21 +1320,21 @@ + #ifndef ExportListCmd + # ifndef ExportListGenSource + # define ExportListCmd /**/ +-# elif !defined(UseInstalled) ++# elif !defined(UseInstalled) && !defined(UseInstalledPrograms) + # define ExportListCmd $(CONFIGSRC)/util/exportlistgen + # else + # define ExportListCmd exportlistgen + # endif + #endif + #ifndef MkdirHierCmd +-#ifdef UseInstalled /* assume BINDIR in path */ ++#if defined(UseInstalled) || defined(UseInstalledPrograms) /* assume BINDIR in path */ + #define MkdirHierCmd mkdirhier + #else + #define MkdirHierCmd $(SHELL) $(CONFIGSRC)/util/mkdirhier.sh + #endif + #endif + #ifndef RevPathCmd +-#ifdef UseInstalled /* assume BINDIR in path */ ++#if defined(UseInstalled) || defined(UseInstalledPrograms) /* assume BINDIR in path */ + #define RevPathCmd revpath + #else + #define RevPathCmd $(CONFIGSRC)/util/revpath +@@ -1536,7 +1536,7 @@ CXXOPTIONS = CplusplusOptions CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES) CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(DEFINES) $(CXXEXTRA_DEFINES) - CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES) + CXXFLAGS += $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES) #endif - COMPRESS = CompressCmd - GZIPCMD = GzipCmd -@@ -1682,7 +1682,7 @@ + + #if !BuildLibraries && AlternateIncRoot +@@ -1736,7 +1736,7 @@ */ - ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(STD_INCLUDES) + ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES) ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES) - CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) + CFLAGS += $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) diff --git a/x11/XFree86-4-libraries/files/patch-c2 b/x11/XFree86-4-libraries/files/patch-c2 index e0ed10d1a722..810389b5eb75 100644 --- a/x11/XFree86-4-libraries/files/patch-c2 +++ b/x11/XFree86-4-libraries/files/patch-c2 @@ -1,5 +1,5 @@ ---- /usr/local/src/XFree86-4/ORIG/xc/config/cf/Library.tmpl Tue Dec 5 11:59:31 2000 -+++ config/cf/Library.tmpl Tue Dec 19 17:18:56 2000 +--- config/cf/Library.tmpl.orig Mon Aug 27 10:40:55 2001 ++++ config/cf/Library.tmpl Mon Sep 2 12:06:46 2002 @@ -67,7 +67,7 @@ STD_DEFINES = LibraryDefines $(PROJECT_DEFINES) CDEBUGFLAGS = LibraryCDebugFlags @@ -18,3 +18,22 @@ # if defined(LargePICTable) && LargePICTable # ifdef LargePositionIndependentCplusplusFlags CXXPICFLAGS = LargePositionIndependentCplusplusFlags +@@ -300,6 +300,10 @@ + */ + + #ifndef MakeStringsDependency ++#if defined(UseInstalled) || defined(UseInstalledPrograms) ++#define MakeStringsDependency @@\ ++MAKESTRS = makestrs ++#else + # define MakeStringsDependency @@\ + MAKESTRS = $(CONFIGSRC)/util/makestrs @@\ + NoCmpScript(HostProgramTargetName($(MAKESTRS)) $(MAKESTRS).Osuf) @@\ +@@ -308,6 +312,7 @@ + cd $(CONFIGSRC)/util && $(MAKE) HostProgramTargetName(makestrs) @@\ + @@\ + includes:: HostProgramTargetName($(MAKESTRS)) ++#endif + #endif + + #ifndef ToolkitMakeStrings diff --git a/x11/XFree86-4-libraries/files/patch-d b/x11/XFree86-4-libraries/files/patch-d index f06579be92ca..9e5ec4a37408 100644 --- a/x11/XFree86-4-libraries/files/patch-d +++ b/x11/XFree86-4-libraries/files/patch-d @@ -1,6 +1,85 @@ ---- config/cf/FreeBSD.cf~ Tue Dec 5 10:16:28 2000 -+++ config/cf/FreeBSD.cf Tue Dec 5 10:45:42 2000 -@@ -371,14 +371,14 @@ +--- config/cf/FreeBSD.cf.orig Tue Sep 17 19:33:33 2002 ++++ config/cf/FreeBSD.cf Tue Sep 17 20:47:11 2002 +@@ -43,11 +43,15 @@ + #define GccUsesGas YES + #define UseGas YES + #define GnuCpp YES ++#define HasPoll YES + #define HasNdbm YES + #define HasPutenv YES + #define HasSnprintf YES + #define HasBSD44Sockets YES + #define HasDlopen YES ++#if ((OSRelVersion >= 410002) && OSRelVersion < 500000) || (OSRelVersion >= 500012) ++#define HasSetProcTitle YES ++#endif + #ifndef HasLibCrypt + # define HasLibCrypt YES + #endif +@@ -82,10 +86,6 @@ + # define HasPosixThreads YES + # define ThreadedX YES + /* +- * math.h uses _REENTRANT and stdio.h uses _THREAD_SAFE, so define both. +- */ +-# define SystemMTDefines -D_REENTRANT -D_THREAD_SAFE +-/* + * FreeBSD has tread-safe api but no getpwnam_r yet. + */ + # define HasThreadSafeAPI YES +@@ -95,8 +95,12 @@ + # else + # define BuildThreadStubLibrary YES + # define NeedUIThrStubs YES +-# define ThreadsCompileFlags -pthread +-# define ThreadsLibraries -pthread ++# define SystemMTDefines -D_REENTRANT -D_THREAD_SAFE ++# if (OSRelVersion >= 500016) ++# define ThreadsLibraries -lc_r ++# else ++# define ThreadsLibraries -pthread ++# endif + # define SharedX11Reqs $(LDPRELIB) $(XTHRSTUBLIB) + # define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB) + # endif +@@ -149,11 +153,11 @@ + * ld: warning: libXThrStub.so.6, needed by libX11.so, not found + */ + #if BuildThreadStubLibrary && !UseInstalled +-# define CcCmd $(CLIENTENVSETUP) cc +-# define CplusplusCmd $(CLIENTENVSETUP) c++ ++# define CcCmd $(CLIENTENVSETUP) ${FBSDCC} ++# define CplusplusCmd $(CLIENTENVSETUP) ${FBSDCXX} + #else +-# define CcCmd cc +-# define CplusplusCmd c++ ++# define CcCmd ${FBSDCC} ++# define CplusplusCmd ${FBSDCXX} + #endif + + #define CppCmd /usr/bin/cpp +@@ -220,6 +224,20 @@ + #endif + #endif + ++/* Katmai (SSE) and 3DNow will be autodetected, so binutils is the only ++ * requirement for enabling this. By 4.2 they were all supported. ++ */ ++#ifdef i386Architecture && \ ++ (OSMajorVersion >= 5) || (OSMajorVersion == 4 && OSMinorVersion >= 2)) ++# define HasMMXSupport YES ++# define Has3DNowSupport YES ++# define HasKatmaiSupport YES ++#else ++# define HasMMXSupport NO ++# define Has3DNowSupport NO ++# define HasKatmaiSupport NO ++#endif ++ + /* + * This doesn't work the way it does on every other system. On FreeBSD it's + * only a "hint, not a demand", whatever that means. Note that this is not +@@ -448,14 +466,14 @@ /* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */ #ifndef DefaultGcc2i386Opt #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5) diff --git a/x11/XFree86-4-libraries/files/patch-dps b/x11/XFree86-4-libraries/files/patch-dps new file mode 100644 index 000000000000..d55f02d93db4 --- /dev/null +++ b/x11/XFree86-4-libraries/files/patch-dps @@ -0,0 +1,38 @@ +--- lib/dps/Imakefile.orig Sat Apr 7 12:41:50 2001 ++++ lib/dps/Imakefile Tue Sep 3 22:37:23 2002 +@@ -29,7 +29,6 @@ + SED = sed + AWK = awk + SORT = sort +- PSWRAP = PsWrap + + COMMONOBJECTFILES = \ + dpsclient.o\ +@@ -195,7 +194,7 @@ + + includes :: $(DPSOPSCFILES) $(PSOPSCFILES) $(HEADERS) + +-$(DPSOPSCFILES) $(PSOPSCFILES): ProgramTargetName($(PSWRAP)) ++$(DPSOPSCFILES) $(PSOPSCFILES) : PsWrapDependency + + SRCS = \ + ${COMMONSOURCEFILES} \ +@@ -218,16 +217,11 @@ + + .SUFFIXES: .psw .h + +-.psw.c : ProgramTargetName($(PSWRAP)) ++.psw.c : PsWrapDependency + RunProgram(PSWRAP,-a -o $*.c -h $*.h $<) + +-.psw.h : ProgramTargetName($(PSWRAP)) ++.psw.h : PsWrapDependency + RunProgram(PSWRAP,-a -h $*.h $< > /dev/null) +- +-ProgramTargetName($(PSWRAP)): +- @echo "checking $@ over in $(PSWRAPSRC) first..."; \ +- cd $(PSWRAPSRC) && $(MAKE); \ +- echo "okay, continuing in $(CURRENT_DIR)" + + HEADERS = psops.h dpsops.h + diff --git a/x11/XFree86-4-libraries/files/patch-dpsinfo b/x11/XFree86-4-libraries/files/patch-dpsinfo new file mode 100644 index 000000000000..b90e75402b66 --- /dev/null +++ b/x11/XFree86-4-libraries/files/patch-dpsinfo @@ -0,0 +1,23 @@ +--- programs/dpsinfo/Imakefile.orig Mon Sep 2 12:57:28 2002 ++++ programs/dpsinfo/Imakefile Mon Sep 2 13:27:26 2002 +@@ -4,7 +4,6 @@ + DEPLIBS = $(DEPDPSLIB) $(DEPXTOOLLIB) $(DEPXLIB) + LOCAL_LIBRARIES = $(DPSLIB) $(XTOOLLIB) $(XLIB) + SYS_LIBRARIES = MathLibrary +- PSWRAP = PsWrap + + SRCS = iwraps.psw dpsinfo.c + +@@ -14,10 +13,10 @@ + + .SUFFIXES: .psw .h + +-.psw.c : ProgramTargetName($(PSWRAP)) ++.psw.c : PsWrapDependency + RunProgram(PSWRAP,-a -o $*.c -h $*.h $<) + +-.psw.h : ProgramTargetName($(PSWRAP)) ++.psw.h : PsWrapDependency + RunProgram(PSWRAP,-a -h $*.h $< > /dev/null) + + depend:: $(DERIVED_FILES) diff --git a/x11/XFree86-4-libraries/files/patch-freetype b/x11/XFree86-4-libraries/files/patch-freetype index 9aad792741d5..0ab7e6d17724 100644 --- a/x11/XFree86-4-libraries/files/patch-freetype +++ b/x11/XFree86-4-libraries/files/patch-freetype @@ -1,6 +1,21 @@ ---- config/cf/X11.tmpl.orig Sat Jun 2 07:21:30 2001 -+++ config/cf/X11.tmpl Fri Jun 8 00:44:19 2001 -@@ -2453,7 +2453,7 @@ +--- config/cf/X11.tmpl.orig Tue Jan 15 14:55:26 2002 ++++ config/cf/X11.tmpl Mon Sep 2 13:28:05 2002 +@@ -1380,7 +1380,14 @@ + #endif + + #ifndef PsWrap ++#if defined(UseInstalled) || defined(UseInstalledPrograms) ++#define PsWrap pswrap ++#define PsWrapDependency /**/ ++#else + #define PsWrap $(PSWRAPSRC)/pswrap ++#define PsWrapDependency ProgramTargetName($(PSWRAP)) ++#endif ++ PSWRAP = PsWrap + #endif + + #ifndef ResourceConfigurationManagement +@@ -2622,7 +2629,7 @@ FREETYPE2DIR = Freetype2Dir FREETYPE2LIBDIR = Freetype2LibDir FREETYPE2INCDIR = Freetype2IncDir diff --git a/x11/XFree86-4-libraries/files/patch-h b/x11/XFree86-4-libraries/files/patch-h index d0e8bbfd19f5..5a424c8515f7 100644 --- a/x11/XFree86-4-libraries/files/patch-h +++ b/x11/XFree86-4-libraries/files/patch-h @@ -1,5 +1,23 @@ ---- config/cf/Imake.rules.orig Tue Dec 18 05:00:37 2001 -+++ config/cf/Imake.rules Sat Jan 19 22:47:40 2002 +--- config/cf/Imake.rules.orig Mon Dec 17 12:00:37 2001 ++++ config/cf/Imake.rules Sun Sep 1 22:20:08 2002 +@@ -1369,7 +1369,7 @@ + * this Imakefile is within the source tree. + */ + #ifndef RmanDependency +-#ifdef UseInstalled ++#if defined(UseInstalled) || defined(UseInstalledPrograms) + #define RmanDependency() /**/ + #else + #define RmanDependency() @@\ +@@ -1384,7 +1384,7 @@ + #endif /* RmanDependency */ + + #ifndef RmanCmdDependency +-#ifdef UseInstalled ++#if defined(UseInstalled) || defined(UseInstalledPrograms) + #define RmanCmdDependency /**/ + #else + #define RmanCmdDependency ProgramTargetName($(RMAN)) @@ -1399,7 +1399,7 @@ dest.suffix.html: file.$(MANNEWSUFFIX) RmanCmdDependency @@\ RemoveFiles(dest.suffix.html dest.suffix-html) @@\ @@ -27,3 +45,30 @@ sed -e 's:^.::' -e 's:[^/.][^/]*:..:'g`; \ @@\ cd Concat($(DESTDIR),opath); \ @@\ if [ -f lfile -a ! -h lfile ]; then \ @@\ +@@ -1833,7 +1833,7 @@ + * this Imakefile is within the source tree. + */ + #ifndef DependDependency +-#ifdef UseInstalled ++#if defined(UseInstalled) || defined(UseInstalledPrograms) + #define DependDependency() /**/ + #else + #define DependDependency() @@\ +@@ -1928,7 +1928,7 @@ + * within the source tree. + */ + #ifndef ImakeDependency +-#ifdef UseInstalled ++#if defined(UseInstalled) || defined(UseInstalledPrograms) + #define ImakeDependency(target) /**/ + #else + #define ImakeDependency(target) @@\ +@@ -3077,6 +3077,8 @@ + + #ifdef UseInstalled + #define ImakeSubCmdHelper $(IMAKE_CMD) ++#elif defined(UseInstalledPrograms) ++#define ImakeSubCmdHelper $(IMAKE) -I$(IMAKEPREFIX)$(IRULESRC) $(IMAKE_DEFINES) + #else + #define ImakeSubCmdHelper $(IMAKEPREFIX)$(IMAKE) -I$(IMAKEPREFIX)$(IRULESRC) $(IMAKE_DEFINES) + #endif diff --git a/x11/XFree86-4-libraries/files/patch-texteroids b/x11/XFree86-4-libraries/files/patch-texteroids new file mode 100644 index 000000000000..335883a8dde4 --- /dev/null +++ b/x11/XFree86-4-libraries/files/patch-texteroids @@ -0,0 +1,23 @@ +--- programs/texteroids/Imakefile.orig Mon Sep 2 13:23:43 2002 ++++ programs/texteroids/Imakefile Mon Sep 2 13:27:13 2002 +@@ -3,7 +3,6 @@ + DEPLIBS = $(DEPDPSLIB) $(DEPXTOOLLIB) $(DEPXLIB) + LOCAL_LIBRARIES = $(XTOOLLIB) $(DPSLIB) $(XLIB) + SYS_LIBRARIES = MathLibrary +- PSWRAP = PsWrap + + SRCS = twraps.psw texteroids.c + +@@ -13,10 +12,10 @@ + + .SUFFIXES: .psw .h + +-.psw.c : ProgramTargetName($(PSWRAP)) ++.psw.c : PsWrapDependency + RunProgram(PSWRAP,-a -o $*.c -h $*.h $<) + +-.psw.h : ProgramTargetName($(PSWRAP)) ++.psw.h : PsWrapDependency + RunProgram(PSWRAP,-a -h $*.h $< > /dev/null) + + depend:: $(DERIVED_FILES) diff --git a/x11/XFree86-4-libraries/files/patch-xf86.tmpl b/x11/XFree86-4-libraries/files/patch-xf86.tmpl new file mode 100644 index 000000000000..27d92eea2d7b --- /dev/null +++ b/x11/XFree86-4-libraries/files/patch-xf86.tmpl @@ -0,0 +1,11 @@ +--- config/cf/xf86.tmpl.orig Mon Sep 2 11:45:21 2002 ++++ config/cf/xf86.tmpl Mon Sep 2 11:45:24 2002 +@@ -27,6 +27,8 @@ + #ifdef UseInstalled + #define ImakeSubCmdHelper $(IMAKE) -DUseInstalled -I$(IMAKETOP) \ + -I$(IRULESRC) $(IMAKE_DEFINES) ++#elif defined(UseInstalledPrograms) ++#define ImakeSubCmdHelper $(IMAKE) -I$(IMAKETOP) -I$(IRULESRC) $(IMAKE_DEFINES) + #else + #define ImakeSubCmdHelper $(IMAKEPREFIX)$(IMAKE) -I$(IMAKETOP) \ + -I$(IMAKEPREFIX)$(IRULESRC) $(IMAKE_DEFINES) diff --git a/x11/XFree86-4-libraries/files/patch-xthreads b/x11/XFree86-4-libraries/files/patch-xthreads index 8ebc062fd872..e69de29bb2d1 100644 --- a/x11/XFree86-4-libraries/files/patch-xthreads +++ b/x11/XFree86-4-libraries/files/patch-xthreads @@ -1,77 +0,0 @@ ---- config/cf/FreeBSD.cf.orig Wed Jul 10 16:27:39 2002 -+++ config/cf/FreeBSD.cf Wed Jul 10 17:14:39 2002 -@@ -43,11 +43,15 @@ - #define GccUsesGas YES - #define UseGas YES - #define GnuCpp YES -+#define HasPoll YES - #define HasNdbm YES - #define HasPutenv YES - #define HasSnprintf YES - #define HasBSD44Sockets YES - #define HasDlopen YES -+#if ((OSRelVersion >= 410002) && OSRelVersion < 500000) || (OSRelVersion >= 500012) -+#define HasSetProcTitle YES -+#endif - #ifndef HasLibCrypt - # define HasLibCrypt YES - #endif -@@ -78,10 +82,6 @@ - # define HasPosixThreads YES - # define ThreadedX YES - /* -- * math.h uses _REENTRANT and stdio.h uses _THREAD_SAFE, so define both. -- */ --# define SystemMTDefines -D_REENTRANT -D_THREAD_SAFE --/* - * FreeBSD has tread-safe api but no getpwnam_r yet. - */ - # define HasThreadSafeAPI YES -@@ -91,8 +91,15 @@ - # else - # define BuildThreadStubLibrary YES - # define NeedUIThrStubs YES --# define ThreadsCompileFlags -pthread --# define ThreadsLibraries -pthread -+# if (OSRelVersion >= 500016) -+# define ThreadsLibraries -lc_r -+# else -+ /* -+ * math.h uses _REENTRANT and stdio.h uses _THREAD_SAFE, so define both. -+ */ -+# define SystemMTDefines -D_REENTRANT -D_THREAD_SAFE -+# define ThreadsLibraries -pthread -+# endif - # define SharedX11Reqs $(LDPRELIB) $(XTHRSTUBLIB) - # define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB) - # endif -@@ -216,6 +223,20 @@ - #endif - #endif - -+/* Katmai (SSE) and 3DNow will be autodetected, so binutils is the only -+ * requirement for enabling this. By 4.2 they were all supported. -+ */ -+#ifdef i386Architecture && \ -+ (OSMajorVersion >= 5) || (OSMajorVersion == 4 && OSMinorVersion >= 2)) -+# define HasMMXSupport YES -+# define Has3DNowSupport YES -+# define HasKatmaiSupport YES -+#else -+# define HasMMXSupport NO -+# define Has3DNowSupport NO -+# define HasKatmaiSupport NO -+#endif -+ - /* - * This doesn't work the way it does on every other system. On FreeBSD it's - * only a "hint, not a demand", whatever that means. Note that this is not -@@ -540,7 +561,7 @@ - /* - * A hack to work around an optimization problem with gcc 2.95.2 - */ --#if OSMajorVersion >= 4 -+#if OSMajorVersion == 4 - #define GccOptBug295 - #endif - diff --git a/x11/XFree86-4-libraries/files/patch-z01 b/x11/XFree86-4-libraries/files/patch-z01 index 9c0273ae6f82..e69de29bb2d1 100644 --- a/x11/XFree86-4-libraries/files/patch-z01 +++ b/x11/XFree86-4-libraries/files/patch-z01 @@ -1,73 +0,0 @@ ---- Makefile.orig Wed Dec 19 13:37:26 2001 -+++ Makefile Wed Jul 10 17:37:14 2002 -@@ -27,6 +27,12 @@ - MAKE_CMD = $(MAKE) $(MAKE_OPTS) - FLAGS = $(MFLAGS) -f Makefile.ini BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)" CC="$(CC)" - -+# Quick Hack! -+# FreeBSD ports system always call 'install.man' -+# It's good for almost ports. but not Dividing XFree86-4 ports. -+# Here is a quick hack for it. -+MAN_INSTALL_TARGET?= install.man -+ - all: - @$(MAKE_CMD) xmakefile-exists || $(MAKE) all-initial - @$(MAKE_CMD) $@ -@@ -198,7 +204,7 @@ - install.ln: - $(MAKE_CMD) $@ - install.man: -- $(MAKE_CMD) $@ -+ $(MAKE_CMD) $(MAN_INSTALL_TARGET) - install: - $(MAKE_CMD) $@ - Makefiles: -@@ -209,3 +215,48 @@ - $(MAKE_CMD) $@ - VerifyOS: - $(MAKE_CMD) $@ -+ -+##### -+FreeBSDPortsConfigure: -+ @echo "" -+ @echo Configuring $(RELEASE) of the X Window System: $(PKGNAMEPREFIX)$(PORTNAME)-$(PORTVERSION) -+ @echo "" -+ @date -+ @echo "" -+ $(MAKE) $(MFLAGS) Makefile.boot -+ $(MAKE_CMD) $(MFLAGS) VerifyOS -+ $(MAKE_CMD) $(MFLAGS) Makefiles -+ $(MAKE_CMD) $(MFLAGS) includes -+ $(MAKE_CMD) $(MFLAGS) depend -+ -+FreeBSDPortsBuild: -+ @echo "" -+ @echo Building $(RELEASE) of the X Window System: $(PKGNAMEPREFIX)$(PORTNAME)-$(PORTVERSION) -+ @echo "" -+ @date -+ @echo "" -+ $(MAKE_CMD) $(MFLAGS) $@ -+ @echo "" -+ @date -+ @echo "" -+ @echo build of X Window System complete. -+ @echo "" -+ -+FreeBSDPortsInstall installXlib installXnest installXprt installXvfb: -+ $(MAKE_CMD) $@ -+ -+FreeBSDPortsInstall.man: -+ $(MAKE_CMD) FreeBSDPortsInstall.man -+ -+installXnest.man: -+ $(MAKE_CMD) installXnest.man -+ -+installXvfb.man: -+ $(MAKE_CMD) installXvfb.man -+ -+installXserver.man: -+ $(MAKE_CMD) installXserver.man -+ -+NOOP: -+ @echo : -+ diff --git a/x11/XFree86-4-libraries/files/patch-z02 b/x11/XFree86-4-libraries/files/patch-z02 index e9c45890eb8d..e69de29bb2d1 100644 --- a/x11/XFree86-4-libraries/files/patch-z02 +++ b/x11/XFree86-4-libraries/files/patch-z02 @@ -1,129 +0,0 @@ ---- Imakefile.orig Thu Mar 22 02:36:43 2001 -+++ Imakefile Mon Jan 21 22:15:51 2002 -@@ -25,8 +25,27 @@ - #endif - #endif - -+#if defined(FreeBSDBuildXlib) && FreeBSDBuildXlib -+ SUBDIRS = include config lib $(NLSSUBDIR) \ -+ programs/Xserver/include \ -+ programs/Xserver/hw/xfree86/parser \ -+ programs/proxymngr programs/xrx -+#else -+#if defined(FreeBSDBuildXbin) && FreeBSDBuildXbin -+ SUBDIRS = include config lib $(NLSSUBDIR) \ -+ programs/rgb \ -+ programs \ -+ fonts/util -+#else -+#if defined(FreeBSDBuildXfs) && FreeBSDBuildXfs -+ SUBDIRS = include config lib $(NLSSUBDIR) \ -+ programs programs/xfs -+#else - SUBDIRS = include config lib $(NLSSUBDIR) \ - programs $(FONTSDIR) $(DOCSDIR) -+#endif -+#endif -+#endif - LNINSTALLDIRS = lib - - #if HasParallelMake -@@ -227,3 +246,98 @@ - #undef BootstrapCleanSubdirs - #define BootstrapCleanSubdirs BOOTSTRAPSUBDIRS="$(BOOTSTRAPSUBDIRS)" - BOOTSTRAPSUBDIRS = imake makedepend -+ -+#if defined(BuildXF86DRI) && BuildXF86DRI -+FreeBSDPortsDRIDir = lib/GL/mesa/src/drv -+#endif -+#if defined(FreeBSDBuildXlib) && FreeBSDBuildXlib -+FreeBSDPortsInstallDir = include lib nls programs/Xserver/include \ -+ programs/xrx/plugin \ -+ programs/Xserver/hw/xfree86/parser -+#else -+#if defined(FreeBSDBuildXbin) && FreeBSDBuildXbin -+FreeBSDPortsInstallDir = lib programs/rgb programs fonts/util -+#else -+#if defined(FreeBSDBuildXxserv) && FreeBSDBuildXxserv -+FreeBSDPortsInstallDir = programs lib/font $(FreeBSDPortsDRIDir) -+#else -+#if defined(FreeBSDBuildXfs) && FreeBSDBuildXfs -+FreeBSDPortsInstallDir = programs/xfs -+#else -+#if defined(FreeBSDBuildXnest) && FreeBSDBuildXnest -+FreeBSDPortsInstallDir = programs/Xserver -+#else -+FreeBSDPortsInstallDir = $(SUBDIRS) -+#endif -+#endif -+#endif -+#endif -+#endif -+ -+FreeBSDPortsBuild:: -+ @for dir in $(SUBDIRS); do \ -+ (cd $$dir && $(MAKE) $(MFLAGS) $(PARALLELMFLAGS) all); \ -+ done -+ -+FreeBSDPortsInstall:: -+ @for dir in $(FreeBSDPortsInstallDir); do \ -+ (cd $$dir && $(MAKE) $(MFLAGS) $(PARALLELMFLAGS) install); \ -+ done -+ -+FreeBSDPortsInstall.man:: -+ @for dir in $(FreeBSDPortsInstallDir); do \ -+ (cd $$dir && $(MAKE) $(MFLAGS) $(PARALLELMFLAGS) install.man); \ -+ done -+ -+# followings are in XBMPICS and XPMPICS at programs/Xserver/hw/xfree86/xf86cfg -+XLIBADDFILES1= \ -+ card.xbm\ -+ keyboard.xbm\ -+ monitor.xbm\ -+ mouse.xbm\ -+ left.xbm\ -+ right.xbm\ -+ up.xbm\ -+ down.xbm\ -+ wider.xbm\ -+ narrower.xbm\ -+ shorter.xbm\ -+ taller.xbm -+XLIBADDFILES2= \ -+ card.xpm\ -+ computer.xpm\ -+ keyboard.xpm\ -+ monitor.xpm\ -+ mouse.xpm -+ -+installXlib:: -+ (cd programs/proxymngr && \ -+ $(INSTALL) -c $(INSTINCFLAGS) PM.h $(INCROOT)/X11/PM && \ -+ $(INSTALL) -c $(INSTINCFLAGS) PMproto.h $(INCROOT)/X11/PM) -+ (cd programs/Xserver/hw/xfree86/xf86cfg && \ -+ $(INSTALL) -c $(INSTINCFLAGS) $(XLIBADDFILES1) $(INCROOT)/X11/bitmaps && \ -+ $(INSTALL) -c $(INSTINCFLAGS) $(XLIBADDFILES2) $(INCROOT)/X11/pixmaps) -+ -+installXnest:: -+ (cd programs/Xserver && \ -+ $(INSTALL) -c $(INSTALLFLAGS) $(INSTPGMFLAGS) Xnest $(DESTDIR)$(BINDIR)/Xnest) -+ -+installXnest.man:: -+ (cd programs/Xserver/hw/xnest && $(MAKE) install.man) -+ -+installXprt:: -+ (cd programs/Xserver && \ -+ $(INSTALL) -c $(INSTALLFLAGS) $(INSTPGMFLAGS) Xprt $(DESTDIR)$(BINDIR)/Xprt) -+ -+installXvfb:: -+ (cd programs/Xserver && \ -+ $(INSTALL) -c $(INSTALLFLAGS) $(INSTPGMFLAGS) Xvfb $(DESTDIR)$(BINDIR)/Xvfb) -+ -+installXvfb.man:: -+ (cd programs/Xserver/hw/vfb && $(MAKE) install.man) -+ -+installXserver.man:: -+ (cd programs/Xserver && $(MAKE) install.man) -+ -+NOOP: -+ @echo : diff --git a/x11/XFree86-4-libraries/files/patch-z04 b/x11/XFree86-4-libraries/files/patch-z04 index 1189c82d52a0..a507a0e85b2a 100644 --- a/x11/XFree86-4-libraries/files/patch-z04 +++ b/x11/XFree86-4-libraries/files/patch-z04 @@ -1,19 +1,19 @@ ---- lib/X11/Imakefile.orig Tue May 1 19:35:05 2001 -+++ lib/X11/Imakefile Wed Jun 6 23:35:50 2001 -@@ -905,7 +905,7 @@ - REQUIREDLIBS = -lcygipc - #endif +--- lib/X11/Imakefile.orig Thu Dec 20 11:03:47 2001 ++++ lib/X11/Imakefile Sun Aug 25 01:18:53 2002 +@@ -943,7 +943,7 @@ + + OBJS = $(OBJS1) $(OBJS2) $(OBJS3) -#if !BuildServersOnly || XnestServer || BuildGLXLibrary || BuildClients +#if !BuildServersOnly || XnestServer || BuildGLXLibrary || BuildClients || FreeBSDBuildXxserv #include <Library.tmpl> SpecialCLibObjectRule(ErrDes,$(ICONFIGFILES),$(EDB_DEFINES)) -@@ -944,8 +944,10 @@ +@@ -983,8 +983,10 @@ #if InstallXcmsTxt InstallNonExecFile(Xcms.txt,$(LIBDIR)) #endif -+#if !defined(FreeBSDBuildXlib) || !FreeBSDBuildXlib ++#if defined(FreeBSDBuildXlib) && FreeBSDBuildXlib InstallNonExecFile(XErrorDB,$(LIBDIR)) InstallNonExecFile(XKeysymDB,$(LIBDIR)) +#endif diff --git a/x11/XFree86-4-libraries/pkg-plist b/x11/XFree86-4-libraries/pkg-plist index 3cc78cee63e7..5fd20bdf3d02 100644 --- a/x11/XFree86-4-libraries/pkg-plist +++ b/x11/XFree86-4-libraries/pkg-plist @@ -203,14 +203,12 @@ include/X11/bitmaps/2x2 include/X11/bitmaps/black include/X11/bitmaps/boxes include/X11/bitmaps/calculator -include/X11/bitmaps/card.xbm include/X11/bitmaps/cntr_ptr include/X11/bitmaps/cntr_ptrmsk include/X11/bitmaps/cross_weave include/X11/bitmaps/dimple1 include/X11/bitmaps/dimple3 include/X11/bitmaps/dot -include/X11/bitmaps/down.xbm include/X11/bitmaps/dropbar7 include/X11/bitmaps/dropbar8 include/X11/bitmaps/escherknot @@ -227,9 +225,7 @@ include/X11/bitmaps/grid8 include/X11/bitmaps/hlines2 include/X11/bitmaps/hlines3 include/X11/bitmaps/icon -include/X11/bitmaps/keyboard.xbm include/X11/bitmaps/keyboard16 -include/X11/bitmaps/left.xbm include/X11/bitmaps/left_ptr include/X11/bitmaps/left_ptrmsk include/X11/bitmaps/letters @@ -244,33 +240,25 @@ include/X11/bitmaps/menu12 include/X11/bitmaps/menu16 include/X11/bitmaps/menu6 include/X11/bitmaps/menu8 -include/X11/bitmaps/monitor.xbm -include/X11/bitmaps/mouse.xbm -include/X11/bitmaps/narrower.xbm include/X11/bitmaps/noletters include/X11/bitmaps/opendot include/X11/bitmaps/opendotMask include/X11/bitmaps/plaid -include/X11/bitmaps/right.xbm include/X11/bitmaps/right_ptr include/X11/bitmaps/right_ptrmsk include/X11/bitmaps/root_weave include/X11/bitmaps/scales -include/X11/bitmaps/shorter.xbm include/X11/bitmaps/sipb include/X11/bitmaps/star include/X11/bitmaps/starMask include/X11/bitmaps/stipple -include/X11/bitmaps/taller.xbm include/X11/bitmaps/target include/X11/bitmaps/terminal include/X11/bitmaps/tie_fighter -include/X11/bitmaps/up.xbm include/X11/bitmaps/vlines2 include/X11/bitmaps/vlines3 include/X11/bitmaps/weird_size include/X11/bitmaps/wide_weave -include/X11/bitmaps/wider.xbm include/X11/bitmaps/wingdogs include/X11/bitmaps/woman include/X11/bitmaps/xfd_icon @@ -383,16 +371,13 @@ include/X11/fonts/fontenc.h include/X11/fonts/fsmasks.h include/X11/keysym.h include/X11/keysymdef.h -include/X11/pixmaps/card.xpm -include/X11/pixmaps/computer.xpm -include/X11/pixmaps/keyboard.xpm -include/X11/pixmaps/monitor.xpm -include/X11/pixmaps/mouse.xpm include/X11/xpm.h include/rgb.h include/site.h include/xf86Optrec.h include/xf86Parser.h +lib/X11/XErrorDB +lib/X11/XKeysymDB lib/X11/XftConfig lib/X11/locale/C/XI18N_OBJS lib/X11/locale/C/XLC_LOCALE diff --git a/x11/XFree86-4-libraries/scripts/configure b/x11/XFree86-4-libraries/scripts/configure index 22dd71a0b148..832eec9686a8 100644 --- a/x11/XFree86-4-libraries/scripts/configure +++ b/x11/XFree86-4-libraries/scripts/configure @@ -72,6 +72,7 @@ configure () { echo "#define Freetype2Dir ${LOCALBASE}" >> $LOCALDEF echo "#define FreeBSDBuildXlib YES" >> $LOCALDEF echo "#define FreeBSDBuildXbin NO" >> $LOCALDEF + echo "#define UseInstalledPrograms YES" >> $LOCALDEF # Copy ORIGDEF to DESTDEF rm -f $DESTDEF diff --git a/x11/XFree86-4/Makefile b/x11/XFree86-4/Makefile index 32d20f5fcd88..6db7345f43ad 100644 --- a/x11/XFree86-4/Makefile +++ b/x11/XFree86-4/Makefile @@ -37,6 +37,11 @@ FONTCYR= ${X11BASE}/lib/X11/fonts/cyrillic/crox1c.pcf.gz FONTDEFAULT= ${X11BASE}/lib/X11/fonts/misc/cursor.pcf.gz FONTSCALE= ${X11BASE}/lib/X11/fonts/PEX/Roman.phont +.if make(package) +DEPENDS_TARGET="package" +.endif +.undef NOCLEANDEPENDS + do-install: # empty .include <bsd.port.mk> |