diff options
| author | Eric Anholt <anholt@FreeBSD.org> | 2004-07-23 19:10:32 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@FreeBSD.org> | 2004-07-23 19:10:32 +0000 |
| commit | 4eb209da7d941e66e0cb065aead6bda76c9e97f3 (patch) | |
| tree | c9cf2fdcee3885499960b9c706dacac0a0080f8e | |
| parent | Fix USE_PHP (diff) | |
- Add the X_WINDOW_SYSTEM={xorg,xfree86-4,xfree86-3} variable to bsd.port.mk,
and make XFREE86_VERSION map to it. XFREE86_VERSION is now deprecated.
- Make xorg the default X_WINDOW_SYSTEM on -current.
- Add several new X_*_PORT variables which point to various pieces of X11 based
on the setting of X_WINDOW_SYSTEM, and make ports use them.
- Add information to CHANGES about how to handle the transition.
PR: ports/68763
Approved by: portmgr (marcus)
Approved by: re (scottl)
Notes
Notes:
svn path=/head/; revision=114511
199 files changed, 599 insertions, 651 deletions
@@ -10,6 +10,26 @@ in the release notes. All ports committers are allowed to commit to this file. +20040721: +AUTHOR: anholt@FreeBSD.org + The XFREE86_VERSION variable is deprecated and replaced by the X_WINDOW_SYSTEM + switch. X_WINDOW_SYSTEM may be set to any of xorg, xfree86-4, and xfree86-3. + Ports which depended on ports from a specific X distribution have been updated + to use the new X_*_PORT defines from bsd.port.mk. XFREE86_VERSION will + continue to work and map to X_WINDOW_SYSTEM for a short time. + + X.Org has been made the default X distribution for FreeBSD 502123 + (current -CURRENT) and later. This requires that all existing XFree86 ports + be deleted and replaced by X.Org for dependencies to work, unless you set + X_WINDOW_SYSTEM to xfree86-4. To make the switch to x.org, do: + + pkg_delete -f /var/db/pkg/imake-4* /var/db/pkg/XFree86-* + cd /usr/ports/x11/xorg && make install + pkgdb -F + + Users of -STABLE or older -CURRENT can switch to X.Org as well by setting + X_WINDOW_SYSTEM=xorg in make.conf and following the same process. + 20040719: AUTHOR: ale@FreeBSD.org There has been a big update to PHP ports and bsd.php.mk to add more diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index d764f346361a..5227d031bf85 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1167,11 +1167,13 @@ PERL= ${LOCALBASE}/bin/perl .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} >= 502123 +X_WINDOW_SYSTEM ?= xorg +.elif (${OSVERSION} >= 450005 && !defined(XFREE86_VERSION)) || \ + (defined(XFREE86_VERSION) && ${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 +1398,92 @@ LIB_DEPENDS+= Xm.3:${PORTSDIR}/x11-toolkits/open-motif 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_NESTSERVER_PORT= ${PORTSDIR}/x11-servers/xorg-nestserver +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 +1568,7 @@ BROKEN= "unknown MySQL version: ${MYSQL_VER}" .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 +1771,7 @@ EXTRACT_CMD?= ${GZIP_CMD} # 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 +2526,7 @@ INFO_PATH?= share/info INFO_PATH?= info .endif -.if ${XFREE86_VERSION} == 3 +.if ${X_WINDOW_SYSTEM:L} == xfree86-3 XFREE86_HTML_MAN= no .else .if defined(USE_IMAKE) diff --git a/arabic/ae_fonts_mono/Makefile b/arabic/ae_fonts_mono/Makefile index 30f1c4f5980c..5620a1bdcf02 100644 --- a/arabic/ae_fonts_mono/Makefile +++ b/arabic/ae_fonts_mono/Makefile @@ -15,17 +15,11 @@ DISTNAME= ae_fonts_mono 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 <bsd.port.pre.mk> - -.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 @@ post-install: @${CAT} ${PKGMESSAGE} | ${SED} "s|X11BASE|${X11BASE}|g" \ | ${SED} "s|PORTNAME|${PORTNAME}|g" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile index 8a9f86f303a3..bfeaae9fb581 100644 --- a/audio/xmcd/Makefile +++ b/audio/xmcd/Makefile @@ -45,7 +45,7 @@ post-patch: -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 @@ post-install: @${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; \ diff --git a/chinese/arphicttf/Makefile b/chinese/arphicttf/Makefile index 4d44d9329d45..e43629daf8ac 100644 --- a/chinese/arphicttf/Makefile +++ b/chinese/arphicttf/Makefile @@ -23,17 +23,13 @@ WRKSRC= ${WRKDIR}/arphic 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 <bsd.port.pre.mk> .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) -RUN_DEPENDS+= mkfontdir.pl:${PORTSDIR}/x11-servers/XttXF86srv-common -.endif pre-fetch: .if defined(WANT_GS) diff --git a/chinese/chinput/Makefile b/chinese/chinput/Makefile index 7452185405f7..6d380d541ea8 100644 --- a/chinese/chinput/Makefile +++ b/chinese/chinput/Makefile @@ -16,12 +16,10 @@ DISTNAME= zh-chinput-2.1 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} diff --git a/chinese/cmexfonts/Makefile b/chinese/cmexfonts/Makefile index 419a0636ae68..4a1b8a8348ed 100644 --- a/chinese/cmexfonts/Makefile +++ b/chinese/cmexfonts/Makefile @@ -14,19 +14,15 @@ MASTER_SITES= ftp://freebsd.sinica.edu.tw/pub/statue/cmexfonts/ \ 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 <bsd.port.pre.mk> - -.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 <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/chinese/cwtexttf/Makefile b/chinese/cwtexttf/Makefile index 9179cdb248d0..9378fa9519bd 100644 --- a/chinese/cwtexttf/Makefile +++ b/chinese/cwtexttf/Makefile @@ -24,15 +24,11 @@ WRKSRC= ${WRKDIR}/texmf/fonts/truetype/cwTeX 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 <bsd.port.pre.mk> -.if ${XFREE86_VERSION} == 3 && !defined(WITHOUT_X) -RUN_DEPENDS+= mkfontdir.pl:${PORTSDIR}/x11-servers/XttXF86srv-common -.endif - pre-fetch: .if defined(WANT_GS) @${ECHO} "Ghostscript support will be added." diff --git a/chinese/cxterm/Makefile b/chinese/cxterm/Makefile index c5b07da1ae64..7a7e613ca173 100644 --- a/chinese/cxterm/Makefile +++ b/chinese/cxterm/Makefile @@ -22,19 +22,15 @@ PATCH_DIST_STRIP= -p1 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 <bsd.port.pre.mk> - -.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 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/Doc/input.doc ${PREFIX}/share/doc/cxterm .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/chinese/gugod-clean/Makefile b/chinese/gugod-clean/Makefile index c3908e570732..5716e9231d48 100644 --- a/chinese/gugod-clean/Makefile +++ b/chinese/gugod-clean/Makefile @@ -11,12 +11,9 @@ MASTER_SITES= ftp://freebsd.sinica.edu.tw/pub/gugod/ MAINTAINER= gugod@gugod.org COMMENT= A pretty font modifyed from X11 schumacher-clean that match kcfonts -USE_X_PREFIX= yes -.include <bsd.port.pre.mk> +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 @@ do-install: .endfor @cd ${XFONTDIR} ; mkfontdir -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/chinese/kcfonts/Makefile b/chinese/kcfonts/Makefile index 9068511dedab..e7616351369d 100644 --- a/chinese/kcfonts/Makefile +++ b/chinese/kcfonts/Makefile @@ -14,6 +14,9 @@ MASTER_SITES= ftp://freebsd.sinica.edu.tw/pub/distfiles/ \ 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 <bsd.port.pre.mk> @@ -22,11 +25,6 @@ USE_X_PREFIX= yes 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 <bsd.port.post.mk> diff --git a/chinese/moettf/Makefile b/chinese/moettf/Makefile index 51f59a961689..f3bd90f589fa 100644 --- a/chinese/moettf/Makefile +++ b/chinese/moettf/Makefile @@ -31,7 +31,7 @@ NO_BUILD= yes 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,9 +43,6 @@ RUN_DEPENDS+= bg5latex:${PORTSDIR}/chinese/CJK .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) -RUN_DEPENDS+= mkfontdir.pl:${PORTSDIR}/x11-servers/XttXF86srv-common -.endif pre-fetch: .if defined(WANT_CJK) diff --git a/chinese/ntuttf/Makefile b/chinese/ntuttf/Makefile index d7899c38ab23..cb4cd299d24f 100644 --- a/chinese/ntuttf/Makefile +++ b/chinese/ntuttf/Makefile @@ -24,7 +24,7 @@ SHAREMODE= 644 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,9 +36,6 @@ RUN_DEPENDS+= bg5latex:${PORTSDIR}/chinese/CJK .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) -RUN_DEPENDS+= mkfontdir.pl:${PORTSDIR}/x11-servers/XttXF86srv-common -.endif pre-fetch: .if defined(WANT_CJK) diff --git a/chinese/ttfm/Makefile b/chinese/ttfm/Makefile index eda69facf8d7..0b83484ddc31 100644 --- a/chinese/ttfm/Makefile +++ b/chinese/ttfm/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= ftp://freebsd.sinica.edu.tw/pub/statue/ttfm/ 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/ diff --git a/chinese/vflib/Makefile b/chinese/vflib/Makefile index 344adb4d8264..07a12a193c57 100644 --- a/chinese/vflib/Makefile +++ b/chinese/vflib/Makefile @@ -21,7 +21,7 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= ports@FreeBSD.org COMMENT= Vector font library with free vector font, BIG5 and GB supported -BUILD_DEPENDS= xmkmf:${PORTSDIR}/devel/imake-4 +BUILD_DEPENDS= xmkmf:${X_IMAKE_PORT} VFLIB_VERSION= 2.25.1 PLIST_SUB= VFLIB_VERSION=${VFLIB_VERSION} diff --git a/chinese/wangttf/Makefile b/chinese/wangttf/Makefile index 83236c65f3a6..d46c9815a176 100644 --- a/chinese/wangttf/Makefile +++ b/chinese/wangttf/Makefile @@ -27,7 +27,7 @@ NO_BUILD= yes 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,9 +39,6 @@ RUN_DEPENDS+= bg5latex:${PORTSDIR}/chinese/CJK .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) -RUN_DEPENDS+= mkfontdir.pl:${PORTSDIR}/x11-servers/XttXF86srv-common -.endif pre-fetch: .if defined(WANT_CJK) diff --git a/devel/gaphor/Makefile b/devel/gaphor/Makefile index 2f8bee56e516..025bfce253b6 100644 --- a/devel/gaphor/Makefile +++ b/devel/gaphor/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= ${BUILD_DEPENDS} 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 diff --git a/devel/gauche-sdl/Makefile b/devel/gauche-sdl/Makefile index bbb246ff6985..c8ec3f356ca5 100644 --- a/devel/gauche-sdl/Makefile +++ b/devel/gauche-sdl/Makefile @@ -15,9 +15,9 @@ MAINTAINER= erik@smluc.org 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} PLIST_SUB= GAUCHE_VERSION="`gauche-config -V`"\ TARGET="${CONFIGURE_TARGET}" diff --git a/editors/elvis/Makefile b/editors/elvis/Makefile index 4ebb8df4560d..db514fefb065 100644 --- a/editors/elvis/Makefile +++ b/editors/elvis/Makefile @@ -34,7 +34,7 @@ PKGNAMESUFFIX= -nox11 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 diff --git a/editors/openoffice-1.0/Makefile b/editors/openoffice-1.0/Makefile index 1b1ff8dbca88..521c373075e4 100644 --- a/editors/openoffice-1.0/Makefile +++ b/editors/openoffice-1.0/Makefile @@ -120,7 +120,7 @@ BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip 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 \ diff --git a/editors/openoffice-1.1-devel/Makefile b/editors/openoffice-1.1-devel/Makefile index 4df3e3252c88..cbce9ad6d0a7 100644 --- a/editors/openoffice-1.1-devel/Makefile +++ b/editors/openoffice-1.1-devel/Makefile @@ -113,7 +113,7 @@ BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14 \ ${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 \ diff --git a/editors/openoffice-1.1/Makefile b/editors/openoffice-1.1/Makefile index 197196eebc85..f2c3a61cc3a5 100644 --- a/editors/openoffice-1.1/Makefile +++ b/editors/openoffice-1.1/Makefile @@ -116,7 +116,7 @@ BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14 \ ${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 \ diff --git a/editors/openoffice-2.0-devel/Makefile b/editors/openoffice-2.0-devel/Makefile index 49fb1a50d061..bf16cff1e5ec 100644 --- a/editors/openoffice-2.0-devel/Makefile +++ b/editors/openoffice-2.0-devel/Makefile @@ -28,6 +28,7 @@ USE_BZIP2= yes USE_BISON= yes USE_GMAKE= yes USE_CCACHE= yes +USE_XLIB= yes .include <bsd.port.pre.mk> .include <${FILESDIR}/Makefile.localized> @@ -67,18 +68,16 @@ CC= gcc32 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 \ diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile index 49fb1a50d061..bf16cff1e5ec 100644 --- a/editors/openoffice-3-devel/Makefile +++ b/editors/openoffice-3-devel/Makefile @@ -28,6 +28,7 @@ USE_BZIP2= yes USE_BISON= yes USE_GMAKE= yes USE_CCACHE= yes +USE_XLIB= yes .include <bsd.port.pre.mk> .include <${FILESDIR}/Makefile.localized> @@ -67,18 +68,16 @@ CC= gcc32 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 \ diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile index 49fb1a50d061..bf16cff1e5ec 100644 --- a/editors/openoffice-3/Makefile +++ b/editors/openoffice-3/Makefile @@ -28,6 +28,7 @@ USE_BZIP2= yes USE_BISON= yes USE_GMAKE= yes USE_CCACHE= yes +USE_XLIB= yes .include <bsd.port.pre.mk> .include <${FILESDIR}/Makefile.localized> @@ -67,18 +68,16 @@ CC= gcc32 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 \ diff --git a/editors/openoffice.org-1.0/Makefile b/editors/openoffice.org-1.0/Makefile index 1b1ff8dbca88..521c373075e4 100644 --- a/editors/openoffice.org-1.0/Makefile +++ b/editors/openoffice.org-1.0/Makefile @@ -120,7 +120,7 @@ BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip 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 \ diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile index 4df3e3252c88..cbce9ad6d0a7 100644 --- a/editors/openoffice.org-1.1-devel/Makefile +++ b/editors/openoffice.org-1.1-devel/Makefile @@ -113,7 +113,7 @@ BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14 \ ${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 \ diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile index 197196eebc85..f2c3a61cc3a5 100644 --- a/editors/openoffice.org-1.1/Makefile +++ b/editors/openoffice.org-1.1/Makefile @@ -116,7 +116,7 @@ BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14 \ ${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 \ diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile index 49fb1a50d061..bf16cff1e5ec 100644 --- a/editors/openoffice.org-2-RC/Makefile +++ b/editors/openoffice.org-2-RC/Makefile @@ -28,6 +28,7 @@ USE_BZIP2= yes USE_BISON= yes USE_GMAKE= yes USE_CCACHE= yes +USE_XLIB= yes .include <bsd.port.pre.mk> .include <${FILESDIR}/Makefile.localized> @@ -67,18 +68,16 @@ CC= gcc32 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 \ diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile index 49fb1a50d061..bf16cff1e5ec 100644 --- a/editors/openoffice.org-2-devel/Makefile +++ b/editors/openoffice.org-2-devel/Makefile @@ -28,6 +28,7 @@ USE_BZIP2= yes USE_BISON= yes USE_GMAKE= yes USE_CCACHE= yes +USE_XLIB= yes .include <bsd.port.pre.mk> .include <${FILESDIR}/Makefile.localized> @@ -67,18 +68,16 @@ CC= gcc32 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 \ diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile index 49fb1a50d061..bf16cff1e5ec 100644 --- a/editors/openoffice.org-2.0-devel/Makefile +++ b/editors/openoffice.org-2.0-devel/Makefile @@ -28,6 +28,7 @@ USE_BZIP2= yes USE_BISON= yes USE_GMAKE= yes USE_CCACHE= yes +USE_XLIB= yes .include <bsd.port.pre.mk> .include <${FILESDIR}/Makefile.localized> @@ -67,18 +68,16 @@ CC= gcc32 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 \ diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile index 49fb1a50d061..bf16cff1e5ec 100644 --- a/editors/openoffice.org-2.0/Makefile +++ b/editors/openoffice.org-2.0/Makefile @@ -28,6 +28,7 @@ USE_BZIP2= yes USE_BISON= yes USE_GMAKE= yes USE_CCACHE= yes +USE_XLIB= yes .include <bsd.port.pre.mk> .include <${FILESDIR}/Makefile.localized> @@ -67,18 +68,16 @@ CC= gcc32 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 \ diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile index 49fb1a50d061..bf16cff1e5ec 100644 --- a/editors/openoffice.org-2/Makefile +++ b/editors/openoffice.org-2/Makefile @@ -28,6 +28,7 @@ USE_BZIP2= yes USE_BISON= yes USE_GMAKE= yes USE_CCACHE= yes +USE_XLIB= yes .include <bsd.port.pre.mk> .include <${FILESDIR}/Makefile.localized> @@ -67,18 +68,16 @@ CC= gcc32 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 \ diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile index 49fb1a50d061..bf16cff1e5ec 100644 --- a/editors/openoffice.org-3-RC/Makefile +++ b/editors/openoffice.org-3-RC/Makefile @@ -28,6 +28,7 @@ USE_BZIP2= yes USE_BISON= yes USE_GMAKE= yes USE_CCACHE= yes +USE_XLIB= yes .include <bsd.port.pre.mk> .include <${FILESDIR}/Makefile.localized> @@ -67,18 +68,16 @@ CC= gcc32 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 \ diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile index 49fb1a50d061..bf16cff1e5ec 100644 --- a/editors/openoffice.org-3-devel/Makefile +++ b/editors/openoffice.org-3-devel/Makefile @@ -28,6 +28,7 @@ USE_BZIP2= yes USE_BISON= yes USE_GMAKE= yes USE_CCACHE= yes +USE_XLIB= yes .include <bsd.port.pre.mk> .include <${FILESDIR}/Makefile.localized> @@ -67,18 +68,16 @@ CC= gcc32 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 \ diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile index 49fb1a50d061..bf16cff1e5ec 100644 --- a/editors/openoffice.org-3/Makefile +++ b/editors/openoffice.org-3/Makefile @@ -28,6 +28,7 @@ USE_BZIP2= yes USE_BISON= yes USE_GMAKE= yes USE_CCACHE= yes +USE_XLIB= yes .include <bsd.port.pre.mk> .include <${FILESDIR}/Makefile.localized> @@ -67,18 +68,16 @@ CC= gcc32 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 \ diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile index 49fb1a50d061..bf16cff1e5ec 100644 --- a/editors/openoffice.org-vcltesttool/Makefile +++ b/editors/openoffice.org-vcltesttool/Makefile @@ -28,6 +28,7 @@ USE_BZIP2= yes USE_BISON= yes USE_GMAKE= yes USE_CCACHE= yes +USE_XLIB= yes .include <bsd.port.pre.mk> .include <${FILESDIR}/Makefile.localized> @@ -67,18 +68,16 @@ CC= gcc32 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 \ diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile index d6553415a150..0ea3854a953a 100644 --- a/emulators/bochs/Makefile +++ b/emulators/bochs/Makefile @@ -16,6 +16,9 @@ MASTER_SITE_SUBDIR= ${PORTNAME} 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 @@ MANCOMPRESSED= yes MAN1= bochs.1 bochs-dlx.1 bxcommit.1 bximage.1 MAN5= bochsrc.5 -.include <bsd.port.pre.mk> - -.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 @@ post-install: @${CAT} ${PKGMESSAGE} @${ECHO_MSG} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/emulators/pcemu/Makefile b/emulators/pcemu/Makefile index 718e788af631..df6267fb8262 100644 --- a/emulators/pcemu/Makefile +++ b/emulators/pcemu/Makefile @@ -26,14 +26,10 @@ DISTNAME= pcemu1.01alpha MAINTAINER= joerg@FreeBSD.org COMMENT= An 8086 PC emulator, by David Hedley -.include <bsd.port.pre.mk> - -.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 <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile index d187beafabcd..fb01be1d26a8 100644 --- a/emulators/vice/Makefile +++ b/emulators/vice/Makefile @@ -45,8 +45,8 @@ MLINKS= vice.1 x64.1 \ .include <bsd.port.pre.mk> -.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 diff --git a/emulators/vmware-guestd4/Makefile b/emulators/vmware-guestd4/Makefile index a16399b41fff..8f55d3514a9c 100644 --- a/emulators/vmware-guestd4/Makefile +++ b/emulators/vmware-guestd4/Makefile @@ -52,7 +52,7 @@ UMOUNT= /sbin/umount .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 @@ post-patch: 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} "" diff --git a/emulators/vmware-guestd5/Makefile b/emulators/vmware-guestd5/Makefile index a16399b41fff..8f55d3514a9c 100644 --- a/emulators/vmware-guestd5/Makefile +++ b/emulators/vmware-guestd5/Makefile @@ -52,7 +52,7 @@ UMOUNT= /sbin/umount .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 @@ post-patch: 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} "" diff --git a/emulators/vmware-guestd6/Makefile b/emulators/vmware-guestd6/Makefile index a16399b41fff..8f55d3514a9c 100644 --- a/emulators/vmware-guestd6/Makefile +++ b/emulators/vmware-guestd6/Makefile @@ -52,7 +52,7 @@ UMOUNT= /sbin/umount .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 @@ post-patch: 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} "" diff --git a/emulators/vmware-tools3/Makefile b/emulators/vmware-tools3/Makefile index 5198adbb3288..0539f216dbcb 100644 --- a/emulators/vmware-tools3/Makefile +++ b/emulators/vmware-tools3/Makefile @@ -42,7 +42,7 @@ UMOUNT= /sbin/umount .include <bsd.port.pre.mk> -.if ${XFREE86_VERSION} == 3 +.if ${X_WINDOW_SYSTEM:L} == xfree86-3 PLIST_SUB+= INSTALLXSERVER:="" .else PLIST_SUB+= INSTALLXSERVER:="@comment " @@ -82,7 +82,7 @@ post-extract: 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} "" diff --git a/emulators/vmware_xf4mod/Makefile b/emulators/vmware_xf4mod/Makefile index 8161fc72a706..758e05738fc3 100644 --- a/emulators/vmware_xf4mod/Makefile +++ b/emulators/vmware_xf4mod/Makefile @@ -15,7 +15,7 @@ EXTRACT_SUFX= # none 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 diff --git a/emulators/xzx/Makefile b/emulators/xzx/Makefile index 30fb7a410bde..7cfa2bc2e242 100644 --- a/emulators/xzx/Makefile +++ b/emulators/xzx/Makefile @@ -20,7 +20,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= ZX Spectrum (48K/128K/+3) Emulator for X11 # xmkmf is used in configure script; USE_IMAKE makes the build unhappy -BUILD_DEPENDS= xmkmf:${PORTSDIR}/devel/imake-4 +BUILD_DEPENDS= xmkmf:${X_IMAKE_PORT} USE_MOTIF= yes USE_X_PREFIX= yes diff --git a/french/xtel/Makefile b/french/xtel/Makefile index 2e161aaa346f..d22f52e358c4 100644 --- a/french/xtel/Makefile +++ b/french/xtel/Makefile @@ -14,7 +14,9 @@ MASTER_SITES= http://pficheux.free.fr/xtel/download/ MAINTAINER= thierry@pompo.net COMMENT= An emulator for the french Minitel -LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg +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 @@ post-install: @${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 <bsd.port.post.mk> diff --git a/games/atitd/Makefile b/games/atitd/Makefile index 3b58e53b3296..09acd773b0dc 100644 --- a/games/atitd/Makefile +++ b/games/atitd/Makefile @@ -16,11 +16,11 @@ EXTRACT_ONLY= 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 <bsd.port.pre.mk> -.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 diff --git a/games/linux-q3ademo/Makefile b/games/linux-q3ademo/Makefile index 8814a1ff8d0e..fe6974906428 100644 --- a/games/linux-q3ademo/Makefile +++ b/games/linux-q3ademo/Makefile @@ -25,7 +25,7 @@ RUN_DEPENDS= /compat/linux/lib/libc.so.6:${PORTSDIR}/emulators/linux_base .include <bsd.port.pre.mk> -.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 diff --git a/games/linux-quake3-demo/Makefile b/games/linux-quake3-demo/Makefile index 8814a1ff8d0e..fe6974906428 100644 --- a/games/linux-quake3-demo/Makefile +++ b/games/linux-quake3-demo/Makefile @@ -25,7 +25,7 @@ RUN_DEPENDS= /compat/linux/lib/libc.so.6:${PORTSDIR}/emulators/linux_base .include <bsd.port.pre.mk> -.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 diff --git a/games/qix/Makefile b/games/qix/Makefile index 4436602c1051..19139c016948 100644 --- a/games/qix/Makefile +++ b/games/qix/Makefile @@ -14,18 +14,15 @@ MASTER_SITE_SUBDIR= jmz 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 <bsd.port.pre.mk> .else USE_X_PREFIX= yes -.include <bsd.port.pre.mk> 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 @@ do-configure: ${SED} -e s:/usr/local:${PREFIX}: -e s:/usr/X11R6:${PREFIX}: \ < ${WRKSRC}/Makefile~ > ${WRKSRC}/Makefile -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/games/xarchon/Makefile b/games/xarchon/Makefile index c8dc22921037..e3ae05dffa6c 100644 --- a/games/xarchon/Makefile +++ b/games/xarchon/Makefile @@ -19,6 +19,7 @@ COMMENT= A chess-like strategy game with battle options USE_XLIB= yes USE_GNOME= esound gtk12 USE_GMAKE= yes +USE_XPM= yes GNU_CONFIGURE= yes USE_REINPLACE= yes @@ -27,12 +28,5 @@ MAN6= xarchon.6 post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} - -.include <bsd.port.pre.mk> - -.if ${XFREE86_VERSION} == 3 -LIB_DEPENDS+= Xpm.4:${PORTSDIR}/graphics/xpm -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/games/xjewel/Makefile b/games/xjewel/Makefile index 02d345718fa1..a86d7aa9d65a 100644 --- a/games/xjewel/Makefile +++ b/games/xjewel/Makefile @@ -15,14 +15,10 @@ EXTRACT_SUFX= .tar.z MAINTAINER= jmz@FreeBSD.org COMMENT= X11 dropping jewels game -USE_IMAKE= yes - -.include <bsd.port.pre.mk> +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 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/bitmaps/seven_seg.pcf.gz ${PREFIX}/${FONTSDIR} @(cd ${PREFIX}/${FONTSDIR} ; mkfontdir) -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/diacanvas2/Makefile b/graphics/diacanvas2/Makefile index df83818d92a5..1e6a899cd129 100644 --- a/graphics/diacanvas2/Makefile +++ b/graphics/diacanvas2/Makefile @@ -26,7 +26,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ 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 diff --git a/graphics/glide3/Makefile b/graphics/glide3/Makefile index 2b865ddd9d3b..aec048d6f1a2 100644 --- a/graphics/glide3/Makefile +++ b/graphics/glide3/Makefile @@ -25,7 +25,6 @@ COMMENT= Library to support 3dfx Voodoo3/4/5/Banshee with the DRI USE_BZIP2= yes WRKSRC= ${WRKDIR}/Glide3 USE_X_PREFIX= yes -XFREE86_VERSION= 4 INSTALLS_SHLIB= yes USE_INC_LIBTOOL_VER= 13 USE_AUTOMAKE_VER= 14 diff --git a/graphics/ivtools/Makefile b/graphics/ivtools/Makefile index 678423597502..2cba4f8b9bf9 100644 --- a/graphics/ivtools/Makefile +++ b/graphics/ivtools/Makefile @@ -16,9 +16,12 @@ EXTRACT_SUFX= .tgz 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 @@ -29,10 +32,4 @@ MAN1= idraw.1 iclass.1 drawtool.1 comterp.1 comdraw.1 flipbook.1 graphdraw.1 BROKEN= "fails to configure on ${ARCH}" .endif -.if ${XFREE86_VERSION} == 3 -BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake -.else -BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake-4 -.endif - .include <bsd.port.post.mk> diff --git a/graphics/linux_glx/Makefile b/graphics/linux_glx/Makefile index e7873206e1b8..97eed90295ee 100644 --- a/graphics/linux_glx/Makefile +++ b/graphics/linux_glx/Makefile @@ -30,7 +30,7 @@ STRIP= .include <bsd.port.pre.mk> -.if ${XFREE86_VERSION} > 3 +.if ${X_WINDOW_SYSTEM:L} != xfree86-3 IGNORE= "Requires XFree86 3.3.* - will not work with XFree86 4.*" .endif diff --git a/graphics/mesagl/Makefile b/graphics/mesagl/Makefile index daf009313a78..0f7d4a2a2338 100644 --- a/graphics/mesagl/Makefile +++ b/graphics/mesagl/Makefile @@ -39,7 +39,7 @@ MAKE_ENV+= SUB_GL="${SUB_GL}" \ .include <bsd.port.pre.mk> -.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 diff --git a/graphics/pixmap/Makefile b/graphics/pixmap/Makefile index 46f778d76338..8edf7f1395be 100644 --- a/graphics/pixmap/Makefile +++ b/graphics/pixmap/Makefile @@ -15,14 +15,12 @@ DISTNAME= ${PORTNAME}${PORTVERSION} 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 <bsd.port.pre.mk> -.if ${XFREE86_VERSION} == 4 # requires rgb.txt -BUILD_DEPENDS= xrdb:${PORTSDIR}/x11/XFree86-4-clients -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/sng/Makefile b/graphics/sng/Makefile index 7a401e8c95c0..dccd701131bd 100644 --- a/graphics/sng/Makefile +++ b/graphics/sng/Makefile @@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} 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 diff --git a/graphics/utah-glx/Makefile b/graphics/utah-glx/Makefile index 1c1400ff4e54..7357e9f6a096 100644 --- a/graphics/utah-glx/Makefile +++ b/graphics/utah-glx/Makefile @@ -54,7 +54,7 @@ ALL_TARGET= depend all .include <bsd.port.pre.mk> -.if ${XFREE86_VERSION} > 3 +.if ${X_WINDOW_SYSTEM:L} != xfree86-3 IGNORE= "Requires XFree86 3.3.* - will not work with XFree86 4.*" .endif diff --git a/graphics/vcg/Makefile b/graphics/vcg/Makefile index 26f7f479b642..4f6cf1d99e58 100644 --- a/graphics/vcg/Makefile +++ b/graphics/vcg/Makefile @@ -15,7 +15,7 @@ EXTRACT_SUFX= .r3.17.tgz MAINTAINER= ports@FreeBSD.org COMMENT= A Visualization Tool for compiler graphs -BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake-4 +BUILD_DEPENDS= imake:${X_IMAKE_PORT} USE_X_PREFIX= yes MANL= pbmrot90.l pbmshift.l pbm2hp.l vcgdemomaker.l vcg.l xvcg.l diff --git a/graphics/xpm/Makefile b/graphics/xpm/Makefile index 315acbd1bb86..60801ce4ca97 100644 --- a/graphics/xpm/Makefile +++ b/graphics/xpm/Makefile @@ -25,7 +25,7 @@ MAN1= cxpm.1 sxpm.1 .include <bsd.port.pre.mk> -.if ${XFREE86_VERSION} > 3 +.if ${X_WINDOW_SYSTEM:L} != xfree86-3 IGNORE= is included in XFree86 >3.x .endif diff --git a/hebrew/culmus/Makefile b/hebrew/culmus/Makefile index 2fcf3289860f..d89323539950 100644 --- a/hebrew/culmus/Makefile +++ b/hebrew/culmus/Makefile @@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} 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 diff --git a/japanese/Wnn6-lib/Makefile b/japanese/Wnn6-lib/Makefile index 6098756e685b..ad99568f65c1 100644 --- a/japanese/Wnn6-lib/Makefile +++ b/japanese/Wnn6-lib/Makefile @@ -14,13 +14,7 @@ DISTNAME= Wnn6-SDK MAINTAINER= taoka@FreeBSD.org COMMENT= Include files and a library of Wnn6 -.include <bsd.port.pre.mk> - -.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/contrib/im/Xsi DOCDIR= ${PREFIX}/share/doc/ja-Wnn6-lib @@ -31,6 +25,8 @@ INSTALLS_SHLIB= yes do-build: ( cd ${WRKSRC} ; make World -f Makefile.ini ) +.include <bsd.port.pre.mk> + post-install: .if ${PORTOBJFORMAT} == "aout" ${LN} -sf libwnn6.so.1.0 ${PREFIX}/lib/libwnn6.so diff --git a/japanese/Wnn7-lib/Makefile b/japanese/Wnn7-lib/Makefile index 8758da751955..ec94e50574ce 100644 --- a/japanese/Wnn7-lib/Makefile +++ b/japanese/Wnn7-lib/Makefile @@ -15,13 +15,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= taoka@FreeBSD.org COMMENT= Include files and a library of Wnn7 -.include <bsd.port.pre.mk> - -.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 @@ INSTALLS_SHLIB= yes do-build: ( cd ${WRKSRC} ; make World -f Makefile.ini ) +.include <bsd.port.pre.mk> + post-install: .if ${PORTOBJFORMAT} == "aout" ${LN} -sf libwnn7.so.1.0 ${PREFIX}/lib/libwnn7.so diff --git a/japanese/alias-fonts/Makefile b/japanese/alias-fonts/Makefile index 0c9867f78b62..0df9826f68dc 100644 --- a/japanese/alias-fonts/Makefile +++ b/japanese/alias-fonts/Makefile @@ -20,21 +20,16 @@ RUN_DEPENDS= \ ${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 <bsd.port.pre.mk> - -.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 <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/japanese/elisa10x8/Makefile b/japanese/elisa10x8/Makefile index bfcdc1472d85..0dfdf549e9ca 100644 --- a/japanese/elisa10x8/Makefile +++ b/japanese/elisa10x8/Makefile @@ -19,14 +19,12 @@ EXTRACT_ONLY= elisau10.tgz 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 <bsd.port.pre.mk> -.if ${XFREE86_VERSION} == 4 -RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients -.endif - NO_WRKSUBDIR= yes FONTSDIR= lib/X11/fonts/local diff --git a/japanese/elisa8x8/Makefile b/japanese/elisa8x8/Makefile index 2466f88298d0..427abd8f5568 100644 --- a/japanese/elisa8x8/Makefile +++ b/japanese/elisa8x8/Makefile @@ -14,14 +14,12 @@ DISTNAME= elisat10 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 <bsd.port.pre.mk> -.if ${XFREE86_VERSION} == 4 -RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients -.endif - NO_WRKSUBDIR= yes BDFTOPCF_CMD= ${PREFIX}/bin/bdftopcf diff --git a/japanese/font-mplus/Makefile b/japanese/font-mplus/Makefile index 11bf1d8dc56d..9e376fa3b6c4 100644 --- a/japanese/font-mplus/Makefile +++ b/japanese/font-mplus/Makefile @@ -15,16 +15,14 @@ DISTNAME= mplus_bitmap_fonts-${PORTVERSION} 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 <bsd.port.pre.mk> -.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 diff --git a/japanese/font-shinonome/Makefile b/japanese/font-shinonome/Makefile index afbe6a9140cd..e9f5ea9858fe 100644 --- a/japanese/font-shinonome/Makefile +++ b/japanese/font-shinonome/Makefile @@ -15,6 +15,9 @@ MASTER_SITE_SUBDIR= . old 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 @@ CONFIGURE_ARGS= --with-fontdir=${PREFIX}/${FONTSDIR} --enable-compress .include <bsd.port.pre.mk> -.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 \ diff --git a/japanese/iv/Makefile b/japanese/iv/Makefile index 96cfa5ca4adb..52bde70ea97d 100644 --- a/japanese/iv/Makefile +++ b/japanese/iv/Makefile @@ -21,19 +21,15 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= ports@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 <bsd.port.pre.mk> .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 diff --git a/japanese/jisx0213-fonts/Makefile b/japanese/jisx0213-fonts/Makefile index 93bbf766e562..f7b2e0e53332 100644 --- a/japanese/jisx0213-fonts/Makefile +++ b/japanese/jisx0213-fonts/Makefile @@ -19,19 +19,14 @@ MAINTAINER= yoichi@FreeBSD.org 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 <bsd.port.pre.mk> - -.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 @@ pre-install: post-install: @(cd ${PREFIX}/${FONTSDIR}; mkfontdir) -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/japanese/k10/Makefile b/japanese/k10/Makefile index 6d8f93f0aa00..84e3c2b8117f 100644 --- a/japanese/k10/Makefile +++ b/japanese/k10/Makefile @@ -16,17 +16,14 @@ MAINTAINER= usagi@clave.gr.jp 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 <bsd.port.pre.mk> -.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} diff --git a/japanese/k12/Makefile b/japanese/k12/Makefile index 975d78148620..9f235201e378 100644 --- a/japanese/k12/Makefile +++ b/japanese/k12/Makefile @@ -17,15 +17,13 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ 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 <bsd.port.pre.mk> -.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 diff --git a/japanese/kanji18/Makefile b/japanese/kanji18/Makefile index 4f6b6cb810b1..a35245b5288f 100644 --- a/japanese/kanji18/Makefile +++ b/japanese/kanji18/Makefile @@ -20,7 +20,9 @@ COMMENT= X11 ${PKGNAMESUFFIX}-dot kanji font 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 @@ USE_X_PREFIX= yes .include <bsd.port.pre.mk> -.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) diff --git a/japanese/kappa20/Makefile b/japanese/kappa20/Makefile index b970eaee6c88..0f09bd0b2db2 100644 --- a/japanese/kappa20/Makefile +++ b/japanese/kappa20/Makefile @@ -23,15 +23,12 @@ USE_BZIP2= yes 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 <bsd.port.pre.mk> -.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}" diff --git a/japanese/kterm16c/Makefile b/japanese/kterm16c/Makefile index e9d08ff00bd3..96c1971974cb 100644 --- a/japanese/kterm16c/Makefile +++ b/japanese/kterm16c/Makefile @@ -27,18 +27,15 @@ PATCH_DIST_STRIP= -p1 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 <bsd.port.pre.mk> -.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: diff --git a/japanese/marumoji-fonts/Makefile b/japanese/marumoji-fonts/Makefile index 39979c0d8928..d97064adc008 100644 --- a/japanese/marumoji-fonts/Makefile +++ b/japanese/marumoji-fonts/Makefile @@ -24,7 +24,9 @@ MAINTAINER= yoichi@FreeBSD.org 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 @@ FONTSDIR= lib/X11/fonts/local .include <bsd.port.pre.mk> -.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} diff --git a/japanese/monafonts/Makefile b/japanese/monafonts/Makefile index 390998116d3b..4c0b55ae500a 100644 --- a/japanese/monafonts/Makefile +++ b/japanese/monafonts/Makefile @@ -16,17 +16,14 @@ DISTNAME= monafont-${PORTVERSION} 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 <bsd.port.pre.mk> - -.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 @@ pre-install: @${SETENV} PKG_PREFIX=${PREFIX} \ ${SH} ${PKGREQ} ${PKGNAME} INSTALL -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/japanese/mplusfonts/Makefile b/japanese/mplusfonts/Makefile index 11bf1d8dc56d..9e376fa3b6c4 100644 --- a/japanese/mplusfonts/Makefile +++ b/japanese/mplusfonts/Makefile @@ -15,16 +15,14 @@ DISTNAME= mplus_bitmap_fonts-${PORTVERSION} 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 <bsd.port.pre.mk> -.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 diff --git a/japanese/ngraph-fonts/Makefile b/japanese/ngraph-fonts/Makefile index d23e7a70d499..6e975f202dd5 100644 --- a/japanese/ngraph-fonts/Makefile +++ b/japanese/ngraph-fonts/Makefile @@ -16,18 +16,13 @@ COMMENT= Japanese Font Setup for math/ngraph 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 <bsd.port.pre.mk> - -.if ${XFREE86_VERSION} == 4 -RUN_DEPENDS+= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients -.endif - NO_BUILD= yes do-install: # empty -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/japanese/oleo/Makefile b/japanese/oleo/Makefile index d78cba87ae0b..1e1a2c92d9df 100644 --- a/japanese/oleo/Makefile +++ b/japanese/oleo/Makefile @@ -22,7 +22,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A Spreadsheet Program + Japanese patches # xmkmf is for configure script, not for USE_IMAKE. -BUILD_DEPENDS= xmkmf:${PORTSDIR}/devel/imake-4 +BUILD_DEPENDS= xmkmf:${X_IMAKE_PORT} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib" diff --git a/japanese/shinonome/Makefile b/japanese/shinonome/Makefile index afbe6a9140cd..e9f5ea9858fe 100644 --- a/japanese/shinonome/Makefile +++ b/japanese/shinonome/Makefile @@ -15,6 +15,9 @@ MASTER_SITE_SUBDIR= . old 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 @@ CONFIGURE_ARGS= --with-fontdir=${PREFIX}/${FONTSDIR} --enable-compress .include <bsd.port.pre.mk> -.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 \ diff --git a/japanese/vflib/Makefile b/japanese/vflib/Makefile index d9a1575d1abb..9bfbcc2ec389 100644 --- a/japanese/vflib/Makefile +++ b/japanese/vflib/Makefile @@ -16,7 +16,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= mita@FreeBSD.org COMMENT= Japanese Vector font library -BUILD_DEPENDS= xmkmf:${PORTSDIR}/devel/imake-4 +BUILD_DEPENDS= xmkmf:${X_IMAKE_PORT} RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf:${PORTSDIR}/japanese/kochi-ttfonts VFLIB_VERSION= 2.25.6 diff --git a/korean/baekmukfonts-bdf/Makefile b/korean/baekmukfonts-bdf/Makefile index 249388839e85..c4f351cc9843 100644 --- a/korean/baekmukfonts-bdf/Makefile +++ b/korean/baekmukfonts-bdf/Makefile @@ -21,14 +21,10 @@ EXTRACT_ONLY= baekmuk-${PORTVERSION}${EXTRACT_SUFX} MAINTAINER= cjh@freebsd.org COMMENT= Free Hangul fonts for X11(baekmuk) -USE_X_PREFIX= yes - -.include <bsd.port.pre.mk> +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 @@ do-install: .endfor @(cd ${PREFIX}/${FONTSDIR} && mkfontdir .) -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/korean/hanyangfonts/Makefile b/korean/hanyangfonts/Makefile index 8bf8849a3df7..a1af9c892c3a 100644 --- a/korean/hanyangfonts/Makefile +++ b/korean/hanyangfonts/Makefile @@ -16,13 +16,9 @@ DISTNAME= hanyang-font-pcf MAINTAINER= cjh@FreeBSD.org COMMENT= Hanyang Hangul fonts for X11 -USE_X_PREFIX= yes - -.include <bsd.port.pre.mk> +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 @@ do-install: done; \ mkfontdir ${PREFIX}/lib/X11/fonts/local -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/korean/johabfonts/Makefile b/korean/johabfonts/Makefile index 96b01e0ceb09..413185388f7e 100644 --- a/korean/johabfonts/Makefile +++ b/korean/johabfonts/Makefile @@ -14,14 +14,10 @@ DISTNAME= hanterm-font-${PORTVERSION} MAINTAINER= cjh@FreeBSD.org COMMENT= Hangul fonts for X11(johab) used in many hangul-related programs -USE_IMAKE= yes - -.include <bsd.port.pre.mk> +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 @@ WRKSRC= ${WRKDIR}/hanterm-font/10-6-6 pre-install: -${MKDIR} ${PREFIX}/lib/X11/fonts/local -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/korean/kaistfonts/Makefile b/korean/kaistfonts/Makefile index 440ed0d81055..13dd09652d2c 100644 --- a/korean/kaistfonts/Makefile +++ b/korean/kaistfonts/Makefile @@ -17,14 +17,10 @@ DISTFILES= kaist-newmj18.bdf.gz ks_philgi16.bdf.gz \ MAINTAINER= cjh@FreeBSD.org COMMENT= X11 KAIST font(ksc5601.1987-0 encoding) collection -USE_X_PREFIX= yes - -.include <bsd.port.pre.mk> +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 @@ do-extract: post-install: ${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/korean/mizifont/Makefile b/korean/mizifont/Makefile index 0cd6459c99c9..256caa29c0c4 100644 --- a/korean/mizifont/Makefile +++ b/korean/mizifont/Makefile @@ -18,13 +18,9 @@ COMMENT= Mizi Research's Korean X11 Font(ksc5601.1987-[01] encoding) EXTRACT_DEPENDS=rpm2cpio:${PORTSDIR}/archivers/rpm -USE_X_PREFIX= yes - -.include <bsd.port.pre.mk> +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 @@ do-install: post-install: @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/korean/pinetreefonts/Makefile b/korean/pinetreefonts/Makefile index 57c607c50387..6323a2e31043 100644 --- a/korean/pinetreefonts/Makefile +++ b/korean/pinetreefonts/Makefile @@ -17,14 +17,10 @@ DISTNAME= pinetree.precomposed-${PORTVERSION}-bdf MAINTAINER= cjh@FreeBSD.org COMMENT= Hangul fonts for X11(pinetree, KSC5601-1987-0 encoding) -USE_X_PREFIX= yes - -.include <bsd.port.pre.mk> +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 @@ do-install: done; \ mkfontdir ${PREFIX}/lib/X11/fonts/local -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/lang/librep/Makefile b/lang/librep/Makefile index 7d3bbcb05427..2ca71d564212 100644 --- a/lang/librep/Makefile +++ b/lang/librep/Makefile @@ -45,7 +45,7 @@ LIB_DEPENDS+= gmp.6:${PORTSDIR}/math/libgmp4 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 diff --git a/mail/metamail/Makefile b/mail/metamail/Makefile index a8476158168a..573027e9a342 100644 --- a/mail/metamail/Makefile +++ b/mail/metamail/Makefile @@ -18,14 +18,9 @@ COMMENT= Implementation of MIME, the Multipurpose Internet Mail Extensions DEPRECATED= "mastersite disappeared\; last distfile update was in 1994" -RUN_DEPENDS= xloadimage:${PORTSDIR}/x11/xloadimage - -.include <bsd.port.pre.mk> - -.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 @@ MAN4= mailcap.4 post-patch: @${RM} ${WRKSRC}/bin/*.orig -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/misc/gtkfind/Makefile b/misc/gtkfind/Makefile index 1b81df846080..848a842f9a8b 100644 --- a/misc/gtkfind/Makefile +++ b/misc/gtkfind/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= ${MASTER_SITE_BACKUP} 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 diff --git a/misc/magicpoint/Makefile b/misc/magicpoint/Makefile index 6de089bacd67..e230adf24d6a 100644 --- a/misc/magicpoint/Makefile +++ b/misc/magicpoint/Makefile @@ -51,7 +51,7 @@ post-configure: 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-build: 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 diff --git a/misc/videotext/Makefile b/misc/videotext/Makefile index 3498b9656539..dcebe1babe2d 100644 --- a/misc/videotext/Makefile +++ b/misc/videotext/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= http://elektra.e-technik.uni-ulm.de/~mbuck/download/ 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 diff --git a/multimedia/libdv/Makefile b/multimedia/libdv/Makefile index 620955b1f573..5f6b2791a76c 100644 --- a/multimedia/libdv/Makefile +++ b/multimedia/libdv/Makefile @@ -34,6 +34,10 @@ PORTDOCS= AUTHORS COPYING COPYRIGHT ChangeLog NEWS README \ .include <bsd.port.pre.mk> +.if ${X_WINDOW_SYSTEM:L} == xfree86-3 +IGNORE= "Requires Xv Extension" +.endif + # XXX - work around compiler bug # Optimizations -O{1,s,2,3} work # However, lack of -O{1,s,2,3} or -O0 BREAK the build @@ -46,15 +50,6 @@ CONFIGURE_ARGS+= --enable-sdl .endif pre-everything:: -.if ${XFREE86_VERSION} < 4 - @${ECHO_MSG} '===>' - @${ECHO_MSG} '===> ATTENTION <===' - @${ECHO_MSG} '===> YOU NEED XFREE86 Version 4.0 <===' - @${ECHO_MSG} '===> or above to run this <===' - @${ECHO_MSG} '===> SINCE IT REQUIRES XV <===' - @${ECHO_MSG} '===>' - @${FALSE} -.endif .ifndef(WITHOUT_SDL) @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITHOUT_SDL to disable SDL support' diff --git a/net-im/ayttm/Makefile b/net-im/ayttm/Makefile index 5515c6d3798a..2fd843e52684 100644 --- a/net-im/ayttm/Makefile +++ b/net-im/ayttm/Makefile @@ -59,7 +59,7 @@ CONFIGURE_ARGS+= --disable-arts 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` diff --git a/net/ayttm/Makefile b/net/ayttm/Makefile index 5515c6d3798a..2fd843e52684 100644 --- a/net/ayttm/Makefile +++ b/net/ayttm/Makefile @@ -59,7 +59,7 @@ CONFIGURE_ARGS+= --disable-arts 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` diff --git a/net/tightvnc/Makefile b/net/tightvnc/Makefile index 585f879cfa87..88f619385f2d 100644 --- a/net/tightvnc/Makefile +++ b/net/tightvnc/Makefile @@ -17,6 +17,7 @@ MAINTAINER= ports@FreeBSD.org 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 @@ MAN1= Xvnc.1 vncviewer.1 vncpasswd.1 vncconnect.1 vncserver.1 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 diff --git a/net/tsclient/Makefile b/net/tsclient/Makefile index 3d4e6f51cb9e..fd8f51b0a84b 100644 --- a/net/tsclient/Makefile +++ b/net/tsclient/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS+= tightvnc:${PORTSDIR}/net/tightvnc .endif .ifdef (WITH_XNEST) -RUN_DEPENDS+= Xnest:${PORTSDIR}/x11-servers/XFree86-4-NestServer +RUN_DEPENDS+= Xnest:${X_NESTSERVER_PORT} .endif USE_X_PREFIX= yes diff --git a/net/vnc/Makefile b/net/vnc/Makefile index 7989808cbc32..f5845ed1f25e 100644 --- a/net/vnc/Makefile +++ b/net/vnc/Makefile @@ -32,8 +32,8 @@ MAN1= vncviewer.1 \ 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 diff --git a/news/pyne/Makefile b/news/pyne/Makefile index 5a6bafa6e7a4..2277124c74c6 100644 --- a/news/pyne/Makefile +++ b/news/pyne/Makefile @@ -22,7 +22,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-1.2/GTK.py:${PORTSDIR}/x11-toolkits/py-gtk # 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 diff --git a/print/cjk-lyx/Makefile b/print/cjk-lyx/Makefile index 37e2994c6030..d082b7fdf3aa 100644 --- a/print/cjk-lyx/Makefile +++ b/print/cjk-lyx/Makefile @@ -17,7 +17,7 @@ COMMENT= Document processor interfaced with LaTeX, with CJK support 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 diff --git a/print/lyx-devel/Makefile b/print/lyx-devel/Makefile index d95dede44233..8950dd7a0574 100644 --- a/print/lyx-devel/Makefile +++ b/print/lyx-devel/Makefile @@ -18,7 +18,7 @@ COMMENT= Document processor interfaced with LaTeX (nearly WYSIWYG) 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 diff --git a/print/lyx/Makefile b/print/lyx/Makefile index d95dede44233..8950dd7a0574 100644 --- a/print/lyx/Makefile +++ b/print/lyx/Makefile @@ -18,7 +18,7 @@ COMMENT= Document processor interfaced with LaTeX (nearly WYSIWYG) 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 diff --git a/print/lyx14/Makefile b/print/lyx14/Makefile index d95dede44233..8950dd7a0574 100644 --- a/print/lyx14/Makefile +++ b/print/lyx14/Makefile @@ -18,7 +18,7 @@ COMMENT= Document processor interfaced with LaTeX (nearly WYSIWYG) 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 diff --git a/print/lyx15/Makefile b/print/lyx15/Makefile index d95dede44233..8950dd7a0574 100644 --- a/print/lyx15/Makefile +++ b/print/lyx15/Makefile @@ -18,7 +18,7 @@ COMMENT= Document processor interfaced with LaTeX (nearly WYSIWYG) 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 diff --git a/print/lyx16/Makefile b/print/lyx16/Makefile index d95dede44233..8950dd7a0574 100644 --- a/print/lyx16/Makefile +++ b/print/lyx16/Makefile @@ -18,7 +18,7 @@ COMMENT= Document processor interfaced with LaTeX (nearly WYSIWYG) 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 diff --git a/security/ssh2/Makefile b/security/ssh2/Makefile index 9615e72cc9f2..53f0ffdcde51 100644 --- a/security/ssh2/Makefile +++ b/security/ssh2/Makefile @@ -92,10 +92,8 @@ EXTRA_PATCHES+= ${FILESDIR}/kerberos-patch-apps::ssh::ssh2_config \ .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 diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile index 98520cba0239..ab16e38db373 100644 --- a/textproc/scrollkeeper/Makefile +++ b/textproc/scrollkeeper/Makefile @@ -56,7 +56,7 @@ MAN8= scrollkeeper-preinstall.8 scrollkeeper-rebuilddb.8 \ .include <bsd.port.pre.mk> -.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 diff --git a/vietnamese/unicode-uhoai/Makefile b/vietnamese/unicode-uhoai/Makefile index 7372e0e7965b..9495923dddc6 100644 --- a/vietnamese/unicode-uhoai/Makefile +++ b/vietnamese/unicode-uhoai/Makefile @@ -20,13 +20,9 @@ NO_WRKSUBDIR= yes USE_X_PREFIX= yes NO_BUILD= taken care of in do-install target -.include <bsd.port.pre.mk> - -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 @@ do-install: @${SETENV} PKG_PREFIX=${PREFIX} \ ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.include <bsd.port.post.mk> +.include <bsd.port.mk> EXTRACT_BEFORE_ARGS+= -L diff --git a/vietnamese/vnterm/Makefile b/vietnamese/vnterm/Makefile index 896a78c9818a..abed01cea476 100644 --- a/vietnamese/vnterm/Makefile +++ b/vietnamese/vnterm/Makefile @@ -20,11 +20,9 @@ USE_IMAKE= yes .include <bsd.port.pre.mk> -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 diff --git a/vietnamese/vnxfonts/Makefile b/vietnamese/vnxfonts/Makefile index 62aa2307c60d..f2337c3ecca9 100644 --- a/vietnamese/vnxfonts/Makefile +++ b/vietnamese/vnxfonts/Makefile @@ -19,16 +19,12 @@ EXTRACT_SUFX= .tar.Z 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 <bsd.port.pre.mk> - -.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 @@ do-install: @${SETENV} PKG_PREFIX=${PREFIX} \ ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/amaya/Makefile b/www/amaya/Makefile index 015721a06931..775a09f658bf 100644 --- a/www/amaya/Makefile +++ b/www/amaya/Makefile @@ -62,7 +62,7 @@ DISTFILES+= ${DICT:S/$/.tgz/g} 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 diff --git a/www/larbin/Makefile b/www/larbin/Makefile index 1b394d5d7213..dc61bb357ca1 100644 --- a/www/larbin/Makefile +++ b/www/larbin/Makefile @@ -15,7 +15,8 @@ MASTER_SITES= ftp://ftp.sourceforge.net/pub/sourceforge/larbin/ \ MAINTAINER= hmp@FreeBSD.org COMMENT= A powerful HTTP crawler with an easy interface -BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash2 +BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash2 \ + makedepend:${X_IMAKE_PORT} USE_GMAKE= yes GNU_CONFIGURE= yes @@ -23,14 +24,6 @@ USE_REINPLACE= yes PATCH_WRKSRC= ${WRKSRC}/src MAKE_ARGS= CXX=${CXX} -.include <bsd.port.pre.mk> - -.if ${XFREE86_VERSION} == 3 -BUILD_DEPENDS+= makedepend:${PORTSDIR}/devel/imake -.else -BUILD_DEPENDS+= makedepend:${PORTSDIR}/devel/imake-4 -.endif - post-patch: @${SED} -e 's,CC=,CC?=,' -e 's,CFLAGS=-O3,CFLAGS+=,' < \ ${WRKSRC}/adns/Makefile > ${WRKSRC}/adns/Makefile.new @@ -66,4 +59,4 @@ post-install: @${ECHO} "" @${ECHO} "=====================================================================" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-clocks/wmbday/Makefile b/x11-clocks/wmbday/Makefile index f7fa950861a8..6a3ccd62cd62 100644 --- a/x11-clocks/wmbday/Makefile +++ b/x11-clocks/wmbday/Makefile @@ -12,7 +12,7 @@ MASTER_SITES= http://buzzinhornetz.ath.cx/wmbday/files/ 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 diff --git a/x11-fonts/XFree86-4-font100dpi/Makefile b/x11-fonts/XFree86-4-font100dpi/Makefile index 3877fb660bc9..13edde71d937 100644 --- a/x11-fonts/XFree86-4-font100dpi/Makefile +++ b/x11-fonts/XFree86-4-font100dpi/Makefile @@ -21,7 +21,6 @@ RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fo CONFLICTS= xorg-fonts-100dpi-* -XFREE86_VERSION= 4 USE_IMAKE= YES PROJECTROOT= -DProjectRoot=${PREFIX} DIST_SUBDIR= xc @@ -45,4 +44,8 @@ pre-build: (cd ${WRKDIR}/xc/fonts/encodings && \ ${MAKE} all) -.include <bsd.port.mk> +.include <bsd.port.pre.mk> +.if ${X_WINDOW_SYSTEM:L} != xfree86-4 +IGNORE= is part of XFree86-4 +.endif +.include <bsd.port.post.mk> diff --git a/x11-fonts/XFree86-4-font75dpi/Makefile b/x11-fonts/XFree86-4-font75dpi/Makefile index 13249a193fb7..0b4dc79cc5ea 100644 --- a/x11-fonts/XFree86-4-font75dpi/Makefile +++ b/x11-fonts/XFree86-4-font75dpi/Makefile @@ -21,7 +21,6 @@ RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fo CONFLICTS= xorg-fonts-75dpi-* -XFREE86_VERSION= 4 USE_IMAKE= YES PROJECTROOT= -DProjectRoot=${PREFIX} DIST_SUBDIR= xc @@ -45,4 +44,8 @@ pre-build: (cd ${WRKDIR}/xc/fonts/encodings && \ ${MAKE} all) -.include <bsd.port.mk> +.include <bsd.port.pre.mk> +.if ${X_WINDOW_SYSTEM:L} != xfree86-4 +IGNORE= is part of XFree86-4 +.endif +.include <bsd.port.post.mk> diff --git a/x11-fonts/XFree86-4-fontCyrillic/Makefile b/x11-fonts/XFree86-4-fontCyrillic/Makefile index cbc13f62210f..fae03aa572dd 100644 --- a/x11-fonts/XFree86-4-fontCyrillic/Makefile +++ b/x11-fonts/XFree86-4-fontCyrillic/Makefile @@ -21,7 +21,6 @@ RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fo CONFLICTS= xorg-fonts-cyrillic-* -XFREE86_VERSION= 4 USE_IMAKE= YES PROJECTROOT= -DProjectRoot=${PREFIX} DIST_SUBDIR= xc @@ -45,4 +44,8 @@ pre-build: (cd ${WRKDIR}/xc/fonts/encodings && \ ${MAKE} all) -.include <bsd.port.mk> +.include <bsd.port.pre.mk> +.if ${X_WINDOW_SYSTEM:L} != xfree86-4 +IGNORE= is part of XFree86-4 +.endif +.include <bsd.port.post.mk> diff --git a/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile b/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile index 4ba471326ee7..c92b14dc4221 100644 --- a/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile +++ b/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile @@ -22,7 +22,6 @@ RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fo CONFLICTS= xorg-fonts-miscbitmaps-* -XFREE86_VERSION= 4 USE_IMAKE= YES PROJECTROOT= -DProjectRoot=${PREFIX} DIST_SUBDIR= xc @@ -52,4 +51,8 @@ pre-build: (cd ${WRKDIR}/xc/fonts/encodings && \ ${MAKE} all) -.include <bsd.port.mk> +.include <bsd.port.pre.mk> +.if ${X_WINDOW_SYSTEM:L} != xfree86-4 +IGNORE= is part of XFree86-4 +.endif +.include <bsd.port.post.mk> diff --git a/x11-fonts/XFree86-4-fontEncodings/Makefile b/x11-fonts/XFree86-4-fontEncodings/Makefile index 64f5e34d8a1b..ddb5e2a11173 100644 --- a/x11-fonts/XFree86-4-fontEncodings/Makefile +++ b/x11-fonts/XFree86-4-fontEncodings/Makefile @@ -20,7 +20,6 @@ BUILD_DEPENDS= ucs2any:${PORTSDIR}/x11/XFree86-4-clients CONFLICTS= xorg-fonts-encodings-* -XFREE86_VERSION= 4 USE_IMAKE= YES PROJECTROOT= -DProjectRoot=${PREFIX} DIST_SUBDIR= xc @@ -35,4 +34,8 @@ do-configure: ${MAKE} includes ; \ ${MAKE} depend) -.include <bsd.port.mk> +.include <bsd.port.pre.mk> +.if ${X_WINDOW_SYSTEM:L} != xfree86-4 +IGNORE= is part of XFree86-4 +.endif +.include <bsd.port.post.mk> diff --git a/x11-fonts/XFree86-4-fontScalable/Makefile b/x11-fonts/XFree86-4-fontScalable/Makefile index abd68cb5fd1e..a4e66c0167a8 100644 --- a/x11-fonts/XFree86-4-fontScalable/Makefile +++ b/x11-fonts/XFree86-4-fontScalable/Makefile @@ -21,7 +21,6 @@ RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fo CONFLICTS= xorg-fonts-type1-* xorg-fonts-truetype-* -XFREE86_VERSION= 4 USE_IMAKE= YES PROJECTROOT= -DProjectRoot=${PREFIX} DIST_SUBDIR= xc @@ -90,4 +89,8 @@ pre-build: (cd ${WRKDIR}/xc/fonts/encodings && \ ${MAKE} all) -.include <bsd.port.mk> +.include <bsd.port.pre.mk> +.if ${X_WINDOW_SYSTEM:L} != xfree86-4 +IGNORE= is part of XFree86-4 +.endif +.include <bsd.port.post.mk> diff --git a/x11-fonts/Xg/Makefile b/x11-fonts/Xg/Makefile index e6a5cc58b649..959e1eb0199d 100644 --- a/x11-fonts/Xg/Makefile +++ b/x11-fonts/Xg/Makefile @@ -14,14 +14,10 @@ DISTNAME= libXg.utf.fonts 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 <bsd.port.pre.mk> - -.if ${XFREE86_VERSION} == 4 -BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11/XFree86-4-clients -RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-fonts/bitmap-fonts/Makefile b/x11-fonts/bitmap-fonts/Makefile index dd8bdc79f439..80c174d244b1 100644 --- a/x11-fonts/bitmap-fonts/Makefile +++ b/x11-fonts/bitmap-fonts/Makefile @@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}-${BITMAP_FONTS_VER} 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 @@ USE_X_PREFIX= yes PLIST_SUB= FONTSDIR=${FONTSDIR} -.include <bsd.port.pre.mk> - -.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 @@ post-install: @${SETENV} PKG_PREFIX=${X11BASE} \ ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-fonts/code2000/Makefile b/x11-fonts/code2000/Makefile index 50f47ada02a3..63dcb107e9cb 100644 --- a/x11-fonts/code2000/Makefile +++ b/x11-fonts/code2000/Makefile @@ -24,7 +24,7 @@ USE_ZIP= yes .include <bsd.port.pre.mk> -.if ${XFREE86_VERSION} == 3 +.if ${X_WINDOW_SYSTEM:L} == xfree86-3 RUN_DEPENDS= xfstt:${PORTSDIR}/x11-servers/Xfstt .endif @@ -37,7 +37,7 @@ PLIST_SUB= PKG_OLDXF86=${PKG_OLDXF86} \ 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 @@ install-fonts: 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 diff --git a/x11-fonts/cyr-rfx/Makefile b/x11-fonts/cyr-rfx/Makefile index 98cf5a400149..5cd7bd449809 100644 --- a/x11-fonts/cyr-rfx/Makefile +++ b/x11-fonts/cyr-rfx/Makefile @@ -16,8 +16,9 @@ EXTRACT_SUFX= .bdfs.tgz 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 diff --git a/x11-fonts/etlfonts/Makefile b/x11-fonts/etlfonts/Makefile index facbce5defe5..20b6bd124761 100644 --- a/x11-fonts/etlfonts/Makefile +++ b/x11-fonts/etlfonts/Makefile @@ -15,22 +15,18 @@ EXTRACT_SUFX= .tar 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 <bsd.port.pre.mk> - -.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 <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-fonts/fontconfig/Makefile b/x11-fonts/fontconfig/Makefile index 2bdfdf848f59..ab3dc60eea76 100644 --- a/x11-fonts/fontconfig/Makefile +++ b/x11-fonts/fontconfig/Makefile @@ -157,7 +157,7 @@ MAN5= fonts-conf.5 .include <bsd.port.pre.mk> -.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 diff --git a/x11-fonts/geminifonts/Makefile b/x11-fonts/geminifonts/Makefile index 679b01867c1d..6b00723ca67f 100644 --- a/x11-fonts/geminifonts/Makefile +++ b/x11-fonts/geminifonts/Makefile @@ -17,7 +17,7 @@ EXTRACT_SUFX= .tgz 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 diff --git a/x11-fonts/jmk-x11-fonts/Makefile b/x11-fonts/jmk-x11-fonts/Makefile index 6b77350856e5..75acd711dfa8 100644 --- a/x11-fonts/jmk-x11-fonts/Makefile +++ b/x11-fonts/jmk-x11-fonts/Makefile @@ -13,13 +13,9 @@ MASTER_SITES= http://www.jmknoble.net/fonts/ MAINTAINER= olgeni@FreeBSD.org COMMENT= Jim Knoble's font package for X -USE_IMAKE= yes - -.include <bsd.port.pre.mk> +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 @@ do-install: post-install: @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-fonts/lfpfonts-fix/Makefile b/x11-fonts/lfpfonts-fix/Makefile index 589165378c8e..175241695a87 100644 --- a/x11-fonts/lfpfonts-fix/Makefile +++ b/x11-fonts/lfpfonts-fix/Makefile @@ -14,18 +14,14 @@ MASTER_SITE_SUBDIR= xfonts 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 <bsd.port.pre.mk> - -.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 @@ do-install: post-install: @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-fonts/lfpfonts-var/Makefile b/x11-fonts/lfpfonts-var/Makefile index 17de98c803b9..4942e6bf0467 100644 --- a/x11-fonts/lfpfonts-var/Makefile +++ b/x11-fonts/lfpfonts-var/Makefile @@ -14,18 +14,14 @@ MASTER_SITE_SUBDIR= xfonts 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 <bsd.port.pre.mk> - -.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 @@ do-install: post-install: @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-fonts/libXft/Makefile b/x11-fonts/libXft/Makefile index fc6f7d7f079c..1a26bff8d63e 100644 --- a/x11-fonts/libXft/Makefile +++ b/x11-fonts/libXft/Makefile @@ -27,8 +27,8 @@ MAN3= Xft.3 .include <bsd.port.pre.mk> -.if ${XFREE86_VERSION} == 3 -BROKEN= Xft requires XFree86 4.x to build. +.if ${X_WINDOW_SYSTEM:L} == xfree86-3 +IGNORE= Xft requires Render extension headers/library to build. .endif .include <bsd.port.post.mk> diff --git a/x11-fonts/mozilla-fonts/Makefile b/x11-fonts/mozilla-fonts/Makefile index 445e282aa9d6..b7ed0bdca21f 100644 --- a/x11-fonts/mozilla-fonts/Makefile +++ b/x11-fonts/mozilla-fonts/Makefile @@ -15,14 +15,12 @@ MASTER_SITES= http://www.happygiraffe.net/dist/ MAINTAINER= dom@happygiraffe.net COMMENT= Web fonts for Netscape/Mozilla +BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} + USE_X_PREFIX= true .include <bsd.port.pre.mk> -.if ${XFREE86_VERSION} == 4 -BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11/XFree86-4-clients -.endif - post-install: .if !defined(NOPORTDOCS) ${MKDIR} ${PREFIX}/share/doc/mozilla-fonts diff --git a/x11-fonts/nucleus/Makefile b/x11-fonts/nucleus/Makefile index 526a42260c18..fede2c555dce 100644 --- a/x11-fonts/nucleus/Makefile +++ b/x11-fonts/nucleus/Makefile @@ -15,16 +15,12 @@ MASTER_SITE_SUBDIR= xfonts MAINTAINER= olgeni@FreeBSD.org COMMENT= Another font package for X +BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} + NO_WRKSUBDIR= yes USE_X_PREFIX= yes -.include <bsd.port.pre.mk> - -.if ${XFREE86_VERSION} == 4 -BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11/XFree86-4-clients -.endif - post-install: @${CAT} ${DESCR} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-fonts/p5-type1inst/Makefile b/x11-fonts/p5-type1inst/Makefile index 30c1f50b14c7..01596f3ba96f 100644 --- a/x11-fonts/p5-type1inst/Makefile +++ b/x11-fonts/p5-type1inst/Makefile @@ -16,6 +16,8 @@ PKGNAMEPREFIX= p5- 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 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/README.type1inst .endif -.include <bsd.port.pre.mk> - -.if ${XFREE86_VERSION} == 4 -RUN_DEPENDS+= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-fonts/sgifonts/Makefile b/x11-fonts/sgifonts/Makefile index e64a67ef7dc3..c6805c4e36b5 100644 --- a/x11-fonts/sgifonts/Makefile +++ b/x11-fonts/sgifonts/Makefile @@ -17,7 +17,7 @@ MAINTAINER= trevor@FreeBSD.org 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 diff --git a/x11-fonts/terminus-font/Makefile b/x11-fonts/terminus-font/Makefile index 22215077859f..946eb71fca55 100644 --- a/x11-fonts/terminus-font/Makefile +++ b/x11-fonts/terminus-font/Makefile @@ -14,20 +14,15 @@ MASTER_SITES= http://www.is-vn.bg/hamster/ 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 <bsd.port.pre.mk> - -.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 @@ do-install: @${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${XFONTDIR} @cd ${XFONTDIR}; mkfontdir -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-fonts/tv-fonts/Makefile b/x11-fonts/tv-fonts/Makefile index d673aee6d6de..c7ac1e4967b5 100644 --- a/x11-fonts/tv-fonts/Makefile +++ b/x11-fonts/tv-fonts/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= http://dl.bytesex.org/releases/${PORTNAME}/ 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 diff --git a/x11-fonts/webfonts/Makefile b/x11-fonts/webfonts/Makefile index e96315a32eba..7f2810493691 100644 --- a/x11-fonts/webfonts/Makefile +++ b/x11-fonts/webfonts/Makefile @@ -34,7 +34,7 @@ USE_X_PREFIX= yes .include <bsd.port.pre.mk> -.if ${XFREE86_VERSION} == 3 +.if ${X_WINDOW_SYSTEM:L} == xfree86-3 RUN_DEPENDS= xfstt:${PORTSDIR}/x11-servers/Xfstt .endif @@ -54,7 +54,7 @@ PLIST_SUB= PKG_OLDXF86=${PKG_OLDXF86} \ 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 @@ install-fonts: 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 diff --git a/x11-fonts/xfs/Makefile b/x11-fonts/xfs/Makefile index 3ab1c8bd9a1a..35e0b789d895 100644 --- a/x11-fonts/xfs/Makefile +++ b/x11-fonts/xfs/Makefile @@ -32,4 +32,8 @@ post-install: ${PREFIX}/lib/X11/fs/config.default .include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc" -.include <bsd.port.mk> +.include <bsd.port.pre.mk> +.if ${X_WINDOW_SYSTEM:L} != xorg +IGNORE= is part of X.Org +.endif +.include <bsd.port.post.mk> diff --git a/x11-fonts/xorg-fonts-100dpi/Makefile b/x11-fonts/xorg-fonts-100dpi/Makefile index ed626d53ed42..e706acdff82e 100644 --- a/x11-fonts/xorg-fonts-100dpi/Makefile +++ b/x11-fonts/xorg-fonts-100dpi/Makefile @@ -25,4 +25,8 @@ XBUILD_DIRS= fonts/encodings fonts/bdf/100dpi XINSTALL_DIRS= fonts/bdf/100dpi .include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc" -.include <bsd.port.mk> +.include <bsd.port.pre.mk> +.if ${X_WINDOW_SYSTEM:L} != xorg +IGNORE= is part of X.Org +.endif +.include <bsd.port.post.mk> diff --git a/x11-fonts/xorg-fonts-75dpi/Makefile b/x11-fonts/xorg-fonts-75dpi/Makefile index a581295f7442..b6bdaa3ae988 100644 --- a/x11-fonts/xorg-fonts-75dpi/Makefile +++ b/x11-fonts/xorg-fonts-75dpi/Makefile @@ -25,4 +25,8 @@ XBUILD_DIRS= fonts/encodings fonts/bdf/75dpi XINSTALL_DIRS= fonts/bdf/75dpi .include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc" -.include <bsd.port.mk> +.include <bsd.port.pre.mk> +.if ${X_WINDOW_SYSTEM:L} != xorg +IGNORE= is part of X.Org +.endif +.include <bsd.port.post.mk> diff --git a/x11-fonts/xorg-fonts-cyrillic/Makefile b/x11-fonts/xorg-fonts-cyrillic/Makefile index 9c177c3079d6..3f91285b8dbe 100644 --- a/x11-fonts/xorg-fonts-cyrillic/Makefile +++ b/x11-fonts/xorg-fonts-cyrillic/Makefile @@ -25,4 +25,8 @@ XBUILD_DIRS= fonts/encodings fonts/bdf/cyrillic XINSTALL_DIRS= fonts/bdf/cyrillic .include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc" -.include <bsd.port.mk> +.include <bsd.port.pre.mk> +.if ${X_WINDOW_SYSTEM:L} != xorg +IGNORE= is part of X.Org +.endif +.include <bsd.port.post.mk> diff --git a/x11-fonts/xorg-fonts-encodings/Makefile b/x11-fonts/xorg-fonts-encodings/Makefile index 533bb56ce02a..d9450f503edd 100644 --- a/x11-fonts/xorg-fonts-encodings/Makefile +++ b/x11-fonts/xorg-fonts-encodings/Makefile @@ -23,4 +23,8 @@ EXTRA_PATCHES= ${CF_PATCHES} XBUILD_DIRS= fonts/encodings .include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc" -.include <bsd.port.mk> +.include <bsd.port.pre.mk> +.if ${X_WINDOW_SYSTEM:L} != xorg +IGNORE= is part of X.Org +.endif +.include <bsd.port.post.mk> diff --git a/x11-fonts/xorg-fonts-miscbitmaps/Makefile b/x11-fonts/xorg-fonts-miscbitmaps/Makefile index 28a9de3fd7c2..8a5190185bdc 100644 --- a/x11-fonts/xorg-fonts-miscbitmaps/Makefile +++ b/x11-fonts/xorg-fonts-miscbitmaps/Makefile @@ -25,4 +25,8 @@ XBUILD_DIRS= fonts/encodings fonts/bdf/misc XINSTALL_DIRS= fonts/bdf/misc .include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc" -.include <bsd.port.mk> +.include <bsd.port.pre.mk> +.if ${X_WINDOW_SYSTEM:L} != xorg +IGNORE= is part of X.Org +.endif +.include <bsd.port.post.mk> diff --git a/x11-fonts/xorg-fonts-truetype/Makefile b/x11-fonts/xorg-fonts-truetype/Makefile index fe59c9cd832f..2610e044bb8c 100644 --- a/x11-fonts/xorg-fonts-truetype/Makefile +++ b/x11-fonts/xorg-fonts-truetype/Makefile @@ -28,4 +28,8 @@ XBUILD_DIRS= fonts/encodings fonts/scaled/TTF XINSTALL_DIRS= fonts/scaled/TTF .include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc" -.include <bsd.port.mk> +.include <bsd.port.pre.mk> +.if ${X_WINDOW_SYSTEM:L} != xorg +IGNORE= is part of X.Org +.endif +.include <bsd.port.post.mk> diff --git a/x11-fonts/xorg-fonts-type1/Makefile b/x11-fonts/xorg-fonts-type1/Makefile index 4a757ff9758d..b2e186e77f53 100644 --- a/x11-fonts/xorg-fonts-type1/Makefile +++ b/x11-fonts/xorg-fonts-type1/Makefile @@ -27,4 +27,8 @@ XBUILD_DIRS= fonts/encodings fonts/scaled/Type1 XINSTALL_DIRS= fonts/scaled/Type1 .include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc" -.include <bsd.port.mk> +.include <bsd.port.pre.mk> +.if ${X_WINDOW_SYSTEM:L} != xorg +IGNORE= is part of X.Org +.endif +.include <bsd.port.post.mk> diff --git a/x11-servers/XFree86-4-FontServer/Makefile b/x11-servers/XFree86-4-FontServer/Makefile index a37a0d8e31f4..db5bf191b51f 100644 --- a/x11-servers/XFree86-4-FontServer/Makefile +++ b/x11-servers/XFree86-4-FontServer/Makefile @@ -27,4 +27,8 @@ XINCLUDE_DIRS= lib/xtrans programs/Xserver XINSTALL_MAN_DIRS= programs/xfs .include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc" -.include <bsd.port.mk> +.include <bsd.port.pre.mk> +.if ${X_WINDOW_SYSTEM:L} != xfree86-4 +IGNORE= is part of XFree86-4 +.endif +.include <bsd.port.post.mk> diff --git a/x11-servers/XFree86-4-NestServer/Makefile b/x11-servers/XFree86-4-NestServer/Makefile index 87762aafaa3a..a905d0466c67 100644 --- a/x11-servers/XFree86-4-NestServer/Makefile +++ b/x11-servers/XFree86-4-NestServer/Makefile @@ -38,4 +38,8 @@ post-extract: ${WRKSRC}/lib/Xdmcp/Wraphelp.c .include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc" -.include <bsd.port.mk> +.include <bsd.port.pre.mk> +.if ${X_WINDOW_SYSTEM:L} != xfree86-4 +IGNORE= is part of XFree86-4 +.endif +.include <bsd.port.post.mk> diff --git a/x11-servers/XFree86-4-PrintServer/Makefile b/x11-servers/XFree86-4-PrintServer/Makefile index 0f26957091b5..30ca5a0c4aa9 100644 --- a/x11-servers/XFree86-4-PrintServer/Makefile +++ b/x11-servers/XFree86-4-PrintServer/Makefile @@ -40,4 +40,8 @@ do-install: $(INSTALL_PROGRAM) ${WRKSRC}/programs/Xserver/Xprt ${PREFIX}/bin/Xprt .include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc" -.include <bsd.port.mk> +.include <bsd.port.pre.mk> +.if ${X_WINDOW_SYSTEM:L} != xfree86-4 +IGNORE= is part of XFree86-4 +.endif +.include <bsd.port.post.mk> diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile index d0596e720644..00a143795cfd 100644 --- a/x11-servers/XFree86-4-Server/Makefile +++ b/x11-servers/XFree86-4-Server/Makefile @@ -122,6 +122,10 @@ NOT_FOR_ARCHS= ia64 .include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc" .include <bsd.port.pre.mk> +.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 diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile index dfceceda5698..86d887ac8b91 100644 --- a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile +++ b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile @@ -42,4 +42,8 @@ post-extract: ${WRKSRC}/lib/Xdmcp/Wraphelp.c .include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc" -.include <bsd.port.mk> +.include <bsd.port.pre.mk> +.if ${X_WINDOW_SYSTEM:L} != xfree86-4 +IGNORE= is part of XFree86-4 +.endif +.include <bsd.port.post.mk> diff --git a/x11-servers/driglide/Makefile b/x11-servers/driglide/Makefile index c31957d694cf..63e87c962b05 100644 --- a/x11-servers/driglide/Makefile +++ b/x11-servers/driglide/Makefile @@ -17,7 +17,6 @@ COMMENT= Libraries to support 3dfx Voodoo3/4/5/Banshee with the DRI USE_BZIP2= yes USE_X_PREFIX= yes -XFREE86_VERSION= 4 INSTALLS_SHLIB= yes USE_INC_LIBTOOL_VER= 13 USE_AUTOMAKE_VER= 14 diff --git a/x11-servers/xorg-fontserver/Makefile b/x11-servers/xorg-fontserver/Makefile index 3ab1c8bd9a1a..35e0b789d895 100644 --- a/x11-servers/xorg-fontserver/Makefile +++ b/x11-servers/xorg-fontserver/Makefile @@ -32,4 +32,8 @@ post-install: ${PREFIX}/lib/X11/fs/config.default .include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc" -.include <bsd.port.mk> +.include <bsd.port.pre.mk> +.if ${X_WINDOW_SYSTEM:L} != xorg +IGNORE= is part of X.Org +.endif +.include <bsd.port.post.mk> diff --git a/x11-servers/xorg-printserver/Makefile b/x11-servers/xorg-printserver/Makefile index 051b1ace08a9..80f6cc07dc3a 100644 --- a/x11-servers/xorg-printserver/Makefile +++ b/x11-servers/xorg-printserver/Makefile @@ -26,4 +26,8 @@ XINCLUDE_DIRS= lib/xtrans XMAN_DIRS= programs/Xserver .include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc" -.include <bsd.port.mk> +.include <bsd.port.pre.mk> +.if ${X_WINDOW_SYSTEM:L} != xorg +IGNORE= is part of X.Org +.endif +.include <bsd.port.post.mk> diff --git a/x11-servers/xorg-server-snap/Makefile b/x11-servers/xorg-server-snap/Makefile index f1686cdfef69..a9d5eea89a94 100644 --- a/x11-servers/xorg-server-snap/Makefile +++ b/x11-servers/xorg-server-snap/Makefile @@ -63,6 +63,10 @@ NOT_FOR_ARCHS= ia64 .include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc" .include <bsd.port.pre.mk> +.if ${X_WINDOW_SYSTEM:L} != xorg +IGNORE= is part of X.Org +.endif + .if ${ARCH} == ia64 PLIST_SUB+= IA64_NA="@comment " .else diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index f1686cdfef69..a9d5eea89a94 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -63,6 +63,10 @@ NOT_FOR_ARCHS= ia64 .include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc" .include <bsd.port.pre.mk> +.if ${X_WINDOW_SYSTEM:L} != xorg +IGNORE= is part of X.Org +.endif + .if ${ARCH} == ia64 PLIST_SUB+= IA64_NA="@comment " .else diff --git a/x11-servers/xorg-vfbserver/Makefile b/x11-servers/xorg-vfbserver/Makefile index c384d2d8ffca..5d0faad289ae 100644 --- a/x11-servers/xorg-vfbserver/Makefile +++ b/x11-servers/xorg-vfbserver/Makefile @@ -28,4 +28,8 @@ XMAN_DIRS= programs/Xserver MAN1= Xvfb.1 .include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc" -.include <bsd.port.mk> +.include <bsd.port.pre.mk> +.if ${X_WINDOW_SYSTEM:L} != xorg +IGNORE= is part of X.Org +.endif +.include <bsd.port.post.mk> diff --git a/x11-toolkits/fox-devel/Makefile b/x11-toolkits/fox-devel/Makefile index 02450f49f112..109878013f44 100644 --- a/x11-toolkits/fox-devel/Makefile +++ b/x11-toolkits/fox-devel/Makefile @@ -48,7 +48,7 @@ LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib ## 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 diff --git a/x11-toolkits/fox14/Makefile b/x11-toolkits/fox14/Makefile index 02450f49f112..109878013f44 100644 --- a/x11-toolkits/fox14/Makefile +++ b/x11-toolkits/fox14/Makefile @@ -48,7 +48,7 @@ LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib ## 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 diff --git a/x11-toolkits/open-motif/Makefile b/x11-toolkits/open-motif/Makefile index e720a5c41e45..0d6af8f6995b 100644 --- a/x11-toolkits/open-motif/Makefile +++ b/x11-toolkits/open-motif/Makefile @@ -21,6 +21,8 @@ DIST_SUBDIR= openmotif MAINTAINER= steve@FreeBSD.org COMMENT= Motif X11 Toolkit (industry standard GUI (IEEE 1295)) +RUN_DEPENDS= imake:${X_IMAKE_PORT} + CONFLICTS= lesstif-* USE_X_PREFIX= yes USE_REINPLACE= yes @@ -38,10 +40,6 @@ DEMOS_SRC= ${WRKSRC}/demos/programs .include <bsd.port.pre.mk> -.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 " diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile index a2d15fd5fd21..ad7303313522 100644 --- a/x11-toolkits/pango/Makefile +++ b/x11-toolkits/pango/Makefile @@ -18,8 +18,8 @@ COMMENT= An open-source framework for the layout and rendering of i18n text 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 @@ post-install: .endif .include <bsd.port.mk> + diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile index df84d74231ca..487c482138bd 100644 --- a/x11-toolkits/qt33/Makefile +++ b/x11-toolkits/qt33/Makefile @@ -115,9 +115,9 @@ CONFIGURE_ARGS+=-system-nas-sound CONFIGURE_ARGS+=-no-nas-sound .endif -.if ${XFREE86_VERSION} < 4 -BROKEN= "The QT ${PORTVERSION} port does not support any XFree86 < 4.x" -.endif # ${XFREE86_VERSION} < 4 +.if ${X_WINDOW_SYSTEM:L} == xfree86-3 +IGNORE= "The QT ${PORTVERSION} port does not support any XFree86 < 4.x" +.endif .if exists(${X11BASE}/include/qt2/qapp.h) BROKEN= "You have QT2 headers installed! Installing this port" diff --git a/x11-toolkits/viewklass/Makefile b/x11-toolkits/viewklass/Makefile index 4880e6ad8089..d752df59b846 100644 --- a/x11-toolkits/viewklass/Makefile +++ b/x11-toolkits/viewklass/Makefile @@ -16,22 +16,16 @@ DISTNAME= ViewKlass-${PORTVERSION} 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 <bsd.port.pre.mk> - -.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 <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-wm/e16/Makefile b/x11-wm/e16/Makefile index 078bf687d1ac..e75ca936ad3d 100644 --- a/x11-wm/e16/Makefile +++ b/x11-wm/e16/Makefile @@ -40,7 +40,7 @@ MAN1= enlightenment.1 .include <bsd.port.pre.mk> -.if (${MACHINE} == "alpha") && (${XFREE86_VERSION} == 3) +.if (${MACHINE} == "alpha") && ${X_WINDOW_SYSTEM:L} == xfree86-3 CONFIGURE_ARGS+= --disable-zoom .endif diff --git a/x11-wm/enlightenment-devel/Makefile b/x11-wm/enlightenment-devel/Makefile index 078bf687d1ac..e75ca936ad3d 100644 --- a/x11-wm/enlightenment-devel/Makefile +++ b/x11-wm/enlightenment-devel/Makefile @@ -40,7 +40,7 @@ MAN1= enlightenment.1 .include <bsd.port.pre.mk> -.if (${MACHINE} == "alpha") && (${XFREE86_VERSION} == 3) +.if (${MACHINE} == "alpha") && ${X_WINDOW_SYSTEM:L} == xfree86-3 CONFIGURE_ARGS+= --disable-zoom .endif diff --git a/x11-wm/enlightenment/Makefile b/x11-wm/enlightenment/Makefile index 078bf687d1ac..e75ca936ad3d 100644 --- a/x11-wm/enlightenment/Makefile +++ b/x11-wm/enlightenment/Makefile @@ -40,7 +40,7 @@ MAN1= enlightenment.1 .include <bsd.port.pre.mk> -.if (${MACHINE} == "alpha") && (${XFREE86_VERSION} == 3) +.if (${MACHINE} == "alpha") && ${X_WINDOW_SYSTEM:L} == xfree86-3 CONFIGURE_ARGS+= --disable-zoom .endif diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile index f567caa4a8d8..67293f5f0a2e 100644 --- a/x11-wm/icewm/Makefile +++ b/x11-wm/icewm/Makefile @@ -57,13 +57,13 @@ CONFIGURE_ARGS+= --with-icesound=esound 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 diff --git a/x11-wm/xfce/Makefile b/x11-wm/xfce/Makefile index b755e19d8498..cffbddb0963c 100644 --- a/x11-wm/xfce/Makefile +++ b/x11-wm/xfce/Makefile @@ -42,7 +42,7 @@ MAN1= glob.1 xfbd.1 xfce.1 xfclock.1 xfglob.1 xfgnome.1 xfhelp.1 \ .include <bsd.port.pre.mk> -.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 diff --git a/x11/XFree86-4-clients/Makefile b/x11/XFree86-4-clients/Makefile index 0d2f9a4cefb2..818c6142017c 100644 --- a/x11/XFree86-4-clients/Makefile +++ b/x11/XFree86-4-clients/Makefile @@ -74,5 +74,11 @@ post-install: .include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc" .include <bsd.port.pre.mk> + +.if ${X_WINDOW_SYSTEM:L} != xfree86-4 +IGNORE= is part of XFree86-4 +.endif + .include "${FILESDIR}/manpages" + .include <bsd.port.post.mk> diff --git a/x11/XFree86-4-documents/Makefile b/x11/XFree86-4-documents/Makefile index 694cb699f99d..1bde9b2c0108 100644 --- a/x11/XFree86-4-documents/Makefile +++ b/x11/XFree86-4-documents/Makefile @@ -17,7 +17,6 @@ DISTFILES= X430src-1.tgz \ MAINTAINER= x11@FreeBSD.org COMMENT= XFree86-4 documentation -XFREE86_VERSION= 4 USE_IMAKE= YES PROJECTROOT= -DProjectRoot=${PREFIX} DIST_SUBDIR= xc @@ -36,4 +35,8 @@ do-configure: ${MAKE} includes ; \ ${MAKE} depend) -.include <bsd.port.mk> +.include <bsd.port.pre.mk> +.if ${X_WINDOW_SYSTEM:L} != xfree86-4 +IGNORE= is part of XFree86-4 +.endif +.include <bsd.port.post.mk> diff --git a/x11/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile index 2422d617e863..599518c4b926 100644 --- a/x11/XFree86-4-libraries/Makefile +++ b/x11/XFree86-4-libraries/Makefile @@ -60,6 +60,9 @@ DebuggableLibraries?= NO .include "Makefile.inc" .include <bsd.port.pre.mk> +.if ${X_WINDOW_SYSTEM:L} != xfree86-4 +IGNORE= is part of XFree86-4 +.endif # BuildXF86DRI is false for FreeBSD < 4.1 .if ${OSVERSION} < 410000 diff --git a/x11/XFree86-4-manuals/Makefile b/x11/XFree86-4-manuals/Makefile index 9cf48d43cee8..065d593c59d2 100644 --- a/x11/XFree86-4-manuals/Makefile +++ b/x11/XFree86-4-manuals/Makefile @@ -18,7 +18,6 @@ COMMENT= XFree86-4 man pages 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 @@ do-configure: ${MAKE} depend) .include <bsd.port.pre.mk> + +.if ${X_WINDOW_SYSTEM:L} != xfree86-4 +IGNORE= is part of XFree86-4 +.endif + .include "${FILESDIR}/manpages" + .include <bsd.port.post.mk> diff --git a/x11/XFree86-4/Makefile b/x11/XFree86-4/Makefile index 0f9d8a2eaa02..595b13a2b87f 100644 --- a/x11/XFree86-4/Makefile +++ b/x11/XFree86-4/Makefile @@ -50,4 +50,8 @@ DEPENDS_TARGET="package" do-install: # empty -.include <bsd.port.mk> +.include <bsd.port.pre.mk> +.if ${X_WINDOW_SYSTEM:L} != xfree86-4 +IGNORE= is part of XFree86-4 +.endif +.include <bsd.port.post.mk> diff --git a/x11/XFree86-contrib/Makefile b/x11/XFree86-contrib/Makefile index 8d149aeedac8..4f00a0b0fbff 100644 --- a/x11/XFree86-contrib/Makefile +++ b/x11/XFree86-contrib/Makefile @@ -28,7 +28,7 @@ MAN1= ico.1 listres.1 showfont.1 viewres.1 xbiff.1 xcalc.1 \ .include <bsd.port.pre.mk> -.if ${XFREE86_VERSION} != 3 +.if ${X_WINDOW_SYSTEM:L} != xfree86-3 IGNORE= "Only for XFree86 version 3" .endif diff --git a/x11/XFree86/Makefile b/x11/XFree86/Makefile index 28e021b0b2e7..6aff6a52f82f 100644 --- a/x11/XFree86/Makefile +++ b/x11/XFree86/Makefile @@ -86,6 +86,10 @@ post-extract: .include <bsd.port.pre.mk> +.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 diff --git a/x11/dgs/Makefile b/x11/dgs/Makefile index f21468ffef2c..73bf612ecc79 100644 --- a/x11/dgs/Makefile +++ b/x11/dgs/Makefile @@ -37,7 +37,7 @@ MANN= dpsexec.man makepsres.man xepsf.man .include <bsd.port.pre.mk> -.if ${XFREE86_VERSION} > 3 +.if ${X_WINDOW_SYSTEM:L} != xfree86-3 IGNORE= "is included in XFree86 4.x and above" .endif diff --git a/x11/emu/Makefile b/x11/emu/Makefile index f59055e92e50..409f3a900e59 100644 --- a/x11/emu/Makefile +++ b/x11/emu/Makefile @@ -18,14 +18,6 @@ COMMENT= A terminal emulator for the X Window System USE_IMAKE= yes WRKSRC= ${WRKDIR}/emu -.include <bsd.port.pre.mk> - -.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 @@ MAN1= emu.1 pre-configure: cd ${WRKSRC}/client ; ${LN} -s ../doc/emu.man . -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11/gdkxft/Makefile b/x11/gdkxft/Makefile index bf784f3ce662..f743dafc95f3 100644 --- a/x11/gdkxft/Makefile +++ b/x11/gdkxft/Makefile @@ -33,7 +33,7 @@ MAN8= gdkxft_sysinstall.8 .include <bsd.port.pre.mk> -.if ${XFREE86_VERSION} < 4 +.if ${X_WINDOW_SYSTEM:L} == xfree86-3 IGNORE= "requires XFree86-4.x or later to run" .endif diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile index 67c989a40513..db61c6ebeb34 100644 --- a/x11/kde4-baseapps/Makefile +++ b/x11/kde4-baseapps/Makefile @@ -16,7 +16,7 @@ DIST_SUBDIR= KDE 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 diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile index 67c989a40513..db61c6ebeb34 100644 --- a/x11/kde4-runtime/Makefile +++ b/x11/kde4-runtime/Makefile @@ -16,7 +16,7 @@ DIST_SUBDIR= KDE 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 diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile index 67c989a40513..db61c6ebeb34 100644 --- a/x11/kde4-workspace/Makefile +++ b/x11/kde4-workspace/Makefile @@ -16,7 +16,7 @@ DIST_SUBDIR= KDE 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 diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index 67c989a40513..db61c6ebeb34 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -16,7 +16,7 @@ DIST_SUBDIR= KDE 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 diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile index 67c989a40513..db61c6ebeb34 100644 --- a/x11/kdebase4-runtime/Makefile +++ b/x11/kdebase4-runtime/Makefile @@ -16,7 +16,7 @@ DIST_SUBDIR= KDE 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 diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile index 67c989a40513..db61c6ebeb34 100644 --- a/x11/kdebase4-workspace/Makefile +++ b/x11/kdebase4-workspace/Makefile @@ -16,7 +16,7 @@ DIST_SUBDIR= KDE 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 diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile index 67c989a40513..db61c6ebeb34 100644 --- a/x11/kdebase4/Makefile +++ b/x11/kdebase4/Makefile @@ -16,7 +16,7 @@ DIST_SUBDIR= KDE 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 diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index 2d4b2dc146ec..3415a7ebcf7e 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -19,7 +19,7 @@ COMMENT= Base set of libraries needed by KDE programs 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 @@ LIB_DEPENDS= art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 \ 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 diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index 2d4b2dc146ec..3415a7ebcf7e 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -19,7 +19,7 @@ COMMENT= Base set of libraries needed by KDE programs 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 @@ LIB_DEPENDS= art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 \ 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 diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile index 34dafa20762e..0a7647a5e98f 100644 --- a/x11/mlterm/Makefile +++ b/x11/mlterm/Makefile @@ -32,7 +32,7 @@ MAN1= mlterm.1 mlclient.1 .include <bsd.port.pre.mk> -.if ${XFREE86_VERSION} == 3 +.if ${X_WINDOW_SYSTEM:L} == xfree86-3 PKGNAMESUFFIX= -noaa .else CONFIGURE_ARGS+= --enable-anti-alias diff --git a/x11/wrapper/Makefile b/x11/wrapper/Makefile index 0e9750538f43..0e66b66f32c3 100644 --- a/x11/wrapper/Makefile +++ b/x11/wrapper/Makefile @@ -30,4 +30,8 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/Xwrapper-4 ${PREFIX}/bin @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.include <bsd.port.mk> +.include <bsd.port.pre.mk> +.if ${X_WINDOW_SYSTEM:L} != xfree86-4 +IGNORE= is part of XFree86-4 +.endif +.include <bsd.port.post.mk> diff --git a/x11/x3270/Makefile b/x11/x3270/Makefile index 3331f72f742e..be99f706caf8 100644 --- a/x11/x3270/Makefile +++ b/x11/x3270/Makefile @@ -14,14 +14,10 @@ MASTER_SITE_SUBDIR= applications MAINTAINER= Yonatan@xpert.com COMMENT= 3270 Terminal emulator -USE_IMAKE= yes - -.include <bsd.port.pre.mk> +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 @@ post-configure: -e 's,%%CC%%,${CC},' \ ${WRKSRC}/Makefile -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11/xgrab/Makefile b/x11/xgrab/Makefile index 6dcbd44607e3..503a0f7c3ccf 100644 --- a/x11/xgrab/Makefile +++ b/x11/xgrab/Makefile @@ -17,14 +17,11 @@ EXTRACT_SUFX= .tar.Z MAINTAINER= jmz@FreeBSD.org COMMENT= An X11 image grabber +BUILD_DEPENDS= xrdb:${X_CLIENTS_PORT} + USE_X_PREFIX= yes USE_IMAKE= yes -.include <bsd.port.pre.mk> -.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 @@ IGNORE= Requires an active X session (and DISPLAY variable) to run xrdb. Pleas MAN1= xgrab.1 xgrabsc.1 -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile index 99cce7b58dc6..45a873552d95 100644 --- a/x11/xlockmore/Makefile +++ b/x11/xlockmore/Makefile @@ -65,7 +65,7 @@ CONFIGURE_ENV+= XLOCKLIBS="${KRB5LIB} ${KRB4LIB} ${MESALIB}" 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 diff --git a/x11/xorg-clients/Makefile b/x11/xorg-clients/Makefile index 67ee40bd427f..835834a405e8 100644 --- a/x11/xorg-clients/Makefile +++ b/x11/xorg-clients/Makefile @@ -59,5 +59,11 @@ post-install: .include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc" .include <bsd.port.pre.mk> + +.if ${X_WINDOW_SYSTEM:L} != xorg +IGNORE= is part of X.Org +.endif + .include "${FILESDIR}/manpages" + .include <bsd.port.post.mk> diff --git a/x11/xorg-libraries/Makefile b/x11/xorg-libraries/Makefile index 470f61b9fac2..b9d0c8b81da0 100644 --- a/x11/xorg-libraries/Makefile +++ b/x11/xorg-libraries/Makefile @@ -57,6 +57,10 @@ post-install: .include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc" .include <bsd.port.pre.mk> + +.if ${X_WINDOW_SYSTEM:L} != xorg +IGNORE= is part of X.Org +.endif # BuildXF86DRI is false for FreeBSD < 4.1 .if ${OSVERSION} < 410000 diff --git a/x11/xorg/Makefile b/x11/xorg/Makefile index 0623a9278b79..2b5707cad896 100644 --- a/x11/xorg/Makefile +++ b/x11/xorg/Makefile @@ -7,7 +7,6 @@ PORTNAME= xorg PORTVERSION= 6.7.0 -PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= # none DISTFILES= # none @@ -54,4 +53,8 @@ DEPENDS_TARGET="package" do-install: # empty -.include <bsd.port.mk> +.include <bsd.port.pre.mk> +.if ${X_WINDOW_SYSTEM:L} != xorg +IGNORE= is part of X.Org +.endif +.include <bsd.port.post.mk> diff --git a/x11/xvattr/Makefile b/x11/xvattr/Makefile index b2dc649e4c09..ce8f27876864 100644 --- a/x11/xvattr/Makefile +++ b/x11/xvattr/Makefile @@ -26,8 +26,8 @@ MAN1= xvattr.1 .include <bsd.port.pre.mk> -.if ${XFREE86_VERSION} == 3 -IGNORE= "Require Xv Extension" +.if ${X_WINDOW_SYSTEM:L} == xfree86-3 +IGNORE= "Requires Xv Extension" .endif .include <bsd.port.post.mk> |