[Midnightbsd-cvs] mports: devel/automake110: Update for wrapper, autoconf 2.61
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Mar 23 16:43:43 EDT 2008
Log Message:
-----------
Update for wrapper, autoconf 2.61
Modified Files:
--------------
mports/devel/automake110:
Makefile (r1.2 -> r1.3)
pkg-descr (r1.1 -> r1.2)
pkg-plist (r1.1 -> r1.2)
mports/devel/automake110/files:
patch-Makefile.in (r1.1 -> r1.2)
patch-doc::Makefile.in (r1.1 -> r1.2)
patch-doc::automake.texi (r1.1 -> r1.2)
Removed Files:
-------------
mports/devel/automake110/files:
patch-aclocal.in
patch-automake.in
patch-configure
patch-lib::Automake::Config.in
patch-lib::Automake::Makefile.in
patch-m4-Makefile.in
-------------- next part --------------
Index: pkg-descr
===================================================================
RCS file: /home/cvs/mports/devel/automake110/pkg-descr,v
retrieving revision 1.1
retrieving revision 1.2
diff -L devel/automake110/pkg-descr -L devel/automake110/pkg-descr -u -r1.1 -r1.2
--- devel/automake110/pkg-descr
+++ devel/automake110/pkg-descr
@@ -10,4 +10,3 @@
mechanism for augmenting autoconf.
WWW: http://www.gnu.org/software/automake/
-
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/devel/automake110/pkg-plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -L devel/automake110/pkg-plist -L devel/automake110/pkg-plist -u -r1.1 -r1.2
--- devel/automake110/pkg-plist
+++ devel/automake110/pkg-plist
@@ -1,123 +1,120 @@
-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%%/as.m4
-share/aclocal%%BUILD_VERSION%%/auxdir.m4
-share/aclocal%%BUILD_VERSION%%/ccstdc.m4
-share/aclocal%%BUILD_VERSION%%/cond.m4
-share/aclocal%%BUILD_VERSION%%/depend.m4
-share/aclocal%%BUILD_VERSION%%/depout.m4
-share/aclocal%%BUILD_VERSION%%/dmalloc.m4
-share/aclocal%%BUILD_VERSION%%/gcj.m4
-share/aclocal%%BUILD_VERSION%%/header.m4
-share/aclocal%%BUILD_VERSION%%/init.m4
-share/aclocal%%BUILD_VERSION%%/install-sh.m4
-share/aclocal%%BUILD_VERSION%%/lead-dot.m4
-share/aclocal%%BUILD_VERSION%%/lex.m4
-share/aclocal%%BUILD_VERSION%%/lispdir.m4
-share/aclocal%%BUILD_VERSION%%/maintainer.m4
-share/aclocal%%BUILD_VERSION%%/make.m4
-share/aclocal%%BUILD_VERSION%%/minuso.m4
-share/aclocal%%BUILD_VERSION%%/missing.m4
-share/aclocal%%BUILD_VERSION%%/mkdirp.m4
-share/aclocal%%BUILD_VERSION%%/multi.m4
-share/aclocal%%BUILD_VERSION%%/obsol-gt.m4
-share/aclocal%%BUILD_VERSION%%/obsol-lt.m4
-share/aclocal%%BUILD_VERSION%%/obsolete.m4
-share/aclocal%%BUILD_VERSION%%/options.m4
-share/aclocal%%BUILD_VERSION%%/protos.m4
-share/aclocal%%BUILD_VERSION%%/python.m4
-share/aclocal%%BUILD_VERSION%%/regex.m4
-share/aclocal%%BUILD_VERSION%%/runlog.m4
-share/aclocal%%BUILD_VERSION%%/sanity.m4
-share/aclocal%%BUILD_VERSION%%/strip.m4
-share/aclocal%%BUILD_VERSION%%/substnot.m4
-share/aclocal%%BUILD_VERSION%%/tar.m4
-share/aclocal%%BUILD_VERSION%%/upc.m4
-share/automake%%BUILD_VERSION%%/Automake/ChannelDefs.pm
-share/automake%%BUILD_VERSION%%/Automake/Channels.pm
-share/automake%%BUILD_VERSION%%/Automake/Condition.pm
-share/automake%%BUILD_VERSION%%/Automake/Config.pm
-share/automake%%BUILD_VERSION%%/Automake/Configure_ac.pm
-share/automake%%BUILD_VERSION%%/Automake/DisjConditions.pm
-share/automake%%BUILD_VERSION%%/Automake/FileUtils.pm
-share/automake%%BUILD_VERSION%%/Automake/General.pm
-share/automake%%BUILD_VERSION%%/Automake/Item.pm
-share/automake%%BUILD_VERSION%%/Automake/ItemDef.pm
-share/automake%%BUILD_VERSION%%/Automake/Location.pm
-share/automake%%BUILD_VERSION%%/Automake/Options.pm
-share/automake%%BUILD_VERSION%%/Automake/Rule.pm
-share/automake%%BUILD_VERSION%%/Automake/RuleDef.pm
-share/automake%%BUILD_VERSION%%/Automake/Struct.pm
-share/automake%%BUILD_VERSION%%/Automake/VarDef.pm
-share/automake%%BUILD_VERSION%%/Automake/Variable.pm
-share/automake%%BUILD_VERSION%%/Automake/Version.pm
-share/automake%%BUILD_VERSION%%/Automake/Wrap.pm
-share/automake%%BUILD_VERSION%%/Automake/XFile.pm
-share/automake%%BUILD_VERSION%%/COPYING
-share/automake%%BUILD_VERSION%%/INSTALL
-share/automake%%BUILD_VERSION%%/acinstall
-share/automake%%BUILD_VERSION%%/am/ansi2knr.am
-share/automake%%BUILD_VERSION%%/am/check.am
-share/automake%%BUILD_VERSION%%/am/clean-hdr.am
-share/automake%%BUILD_VERSION%%/am/clean.am
-share/automake%%BUILD_VERSION%%/am/compile.am
-share/automake%%BUILD_VERSION%%/am/configure.am
-share/automake%%BUILD_VERSION%%/am/data.am
-share/automake%%BUILD_VERSION%%/am/dejagnu.am
-share/automake%%BUILD_VERSION%%/am/depend.am
-share/automake%%BUILD_VERSION%%/am/depend2.am
-share/automake%%BUILD_VERSION%%/am/distdir.am
-share/automake%%BUILD_VERSION%%/am/footer.am
-share/automake%%BUILD_VERSION%%/am/header-vars.am
-share/automake%%BUILD_VERSION%%/am/header.am
-share/automake%%BUILD_VERSION%%/am/install.am
-share/automake%%BUILD_VERSION%%/am/inst-vars.am
-share/automake%%BUILD_VERSION%%/am/java.am
-share/automake%%BUILD_VERSION%%/am/lang-compile.am
-share/automake%%BUILD_VERSION%%/am/lex.am
-share/automake%%BUILD_VERSION%%/am/library.am
-share/automake%%BUILD_VERSION%%/am/libs.am
-share/automake%%BUILD_VERSION%%/am/libtool.am
-share/automake%%BUILD_VERSION%%/am/lisp.am
-share/automake%%BUILD_VERSION%%/am/ltlib.am
-share/automake%%BUILD_VERSION%%/am/ltlibrary.am
-share/automake%%BUILD_VERSION%%/am/mans-vars.am
-share/automake%%BUILD_VERSION%%/am/mans.am
-share/automake%%BUILD_VERSION%%/am/multilib.am
-share/automake%%BUILD_VERSION%%/am/program.am
-share/automake%%BUILD_VERSION%%/am/progs.am
-share/automake%%BUILD_VERSION%%/am/python.am
-share/automake%%BUILD_VERSION%%/am/remake-hdr.am
-share/automake%%BUILD_VERSION%%/am/scripts.am
-share/automake%%BUILD_VERSION%%/am/subdirs.am
-share/automake%%BUILD_VERSION%%/am/tags.am
-share/automake%%BUILD_VERSION%%/am/texi-vers.am
-share/automake%%BUILD_VERSION%%/am/texibuild.am
-share/automake%%BUILD_VERSION%%/am/texinfos.am
-share/automake%%BUILD_VERSION%%/am/yacc.am
-share/automake%%BUILD_VERSION%%/ansi2knr.1
-share/automake%%BUILD_VERSION%%/ansi2knr.c
-share/automake%%BUILD_VERSION%%/compile
-share/automake%%BUILD_VERSION%%/config-ml.in
-share/automake%%BUILD_VERSION%%/config.guess
-share/automake%%BUILD_VERSION%%/config.sub
-share/automake%%BUILD_VERSION%%/depcomp
-share/automake%%BUILD_VERSION%%/elisp-comp
-share/automake%%BUILD_VERSION%%/install-sh
-share/automake%%BUILD_VERSION%%/mdate-sh
-share/automake%%BUILD_VERSION%%/missing
-share/automake%%BUILD_VERSION%%/mkinstalldirs
-share/automake%%BUILD_VERSION%%/py-compile
-share/automake%%BUILD_VERSION%%/symlink-tree
-share/automake%%BUILD_VERSION%%/texinfo.tex
-share/automake%%BUILD_VERSION%%/ylwrap
+bin/aclocal-%%BUILD_VERSION%%
+bin/automake-%%BUILD_VERSION%%
+share/aclocal-%%BUILD_VERSION%%/amversion.m4
+share/aclocal-%%BUILD_VERSION%%/as.m4
+share/aclocal-%%BUILD_VERSION%%/auxdir.m4
+share/aclocal-%%BUILD_VERSION%%/ccstdc.m4
+share/aclocal-%%BUILD_VERSION%%/cond.m4
+share/aclocal-%%BUILD_VERSION%%/depend.m4
+share/aclocal-%%BUILD_VERSION%%/depout.m4
+share/aclocal-%%BUILD_VERSION%%/dmalloc.m4
+share/aclocal-%%BUILD_VERSION%%/gcj.m4
+share/aclocal-%%BUILD_VERSION%%/header.m4
+share/aclocal-%%BUILD_VERSION%%/init.m4
+share/aclocal-%%BUILD_VERSION%%/install-sh.m4
+share/aclocal-%%BUILD_VERSION%%/lead-dot.m4
+share/aclocal-%%BUILD_VERSION%%/lex.m4
+share/aclocal-%%BUILD_VERSION%%/lispdir.m4
+share/aclocal-%%BUILD_VERSION%%/maintainer.m4
+share/aclocal-%%BUILD_VERSION%%/make.m4
+share/aclocal-%%BUILD_VERSION%%/minuso.m4
+share/aclocal-%%BUILD_VERSION%%/missing.m4
+share/aclocal-%%BUILD_VERSION%%/mkdirp.m4
+share/aclocal-%%BUILD_VERSION%%/multi.m4
+share/aclocal-%%BUILD_VERSION%%/obsol-gt.m4
+share/aclocal-%%BUILD_VERSION%%/obsol-lt.m4
+share/aclocal-%%BUILD_VERSION%%/obsolete.m4
+share/aclocal-%%BUILD_VERSION%%/options.m4
+share/aclocal-%%BUILD_VERSION%%/protos.m4
+share/aclocal-%%BUILD_VERSION%%/python.m4
+share/aclocal-%%BUILD_VERSION%%/regex.m4
+share/aclocal-%%BUILD_VERSION%%/runlog.m4
+share/aclocal-%%BUILD_VERSION%%/sanity.m4
+share/aclocal-%%BUILD_VERSION%%/strip.m4
+share/aclocal-%%BUILD_VERSION%%/substnot.m4
+share/aclocal-%%BUILD_VERSION%%/tar.m4
+share/aclocal-%%BUILD_VERSION%%/upc.m4
+share/automake-%%BUILD_VERSION%%/Automake/ChannelDefs.pm
+share/automake-%%BUILD_VERSION%%/Automake/Channels.pm
+share/automake-%%BUILD_VERSION%%/Automake/Condition.pm
+share/automake-%%BUILD_VERSION%%/Automake/Config.pm
+share/automake-%%BUILD_VERSION%%/Automake/Configure_ac.pm
+share/automake-%%BUILD_VERSION%%/Automake/DisjConditions.pm
+share/automake-%%BUILD_VERSION%%/Automake/FileUtils.pm
+share/automake-%%BUILD_VERSION%%/Automake/General.pm
+share/automake-%%BUILD_VERSION%%/Automake/Item.pm
+share/automake-%%BUILD_VERSION%%/Automake/ItemDef.pm
+share/automake-%%BUILD_VERSION%%/Automake/Location.pm
+share/automake-%%BUILD_VERSION%%/Automake/Options.pm
+share/automake-%%BUILD_VERSION%%/Automake/Rule.pm
+share/automake-%%BUILD_VERSION%%/Automake/RuleDef.pm
+share/automake-%%BUILD_VERSION%%/Automake/Struct.pm
+share/automake-%%BUILD_VERSION%%/Automake/VarDef.pm
+share/automake-%%BUILD_VERSION%%/Automake/Variable.pm
+share/automake-%%BUILD_VERSION%%/Automake/Version.pm
+share/automake-%%BUILD_VERSION%%/Automake/Wrap.pm
+share/automake-%%BUILD_VERSION%%/Automake/XFile.pm
+share/automake-%%BUILD_VERSION%%/COPYING
+share/automake-%%BUILD_VERSION%%/INSTALL
+share/automake-%%BUILD_VERSION%%/acinstall
+share/automake-%%BUILD_VERSION%%/am/ansi2knr.am
+share/automake-%%BUILD_VERSION%%/am/check.am
+share/automake-%%BUILD_VERSION%%/am/clean-hdr.am
+share/automake-%%BUILD_VERSION%%/am/clean.am
+share/automake-%%BUILD_VERSION%%/am/compile.am
+share/automake-%%BUILD_VERSION%%/am/configure.am
+share/automake-%%BUILD_VERSION%%/am/data.am
+share/automake-%%BUILD_VERSION%%/am/dejagnu.am
+share/automake-%%BUILD_VERSION%%/am/depend.am
+share/automake-%%BUILD_VERSION%%/am/depend2.am
+share/automake-%%BUILD_VERSION%%/am/distdir.am
+share/automake-%%BUILD_VERSION%%/am/footer.am
+share/automake-%%BUILD_VERSION%%/am/header-vars.am
+share/automake-%%BUILD_VERSION%%/am/header.am
+share/automake-%%BUILD_VERSION%%/am/install.am
+share/automake-%%BUILD_VERSION%%/am/inst-vars.am
+share/automake-%%BUILD_VERSION%%/am/java.am
+share/automake-%%BUILD_VERSION%%/am/lang-compile.am
+share/automake-%%BUILD_VERSION%%/am/lex.am
+share/automake-%%BUILD_VERSION%%/am/library.am
+share/automake-%%BUILD_VERSION%%/am/libs.am
+share/automake-%%BUILD_VERSION%%/am/libtool.am
+share/automake-%%BUILD_VERSION%%/am/lisp.am
+share/automake-%%BUILD_VERSION%%/am/ltlib.am
+share/automake-%%BUILD_VERSION%%/am/ltlibrary.am
+share/automake-%%BUILD_VERSION%%/am/mans-vars.am
+share/automake-%%BUILD_VERSION%%/am/mans.am
+share/automake-%%BUILD_VERSION%%/am/multilib.am
+share/automake-%%BUILD_VERSION%%/am/program.am
+share/automake-%%BUILD_VERSION%%/am/progs.am
+share/automake-%%BUILD_VERSION%%/am/python.am
+share/automake-%%BUILD_VERSION%%/am/remake-hdr.am
+share/automake-%%BUILD_VERSION%%/am/scripts.am
+share/automake-%%BUILD_VERSION%%/am/subdirs.am
+share/automake-%%BUILD_VERSION%%/am/tags.am
+share/automake-%%BUILD_VERSION%%/am/texi-vers.am
+share/automake-%%BUILD_VERSION%%/am/texibuild.am
+share/automake-%%BUILD_VERSION%%/am/texinfos.am
+share/automake-%%BUILD_VERSION%%/am/yacc.am
+share/automake-%%BUILD_VERSION%%/ansi2knr.1
+share/automake-%%BUILD_VERSION%%/ansi2knr.c
+share/automake-%%BUILD_VERSION%%/compile
+share/automake-%%BUILD_VERSION%%/config-ml.in
+share/automake-%%BUILD_VERSION%%/config.guess
+share/automake-%%BUILD_VERSION%%/config.sub
+share/automake-%%BUILD_VERSION%%/depcomp
+share/automake-%%BUILD_VERSION%%/elisp-comp
+share/automake-%%BUILD_VERSION%%/install-sh
+share/automake-%%BUILD_VERSION%%/mdate-sh
+share/automake-%%BUILD_VERSION%%/missing
+share/automake-%%BUILD_VERSION%%/mkinstalldirs
+share/automake-%%BUILD_VERSION%%/py-compile
+share/automake-%%BUILD_VERSION%%/symlink-tree
+share/automake-%%BUILD_VERSION%%/texinfo.tex
+share/automake-%%BUILD_VERSION%%/ylwrap
share/doc/automake/amhello-1.0.tar.gz
@dirrm share/doc/automake
- at dirrm share/aclocal%%BUILD_VERSION%%
- at dirrm share/automake%%BUILD_VERSION%%/Automake
- at dirrm share/automake%%BUILD_VERSION%%/am
- at dirrm share/automake%%BUILD_VERSION%%
- at dirrm libexec/automake%%BUILD_VERSION%%
+ at dirrm share/aclocal-%%BUILD_VERSION%%
+ at dirrm share/automake-%%BUILD_VERSION%%/Automake
+ at dirrm share/automake-%%BUILD_VERSION%%/am
+ at dirrm share/automake-%%BUILD_VERSION%%
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/devel/automake110/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -L devel/automake110/Makefile -L devel/automake110/Makefile -u -r1.2 -r1.3
--- devel/automake110/Makefile
+++ devel/automake110/Makefile
@@ -3,12 +3,12 @@
# Whom: Ade Lovett <ade at FreeBSD.org>
#
# $MidnightBSD$
-# $FreeBSD: ports/devel/automake110/Makefile,v 1.70 2007/02/07 10:04:31 ade Exp $
+# $FreeBSD: ports/devel/automake110/Makefile,v 1.74 2007/07/28 10:01:08 ade Exp $
#
PORTNAME= automake
PORTVERSION= 1.10
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= automake
@@ -18,43 +18,32 @@
COMMENT= GNU Standards-compliant Makefile generator (1.10)
LICENSE= gpl2
-RUN_DEPENDS= ${AUTOCONF_DEPENDS}
+RUN_DEPENDS= ${AUTOCONF_DEPENDS} \
+ automake-wrapper:${PORTSDIR}/devel/automake-wrapper
USE_AUTOTOOLS= autoconf:261:env
-BUILD_VERSION= 110
+BUILD_VERSION= 1.10
PLIST_SUB= BUILD_VERSION=${BUILD_VERSION}
-LATEST_LINK= automake${BUILD_VERSION}
+LATEST_LINK= automake110
USE_BZIP2= yes
USE_PERL5= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --program-suffix=${BUILD_VERSION} \
- --infodir=${PREFIX}/info --mandir=${PREFIX}/man
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd6.0
-INFO= automake${BUILD_VERSION}
+CONFIGURE_ARGS= --program-suffix=-${BUILD_VERSION}
+CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+INFO= automake-${BUILD_VERSION}
.include <bsd.port.pre.mk>
CONFIGURE_ENV+= MAKEINFO="makeinfo --no-split"
post-patch:
- @(cd ${WRKSRC}/doc && \
- ${RM} -f *.info && \
- ${MV} automake.texi automake${BUILD_VERSION}.texi && \
- ${REINPLACE_CMD} -E 's,(automake)\.(info),\1${BUILD_VERSION}\.\2,g' automake${BUILD_VERSION}.texi && \
- ${REINPLACE_CMD} -E 's,(automake)\.(info|texi),\1${BUILD_VERSION}\.\2,g' Makefile.in \
- )
- @${REINPLACE_CMD} -e 's,%%X11BASE%%,${X11BASE},g' ${WRKSRC}/aclocal.in
+ @${RM} ${WRKSRC}/doc/*.info
+ @${MV} ${WRKSRC}/doc/automake.texi \
+ ${WRKSRC}/doc/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.post.mk>
Index: patch-doc::automake.texi
===================================================================
RCS file: /home/cvs/mports/devel/automake110/files/patch-doc::automake.texi,v
retrieving revision 1.1
retrieving revision 1.2
diff -L devel/automake110/files/patch-doc::automake.texi -L devel/automake110/files/patch-doc::automake.texi -u -r1.1 -r1.2
--- devel/automake110/files/patch-doc::automake.texi
+++ devel/automake110/files/patch-doc::automake.texi
@@ -1,13 +1,19 @@
--- doc/automake.texi.orig Sun Oct 15 10:41:24 2006
-+++ doc/automake.texi Tue Dec 5 13:25:18 2006
++++ doc/automake.texi Sat Apr 14 15:32:49 2007
@@ -2,4 +2,4 @@
@c %**start of header
- at setfilename automake.info
- at settitle automake
-+ at setfilename automake19.info
-+ at settitle automake19
++ at setfilename automake-1.10.info
++ at settitle Automake-1.10
@setchapternewpage off
-@@ -39,9 +39,4 @@
+@@ -34,14 +34,5 @@
+
+- at c info Automake points to the Automake package's documentation
+- at c info automake points to the automake script's documentation
+- at c (Autoconf has a similar setup.)
+- at dircategory Software development
++ at dircategory Programming & development tools
@direntry
-* Automake: (automake). Making GNU standards-compliant Makefiles.
- at end direntry
@@ -16,11 +22,5 @@
- at direntry
-* aclocal: (automake)Invoking aclocal. Generating aclocal.m4.
-* automake: (automake)Invoking Automake. Generating Makefile.in.
-+* aclocal110: (automake110)Invoking aclocal. Generating aclocal.m4.
-+* automake110: (automake110)Invoking Automake. Generating Makefile.in.
++* Automake-1.10: (automake-1.10). Making Makefile.in's.
@end direntry
-@@ -11894,3 +11889,3 @@
- @multitable {8888-88-88} {8.8-p8} {8888} {8888} {8888} {8888 (88)} {8888 (88)} {888} {888}
-- at headitem Date @tab Rel @tab am @tab acl @tab pm @tab @file{*.am} @tab m4 @tab doc @tab t
-+ at item Date @tab Rel @tab am @tab acl @tab pm @tab @file{*.am} @tab m4 @tab doc @tab t
- @item 1994-09-19 @tab CVS @tab 141 @tab @tab @tab 299 (24) @tab @tab @tab
--- devel/automake110/files/patch-lib::Automake::Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/Automake/Makefile.in.orig Sun Mar 7 09:04:33 2004
-+++ lib/Automake/Makefile.in Mon Mar 29 20:22:26 2004
-@@ -70,2 +70,3 @@
- APIVERSION = @APIVERSION@
-+APIPVERSION = @APIPVERSION@
- AUTOCONF = @AUTOCONF@
-@@ -161,2 +162,3 @@
- -e 's,[@]APIVERSION[@],$(APIVERSION),g' \
-+ -e 's,[@]APIPVERSION[@],$(APIPVERSION),g' \
- -e 's,[@]PACKAGE[@],$(PACKAGE),g' \
Index: patch-Makefile.in
===================================================================
RCS file: /home/cvs/mports/devel/automake110/files/patch-Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -L devel/automake110/files/patch-Makefile.in -L devel/automake110/files/patch-Makefile.in -u -r1.1 -r1.2
--- devel/automake110/files/patch-Makefile.in
+++ devel/automake110/files/patch-Makefile.in
@@ -1,27 +1,6 @@
---- Makefile.in.orig Sun Mar 7 09:04:32 2004
-+++ Makefile.in Sun Mar 14 17:07:15 2004
-@@ -82,2 +82,3 @@
- APIVERSION = @APIVERSION@
-+APIPVERSION = @APIPVERSION@
- AUTOCONF = @AUTOCONF@
-@@ -154,2 +155,3 @@
- -e 's,[@]APIVERSION[@],$(APIVERSION),g' \
-+ -e 's,[@]APIPVERSION[@],$(APIPVERSION),g' \
- -e 's,[@]PACKAGE[@],$(PACKAGE),g' \
-@@ -590,16 +592,4 @@
- @$(POST_INSTALL)
-- @for p in $(bin_SCRIPTS); do \
-- f="`echo $$p|sed '$(transform)'`"; \
-- fv="$$f-$(APIVERSION)"; \
-- rm -f $(DESTDIR)$(bindir)/$$fv; \
-- echo " $(LN) $(DESTDIR)$(bindir)/$$f $(DESTDIR)$(bindir)/$$fv"; \
-- $(LN) $(DESTDIR)$(bindir)/$$f $(DESTDIR)$(bindir)/$$fv; \
-- done
-
- uninstall-hook:
-- @for p in $(bin_SCRIPTS); do \
-- f="`echo $$p|sed '$(transform)'`"; \
-- fv="$$f-$(APIVERSION)"; \
-- rm -f $(DESTDIR)$(bindir)/$$fv; \
-- done
+--- Makefile.in.orig Sun Oct 15 10:25:23 2006
++++ Makefile.in Sat Apr 14 16:04:04 2007
+@@ -591,3 +591,2 @@
+ @$(NORMAL_INSTALL)
+- $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
--- devel/automake110/files/patch-aclocal.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- aclocal.in.orig Sun Oct 15 09:19:37 2006
-+++ aclocal.in Tue Dec 5 13:19:21 2006
-@@ -32,3 +32,3 @@
- {
-- my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE at -@APIVERSION@';
-+ my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@@APIPVERSION@';
- unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir);
-@@ -58,4 +58,4 @@
- my @user_includes = ();
--my @automake_includes = ("@datadir@/aclocal-$APIVERSION");
--my @system_includes = ('@datadir@/aclocal');
-+my @automake_includes = ("@datadir@/aclocal$APIPVERSION");
-+my @system_includes = ('@datadir@/aclocal', '%%X11BASE%%/share/aclocal');
-
-@@ -650,3 +650,3 @@
-
-- my $traces = ($ENV{AUTOM4TE} || 'autom4te');
-+ my $traces = ($ENV{AUTOM4TE} || 'autom4te261');
- $traces .= " --language Autoconf-without-aclocal-m4 ";
--- devel/automake110/files/patch-m4-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- m4/Makefile.in.orig Sun Mar 7 09:04:33 2004
-+++ m4/Makefile.in Sun Mar 14 17:09:37 2004
-@@ -60,2 +60,3 @@
- APIVERSION = @APIVERSION@
-+APIPVERSION = @APIPVERSION@
- AUTOCONF = @AUTOCONF@
-@@ -122,3 +123,3 @@
- target_alias = @target_alias@
--m4datadir = $(datadir)/aclocal-$(APIVERSION)
-+m4datadir = $(datadir)/aclocal$(APIPVERSION)
- dist_m4data_DATA = \
--- devel/automake110/files/patch-automake.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- automake.in.orig Sat Apr 10 10:15:32 2004
-+++ automake.in Wed May 26 14:34:15 2004
-@@ -33,3 +33,3 @@
- {
-- my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE at -@APIVERSION@';
-+ my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@@APIPVERSION@';
- unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir);
-@@ -4440,3 +4440,3 @@
-
-- my $traces = ($ENV{AUTOCONF} || 'autoconf') . " ";
-+ my $traces = ($ENV{AUTOCONF} || 'autoconf261') . " ";
-
--- devel/automake110/files/patch-configure
+++ /dev/null
@@ -1,42 +0,0 @@
---- configure.orig Sun Oct 15 10:25:22 2006
-+++ configure Tue Dec 5 13:23:30 2006
-@@ -631,2 +631,3 @@
- APIVERSION
-+APIPVERSION
- pkgvdatadir
-@@ -1736,2 +1737,3 @@
- am__api_version='1.10'
-+am__apip_version='110'
-
-@@ -2055,3 +2057,3 @@
-
--ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
-+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal${am__apip_version}"}
-
-@@ -2061,3 +2063,3 @@
-
--AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
-+AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake${am__apip_version}"}
-
-@@ -2196,6 +2198,6 @@
- APIVERSION=`echo "$VERSION" | sed -e 's/^\([0-9]*\.[0-9]*[a-z]*\).*$/\1/'`
--
-+APIPVERSION=`echo "$VERSION" | sed -e 's/^\([0-9]*\)\.\([0-9]*[a-z]*\).*$/\1\2/'`
-
- # A versioned directory, defined here for convenience.
--pkgvdatadir="\${datadir}/$PACKAGE-$APIVERSION"
-+pkgvdatadir="\${datadir}/automake${APIPVERSION}"
-
-@@ -3232,2 +3234,3 @@
- APIVERSION=$APIVERSION
-+APIPVERSION=$APIPVERSION
-
-@@ -3377,2 +3380,3 @@
- APIVERSION!$APIVERSION$ac_delim
-+APIPVERSION!$APIPVERSION$ac_delim
- pkgvdatadir!$pkgvdatadir$ac_delim
-@@ -3389,3 +3393,3 @@
-
-- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 75; then
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 76; then
- break
--- devel/automake110/files/patch-lib::Automake::Config.in
+++ /dev/null
@@ -1,15 +0,0 @@
---- lib/Automake/Config.in.orig Sat May 14 12:52:09 2005
-+++ lib/Automake/Config.in Tue Dec 5 13:27:08 2006
-@@ -25,3 +25,3 @@
- our @ISA = qw (Exporter);
--our @EXPORT = qw ($APIVERSION $PACKAGE $VERSION $libdir);
-+our @EXPORT = qw ($APIVERSION $APIPVERSION $PACKAGE $VERSION $libdir);
-
-@@ -30,5 +30,6 @@
- our $APIVERSION = '@APIVERSION@';
-+our $APIPVERSION = '@APIPVERSION@';
- our $PACKAGE = '@PACKAGE@';
- our $VERSION = '@VERSION@';
--our $libdir = '@datadir@/@PACKAGE at -@APIVERSION@';
-+our $libdir = '@datadir@/@PACKAGE@@APIPVERSION@';
-
Index: patch-doc::Makefile.in
===================================================================
RCS file: /home/cvs/mports/devel/automake110/files/patch-doc::Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -L devel/automake110/files/patch-doc::Makefile.in -L devel/automake110/files/patch-doc::Makefile.in -u -r1.1 -r1.2
--- devel/automake110/files/patch-doc::Makefile.in
+++ devel/automake110/files/patch-doc::Makefile.in
@@ -3,33 +3,24 @@
@@ -53,3 +53,3 @@
DIST_SOURCES =
-INFO_DEPS = $(srcdir)/automake.info
-+INFO_DEPS = $(srcdir)/automake${APIPVERSION}.info
++INFO_DEPS = $(srcdir)/automake- at APIVERSION@.info
TEXINFO_TEX = $(top_srcdir)/lib/texinfo.tex
-@@ -73,2 +73,3 @@
- APIVERSION = @APIVERSION@
-+APIPVERSION = @APIPVERSION@
- AUTOCONF = @AUTOCONF@
-@@ -93,3 +94,3 @@
- LTLIBOBJS = @LTLIBOBJS@
--MAKEINFO = @MAKEINFO@
-+MAKEINFO = @MAKEINFO@ --no-split
- MODIFICATION_DELAY = @MODIFICATION_DELAY@
@@ -135,3 +136,3 @@
target_alias = @target_alias@
-info_TEXINFOS = automake.texi
-+info_TEXINFOS = automake${APIPVERSION}.texi
++info_TEXINFOS = automake- at APIVERSION@.texi
automake_TEXINFOS = fdl.texi
@@ -142,3 +143,3 @@
-TAGS_DEPENDENCIES = automake.texi
-+TAGS_DEPENDENCIES = automake${APIPVERSION}.texi
++TAGS_DEPENDENCIES = automake- at APIVERSION@.texi
all: all-am
@@ -222,5 +223,5 @@
$(srcdir)/version.texi: $(srcdir)/stamp-vti
-$(srcdir)/stamp-vti: automake.texi $(top_srcdir)/configure
- @(dir=.; test -f ./automake.texi || dir=$(srcdir); \
- set `$(SHELL) $(top_srcdir)/lib/mdate-sh $$dir/automake.texi`; \
-+$(srcdir)/stamp-vti: automake${APIPVERSION}.texi $(top_srcdir)/configure
-+ @(dir=.; test -f ./automake${APIPVERSION}.texi || dir=$(srcdir); \
-+ set `$(SHELL) $(top_srcdir)/lib/mdate-sh $$dir/automake${APIPVERSION}.texi`; \
++$(srcdir)/stamp-vti: automake- at APIVERSION@.texi $(top_srcdir)/configure
++ @(dir=.; test -f ./automake- at APIVERSION@.texi || dir=$(srcdir); \
++ set `$(SHELL) $(top_srcdir)/lib/mdate-sh $$dir/automake- at APIVERSION@.texi`; \
echo "@set UPDATED $$1 $$2 $$3"; \
More information about the Midnightbsd-cvs
mailing list