From af2a6cb93bc18e2f18ab75f873cc87f3eddcf3bd Mon Sep 17 00:00:00 2001 From: Ade Lovett Date: Thu, 31 May 2001 22:53:13 +0000 Subject: [PATCH] Replace explicit build dependency on automake with USE_AUTOMAKE knob --- deskutils/bitnotes/Makefile | 3 +-- finance/emma/Makefile | 2 +- games/gcompris/Makefile | 3 +-- games/gcompris2/Makefile | 3 +-- games/quakeforge/Makefile | 2 +- misc/emma/Makefile | 2 +- net/gnometelnet/Makefile | 3 +-- x11-toolkits/lesstif/Makefile | 3 +-- x11-toolkits/libgtkeditor/Makefile | 2 +- 9 files changed, 9 insertions(+), 14 deletions(-) diff --git a/deskutils/bitnotes/Makefile b/deskutils/bitnotes/Makefile index c5ec666d21b2..961bf79facec 100644 --- a/deskutils/bitnotes/Makefile +++ b/deskutils/bitnotes/Makefile @@ -14,12 +14,11 @@ EXTRACT_SUFX= .tgz MAINTAINER= sobomax@FreeBSD.org -BUILD_DEPENDS= automake:${PORTSDIR}/devel/automake - WRKSRC= ${WRKDIR}/BitNotes USE_X_PREFIX= yes USE_AUTOCONF= yes +USE_AUTOMAKE= yes USE_GMAKE= yes USE_GNOME= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/finance/emma/Makefile b/finance/emma/Makefile index 69055e2c333d..43821425d635 100644 --- a/finance/emma/Makefile +++ b/finance/emma/Makefile @@ -13,12 +13,12 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.1/-1/} MAINTAINER= sobomax@FreeBSD.org -BUILD_DEPENDS= automake:${PORTSDIR}/devel/automake RUN_DEPENDS= ${PYTHON_SITELIBDIR}/mx/DateTime/DateTime.py:${PORTSDIR}/lang/py-mx-base WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.1//} USE_X_PREFIX= yes +USE_AUTOMAKE= yes USE_GMAKE= yes USE_GNOME= yes USE_LIBTOOL= yes diff --git a/games/gcompris/Makefile b/games/gcompris/Makefile index b65387970930..65dd6e91bb39 100644 --- a/games/gcompris/Makefile +++ b/games/gcompris/Makefile @@ -14,9 +14,8 @@ EXTRACT_SUFX= .tgz MAINTAINER= sobomax@FreeBSD.org -BUILD_DEPENDS= ${LOCALBASE}/share/automake/install-sh:${PORTSDIR}/devel/automake - USE_X_PREFIX= yes +USE_AUTOMAKE= yes USE_GMAKE= yes USE_GNOME= yes USE_LIBTOOL= yes diff --git a/games/gcompris2/Makefile b/games/gcompris2/Makefile index b65387970930..65dd6e91bb39 100644 --- a/games/gcompris2/Makefile +++ b/games/gcompris2/Makefile @@ -14,9 +14,8 @@ EXTRACT_SUFX= .tgz MAINTAINER= sobomax@FreeBSD.org -BUILD_DEPENDS= ${LOCALBASE}/share/automake/install-sh:${PORTSDIR}/devel/automake - USE_X_PREFIX= yes +USE_AUTOMAKE= yes USE_GMAKE= yes USE_GNOME= yes USE_LIBTOOL= yes diff --git a/games/quakeforge/Makefile b/games/quakeforge/Makefile index 831fc13dcad9..8b5be854d462 100644 --- a/games/quakeforge/Makefile +++ b/games/quakeforge/Makefile @@ -18,7 +18,6 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${WADFILE} MAINTAINER= darius@dons.net.au -BUILD_DEPENDS= aclocal:${PORTSDIR}/devel/automake LIB_DEPENDS= SDL-1.0.2:${PORTSDIR}/devel/sdl10 \ ${GL_DEPENDS} @@ -27,6 +26,7 @@ SDL_CONFIG?= ${LOCALBASE}/bin/sdl-config WADFILE= quakesw-1.0.6.tar.gz USE_BZIP2= yes USE_GMAKE= yes +USE_AUTOMAKE= yes USE_AUTOCONF= yes USE_XLIB= yes PLIST= ${WRKDIR}/PLIST diff --git a/misc/emma/Makefile b/misc/emma/Makefile index 69055e2c333d..43821425d635 100644 --- a/misc/emma/Makefile +++ b/misc/emma/Makefile @@ -13,12 +13,12 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.1/-1/} MAINTAINER= sobomax@FreeBSD.org -BUILD_DEPENDS= automake:${PORTSDIR}/devel/automake RUN_DEPENDS= ${PYTHON_SITELIBDIR}/mx/DateTime/DateTime.py:${PORTSDIR}/lang/py-mx-base WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.1//} USE_X_PREFIX= yes +USE_AUTOMAKE= yes USE_GMAKE= yes USE_GNOME= yes USE_LIBTOOL= yes diff --git a/net/gnometelnet/Makefile b/net/gnometelnet/Makefile index be244d8e6c6c..501302d598b3 100644 --- a/net/gnometelnet/Makefile +++ b/net/gnometelnet/Makefile @@ -13,11 +13,10 @@ DISTNAME= ${PORTNAME:S/gnome/gnome-/}-${PORTVERSION} MAINTAINER= sobomax@FreeBSD.org -BUILD_DEPENDS= automake:${PORTSDIR}/devel/automake - USE_BZIP2= yes USE_X_PREFIX= yes USE_GNOME= yes +USE_AUTOMAKE= yes USE_LIBTOOL= yes USE_GMAKE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/x11-toolkits/lesstif/Makefile b/x11-toolkits/lesstif/Makefile index 91cd36cdd4b8..3ee972f2116e 100644 --- a/x11-toolkits/lesstif/Makefile +++ b/x11-toolkits/lesstif/Makefile @@ -15,9 +15,8 @@ MASTER_SITES= ftp://ftp.lesstif.org/pub/hungry/lesstif/srcdist/ \ MAINTAINER= ports@freebsd.org -BUILD_DEPENDS= ${LOCALBASE}/bin/automake:${PORTSDIR}/devel/automake - MANUAL_PACKAGE_BUILD= do not want to install during interactive build +USE_AUTOMAKE= yes USE_AUTOCONF= yes USE_X_PREFIX= yes INSTALLS_SHLIB= yes diff --git a/x11-toolkits/libgtkeditor/Makefile b/x11-toolkits/libgtkeditor/Makefile index 7f4de9c6bf0c..1af123da6e01 100644 --- a/x11-toolkits/libgtkeditor/Makefile +++ b/x11-toolkits/libgtkeditor/Makefile @@ -14,10 +14,10 @@ DISTNAME= ${PORTNAME:S/lib//}-${PORTVERSION} MAINTAINER= sobomax@FreeBSD.org -BUILD_DEPENDS= ${LOCALBASE}/share/automake/install-sh:${PORTSDIR}/devel/automake LIB_DEPENDS= unicode.0:${PORTSDIR}/devel/libunicode USE_X_PREFIX= yes +USE_AUTOMAKE= yes USE_GTK= yes USE_GMAKE= yes USE_LIBTOOL= yes