Index: Mk/bsd.port.mk =================================================================== RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v retrieving revision 1.491 diff -u -r1.491 bsd.port.mk --- Mk/bsd.port.mk 10 Jun 2004 07:30:19 -0000 1.491 +++ Mk/bsd.port.mk 5 Jul 2004 00:21:26 -0000 @@ -1167,11 +1167,12 @@ .include "${PORTSDIR}/Mk/bsd.sdl.mk" .endif -# defaults to 4.x for 5.0-CURRENT and 4.5-STABLE; and 3.3.6 for all other branches -.if ${OSVERSION} > 500025 || ( ${OSVERSION} >= 450005 && ${OSVERSION} < 500000 ) -XFREE86_VERSION?= 4 +.if ${OSVERSION} >= 502000 +X_WINDOW_SYSTEM ?= xorg +.elif ${OSVERSION} >= 450005 || ${XFREE86_VERSION} == 4 +X_WINDOW_SYSTEM ?= xfree86-4 .else -XFREE86_VERSION?= 3 +X_WINDOW_SYSTEM ?= xfree86-3 .endif # Location of mounted CDROM(s) to search for files @@ -1396,30 +1397,91 @@ LIB_DEPENDS+= ttf.4:${PORTSDIR}/print/freetype .endif -.if ${XFREE86_VERSION} == 3 +.if defined(X_WINDOW_SYSTEM) && ${X_WINDOW_SYSTEM:L} == xorg +X_IMAKE_PORT= ${PORTSDIR}/devel/imake-6 +X_LIBRARIES_PORT= ${PORTSDIR}/x11/xorg-libraries +X_CLIENTS_PORT= ${PORTSDIR}/x11/xorg-clients +X_SERVER_PORT= ${PORTSDIR}/x11-servers/xorg-server +X_FONTSERVER_PORT= ${PORTSDIR}/x11-servers/xorg-fontserver +X_PRINTSERVER_PORT= ${PORTSDIR}/x11-servers/xorg-printserver +X_VFBSERVER_PORT= ${PORTSDIR}/x11-servers/xorg-vfbserver +X_FONTS_ENCODINGS_PORT= ${PORTSDIR}/x11-fonts/xorg-fonts-encodings +X_FONTS_MISC_PORT= ${PORTSDIR}/x11-fonts/xorg-fonts-miscbitmaps +X_FONTS_100DPI_PORT= ${PORTSDIR}/x11-fonts/xorg-fonts-100dpi +X_FONTS_75DPI_PORT= ${PORTSDIR}/x11-fonts/xorg-fonts-75dpi +X_FONTS_CYRILLIC_PORT= ${PORTSDIR}/x11-fonts/xorg-fonts-cyrillic +X_FONTS_TTF_PORT= ${PORTSDIR}/x11-fonts/xorg-fonts-truetype +X_FONTS_TYPE1_PORT= ${PORTSDIR}/x11-fonts/xorg-fonts-type1 +X_MANUALS_PORT= ${PORTSDIR}/x11/xorg-manpages +.elif defined(X_WINDOW_SYSTEM) && ${X_WINDOW_SYSTEM:L} == xfree86-4 +X_IMAKE_PORT= ${PORTSDIR}/devel/imake-4 +X_LIBRARIES_PORT= ${PORTSDIR}/x11/XFree86-4-libraries +X_CLIENTS_PORT= ${PORTSDIR}/x11/XFree86-4-clients +X_SERVER_PORT= ${PORTSDIR}/x11-servers/XFree86-4-Server +X_FONTSERVER_PORT= ${PORTSDIR}/x11-servers/XFree86-4-FontServer +X_PRINTSERVER_PORT= ${PORTSDIR}/x11-servers/XFree86-4-PrintServer +X_VFBSERVER_PORT= ${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer +X_NESTSERVER_PORT= ${PORTSDIR}/x11-servers/XFree86-4-NestServer +X_FONTS_ENCODINGS_PORT= ${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings +X_FONTS_MISC_PORT= ${PORTSDIR}/x11-fonts/XFree86-4-fontDefaultBitmaps +X_FONTS_100DPI_PORT= ${PORTSDIR}/x11-fonts/XFree86-4-font100dpi +X_FONTS_75DPI_PORT= ${PORTSDIR}/x11-fonts/XFree86-4-font75dpi +X_FONTS_CYRILLIC_PORT= ${PORTSDIR}/x11-fonts/XFree86-4-fontCyrillic +X_FONTS_TTF_PORT= ${PORTSDIR}/x11-fonts/XFree86-4-fontScalable +X_FONTS_TYPE1_PORT= ${PORTSDIR}/x11-fonts/XFree86-4-fontScalable +X_MANUALS_PORT= ${PORTSDIR}/x11/XFree86-4-manuals +.elif defined(X_WINDOW_SYSTEM) && ${X_WINDOW_SYSTEM:L} == xfree86-3 +X_IMAKE_PORT= ${PORTSDIR}/x11/XFree86 +X_LIBRARIES_PORT= ${PORTSDIR}/x11/XFree86 +X_CLIENTS_PORT= ${PORTSDIR}/x11/XFree86 +X_SERVER_PORT= ${PORTSDIR}/x11/XFree86 +X_FONTSERVER_PORT= ${PORTSDIR}/x11/XFree86 +X_PRINTSERVER_PORT= ${PORTSDIR}/x11/XFree86 +X_VFBSERVER_PORT= ${PORTSDIR}/x11/XFree86 +X_NESTSERVER_PORT= ${PORTSDIR}/x11/XFree86 +X_FONTS_ENCODINGS_PORT= ${PORTSDIR}/x11/XFree86 +X_FONTS_MISC_PORT= ${PORTSDIR}/x11/XFree86 +X_FONTS_100DPI_PORT= ${PORTSDIR}/x11/XFree86 +X_FONTS_75DPI_PORT= ${PORTSDIR}/x11/XFree86 +X_FONTS_CYRILLIC_PORT= ${PORTSDIR}/x11/XFree86 +X_FONTS_TTF_PORT= ${PORTSDIR}/x11/XFree86 +X_FONTS_TYPE1_PORT= ${PORTSDIR}/x11/XFree86 +X_MANUALS_PORT= ${PORTSDIR}/x11/XFree86 +.else +.error Bad X_WINDOW_SYSTEM setting +.endif + .if defined(USE_IMAKE) -BUILD_DEPENDS+= imake:${PORTSDIR}/x11/XFree86 +BUILD_DEPENDS+= imake:${X_IMAKE_PORT} .endif + +.if ${X_WINDOW_SYSTEM:L} == xfree86-3 + .if defined(USE_XPM) LIB_DEPENDS+= Xpm.4:${PORTSDIR}/graphics/xpm .endif .if defined(USE_GL) LIB_DEPENDS+= GL.14:${PORTSDIR}/graphics/mesagl .endif -XAWVER= 6 -PKG_IGNORE_DEPENDS?= '^XFree86-3\.' + +XAWVER= 6 +PKG_IGNORE_DEPENDS?= '^XFree86-3\.' + .else + .if defined(USE_IMAKE) -BUILD_DEPENDS+= ${X11BASE}/lib/X11/config/date.def:${PORTSDIR}/devel/imake-4 -RUN_DEPENDS+= mkhtmlindex:${PORTSDIR}/devel/imake-4 +RUN_DEPENDS+= mkhtmlindex:${X_IMAKE_PORT} .endif .if defined(USE_XPM) || defined(USE_GL) -USE_XLIB= yes +USE_XLIB= yes .endif -XAWVER= 7 -PKG_IGNORE_DEPENDS?= 'this_port_does_not_exist' + +XAWVER= 7 +PKG_IGNORE_DEPENDS?= 'this_port_does_not_exist' + .endif -PLIST_SUB+= XAWVER=${XAWVER} + +PLIST_SUB+= XAWVER=${XAWVER} .if defined(USE_MESA) LIB_DEPENDS+= glut.3:${PORTSDIR}/graphics/libglut @@ -1504,15 +1566,7 @@ .endif # USE_MYSQL .if defined(USE_XLIB) -.if ${XFREE86_VERSION} == 3 -# Don't try to build XFree86-3 even if ALWAYS_BUILD_DEPENDS is defined -- -# it's just too big.... -.if !defined(ALWAYS_BUILD_DEPENDS) -LIB_DEPENDS+= X11.6:${PORTSDIR}/x11/XFree86 -.endif -.else -LIB_DEPENDS+= X11.6:${PORTSDIR}/x11/XFree86-4-libraries -.endif +LIB_DEPENDS+= X11.6:${X_LIBRARIES_PORT} # Add explicit X options to avoid problems with false positives in configure .if defined(GNU_CONFIGURE) CONFIGURE_ARGS+=--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include @@ -1715,7 +1769,7 @@ # Figure out where the local mtree file is .if !defined(MTREE_FILE) && !defined(NO_MTREE) .if defined(USE_X_PREFIX) -.if ${XFREE86_VERSION} == 3 +.if ${X_WINDOW_SYSTEM:L} == xfree86-3 MTREE_FILE= /etc/mtree/BSD.x11.dist .else MTREE_FILE= /etc/mtree/BSD.x11-4.dist @@ -2470,7 +2524,7 @@ INFO_PATH?= info .endif -.if ${XFREE86_VERSION} == 3 +.if ${X_WINDOW_SYSTEM:L} == xfree86-3 XFREE86_HTML_MAN= no .else .if defined(USE_IMAKE) Index: arabic/ae_fonts_mono/Makefile =================================================================== RCS file: /home/ncvs/ports/arabic/ae_fonts_mono/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- arabic/ae_fonts_mono/Makefile 16 Nov 2003 02:36:26 -0000 1.2 +++ arabic/ae_fonts_mono/Makefile 4 Jul 2004 21:22:42 -0000 @@ -15,17 +15,11 @@ MAINTAINER= samy@kerneled.com COMMENT= A collection of PCF fonts that include Arabic glyphs +BUILD_DEPENDS= mkfontdir:${X_CLIENTS_PORT} + USE_X_PREFIX= yes USE_BZIP2= yes -.include - -.if ${XFREE86_VERSION} == 4 -BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients -.elif ${XFREE86_VERSION} == 3 -BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86 -.endif - do-build: @mkfontdir ${WRKSRC} @@ -38,4 +32,4 @@ @${CAT} ${PKGMESSAGE} | ${SED} "s|X11BASE|${X11BASE}|g" \ | ${SED} "s|PORTNAME|${PORTNAME}|g" -.include +.include Index: audio/xmcd/Makefile =================================================================== RCS file: /home/ncvs/ports/audio/xmcd/Makefile,v retrieving revision 1.48 diff -u -r1.48 Makefile --- audio/xmcd/Makefile 24 Apr 2004 23:45:57 -0000 1.48 +++ audio/xmcd/Makefile 4 Jul 2004 21:24:36 -0000 @@ -45,7 +45,7 @@ -e 's|_CFLAGS= -pthread|_CFLAGS= ${PTHREAD_CFLAGS}|g; \ s|_LDFLAGS= -pthread|_LDFLAGS= ${PTHREAD_LIBS}|g' -.if ${XFREE86_VERSION} == 4 +.if ${X_WINDOW_SYSTEM:L} != xfree86-3 post-build: (cd ${WRKSRC}; \ for i in xmcd cda; do \ @@ -62,7 +62,7 @@ @${STRIP_CMD} ${LIBBINDIR}/xmcd @${CAT} ${PKGMESSAGE} @${CP} ${WRKSRC}/xmcd_d/XMcd.ad ${PREFIX}/lib/X11/app-defaults/XMcd -.if ${XFREE86_VERSION} == 4 +.if ${X_WINDOW_SYSTEM:L} != xfree86-3 (cd ${WRKSRC}; \ for i in xmcd cda; do \ ${INSTALL_MAN} $${i}.1.html ${PREFIX}/lib/X11/doc/html; \ Index: chinese/arphicttf/Makefile =================================================================== RCS file: /home/ncvs/ports/chinese/arphicttf/Makefile,v retrieving revision 1.16 diff -u -r1.16 Makefile --- chinese/arphicttf/Makefile 21 Nov 2003 03:09:39 -0000 1.16 +++ chinese/arphicttf/Makefile 4 Jul 2004 21:26:43 -0000 @@ -23,15 +23,14 @@ USE_XLIB= yes FONTDIR= ${PREFIX}/share/fonts/TrueType XFONTDIR= ${X11BASE}/lib/X11/fonts/TrueType -INSTALL_ENV= PKG_PREFIX=${PREFIX} XFREE86_VERSION=${XFREE86_VERSION} \ - WANT_GS=${WANT_GS} WITHOUT_X=${WITHOUT_X} +INSTALL_ENV= PKG_PREFIX=${PREFIX} WANT_GS=${WANT_GS} WITHOUT_X=${WITHOUT_X} .include .if defined(WANT_GS) RUN_DEPENDS+= ${LOCALBASE}/share/ghostscript/Resource/ai0/CMap/Identity-H:${PORTSDIR}/print/adobe-cmaps .endif -.if ${XFREE86_VERSION} == 3 && !defined(WITHOUT_X) +.if ${X_WINDOW_SYSTEM:L} == xfree86-3 && !defined(WITHOUT_X) RUN_DEPENDS+= mkfontdir.pl:${PORTSDIR}/x11-servers/XttXF86srv-common .endif Index: chinese/chinput/Makefile =================================================================== RCS file: /home/ncvs/ports/chinese/chinput/Makefile,v retrieving revision 1.9 diff -u -r1.9 Makefile --- chinese/chinput/Makefile 13 Nov 2003 14:44:58 -0000 1.9 +++ chinese/chinput/Makefile 4 Jul 2004 22:11:34 -0000 @@ -16,12 +16,10 @@ MAINTAINER= phj@cn.FreeBSD.org COMMENT= Chinese GB2312,BIG5,Japanese code input server -USE_XLIB= yes +BUILD_DEPENDS= xmkmf:${X_IMAKE_PORT} \ + mkfontdir:${X_CLIENTS_PORT} -.if defined(XFREE86_VERSION) && ${XFREE86_VERSION} == 4 -BUILD_DEPENDS= xmkmf:${PORTSDIR}/devel/imake-4 \ - mkfontdir:${PORTSDIR}/x11/XFree86-4-clients -.endif +USE_XLIB= yes WRKSRC= ${WRKDIR}/${PORTNAME} Index: chinese/cmexfonts/Makefile =================================================================== RCS file: /home/ncvs/ports/chinese/cmexfonts/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- chinese/cmexfonts/Makefile 21 Nov 2003 03:09:40 -0000 1.4 +++ chinese/cmexfonts/Makefile 4 Jul 2004 22:12:10 -0000 @@ -14,19 +14,15 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Big5+ Chinese Mingti bitmap font (by CMEX & DynaLab) for X11 +BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} +RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} + USE_X_PREFIX= yes NO_BUILD= yes -.include - -.if ${XFREE86_VERSION} == 4 -BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11/XFree86-4-clients -RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients -.endif - WRKSRC= ${WRKDIR}/cmexfonts post-install: @${SETENV} ${INSTALL_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.include +.include Index: chinese/cwtexttf/Makefile =================================================================== RCS file: /home/ncvs/ports/chinese/cwtexttf/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- chinese/cwtexttf/Makefile 21 Nov 2003 03:09:41 -0000 1.5 +++ chinese/cwtexttf/Makefile 5 Jul 2004 00:28:43 -0000 @@ -24,12 +24,12 @@ USE_XLIB= yes FONTDIR= ${PREFIX}/share/fonts/TrueType XFONTDIR= ${X11BASE}/lib/X11/fonts/TrueType -INSTALL_ENV= PKG_PREFIX=${PREFIX} XFREE86_VERSION=${XFREE86_VERSION} \ +INSTALL_ENV= PKG_PREFIX=${PREFIX} \ WANT_GS=${WANT_GS} WITHOUT_X=${WITHOUT_X} .include -.if ${XFREE86_VERSION} == 3 && !defined(WITHOUT_X) +.if ${X_WINDOW_SYSTEM:L} == xfree86-3 RUN_DEPENDS+= mkfontdir.pl:${PORTSDIR}/x11-servers/XttXF86srv-common .endif Index: chinese/cxterm/Makefile =================================================================== RCS file: /home/ncvs/ports/chinese/cxterm/Makefile,v retrieving revision 1.22 diff -u -r1.22 Makefile --- chinese/cxterm/Makefile 20 Feb 2003 16:56:52 -0000 1.22 +++ chinese/cxterm/Makefile 4 Jul 2004 22:14:15 -0000 @@ -22,19 +22,15 @@ MAINTAINER= ports@FreeBSD.org COMMENT= An xterm that speaks Chinese +BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} +RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} + WRKSRC= ${WRKDIR}/cxterm-5.0 USE_IMAKE= yes MAN1= cit2tit.1 cxterm.1 hzimctrl.1 tit2cit.1 MANCOMPRESSED= yes -.include - -.if ${XFREE86_VERSION} == 4 -BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11/XFree86-4-clients -RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients -.endif - XMKMF= xmkmf ALL_TARGET= xrelease Makefiles includes all @@ -53,4 +49,4 @@ ${INSTALL_DATA} ${WRKSRC}/Doc/input.doc ${PREFIX}/share/doc/cxterm .endif -.include +.include Index: chinese/gugod-clean/Makefile =================================================================== RCS file: /home/ncvs/ports/chinese/gugod-clean/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- chinese/gugod-clean/Makefile 21 Feb 2003 11:06:28 -0000 1.12 +++ chinese/gugod-clean/Makefile 4 Jul 2004 22:17:30 -0000 @@ -11,12 +11,9 @@ MAINTAINER= gugod@gugod.org COMMENT= A pretty font modifyed from X11 schumacher-clean that match kcfonts -USE_X_PREFIX= yes -.include +RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} -.if ${XFREE86_VERSION} == 4 -RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients -.endif +USE_X_PREFIX= yes FONTFILES= gugod16.bdf gugod18.bdf gugod20.bdf gugod22.bdf @@ -32,4 +29,4 @@ .endfor @cd ${XFONTDIR} ; mkfontdir -.include +.include Index: chinese/kcfonts/Makefile =================================================================== RCS file: /home/ncvs/ports/chinese/kcfonts/Makefile,v retrieving revision 1.15 diff -u -r1.15 Makefile --- chinese/kcfonts/Makefile 12 Apr 2004 04:02:31 -0000 1.15 +++ chinese/kcfonts/Makefile 4 Jul 2004 22:17:55 -0000 @@ -14,6 +14,9 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Kuo Chauo Chinese Fonts collection +BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} +RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} + USE_X_PREFIX= yes .include @@ -22,11 +25,6 @@ BROKEN= "Does not build on sparc64" .endif -.if ${XFREE86_VERSION} == 4 -BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11/XFree86-4-clients -RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients -.endif - NO_WRKSUBDIR= yes .include Index: chinese/moettf/Makefile =================================================================== RCS file: /home/ncvs/ports/chinese/moettf/Makefile,v retrieving revision 1.13 diff -u -r1.13 Makefile --- chinese/moettf/Makefile 9 Apr 2004 03:06:24 -0000 1.13 +++ chinese/moettf/Makefile 4 Jul 2004 21:38:00 -0000 @@ -31,7 +31,7 @@ SHAREMODE= 644 FONTDIR= ${PREFIX}/share/fonts/TrueType XFONTDIR= ${X11BASE}/lib/X11/fonts/TrueType -INSTALL_ENV= PKG_PREFIX=${PREFIX} XFREE86_VERSION=${XFREE86_VERSION} \ +INSTALL_ENV= PKG_PREFIX=${PREFIX} \ DEFAULT=${DEFAULT} WANT_CJK=${WANT_CJK} WANT_GS=${WANT_GS} \ WITHOUT_X=${WITHOUT_X} @@ -43,7 +43,7 @@ .if defined(WANT_GS) RUN_DEPENDS+= ${LOCALBASE}/share/ghostscript/Resource/ai0/CMap/Identity-H:${PORTSDIR}/print/adobe-cmaps .endif -.if ${XFREE86_VERSION} == 3 && !defined(WITHOUT_X) +.if ${X_WINDOW_SYSTEM:L} == xfree86-3 && !defined(WITHOUT_X) RUN_DEPENDS+= mkfontdir.pl:${PORTSDIR}/x11-servers/XttXF86srv-common .endif Index: chinese/ntuttf/Makefile =================================================================== RCS file: /home/ncvs/ports/chinese/ntuttf/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- chinese/ntuttf/Makefile 21 Nov 2003 03:09:42 -0000 1.2 +++ chinese/ntuttf/Makefile 4 Jul 2004 21:38:46 -0000 @@ -24,7 +24,7 @@ USE_XLIB= yes FONTDIR= ${PREFIX}/share/fonts/TrueType XFONTDIR= ${X11BASE}/lib/X11/fonts/TrueType -INSTALL_ENV= PKG_PREFIX=${PREFIX} XFREE86_VERSION=${XFREE86_VERSION} \ +INSTALL_ENV= PKG_PREFIX=${PREFIX} \ WANT_CJK=${WANT_CJK} WANT_GS=${WANT_GS} \ WITHOUT_X=${WITHOUT_X} @@ -36,7 +36,7 @@ .if defined(WANT_GS) RUN_DEPENDS+= ${LOCALBASE}/share/ghostscript/Resource/ai0/CMap/Identity-H:${PORTSDIR}/print/adobe-cmaps .endif -.if ${XFREE86_VERSION} == 3 && !defined(WITHOUT_X) +.if ${X_WINDOW_SYSTEM:L} == xfree86-3 && !defined(WITHOUT_X) RUN_DEPENDS+= mkfontdir.pl:${PORTSDIR}/x11-servers/XttXF86srv-common .endif Index: chinese/wangttf/Makefile =================================================================== RCS file: /home/ncvs/ports/chinese/wangttf/Makefile,v retrieving revision 1.9 diff -u -r1.9 Makefile --- chinese/wangttf/Makefile 21 Nov 2003 03:09:44 -0000 1.9 +++ chinese/wangttf/Makefile 4 Jul 2004 21:39:16 -0000 @@ -27,7 +27,7 @@ SHAREMODE= 644 FONTDIR= ${PREFIX}/share/fonts/TrueType XFONTDIR= ${X11BASE}/lib/X11/fonts/TrueType -INSTALL_ENV= PKG_PREFIX=${PREFIX} XFREE86_VERSION=${XFREE86_VERSION} \ +INSTALL_ENV= PKG_PREFIX=${PREFIX} \ DEFAULT=${DEFAULT} WANT_CJK=${WANT_CJK} WANT_GS=${WANT_GS} \ WITHOUT_X=${WITHOUT_X} @@ -39,7 +39,7 @@ .if defined(WANT_GS) RUN_DEPENDS+= ${LOCALBASE}/share/ghostscript/Resource/ai0/CMap/Identity-H:${PORTSDIR}/print/adobe-cmaps .endif -.if ${XFREE86_VERSION} == 3 && !defined(WITHOUT_X) +.if ${X_WINDOW_SYSTEM:L} == xfree86-3 && !defined(WITHOUT_X) RUN_DEPENDS+= mkfontdir.pl:${PORTSDIR}/x11-servers/XttXF86srv-common .endif Index: chinese/ttfm/Makefile =================================================================== RCS file: /home/ncvs/ports/chinese/ttfm/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- chinese/ttfm/Makefile 21 Nov 2003 03:09:44 -0000 1.12 +++ chinese/ttfm/Makefile 5 Jul 2004 00:31:54 -0000 @@ -13,7 +13,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A Big5/GB enhanced TrueType Font Manager -RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients +RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 FONTSDIR= ${PREFIX}/share/fonts/TrueType/ Index: editors/elvis/Makefile =================================================================== RCS file: /home/ncvs/ports/editors/elvis/Makefile,v retrieving revision 1.10 diff -u -r1.10 Makefile --- editors/elvis/Makefile 16 Mar 2004 22:54:01 -0000 1.10 +++ editors/elvis/Makefile 4 Jul 2004 21:40:41 -0000 @@ -34,7 +34,7 @@ CONFIGURE_ARGS+= --without-x .else USE_XPM= yes -.if ${XFREE86_VERSION} < 4 || defined(WITHOUT_XFT) +.if ${X_WINDOW_SYSTEM:L} == xfree86-3 || defined(WITHOUT_XFT) CONFIGURE_ARGS+= --without-xft .else LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft Index: emulators/bochs/Makefile =================================================================== RCS file: /home/ncvs/ports/emulators/bochs/Makefile,v retrieving revision 1.63 diff -u -r1.63 Makefile --- emulators/bochs/Makefile 27 Mar 2004 13:25:40 -0000 1.63 +++ emulators/bochs/Makefile 4 Jul 2004 22:20:15 -0000 @@ -16,6 +16,9 @@ MAINTAINER= ports@FreeBSD.org COMMENT= An IA-32 (x86) PC emulator that runs DOS, Win 95, and more +BUILD_DEPENDS+= mkfontdir:${X_CLIENTS_PORT} +RUN_DEPENDS+= mkfontdir:${X_CLIENTS_PORT} + USE_XLIB= yes USE_REINPLACE= yes USE_GMAKE= yes @@ -36,13 +39,6 @@ MAN1= bochs.1 bochs-dlx.1 bxcommit.1 bximage.1 MAN5= bochsrc.5 -.include - -.if ${XFREE86_VERSION} == 4 -BUILD_DEPENDS+= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients -RUN_DEPENDS+= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients -.endif - .if defined(WITH_BOCHS_PROCESSORS) .if ${WITH_BOCHS_PROCESSORS} < 1 || ${WITH_BOCHS_PROCESSORS} > 15 .error "WITH_BOCHS_PROCESSORS must be an integer value between 1 and 15." @@ -145,4 +141,4 @@ @${CAT} ${PKGMESSAGE} @${ECHO_MSG} -.include +.include Index: emulators/pcemu/Makefile =================================================================== RCS file: /home/ncvs/ports/emulators/pcemu/Makefile,v retrieving revision 1.19 diff -u -r1.19 Makefile --- emulators/pcemu/Makefile 7 Mar 2003 06:01:17 -0000 1.19 +++ emulators/pcemu/Makefile 4 Jul 2004 22:20:34 -0000 @@ -26,14 +26,10 @@ MAINTAINER= joerg@FreeBSD.org COMMENT= An 8086 PC emulator, by David Hedley -.include - -.if ${XFREE86_VERSION} == 4 -BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11/XFree86-4-clients -RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients -.endif +BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} +RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} USE_XLIB= yes MAKE_ENV= FILESDIR=${FILESDIR} -.include +.include Index: emulators/vice/Makefile =================================================================== RCS file: /home/ncvs/ports/emulators/vice/Makefile,v retrieving revision 1.33 diff -u -r1.33 Makefile --- emulators/vice/Makefile 26 Mar 2004 17:22:17 -0000 1.33 +++ emulators/vice/Makefile 4 Jul 2004 21:42:56 -0000 @@ -45,8 +45,8 @@ .include -.if ${XFREE86_VERSION} == 4 -BUILD_DEPENDS+= bdftopcf:${PORTSDIR}/x11/XFree86-4-clients +.if ${X_WINDOW_SYSTEM:L} != xfree86-3 +BUILD_DEPENDS+= bdftopcf:${X_CLIENTS_PORT} .endif .if ${ARCH} == "alpha" && ${OSVERSION} < 500000 Index: emulators/vmware-guestd4/Makefile =================================================================== RCS file: /home/ncvs/ports/emulators/vmware-guestd4/Makefile,v retrieving revision 1.16 diff -u -r1.16 Makefile --- emulators/vmware-guestd4/Makefile 21 Mar 2004 03:12:42 -0000 1.16 +++ emulators/vmware-guestd4/Makefile 5 Jul 2004 00:29:09 -0000 @@ -52,7 +52,7 @@ .if defined(VMWARE_X_PORTS) -.if ${XFREE86_VERSION} == 3 +.if ${X_WINDOW_SYSTEM:L} == xfree86-3 PLIST_SUB+= INSTALLXSERVER3:="" PLIST_SUB+= INSTALLXSERVER4:="@comment " .else @@ -121,7 +121,7 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/vmware-toolbox ${X11BASE}/bin -.if ${XFREE86_VERSION} == 3 +.if ${X_WINDOW_SYSTEM:L} == xfree86-3 ${INSTALL_PROGRAM} ${WRKSRC}/lib/configurator/XFree86-3/XF86_VMware_4.5 ${X11BASE}/bin/XF86_VMware ${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-3/XF86Config ${X11BASE}/etc/XF86Config_VMware @${ECHO} "" Index: emulators/vmware-tools3/Makefile =================================================================== RCS file: /home/ncvs/ports/emulators/vmware-tools3/Makefile,v retrieving revision 1.13 diff -u -r1.13 Makefile --- emulators/vmware-tools3/Makefile 6 Feb 2004 18:06:47 -0000 1.13 +++ emulators/vmware-tools3/Makefile 5 Jul 2004 00:29:19 -0000 @@ -42,7 +42,7 @@ .include -.if ${XFREE86_VERSION} == 3 +.if ${X_WINDOW_SYSTEM:L} == xfree86-3 PLIST_SUB+= INSTALLXSERVER:="" .else PLIST_SUB+= INSTALLXSERVER:="@comment " @@ -82,7 +82,7 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/vmware-toolbox ${PREFIX}/bin -.if ${XFREE86_VERSION} == 3 +.if ${X_WINDOW_SYSTEM:L} == xfree86-3 ${INSTALL_PROGRAM} ${WRKSRC}/XF86_VMware ${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/XF86Config.dist ${PREFIX}/etc/XF86Config_VMware @${ECHO} "" Index: french/xtel/Makefile =================================================================== RCS file: /home/ncvs/ports/french/xtel/Makefile,v retrieving revision 1.14 diff -u -r1.14 Makefile --- french/xtel/Makefile 21 Feb 2003 12:00:35 -0000 1.14 +++ french/xtel/Makefile 4 Jul 2004 22:21:50 -0000 @@ -15,6 +15,8 @@ COMMENT= An emulator for the french Minitel LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg +BUILD_DEPENDS+= mkfontdir:${X_CLIENTS_PORT} +RUN_DEPENDS+= mkfontdir:${X_CLIENTS_PORT} # Remark: Xtel can serve a network, and emulate TVR and I-Minitel, but this is # the first release of this port, and these functionnalities have not (yet) @@ -77,9 +79,4 @@ @${CAT} ${WRKDIR}/pkg-message | ${SED} -e "s:%%PREFIX%%:${PREFIX}:g" @${ECHO} -.if ${XFREE86_VERSION} == 4 -BUILD_DEPENDS+= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients -RUN_DEPENDS+= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients -.endif - .include Index: games/atitd/Makefile =================================================================== RCS file: /home/ncvs/ports/games/atitd/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- games/atitd/Makefile 6 Feb 2004 13:11:18 -0000 1.3 +++ games/atitd/Makefile 4 Jul 2004 21:46:32 -0000 @@ -16,11 +16,11 @@ MAINTAINER= mdodd@freebsd.org COMMENT= The Linux "A Tale in the Desert" (ATITD) client -RUN_DEPENDS= ${X11BASE}/bin/xhost:${PORTSDIR}/x11/XFree86-4-clients +RUN_DEPENDS= ${X11BASE}/bin/xhost:${X_CLIENTS_PORT} .include -.if ${XFREE86_VERSION} == 4 +.if ${X_WINDOW_SYSTEM:L} != xfree86-3 RUN_DEPENDS+= ${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_dri .else RUN_DEPENDS+= ${LINUXBASE}/lib/libGL.so:${PORTSDIR}/graphics/linux_glx Index: games/linux-q3ademo/Makefile =================================================================== RCS file: /home/ncvs/ports/games/linux-q3ademo/Makefile,v retrieving revision 1.7 diff -u -r1.7 Makefile --- games/linux-q3ademo/Makefile 10 Apr 2004 17:26:36 -0000 1.7 +++ games/linux-q3ademo/Makefile 4 Jul 2004 21:47:04 -0000 @@ -25,7 +25,7 @@ .include -.if ${XFREE86_VERSION} == 4 +.if ${X_WINDOW_SYSTEM:L} != xfree86-3 RUN_DEPENDS += /compat/linux/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_dri .else RUN_DEPENDS += /compat/linux/lib/libGL.so:${PORTSDIR}/graphics/linux_glx Index: games/qix/Makefile =================================================================== RCS file: /home/ncvs/ports/games/qix/Makefile,v retrieving revision 1.9 diff -u -r1.9 Makefile --- games/qix/Makefile 16 May 2004 20:46:59 -0000 1.9 +++ games/qix/Makefile 4 Jul 2004 22:23:23 -0000 @@ -14,18 +14,15 @@ MAINTAINER= jmz@FreeBSD.org COMMENT= The classic arcade game +BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} +RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} + .if defined(WITHOUT_X11) MAKE_ARGS= NO_X11=yes -.include .else USE_X_PREFIX= yes -.include PLIST= pkg-plist.x11 .endif -.if ${XFREE86_VERSION} == 4 -BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11/XFree86-4-clients -RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients -.endif .if !defined(DISPLAY) || ${DISPLAY} == "" IGNORE= Requires an active X session (and DISPLAY variable) to run xrdb. Please compile this while running X. @@ -41,4 +38,4 @@ ${SED} -e s:/usr/local:${PREFIX}: -e s:/usr/X11R6:${PREFIX}: \ < ${WRKSRC}/Makefile~ > ${WRKSRC}/Makefile -.include +.include Index: games/xarchon/Makefile =================================================================== RCS file: /home/ncvs/ports/games/xarchon/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- games/xarchon/Makefile 4 Feb 2004 05:20:45 -0000 1.4 +++ games/xarchon/Makefile 4 Jul 2004 21:49:20 -0000 @@ -19,6 +19,7 @@ USE_XLIB= yes USE_GNOME= esound gtk12 USE_GMAKE= yes +USE_XPM= yes GNU_CONFIGURE= yes USE_REINPLACE= yes @@ -27,12 +28,5 @@ post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} - -.include - -.if ${XFREE86_VERSION} == 3 -LIB_DEPENDS+= Xpm.4:${PORTSDIR}/graphics/xpm -.endif - -.include +.include Index: games/xjewel/Makefile =================================================================== RCS file: /home/ncvs/ports/games/xjewel/Makefile,v retrieving revision 1.24 diff -u -r1.24 Makefile --- games/xjewel/Makefile 7 Mar 2003 06:02:57 -0000 1.24 +++ games/xjewel/Makefile 4 Jul 2004 22:24:20 -0000 @@ -15,14 +15,10 @@ MAINTAINER= jmz@FreeBSD.org COMMENT= X11 dropping jewels game -USE_IMAKE= yes - -.include +BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} +RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} -.if ${XFREE86_VERSION} == 4 -BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11/XFree86-4-clients -RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients -.endif +USE_IMAKE= yes MAN6= xjewel.6 @@ -37,4 +33,4 @@ ${INSTALL_DATA} ${WRKSRC}/bitmaps/seven_seg.pcf.gz ${PREFIX}/${FONTSDIR} @(cd ${PREFIX}/${FONTSDIR} ; mkfontdir) -.include +.include Index: graphics/glide3/Makefile =================================================================== RCS file: /home/ncvs/ports/graphics/glide3/Makefile,v retrieving revision 1.15 diff -u -r1.15 Makefile --- graphics/glide3/Makefile 4 Jun 2004 17:29:19 -0000 1.15 +++ graphics/glide3/Makefile 4 Jul 2004 21:51:12 -0000 @@ -25,7 +25,6 @@ USE_BZIP2= yes WRKSRC= ${WRKDIR}/Glide3 USE_X_PREFIX= yes -XFREE86_VERSION= 4 INSTALLS_SHLIB= yes USE_LIBTOOL_VER= 13 USE_AUTOMAKE_VER= 14 Index: graphics/ivtools/Makefile =================================================================== RCS file: /home/ncvs/ports/graphics/ivtools/Makefile,v retrieving revision 1.11 diff -u -r1.11 Makefile --- graphics/ivtools/Makefile 18 Mar 2004 12:41:26 -0000 1.11 +++ graphics/ivtools/Makefile 4 Jul 2004 21:52:31 -0000 @@ -16,9 +16,12 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Drawing editors derived from idraw +BUILD_DEPENDS= imake:${X_IMAKE_PORT} + USE_XLIB= yes GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R} +INSTALLS_SHLIB= yes MANCOMPRESSED= no MAN1= idraw.1 iclass.1 drawtool.1 comterp.1 comdraw.1 flipbook.1 graphdraw.1 @@ -32,10 +35,4 @@ BROKEN= "fails to configure on ${ARCH} with FreeBSD version ${OSVERSION}" .endif -.if ${XFREE86_VERSION} == 3 -BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake -.else -BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake-4 -.endif - .include Index: graphics/linux_glx/Makefile =================================================================== RCS file: /home/ncvs/ports/graphics/linux_glx/Makefile,v retrieving revision 1.16 diff -u -r1.16 Makefile --- graphics/linux_glx/Makefile 10 Apr 2004 17:26:39 -0000 1.16 +++ graphics/linux_glx/Makefile 4 Jul 2004 21:54:07 -0000 @@ -30,7 +30,7 @@ .include -.if ${XFREE86_VERSION} > 3 +.if ${X_WINDOW_SYSTEM:L} != xfree86-3 IGNORE= "Requires XFree86 3.3.* - will not work with XFree86 4.*" .endif Index: graphics/mesagl/Makefile =================================================================== RCS file: /home/ncvs/ports/graphics/mesagl/Makefile,v retrieving revision 1.63 diff -u -r1.63 Makefile --- graphics/mesagl/Makefile 14 Mar 2004 06:16:41 -0000 1.63 +++ graphics/mesagl/Makefile 4 Jul 2004 21:54:57 -0000 @@ -39,7 +39,7 @@ .include -.if ${XFREE86_VERSION} != 3 +.if ${X_WINDOW_SYSTEM:L} != xfree86-3 IGNORE= is unnecessary because libGL and libGLU come with XFree86 4.0 and higher .endif Index: graphics/pixmap/Makefile =================================================================== RCS file: /home/ncvs/ports/graphics/pixmap/Makefile,v retrieving revision 1.18 diff -u -r1.18 Makefile --- graphics/pixmap/Makefile 7 Mar 2003 06:04:09 -0000 1.18 +++ graphics/pixmap/Makefile 4 Jul 2004 21:58:26 -0000 @@ -15,14 +15,12 @@ MAINTAINER= jmz@FreeBSD.org COMMENT= A pixmap editor based on XPM library +# requires rgb.txt +BUILD_DEPENDS= xrdb:${X_CLIENTS_PORT} + WRKSRC= ${WRKDIR}/pixmap USE_IMAKE= yes USE_XPM= yes MAN1= pixmap.1 -.include -.if ${XFREE86_VERSION} == 4 # requires rgb.txt -BUILD_DEPENDS= xrdb:${PORTSDIR}/x11/XFree86-4-clients -.endif - .include Index: graphics/utah-glx/Makefile =================================================================== RCS file: /home/ncvs/ports/graphics/utah-glx/Makefile,v retrieving revision 1.27 diff -u -r1.27 Makefile --- graphics/utah-glx/Makefile 4 Jun 2004 17:29:20 -0000 1.27 +++ graphics/utah-glx/Makefile 4 Jul 2004 22:01:13 -0000 @@ -54,7 +54,7 @@ .include -.if ${XFREE86_VERSION} > 3 +.if ${X_WINDOW_SYSTEM:L} != xfree86-3 IGNORE= "Requires XFree86 3.3.* - will not work with XFree86 4.*" .endif Index: graphics/xpm/Makefile =================================================================== RCS file: /home/ncvs/ports/graphics/xpm/Makefile,v retrieving revision 1.38 diff -u -r1.38 Makefile --- graphics/xpm/Makefile 17 Apr 2004 13:16:42 -0000 1.38 +++ graphics/xpm/Makefile 4 Jul 2004 22:01:53 -0000 @@ -25,7 +25,7 @@ .include -.if ${XFREE86_VERSION} > 3 +.if ${X_WINDOW_SYSTEM:L} != xfree86-3 IGNORE= is included in XFree86 >3.x .endif Index: japanese/Wnn7-lib/Makefile =================================================================== RCS file: /home/ncvs/ports/japanese/Wnn7-lib/Makefile,v retrieving revision 1.33 diff -u -r1.33 Makefile --- japanese/Wnn7-lib/Makefile 7 Mar 2003 06:04:41 -0000 1.33 +++ japanese/Wnn7-lib/Makefile 4 Jul 2004 22:02:48 -0000 @@ -15,13 +15,7 @@ MAINTAINER= taoka@FreeBSD.org COMMENT= Include files and a library of Wnn7 -.include - -.if ${XFREE86_VERSION} == 3 -BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake -.else -BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake-4 -.endif +BUILD_DEPENDS= imake:${X_IMAKE_PORT} WRKSRC= ${WRKDIR}/src DOCDIR= ${PREFIX}/share/doc/ja-Wnn7-lib @@ -32,6 +26,8 @@ do-build: ( cd ${WRKSRC} ; make World -f Makefile.ini ) +.include + post-install: .if ${PORTOBJFORMAT} == "aout" ${LN} -sf libwnn7.so.1.0 ${PREFIX}/lib/libwnn7.so Index: japanese/alias-fonts/Makefile =================================================================== RCS file: /home/ncvs/ports/japanese/alias-fonts/Makefile,v retrieving revision 1.14 diff -u -r1.14 Makefile --- japanese/alias-fonts/Makefile 21 Feb 2003 12:28:53 -0000 1.14 +++ japanese/alias-fonts/Makefile 4 Jul 2004 22:04:05 -0000 @@ -20,21 +20,16 @@ ${FONTSDIR}/kanji18.pcf.gz:${PORTSDIR}/japanese/kanji18 \ ${FONTSDIR}/k20b.pcf.gz:${PORTSDIR}/japanese/kappa20 \ ${FONTSDIR}/kanji26.pcf.gz:${PORTSDIR}/japanese/kanji26 \ - ${FONTSDIR}/K12-1.pcf.gz:${PORTSDIR}/japanese/jisx0213-fonts + ${FONTSDIR}/K12-1.pcf.gz:${PORTSDIR}/japanese/jisx0213-fonts \ + mkfontdir:${X_CLIENTS_PORT} NO_BUILD= yes USE_X_PREFIX= yes -.include - -.if ${XFREE86_VERSION} == 4 -RUN_DEPENDS+= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients -.endif - FONTSDIR= ${X11BASE}/lib/X11/fonts/local do-install: @${SETENV} PKG_PREFIX=${PREFIX} \ ${PERL} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.include +.include Index: japanese/elisa10x8/Makefile =================================================================== RCS file: /home/ncvs/ports/japanese/elisa10x8/Makefile,v retrieving revision 1.10 diff -u -r1.10 Makefile --- japanese/elisa10x8/Makefile 21 Feb 2003 12:28:56 -0000 1.10 +++ japanese/elisa10x8/Makefile 4 Jul 2004 23:17:36 -0000 @@ -19,14 +19,12 @@ MAINTAINER= ishijima@tri.pref.osaka.jp COMMENT= X11 8-dot kanji font 'elisa font' +RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} + USE_X_PREFIX= yes .include -.if ${XFREE86_VERSION} == 4 -RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients -.endif - NO_WRKSUBDIR= yes FONTSDIR= lib/X11/fonts/local Index: japanese/elisa8x8/Makefile =================================================================== RCS file: /home/ncvs/ports/japanese/elisa8x8/Makefile,v retrieving revision 1.8 diff -u -r1.8 Makefile --- japanese/elisa8x8/Makefile 7 Nov 2003 16:02:01 -0000 1.8 +++ japanese/elisa8x8/Makefile 4 Jul 2004 23:17:43 -0000 @@ -14,14 +14,12 @@ MAINTAINER= toshi@tea.forus.or.jp COMMENT= X11 8-dot kanji font 'elisa font' +RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} + USE_X_PREFIX= yes .include -.if ${XFREE86_VERSION} == 4 -RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients -.endif - NO_WRKSUBDIR= yes BDFTOPCF_CMD= ${PREFIX}/bin/bdftopcf Index: japanese/iv/Makefile =================================================================== RCS file: /home/ncvs/ports/japanese/iv/Makefile,v retrieving revision 1.23 diff -u -r1.23 Makefile --- japanese/iv/Makefile 15 Jun 2004 10:13:12 -0000 1.23 +++ japanese/iv/Makefile 4 Jul 2004 22:28:43 -0000 @@ -21,19 +21,15 @@ MAINTAINER= sanpei@FreeBSD.org COMMENT= A toolkit from Stanford University and Silicon Graphics + Japanese patches +# Warning: we cannot use USE_IMAKE. +BUILD_DEPENDS= imake:${X_IMAKE_PORT} + .include .if ${OSVERSION} > 502112 BROKEN= "Does not compile on FreeBSD >= 5.x" .endif -# Warning: we cannot use USE_IMAKE. -.if ${XFREE86_VERSION} == 3 -BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake -.else -BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake-4 -.endif - USE_GCC= 2.95 USE_XLIB= yes DIST_SUBDIR= iv Index: japanese/jisx0213-fonts/Makefile =================================================================== RCS file: /home/ncvs/ports/japanese/jisx0213-fonts/Makefile,v retrieving revision 1.8 diff -u -r1.8 Makefile --- japanese/jisx0213-fonts/Makefile 7 Mar 2003 06:04:48 -0000 1.8 +++ japanese/jisx0213-fonts/Makefile 4 Jul 2004 23:17:28 -0000 @@ -19,19 +19,14 @@ COMMENT= Japanese jisx0213 fonts BUILD_DEPENDS= mkbold:${PORTSDIR}/x11-fonts/mkbold \ - mkitalic:${PORTSDIR}/x11-fonts/mkitalic + mkitalic:${PORTSDIR}/x11-fonts/mkitalic \ + bdftopcf:${X_CLIENTS_PORT} +RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} NO_WRKSUBDIR= yes USE_X_PREFIX= yes FONTSDIR= lib/X11/fonts/local -.include - -.if ${XFREE86_VERSION} == 4 -BUILD_DEPENDS+= bdftopcf:${PORTSDIR}/x11/XFree86-4-clients -RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients -.endif - EXTRACT_CMD= ${CP} EXTRACT_BEFORE_ARGS= -p EXTRACT_AFTER_ARGS= ${WRKDIR} @@ -50,4 +45,4 @@ post-install: @(cd ${PREFIX}/${FONTSDIR}; mkfontdir) -.include +.include Index: japanese/k10/Makefile =================================================================== RCS file: /home/ncvs/ports/japanese/k10/Makefile,v retrieving revision 1.13 diff -u -r1.13 Makefile --- japanese/k10/Makefile 21 Feb 2003 12:28:59 -0000 1.13 +++ japanese/k10/Makefile 4 Jul 2004 23:17:10 -0000 @@ -16,17 +16,14 @@ COMMENT= X11 10-dot kanji font 'naga10 font' BUILD_DEPENDS= mkbold:${PORTSDIR}/x11-fonts/mkbold \ - mkitalic:${PORTSDIR}/x11-fonts/mkitalic + mkitalic:${PORTSDIR}/x11-fonts/mkitalic \ + bdftopcf:${X_CLIENTS_PORT} +RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} USE_X_PREFIX= yes .include -.if ${XFREE86_VERSION} == 4 -BUILD_DEPENDS+= bdftopcf:${PORTSDIR}/x11/XFree86-4-clients -RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients -.endif - FONTSDIR= lib/X11/fonts/local MAKE_ENV= FONTSDIR=${FONTSDIR} PLIST_SUB= FONTSDIR=${FONTSDIR} Index: japanese/k12/Makefile =================================================================== RCS file: /home/ncvs/ports/japanese/k12/Makefile,v retrieving revision 1.15 diff -u -r1.15 Makefile --- japanese/k12/Makefile 7 Mar 2003 06:04:48 -0000 1.15 +++ japanese/k12/Makefile 4 Jul 2004 23:17:07 -0000 @@ -17,15 +17,13 @@ MAINTAINER= mita@jp.FreeBSD.org COMMENT= X11 12-dot kanji font +BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} +RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} + USE_X_PREFIX= yes .include -.if ${XFREE86_VERSION} == 4 -BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11/XFree86-4-clients -RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients -.endif - WRKSRC= ${WRKDIR}/fonts EXTRACT_ONLY= knm_new_linux.tar.gz Index: japanese/kanji18/Makefile =================================================================== RCS file: /home/ncvs/ports/japanese/kanji18/Makefile,v retrieving revision 1.15 diff -u -r1.15 Makefile --- japanese/kanji18/Makefile 19 Mar 2004 23:56:42 -0000 1.15 +++ japanese/kanji18/Makefile 4 Jul 2004 23:17:02 -0000 @@ -20,7 +20,9 @@ EXTRACT_DEPENDS= gunshar:${PORTSDIR}/archivers/sharutils BUILD_DEPENDS= mkbold:${PORTSDIR}/x11-fonts/mkbold \ - mkitalic:${PORTSDIR}/x11-fonts/mkitalic + mkitalic:${PORTSDIR}/x11-fonts/mkitalic \ + bdftopcf:${X_CLIENTS_PORT} +RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} DIST_SUBDIR= ${DISTNAME} FONTSDIR= lib/X11/fonts/local @@ -29,11 +31,6 @@ .include -.if ${XFREE86_VERSION} == 4 -BUILD_DEPENDS+= bdftopcf:${PORTSDIR}/x11/XFree86-4-clients -RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients -.endif - EXTRACT_CMD= zcat EXTRACT_BEFORE_ARGS= EXTRACT_AFTER_ARGS= | gunshar -d $(WRKDIR) Index: japanese/kappa20/Makefile =================================================================== RCS file: /home/ncvs/ports/japanese/kappa20/Makefile,v retrieving revision 1.21 diff -u -r1.21 Makefile --- japanese/kappa20/Makefile 4 Jun 2004 12:35:05 -0000 1.21 +++ japanese/kappa20/Makefile 4 Jul 2004 23:16:56 -0000 @@ -23,15 +23,12 @@ AYUDISTNAME= ayu20gothic-1.4 AYU_SUFFIX= .tar.gz -BUILD_DEPENDS= mkitalic:${PORTSDIR}/x11-fonts/mkitalic +BUILD_DEPENDS= mkitalic:${PORTSDIR}/x11-fonts/mkitalic \ + bdftopcf:${X_CLIENTS_PORT} +RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} .include -.if ${XFREE86_VERSION} == 4 -BUILD_DEPENDS+= bdftopcf:${PORTSDIR}/x11/XFree86-4-clients -RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients -.endif - FONTSDIR= lib/X11/fonts/local MAKE_ENV= INSTALL_DATA="${INSTALL_DATA}" MAKE_ARGS= FONTSDIR="${FONTSDIR}" Index: japanese/kterm16c/Makefile =================================================================== RCS file: /home/ncvs/ports/japanese/kterm16c/Makefile,v retrieving revision 1.32 diff -u -r1.32 Makefile --- japanese/kterm16c/Makefile 3 May 2004 00:04:43 -0000 1.32 +++ japanese/kterm16c/Makefile 4 Jul 2004 23:16:46 -0000 @@ -27,18 +27,15 @@ MAINTAINER= kiri@FreeBSD.org COMMENT= An xterm that speaks Japanese with 16 colors like on a VGA -BUILD_DEPENDS= nkf:${PORTSDIR}/japanese/nkf +BUILD_DEPENDS= nkf:${PORTSDIR}/japanese/nkf \ + mkfontdir:${X_CLIENTS_PORT} +EXTRACT_DEPENDS+=bdftopcf:${X_CLIENTS_PORT} USE_IMAKE= yes USE_XPM= yes .include -.if ${XFREE86_VERSION} == 4 -EXTRACT_DEPENDS+=bdftopcf:${PORTSDIR}/x11/XFree86-4-clients -BUILD_DEPENDS+= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients -.endif - DOCDIR= ${PREFIX}/share/doc/kterm16c post-extract: Index: japanese/marumoji-fonts/Makefile =================================================================== RCS file: /home/ncvs/ports/japanese/marumoji-fonts/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- japanese/marumoji-fonts/Makefile 7 Mar 2003 06:04:51 -0000 1.4 +++ japanese/marumoji-fonts/Makefile 4 Jul 2004 23:16:38 -0000 @@ -24,7 +24,9 @@ COMMENT= Japanese marumoji fonts BUILD_DEPENDS= mkbold:${PORTSDIR}/x11-fonts/mkbold \ - mkitalic:${PORTSDIR}/x11-fonts/mkitalic + mkitalic:${PORTSDIR}/x11-fonts/mkitalic \ + bdftopcf:${X_CLIENTS_PORT} +RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} NO_WRKSUBDIR= yes USE_X_PREFIX= yes @@ -32,11 +34,6 @@ .include -.if ${XFREE86_VERSION} == 4 -BUILD_DEPENDS+= bdftopcf:${PORTSDIR}/x11/XFree86-4-clients -RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients -.endif - EXTRACT_CMD= ${CP} EXTRACT_BEFORE_ARGS= -p EXTRACT_AFTER_ARGS= ${WRKDIR} Index: japanese/monafonts/Makefile =================================================================== RCS file: /home/ncvs/ports/japanese/monafonts/Makefile,v retrieving revision 1.15 diff -u -r1.15 Makefile --- japanese/monafonts/Makefile 14 Oct 2003 13:15:21 -0000 1.15 +++ japanese/monafonts/Makefile 4 Jul 2004 23:16:30 -0000 @@ -16,17 +16,14 @@ MAINTAINER= nobutaka@FreeBSD.org COMMENT= X11 12,14,16-dot kanji fonts +BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} +RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} + FONTSDIR= lib/X11/fonts/local USE_BZIP2= yes USE_X_PREFIX= yes ALL_TARGET= bdf MAKE_ARGS= PREFIX=${PREFIX} -.include - -.if ${XFREE86_VERSION} == 4 -BUILD_DEPENDS+= bdftopcf:${PORTSDIR}/x11/XFree86-4-clients -RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients -.endif PLIST_SUB= FONTSDIR=${FONTSDIR} @@ -34,4 +31,4 @@ @${SETENV} PKG_PREFIX=${PREFIX} \ ${SH} ${PKGREQ} ${PKGNAME} INSTALL -.include +.include Index: japanese/mplusfonts/Makefile =================================================================== RCS file: /home/ncvs/ports/japanese/mplusfonts/Makefile,v retrieving revision 1.10 diff -u -r1.10 Makefile --- japanese/mplusfonts/Makefile 11 Apr 2004 14:21:04 -0000 1.10 +++ japanese/mplusfonts/Makefile 4 Jul 2004 23:16:28 -0000 @@ -15,16 +15,14 @@ MAINTAINER= Ys@PixyGarden.net COMMENT= 12x13 dots X11 kanji fonts with simple and readable design +BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} +RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} + NO_BUILD= yes USE_X_PREFIX= yes .include -.if ${XFREE86_VERSION} == 4 -BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11/XFree86-4-clients -RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients -.endif - DOCSDIR= ${PREFIX}/share/doc/${PORTNAME} DOCS= INSTALL_E LICENSE_E README_E \ INSTALL_J LICENSE_J README_J Index: japanese/ngraph-fonts/Makefile =================================================================== RCS file: /home/ncvs/ports/japanese/ngraph-fonts/Makefile,v retrieving revision 1.8 diff -u -r1.8 Makefile --- japanese/ngraph-fonts/Makefile 22 Feb 2003 13:24:08 -0000 1.8 +++ japanese/ngraph-fonts/Makefile 4 Jul 2004 23:15:14 -0000 @@ -16,18 +16,13 @@ RUN_DEPENDS= \ ${X11BASE}/lib/X11/fonts/local/kanji18.pcf.gz:${PORTSDIR}/japanese/kanji18 \ - ${X11BASE}/lib/X11/fonts/local/kanji26.pcf.gz:${PORTSDIR}/japanese/kanji26 + ${X11BASE}/lib/X11/fonts/local/kanji26.pcf.gz:${PORTSDIR}/japanese/kanji26 \ + mkfontdir:${X_CLIENTS_PORT} USE_X_PREFIX= yes -.include - -.if ${XFREE86_VERSION} == 4 -RUN_DEPENDS+= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients -.endif - NO_BUILD= yes do-install: # empty -.include +.include Index: japanese/shinonome/Makefile =================================================================== RCS file: /home/ncvs/ports/japanese/shinonome/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- japanese/shinonome/Makefile 4 Feb 2004 05:21:23 -0000 1.12 +++ japanese/shinonome/Makefile 4 Jul 2004 23:15:36 -0000 @@ -15,6 +15,9 @@ MAINTAINER= yoichi@FreeBSD.org COMMENT= Japanese 12,14,16 dot fonts +BUILD_DEPENDS+= bdftopcf:${X_CLIENTS_PORT} +RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} + USE_BZIP2= yes HAS_CONFIGURE= yes USE_GMAKE= yes @@ -25,11 +28,6 @@ .include -.if ${XFREE86_VERSION} == 4 -BUILD_DEPENDS+= bdftopcf:${PORTSDIR}/x11/XFree86-4-clients -RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients -.endif - FONTNAMES=\ shnm6x12a shnm6x12ab shnm6x12ai shnm6x12abi \ shnm6x12r shnm6x12rb shnm6x12ri shnm6x12rbi \ Index: korean/baekmukfonts-bdf/Makefile =================================================================== RCS file: /home/ncvs/ports/korean/baekmukfonts-bdf/Makefile,v retrieving revision 1.21 diff -u -r1.21 Makefile --- korean/baekmukfonts-bdf/Makefile 10 Mar 2004 21:48:33 -0000 1.21 +++ korean/baekmukfonts-bdf/Makefile 4 Jul 2004 23:21:09 -0000 @@ -21,14 +21,10 @@ MAINTAINER= cjh@freebsd.org COMMENT= Free Hangul fonts for X11(baekmuk) -USE_X_PREFIX= yes - -.include +BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} +RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} -.if ${XFREE86_VERSION} == 4 -BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11/XFree86-4-clients -RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients -.endif +USE_X_PREFIX= yes FONTLIST= batang10 batang10b batang12 batang12b batang14 batang14b \ batang16 batang16b batang18 batang18b batang20 batang20b \ @@ -71,4 +67,4 @@ .endfor @(cd ${PREFIX}/${FONTSDIR} && mkfontdir .) -.include +.include Index: korean/mizifont/Makefile =================================================================== RCS file: /home/ncvs/ports/korean/mizifont/Makefile,v retrieving revision 1.21 diff -u -r1.21 Makefile --- korean/mizifont/Makefile 11 Apr 2004 22:38:55 -0000 1.21 +++ korean/mizifont/Makefile 4 Jul 2004 23:19:55 -0000 @@ -18,13 +18,9 @@ EXTRACT_DEPENDS=rpm2cpio:${PORTSDIR}/archivers/rpm -USE_X_PREFIX= yes - -.include +RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} -.if ${XFREE86_VERSION} == 4 -RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients -.endif +USE_X_PREFIX= yes NO_WRKSUBDIR= yes @@ -57,4 +53,4 @@ post-install: @${CAT} ${PKGMESSAGE} -.include +.include Index: korean/hanyangfonts/Makefile =================================================================== RCS file: /home/ncvs/ports/korean/hanyangfonts/Makefile,v retrieving revision 1.16 diff -u -r1.16 Makefile --- korean/hanyangfonts/Makefile 7 Mar 2003 06:05:14 -0000 1.16 +++ korean/hanyangfonts/Makefile 4 Jul 2004 23:20:51 -0000 @@ -16,13 +16,9 @@ MAINTAINER= cjh@FreeBSD.org COMMENT= Hanyang Hangul fonts for X11 -USE_X_PREFIX= yes - -.include +RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} -.if ${XFREE86_VERSION} == 4 -RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients -.endif +USE_X_PREFIX= yes NO_WRKSUBDIR= yes @@ -44,4 +40,4 @@ done; \ mkfontdir ${PREFIX}/lib/X11/fonts/local -.include +.include Index: korean/johabfonts/Makefile =================================================================== RCS file: /home/ncvs/ports/korean/johabfonts/Makefile,v retrieving revision 1.16 diff -u -r1.16 Makefile --- korean/johabfonts/Makefile 7 Mar 2003 06:05:15 -0000 1.16 +++ korean/johabfonts/Makefile 4 Jul 2004 23:20:36 -0000 @@ -14,14 +14,10 @@ MAINTAINER= cjh@FreeBSD.org COMMENT= Hangul fonts for X11(johab) used in many hangul-related programs -USE_IMAKE= yes - -.include +BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} +RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} -.if ${XFREE86_VERSION} == 4 -BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11/XFree86-4-clients -RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients -.endif +USE_IMAKE= yes NO_INSTALL_MANPAGES= yes WRKSRC= ${WRKDIR}/hanterm-font/10-6-6 @@ -29,4 +25,4 @@ pre-install: -${MKDIR} ${PREFIX}/lib/X11/fonts/local -.include +.include Index: korean/pinetreefonts/Makefile =================================================================== RCS file: /home/ncvs/ports/korean/pinetreefonts/Makefile,v retrieving revision 1.17 diff -u -r1.17 Makefile --- korean/pinetreefonts/Makefile 7 Mar 2003 06:05:18 -0000 1.17 +++ korean/pinetreefonts/Makefile 4 Jul 2004 23:19:09 -0000 @@ -17,14 +17,10 @@ MAINTAINER= cjh@FreeBSD.org COMMENT= Hangul fonts for X11(pinetree, KSC5601-1987-0 encoding) -USE_X_PREFIX= yes - -.include +BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} +RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} -.if ${XFREE86_VERSION} == 4 -BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11/XFree86-4-clients -RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients -.endif +USE_X_PREFIX= yes WRKSRC= ${WRKDIR}/pinetree.precomposed/bdf @@ -46,4 +42,4 @@ done; \ mkfontdir ${PREFIX}/lib/X11/fonts/local -.include +.include Index: korean/kaistfonts/Makefile =================================================================== RCS file: /home/ncvs/ports/korean/kaistfonts/Makefile,v retrieving revision 1.15 diff -u -r1.15 Makefile --- korean/kaistfonts/Makefile 4 Feb 2004 05:21:31 -0000 1.15 +++ korean/kaistfonts/Makefile 4 Jul 2004 23:20:05 -0000 @@ -17,14 +17,10 @@ MAINTAINER= cjh@FreeBSD.org COMMENT= X11 KAIST font(ksc5601.1987-0 encoding) collection -USE_X_PREFIX= yes - -.include +BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} +RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} -.if ${XFREE86_VERSION} == 4 -BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11/XFree86-4-clients -RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients -.endif +USE_X_PREFIX= yes USE_GMAKE= yes NO_WRKSUBDIR= yes @@ -41,4 +37,4 @@ post-install: ${CAT} ${PKGMESSAGE} -.include +.include Index: lang/librep/Makefile =================================================================== RCS file: /home/ncvs/ports/lang/librep/Makefile,v retrieving revision 1.54 diff -u -r1.54 Makefile --- lang/librep/Makefile 4 Feb 2004 04:36:05 -0000 1.54 +++ lang/librep/Makefile 4 Jul 2004 23:21:55 -0000 @@ -45,7 +45,7 @@ EXTRA_PATCHES+= ${FILESDIR}/stable-patch-src_numbers.c .endif -.if ${XFREE86_VERSION} == 3 +.if ${X_WINDOW_SYSTEM:L} != xfree86-3 MTREE_FILE= /etc/mtree/BSD.x11.dist .else MTREE_FILE= /etc/mtree/BSD.x11-4.dist Index: mail/metamail/Makefile =================================================================== RCS file: /home/ncvs/ports/mail/metamail/Makefile,v retrieving revision 1.25 diff -u -r1.25 Makefile --- mail/metamail/Makefile 13 Apr 2004 02:45:41 -0000 1.25 +++ mail/metamail/Makefile 4 Jul 2004 23:25:39 -0000 @@ -18,14 +18,9 @@ DEPRECATED= "mastersite disappeared\; last distfile update was in 1994" -RUN_DEPENDS= xloadimage:${PORTSDIR}/x11/xloadimage - -.include - -.if ${XFREE86_VERSION} == 4 -BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11/XFree86-4-clients -RUN_DEPENDS+= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients -.endif +BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} +RUN_DEPENDS= xloadimage:${PORTSDIR}/x11/xloadimage \ + mkfontdir:${X_CLIENTS_PORT} USE_XLIB= yes WRKSRC= ${WRKDIR}/${DISTNAME}/src @@ -40,4 +35,4 @@ post-patch: @${RM} ${WRKSRC}/bin/*.orig -.include +.include Index: misc/magicpoint/Makefile =================================================================== RCS file: /home/ncvs/ports/misc/magicpoint/Makefile,v retrieving revision 1.32 diff -u -r1.32 Makefile --- misc/magicpoint/Makefile 16 Jun 2004 16:39:00 -0000 1.32 +++ misc/magicpoint/Makefile 4 Jul 2004 23:27:40 -0000 @@ -51,7 +51,7 @@ post-build: (cd ${WRKSRC}/contrib/xmindpath; make) -.if ${XFREE86_VERSION} == 4 +.if ${X_WINDOW_SYSTEM:L} != xfree86-3 (cd ${WRKSRC}/contrib/xmindpath; \ ${RM} -f xmindpath.1.html xmindpath-1.html; \ ${X11BASE}/bin/rman -f HTML < xmindpath.1 > xmindpath-1.html && \ @@ -62,7 +62,7 @@ post-install: (cd ${WRKSRC}/contrib/xmindpath; make install) ${GZIP_CMD} ${PREFIX}/man/man1/xmindpath.1 -.if ${XFREE86_VERSION} == 4 +.if ${X_WINDOW_SYSTEM:L} != xfree86-3 (cd ${WRKSRC}/contrib/xmindpath; \ ${INSTALL_MAN} xmindpath.1.html ${PREFIX}/lib/X11/doc/html) .endif Index: multimedia/libdv/Makefile =================================================================== RCS file: /home/ncvs/ports/multimedia/libdv/Makefile,v retrieving revision 1.23 diff -u -r1.23 Makefile --- multimedia/libdv/Makefile 16 Mar 2004 04:23:52 -0000 1.23 +++ multimedia/libdv/Makefile 4 Jul 2004 23:28:15 -0000 @@ -47,7 +47,7 @@ .endif pre-everything:: -.if ${XFREE86_VERSION} < 4 +.if ${X_WINDOW_SYSTEM:L} == xfree86-3 @${ECHO_MSG} '===>' @${ECHO_MSG} '===> ATTENTION <===' @${ECHO_MSG} '===> YOU NEED XFREE86 Version 4.0 <===' Index: net/ayttm/Makefile =================================================================== RCS file: /home/ncvs/ports/net/ayttm/Makefile,v retrieving revision 1.32 diff -u -r1.32 Makefile --- net/ayttm/Makefile 4 Jun 2004 17:29:27 -0000 1.32 +++ net/ayttm/Makefile 4 Jul 2004 23:29:02 -0000 @@ -59,7 +59,7 @@ PLIST_SUB+= LIBARTS="@comment " .endif -.if ${XFREE86_VERSION} >= 4 && !defined(WITHOUT_XFT) +.if ${X_WINDOW_SYSTEM:L} != xfree86-3 && !defined(WITHOUT_XFT) LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft CONFIGURE_ARGS+= --enable-xft CPPFLAGS+= `freetype-config --cflags` Index: net/tightvnc/Makefile =================================================================== RCS file: /home/ncvs/ports/net/tightvnc/Makefile,v retrieving revision 1.20 diff -u -r1.20 Makefile --- net/tightvnc/Makefile 13 Mar 2004 10:00:49 -0000 1.20 +++ net/tightvnc/Makefile 4 Jul 2004 23:30:23 -0000 @@ -17,6 +17,7 @@ COMMENT= Enhanced version of VNC LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg +RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/misc/10x20.pcf.gz:${X_FONTS_MISC_PORT} WRKSRC= ${WRKDIR}/vnc_unixsrc @@ -36,10 +37,6 @@ BROKEN= "Does not compile on !i386" .endif -.if ${XFREE86_VERSION} >= 4 -RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/misc/10x20.pcf.gz:${PORTSDIR}/x11-fonts/XFree86-4-fontDefaultBitmaps -.endif - .if exists(${X11BASE}/share/vnc/classes/index.vnc) IGNORE= "vnc has already been installed, please uninstall it first." .endif Index: security/ssh2/Makefile =================================================================== RCS file: /home/ncvs/ports/security/ssh2/Makefile,v retrieving revision 1.121 diff -u -r1.121 Makefile --- security/ssh2/Makefile 22 Apr 2004 20:56:26 -0000 1.121 +++ security/ssh2/Makefile 4 Jul 2004 23:30:59 -0000 @@ -92,10 +92,8 @@ .endif .if !defined(WITHOUT_X11) -.if ${XFREE86_VERSION} == 4 -BUILD_DEPENDS+= ${X11BASE}/bin/xauth:${PORTSDIR}/x11/XFree86-4-clients -RUN_DEPENDS+= ${X11BASE}/bin/xauth:${PORTSDIR}/x11/XFree86-4-clients -.endif +BUILD_DEPENDS+= ${X11BASE}/bin/xauth:${X_CLIENTS_PORT} +RUN_DEPENDS+= ${X11BASE}/bin/xauth:${X_CLIENTS_PORT} USE_XLIB= yes PLIST_SUB+= WITH_X11:="" .else Index: textproc/scrollkeeper/Makefile =================================================================== RCS file: /home/ncvs/ports/textproc/scrollkeeper/Makefile,v retrieving revision 1.41 diff -u -r1.41 Makefile --- textproc/scrollkeeper/Makefile 14 Mar 2004 06:17:29 -0000 1.41 +++ textproc/scrollkeeper/Makefile 4 Jul 2004 23:34:45 -0000 @@ -56,7 +56,7 @@ .include -.if ${XFREE86_VERSION} == 3 +.if ${X_WINDOW_SYSTEM:L} == xfree86-3 MTREE_FILE= /etc/mtree/BSD.x11.dist .else MTREE_FILE= /etc/mtree/BSD.x11-4.dist Index: vietnamese/vnxfonts/Makefile =================================================================== RCS file: /home/ncvs/ports/vietnamese/vnxfonts/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- vietnamese/vnxfonts/Makefile 7 Mar 2003 06:11:50 -0000 1.6 +++ vietnamese/vnxfonts/Makefile 4 Jul 2004 23:35:23 -0000 @@ -19,16 +19,12 @@ MAINTAINER= obrien@FreeBSD.org COMMENT= X fonts for displaying Vietnamese +BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} +RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} + WRKSRC= ${WRKDIR}/fonts/X USE_X_PREFIX= yes -.include - -.if ${XFREE86_VERSION} == 4 -BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11/XFree86-4-clients -RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients -.endif - do-install: @${MKDIR} ${PREFIX}/lib/X11/fonts/vietnamese @cd ${WRKSRC} ; \ @@ -39,4 +35,4 @@ @${SETENV} PKG_PREFIX=${PREFIX} \ ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.include +.include Index: vietnamese/vnterm/Makefile =================================================================== RCS file: /home/ncvs/ports/vietnamese/vnterm/Makefile,v retrieving revision 1.35 diff -u -r1.35 Makefile --- vietnamese/vnterm/Makefile 18 Aug 2003 00:29:08 -0000 1.35 +++ vietnamese/vnterm/Makefile 4 Jul 2004 23:35:39 -0000 @@ -20,11 +20,9 @@ .include -BUILD_DEPENDS= ${LOCALBASE}/lib/libviqr.a:${PORTSDIR}/vietnamese/libviet +BUILD_DEPENDS= ${LOCALBASE}/lib/libviqr.a:${PORTSDIR}/vietnamese/libviet \ + mkfontdir:${X_CLIENTS_PORT} RUN_DEPENDS= ${PREFIX}/lib/X11/fonts/vietnamese/fonts.dir:${PORTSDIR}/vietnamese/vnxfonts -.if ${XFREE86_VERSION} == 4 -BUILD_DEPENDS+= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients -.endif EXTRACT_AFTER_ARGS= | ${TAR} -xf - xc/programs/xterm WRKSRC= ${WRKDIR}/xc/programs/xterm Index: vietnamese/unicode-uhoai/Makefile =================================================================== RCS file: /home/ncvs/ports/vietnamese/unicode-uhoai/Makefile,v retrieving revision 1.8 diff -u -r1.8 Makefile --- vietnamese/unicode-uhoai/Makefile 7 Mar 2003 06:11:48 -0000 1.8 +++ vietnamese/unicode-uhoai/Makefile 4 Jul 2004 23:36:13 -0000 @@ -20,13 +20,9 @@ USE_X_PREFIX= yes NO_BUILD= taken care of in do-install target -.include - -BUILD_DEPENDS= ttmkfdir:${PORTSDIR}/x11-fonts/ttmkfdir -.if ${XFREE86_VERSION} == 4 -BUILD_DEPENDS+= bdftopcf:${PORTSDIR}/x11/XFree86-4-clients -RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients -.endif +BUILD_DEPENDS= ttmkfdir:${PORTSDIR}/x11-fonts/ttmkfdir \ + bdftopcf:${X_CLIENTS_PORT} +RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} do-install: @${MKDIR} ${PREFIX}/lib/X11/fonts/TrueType @@ -35,6 +31,6 @@ @${SETENV} PKG_PREFIX=${PREFIX} \ ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.include +.include EXTRACT_BEFORE_ARGS+= -L Index: www/amaya/Makefile =================================================================== RCS file: /home/ncvs/ports/www/amaya/Makefile,v retrieving revision 1.42 diff -u -r1.42 Makefile --- www/amaya/Makefile 16 Jun 2004 19:55:40 -0000 1.42 +++ www/amaya/Makefile 4 Jul 2004 23:38:24 -0000 @@ -62,7 +62,7 @@ BROKEN= "Does not compile on alpha" .endif -.if ${XFREE86_VERSION} >= 4 && defined(WITH_OPENGL) +.if ${X_WINDOW_SYSTEM:L} != xfree86-3 && defined(WITH_OPENGL) LIB_DEPENDS+= gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea USE_GL= yes CONFIGURE_ARGS+= --with-gl Index: x11/XFree86/Makefile =================================================================== RCS file: /home/ncvs/ports/x11/XFree86/Makefile,v retrieving revision 1.103 diff -u -r1.103 Makefile --- x11/XFree86/Makefile 7 Mar 2003 06:36:07 -0000 1.103 +++ x11/XFree86/Makefile 5 Jul 2004 00:16:11 -0000 @@ -86,6 +86,10 @@ .include +.if ${X_WINDOW_SYSTEM:L} != xfree86-3 +IGNORE= is part of XFree86-3 +.endif + .if !defined(BUILD_XDIST) && !exists(${FILESDIR}/config) IS_INTERACTIVE= yes # configure script asks questions .endif Index: x11/XFree86-contrib/Makefile =================================================================== RCS file: /home/ncvs/ports/x11/XFree86-contrib/Makefile,v retrieving revision 1.25 diff -u -r1.25 Makefile --- x11/XFree86-contrib/Makefile 26 Mar 2004 23:12:10 -0000 1.25 +++ x11/XFree86-contrib/Makefile 4 Jul 2004 23:38:56 -0000 @@ -28,7 +28,7 @@ .include -.if ${XFREE86_VERSION} != 3 +.if ${X_WINDOW_SYSTEM:L} != xfree86-3 IGNORE= "Only for XFree86 version 3" .endif Index: x11/XFree86-4/Makefile =================================================================== RCS file: /home/ncvs/ports/x11/XFree86-4/Makefile,v retrieving revision 1.155 diff -u -r1.155 Makefile --- x11/XFree86-4/Makefile 12 Nov 2003 01:02:18 -0000 1.155 +++ x11/XFree86-4/Makefile 5 Jul 2004 00:16:54 -0000 @@ -50,4 +50,8 @@ do-install: # empty -.include +.include +.if ${X_WINDOW_SYSTEM:L} != xfree86-4 +IGNORE= is part of XFree86-4 +.endif +.include Index: x11/XFree86-4-clients/Makefile =================================================================== RCS file: /home/ncvs/ports/x11/XFree86-4-clients/Makefile,v retrieving revision 1.125 diff -u -r1.125 Makefile --- x11/XFree86-4-clients/Makefile 31 May 2004 06:15:41 -0000 1.125 +++ x11/XFree86-4-clients/Makefile 5 Jul 2004 00:17:48 -0000 @@ -74,5 +74,11 @@ .include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc" .include + +.if ${X_WINDOW_SYSTEM:L} != xfree86-4 +IGNORE= is part of XFree86-4 +.endif + .include "${FILESDIR}/manpages" + .include Index: x11/XFree86-4-libraries/Makefile =================================================================== RCS file: /home/ncvs/ports/x11/XFree86-4-libraries/Makefile,v retrieving revision 1.139 diff -u -r1.139 Makefile --- x11/XFree86-4-libraries/Makefile 31 May 2004 02:13:21 -0000 1.139 +++ x11/XFree86-4-libraries/Makefile 5 Jul 2004 00:17:25 -0000 @@ -60,6 +60,9 @@ .include "Makefile.inc" .include +.if ${X_WINDOW_SYSTEM:L} != xfree86-4 +IGNORE= is part of XFree86-4 +.endif # BuildXF86DRI is false for FreeBSD < 4.1 .if ${OSVERSION} < 410000 Index: x11/XFree86-4-documents/Makefile =================================================================== RCS file: /home/ncvs/ports/x11/XFree86-4-documents/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- x11/XFree86-4-documents/Makefile 12 Nov 2003 01:02:18 -0000 1.12 +++ x11/XFree86-4-documents/Makefile 5 Jul 2004 00:26:41 -0000 @@ -17,7 +17,6 @@ MAINTAINER= x11@FreeBSD.org COMMENT= XFree86-4 documentation -XFREE86_VERSION= 4 USE_IMAKE= YES PROJECTROOT= -DProjectRoot=${PREFIX} DIST_SUBDIR= xc @@ -36,4 +35,8 @@ ${MAKE} includes ; \ ${MAKE} depend) -.include +.include +.if ${X_WINDOW_SYSTEM:L} != xfree86-4 +IGNORE= is part of XFree86-4 +.endif +.include Index: x11/XFree86-4-manuals/Makefile =================================================================== RCS file: /home/ncvs/ports/x11/XFree86-4-manuals/Makefile,v retrieving revision 1.14 diff -u -r1.14 Makefile --- x11/XFree86-4-manuals/Makefile 31 May 2004 02:13:21 -0000 1.14 +++ x11/XFree86-4-manuals/Makefile 5 Jul 2004 00:17:19 -0000 @@ -18,7 +18,6 @@ CONFLICTS= xorg-manpages-* -XFREE86_VERSION= 4 USE_IMAKE= YES EXTRACT_TARGET= xc/doc/man \ xc/extras/ogl-sample/main/doc/man @@ -37,5 +36,11 @@ ${MAKE} depend) .include + +.if ${X_WINDOW_SYSTEM:L} != xfree86-4 +IGNORE= is part of XFree86-4 +.endif + .include "${FILESDIR}/manpages" + .include Index: x11/dgs/Makefile =================================================================== RCS file: /home/ncvs/ports/x11/dgs/Makefile,v retrieving revision 1.38 diff -u -r1.38 Makefile --- x11/dgs/Makefile 17 Apr 2004 00:17:56 -0000 1.38 +++ x11/dgs/Makefile 4 Jul 2004 23:47:09 -0000 @@ -37,7 +37,7 @@ .include -.if ${XFREE86_VERSION} > 3 +.if ${X_WINDOW_SYSTEM:L} != xfree86-3 IGNORE= "is included in XFree86 4.x and above" .endif Index: x11/emu/Makefile =================================================================== RCS file: /home/ncvs/ports/x11/emu/Makefile,v retrieving revision 1.24 diff -u -r1.24 Makefile --- x11/emu/Makefile 16 May 2004 20:49:38 -0000 1.24 +++ x11/emu/Makefile 4 Jul 2004 23:48:02 -0000 @@ -18,14 +18,6 @@ USE_IMAKE= yes WRKSRC= ${WRKDIR}/emu -.include - -.if ${XFREE86_VERSION} == 4 -BUILD_DEPENDS+= xmkmf:${PORTSDIR}/x11/XFree86-4 -.else -BUILD_DEPENDS+= xmkmf:${PORTSDIR}/x11/XFree86 -.endif - .if !defined(DISPLAY) || ${DISPLAY} == "" IGNORE= Requires an active X session (and DISPLAY variable) to run xrdb. Please compile this while running X. .endif @@ -35,4 +27,4 @@ pre-configure: cd ${WRKSRC}/client ; ${LN} -s ../doc/emu.man . -.include +.include Index: x11/gdkxft/Makefile =================================================================== RCS file: /home/ncvs/ports/x11/gdkxft/Makefile,v retrieving revision 1.24 diff -u -r1.24 Makefile --- x11/gdkxft/Makefile 30 Mar 2004 19:56:43 -0000 1.24 +++ x11/gdkxft/Makefile 4 Jul 2004 23:48:28 -0000 @@ -33,7 +33,7 @@ .include -.if ${XFREE86_VERSION} < 4 +.if ${X_WINDOW_SYSTEM:L} == xfree86-3 IGNORE= "requires XFree86-4.x or later to run" .endif Index: x11/mlterm/Makefile =================================================================== RCS file: /home/ncvs/ports/x11/mlterm/Makefile,v retrieving revision 1.22 diff -u -r1.22 Makefile --- x11/mlterm/Makefile 16 Mar 2004 22:54:03 -0000 1.22 +++ x11/mlterm/Makefile 4 Jul 2004 23:50:30 -0000 @@ -32,7 +32,7 @@ .include -.if ${XFREE86_VERSION} == 3 +.if ${X_WINDOW_SYSTEM:L} == xfree86-3 PKGNAMESUFFIX= -noaa .else CONFIGURE_ARGS+= --enable-anti-alias Index: x11/x3270/Makefile =================================================================== RCS file: /home/ncvs/ports/x11/x3270/Makefile,v retrieving revision 1.19 diff -u -r1.19 Makefile --- x11/x3270/Makefile 8 Sep 2003 09:30:50 -0000 1.19 +++ x11/x3270/Makefile 4 Jul 2004 23:50:59 -0000 @@ -14,14 +14,10 @@ MAINTAINER= Yonatan@xpert.com COMMENT= 3270 Terminal emulator -USE_IMAKE= yes - -.include +BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} +RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} -.if ${XFREE86_VERSION} == 4 -BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11/XFree86-4-clients -RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients -.endif +USE_IMAKE= yes WRKSRC= ${WRKDIR}/x3270-3.1.1 MAN1= x3270.1 x3270if.1 x3270-script.1 ibm_hosts.1 @@ -47,4 +43,4 @@ -e 's,%%CC%%,${CC},' \ ${WRKSRC}/Makefile -.include +.include Index: x11/xgrab/Makefile =================================================================== RCS file: /home/ncvs/ports/x11/xgrab/Makefile,v retrieving revision 1.21 diff -u -r1.21 Makefile --- x11/xgrab/Makefile 16 May 2004 20:48:07 -0000 1.21 +++ x11/xgrab/Makefile 4 Jul 2004 23:51:25 -0000 @@ -17,14 +17,11 @@ MAINTAINER= jmz@FreeBSD.org COMMENT= An X11 image grabber +BUILD_DEPENDS= xrdb:${X_CLIENTS_PORT} + USE_X_PREFIX= yes USE_IMAKE= yes -.include -.if ${XFREE86_VERSION} == 4 -BUILD_DEPENDS= xrdb:${PORTSDIR}/x11/XFree86-4-clients -.endif - MAKE_FLAGS= BINDIR=${PREFIX}/bin MANDIR=${PREFIX}/man/man1 \ XAPPLOADDIR=${PREFIX}/lib/X11/app-defaults -f # "make depend" blows up @@ -36,4 +33,4 @@ MAN1= xgrab.1 xgrabsc.1 -.include +.include Index: x11/xlockmore/Makefile =================================================================== RCS file: /home/ncvs/ports/x11/xlockmore/Makefile,v retrieving revision 1.84 diff -u -r1.84 Makefile --- x11/xlockmore/Makefile 30 Apr 2004 13:04:08 -0000 1.84 +++ x11/xlockmore/Makefile 4 Jul 2004 23:51:54 -0000 @@ -65,7 +65,7 @@ CONFIGURE_ARGS+= --disable-allow-root .endif -.if ${XFREE86_VERSION} >= 4 +.if ${X_WINDOW_SYSTEM:L} != xfree86-3 post-configure: ${REINPLACE_CMD} -e 's/-lXdpms//g' ${WRKSRC}/modes/Makefile .endif Index: x11/xvattr/Makefile =================================================================== RCS file: /home/ncvs/ports/x11/xvattr/Makefile,v retrieving revision 1.7 diff -u -r1.7 Makefile --- x11/xvattr/Makefile 4 Feb 2004 05:09:53 -0000 1.7 +++ x11/xvattr/Makefile 4 Jul 2004 23:52:32 -0000 @@ -26,8 +26,8 @@ .include -.if ${XFREE86_VERSION} == 3 -IGNORE= "Require Xv Extension" +.if ${X_WINDOW_SYSTEM:L} == xfree86-3 +IGNORE= "Requires Xv Extension" .endif .include Index: x11/xorg/Makefile =================================================================== RCS file: /home/ncvs/ports/x11/xorg/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- x11/xorg/Makefile 19 Jun 2004 06:08:43 -0000 1.1 +++ x11/xorg/Makefile 5 Jul 2004 00:18:53 -0000 @@ -51,4 +51,8 @@ do-install: # empty -.include +.include +.if ${X_WINDOW_SYSTEM:L} != xorg +IGNORE= is part of X.Org +.endif +.include Index: x11/xorg-clients/Makefile =================================================================== RCS file: /home/ncvs/ports/x11/xorg-clients/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- x11/xorg-clients/Makefile 17 Jun 2004 01:53:09 -0000 1.3 +++ x11/xorg-clients/Makefile 5 Jul 2004 00:20:25 -0000 @@ -58,5 +58,11 @@ .include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc" .include + +.if ${X_WINDOW_SYSTEM:L} != xorg +IGNORE= is part of X.Org +.endif + .include "${FILESDIR}/manpages" + .include Index: x11/xorg-libraries/Makefile =================================================================== RCS file: /home/ncvs/ports/x11/xorg-libraries/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- x11/xorg-libraries/Makefile 2 Jun 2004 18:05:53 -0000 1.3 +++ x11/xorg-libraries/Makefile 5 Jul 2004 00:19:51 -0000 @@ -57,6 +57,10 @@ .include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc" .include +.if ${X_WINDOW_SYSTEM:L} != xorg +IGNORE= is part of X.Org +.endif + # BuildXF86DRI is false for FreeBSD < 4.1 .if ${OSVERSION} < 410000 PLIST_SUB+= OSMESA:="@comment " Index: x11-fonts/XFree86-4-fontScalable/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-fonts/XFree86-4-fontScalable/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- x11-fonts/XFree86-4-fontScalable/Makefile 31 May 2004 06:13:24 -0000 1.12 +++ x11-fonts/XFree86-4-fontScalable/Makefile 5 Jul 2004 00:23:27 -0000 @@ -21,7 +21,6 @@ CONFLICTS= xorg-fonts-type1-* xorg-fonts-truetype-* -XFREE86_VERSION= 4 USE_IMAKE= YES PROJECTROOT= -DProjectRoot=${PREFIX} DIST_SUBDIR= xc @@ -90,4 +89,8 @@ (cd ${WRKDIR}/xc/fonts/encodings && \ ${MAKE} all) -.include +.include +.if ${X_WINDOW_SYSTEM:L} != xfree86-4 +IGNORE= is part of XFree86-4 +.endif +.include Index: x11-fonts/XFree86-4-fontEncodings/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-fonts/XFree86-4-fontEncodings/Makefile,v retrieving revision 1.11 diff -u -r1.11 Makefile --- x11-fonts/XFree86-4-fontEncodings/Makefile 31 May 2004 06:13:24 -0000 1.11 +++ x11-fonts/XFree86-4-fontEncodings/Makefile 5 Jul 2004 00:23:30 -0000 @@ -20,7 +20,6 @@ CONFLICTS= xorg-fonts-encodings-* -XFREE86_VERSION= 4 USE_IMAKE= YES PROJECTROOT= -DProjectRoot=${PREFIX} DIST_SUBDIR= xc @@ -35,4 +34,8 @@ ${MAKE} includes ; \ ${MAKE} depend) -.include +.include +.if ${X_WINDOW_SYSTEM:L} != xfree86-4 +IGNORE= is part of XFree86-4 +.endif +.include Index: x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile 31 May 2004 06:13:24 -0000 1.12 +++ x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile 5 Jul 2004 00:23:32 -0000 @@ -22,7 +22,6 @@ CONFLICTS= xorg-fonts-miscbitmaps-* -XFREE86_VERSION= 4 USE_IMAKE= YES PROJECTROOT= -DProjectRoot=${PREFIX} DIST_SUBDIR= xc @@ -52,4 +51,8 @@ (cd ${WRKDIR}/xc/fonts/encodings && \ ${MAKE} all) -.include +.include +.if ${X_WINDOW_SYSTEM:L} != xfree86-4 +IGNORE= is part of XFree86-4 +.endif +.include Index: x11-fonts/XFree86-4-fontCyrillic/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-fonts/XFree86-4-fontCyrillic/Makefile,v retrieving revision 1.17 diff -u -r1.17 Makefile --- x11-fonts/XFree86-4-fontCyrillic/Makefile 31 May 2004 06:13:24 -0000 1.17 +++ x11-fonts/XFree86-4-fontCyrillic/Makefile 5 Jul 2004 00:23:34 -0000 @@ -21,7 +21,6 @@ CONFLICTS= xorg-fonts-cyrillic-* -XFREE86_VERSION= 4 USE_IMAKE= YES PROJECTROOT= -DProjectRoot=${PREFIX} DIST_SUBDIR= xc @@ -45,4 +44,8 @@ (cd ${WRKDIR}/xc/fonts/encodings && \ ${MAKE} all) -.include +.include +.if ${X_WINDOW_SYSTEM:L} != xfree86-4 +IGNORE= is part of XFree86-4 +.endif +.include Index: x11-fonts/XFree86-4-font75dpi/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-fonts/XFree86-4-font75dpi/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- x11-fonts/XFree86-4-font75dpi/Makefile 31 May 2004 06:13:23 -0000 1.12 +++ x11-fonts/XFree86-4-font75dpi/Makefile 5 Jul 2004 00:23:37 -0000 @@ -21,7 +21,6 @@ CONFLICTS= xorg-fonts-75dpi-* -XFREE86_VERSION= 4 USE_IMAKE= YES PROJECTROOT= -DProjectRoot=${PREFIX} DIST_SUBDIR= xc @@ -45,4 +44,8 @@ (cd ${WRKDIR}/xc/fonts/encodings && \ ${MAKE} all) -.include +.include +.if ${X_WINDOW_SYSTEM:L} != xfree86-4 +IGNORE= is part of XFree86-4 +.endif +.include Index: x11-fonts/XFree86-4-font100dpi/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-fonts/XFree86-4-font100dpi/Makefile,v retrieving revision 1.13 diff -u -r1.13 Makefile --- x11-fonts/XFree86-4-font100dpi/Makefile 31 May 2004 06:13:23 -0000 1.13 +++ x11-fonts/XFree86-4-font100dpi/Makefile 5 Jul 2004 00:23:38 -0000 @@ -21,7 +21,6 @@ CONFLICTS= xorg-fonts-100dpi-* -XFREE86_VERSION= 4 USE_IMAKE= YES PROJECTROOT= -DProjectRoot=${PREFIX} DIST_SUBDIR= xc @@ -45,4 +44,8 @@ (cd ${WRKDIR}/xc/fonts/encodings && \ ${MAKE} all) -.include +.include +.if ${X_WINDOW_SYSTEM:L} != xfree86-4 +IGNORE= is part of XFree86-4 +.endif +.include Index: x11-fonts/code2000/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-fonts/code2000/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- x11-fonts/code2000/Makefile 9 Dec 2003 00:55:23 -0000 1.1 +++ x11-fonts/code2000/Makefile 5 Jul 2004 00:27:12 -0000 @@ -24,7 +24,7 @@ .include -.if ${XFREE86_VERSION} == 3 +.if ${X_WINDOW_SYSTEM:L} == xfree86-3 RUN_DEPENDS= xfstt:${PORTSDIR}/x11-servers/Xfstt .endif @@ -37,7 +37,7 @@ MSG_FILE= ${PKGDIR}/pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message -.if ${XFREE86_VERSION} == 3 +.if ${X_WINDOW_SYSTEM:L} == xfree86-3 OLDXF86= "" .else OLDXF86= "@comment " @@ -106,7 +106,7 @@ post-install: truetype-link display-message truetype-link: -.if ${XFREE86_VERSION} == 3 +.if ${X_WINDOW_SYSTEM:L} == xfree86-3 ${LN} -fs ${FONTSDIR} ${TTFONTSDIR}/${FONTNAME} .endif Index: x11-fonts/bitmap-fonts/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-fonts/bitmap-fonts/Makefile,v retrieving revision 1.20 diff -u -r1.20 Makefile --- x11-fonts/bitmap-fonts/Makefile 25 Mar 2003 14:20:19 -0000 1.20 +++ x11-fonts/bitmap-fonts/Makefile 5 Jul 2004 00:27:46 -0000 @@ -15,7 +15,7 @@ MAINTAINER= shige@FreeBSD.org COMMENT= Bitmap font, (6x12, 7x14, 8x16, 12x24) dots bitmap font -BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11/XFree86 +BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} # distfile version BITMAP_FONTS_VER= 1.0 @@ -29,14 +29,6 @@ PLIST_SUB= FONTSDIR=${FONTSDIR} -.include - -.if ${XFREE86_VERSION} == 3 -BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11/XFree86 -.elif ${XFREE86_VERSION} == 4 -RUN_DEPENDS= bdftopcf:${PORTSDIR}/x11/XFree86-4-clients -.endif - do-build: @(cd ${WRKSRC}; \ for i in ${BITMAP_FONTS_SIZE} ; do \ @@ -64,4 +56,4 @@ @${SETENV} PKG_PREFIX=${X11BASE} \ ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.include +.include Index: x11-fonts/Xg/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-fonts/Xg/Makefile,v retrieving revision 1.15 diff -u -r1.15 Makefile --- x11-fonts/Xg/Makefile 20 Feb 2003 19:18:01 -0000 1.15 +++ x11-fonts/Xg/Makefile 4 Jul 2004 23:55:07 -0000 @@ -14,14 +14,10 @@ MAINTAINER= ports@FreeBSD.org COMMENT= UNICODE fonts for use with 9term and sam +BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} +RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} + NO_WRKSUBDIR= yes USE_X_PREFIX= yes -.include - -.if ${XFREE86_VERSION} == 4 -BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11/XFree86-4-clients -RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients -.endif - -.include +.include Index: x11-fonts/lfpfonts-var/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-fonts/lfpfonts-var/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- x11-fonts/lfpfonts-var/Makefile 1 May 2004 16:24:47 -0000 1.6 +++ x11-fonts/lfpfonts-var/Makefile 4 Jul 2004 23:55:56 -0000 @@ -14,18 +14,14 @@ MAINTAINER= olgeni@FreeBSD.org COMMENT= Variable width fonts from the Linux Font Project +BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} + WRKSRC= ${WRKDIR}/lfpfonts-var NO_BUILD= yes USE_BZIP2= yes USE_X_PREFIX= yes -.include - -.if ${XFREE86_VERSION} == 4 -BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11/XFree86-4-clients -.endif - do-install: @${MKDIR} ${PREFIX}/lib/X11/fonts/lfpfonts-var @${INSTALL_DATA} ${WRKSRC}/lfp-var/*.pcf.gz ${PREFIX}/lib/X11/fonts/lfpfonts-var @@ -34,4 +30,4 @@ post-install: @${CAT} ${PKGMESSAGE} -.include +.include Index: x11-fonts/lfpfonts-fix/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-fonts/lfpfonts-fix/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- x11-fonts/lfpfonts-fix/Makefile 1 May 2004 16:24:47 -0000 1.6 +++ x11-fonts/lfpfonts-fix/Makefile 4 Jul 2004 23:56:10 -0000 @@ -14,18 +14,14 @@ MAINTAINER= olgeni@FreeBSD.org COMMENT= Fixed width fonts from the Linux Font Project +BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} + WRKSRC= ${WRKDIR}/lfpfonts-fix NO_BUILD= yes USE_BZIP2= yes USE_X_PREFIX= yes -.include - -.if ${XFREE86_VERSION} == 4 -BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11/XFree86-4-clients -.endif - do-install: @${MKDIR} ${PREFIX}/lib/X11/fonts/lfpfonts-fix @${INSTALL_DATA} ${WRKSRC}/lfp-fix/*.pcf.gz ${PREFIX}/lib/X11/fonts/lfpfonts-fix @@ -34,4 +30,4 @@ post-install: @${CAT} ${PKGMESSAGE} -.include +.include Index: x11-fonts/jmk-x11-fonts/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-fonts/jmk-x11-fonts/Makefile,v retrieving revision 1.7 diff -u -r1.7 Makefile --- x11-fonts/jmk-x11-fonts/Makefile 1 May 2004 16:24:46 -0000 1.7 +++ x11-fonts/jmk-x11-fonts/Makefile 4 Jul 2004 23:56:29 -0000 @@ -13,13 +13,9 @@ MAINTAINER= olgeni@FreeBSD.org COMMENT= Jim Knoble's font package for X -USE_IMAKE= yes - -.include +BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} -.if ${XFREE86_VERSION} == 4 -BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11/XFree86-4-clients -.endif +USE_IMAKE= yes do-install: @${MKDIR} ${PREFIX}/lib/X11/fonts/jmk @@ -29,4 +25,4 @@ post-install: @${CAT} ${PKGMESSAGE} -.include +.include Index: x11-fonts/fontconfig/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-fonts/fontconfig/Makefile,v retrieving revision 1.35 diff -u -r1.35 Makefile --- x11-fonts/fontconfig/Makefile 11 May 2004 18:08:57 -0000 1.35 +++ x11-fonts/fontconfig/Makefile 4 Jul 2004 23:56:36 -0000 @@ -157,7 +157,7 @@ .include -.if ${XFREE86_VERSION} == 3 +.if ${X_WINDOW_SYSTEM:L} == xfree86-3 MTREE_FILE= /etc/mtree/BSD.x11.dist .else MTREE_FILE= /etc/mtree/BSD.x11-4.dist Index: x11-fonts/nucleus/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-fonts/nucleus/Makefile,v retrieving revision 1.9 diff -u -r1.9 Makefile --- x11-fonts/nucleus/Makefile 28 Sep 2003 08:53:49 -0000 1.9 +++ x11-fonts/nucleus/Makefile 4 Jul 2004 23:57:48 -0000 @@ -15,16 +15,12 @@ MAINTAINER= olgeni@FreeBSD.org COMMENT= Another font package for X +BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} + NO_WRKSUBDIR= yes USE_X_PREFIX= yes -.include - -.if ${XFREE86_VERSION} == 4 -BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11/XFree86-4-clients -.endif - post-install: @${CAT} ${DESCR} -.include +.include Index: x11-fonts/mozilla-fonts/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-fonts/mozilla-fonts/Makefile,v retrieving revision 1.10 diff -u -r1.10 Makefile --- x11-fonts/mozilla-fonts/Makefile 22 Feb 2004 22:26:19 -0000 1.10 +++ x11-fonts/mozilla-fonts/Makefile 4 Jul 2004 23:58:02 -0000 @@ -15,14 +15,12 @@ MAINTAINER= dom@happygiraffe.net COMMENT= Web fonts for Netscape/Mozilla +BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} + USE_X_PREFIX= true .include -.if ${XFREE86_VERSION} == 4 -BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11/XFree86-4-clients -.endif - post-install: .if !defined(NOPORTDOCS) ${MKDIR} ${PREFIX}/share/doc/mozilla-fonts Index: x11-fonts/libXft/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-fonts/libXft/Makefile,v retrieving revision 1.23 diff -u -r1.23 Makefile --- x11-fonts/libXft/Makefile 22 Mar 2004 19:08:27 -0000 1.23 +++ x11-fonts/libXft/Makefile 4 Jul 2004 23:58:27 -0000 @@ -27,7 +27,7 @@ .include -.if ${XFREE86_VERSION} == 3 +.if ${X_WINDOW_SYSTEM:L} == xfree86-3 BROKEN= Xft requires XFree86 4.x to build. .endif Index: x11-fonts/p5-type1inst/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-fonts/p5-type1inst/Makefile,v retrieving revision 1.15 diff -u -r1.15 Makefile --- x11-fonts/p5-type1inst/Makefile 10 Apr 2004 17:26:53 -0000 1.15 +++ x11-fonts/p5-type1inst/Makefile 4 Jul 2004 23:59:08 -0000 @@ -16,6 +16,8 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A script that helps install Postscript fonts in X Window System +RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} + USE_PERL5= yes USE_XLIB= yes NO_BUILD= yes @@ -30,10 +32,4 @@ ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/README.type1inst .endif -.include - -.if ${XFREE86_VERSION} == 4 -RUN_DEPENDS+= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients -.endif - -.include +.include Index: x11-fonts/webfonts/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-fonts/webfonts/Makefile,v retrieving revision 1.18 diff -u -r1.18 Makefile --- x11-fonts/webfonts/Makefile 19 Mar 2003 07:41:55 -0000 1.18 +++ x11-fonts/webfonts/Makefile 5 Jul 2004 00:00:10 -0000 @@ -34,7 +34,7 @@ .include -.if ${XFREE86_VERSION} == 3 +.if ${X_WINDOW_SYSTEM:L} == xfree86-3 RUN_DEPENDS= xfstt:${PORTSDIR}/x11-servers/Xfstt .endif @@ -54,7 +54,7 @@ MSG_FILE= ${PKGDIR}/pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message -.if ${XFREE86_VERSION} == 3 +.if ${X_WINDOW_SYSTEM:L} == xfree86-3 OLDXF86= .else OLDXF86= "@comment " @@ -179,7 +179,7 @@ post-install: truetype-link display-message truetype-link: -.if ${XFREE86_VERSION} == 3 +.if ${X_WINDOW_SYSTEM:L} == xfree86-3 ${LN} -fs ${FONTSDIR} ${TTFONTSDIR}/${FONTNAME} .endif Index: x11-fonts/terminus-font/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-fonts/terminus-font/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- x11-fonts/terminus-font/Makefile 11 Mar 2003 00:40:06 -0000 1.4 +++ x11-fonts/terminus-font/Makefile 5 Jul 2004 00:00:43 -0000 @@ -14,20 +14,15 @@ MAINTAINER= gugod@gugod.org COMMENT= Terminus Font - a clean fixed width font -BUILD_DEPENDS= mkitalic:${PORTSDIR}/x11-fonts/mkitalic +BUILD_DEPENDS= mkitalic:${PORTSDIR}/x11-fonts/mkitalic \ + bdftopcf:${X_CLIENTS_PORT} +RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} USE_X_PREFIX= yes ALL_TARGET= pcf SHAREMODE= 644 XFONTDIR= ${PREFIX}/lib/X11/fonts/local -.include - -.if ${XFREE86_VERSION} == 4 -BUILD_DEPENDS+= bdftopcf:${PORTSDIR}/x11/XFree86-4-clients -RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients -.endif - post-build: @gzip ${WRKSRC}/*.pcf @@ -36,4 +31,4 @@ @${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${XFONTDIR} @cd ${XFONTDIR}; mkfontdir -.include +.include Index: x11-servers/driglide/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-servers/driglide/Makefile,v retrieving revision 1.16 diff -u -r1.16 Makefile --- x11-servers/driglide/Makefile 4 Jun 2004 17:29:36 -0000 1.16 +++ x11-servers/driglide/Makefile 5 Jul 2004 00:06:34 -0000 @@ -17,7 +17,6 @@ USE_BZIP2= yes USE_X_PREFIX= yes -XFREE86_VERSION= 4 INSTALLS_SHLIB= yes USE_LIBTOOL_VER= 13 USE_AUTOMAKE_VER= 14 Index: x11-toolkits/viewklass/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-toolkits/viewklass/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- x11-toolkits/viewklass/Makefile 5 Jan 2004 17:12:15 -0000 1.12 +++ x11-toolkits/viewklass/Makefile 5 Jul 2004 00:07:26 -0000 @@ -16,22 +16,16 @@ MAINTAINER= ports@FreeBSD.org COMMENT= C++ Framework for Motif +BUILD_DEPENDS= xmkmf:${X_IMAKE_PORT} + USE_X_PREFIX= yes USE_MOTIF= yes USE_REINPLACE= yes GNU_CONFIGURE= yes -.include - -.if ${XFREE86_VERSION} == 3 -BUILD_DEPENDS+= xmkmf:${PORTSDIR}/devel/imake -.else -BUILD_DEPENDS+= xmkmf:${PORTSDIR}/devel/imake-4 -.endif - post-patch: @${REINPLACE_CMD} -e 's/^CFLAGS=/CFLAGS+=/g ; \ s/^CXXFLAGS=/CXXFLAGS+=/g ; \ s/-g -Wall//g' ${WRKSRC}/Makefile.in -.include +.include Index: x11-toolkits/qt33/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-toolkits/qt33/Makefile,v retrieving revision 1.170 diff -u -r1.170 Makefile --- x11-toolkits/qt33/Makefile 9 Jun 2004 16:58:30 -0000 1.170 +++ x11-toolkits/qt33/Makefile 5 Jul 2004 00:07:59 -0000 @@ -115,9 +115,9 @@ CONFIGURE_ARGS+=-no-nas-sound .endif -.if ${XFREE86_VERSION} < 4 +.if ${X_WINDOW_SYSTEM:L} == xfree86-3 BROKEN= "The QT ${PORTVERSION} port does not support any XFree86 < 4.x" -.endif # ${XFREE86_VERSION} < 4 +.endif .if exists(${X11BASE}/include/qt2/qapp.h) BROKEN= "You have QT2 headers installed! Installing this port" Index: x11-toolkits/open-motif/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-toolkits/open-motif/Makefile,v retrieving revision 1.30 diff -u -r1.30 Makefile --- x11-toolkits/open-motif/Makefile 4 Feb 2004 05:10:12 -0000 1.30 +++ x11-toolkits/open-motif/Makefile 5 Jul 2004 00:08:23 -0000 @@ -21,6 +21,8 @@ MAINTAINER= steve@FreeBSD.org COMMENT= Motif X11 Toolkit (industry standard GUI (IEEE 1295)) +RUN_DEPENDS= imake:${X_IMAKE_PORT}/devel/imake-4 + CONFLICTS= lesstif-* USE_X_PREFIX= yes USE_REINPLACE= yes @@ -38,10 +40,6 @@ .include -.if ${XFREE86_VERSION} >= 4 -RUN_DEPENDS= imake:${PORTSDIR}/devel/imake-4 -.endif - # User config option: Build and install Motif demos .if defined(WITHOUT_OPENMOTIF_DEMOS) PLIST_SUB+= MOTIF_DEMOS="@comment " Index: x11-toolkits/fox-devel/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-toolkits/fox-devel/Makefile,v retrieving revision 1.44 diff -u -r1.44 Makefile --- x11-toolkits/fox-devel/Makefile 23 May 2004 19:11:06 -0000 1.44 +++ x11-toolkits/fox-devel/Makefile 5 Jul 2004 00:08:34 -0000 @@ -48,7 +48,7 @@ ## Additional Options ## # -.if ${XFREE86_VERSION} < 4 || defined(WITHOUT_XFT) +.if ${X_WINDOW_SYSTEM:L} == xfree86-3 || defined(WITHOUT_XFT) CONFIGURE_ARGS+= --with-xft=no .else CONFIGURE_ARGS+= --with-xft=yes Index: x11-wm/xfce/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-wm/xfce/Makefile,v retrieving revision 1.72 diff -u -r1.72 Makefile --- x11-wm/xfce/Makefile 16 Mar 2004 22:54:05 -0000 1.72 +++ x11-wm/xfce/Makefile 5 Jul 2004 00:09:06 -0000 @@ -42,7 +42,7 @@ .include -.if ${XFREE86_VERSION} == 4 +.if ${X_WINDOW_SYSTEM:L} != xfree86-3 .if defined(WITH_XFT) LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft CONFIGURE_ARGS+= --enable-xft Index: x11-wm/icewm/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-wm/icewm/Makefile,v retrieving revision 1.98 diff -u -r1.98 Makefile --- x11-wm/icewm/Makefile 24 May 2004 07:57:28 -0000 1.98 +++ x11-wm/icewm/Makefile 5 Jul 2004 00:09:32 -0000 @@ -57,13 +57,13 @@ CONFIGURE_ARGS+= --with-icesound=oss .endif -.if ${XFREE86_VERSION} < 4 || defined(WITHOUT_XFT) +.if ${X_WINDOW_SYSTEM:L} == xfree86-3 || defined(WITHOUT_XFT) CONFIGURE_ARGS+= --enable-corefonts --disable-xfreetype .else LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft .endif -.if ${XFREE86_VERSION} < 4 || defined(WITHOUT_XINERAMA) +.if ${X_WINDOW_SYSTEM:L} == xfree86-3 || defined(WITHOUT_XINERAMA) CONFIGURE_ARGS+= --disable-xinerama .endif Index: x11-wm/enlightenment/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-wm/enlightenment/Makefile,v retrieving revision 1.79 diff -u -r1.79 Makefile --- x11-wm/enlightenment/Makefile 4 Feb 2004 05:10:20 -0000 1.79 +++ x11-wm/enlightenment/Makefile 5 Jul 2004 00:09:45 -0000 @@ -40,7 +40,7 @@ .include -.if (${MACHINE} == "alpha") && (${XFREE86_VERSION} == 3) +.if (${MACHINE} == "alpha") && ${X_WINDOW_SYSTEM:L} == xfree86-3 CONFIGURE_ARGS+= --disable-zoom .endif Index: x11-servers/XFree86-4-VirtualFramebufferServer/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile,v retrieving revision 1.28 diff -u -r1.28 Makefile --- x11-servers/XFree86-4-VirtualFramebufferServer/Makefile 19 Jun 2004 06:10:42 -0000 1.28 +++ x11-servers/XFree86-4-VirtualFramebufferServer/Makefile 5 Jul 2004 00:15:11 -0000 @@ -42,4 +42,8 @@ ${WRKSRC}/lib/Xdmcp/Wraphelp.c .include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc" -.include +.include +.if ${X_WINDOW_SYSTEM:L} != xfree86-4 +IGNORE= is part of XFree86-4 +.endif +.include Index: x11-servers/XFree86-4-Server/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-servers/XFree86-4-Server/Makefile,v retrieving revision 1.156 diff -u -r1.156 Makefile --- x11-servers/XFree86-4-Server/Makefile 10 May 2004 05:42:11 -0000 1.156 +++ x11-servers/XFree86-4-Server/Makefile 5 Jul 2004 00:15:15 -0000 @@ -122,6 +122,10 @@ .include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc" .include +.if ${X_WINDOW_SYSTEM:L} != xfree86-4 +IGNORE= is part of XFree86-4 +.endif + .if ${ARCH} == i386 || ${ARCH} == alpha RUN_DEPENDS+= ${X11BASE}/lib/modules/dri/r200_dri.so:${PORTSDIR}/graphics/dri BuildXF86DRI= YES Index: x11-servers/XFree86-4-PrintServer/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-servers/XFree86-4-PrintServer/Makefile,v retrieving revision 1.26 diff -u -r1.26 Makefile --- x11-servers/XFree86-4-PrintServer/Makefile 19 Jun 2004 06:10:42 -0000 1.26 +++ x11-servers/XFree86-4-PrintServer/Makefile 5 Jul 2004 00:15:18 -0000 @@ -40,4 +40,8 @@ $(INSTALL_PROGRAM) ${WRKSRC}/programs/Xserver/Xprt ${PREFIX}/bin/Xprt .include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc" -.include +.include +.if ${X_WINDOW_SYSTEM:L} != xfree86-4 +IGNORE= is part of XFree86-4 +.endif +.include Index: x11-servers/XFree86-4-NestServer/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-servers/XFree86-4-NestServer/Makefile,v retrieving revision 1.26 diff -u -r1.26 Makefile --- x11-servers/XFree86-4-NestServer/Makefile 12 Dec 2003 23:50:10 -0000 1.26 +++ x11-servers/XFree86-4-NestServer/Makefile 5 Jul 2004 00:15:20 -0000 @@ -36,4 +36,8 @@ ${WRKSRC}/lib/Xdmcp/Wraphelp.c .include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc" -.include +.include +.if ${X_WINDOW_SYSTEM:L} != xfree86-4 +IGNORE= is part of XFree86-4 +.endif +.include Index: x11-servers/XFree86-4-FontServer/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-servers/XFree86-4-FontServer/Makefile,v retrieving revision 1.24 diff -u -r1.24 Makefile --- x11-servers/XFree86-4-FontServer/Makefile 11 Jun 2004 05:49:03 -0000 1.24 +++ x11-servers/XFree86-4-FontServer/Makefile 5 Jul 2004 00:15:23 -0000 @@ -27,4 +27,8 @@ XINSTALL_MAN_DIRS= programs/xfs .include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc" -.include +.include +.if ${X_WINDOW_SYSTEM:L} != xfree86-4 +IGNORE= is part of XFree86-4 +.endif +.include Index: x11-fonts/xorg-fonts-type1/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-fonts/xorg-fonts-type1/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- x11-fonts/xorg-fonts-type1/Makefile 31 May 2004 03:11:07 -0000 1.1 +++ x11-fonts/xorg-fonts-type1/Makefile 5 Jul 2004 00:24:27 -0000 @@ -27,4 +27,8 @@ XINSTALL_DIRS= fonts/scaled/Type1 .include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc" -.include +.include +.if ${X_WINDOW_SYSTEM:L} != xorg +IGNORE= is part of X.Org +.endif +.include Index: x11-fonts/xorg-fonts-truetype/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-fonts/xorg-fonts-truetype/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- x11-fonts/xorg-fonts-truetype/Makefile 31 May 2004 03:22:09 -0000 1.1 +++ x11-fonts/xorg-fonts-truetype/Makefile 5 Jul 2004 00:24:31 -0000 @@ -28,4 +28,8 @@ XINSTALL_DIRS= fonts/scaled/TTF .include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc" -.include +.include +.if ${X_WINDOW_SYSTEM:L} != xorg +IGNORE= is part of X.Org +.endif +.include Index: x11-fonts/xorg-fonts-miscbitmaps/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-fonts/xorg-fonts-miscbitmaps/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- x11-fonts/xorg-fonts-miscbitmaps/Makefile 31 May 2004 03:21:30 -0000 1.1 +++ x11-fonts/xorg-fonts-miscbitmaps/Makefile 5 Jul 2004 00:24:37 -0000 @@ -25,4 +25,8 @@ XINSTALL_DIRS= fonts/bdf/misc .include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc" -.include +.include +.if ${X_WINDOW_SYSTEM:L} != xorg +IGNORE= is part of X.Org +.endif +.include Index: x11-fonts/xorg-fonts-encodings/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-fonts/xorg-fonts-encodings/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- x11-fonts/xorg-fonts-encodings/Makefile 31 May 2004 03:17:29 -0000 1.1 +++ x11-fonts/xorg-fonts-encodings/Makefile 5 Jul 2004 00:24:39 -0000 @@ -23,4 +23,8 @@ XBUILD_DIRS= fonts/encodings .include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc" -.include +.include +.if ${X_WINDOW_SYSTEM:L} != xorg +IGNORE= is part of X.Org +.endif +.include Index: x11-fonts/xorg-fonts-cyrillic/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-fonts/xorg-fonts-cyrillic/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- x11-fonts/xorg-fonts-cyrillic/Makefile 31 May 2004 03:20:52 -0000 1.1 +++ x11-fonts/xorg-fonts-cyrillic/Makefile 5 Jul 2004 00:24:40 -0000 @@ -25,4 +25,8 @@ XINSTALL_DIRS= fonts/bdf/cyrillic .include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc" -.include +.include +.if ${X_WINDOW_SYSTEM:L} != xorg +IGNORE= is part of X.Org +.endif +.include Index: x11-fonts/xorg-fonts-75dpi/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-fonts/xorg-fonts-75dpi/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- x11-fonts/xorg-fonts-75dpi/Makefile 31 May 2004 03:19:42 -0000 1.1 +++ x11-fonts/xorg-fonts-75dpi/Makefile 5 Jul 2004 00:24:42 -0000 @@ -25,4 +25,8 @@ XINSTALL_DIRS= fonts/bdf/75dpi .include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc" -.include +.include +.if ${X_WINDOW_SYSTEM:L} != xorg +IGNORE= is part of X.Org +.endif +.include Index: x11-fonts/xorg-fonts-100dpi/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-fonts/xorg-fonts-100dpi/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- x11-fonts/xorg-fonts-100dpi/Makefile 31 May 2004 03:18:51 -0000 1.1 +++ x11-fonts/xorg-fonts-100dpi/Makefile 5 Jul 2004 00:24:44 -0000 @@ -25,4 +25,8 @@ XINSTALL_DIRS= fonts/bdf/100dpi .include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc" -.include +.include +.if ${X_WINDOW_SYSTEM:L} != xorg +IGNORE= is part of X.Org +.endif +.include Index: x11-servers/xorg-vfbserver/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-servers/xorg-vfbserver/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- x11-servers/xorg-vfbserver/Makefile 19 Jun 2004 02:02:13 -0000 1.1 +++ x11-servers/xorg-vfbserver/Makefile 5 Jul 2004 00:14:23 -0000 @@ -28,4 +28,8 @@ MAN1= Xvfb.1 .include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc" -.include +.include +.if ${X_WINDOW_SYSTEM:L} != xorg +IGNORE= is part of X.Org +.endif +.include Index: x11-servers/xorg-server/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-servers/xorg-server/Makefile,v retrieving revision 1.8 diff -u -r1.8 Makefile --- x11-servers/xorg-server/Makefile 19 Jun 2004 06:03:51 -0000 1.8 +++ x11-servers/xorg-server/Makefile 5 Jul 2004 00:14:35 -0000 @@ -63,6 +63,10 @@ .include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc" .include +.if ${X_WINDOW_SYSTEM:L} != xorg +IGNORE= is part of X.Org +.endif + .if ${ARCH} == i386 || ${ARCH} == alpha RUN_DEPENDS+= ${X11BASE}/lib/modules/dri/r200_dri.so:${PORTSDIR}/graphics/dri .endif Index: x11-servers/xorg-printserver/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-servers/xorg-printserver/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- x11-servers/xorg-printserver/Makefile 19 Jun 2004 01:54:48 -0000 1.1 +++ x11-servers/xorg-printserver/Makefile 5 Jul 2004 00:14:37 -0000 @@ -26,4 +26,8 @@ XMAN_DIRS= programs/Xserver .include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc" -.include +.include +.if ${X_WINDOW_SYSTEM:L} != xorg +IGNORE= is part of X.Org +.endif +.include Index: x11-servers/xorg-fontserver/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-servers/xorg-fontserver/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- x11-servers/xorg-fontserver/Makefile 11 Jun 2004 05:36:11 -0000 1.1 +++ x11-servers/xorg-fontserver/Makefile 5 Jul 2004 00:14:39 -0000 @@ -32,4 +32,8 @@ ${PREFIX}/lib/X11/fs/config.default .include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc" -.include +.include +.if ${X_WINDOW_SYSTEM:L} != xorg +IGNORE= is part of X.Org +.endif +.include Index: x11-fonts/etlfonts/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-fonts/etlfonts/Makefile,v retrieving revision 1.14 diff -u -r1.14 Makefile --- x11-fonts/etlfonts/Makefile 7 Mar 2003 06:13:03 -0000 1.14 +++ x11-fonts/etlfonts/Makefile 5 Jul 2004 00:28:09 -0000 @@ -15,22 +15,18 @@ MAINTAINER= mita@jp.FreeBSD.org COMMENT= X11 supplemental fonts +BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} +RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} + EXTRACT_CMD= ${TAR} EXTRACT_BEFORE_ARGS= -xf EXTRACT_AFTER_ARGS= # empty USE_X_PREFIX= yes -.include - -.if ${XFREE86_VERSION} == 4 -BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11/XFree86-4-clients -RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients -.endif - post-extract: @${GUNZIP_CMD} ${WRKSRC}/*.gz post-install: @${SH} ${PKGREQ} ${PKGNAME} INSTALL -.include +.include Index: devel/gaphor/Makefile =================================================================== RCS file: /home/ncvs/ports/devel/gaphor/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- devel/gaphor/Makefile 15 Jun 2004 01:53:55 -0000 1.2 +++ devel/gaphor/Makefile 5 Jul 2004 00:33:23 -0000 @@ -21,7 +21,7 @@ USE_PYTHON= 2.2+ .if !defined(DISPLAY) -BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer +BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT} DISPLAYHACK= localhost:1001 .endif Index: devel/gauche-sdl/Makefile =================================================================== RCS file: /home/ncvs/ports/devel/gauche-sdl/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- devel/gauche-sdl/Makefile 9 Jun 2004 03:22:02 -0000 1.5 +++ devel/gauche-sdl/Makefile 5 Jul 2004 00:34:02 -0000 @@ -15,9 +15,9 @@ COMMENT= Scheme script interpreter with multibyte character handling BUILD_DEPENDS= gosh:${PORTSDIR}/lang/gauche \ - ${X11BASE}/lib/X11/rgb.txt:${PORTSDIR}/x11/XFree86-4-clients + ${X11BASE}/lib/X11/rgb.txt:${X_CLIENTS_PORT} RUN_DEPENDS= gosh:${PORTSDIR}/lang/gauche \ - ${X11BASE}/lib/X11/rgb.txt:${PORTSDIR}/x11/XFree86-4-clients + ${X11BASE}/lib/X11/rgb.txt:${X_CLIENTS_PORT} BROKEN= "SDL is needed in patch phase but only added in build phase" Index: editors/openoffice-1.0/Makefile =================================================================== RCS file: /home/ncvs/ports/editors/openoffice-1.0/Makefile,v retrieving revision 1.191 diff -u -r1.191 Makefile --- editors/openoffice-1.0/Makefile 29 May 2004 22:15:02 -0000 1.191 +++ editors/openoffice-1.0/Makefile 5 Jul 2004 00:35:09 -0000 @@ -120,7 +120,7 @@ BUILD_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant .if !defined(DISPLAY) -BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer +BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT} .endif LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ Index: editors/openoffice-1.1/Makefile =================================================================== RCS file: /home/ncvs/ports/editors/openoffice-1.1/Makefile,v retrieving revision 1.149 diff -u -r1.149 Makefile --- editors/openoffice-1.1/Makefile 29 May 2004 22:15:02 -0000 1.149 +++ editors/openoffice-1.1/Makefile 5 Jul 2004 00:35:25 -0000 @@ -116,7 +116,7 @@ ${ANT}:${PORTSDIR}/devel/apache-ant \ ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft .if !defined(DISPLAY) -BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer +BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT} .endif LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ Index: editors/openoffice-1.1-devel/Makefile =================================================================== RCS file: /home/ncvs/ports/editors/openoffice-1.1-devel/Makefile,v retrieving revision 1.144 diff -u -r1.144 Makefile --- editors/openoffice-1.1-devel/Makefile 29 May 2004 22:15:02 -0000 1.144 +++ editors/openoffice-1.1-devel/Makefile 5 Jul 2004 00:36:19 -0000 @@ -113,7 +113,7 @@ ${ANT}:${PORTSDIR}/devel/apache-ant \ ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft .if !defined(DISPLAY) -BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer +BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT} .endif LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ Index: editors/openoffice-2.0-devel/Makefile =================================================================== RCS file: /home/ncvs/ports/editors/openoffice-2.0-devel/Makefile,v retrieving revision 1.122 diff -u -r1.122 Makefile --- editors/openoffice-2.0-devel/Makefile 15 Jun 2004 09:19:21 -0000 1.122 +++ editors/openoffice-2.0-devel/Makefile 5 Jul 2004 00:37:28 -0000 @@ -28,6 +28,7 @@ USE_BISON= yes USE_GMAKE= yes USE_CCACHE= yes +USE_XLIB= yes .include .include <${FILESDIR}/Makefile.localized> @@ -67,18 +68,16 @@ CXX= g++32 .endif - BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant -BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft BUILD_DEPENDS+= ${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip BUILD_DEPENDS+= gcp:${PORTSDIR}/sysutils/coreutils .if !defined(DISPLAY) -BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer +BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT} .endif LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ Index: emulators/vmware_xf4mod/Makefile =================================================================== RCS file: /home/ncvs/ports/emulators/vmware_xf4mod/Makefile,v retrieving revision 1.16 diff -u -r1.16 Makefile --- emulators/vmware_xf4mod/Makefile 21 Jun 2004 21:27:17 -0000 1.16 +++ emulators/vmware_xf4mod/Makefile 5 Jul 2004 00:38:29 -0000 @@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A XFree86 4.x driver module for VMware guests -RUN_DEPENDS= XFree86:${PORTSDIR}/x11/XFree86-4 +RUN_DEPENDS= XFree86:${X_SERVER_PORT} NO_WRKSUBDIR= yes Index: graphics/diacanvas2/Makefile =================================================================== RCS file: /home/ncvs/ports/graphics/diacanvas2/Makefile,v retrieving revision 1.8 diff -u -r1.8 Makefile --- graphics/diacanvas2/Makefile 15 Jun 2004 01:44:09 -0000 1.8 +++ graphics/diacanvas2/Makefile 5 Jul 2004 00:39:25 -0000 @@ -26,7 +26,7 @@ INSTALLS_SHLIB= yes .if !defined(DISPLAY) -BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer +BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT} CONFIGURE_ENV+= DISPLAY=localhost:1001 .endif Index: graphics/sng/Makefile =================================================================== RCS file: /home/ncvs/ports/graphics/sng/Makefile,v retrieving revision 1.8 diff -u -r1.8 Makefile --- graphics/sng/Makefile 4 Feb 2004 05:21:07 -0000 1.8 +++ graphics/sng/Makefile 5 Jul 2004 00:39:46 -0000 @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= compiler/decompiler for Scriptable Network Graphics -BUILD_DEPENDS= ${X11BASE}/lib/X11/rgb.txt:${PORTSDIR}/x11/XFree86-4-clients +BUILD_DEPENDS= ${X11BASE}/lib/X11/rgb.txt:${X_CLIENTS_PORT} RUN_DEPENDS= ${BUILD_DEPENDS} LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png Index: hebrew/culmus/Makefile =================================================================== RCS file: /home/ncvs/ports/hebrew/culmus/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- hebrew/culmus/Makefile 16 Jun 2004 20:56:12 -0000 1.4 +++ hebrew/culmus/Makefile 5 Jul 2004 00:42:13 -0000 @@ -14,7 +14,7 @@ MAINTAINER= yonatan@xpert.com COMMENT= Free Hebrew Type1 fonts -BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients +BUILD_DEPENDS= mkfontdir:${X_CLIENTS_PORT} USE_X_PREFIX= yes NO_BUILD= yes Index: misc/gtkfind/Makefile =================================================================== RCS file: /home/ncvs/ports/misc/gtkfind/Makefile,v retrieving revision 1.20 diff -u -r1.20 Makefile --- misc/gtkfind/Makefile 6 Feb 2004 13:11:49 -0000 1.20 +++ misc/gtkfind/Makefile 5 Jul 2004 00:42:45 -0000 @@ -14,7 +14,7 @@ MAINTAINER= billf@FreeBSD.org COMMENT= The program to use to have to remember all the options to find(1) -BUILD_DEPENDS= xterm:${PORTSDIR}/x11/XFree86-4-clients +BUILD_DEPENDS= xterm:${X_CLIENTS_PORT} USE_X_PREFIX= yes USE_GMAKE= yes Index: misc/videotext/Makefile =================================================================== RCS file: /home/ncvs/ports/misc/videotext/Makefile,v retrieving revision 1.16 diff -u -r1.16 Makefile --- misc/videotext/Makefile 17 Feb 2004 08:42:52 -0000 1.16 +++ misc/videotext/Makefile 5 Jul 2004 00:43:10 -0000 @@ -14,7 +14,7 @@ MAINTAINER= roger@FreeBSD.org COMMENT= X11/Xview TV Videotext/Teletext page viewer (.vtx files) -BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11/XFree86-4-clients +BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ xview.3:${PORTSDIR}/x11-toolkits/xview Index: net/tsclient/Makefile =================================================================== RCS file: /home/ncvs/ports/net/tsclient/Makefile,v retrieving revision 1.13 diff -u -r1.13 Makefile --- net/tsclient/Makefile 5 Apr 2004 03:30:24 -0000 1.13 +++ net/tsclient/Makefile 5 Jul 2004 00:43:48 -0000 @@ -21,7 +21,7 @@ .endif .ifdef (WITH_XNEST) -RUN_DEPENDS+= Xnest:${PORTSDIR}/x11-servers/XFree86-4-NestServer +RUN_DEPENDS+= Xnest:${X_NESTSERVER_PORT} .endif USE_X_PREFIX= yes Index: net/vnc/Makefile =================================================================== RCS file: /home/ncvs/ports/net/vnc/Makefile,v retrieving revision 1.39 diff -u -r1.39 Makefile --- net/vnc/Makefile 9 Apr 2004 20:56:03 -0000 1.39 +++ net/vnc/Makefile 5 Jul 2004 00:44:44 -0000 @@ -32,8 +32,8 @@ MAN1+= Xvnc.1 \ vncserver.1 -RUN_DEPENDS+= xauth:${PORTSDIR}/x11/XFree86-4-clients \ -${X11BASE}/lib/X11/fonts/misc/6x13-ISO8859-1.pcf.gz:${PORTSDIR}/x11-fonts/XFree86-4-fontDefaultBitmaps +RUN_DEPENDS+= xauth:${X_CLIENTS_PORT} \ + ${X11BASE}/lib/X11/fonts/misc/6x13-ISO8859-1.pcf.gz:${X_FONTS_MISC_PORT} USE_PERL5_RUN= yes .endif Index: news/pyne/Makefile =================================================================== RCS file: /home/ncvs/ports/news/pyne/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- news/pyne/Makefile 4 Feb 2004 05:08:29 -0000 1.12 +++ news/pyne/Makefile 5 Jul 2004 00:45:39 -0000 @@ -22,7 +22,7 @@ # ugly hack imported from openoffice. .if !defined(DISPLAY) -BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer +BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT} DISPLAYHACK=localhost:1001 .endif Index: print/cjk-lyx/Makefile =================================================================== RCS file: /home/ncvs/ports/print/cjk-lyx/Makefile,v retrieving revision 1.22 diff -u -r1.22 Makefile --- print/cjk-lyx/Makefile 4 Jun 2004 17:29:30 -0000 1.22 +++ print/cjk-lyx/Makefile 5 Jul 2004 00:46:05 -0000 @@ -17,7 +17,7 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \ latex:${PORTSDIR}/print/teTeX \ - makepsres:${PORTSDIR}/x11/XFree86-4-clients + makepsres:${X_CLIENTS_PORT} RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 \ latex:${PORTSDIR}/print/teTeX Index: print/lyx/Makefile =================================================================== RCS file: /home/ncvs/ports/print/lyx/Makefile,v retrieving revision 1.88 diff -u -r1.88 Makefile --- print/lyx/Makefile 30 May 2004 19:35:54 -0000 1.88 +++ print/lyx/Makefile 5 Jul 2004 00:46:28 -0000 @@ -18,7 +18,7 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \ latex:${PORTSDIR}/print/teTeX \ - makepsres:${PORTSDIR}/x11/XFree86-4-clients + makepsres:${X_CLIENTS_PORT} RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 \ latex:${PORTSDIR}/print/teTeX Index: x11/kdelibs3/Makefile =================================================================== RCS file: /home/ncvs/ports/x11/kdelibs3/Makefile,v retrieving revision 1.151 diff -u -r1.151 Makefile --- x11/kdelibs3/Makefile 21 Jun 2004 20:36:10 -0000 1.151 +++ x11/kdelibs3/Makefile 5 Jul 2004 00:49:33 -0000 @@ -19,7 +19,7 @@ CONFLICTS= kdebase-3.[0-1] kdebase-3.0.* kdebase-3.1.* -BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients +BUILD_DEPENDS= mkfontdir:${X_CLIENTS_PORT} LIB_DEPENDS= art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 \ artsc.0:${PORTSDIR}/audio/arts \ cups.2:${PORTSDIR}/print/cups-base \ @@ -30,8 +30,8 @@ xml2.5:${PORTSDIR}/textproc/libxml2 \ xslt.2:${PORTSDIR}/textproc/libxslt \ pcre.0:${PORTSDIR}/devel/pcre -RUN_DEPENDS= ${FONTSCALE}:${PORTSDIR}/x11-fonts/XFree86-4-fontScalable \ - ${FONTENCOD}:${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings +RUN_DEPENDS= ${FONTSCALE}:${X_FONTS_TTF_PORT} \ + ${FONTENCOD}:${X_FONTS_ENCODINGS_PORT} USE_GETTEXT= yes USE_QT_VER= 3 Index: x11/kdebase3/Makefile =================================================================== RCS file: /home/ncvs/ports/x11/kdebase3/Makefile,v retrieving revision 1.139 diff -u -r1.139 Makefile --- x11/kdebase3/Makefile 9 Jun 2004 16:58:25 -0000 1.139 +++ x11/kdebase3/Makefile 5 Jul 2004 01:05:04 -0000 @@ -16,7 +16,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Basic applications for the KDE system -BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients +BUILD_DEPENDS= mkfontdir:${X_CLIENTS_PORT} LIB_DEPENDS= smbclient:${PORTSDIR}/net/samba-libsmbclient USE_KDELIBS_VER=3 Index: x11-wm/fluxbox/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-wm/fluxbox/Makefile,v retrieving revision 1.29 diff -u -r1.29 Makefile --- x11-wm/fluxbox/Makefile 4 Jun 2004 17:29:37 -0000 1.29 +++ x11-wm/fluxbox/Makefile 5 Jul 2004 00:52:47 -0000 @@ -23,8 +23,8 @@ LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft RUN_DEPENDS= bsetbg:${PORTSDIR}/x11-wm/boxtools \ - xterm:${PORTSDIR}/x11/XFree86-4-clients -BUILD_DEPENDS= xterm:${PORTSDIR}/x11/XFree86-4-clients + xterm:${X_CLIENTS_PORT} +BUILD_DEPENDS= xterm:${X_CLIENTS_PORT} .if defined(WITH_REMEMBER) WANT_AUTOMAKE_VER=14 .endif Index: x11-wm/fluxbox-devel/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-wm/fluxbox-devel/Makefile,v retrieving revision 1.38 diff -u -r1.38 Makefile --- x11-wm/fluxbox-devel/Makefile 2 Jun 2004 04:51:56 -0000 1.38 +++ x11-wm/fluxbox-devel/Makefile 5 Jul 2004 00:53:02 -0000 @@ -20,10 +20,10 @@ MAINTAINER= mezz@FreeBSD.org COMMENT= A small and fast window manager based on BlackBox -BUILD_DEPENDS= xterm:${PORTSDIR}/x11/XFree86-4-clients +BUILD_DEPENDS= xterm:${X_CLIENTS_PORT} LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft RUN_DEPENDS= bsetbg:${PORTSDIR}/x11-wm/boxtools \ - xterm:${PORTSDIR}/x11/XFree86-4-clients + xterm:${X_CLIENTS_PORT} CONFLICTS= fluxbox-0.1.* Index: x11-toolkits/pango/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-toolkits/pango/Makefile,v retrieving revision 1.62 diff -u -r1.62 Makefile --- x11-toolkits/pango/Makefile 31 May 2004 19:41:46 -0000 1.62 +++ x11-toolkits/pango/Makefile 5 Jul 2004 00:53:58 -0000 @@ -18,8 +18,8 @@ BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft -RUN_DEPENDS= ${FONTSCALE}:${PORTSDIR}/x11-fonts/XFree86-4-fontScalable \ - ${FONTENCOD}:${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings +RUN_DEPENDS= ${FONTSCALE}:${X_FONTS_TTF_PORT} \ + ${FONTENCOD}:${X_FONTS_ENCODINGS_PORT} USE_BZIP2= yes USE_GETTEXT= yes @@ -61,3 +61,4 @@ .endif .include + Index: x11-fonts/cyr-rfx/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-fonts/cyr-rfx/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- x11-fonts/cyr-rfx/Makefile 7 Mar 2003 06:13:03 -0000 1.4 +++ x11-fonts/cyr-rfx/Makefile 5 Jul 2004 00:55:07 -0000 @@ -16,8 +16,8 @@ MAINTAINER= mi@aldan.algebra.com COMMENT= Cyrillic X11 bitmap fonts from CYR-RFX project -BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11/XFree86-4-clients \ - mkfontdir:${PORTSDIR}/x11/XFree86-4-clients +BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} + mkfontdir:${X_CLIENTS_PORT} USE_X_PREFIX= yes # See WWW for other available encodings Index: x11-fonts/geminifonts/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-fonts/geminifonts/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- x11-fonts/geminifonts/Makefile 7 Mar 2003 06:13:03 -0000 1.6 +++ x11-fonts/geminifonts/Makefile 5 Jul 2004 00:55:23 -0000 @@ -17,7 +17,7 @@ MAINTAINER= mi@aldan.algebra.com COMMENT= Ukrainian KOI8 fonts for X11R6 (koi8-u) -BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11/XFree86-4-clients +BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} USE_PERL5_BUILD=yes USE_X_PREFIX= yes Index: x11-fonts/sgifonts/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-fonts/sgifonts/Makefile,v retrieving revision 1.13 diff -u -r1.13 Makefile --- x11-fonts/sgifonts/Makefile 7 Apr 2004 13:37:26 -0000 1.13 +++ x11-fonts/sgifonts/Makefile 5 Jul 2004 00:55:32 -0000 @@ -17,7 +17,7 @@ COMMENT= Fonts from the SGI ProPack 1.4 (originally for Linux) EXTRACT_DEPENDS= rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio -BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11/XFree86-4-clients +BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} PLIST= ${WRKDIR}/pkg-plist PLIST_DIRS= lib/X11/fonts/local/sgi Index: x11-fonts/tv-fonts/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-fonts/tv-fonts/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- x11-fonts/tv-fonts/Makefile 21 Jun 2004 03:24:02 -0000 1.2 +++ x11-fonts/tv-fonts/Makefile 5 Jul 2004 00:55:44 -0000 @@ -13,7 +13,7 @@ MAINTAINER= oliver@FreeBSD.org COMMENT= A number of fonts which are useful for TV applications -BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11/XFree86-4-clients +BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} USE_X_PREFIX= yes USE_GMAKE= yes Index: x11-clocks/wmbday/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-clocks/wmbday/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- x11-clocks/wmbday/Makefile 18 Mar 2004 04:30:26 -0000 1.2 +++ x11-clocks/wmbday/Makefile 5 Jul 2004 00:56:07 -0000 @@ -12,7 +12,7 @@ MAINTAINER= q@uni.de COMMENT= Window Maker dock app that will remind you of birthdays -BUILD_DEPENDS= ${X11BASE}/bin/xmessage:${PORTSDIR}/x11/XFree86-4-clients +BUILD_DEPENDS= ${X11BASE}/bin/xmessage:${X_CLIENTS_PORT} HAS_CONFIGURE= yes USE_XLIB= yes Index: x11/wrapper/Makefile =================================================================== RCS file: /home/ncvs/ports/x11/wrapper/Makefile,v retrieving revision 1.19 diff -u -r1.19 Makefile --- x11/wrapper/Makefile 17 Feb 2004 01:58:49 -0000 1.19 +++ x11/wrapper/Makefile 5 Jul 2004 00:57:22 -0000 @@ -30,4 +30,8 @@ ${INSTALL_PROGRAM} ${WRKSRC}/Xwrapper-4 ${PREFIX}/bin @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.include +.include +.if ${X_WINDOW_SYSTEM:L} != xfree86-4 +IGNORE= is part of XFree86-4 +.endif +.include