aboutsummaryrefslogtreecommitdiffstats
path: root/x11-fonts/bitmap-fonts/Makefile
diff options
context:
space:
mode:
authoranholt <anholt@FreeBSD.org>2004-07-24 03:10:32 +0800
committeranholt <anholt@FreeBSD.org>2004-07-24 03:10:32 +0800
commit3c76fd7fad82c9f137407348028fde08754f2866 (patch)
tree9818557f7ca7be09aba8db3b18a8262f50280603 /x11-fonts/bitmap-fonts/Makefile
parenta861bc861bc7251a2f2399f845d673f742a19ee1 (diff)
downloadfreebsd-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 'x11-fonts/bitmap-fonts/Makefile')
-rw-r--r--x11-fonts/bitmap-fonts/Makefile12
1 files changed, 2 insertions, 10 deletions
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>