From 1a628ded35ecbbc5eeb75598dd844d830aca8cb2 Mon Sep 17 00:00:00 2001 From: Ade Lovett Date: Fri, 4 Jun 2004 17:29:38 +0000 Subject: Sync with new bsd.autotools.mk --- japanese/aterm/Makefile | 7 ++++--- japanese/celrw/Makefile | 9 ++++----- japanese/eblook/Makefile | 1 + japanese/emacs20-dl-canna/Makefile | 2 +- japanese/emacs20-dl-wnn6/Makefile | 4 ++-- japanese/migemo/Makefile | 1 + japanese/mutt-devel/Makefile | 1 + japanese/mutt/Makefile | 1 + 8 files changed, 15 insertions(+), 11 deletions(-) (limited to 'japanese') diff --git a/japanese/aterm/Makefile b/japanese/aterm/Makefile index 9bce1bdb1f14..8a73c3490907 100644 --- a/japanese/aterm/Makefile +++ b/japanese/aterm/Makefile @@ -20,8 +20,8 @@ COMMENT= A color vt102 terminal emulator with transparency support LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png -BUILD_DEPENDS+= autoconf:${PORTSDIR}/devel/autoconf +WANT_AUTOCONF_VER=253 USE_X_PREFIX= yes USE_XPM= yes GNU_CONFIGURE= yes @@ -38,8 +38,9 @@ MAN1= aterm.1 pre-configure: @(cd ${WRKSRC}; \ - autoheader --localdir=autoconf autoconf/configure.in > autoconf/config.h.in; \ - autoconf --localdir=autoconf autoconf/configure.in > configure) + ${AUTOHEADER} --localdir=autoconf autoconf/configure.in > autoconf/config.h.in; \ + ${AUTOCONF} --localdir=autoconf autoconf/configure.in > configure) + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/aterm ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/doc/aterm.1 ${PREFIX}/man/man1/ diff --git a/japanese/celrw/Makefile b/japanese/celrw/Makefile index d9a5186cc99a..b2d719cc890b 100644 --- a/japanese/celrw/Makefile +++ b/japanese/celrw/Makefile @@ -13,17 +13,16 @@ MASTER_SITES= http://www.nurs.or.jp/~kurati/celrw/ MAINTAINER= shuna@pop16.odn.ne.jp COMMENT= Cellular phone-number read/write tool (in Japan only) -BUILD_DEPENDS= automake:${PORTSDIR}/devel/automake - +WANT_AUTOMAKE_VER=15 USE_BZIP2= yes HAS_CONFIGURE= yes ALL_TARGET= pre-configure: ${RM} -f ${WRKSRC}/install.sh - ${LN} -sf ${PREFIX}/share/automake/install-sh ${WRKSRC}/install-sh - ${LN} -sf ${PREFIX}/share/automake/config.guess ${WRKSRC}/config.guess - ${LN} -sf ${PREFIX}/share/automake/config.sub ${WRKSRC}/config.sub + ${LN} -sf ${AUTOMAKE_DIR}/install-sh ${WRKSRC}/install-sh + ${LN} -sf ${AUTOMAKE_DIR}/config.guess ${WRKSRC}/config.guess + ${LN} -sf ${AUTOMAKE_DIR}/config.sub ${WRKSRC}/config.sub do-install: ${INSTALL_PROGRAM} ${WRKSRC}/celrw ${PREFIX}/bin diff --git a/japanese/eblook/Makefile b/japanese/eblook/Makefile index 9cf4f0352909..0e779cb9f093 100644 --- a/japanese/eblook/Makefile +++ b/japanese/eblook/Makefile @@ -21,6 +21,7 @@ LIB_DEPENDS= eb.7:${PORTSDIR}/japanese/eb GNU_CONFIGURE= yes USE_AUTOMAKE_VER= 14 +USE_AUTOCONF_VER= 213 CONFIGURE_ARGS= --with-eb-includes=${PREFIX}/include \ --with-eb-libraries=${PREFIX}/lib diff --git a/japanese/emacs20-dl-canna/Makefile b/japanese/emacs20-dl-canna/Makefile index aa3b35148b33..4e9b5ef575cc 100644 --- a/japanese/emacs20-dl-canna/Makefile +++ b/japanese/emacs20-dl-canna/Makefile @@ -43,7 +43,7 @@ DLCANNA_VER= 1.4 # hack to allow parallel build to work .if defined(PACKAGE_BUILDING) USE_GMAKE= yes -BUILD_DEPENDS+= ${AUTOCONF}:${PORTSDIR}/devel/autoconf +WANT_AUTOCONF_VER=253 .endif post-install: diff --git a/japanese/emacs20-dl-wnn6/Makefile b/japanese/emacs20-dl-wnn6/Makefile index 4227ee5bcbdb..56a3a6768aa5 100644 --- a/japanese/emacs20-dl-wnn6/Makefile +++ b/japanese/emacs20-dl-wnn6/Makefile @@ -17,10 +17,10 @@ COMMENT= Dynamic loading module input method `Wnn' on Emacs LIB_DEPENDS= wnn6.2:${.CURDIR}/../../japanese/Wnn6-lib BUILD_DEPENDS= emacs-dl-${EMACS_VER}:${EMACSDL_DIR} \ - autoconf:${PORTSDIR}/devel/autoconf \ ${NONEXISTENT}:${EMACSDL_DIR}:configure RUN_DEPENDS= emacs-dl-${EMACS_VER}:${EMACSDL_DIR} +WANT_AUTOCONF_VER=253 USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-wnn6 \ @@ -38,7 +38,7 @@ EMACSDL_SRCDIR= ${WRKDIRPREFIX}${EMACSDL_DIR}/work/emacs-${EMACS_VER} # hack to allow parallel build to work .if defined(PARALLEL_PACKAGE_BUILD) USE_GMAKE= yes -BUILD_DEPENDS+= autoconf:${PORTSDIR}/devel/autoconf +WANT_AUTOCONF_VER=253 .endif post-install: diff --git a/japanese/migemo/Makefile b/japanese/migemo/Makefile index ca4ae4c7f586..2d3890b573a5 100644 --- a/japanese/migemo/Makefile +++ b/japanese/migemo/Makefile @@ -16,6 +16,7 @@ COMMENT?= Japanese incremental search tool .if !defined(EMACS_PORT_NAME) USE_AUTOMAKE_VER= 14 +USE_AUTOCONF_VER= 213 EXTRA_PATCHES= ${FILESDIR}/extra-patch-Makefile.am ${FILESDIR}/extra-patch-configure.in PLIST_SUB= MIGEMO="" ELISP="@comment " .endif diff --git a/japanese/mutt-devel/Makefile b/japanese/mutt-devel/Makefile index 58c05c4a3bf3..3a4434fb40bc 100644 --- a/japanese/mutt-devel/Makefile +++ b/japanese/mutt-devel/Makefile @@ -47,6 +47,7 @@ USE_REINPLACE= yes USE_GMAKE= yes USE_ICONV= yes USE_AUTOMAKE_VER= 14 +USE_AUTOCONF_VER= 213 USE_OPENSSL= yes WRKSRC= ${WRKDIR}/mutt-${VERSION} LDFLAGS+= -L${LOCALBASE}/lib diff --git a/japanese/mutt/Makefile b/japanese/mutt/Makefile index aeb34837d242..d70bda84dded 100644 --- a/japanese/mutt/Makefile +++ b/japanese/mutt/Makefile @@ -42,6 +42,7 @@ USE_REINPLACE= yes USE_GMAKE= yes USE_ICONV= yes USE_AUTOMAKE_VER= 14 +USE_AUTOCONF_VER= 213 USE_OPENSSL= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${VERSION} LDFLAGS+= -L${LOCALBASE}/lib -- cgit v1.2.3