diff options
author | Satoshi Asami <asami@FreeBSD.org> | 2000-08-03 09:28:57 +0000 |
---|---|---|
committer | Satoshi Asami <asami@FreeBSD.org> | 2000-08-03 09:28:57 +0000 |
commit | c6bcad2436d925c98052ed292bd0794ae0e34b45 (patch) | |
tree | 4752ebd6e8eb5959ebf00516e4ecf7156215bbce /x11-fm | |
parent | USE_X_PREFIX should be before bsd.port.pre.mk include. (diff) |
(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
Notes
Notes:
svn path=/head/; revision=31272
Diffstat (limited to 'x11-fm')
-rw-r--r-- | x11-fm/asfiles/Makefile | 4 | ||||
-rw-r--r-- | x11-fm/dfm/Makefile | 4 | ||||
-rw-r--r-- | x11-fm/endeavour/Makefile | 4 | ||||
-rw-r--r-- | x11-fm/fsv/Makefile | 2 | ||||
-rw-r--r-- | x11-fm/offix-files/Makefile | 4 | ||||
-rw-r--r-- | x11-fm/xfm/Makefile | 4 |
6 files changed, 11 insertions, 11 deletions
diff --git a/x11-fm/asfiles/Makefile b/x11-fm/asfiles/Makefile index d5099b70f5a1..42e496ef50ef 100644 --- a/x11-fm/asfiles/Makefile +++ b/x11-fm/asfiles/Makefile @@ -14,11 +14,11 @@ DISTNAME= ASFiles-${PORTVERSION} MAINTAINER= lukin@okbmei.msk.su -LIB_DEPENDS= Dnd.1:${PORTSDIR}/x11/libdnd \ - Xpm.4:${PORTSDIR}/graphics/xpm +LIB_DEPENDS= Dnd.1:${PORTSDIR}/x11/libdnd GNU_CONFIGURE= yes USE_X_PREFIX= yes +USE_XPM= yes MAN1= files.1 MAN3= regexp.3 diff --git a/x11-fm/dfm/Makefile b/x11-fm/dfm/Makefile index 6d460288e3e3..07cbbe555d0b 100644 --- a/x11-fm/dfm/Makefile +++ b/x11-fm/dfm/Makefile @@ -12,13 +12,13 @@ MASTER_SITES= http://linux.tucows.com/files/x11/file/ MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ - gdk_imlib.5:${PORTSDIR}/graphics/imlib +LIB_DEPENDS= gdk_imlib.5:${PORTSDIR}/graphics/imlib GTK_CONFIG?= ${X11BASE}/bin/gtk12-config WRKSRC= ${WRKDIR}/${PORTNAME} USE_X_PREFIX= yes +USE_XPM= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GTK_CONFIG="${GTK_CONFIG}" \ diff --git a/x11-fm/endeavour/Makefile b/x11-fm/endeavour/Makefile index 3669eecf6125..6da0aa0531c9 100644 --- a/x11-fm/endeavour/Makefile +++ b/x11-fm/endeavour/Makefile @@ -14,12 +14,12 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= Imlib.5:${PORTSDIR}/graphics/imlib \ - Xpm.4:${PORTSDIR}/graphics/xpm +LIB_DEPENDS= Imlib.5:${PORTSDIR}/graphics/imlib WRKSRC= ${WRKDIR}/${DISTNAME}/endeavour USE_X_PREFIX= yes +USE_XPM= yes do-install: ${INSTALL_PROGRAM} ${WRKSRC}/endeavour ${PREFIX}/bin diff --git a/x11-fm/fsv/Makefile b/x11-fm/fsv/Makefile index e11a0e96307f..a25415ce1e48 100644 --- a/x11-fm/fsv/Makefile +++ b/x11-fm/fsv/Makefile @@ -13,12 +13,12 @@ MASTER_SITES= http://fox.mit.edu/skunk/soft/src/ MAINTAINER= sobomax@FreeBSD.org LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - GL.14:${PORTSDIR}/graphics/Mesa3 \ gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea GTK_CONFIG?= ${X11BASE}/bin/gtk12-config USE_X_PREFIX= yes +USE_MESA= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-GL-prefix=${X11BASE}/lib CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/x11-fm/offix-files/Makefile b/x11-fm/offix-files/Makefile index d02a91b5207e..684e5f3b6515 100644 --- a/x11-fm/offix-files/Makefile +++ b/x11-fm/offix-files/Makefile @@ -17,12 +17,12 @@ MAINTAINER= ruslan@shevchenko.kiev.ua RUN_DEPENDS= execute:${PORTSDIR}/x11/offix-execute \ editor:${PORTSDIR}/editors/offix-editor -LIB_DEPENDS= Dnd.1:${PORTSDIR}/x11/libdnd \ - Xpm.4:${PORTSDIR}/graphics/xpm +LIB_DEPENDS= Dnd.1:${PORTSDIR}/x11/libdnd GNU_CONFIGURE= YES USE_GMAKE= YES USE_X_PREFIX= YES +USE_XPM= YES MAN1= files.1 MAN3= regexp.3 diff --git a/x11-fm/xfm/Makefile b/x11-fm/xfm/Makefile index d371f73b9df5..4fa9d6ad41ad 100644 --- a/x11-fm/xfm/Makefile +++ b/x11-fm/xfm/Makefile @@ -12,10 +12,10 @@ MASTER_SITES= ftp://ftp.uni-koeln.de/windows/xcontrib/ MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d \ - Xpm.4:${PORTSDIR}/graphics/xpm +LIB_DEPENDS= Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d USE_IMAKE= yes +USE_XPM= yes MAN1= xfm.1 xfmtype.1 .include <bsd.port.mk> |