From 4eb209da7d941e66e0cb065aead6bda76c9e97f3 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 23 Jul 2004 19:10:32 +0000 Subject: - 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) --- mail/metamail/Makefile | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'mail/metamail/Makefile') 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 - -.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 +.include -- cgit v1.2.3