[Midnightbsd-cvs] mports: devel/automake14: switch to wrapper, autoconf 2.61
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Mar 23 16:38:16 EDT 2008
Log Message:
-----------
switch to wrapper, autoconf 2.61
Modified Files:
--------------
mports/devel/automake14:
Makefile (r1.3 -> r1.4)
pkg-plist (r1.1 -> r1.2)
mports/devel/automake14/files:
patch-Makefile.in (r1.1 -> r1.2)
patch-automake.texi (r1.1 -> r1.2)
Removed Files:
-------------
mports/devel/automake14/files:
patch-aclocal.in
patch-automake.in
patch-configure
patch-m4-Makefile.in
-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/devel/automake14/pkg-plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -L devel/automake14/pkg-plist -L devel/automake14/pkg-plist -u -r1.1 -r1.2
--- devel/automake14/pkg-plist
+++ devel/automake14/pkg-plist
@@ -1,82 +1,79 @@
-bin/aclocal%%BUILD_VERSION%%
-bin/automake%%BUILD_VERSION%%
-libexec/automake%%BUILD_VERSION%%/aclocal
-libexec/automake%%BUILD_VERSION%%/automake
-share/aclocal%%BUILD_VERSION%%/amversion.m4
-share/aclocal%%BUILD_VERSION%%/ccstdc.m4
-share/aclocal%%BUILD_VERSION%%/cond.m4
-share/aclocal%%BUILD_VERSION%%/dmalloc.m4
-share/aclocal%%BUILD_VERSION%%/error.m4
-share/aclocal%%BUILD_VERSION%%/header.m4
-share/aclocal%%BUILD_VERSION%%/init.m4
-share/aclocal%%BUILD_VERSION%%/lex.m4
-share/aclocal%%BUILD_VERSION%%/lispdir.m4
-share/aclocal%%BUILD_VERSION%%/maintainer.m4
-share/aclocal%%BUILD_VERSION%%/missing.m4
-share/aclocal%%BUILD_VERSION%%/mktime.m4
-share/aclocal%%BUILD_VERSION%%/multi.m4
-share/aclocal%%BUILD_VERSION%%/obstack.m4
-share/aclocal%%BUILD_VERSION%%/protos.m4
-share/aclocal%%BUILD_VERSION%%/ptrdiff.m4
-share/aclocal%%BUILD_VERSION%%/regex.m4
-share/aclocal%%BUILD_VERSION%%/sanity.m4
-share/aclocal%%BUILD_VERSION%%/strtod.m4
-share/aclocal%%BUILD_VERSION%%/termios.m4
-share/aclocal%%BUILD_VERSION%%/winsz.m4
-share/automake%%BUILD_VERSION%%/COPYING
-share/automake%%BUILD_VERSION%%/INSTALL
-share/automake%%BUILD_VERSION%%/acinstall
-share/automake%%BUILD_VERSION%%/ansi2knr.1
-share/automake%%BUILD_VERSION%%/ansi2knr.c
-share/automake%%BUILD_VERSION%%/clean-hdr.am
-share/automake%%BUILD_VERSION%%/clean-kr.am
-share/automake%%BUILD_VERSION%%/clean.am
-share/automake%%BUILD_VERSION%%/comp-vars.am
-share/automake%%BUILD_VERSION%%/compile.am
-share/automake%%BUILD_VERSION%%/config.guess
-share/automake%%BUILD_VERSION%%/config.sub
-share/automake%%BUILD_VERSION%%/data-clean.am
-share/automake%%BUILD_VERSION%%/data.am
-share/automake%%BUILD_VERSION%%/dejagnu.am
-share/automake%%BUILD_VERSION%%/depend.am
-share/automake%%BUILD_VERSION%%/depend2.am
-share/automake%%BUILD_VERSION%%/dist-vars.am
-share/automake%%BUILD_VERSION%%/elisp-comp
-share/automake%%BUILD_VERSION%%/footer.am
-share/automake%%BUILD_VERSION%%/header-vars.am
-share/automake%%BUILD_VERSION%%/header.am
-share/automake%%BUILD_VERSION%%/install-sh
-share/automake%%BUILD_VERSION%%/java-clean.am
-share/automake%%BUILD_VERSION%%/java.am
-share/automake%%BUILD_VERSION%%/kr-extra.am
-share/automake%%BUILD_VERSION%%/library.am
-share/automake%%BUILD_VERSION%%/libs-clean.am
-share/automake%%BUILD_VERSION%%/libs.am
-share/automake%%BUILD_VERSION%%/libtool.am
-share/automake%%BUILD_VERSION%%/lisp-clean.am
-share/automake%%BUILD_VERSION%%/lisp.am
-share/automake%%BUILD_VERSION%%/ltlib-clean.am
-share/automake%%BUILD_VERSION%%/ltlib.am
-share/automake%%BUILD_VERSION%%/ltlibrary.am
-share/automake%%BUILD_VERSION%%/mans-vars.am
-share/automake%%BUILD_VERSION%%/mans.am
-share/automake%%BUILD_VERSION%%/mdate-sh
-share/automake%%BUILD_VERSION%%/missing
-share/automake%%BUILD_VERSION%%/mkinstalldirs
-share/automake%%BUILD_VERSION%%/multilib.am
-share/automake%%BUILD_VERSION%%/program.am
-share/automake%%BUILD_VERSION%%/progs-clean.am
-share/automake%%BUILD_VERSION%%/progs.am
-share/automake%%BUILD_VERSION%%/remake-hdr.am
-share/automake%%BUILD_VERSION%%/remake.am
-share/automake%%BUILD_VERSION%%/scripts.am
-share/automake%%BUILD_VERSION%%/subdirs.am
-share/automake%%BUILD_VERSION%%/tags-clean.am
-share/automake%%BUILD_VERSION%%/tags.am
-share/automake%%BUILD_VERSION%%/texi-vers.am
-share/automake%%BUILD_VERSION%%/texinfo.tex
-share/automake%%BUILD_VERSION%%/texinfos.am
-share/automake%%BUILD_VERSION%%/ylwrap
- at dirrm libexec/automake%%BUILD_VERSION%%
- at dirrm share/aclocal%%BUILD_VERSION%%
- at dirrm share/automake%%BUILD_VERSION%%
+bin/aclocal-%%BUILD_VERSION%%
+bin/automake-%%BUILD_VERSION%%
+share/aclocal-%%BUILD_VERSION%%/amversion.m4
+share/aclocal-%%BUILD_VERSION%%/ccstdc.m4
+share/aclocal-%%BUILD_VERSION%%/cond.m4
+share/aclocal-%%BUILD_VERSION%%/dmalloc.m4
+share/aclocal-%%BUILD_VERSION%%/error.m4
+share/aclocal-%%BUILD_VERSION%%/header.m4
+share/aclocal-%%BUILD_VERSION%%/init.m4
+share/aclocal-%%BUILD_VERSION%%/lex.m4
+share/aclocal-%%BUILD_VERSION%%/lispdir.m4
+share/aclocal-%%BUILD_VERSION%%/maintainer.m4
+share/aclocal-%%BUILD_VERSION%%/missing.m4
+share/aclocal-%%BUILD_VERSION%%/mktime.m4
+share/aclocal-%%BUILD_VERSION%%/multi.m4
+share/aclocal-%%BUILD_VERSION%%/obstack.m4
+share/aclocal-%%BUILD_VERSION%%/protos.m4
+share/aclocal-%%BUILD_VERSION%%/ptrdiff.m4
+share/aclocal-%%BUILD_VERSION%%/regex.m4
+share/aclocal-%%BUILD_VERSION%%/sanity.m4
+share/aclocal-%%BUILD_VERSION%%/strtod.m4
+share/aclocal-%%BUILD_VERSION%%/termios.m4
+share/aclocal-%%BUILD_VERSION%%/winsz.m4
+share/automake-%%BUILD_VERSION%%/COPYING
+share/automake-%%BUILD_VERSION%%/INSTALL
+share/automake-%%BUILD_VERSION%%/acinstall
+share/automake-%%BUILD_VERSION%%/ansi2knr.1
+share/automake-%%BUILD_VERSION%%/ansi2knr.c
+share/automake-%%BUILD_VERSION%%/clean-hdr.am
+share/automake-%%BUILD_VERSION%%/clean-kr.am
+share/automake-%%BUILD_VERSION%%/clean.am
+share/automake-%%BUILD_VERSION%%/comp-vars.am
+share/automake-%%BUILD_VERSION%%/compile.am
+share/automake-%%BUILD_VERSION%%/config.guess
+share/automake-%%BUILD_VERSION%%/config.sub
+share/automake-%%BUILD_VERSION%%/data-clean.am
+share/automake-%%BUILD_VERSION%%/data.am
+share/automake-%%BUILD_VERSION%%/dejagnu.am
+share/automake-%%BUILD_VERSION%%/depend.am
+share/automake-%%BUILD_VERSION%%/depend2.am
+share/automake-%%BUILD_VERSION%%/dist-vars.am
+share/automake-%%BUILD_VERSION%%/elisp-comp
+share/automake-%%BUILD_VERSION%%/footer.am
+share/automake-%%BUILD_VERSION%%/header-vars.am
+share/automake-%%BUILD_VERSION%%/header.am
+share/automake-%%BUILD_VERSION%%/install-sh
+share/automake-%%BUILD_VERSION%%/java-clean.am
+share/automake-%%BUILD_VERSION%%/java.am
+share/automake-%%BUILD_VERSION%%/kr-extra.am
+share/automake-%%BUILD_VERSION%%/library.am
+share/automake-%%BUILD_VERSION%%/libs-clean.am
+share/automake-%%BUILD_VERSION%%/libs.am
+share/automake-%%BUILD_VERSION%%/libtool.am
+share/automake-%%BUILD_VERSION%%/lisp-clean.am
+share/automake-%%BUILD_VERSION%%/lisp.am
+share/automake-%%BUILD_VERSION%%/ltlib-clean.am
+share/automake-%%BUILD_VERSION%%/ltlib.am
+share/automake-%%BUILD_VERSION%%/ltlibrary.am
+share/automake-%%BUILD_VERSION%%/mans-vars.am
+share/automake-%%BUILD_VERSION%%/mans.am
+share/automake-%%BUILD_VERSION%%/mdate-sh
+share/automake-%%BUILD_VERSION%%/missing
+share/automake-%%BUILD_VERSION%%/mkinstalldirs
+share/automake-%%BUILD_VERSION%%/multilib.am
+share/automake-%%BUILD_VERSION%%/program.am
+share/automake-%%BUILD_VERSION%%/progs-clean.am
+share/automake-%%BUILD_VERSION%%/progs.am
+share/automake-%%BUILD_VERSION%%/remake-hdr.am
+share/automake-%%BUILD_VERSION%%/remake.am
+share/automake-%%BUILD_VERSION%%/scripts.am
+share/automake-%%BUILD_VERSION%%/subdirs.am
+share/automake-%%BUILD_VERSION%%/tags-clean.am
+share/automake-%%BUILD_VERSION%%/tags.am
+share/automake-%%BUILD_VERSION%%/texi-vers.am
+share/automake-%%BUILD_VERSION%%/texinfo.tex
+share/automake-%%BUILD_VERSION%%/texinfos.am
+share/automake-%%BUILD_VERSION%%/ylwrap
+ at dirrm share/aclocal-%%BUILD_VERSION%%
+ at dirrm share/automake-%%BUILD_VERSION%%
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/devel/automake14/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -L devel/automake14/Makefile -L devel/automake14/Makefile -u -r1.3 -r1.4
--- devel/automake14/Makefile
+++ devel/automake14/Makefile
@@ -3,12 +3,12 @@
# Whom: FUJIMOTO Kensaku <fujimoto at oscar.elec.waseda.ac.jp>
#
# $MidnightBSD$
-# $FreeBSD: ports/devel/automake14/Makefile,v 1.60 2006/05/04 21:40:24 edwin Exp $
+# $FreeBSD: ports/devel/automake14/Makefile,v 1.62 2007/07/28 06:33:46 ade Exp $
#
PORTNAME= automake
PORTVERSION= 1.4.6
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= automake
@@ -18,38 +18,29 @@
COMMENT= GNU Standards-compliant Makefile generator (1.4)
LICENSE= gpl2
-RUN_DEPENDS= ${AUTOCONF_DEPENDS}
+RUN_DEPENDS= ${AUTOCONF_DEPENDS} \
+ automake-wrapper:${PORTSDIR}/devel/automake-wrapper
-USE_AUTOTOOLS= autoconf:213:env
-BUILD_VERSION= 14
+USE_AUTOTOOLS= autoconf:261:env
+BUILD_VERSION= 1.4
PLIST_SUB= BUILD_VERSION=${BUILD_VERSION}
-LATEST_LINK= automake${BUILD_VERSION}
-GNU_CONFIGURE= yes
-CONFIGURE_ENV= PERL=${PERL}
-CONFIGURE_ARGS= --program-suffix=${BUILD_VERSION}
+LATEST_LINK= automake14
USE_PERL5= yes
-INFO= automake${BUILD_VERSION}
+GNU_CONFIGURE= yes
+CONFIGURE_ENV= MAKEINFO="makeinfo --no-split"
+CONFIGURE_ARGS= --program-suffix=-${BUILD_VERSION}
+CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd6.1
+INFO= automake-${BUILD_VERSION}
STRIP= # none
post-patch:
- @${MV} ${WRKSRC}/automake.texi ${WRKSRC}/automake${BUILD_VERSION}.texi
- @${RM} ${WRKSRC}/*.info* ${WRKSRC}/*.dvi >/dev/null 2>&1 || true
-
-pre-configure:
- @${REINPLACE_CMD} -i -e "s,%%X11BASE%%,${X11BASE}," \
- ${WRKSRC}/aclocal.in
+ @${RM} ${WRKSRC}/*.info*
+ @${MV} ${WRKSRC}/automake.texi ${WRKSRC}/automake-${BUILD_VERSION}.texi
pre-su-install:
- @${RM} -fr ${PREFIX}/share/automake${BUILD_VERSION}
- @${MKDIR} ${PREFIX}/share/automake${BUILD_VERSION}
- @${MKDIR} ${PREFIX}/share/aclocal${BUILD_VERSION}
- @${MKDIR} ${PREFIX}/libexec/automake${BUILD_VERSION}
-
-post-install:
-.for i in aclocal automake
- @${LN} -sf ${PREFIX}/bin/${i}${BUILD_VERSION} \
- ${PREFIX}/libexec/automake${BUILD_VERSION}/${i}
-.endfor
+ @${RM} -fr ${PREFIX}/share/automake-${BUILD_VERSION}
+ @${MKDIR} ${PREFIX}/share/automake-${BUILD_VERSION}
+ @${MKDIR} ${PREFIX}/share/aclocal-${BUILD_VERSION}
.include <bsd.port.mk>
--- devel/automake14/files/patch-m4-Makefile.in
+++ /dev/null
@@ -1,7 +0,0 @@
---- m4/Makefile.in.orig Sat Jul 27 14:09:41 2002
-+++ m4/Makefile.in Thu May 13 13:35:28 2004
-@@ -70,3 +70,3 @@
-
--m4datadir = $(datadir)/aclocal-$(APIVERSION)
-+m4datadir = $(datadir)/aclocal14
- m4data_DATA = amversion.m4 ccstdc.m4 cond.m4 dmalloc.m4 error.m4 header.m4 init.m4 lex.m4 lispdir.m4 maintainer.m4 missing.m4 mktime.m4 multi.m4 obstack.m4 protos.m4 ptrdiff.m4 regex.m4 sanity.m4 strtod.m4 termios.m4 winsz.m4
--- devel/automake14/files/patch-configure
+++ /dev/null
@@ -1,7 +0,0 @@
---- configure.orig Sat Jul 27 13:43:07 2002
-+++ configure Thu May 13 13:39:30 2004
-@@ -867,3 +867,3 @@
- # A versioned directory, defined here for convenience.
--pkgvdatadir="\${datadir}/automake-${APIVERSION}"
-+pkgvdatadir="\${datadir}/automake14"
-
Index: patch-automake.texi
===================================================================
RCS file: /home/cvs/mports/devel/automake14/files/patch-automake.texi,v
retrieving revision 1.1
retrieving revision 1.2
diff -L devel/automake14/files/patch-automake.texi -L devel/automake14/files/patch-automake.texi -u -r1.1 -r1.2
--- devel/automake14/files/patch-automake.texi
+++ devel/automake14/files/patch-automake.texi
@@ -1,20 +1,23 @@
---- automake.texi.orig Wed Jan 6 13:01:26 1999
-+++ automake.texi Thu Oct 14 20:28:26 2004
-@@ -2,4 +2,5 @@
+--- automake.texi.orig Wed Jan 6 05:01:26 1999
++++ automake.texi Sat Apr 14 15:26:06 2007
+@@ -2,4 +2,4 @@
@c %**start of header
- at setfilename automake.info
- at settitle automake
-+ at setfilename automake14.info
-+ at dircategory Programming & development tools
-+ at settitle Automake14
++ at setfilename automake-1.4.info
++ at settitle Automake-1.4
@setchapternewpage off
-@@ -11,8 +12,3 @@
- @direntry
+@@ -9,10 +9,5 @@
+
+- at dircategory GNU admin
+- at direntry
-* automake: (automake). Making Makefile.in's
- at end direntry
-
- at dircategory Individual utilities
- at direntry
-* aclocal: (automake)Invoking aclocal. Generating aclocal.m4
-+* Automake14: (automake14). Making Makefile.in's
++ at dircategory Programming & development tools
++ at direntry
++* Automake-1.4: (automake-1.4). Making Makefile.in's.
@end direntry
--- devel/automake14/files/patch-automake.in
+++ /dev/null
@@ -1,7 +0,0 @@
---- automake.in.orig Sat Jul 27 13:55:58 2002
-+++ automake.in Thu May 13 13:34:28 2004
-@@ -34,3 +34,3 @@
- $prefix = "@prefix@";
--$am_dir = "@datadir@/@PACKAGE at -@APIVERSION@";
-+$am_dir = "@datadir@/@PACKAGE at 14";
- $TAR = "@TAR@";
Index: patch-Makefile.in
===================================================================
RCS file: /home/cvs/mports/devel/automake14/files/patch-Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -L devel/automake14/files/patch-Makefile.in -L devel/automake14/files/patch-Makefile.in -u -r1.1 -r1.2
--- devel/automake14/files/patch-Makefile.in
+++ devel/automake14/files/patch-Makefile.in
@@ -1,52 +1,39 @@
--- Makefile.in.orig Sat Jul 27 14:09:40 2002
-+++ Makefile.in Thu May 13 13:44:45 2004
++++ Makefile.in Thu Apr 5 02:20:54 2007
@@ -36,5 +36,5 @@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-+pkgdatadir = $(datadir)/@PACKAGE at 14
-+pkglibdir = $(libdir)/@PACKAGE at 14
-+pkgincludedir = $(includedir)/@PACKAGE at 14
++pkgdatadir = $(datadir)/@PACKAGE at -@APIVERSION@
++pkglibdir = $(libdir)/@PACKAGE at -@APIVERSION@
++pkgincludedir = $(includedir)/@PACKAGE at -@APIVERSION@
@@ -74,3 +74,3 @@
bin_SCRIPTS = automake aclocal
-info_TEXINFOS = automake.texi
-+info_TEXINFOS = automake14.texi
++info_TEXINFOS = automake- at APIVERSION@.texi
@@ -97,5 +97,5 @@
TEXI2DVI = texi2dvi
-INFO_DEPS = automake.info
--DVIS = automake.dvi
++INFO_DEPS = automake- at APIVERSION@.info
+ DVIS = automake.dvi
-TEXINFOS = automake.texi
-+INFO_DEPS = automake14.info
-+DVIS = automake14.dvi
-+TEXINFOS = automake14.texi
++TEXINFOS = automake- at APIVERSION@.texi
DATA = $(pkgvdata_DATA) $(script_DATA)
@@ -156,4 +156,4 @@
-$(srcdir)/stamp-vti: automake.texi $(top_srcdir)/configure.in
- @echo "@set UPDATED `$(SHELL) $(srcdir)/mdate-sh $(srcdir)/automake.texi`" > vti.tmp
-+$(srcdir)/stamp-vti: automake14.texi $(top_srcdir)/configure.in
-+ @echo "@set UPDATED `$(SHELL) $(srcdir)/mdate-sh $(srcdir)/automake14.texi`" > vti.tmp
++$(srcdir)/stamp-vti: automake- at APIVERSION@.texi $(top_srcdir)/configure.in
++ @echo "@set UPDATED `$(SHELL) $(srcdir)/mdate-sh $(srcdir)/automake- at APIVERSION@.texi`" > vti.tmp
@echo "@set EDITION $(VERSION)" >> vti.tmp
-@@ -176,4 +176,4 @@
+@@ -176,3 +176,3 @@
-automake.info: automake.texi version.texi
--automake.dvi: automake.texi version.texi
-+automake14.info: automake14.texi version.texi
-+automake14.dvi: automake14.texi version.texi
-
-@@ -185,3 +185,3 @@
- cd $(srcdir) \
-- && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
-+ && $(MAKEINFO) --no-split `echo $< | sed 's,.*/,,'`
-
-@@ -276,3 +276,3 @@
- mostlyclean-aminfo:
-- -rm -f automake.aux automake.cp automake.cps automake.dvi automake.fn \
-+ -rm -f automake.aux automake.cp automake.cps automake14.dvi automake.fn \
- automake.fns automake.ky automake.kys automake.ps \
++automake- at APIVERSION@.info: automake- at APIVERSION@.texi version.texi
+ automake.dvi: automake.texi version.texi
@@ -490,3 +490,3 @@
@$(NORMAL_INSTALL)
- $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
--- devel/automake14/files/patch-aclocal.in
+++ /dev/null
@@ -1,39 +0,0 @@
---- aclocal.in.orig Thu Jul 25 09:51:42 2002
-+++ aclocal.in Fri May 14 09:40:13 2004
-@@ -36,3 +36,4 @@
- # Note also that the versioned directory is handled later.
--$acdir = "@datadir@/aclocal";
-+$acdir = "@datadir@/aclocal14";
-+$acdir_x11 = '%%X11BASE%%/share/aclocal';
- $default_acdir = $acdir;
-@@ -111,2 +112,3 @@
- local (@dirlist) = &parse_arguments (@ARGV);
-+unshift @dirlist, $acdir_x11 if -d "$acdir_x11/.";
- &scan_m4_files (@dirlist);
-@@ -200,8 +202,2 @@
-
-- # Search the versioned directory near the end, and then the
-- # unversioned directory last. Only do this if the user didn't
-- # override acdir.
-- push (@dirlist, "$acdir-$APIVERSION")
-- if $acdir eq $default_acdir;
--
- # By default $(datadir)/aclocal doesn't exist. We don't want to
-@@ -296,2 +292,3 @@
-
-+ local (@skipinolist) = ();
- local ($m4dir);
-@@ -301,3 +298,3 @@
- || die "aclocal: couldn't open directory \`$m4dir': $!\n";
-- local ($file, $fullfile, $expr);
-+ local ($file, $fullfile, $ino, $expr);
- foreach $file (sort grep (! /^\./, readdir (DIR)))
-@@ -311,2 +308,8 @@
- $fullfile = $m4dir . '/' . $file;
-+
-+ # Do not scan a file more than once.
-+ $ino = (stat($fullfile))[1];
-+ next if grep($ino eq $_, @skipinolist);
-+ push @skipinolist, $ino;
-+
- $file_contents{$fullfile} = &scan_file ($fullfile);
More information about the Midnightbsd-cvs
mailing list