Date: Mon, 18 Mar 2002 22:25:55 -0500 (EST) From: Alan Eldridge <ports@geeksrus.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: portmgr@FreeBSD.org Subject: ports/36077: devel/automake14: fix info file overlap w/automake, add libexec/automake14/* links Message-ID: <200203190325.g2J3Ptd27722@wwweasel.geeksrus.net>
next in thread | raw e-mail | index | archive | help
>Number: 36077
>Category: ports
>Synopsis: devel/automake14: fix info file overlap w/automake, add libexec/automake14/* links
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Mon Mar 18 19: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: Mon Mar 11 00:59:22 EST 2002 root@wwweasel.geeksrus.net:/usr/obj/usr/src/sys/WWWEASEL i386
>Description:
The info files are the only documentation for automake and automake14. Each
port thinks it owns automake.info. This means that only the documentation for
the most recently installed automake port will survive. This is a significant
problem, since the 2 versions of automake are noticably different and so
documentation needs to be available for both.
This patch also introduces links libexec/automake14/{aclocal,automake},
pointing to bin/{aclocal,automake}14. This gives a directory that can be
added to the front of the PATH for ports which require this version of
automake, instead of having to work with nonstandard executable names.
>How-To-Repeat:
>Fix:
--8<----8<----8<----8<----8<----8<----8<----8<----8<----8<--
Index: devel/automake14/Makefile
===================================================================
RCS file: /home/alane/cvsroot/ports/devel/automake14/Makefile,v
retrieving revision 1.20
diff -u -3 -r1.20 Makefile
--- devel/automake14/Makefile 27 Oct 2001 17:09:17 -0000 1.20
+++ devel/automake14/Makefile 19 Mar 2002 03:16:39 -0000
@@ -7,6 +7,7 @@
PORTNAME= automake14
PORTVERSION= 1.4.5
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= automake
@@ -22,10 +23,19 @@
STRIP= # none
+post-patch:
+ @-${RM} ${WRKSRC}/*.info* ${WRKSRC}/*.dvi
+ ${MV} ${WRKSRC}/automake.texi ${WRKSRC}/automake14.texi
+
pre-configure:
${PERL} -pi -e "s^%%X11BASE%%^${X11BASE}^" ${WRKSRC}/aclocal.in
post-install:
- @install-info ${PREFIX}/info/automake.info ${PREFIX}/info/dir
+ @-${RM} -fr ${PREFIX}/libexec/automake14
+ ${MKDIR} ${PREFIX}/libexec/automake14
+.for i in aclocal automake
+ ${LN} -s ../../bin/${i}14 ${PREFIX}/libexec/automake14/${i}
+.endfor
+ @install-info ${PREFIX}/info/automake14.info ${PREFIX}/info/dir
.include <bsd.port.mk>
Index: devel/automake14/pkg-plist
===================================================================
RCS file: /home/alane/cvsroot/ports/devel/automake14/pkg-plist,v
retrieving revision 1.12
diff -u -3 -r1.12 pkg-plist
--- devel/automake14/pkg-plist 27 Oct 2001 17:09:17 -0000 1.12
+++ devel/automake14/pkg-plist 19 Mar 2002 03:15:27 -0000
@@ -1,8 +1,10 @@
bin/aclocal14
bin/automake14
-@unexec install-info --delete %D/info/automake.info %D/info/dir
-info/automake.info
-@exec install-info %D/info/automake.info %D/info/dir
+@unexec install-info --delete %D/info/automake14.info %D/info/dir
+info/automake14.info
+@exec install-info %D/info/automake14.info %D/info/dir
+libexec/automake14/aclocal
+libexec/automake14/automake
share/automake14/aclocal/ccstdc.m4
share/automake14/aclocal/cond.m4
share/automake14/aclocal/dmalloc.m4
@@ -77,6 +79,7 @@
share/automake14/automake/texinfo.tex
share/automake14/automake/texinfos.am
share/automake14/automake/ylwrap
+@dirrm libexec/automake14
@dirrm share/automake14/aclocal
@dirrm share/automake14/automake
@dirrm share/automake14
Index: devel/automake14/files/patch-aa
===================================================================
RCS file: /home/alane/cvsroot/ports/devel/automake14/files/patch-aa,v
retrieving revision 1.6
diff -u -3 -r1.6 patch-aa
--- devel/automake14/files/patch-aa 23 Sep 1998 16:11:40 -0000 1.6
+++ devel/automake14/files/patch-aa 19 Mar 2002 02:49:01 -0000
@@ -1,25 +1,28 @@
---- automake.texi.orig Sat Apr 4 04:04:07 1998
-+++ automake.texi Wed Sep 23 23:34:15 1998
-@@ -1,6 +1,7 @@
+--- automake.texi.orig Wed Jan 6 08:01:26 1999
++++ automake.texi Mon Mar 18 21:44:51 2002
+@@ -1,7 +1,8 @@
\input texinfo @c -*-texinfo-*-
@c %**start of header
- @setfilename automake.info
+-@setfilename automake.info
+-@settitle automake
++@setfilename automake14.info
+@dircategory Programming & development tools
- @settitle automake
++@settitle Automake14
@setchapternewpage off
@c %**end of header
+
@@ -9,12 +10,12 @@
@dircategory GNU admin
@direntry
-* automake: (automake). Making Makefile.in's
-+* Automake: (automake). Making Makefile.in's
++* Automake14: (automake14). Making Makefile.in's
@end direntry
@dircategory Individual utilities
@direntry
-* aclocal: (automake)Invoking aclocal. Generating aclocal.m4
-+* Aclocal: (automake) Invoking aclocal. Generating aclocal.m4
++* Aclocal14: (automake14) Invoking aclocal. Generating aclocal.m4
@end direntry
@ifinfo
Index: devel/automake14/files/patch-ab
===================================================================
RCS file: /home/alane/cvsroot/ports/devel/automake14/files/patch-ab,v
retrieving revision 1.6
diff -u -3 -r1.6 patch-ab
--- devel/automake14/files/patch-ab 8 Oct 2001 07:24:07 -0000 1.6
+++ devel/automake14/files/patch-ab 19 Mar 2002 02:48:38 -0000
@@ -1,6 +1,50 @@
---- Makefile.in.orig Mon May 4 10:42:08 1998
-+++ Makefile.in Mon May 4 10:42:34 1998
-@@ -204,7 +204,7 @@
+--- Makefile.in.orig Sun Jul 15 13:23:30 2001
++++ Makefile.in Mon Mar 18 21:47:17 2002
+@@ -69,7 +69,7 @@
+ SUBDIRS = . m4 tests
+
+ bin_SCRIPTS = automake aclocal
+-info_TEXINFOS = automake.texi
++info_TEXINFOS = automake14.texi
+
+ amfiles = clean-hdr.am clean-kr.am clean.am comp-vars.am compile.am data-clean.am data.am dejagnu.am depend.am depend2.am dist-vars.am footer.am header-vars.am header.am java-clean.am java.am kr-extra.am library.am libs-clean.am libs.am libtool.am lisp-clean.am lisp.am ltlib-clean.am ltlib.am ltlibrary.am mans-vars.am mans.am multilib.am program.am progs-clean.am progs.am remake-hdr.am remake.am scripts.am subdirs.am tags-clean.am tags.am texi-vers.am texinfos.am
+
+@@ -90,9 +90,9 @@
+ SCRIPTS = $(bin_SCRIPTS)
+
+ TEXI2DVI = texi2dvi
+-INFO_DEPS = automake.info
+-DVIS = automake.dvi
+-TEXINFOS = automake.texi
++INFO_DEPS = automake14.info
++DVIS = automake14.dvi
++TEXINFOS = automake14.texi
+ DATA = $(pkgdata_DATA) $(script_DATA)
+
+ DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
+@@ -149,8 +149,8 @@
+ $(srcdir)/version.texi: stamp-vti
+ @:
+
+-$(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
+ @echo "@set EDITION $(VERSION)" >> vti.tmp
+ @echo "@set VERSION $(VERSION)" >> vti.tmp
+ @cmp -s vti.tmp $(srcdir)/version.texi \
+@@ -169,8 +169,8 @@
+ maintainer-clean-vti:
+ -rm -f $(srcdir)/stamp-vti $(srcdir)/version.texi
+
+-automake.info: automake.texi version.texi
+-automake.dvi: automake.texi version.texi
++automake14.info: automake14.texi version.texi
++automake14.dvi: automake14.texi version.texi
+
+
+ DVIPS = dvips
+@@ -178,7 +178,7 @@
.texi.info:
@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
cd $(srcdir) \
@@ -8,4 +52,13 @@
+ && $(MAKEINFO) --no-split `echo $< | sed 's,.*/,,'`
.texi.dvi:
- TEXINPUTS=$(srcdir):$$TEXINPUTS \
+ TEXINPUTS=.:$$TEXINPUTS \
+@@ -269,7 +269,7 @@
+ done
+
+ 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.log automake.pg automake.toc automake.tp \
+ automake.tps automake.vr automake.vrs automake.op automake.tr \
--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?200203190325.g2J3Ptd27722>