From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Jun 11 19:20:08 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 5054437B401 for ; Wed, 11 Jun 2003 19:20:08 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2825A43FB1 for ; Wed, 11 Jun 2003 19:20:06 -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 h5C2K6Up039737 for ; Wed, 11 Jun 2003 19:20:06 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h5C2K5Wh039736; Wed, 11 Jun 2003 19:20:05 -0700 (PDT) Resent-Date: Wed, 11 Jun 2003 19:20:05 -0700 (PDT) Resent-Message-Id: <200306120220.h5C2K5Wh039736@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 6245237B401 for ; Wed, 11 Jun 2003 19:12:44 -0700 (PDT) Received: from ns.webtt.biz (ns.webtt.biz [64.239.29.225]) by mx1.FreeBSD.org (Postfix) with SMTP id 648CA43FBD for ; Wed, 11 Jun 2003 19:12:43 -0700 (PDT) (envelope-from root@ns.webtt.biz) Received: (qmail 42643 invoked by uid 0); 12 Jun 2003 02:15:03 -0000 Message-Id: <20030612021503.42642.qmail@ns.webtt.biz> Date: 12 Jun 2003 02:15:03 -0000 From: Rui Lopes To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: ade@FreeBSD.org Subject: ports/53236: [PATCH] to devel/autoconf257 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: Thu, 12 Jun 2003 02:20:08 -0000 >Number: 53236 >Category: ports >Synopsis: [PATCH] to devel/autoconf257 >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 Jun 11 19:20:05 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: Patch for making autoconf257 port build. I did not have the time for fixing the .info file. sorry. >How-To-Repeat: >Fix: --- autoconf257-1.diff begins here --- diff -ruN autoconf257.orig/Makefile autoconf257/Makefile --- autoconf257.orig/Makefile Sun Jun 1 20:31:04 2003 +++ autoconf257/Makefile Sun Jun 1 21:15:18 2003 @@ -20,16 +20,20 @@ help2man:${PORTSDIR}/misc/help2man RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 -BROKEN= Work is in progress right now. - USE_BZIP2= yes USE_GMAKE= yes USE_PERL5= yes +USE_REINPLACE= yes +MAN1_PAGES= autoconf autom4te autoscan config.guess ifnames autoheader \ + autoreconf autoupdate config.sub +MAN1= ${MAN1_PAGES:S/$/${PROGRAM_SUFFIX}.1/g} +PROGRAM_SUFFIX= 257 GNU_CONFIGURE= yes CONFIGURE_ENV+= CONFIG_SHELL=${SH} CONFIGURE_ENV+= M4=${LOCALBASE}/bin/gm4 -CONFIGURE_ARGS= --program-suffix=257 +CONFIGURE_ARGS= --program-suffix=${PROGRAM_SUFFIX} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} .if ${PORTNAME} == "autoconf" .if exists(${LOCALBASE}/bin/emacs) @@ -59,12 +63,23 @@ @${FALSE} .endif # defined(USE_AUTOCONF) || defined(USE_AUTOCONF_VER) +post-patch: + @(cd ${WRKSRC} && ${REINPLACE_CMD} -E 's,(PACKAGE=autoconf),\1${PROGRAM_SUFFIX},' configure) + @(cd ${WRKSRC}/man && \ + for file in *.[1x]; do \ + ${REINPLACE_CMD} -E 's,([^-]auto)(conf|make|reconf|update|header|scan),\1\2${PROGRAM_SUFFIX},g ; \ + s,(config\.guess|config\.sub|ifnames),\1${PROGRAM_SUFFIX},g' $$file ; \ + done) + @(cd ${WRKSRC}/doc && \ + ${RM} -f *.info && \ + ${MV} autoconf.texi autoconf${PROGRAM_SUFFIX}.texi && \ + ${MV} standards.texi standards${PROGRAM_SUFFIX}.texi && \ + ${REINPLACE_CMD} -E 's,(autoconf)\),\1${PROGRAM_SUFFIX}\),g' autoconf${PROGRAM_SUFFIX}.texi && \ + ${REINPLACE_CMD} -E 's,(autoconf|standards)\.(info|texi),\1${PROGRAM_SUFFIX}\.\2,g' Makefile.in) + post-install: - ${MKDIR} ${PREFIX}/share/autoconf257 .for FILE in ${GENERIC_TOOLS} - ${INSTALL_SCRIPT} ${WRKSRC}/config/${FILE} ${PREFIX}/share/autoconf257 + ${INSTALL_SCRIPT} ${WRKSRC}/config/${FILE} ${PREFIX}/share/autoconf${PROGRAM_SUFFIX} .endfor -.include -#.include "${FILESDIR}/manpages.mk" -.include +.include diff -ruN autoconf257.orig/files/patch-autoconf.texi autoconf257/files/patch-autoconf.texi --- autoconf257.orig/files/patch-autoconf.texi Thu Jan 1 01:00:00 1970 +++ autoconf257/files/patch-autoconf.texi Sun Jun 1 21:17:59 2003 @@ -0,0 +1,23 @@ +--- doc/autoconf.texi.orig Tue Dec 3 07:16:32 2002 ++++ doc/autoconf.texi Sun Jun 1 19:17:51 2003 +@@ -1,9 +1,9 @@ + \input texinfo @c -*-texinfo-*- + @comment ======================================================== + @comment %**start of header +-@setfilename autoconf.info ++@setfilename autoconf257.info + @include version.texi +-@settitle Autoconf ++@settitle Autoconf257 + @setchapternewpage odd + @setcontentsaftertitlepage + @finalout +@@ -97,7 +97,7 @@ + + @dircategory GNU programming tools + @direntry +-* Autoconf: (autoconf). Create source code configuration scripts ++* Autoconf257: (autoconf257). Create source code configuration scripts + @end direntry + + @dircategory Individual utilities diff -ruN autoconf257.orig/files/patch-standards.texi autoconf257/files/patch-standards.texi --- autoconf257.orig/files/patch-standards.texi Thu Jan 1 01:00:00 1970 +++ autoconf257/files/patch-standards.texi Sun Jun 1 20:32:47 2003 @@ -0,0 +1,19 @@ +--- doc/standards.texi.orig Sun Jun 1 18:52:56 2003 ++++ doc/standards.texi Sun Jun 1 18:54:00 2003 +@@ -1,6 +1,6 @@ + \input texinfo @c -*-texinfo-*- + @c %**start of header +-@setfilename standards.info ++@setfilename standards257.info + @settitle GNU Coding Standards + @c This date is automagically updated when you save this file: + @set lastupdate November 23, 2002 +@@ -8,7 +8,7 @@ + + @dircategory GNU organization + @direntry +-* Standards: (standards). GNU coding standards. ++* Standards257: (standards257). GNU coding standards. + @end direntry + + @c @setchapternewpage odd diff -ruN autoconf257.orig/pkg-plist autoconf257/pkg-plist --- autoconf257.orig/pkg-plist Sun Jun 1 20:31:04 2003 +++ autoconf257/pkg-plist Sun Jun 1 20:33:17 2003 @@ -5,9 +5,12 @@ bin/autoscan257 bin/autoupdate257 bin/ifnames257 -info/autoconf.info -info/dir -info/standards.info +@unexec install-info --delete %D/info/autoconf257.info %D/info/dir +@unexec install-info --delete %D/info/standards257.info %D/info/dir +info/autoconf257.info +info/standards257.info +@exec install-info %D/info/autoconf257.info %D/info/dir +@exec install-info %D/info/standards257.info %D/info/dir share/autoconf257/Autom4te/General.pm share/autoconf257/Autom4te/Struct.pm share/autoconf257/Autom4te/XFile.pm @@ -53,4 +56,3 @@ @dirrm share/autoconf257/autoconf @dirrm share/autoconf257/Autom4te @dirrm share/autoconf257 -@dirrm info --- autoconf257-1.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: