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 --- net/cnet/Makefile | 4 ++-- net/ppxp/Makefile | 4 ++-- net/wmnet/Makefile | 3 +-- net/xisp/Makefile | 4 ++-- net/xtraceroute/Makefile | 2 +- 5 files changed, 8 insertions(+), 9 deletions(-) (limited to 'net') diff --git a/net/cnet/Makefile b/net/cnet/Makefile index 47094704a89f..a18b80ac1527 100644 --- a/net/cnet/Makefile +++ b/net/cnet/Makefile @@ -12,10 +12,10 @@ MASTER_SITES= http://www.cs.uwa.edu.au/cnet/ MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82 \ - Xpm.4:${PORTSDIR}/graphics/xpm +LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82 USE_X_PREFIX= yes +USE_XPM= yes USE_GMAKE= yes ALL_TARGET= # empty MAN1= cnet.1 diff --git a/net/ppxp/Makefile b/net/ppxp/Makefile index 61acffcecd44..c0c6abddbff8 100644 --- a/net/ppxp/Makefile +++ b/net/ppxp/Makefile @@ -16,8 +16,7 @@ MASTER_SITES= http://www.dsl.gr.jp/~manabe/PPxP/packages/ \ MAINTAINER= nosuzuki@e-mail.ne.jp -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ - xforms.0:${PORTSDIR}/x11-toolkits/xforms +LIB_DEPENDS= xforms.0:${PORTSDIR}/x11-toolkits/xforms .if defined(WITH_TCLJP) BUILD_DEPENDS= wish8.0jp:${PORTSDIR}/japanese/tk80 \ tclsh8.0jp:${PORTSDIR}/japanese/tcl80 @@ -32,6 +31,7 @@ RUN_DEPENDS= wish8.2:${PORTSDIR}/x11-toolkits/tk82 \ tclsh8.2:${PORTSDIR}/lang/tcl82 .endif +USE_XPM= yes WRKSRC= ${WRKDIR}/ppxp USE_GMAKE= yes MAKEFILE= makefile diff --git a/net/wmnet/Makefile b/net/wmnet/Makefile index 8b0bd5f8fc29..7e91349f4859 100644 --- a/net/wmnet/Makefile +++ b/net/wmnet/Makefile @@ -12,8 +12,7 @@ MASTER_SITES= ftp://ftp.enteract.com/users/rneswold/ MAINTAINER= rneswold@enteract.com -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - +USE_XPM= yes MAN1= wmnet.1 .include diff --git a/net/xisp/Makefile b/net/xisp/Makefile index 668e5ff52f2b..ddefce82dd36 100644 --- a/net/xisp/Makefile +++ b/net/xisp/Makefile @@ -14,9 +14,9 @@ DISTFILES= xisp-2.6-noufc.tar.gz \ MAINTAINER= morishim@cig.mot.com -LIB_DEPENDS= xforms:${PORTSDIR}/x11-toolkits/xforms \ - Xpm.4:${PORTSDIR}/graphics/xpm +LIB_DEPENDS= xforms:${PORTSDIR}/x11-toolkits/xforms +USE_XPM= yes WRKSRC= ${WRKDIR}/xisp-2.6 MAN1= xisp.1 HAS_CONFIGURE= yes diff --git a/net/xtraceroute/Makefile b/net/xtraceroute/Makefile index dfdd328a60a7..ff8c6b3fdc33 100644 --- a/net/xtraceroute/Makefile +++ b/net/xtraceroute/Makefile @@ -14,13 +14,13 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DATAFILES} MAINTAINER= sobomax@FreeBSD.org LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - GL.14:${PORTSDIR}/graphics/Mesa3 \ gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea \ tiff.4:${PORTSDIR}/graphics/tiff GTK_CONFIG?= ${X11BASE}/bin/gtk12-config USE_X_PREFIX= yes +USE_MESA= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-GL-prefix=${X11BASE}/lib \ --with-lib-GL -- cgit v1.2.3