From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Jul 9 01:24:06 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6953B37B401 for ; Wed, 9 Jul 2003 01:24:06 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 15E1243F85 for ; Wed, 9 Jul 2003 01:22:45 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h698LOUp026273 for ; Wed, 9 Jul 2003 01:21:24 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h698LOKt026272; Wed, 9 Jul 2003 01:21:24 -0700 (PDT) Resent-Date: Wed, 9 Jul 2003 01:21:24 -0700 (PDT) Resent-Message-Id: <200307090821.h698LOKt026272@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Rui Lopes Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 46C2A37B401 for ; Wed, 9 Jul 2003 01:15:09 -0700 (PDT) Received: from ns.webtt.biz (ns.webtt.biz [64.239.29.225]) by mx1.FreeBSD.org (Postfix) with SMTP id BB1C743F3F for ; Wed, 9 Jul 2003 01:15:07 -0700 (PDT) (envelope-from root@ns.webtt.biz) Received: (qmail 21557 invoked by uid 0); 9 Jul 2003 08:17:24 -0000 Message-Id: <20030709081724.21556.qmail@ns.webtt.biz> Date: 9 Jul 2003 08:17:24 -0000 From: Rui Lopes To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: ade@FreeBSD.org Subject: ports/54250: [PATCH] for devel/automake17 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Rui Lopes List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jul 2003 08:24:06 -0000 >Number: 54250 >Category: ports >Synopsis: [PATCH] for devel/automake17 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Jul 09 01:20:04 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Rui Lopes >Release: FreeBSD 5.1-RELEASE i386 >Organization: >Environment: System: FreeBSD disty 5.1-RELEASE FreeBSD 5.1-RELEASE #0: Fri Jun 6 19:30:44 WEST 2003 root@disty:/usr/obj/usr/src/sys/DEBUGGER i386 >Description: * versioned aclocal directory should be added to aclocal search dir; * add X11BASE/share/aclocal directory to aclocal search dir, and only add it if user didn't change acdir; * removed REINPLACE from Makefile since this is already done in patch files. >How-To-Repeat: >Fix: --- automake17.patch begins here --- # * versioned aclocal directory should be added to aclocal search dir; # * add X11BASE/share/aclocal directory to aclocal search dir, and only # add it if user didn't change acdir; # * removed REINPLACE from Makefile since this is already done in patch # files. # -- Rui Lopes diff -ruN automake17.orig/Makefile automake17/Makefile --- automake17.orig/Makefile Tue Jul 8 12:28:30 2003 +++ automake17/Makefile Tue Jul 8 14:22:00 2003 @@ -7,7 +7,7 @@ PORTNAME= automake PORTVERSION= 1.7.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= automake @@ -25,10 +25,10 @@ USE_BZIP2= yes USE_PERL5= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= AUTOCONF=autoconf257 AUTOHEADER=autoheader257 MAKEINFO=makeinfo +CONFIGURE_ENV= AUTOCONF=autoconf257 AUTOHEADER=autoheader257 \ + MAKEINFO=makeinfo X11BASE=${X11BASE} CONFIGURE_ARGS= --program-suffix=${BUILD_VERSION} CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -USE_REINPLACE= yes .if defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER) pre-everything:: @@ -43,9 +43,6 @@ post-patch: @(cd ${WRKSRC} && \ ${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 \ - ) + ${MV} automake.texi automake${BUILD_VERSION}.texi) .include diff -ruN automake17.orig/files/patch-Makefile.in automake17/files/patch-Makefile.in --- automake17.orig/files/patch-Makefile.in Tue Jul 8 12:28:30 2003 +++ automake17/files/patch-Makefile.in Tue Jul 8 13:27:02 2003 @@ -1,39 +1,70 @@ ---- Makefile.in.orig Sun May 18 07:21:29 2003 -+++ Makefile.in Sun Jun 29 04:06:13 2003 -@@ -40,2 +40,3 @@ +--- Makefile.in.orig Sun May 18 08:21:29 2003 ++++ Makefile.in Tue Jul 8 13:26:19 2003 +@@ -38,6 +38,8 @@ + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ APIVERSION = @APIVERSION@ +APIPVERSION = @APIPVERSION@ ++X11BASE = @X11BASE@ AUTOCONF = @AUTOCONF@ -@@ -99,3 +100,3 @@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ +@@ -97,7 +99,7 @@ + SUBDIRS = . m4 lib tests + bin_SCRIPTS = automake aclocal -info_TEXINFOS = automake.texi +info_TEXINFOS = automake${APIPVERSION}.texi -@@ -110,3 +111,3 @@ + CLEANFILES = $(bin_SCRIPTS) + AUTOMAKESOURCES = automake.in aclocal.in +@@ -106,9 +108,9 @@ + + # The following requires a fixed version of the Emacs 19.30 etags. + ETAGS_ARGS = --lang=none \ +- --regex='/^@node[ \t]+\([^,]+\)/\1/' $(srcdir)/automake.texi ++ --regex='/^@node[ \t]+\([^,]+\)/\1/' $(srcdir)/automake17.texi -TAGS_DEPENDENCIES = automake.texi +TAGS_DEPENDENCIES = automake${APIPVERSION}.texi -@@ -121,2 +122,3 @@ + EXTRA_DIST = ChangeLog.96 ChangeLog.98 ChangeLog.00 ChangeLog.01 \ + $(AUTOMAKESOURCES) +@@ -119,6 +121,8 @@ + -e 's,[@]PACKAGE[@],$(PACKAGE),g' \ + -e 's,[@]VERSION[@],$(VERSION),g' \ -e 's,[@]APIVERSION[@],$(APIVERSION),g' \ + -e 's,[@]APIPVERSION[@],$(APIPVERSION),g' \ ++ -e 's,[@]X11BASE[@],$(X11BASE),g' \ -e 's,[@]SHELL[@],$(SHELL),g' -@@ -143,3 +145,3 @@ + + +@@ -141,11 +145,11 @@ + DIST_SOURCES = + TEXINFO_TEX = $(top_srcdir)/lib/texinfo.tex am__TEXINFO_TEX_DIR = $(top_srcdir)/lib -INFO_DEPS = automake.info +INFO_DEPS = automake${APIPVERSION}.info DVIS = automake.dvi -@@ -147,3 +149,3 @@ + PDFS = automake.pdf PSS = automake.ps -TEXINFOS = automake.texi +TEXINFOS = automake${APIPVERSION}.texi -@@ -202,3 +204,3 @@ + RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ + ps-recursive install-info-recursive uninstall-info-recursive \ +@@ -200,7 +204,7 @@ + .texi.info: + @rm -f $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9] $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ - -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + --no-split -o $@ `test -f '$<' || echo '$(srcdir)/'`$< -@@ -213,9 +215,10 @@ + .texi.dvi: + TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ +@@ -211,13 +215,14 @@ + TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ + MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \ $(TEXI2PDF) `test -f '$<' || echo '$(srcdir)/'`$< -automake.info: automake.texi version.texi -automake.dvi: automake.texi version.texi @@ -50,7 +81,11 @@ + @(dir=.; test -f ./automake${APIPVERSION}.texi || dir=$(srcdir); \ + set `$(SHELL) $(top_srcdir)/lib/mdate-sh $$dir/automake${APIPVERSION}.texi`; \ echo "@set UPDATED $$1 $$2 $$3"; \ -@@ -678,16 +681,4 @@ + echo "@set UPDATED-MONTH $$2 $$3"; \ + echo "@set EDITION $(VERSION)"; \ +@@ -676,20 +681,8 @@ + + install-exec-hook: @$(POST_INSTALL) - @for p in $(bin_SCRIPTS); do \ - f="`echo $$p|sed '$(transform)'`"; \ @@ -67,3 +102,5 @@ - rm -f $(DESTDIR)$(bindir)/$$fv; \ - done + automake: automake.in Makefile + $(do_subst) < $(srcdir)/automake.in > automake diff -ruN automake17.orig/files/patch-aclocal.in automake17/files/patch-aclocal.in --- automake17.orig/files/patch-aclocal.in Tue Jul 8 12:28:30 2003 +++ automake17/files/patch-aclocal.in Tue Jul 8 14:10:02 2003 @@ -1,5 +1,5 @@ ---- aclocal.in.orig Sat Oct 12 23:14:57 2002 -+++ aclocal.in Thu Feb 13 14:57:16 2003 +--- aclocal.in.orig Sat Oct 12 22:14:57 2002 ++++ aclocal.in Tue Jul 8 14:08:38 2003 @@ -29,7 +29,7 @@ BEGIN @@ -9,31 +9,31 @@ unshift @INC, $perllibdir; } -@@ -42,8 +42,9 @@ - $PACKAGE = '@PACKAGE@'; - # Note that this isn't pkgdatadir, but a separate directory. +@@ -44,6 +44,7 @@ # Note also that the versioned directory is handled later. --$acdir = '@datadir@/aclocal'; -+$acdir = '@datadir@/aclocal@APIPVERSION@'; + $acdir = '@datadir@/aclocal'; $default_acdir = $acdir; -+$acdir_x11 = '%%X11BASE%%/share/aclocal'; ++$acdir_x11 = '@X11BASE@/share/aclocal'; # contains a list of directories, one per line, to be added # to the dirlist in addition to $acdir, as if -I had been # added to the command line. If acdir has been redirected, -@@ -188,11 +189,7 @@ - $default_dirlist="$acdir/dirlist" - if $acdir ne $default_acdir; - -- # Search the versioned directory near the end, and then the -- # unversioned directory last. Only do this if the user didn't -- # override acdir. +@@ -191,9 +192,14 @@ + # 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; -+ unshift @dirlist, $acdir_x11 if -d "$acdir_x11/."; ++ push (@dirlist, "${acdir}@APIPVERSION@") + if $acdir eq $default_acdir; ++ # Search X11 directory. Only do this if the user didn't override ++ # acdir. ++ push (@dirlist, $acdir_x11) ++ unless $acdir eq $default_acdir && ! -d $acdir_x11; ++ # By default $(datadir)/aclocal doesn't exist. We don't want to # get an error in the case where we are searching the default -@@ -290,12 +287,13 @@ + # directory and it hasn't been created. +@@ -290,12 +296,13 @@ $file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4'); } @@ -48,7 +48,7 @@ foreach $file (sort grep (! /^\./, readdir (DIR))) { # Only examine .m4 files. -@@ -305,6 +303,12 @@ +@@ -305,6 +312,12 @@ next if $file eq 'aclocal.m4'; $fullfile = $m4dir . '/' . $file; diff -ruN automake17.orig/files/patch-configure automake17/files/patch-configure --- automake17.orig/files/patch-configure Tue Jul 8 12:28:30 2003 +++ automake17/files/patch-configure Tue Jul 8 13:30:55 2003 @@ -1,20 +1,33 @@ ---- configure.orig Sun May 18 07:22:17 2003 -+++ configure Sun Jun 29 03:35:27 2003 -@@ -275,3 +275,3 @@ +--- configure.orig Sun May 18 08:22:17 2003 ++++ configure Tue Jul 8 13:30:10 2003 +@@ -273,7 +273,7 @@ + PACKAGE_BUGREPORT='bug-automake@gnu.org' + ac_unique_file="automake.in" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot APIVERSION pkgvdatadir PERL TEX LN EGREP FGREP LIBOBJS LTLIBOBJS' -+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot APIPVERSION APIVERSION pkgvdatadir PERL TEX LN EGREP FGREP LIBOBJS LTLIBOBJS' ++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot APIPVERSION X11BASE APIVERSION pkgvdatadir PERL TEX LN EGREP FGREP LIBOBJS LTLIBOBJS' ac_subst_files='' -@@ -1622,2 +1622,3 @@ + + # Initialize some variables set by options. +@@ -1620,10 +1620,11 @@ + # * Prereleases on the trunk are all incompatible -- 1.5b and 1.5c + # aren't the same. 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/'` -@@ -1625,3 +1626,3 @@ + # A versioned directory, defined here for convenience. -pkgvdatadir="\${datadir}/automake-${APIVERSION}" +pkgvdatadir="\${datadir}/automake${APIPVERSION}" -@@ -2460,2 +2461,3 @@ + + # $AUTOMAKE and $ACLOCAL are always run after a `cd $top_srcdir', +@@ -2458,6 +2459,8 @@ + s,@SET_MAKE@,$SET_MAKE,;t t + s,@am__leading_dot@,$am__leading_dot,;t t s,@APIVERSION@,$APIVERSION,;t t +s,@APIPVERSION@,$APIPVERSION,;t t ++s,@X11BASE@,$X11BASE,;t t s,@pkgvdatadir@,$pkgvdatadir,;t t + s,@PERL@,$PERL,;t t + s,@TEX@,$TEX,;t t --- automake17.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: