diff options
| author | anholt <anholt@FreeBSD.org> | 2004-07-24 03:10:32 +0800 |
|---|---|---|
| committer | anholt <anholt@FreeBSD.org> | 2004-07-24 03:10:32 +0800 |
| commit | 3c76fd7fad82c9f137407348028fde08754f2866 (patch) | |
| tree | 9818557f7ca7be09aba8db3b18a8262f50280603 /vietnamese | |
| parent | a861bc861bc7251a2f2399f845d673f742a19ee1 (diff) | |
| download | freebsd-ports-gnome-3c76fd7fad82c9f137407348028fde08754f2866.tar.gz freebsd-ports-gnome-3c76fd7fad82c9f137407348028fde08754f2866.tar.zst freebsd-ports-gnome-3c76fd7fad82c9f137407348028fde08754f2866.zip | |
- 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)
Diffstat (limited to 'vietnamese')
| -rw-r--r-- | vietnamese/unicode-uhoai/Makefile | 12 | ||||
| -rw-r--r-- | vietnamese/vnterm/Makefile | 6 | ||||
| -rw-r--r-- | vietnamese/vnxfonts/Makefile | 12 |
3 files changed, 10 insertions, 20 deletions
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> |