Skip site navigation (1)Skip section navigation (2)
Date:      12 Jun 2003 02:15:03 -0000
From:      Rui Lopes <rui@ruilopes.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        ade@FreeBSD.org
Subject:   ports/53236: [PATCH] to devel/autoconf257
Message-ID:  <20030612021503.42642.qmail@ns.webtt.biz>
Resent-Message-ID: <200306120220.h5C2K5Wh039736@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>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 <bsd.port.pre.mk>
-#.include "${FILESDIR}/manpages.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
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:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030612021503.42642.qmail>