From 7173d932bf0cf75d5bcbb04086481211381c60da Mon Sep 17 00:00:00 2001
From: asami <asami@FreeBSD.org>
Date: Thu, 3 Aug 2000 09:28:57 +0000
Subject: (1) Add new variable, XFREE86_VERSION, to specify which version of   
  XFree86 (3 or 4) to depend to when USE_XLIB is set.     XFREE86_VERSION
 defaults to 3 for now, but adventurous users can     override it in
 /etc/make.conf.  When XFREE86_VERSION=3, USE_XLIB     will add a dependency
 to x11/XFree86; when it is set to 4, the     dependency will be to
 x11/XFree86-4-libraries.  When     XFREE86_VERSION=4, the PKG_IGNORE_DEPENDS
 and ALWAYS_BUILD_DEPENDS     hacks to avoid messing with XFree86 are turned
 off.

    Since XFree86 version 4 includes some software that used to be
    separate ports, when XFREE86_VERSION=3 the following variables are
    provided:

    USE_DGS		LIB_DEPENDS on x11/dgs
    USE_FREETYPE	LIB_DEPENDS on print/freetype
    USE_MESA		LIB_DEPENDS on graphics/Mesa3
    USE_XPM		LIB_DEPENDS on graphics/xpm

    When XFREE86_VERSION=4, these variables have no effect.  The
    LIB_DEPENDS in the tree for the above four ports have all been
    converted to the USE_* counterparts.  For your information, this
    is the count of the number of ports:

    USE_DGS		0
    USE_FREETYPE	16
    USE_MESA		36
    USE_XPM		236

    There is a new variable, XAWVER, which is set to 6 when
    XFREE86_VERSION=3 and 7 when XFREE86_VERSION=4.  This is also
    passed to PLIST_SUB so ports that build Xaw based shared libraries
    can use this variable to substitute the shlib version number.

    There is also a provision of using a separate mtree file for
    XFREE86_VERSION=4, but that part is not enabled yet.

Reviewed by:	the ports list
Tested by:	make index (XFREE86_VERSION=3 only)

(2) Add hebrew to list of valid categories.
Submitted by:	nbm
---
 x11-wm/afterstep/Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'x11-wm/afterstep')

diff --git a/x11-wm/afterstep/Makefile b/x11-wm/afterstep/Makefile
index ea4abc7..ae307ca 100644
--- a/x11-wm/afterstep/Makefile
+++ b/x11-wm/afterstep/Makefile
@@ -15,10 +15,9 @@ DISTNAME=	AfterStep-${PORTVERSION}
 
 MAINTAINER=	jfitz@FreeBSD.org
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-
 NO_LATEST_LINK= yes
 USE_X_PREFIX=	yes
+USE_XPM=	yes
 INSTALL_TARGET=	install install.man
 MANCOMPRESSED=	yes
 MAN1=		afterstep.1 asclock.1 Animate.1 Audio.1 Auto.1 Banner.1 Pager.1 Wharf.1
-- 
cgit v1.1