From 54a0b86543e9ffa811825f0afecea56e89aac2a5 Mon Sep 17 00:00:00 2001 From: Ade Lovett Date: Tue, 15 Nov 2005 06:52:12 +0000 Subject: Mass-conversion to the USE_AUTOTOOLS New World Order. The code present in bsd.autotools.mk essentially makes this a no-op given that all the old variables set a USE_AUTOTOOLS_COMPAT variable, which is parsed in exactly the same way as USE_AUTOTOOLS itself. Moreover, USE_AUTOTOOLS has already been extensively tested by the GNOME team -- all GNOME 2.12.x ports use it. Preliminary documentation can be found at: http://people.FreeBSD.org/~ade/autotools.txt which is in the process of being SGMLized before introduction into the Porters Handbook. Light blue touch-paper. Run. --- java/classpath/Makefile | 2 +- java/jc/Makefile | 2 +- java/jmp/Makefile | 2 +- java/kaffe/Makefile | 2 +- java/sablevm/Makefile | 4 +--- 5 files changed, 5 insertions(+), 7 deletions(-) (limited to 'java') diff --git a/java/classpath/Makefile b/java/classpath/Makefile index 4398f6e7a694..c86eb663df46 100644 --- a/java/classpath/Makefile +++ b/java/classpath/Makefile @@ -18,7 +18,7 @@ COMMENT= A GNU project to create a free Java class library BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 USE_GNOME= gtk20 libartlgpl2 pkgconfig USE_JAVA= yes USE_JIKES= yes diff --git a/java/jc/Makefile b/java/jc/Makefile index 0925d503ef9b..9c882205c888 100644 --- a/java/jc/Makefile +++ b/java/jc/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt MAN1= jc.1 -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 USE_JAVA= yes USE_GMAKE= yes JAVA_BUILD= jre diff --git a/java/jmp/Makefile b/java/jmp/Makefile index 6024d390d59e..1633299b0976 100644 --- a/java/jmp/Makefile +++ b/java/jmp/Makefile @@ -37,7 +37,7 @@ CFLAGS+= -DJMPDEBUG -g CFLAGS+= -O3 .endif -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes USE_JAVA= yes JAVA_VERSION= 1.2+ diff --git a/java/kaffe/Makefile b/java/kaffe/Makefile index a4bfa542c348..064e59f0c657 100644 --- a/java/kaffe/Makefile +++ b/java/kaffe/Makefile @@ -27,7 +27,7 @@ WRKSRC= ${WRKDIR}/kaffe-${PORTVERSION} ONLY_FOR_ARCHS= i386 amd64 -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes USE_ICONV= yes LIBTOOLFLAGS= diff --git a/java/sablevm/Makefile b/java/sablevm/Makefile index aa0c76311a51..236e4ebcd18e 100644 --- a/java/sablevm/Makefile +++ b/java/sablevm/Makefile @@ -23,11 +23,9 @@ LIB_DEPENDS= popt:${PORTSDIR}/devel/popt \ gtk-x11-2.0:${PORTSDIR}/x11-toolkits/gtk20 \ art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl2 -USE_AUTOCONF_VER=259 +USE_AUTOTOOLS= autoconf:259 libltdl:15 libtool:15 #GNU_CONFIGURE= yes USE_GMAKE= yes -USE_LIBTOOL_VER=15 -USE_LIBLTDL= yes INSTALLS_SHLIB= yes PLIST_SUB= PORTVERSION=${PORTVERSION} CONFIGURE_ENV= CFLAGS="-I${PREFIX}/include -L${PREFIX}/lib" -- cgit v1.2.3