Date: Sat, 9 Mar 2002 15:21:36 -0500 (EST) From: Alan Eldridge <ports@geeksrus.net> To: FreeBSD-gnats-submit@freebsd.org Cc: portmgr@freebsd.org Subject: ports/35710: Request repocopy: devel/automake -> devel/automake-devel + patch to automake-1.6 Message-ID: <200203092021.g29KLaS04342@wwweasel.geeksrus.net>
next in thread | raw e-mail | index | archive | help
>Number: 35710
>Category: ports
>Synopsis: Request repocopy: devel/automake -> devel/automake-devel + patch to automake-1.6
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Mar 09 12:30:01 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: Alan Eldridge
>Release: FreeBSD 4.5-STABLE i386
>Organization:
Geeksrus.NET
>Environment:
System: FreeBSD wwweasel.geeksrus.net 4.5-STABLE FreeBSD 4.5-STABLE #0: Wed Mar 6 21:55:19 EST 2002 root@wwweasel.geeksrus.net:/usr/obj/usr/src/sys/WWWEASEL i386
>Description:
Automake-1.6 is out. This repocopy and patch will give an automake-1.6 port.
Binaries are installed with 16 suffix only. Info file is installed with 16 suffix (automake16.info) and install-info is not run.
This includes my new mechanism for setting automake paths as discussed with
Will Andrews. That is, a directory ${PREFIX}/libexec/automake16 is created,
and links automake, aclocal are made to ${PREFIX}/bin/{automake,aclocal}16.
This is in anticipation of the autotools patch for bsd.port.mk which I am
working on now. USE_AUTOMAKE_VER=16 results in ${PREFIX}/libexec/automake16
being prepended to the path.
Libexec/fooversion/ patches for all auto* ports will be submitted before
the bsd.port.mk patch.
This is just the tip of the iceberg, and allows people to get a head start
on this version. Note that there are changes related to use of sed. I'll
update with a DOCSDIR once the port is in.
Thanks. :)
>How-To-Repeat:
>Fix:
1. Repocopy devel/automake to devel/automake-devel.
2. Apply this patch.
--8<----8<----8<----8<----8<----8<----8<----8<----8<----8<--
Index: devel/automake-devel/Makefile
===================================================================
RCS file: /home/alane/cvsroot/ports/devel/automake/Makefile,v
retrieving revision 1.21
diff -u -3 -r1.21 Makefile
--- devel/automake-devel/Makefile 30 Oct 2001 08:28:01 -0000 1.21
+++ devel/automake-devel/Makefile 9 Mar 2002 19:25:44 -0000
@@ -6,7 +6,7 @@
#
PORTNAME= automake
-PORTVERSION= 1.5
+PORTVERSION= 1.6
PORTEPOCH= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
@@ -16,15 +16,25 @@
GNU_CONFIGURE= yes
CONFIGURE_ENV= PERL=${PERL5}
+CONFIGURE_ARGS+= --program-suffix=${AMSUFFIX}
USE_PERL5= yes
WRKSRC= ${WRKDIR}/${DISTNAME}
STRIP= # none
+AMSUFFIX= ${PORTVERSION:S|.||}
+PLIST_SUB+= PORTVERSION=${PORTVERSION} AMSUFFIX=${AMSUFFIX}
+
pre-configure:
${PERL} -pi -e "s^%%X11BASE%%^${X11BASE}^" ${WRKSRC}/aclocal.in
post-install:
- @install-info ${PREFIX}/info/automake.info ${PREFIX}/info/dir
+ @${MKDIR} ${PREFIX}/libexec/${PORTNAME}${AMSUFFIX}
+.for i in automake aclocal
+ @${RM} ${PREFIX}/bin/${i}${AMSUFFIX}-${PORTVERSION}
+ @${LN} -s ../../bin/${i}${AMSUFFIX} \
+ ${PREFIX}/libexec/${PORTNAME}${AMSUFFIX}/${i}
+.endfor
+# @install-info ${PREFIX}/info/automake.info ${PREFIX}/info/dir
.include <bsd.port.mk>
Index: devel/automake-devel/distinfo
===================================================================
RCS file: /home/alane/cvsroot/ports/devel/automake/distinfo,v
retrieving revision 1.9
diff -u -3 -r1.9 distinfo
--- devel/automake-devel/distinfo 29 Oct 2001 01:46:00 -0000 1.9
+++ devel/automake-devel/distinfo 8 Mar 2002 04:24:03 -0000
@@ -1 +1 @@
-MD5 (automake-1.5.tar.gz) = 74a22ac0581378e807ecb334a55c5bab
+MD5 (automake-1.6.tar.gz) = 549af723e3757f71e2a904dbd46d9e76
Index: devel/automake-devel/pkg-plist
===================================================================
RCS file: /home/alane/cvsroot/ports/devel/automake/pkg-plist,v
retrieving revision 1.12
diff -u -3 -r1.12 pkg-plist
--- devel/automake-devel/pkg-plist 30 Oct 2001 12:57:35 -0000 1.12
+++ devel/automake-devel/pkg-plist 9 Mar 2002 19:22:41 -0000
@@ -1,93 +1,98 @@
-bin/aclocal
-bin/automake
-@unexec install-info --delete %D/info/automake.info %D/info/dir
-info/automake.info
-@exec install-info %D/info/automake.info %D/info/dir
-share/aclocal/as.m4
-share/aclocal/auxdir.m4
-share/aclocal/ccstdc.m4
-share/aclocal/cond.m4
-share/aclocal/depend.m4
-share/aclocal/depout.m4
-share/aclocal/dmalloc.m4
-share/aclocal/error.m4
-share/aclocal/gcj.m4
-share/aclocal/header.m4
-share/aclocal/init.m4
-share/aclocal/install-sh.m4
-share/aclocal/lex.m4
-share/aclocal/lispdir.m4
-share/aclocal/maintainer.m4
-share/aclocal/make.m4
-share/aclocal/minuso.m4
-share/aclocal/missing.m4
-share/aclocal/multi.m4
-share/aclocal/obstack.m4
-share/aclocal/protos.m4
-share/aclocal/ptrdiff.m4
-share/aclocal/python.m4
-share/aclocal/regex.m4
-share/aclocal/sanity.m4
-share/aclocal/strip.m4
-share/aclocal/strtod.m4
-share/aclocal/termios.m4
-share/aclocal/winsz.m4
-share/automake/Automake/Struct.pm
-share/automake/COPYING
-share/automake/INSTALL
-share/automake/acinstall
-share/automake/am/ansi2knr.am
-share/automake/am/check.am
-share/automake/am/clean-hdr.am
-share/automake/am/clean.am
-share/automake/am/compile.am
-share/automake/am/configure.am
-share/automake/am/data.am
-share/automake/am/dejagnu.am
-share/automake/am/depend.am
-share/automake/am/depend2.am
-share/automake/am/distdir.am
-share/automake/am/footer.am
-share/automake/am/header-vars.am
-share/automake/am/header.am
-share/automake/am/install.am
-share/automake/am/java.am
-share/automake/am/lang-compile.am
-share/automake/am/lex.am
-share/automake/am/library.am
-share/automake/am/libs.am
-share/automake/am/libtool.am
-share/automake/am/lisp.am
-share/automake/am/ltlib.am
-share/automake/am/ltlibrary.am
-share/automake/am/mans-vars.am
-share/automake/am/mans.am
-share/automake/am/multilib.am
-share/automake/am/program.am
-share/automake/am/progs.am
-share/automake/am/python.am
-share/automake/am/remake-hdr.am
-share/automake/am/scripts.am
-share/automake/am/subdirs.am
-share/automake/am/tags.am
-share/automake/am/texi-vers.am
-share/automake/am/texibuild.am
-share/automake/am/texinfos.am
-share/automake/am/yacc.am
-share/automake/ansi2knr.1
-share/automake/ansi2knr.c
-share/automake/compile
-share/automake/config.guess
-share/automake/config.sub
-share/automake/depcomp
-share/automake/elisp-comp
-share/automake/install-sh
-share/automake/mdate-sh
-share/automake/missing
-share/automake/mkinstalldirs
-share/automake/py-compile
-share/automake/texinfo.tex
-share/automake/ylwrap
-@dirrm share/automake/am
-@dirrm share/automake/Automake
-@dirrm share/automake
+bin/aclocal%%AMSUFFIX%%
+bin/automake%%AMSUFFIX%%
+libexec/automake%%AMSUFFIX%%/aclocal
+libexec/automake%%AMSUFFIX%%/automake
+@comment @unexec install-info --delete %D/info/automake.info %D/info/dir
+info/automake16.info
+@comment @exec install-info %D/info/automake.info %D/info/dir
+share/aclocal-%%PORTVERSION%%/amversion.m4
+share/aclocal-%%PORTVERSION%%/as.m4
+share/aclocal-%%PORTVERSION%%/auxdir.m4
+share/aclocal-%%PORTVERSION%%/ccstdc.m4
+share/aclocal-%%PORTVERSION%%/cond.m4
+share/aclocal-%%PORTVERSION%%/depend.m4
+share/aclocal-%%PORTVERSION%%/depout.m4
+share/aclocal-%%PORTVERSION%%/dmalloc.m4
+share/aclocal-%%PORTVERSION%%/gcj.m4
+share/aclocal-%%PORTVERSION%%/header.m4
+share/aclocal-%%PORTVERSION%%/init.m4
+share/aclocal-%%PORTVERSION%%/install-sh.m4
+share/aclocal-%%PORTVERSION%%/lex.m4
+share/aclocal-%%PORTVERSION%%/lispdir.m4
+share/aclocal-%%PORTVERSION%%/maintainer.m4
+share/aclocal-%%PORTVERSION%%/make.m4
+share/aclocal-%%PORTVERSION%%/minuso.m4
+share/aclocal-%%PORTVERSION%%/missing.m4
+share/aclocal-%%PORTVERSION%%/multi.m4
+share/aclocal-%%PORTVERSION%%/options.m4
+share/aclocal-%%PORTVERSION%%/protos.m4
+share/aclocal-%%PORTVERSION%%/python.m4
+share/aclocal-%%PORTVERSION%%/regex.m4
+share/aclocal-%%PORTVERSION%%/runlog.m4
+share/aclocal-%%PORTVERSION%%/sanity.m4
+share/aclocal-%%PORTVERSION%%/strip.m4
+share/aclocal-%%PORTVERSION%%/termios.m4
+share/aclocal-%%PORTVERSION%%/winsz.m4
+share/automake-%%PORTVERSION%%/Automake/General.pm
+share/automake-%%PORTVERSION%%/Automake/Struct.pm
+share/automake-%%PORTVERSION%%/Automake/XFile.pm
+share/automake-%%PORTVERSION%%/COPYING
+share/automake-%%PORTVERSION%%/INSTALL
+share/automake-%%PORTVERSION%%/acinstall
+share/automake-%%PORTVERSION%%/am/ansi2knr.am
+share/automake-%%PORTVERSION%%/am/check.am
+share/automake-%%PORTVERSION%%/am/clean-hdr.am
+share/automake-%%PORTVERSION%%/am/clean.am
+share/automake-%%PORTVERSION%%/am/compile.am
+share/automake-%%PORTVERSION%%/am/configure.am
+share/automake-%%PORTVERSION%%/am/data.am
+share/automake-%%PORTVERSION%%/am/dejagnu.am
+share/automake-%%PORTVERSION%%/am/depend.am
+share/automake-%%PORTVERSION%%/am/depend2.am
+share/automake-%%PORTVERSION%%/am/distdir.am
+share/automake-%%PORTVERSION%%/am/footer.am
+share/automake-%%PORTVERSION%%/am/header-vars.am
+share/automake-%%PORTVERSION%%/am/header.am
+share/automake-%%PORTVERSION%%/am/install.am
+share/automake-%%PORTVERSION%%/am/java.am
+share/automake-%%PORTVERSION%%/am/lang-compile.am
+share/automake-%%PORTVERSION%%/am/lex.am
+share/automake-%%PORTVERSION%%/am/library.am
+share/automake-%%PORTVERSION%%/am/libs.am
+share/automake-%%PORTVERSION%%/am/libtool.am
+share/automake-%%PORTVERSION%%/am/lisp.am
+share/automake-%%PORTVERSION%%/am/ltlib.am
+share/automake-%%PORTVERSION%%/am/ltlibrary.am
+share/automake-%%PORTVERSION%%/am/mans-vars.am
+share/automake-%%PORTVERSION%%/am/mans.am
+share/automake-%%PORTVERSION%%/am/multilib.am
+share/automake-%%PORTVERSION%%/am/program.am
+share/automake-%%PORTVERSION%%/am/progs.am
+share/automake-%%PORTVERSION%%/am/python.am
+share/automake-%%PORTVERSION%%/am/remake-hdr.am
+share/automake-%%PORTVERSION%%/am/scripts.am
+share/automake-%%PORTVERSION%%/am/subdirs.am
+share/automake-%%PORTVERSION%%/am/tags.am
+share/automake-%%PORTVERSION%%/am/texi-vers.am
+share/automake-%%PORTVERSION%%/am/texibuild.am
+share/automake-%%PORTVERSION%%/am/texinfos.am
+share/automake-%%PORTVERSION%%/am/yacc.am
+share/automake-%%PORTVERSION%%/ansi2knr.1
+share/automake-%%PORTVERSION%%/ansi2knr.c
+share/automake-%%PORTVERSION%%/compile
+share/automake-%%PORTVERSION%%/config.guess
+share/automake-%%PORTVERSION%%/config.sub
+share/automake-%%PORTVERSION%%/depcomp
+share/automake-%%PORTVERSION%%/elisp-comp
+share/automake-%%PORTVERSION%%/install-sh
+share/automake-%%PORTVERSION%%/mdate-sh
+share/automake-%%PORTVERSION%%/missing
+share/automake-%%PORTVERSION%%/mkinstalldirs
+share/automake-%%PORTVERSION%%/py-compile
+share/automake-%%PORTVERSION%%/texinfo.tex
+share/automake-%%PORTVERSION%%/ylwrap
+@dirrm libexec/automake%%AMSUFFIX%%
+@dirrm share/automake-%%PORTVERSION%%/am
+@dirrm share/automake-%%PORTVERSION%%/Automake
+@dirrm share/automake-%%PORTVERSION%%
+@dirrm share/aclocal-%%PORTVERSION%%
Index: devel/automake-devel/files/patch-ab
===================================================================
RCS file: /home/alane/cvsroot/ports/devel/automake/files/patch-ab,v
retrieving revision 1.7
diff -u -3 -r1.7 patch-ab
--- devel/automake-devel/files/patch-ab 29 Oct 2001 01:46:00 -0000 1.7
+++ devel/automake-devel/files/patch-ab 9 Mar 2002 19:16:12 -0000
@@ -1,6 +1,23 @@
---- Makefile.in.orig Sun Sep 9 11:42:15 2001
-+++ Makefile.in Sun Sep 9 11:42:51 2001
-@@ -180,7 +180,7 @@
+--- Makefile.in.orig Wed Mar 6 00:13:04 2002
++++ Makefile.in Sat Mar 9 14:16:04 2002
+@@ -103,6 +103,7 @@
+ DIST_SOURCES =
+ TEXINFO_TEX = $(top_srcdir)/lib/texinfo.tex
+ INFO_DEPS = automake.info
++INFO_DEPS_INSTALL = automake16.info
+ DVIS = automake.dvi
+ TEXINFOS = automake.texi
+
+@@ -178,13 +179,16 @@
+ maintainer-clean-vti:
+ -rm -f $(srcdir)/stamp-vti $(srcdir)/version.texi
+
++automake16.info: automake.info
++ mv automake.info automake16.info
++
+ automake.info: automake.texi $(srcdir)/version.texi
+ automake.dvi: automake.texi $(srcdir)/version.texi
+
.texi.info:
@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
cd $(srcdir) \
@@ -9,3 +26,49 @@
`echo $< | sed 's,.*/,,'`
.texi.dvi:
+@@ -454,7 +458,7 @@
+ exit 1; } >&2
+ check-am: all-am
+ check: check-recursive
+-all-am: Makefile $(INFO_DEPS) $(SCRIPTS)
++all-am: Makefile $(INFO_DEPS_INSTALL) $(SCRIPTS)
+ installdirs: installdirs-recursive
+ installdirs-am:
+ $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(infodir)
+@@ -497,7 +501,7 @@
+
+ info: info-recursive
+
+-info-am: $(INFO_DEPS)
++info-am: $(INFO_DEPS_INSTALL)
+
+ install-data-am: install-info-am
+
+@@ -507,10 +511,10 @@
+
+ install-info: install-info-recursive
+
+-install-info-am: $(INFO_DEPS)
++install-info-am: $(INFO_DEPS_INSTALL)
+ @$(NORMAL_INSTALL)
+ $(mkinstalldirs) $(DESTDIR)$(infodir)
+- @list='$(INFO_DEPS)'; \
++ @list='$(INFO_DEPS_INSTALL)'; \
+ for file in $$list; do \
+ d=$(srcdir); \
+ for ifile in echo $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9]; do \
+@@ -522,14 +526,6 @@
+ done; \
+ done
+ @$(POST_INSTALL)
+- @if (install-info --version && \
+- install-info --version | fgrep -i -v debian) >/dev/null 2>&1; then \
+- list='$(INFO_DEPS)'; \
+- for file in $$list; do \
+- echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file";\
+- install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file || :;\
+- done; \
+- else : ; fi
+ install-man:
+
+ installcheck-am:
--8<----8<----8<----8<----8<----8<----8<----8<----8<----8<--
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200203092021.g29KLaS04342>