From c6bcad2436d925c98052ed292bd0794ae0e34b45 Mon Sep 17 00:00:00 2001 From: Satoshi Asami 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/fvwm95-i18n/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'x11-wm/fvwm95-i18n') diff --git a/x11-wm/fvwm95-i18n/Makefile b/x11-wm/fvwm95-i18n/Makefile index 7447aa98df79..836a37daa1d4 100644 --- a/x11-wm/fvwm95-i18n/Makefile +++ b/x11-wm/fvwm95-i18n/Makefile @@ -25,12 +25,12 @@ PATCHFILES= fvwm95-2.0.43a-Autoconf.I18N.diff.gz MAINTAINER= ryo2@on.rim.or.jp -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm BUILD_DEPENDS= ${LOCALBASE}/lib/librplay.a:${PORTSDIR}/audio/rplay RUN_DEPENDS= ${X11BASE}/icons/chuck.xpm:${PORTSDIR}/x11/fbsd-icons EXTRACT_ONLY= ${DISTNAME}.tgz ${PKGNAME}-portKit-19981123.tgz USE_X_PREFIX= yes +USE_XPM= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --x-includes=${X11BASE}/include \ --mandir=${MANPREFIX}/man \ -- cgit v1.2.3