From 11a74e8c90436dd695c832e2318b5d3453268f69 Mon Sep 17 00:00:00 2001 From: asami Date: Tue, 5 Sep 2000 18:34:52 +0000 Subject: Use ${XAWVER} for Xaw3d's shlib version number in LIB_DEPENDS so these ports work with both XFree86-3 and XFree86-4. --- cad/felt/Makefile | 2 +- emulators/vice/Makefile | 2 +- games/3dc/Makefile | 2 +- games/xfrisk/Makefile | 2 +- games/xmine/Makefile | 2 +- graphics/fxtv/Makefile | 2 +- graphics/xfig-devel/Makefile | 2 +- graphics/xfig/Makefile | 2 +- math/siag/Makefile | 2 +- misc/muuz/Makefile | 2 +- multimedia/fxtv/Makefile | 2 +- science/felt/Makefile | 2 +- x11-fm/xfm/Makefile | 2 +- x11/libsx/Makefile | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/cad/felt/Makefile b/cad/felt/Makefile index cc584e058c56..425da9f4b5d2 100644 --- a/cad/felt/Makefile +++ b/cad/felt/Makefile @@ -16,7 +16,7 @@ EXTRACT_SUFX= .src.tar.gz MAINTAINER= giffunip@asme.org -LIB_DEPENDS= Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d +LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d WRKSRC= ${WRKDIR}/FElt-${PORTVERSION} GNU_CONFIGURE= yes diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile index ac358531fa15..dc73e024c398 100644 --- a/emulators/vice/Makefile +++ b/emulators/vice/Makefile @@ -11,7 +11,7 @@ MASTER_SITES= ftp://ftp.funet.fi/pub/cbm/crossplatform/emulators/VICE/ MAINTAINER= dchapes@ddm.on.ca -LIB_DEPENDS= Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d +LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d WRKSRC= ${WRKDIR}/vice-1.2 USE_XLIB= yes diff --git a/games/3dc/Makefile b/games/3dc/Makefile index 2942952e4c67..4934f308f1c3 100644 --- a/games/3dc/Makefile +++ b/games/3dc/Makefile @@ -14,7 +14,7 @@ DISTNAME= 3Dc-${PORTVERSION} MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d +LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d USE_X_PREFIX= yes USE_XPM= yes diff --git a/games/xfrisk/Makefile b/games/xfrisk/Makefile index 0abaefe0016c..dc40cc604bff 100644 --- a/games/xfrisk/Makefile +++ b/games/xfrisk/Makefile @@ -13,7 +13,7 @@ DISTNAME= XFrisk-${PORTVERSION} MAINTAINER= mph@freebsd.org -LIB_DEPENDS= Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d +LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d NO_CDROM= Possible trademark infringement diff --git a/games/xmine/Makefile b/games/xmine/Makefile index b25ddcf345b0..1beb59c91129 100644 --- a/games/xmine/Makefile +++ b/games/xmine/Makefile @@ -15,7 +15,7 @@ DISTNAME= ${PKGNAME}-Xaw MAINTAINER= joerg@FreeBSD.org -LIB_DEPENDS= Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d +LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d USE_IMAKE= yes MAN6= xmine.6 diff --git a/graphics/fxtv/Makefile b/graphics/fxtv/Makefile index d727e1cf02e9..b6b9146513c8 100644 --- a/graphics/fxtv/Makefile +++ b/graphics/fxtv/Makefile @@ -14,7 +14,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= aa8vb@nc.rr.com LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ - Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d + Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d # This program does not actually require the programs below unless you # use audio/video recording and/or playback and save to a non-raw format. diff --git a/graphics/xfig-devel/Makefile b/graphics/xfig-devel/Makefile index 56efa0972782..9bfa2ceb5103 100644 --- a/graphics/xfig-devel/Makefile +++ b/graphics/xfig-devel/Makefile @@ -16,7 +16,7 @@ DISTNAME= ${PORTNAME}.${PORTVERSION}.full MAINTAINER= ports@FreeBSD.org LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ - Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d + Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d RUN_DEPENDS= fig2dev:${PORTSDIR}/print/transfig WRKSRC= ${WRKDIR}/${PORTNAME}.${PORTVERSION} diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile index 56efa0972782..9bfa2ceb5103 100644 --- a/graphics/xfig/Makefile +++ b/graphics/xfig/Makefile @@ -16,7 +16,7 @@ DISTNAME= ${PORTNAME}.${PORTVERSION}.full MAINTAINER= ports@FreeBSD.org LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ - Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d + Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d RUN_DEPENDS= fig2dev:${PORTSDIR}/print/transfig WRKSRC= ${WRKDIR}/${PORTNAME}.${PORTVERSION} diff --git a/math/siag/Makefile b/math/siag/Makefile index 81e035e93fe2..4318f3b74f46 100644 --- a/math/siag/Makefile +++ b/math/siag/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.siag.nu/pub/siag/ \ MAINTAINER= mi@aldan.algebra.com -LIB_DEPENDS= Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d \ +LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d \ Magick:${PORTSDIR}/graphics/ImageMagick RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot \ mswordview:${PORTSDIR}/textproc/mswordview \ diff --git a/misc/muuz/Makefile b/misc/muuz/Makefile index 36570493da99..c4ea372b9c7f 100644 --- a/misc/muuz/Makefile +++ b/misc/muuz/Makefile @@ -12,7 +12,7 @@ MASTER_SITES= ftp://toxic.magnesium.net/pub/FreeBSD/muuz/ MAINTAINER= kline@thought.org -LIB_DEPENDS= Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d +LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d USE_IMAKE= yes MAN1= muuz.1 diff --git a/multimedia/fxtv/Makefile b/multimedia/fxtv/Makefile index d727e1cf02e9..b6b9146513c8 100644 --- a/multimedia/fxtv/Makefile +++ b/multimedia/fxtv/Makefile @@ -14,7 +14,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= aa8vb@nc.rr.com LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ - Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d + Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d # This program does not actually require the programs below unless you # use audio/video recording and/or playback and save to a non-raw format. diff --git a/science/felt/Makefile b/science/felt/Makefile index cc584e058c56..425da9f4b5d2 100644 --- a/science/felt/Makefile +++ b/science/felt/Makefile @@ -16,7 +16,7 @@ EXTRACT_SUFX= .src.tar.gz MAINTAINER= giffunip@asme.org -LIB_DEPENDS= Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d +LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d WRKSRC= ${WRKDIR}/FElt-${PORTVERSION} GNU_CONFIGURE= yes diff --git a/x11-fm/xfm/Makefile b/x11-fm/xfm/Makefile index 4fa9d6ad41ad..735df932a339 100644 --- a/x11-fm/xfm/Makefile +++ b/x11-fm/xfm/Makefile @@ -12,7 +12,7 @@ MASTER_SITES= ftp://ftp.uni-koeln.de/windows/xcontrib/ MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d +LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d USE_IMAKE= yes USE_XPM= yes diff --git a/x11/libsx/Makefile b/x11/libsx/Makefile index ef0ac14fbc39..80b1a7f6563b 100644 --- a/x11/libsx/Makefile +++ b/x11/libsx/Makefile @@ -15,7 +15,7 @@ EXTRACT_SUFX= .tar.Z MAINTAINER= giffunip@asme.org -LIB_DEPENDS= Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d +LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d USE_X_PREFIX= yes ALL_TARGET= src freq -- cgit