Attachment #32990 for bug #54250

View | Details | Raw Unified | Return to bug 54250
Collapse All | Expand All





PORTNAME=	automake
PORTVERSION=	1.7.5
PORTREVISION=	2
CATEGORIES=	devel
MASTER_SITES=	${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR=	automake

USE_BZIP2=	yes
USE_PERL5=	yes
GNU_CONFIGURE=	yes
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::

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 \
	)

.include <bsd.port.mk>

Lines 1-39 Link Here

(-)automake17/files/patch-Makefile.in (-11 / +48 lines)
1	--- Makefile.in.orig Sun May 18 07:21:29 2003	1	--- Makefile.in.orig Sun May 18 08:21:29 2003
2	+++ Makefile.in Sun Jun 29 04:06:13 2003	2	+++ Makefile.in Tue Jul 8 13:26:19 2003
3	@@ -40,2 +40,3 @@	3	@@ -38,6 +38,8 @@
		4	ACLOCAL = @ACLOCAL@
		5	AMTAR = @AMTAR@
4	APIVERSION = @APIVERSION@	6	APIVERSION = @APIVERSION@
5	+APIPVERSION = @APIPVERSION@	7	+APIPVERSION = @APIPVERSION@
		8	+X11BASE = @X11BASE@
6	AUTOCONF = @AUTOCONF@	9	AUTOCONF = @AUTOCONF@
7	@@ -99,3 +100,3 @@	10	AUTOHEADER = @AUTOHEADER@
		11	AUTOMAKE = @AUTOMAKE@
		12	@@ -97,7 +99,7 @@
		13	SUBDIRS = . m4 lib tests
		14
8	bin_SCRIPTS = automake aclocal	15	bin_SCRIPTS = automake aclocal
9	-info_TEXINFOS = automake.texi	16	-info_TEXINFOS = automake.texi
10	+info_TEXINFOS = automake${APIPVERSION}.texi	17	+info_TEXINFOS = automake${APIPVERSION}.texi
11		18
12	@@ -110,3 +111,3 @@	19	CLEANFILES = $(bin_SCRIPTS)
		20	AUTOMAKESOURCES = automake.in aclocal.in
		21	@@ -106,9 +108,9 @@
		22
		23	# The following requires a fixed version of the Emacs 19.30 etags.
		24	ETAGS_ARGS = --lang=none \
		25	- --regex='/^@node[ \t]+$[^,]+$/\1/' $(srcdir)/automake.texi
		26	+ --regex='/^@node[ \t]+$[^,]+$/\1/' $(srcdir)/automake17.texi
13		27
14	-TAGS_DEPENDENCIES = automake.texi	28	-TAGS_DEPENDENCIES = automake.texi
15	+TAGS_DEPENDENCIES = automake${APIPVERSION}.texi	29	+TAGS_DEPENDENCIES = automake${APIPVERSION}.texi
16		30
17	@@ -121,2 +122,3 @@	31	EXTRA_DIST = ChangeLog.96 ChangeLog.98 ChangeLog.00 ChangeLog.01 \
		32	$(AUTOMAKESOURCES)
		33	@@ -119,6 +121,8 @@
		34	-e 's,[@]PACKAGE[@],$(PACKAGE),g' \
		35	-e 's,[@]VERSION[@],$(VERSION),g' \
18	-e 's,[@]APIVERSION[@],$(APIVERSION),g' \	36	-e 's,[@]APIVERSION[@],$(APIVERSION),g' \
19	+ -e 's,[@]APIPVERSION[@],$(APIPVERSION),g' \	37	+ -e 's,[@]APIPVERSION[@],$(APIPVERSION),g' \
		38	+ -e 's,[@]X11BASE[@],$(X11BASE),g' \
20	-e 's,[@]SHELL[@],$(SHELL),g'	39	-e 's,[@]SHELL[@],$(SHELL),g'
21	@@ -143,3 +145,3 @@	40
		41
		42	@@ -141,11 +145,11 @@
		43	DIST_SOURCES =
		44	TEXINFO_TEX = $(top_srcdir)/lib/texinfo.tex
22	am__TEXINFO_TEX_DIR = $(top_srcdir)/lib	45	am__TEXINFO_TEX_DIR = $(top_srcdir)/lib
23	-INFO_DEPS = automake.info	46	-INFO_DEPS = automake.info
24	+INFO_DEPS = automake${APIPVERSION}.info	47	+INFO_DEPS = automake${APIPVERSION}.info
25	DVIS = automake.dvi	48	DVIS = automake.dvi
26	@@ -147,3 +149,3 @@	49	PDFS = automake.pdf
27	PSS = automake.ps	50	PSS = automake.ps
28	-TEXINFOS = automake.texi	51	-TEXINFOS = automake.texi
29	+TEXINFOS = automake${APIPVERSION}.texi	52	+TEXINFOS = automake${APIPVERSION}.texi
30		53
31	@@ -202,3 +204,3 @@	54	RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
		55	ps-recursive install-info-recursive uninstall-info-recursive \
		56	@@ -200,7 +204,7 @@
		57	.texi.info:
		58	@rm -f $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]
32	$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \	59	$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
33	- -o $@ `test -f '$<' \|\| echo '$(srcdir)/'`$<	60	- -o $@ `test -f '$<' \|\| echo '$(srcdir)/'`$<
34	+ --no-split -o $@ `test -f '$<' \|\| echo '$(srcdir)/'`$<	61	+ --no-split -o $@ `test -f '$<' \|\| echo '$(srcdir)/'`$<
35		62
36	@@ -213,9 +215,10 @@	63	.texi.dvi:
		64	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
		65	@@ -211,13 +215,14 @@
		66	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
		67	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
37	$(TEXI2PDF) `test -f '$<' \|\| echo '$(srcdir)/'`$<	68	$(TEXI2PDF) `test -f '$<' \|\| echo '$(srcdir)/'`$<
38	-automake.info: automake.texi version.texi	69	-automake.info: automake.texi version.texi
39	-automake.dvi: automake.texi version.texi	70	-automake.dvi: automake.texi version.texi
Lines 50-56 Link Here
50	+ @(dir=.; test -f ./automake${APIPVERSION}.texi \|\| dir=$(srcdir); \	81	+ @(dir=.; test -f ./automake${APIPVERSION}.texi \|\| dir=$(srcdir); \
51	+ set `$(SHELL) $(top_srcdir)/lib/mdate-sh $$dir/automake${APIPVERSION}.texi`; \	82	+ set `$(SHELL) $(top_srcdir)/lib/mdate-sh $$dir/automake${APIPVERSION}.texi`; \
52	echo "@set UPDATED $$1 $$2 $$3"; \	83	echo "@set UPDATED $$1 $$2 $$3"; \
53	@@ -678,16 +681,4 @@	84	echo "@set UPDATED-MONTH $$2 $$3"; \
		85	echo "@set EDITION $(VERSION)"; \
		86	@@ -676,20 +681,8 @@
		87
		88	install-exec-hook:
54	@$(POST_INSTALL)	89	@$(POST_INSTALL)
55	- @for p in $(bin_SCRIPTS); do \	90	- @for p in $(bin_SCRIPTS); do \
56	- f="`echo $$p\|sed '$(transform)'`"; \	91	- f="`echo $$p\|sed '$(transform)'`"; \
Lines 67-69 Link Here
67	- rm -f $(DESTDIR)$(bindir)/$$fv; \	102	- rm -f $(DESTDIR)$(bindir)/$$fv; \
68	- done	103	- done
69		104
		105	automake: automake.in Makefile
		106	$(do_subst) < $(srcdir)/automake.in > automake




--- aclocal.in.orig	Sat Oct 12 22:14:57 2002
+++ aclocal.in	Tue Jul  8 14:08:38 2003
@@ -29,7 +29,7 @@
 
 BEGIN

   unshift @INC, $perllibdir;
 }
 
@@ -44,6 +44,7 @@
 $PACKAGE = '@PACKAGE@';
 # Note that this isn't pkgdatadir, but a separate directory.
 # Note also that the versioned directory is handled later.
 $acdir = '@datadir@/aclocal';
+$acdir = '@datadir@/aclocal@APIPVERSION@';
 $default_acdir = $acdir;
+$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,
@@ -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.
-    # 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")
+    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
     # directory and it hasn't been created.
@@ -290,12 +296,13 @@
 	$file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4');
     }
 

 	foreach $file (sort grep (! /^\./, readdir (DIR)))
 	{
 	    # Only examine .m4 files.
@@ -305,6 +312,12 @@
 	    next if $file eq 'aclocal.m4';
 
 	    $fullfile = $m4dir . '/' . $file;

Lines 1-20 Link Here

(-)automake17/files/patch-configure (-7 / +20 lines)
1	--- configure.orig Sun May 18 07:22:17 2003	1	--- configure.orig Sun May 18 08:22:17 2003
2	+++ configure Sun Jun 29 03:35:27 2003	2	+++ configure Tue Jul 8 13:30:10 2003
3	@@ -275,3 +275,3 @@	3	@@ -273,7 +273,7 @@
		4	PACKAGE_BUGREPORT='bug-automake@gnu.org'
		5
4	ac_unique_file="automake.in"	6	ac_unique_file="automake.in"
5	-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'	7	-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'
6	+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'	8	+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'
7	ac_subst_files=''	9	ac_subst_files=''
8	@@ -1622,2 +1622,3 @@	10
		11	# Initialize some variables set by options.
		12	@@ -1620,10 +1620,11 @@
		13	# * Prereleases on the trunk are all incompatible -- 1.5b and 1.5c
		14	# aren't the same.
9	APIVERSION=`echo "$VERSION" \| sed -e 's/^$[0-9]\.[0-9][a-z]$.$/\1/'`	15	APIVERSION=`echo "$VERSION" \| sed -e 's/^$[0-9]\.[0-9][a-z]$.$/\1/'`
10	+APIPVERSION=`echo "$VERSION" \| sed -e 's/^$[0-9]$\.$[0-9][a-z]$.$/\1\2/'`	16	+APIPVERSION=`echo "$VERSION" \| sed -e 's/^$[0-9]$\.$[0-9][a-z]$.$/\1\2/'`
11		17
12	@@ -1625,3 +1626,3 @@	18
13	# A versioned directory, defined here for convenience.	19	# A versioned directory, defined here for convenience.
14	-pkgvdatadir="\${datadir}/automake-${APIVERSION}"	20	-pkgvdatadir="\${datadir}/automake-${APIVERSION}"
15	+pkgvdatadir="\${datadir}/automake${APIPVERSION}"	21	+pkgvdatadir="\${datadir}/automake${APIPVERSION}"
16		22
17	@@ -2460,2 +2461,3 @@	23
		24	# $AUTOMAKE and $ACLOCAL are always run after a `cd $top_srcdir',
		25	@@ -2458,6 +2459,8 @@
		26	s,@SET_MAKE@,$SET_MAKE,;t t
		27	s,@am__leading_dot@,$am__leading_dot,;t t
18	s,@APIVERSION@,$APIVERSION,;t t	28	s,@APIVERSION@,$APIVERSION,;t t
19	+s,@APIPVERSION@,$APIPVERSION,;t t	29	+s,@APIPVERSION@,$APIPVERSION,;t t
		30	+s,@X11BASE@,$X11BASE,;t t
20	s,@pkgvdatadir@,$pkgvdatadir,;t t	31	s,@pkgvdatadir@,$pkgvdatadir,;t t
		32	s,@PERL@,$PERL,;t t
		33	s,@TEX@,$TEX,;t t

Return to bug 54250

Lines 7-13 Link Here

(-)automake17/Makefile (-7 / +4 lines)
7		7
8	PORTNAME= automake	8	PORTNAME= automake
9	PORTVERSION= 1.7.5	9	PORTVERSION= 1.7.5
10	PORTREVISION= 1	10	PORTREVISION= 2
11	CATEGORIES= devel	11	CATEGORIES= devel
12	MASTER_SITES= ${MASTER_SITE_GNU}	12	MASTER_SITES= ${MASTER_SITE_GNU}
13	MASTER_SITE_SUBDIR= automake	13	MASTER_SITE_SUBDIR= automake
Lines 25-34 Link Here
25	USE_BZIP2= yes	25	USE_BZIP2= yes
26	USE_PERL5= yes	26	USE_PERL5= yes
27	GNU_CONFIGURE= yes	27	GNU_CONFIGURE= yes
28	CONFIGURE_ENV= AUTOCONF=autoconf257 AUTOHEADER=autoheader257 MAKEINFO=makeinfo	28	CONFIGURE_ENV= AUTOCONF=autoconf257 AUTOHEADER=autoheader257 \
		29	MAKEINFO=makeinfo X11BASE=${X11BASE}
29	CONFIGURE_ARGS= --program-suffix=${BUILD_VERSION}	30	CONFIGURE_ARGS= --program-suffix=${BUILD_VERSION}
30	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}	31	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
31	USE_REINPLACE= yes
32		32
33	.if defined(USE_AUTOMAKE) \|\| defined(USE_AUTOMAKE_VER)	33	.if defined(USE_AUTOMAKE) \|\| defined(USE_AUTOMAKE_VER)
34	pre-everything::	34	pre-everything::
Lines 43-51 Link Here
43	post-patch:	43	post-patch:
44	@(cd ${WRKSRC} && \	44	@(cd ${WRKSRC} && \
45	${RM} -f *.info && \	45	${RM} -f *.info && \
46	${MV} automake.texi automake${BUILD_VERSION}.texi && \	46	${MV} automake.texi automake${BUILD_VERSION}.texi)
47	${REINPLACE_CMD} -E 's,(automake)\.(info),\1${BUILD_VERSION}\.\2,g' automake${BUILD_VERSION}.texi && \
48	${REINPLACE_CMD} -E 's,(automake)\.(info\|texi),\1${BUILD_VERSION}\.\2,g' Makefile.in \
49	)
50		47
51	.include <bsd.port.mk>	48	.include <bsd.port.mk>

Lines 1-5 Link Here

(-)automake17/files/patch-aclocal.in (-19 / +19 lines)
1	--- aclocal.in.orig Sat Oct 12 23:14:57 2002	1	--- aclocal.in.orig Sat Oct 12 22:14:57 2002
2	+++ aclocal.in Thu Feb 13 14:57:16 2003	2	+++ aclocal.in Tue Jul 8 14:08:38 2003
3	@@ -29,7 +29,7 @@	3	@@ -29,7 +29,7 @@
4		4
5	BEGIN	5	BEGIN
Lines 9-39 Link Here
9	unshift @INC, $perllibdir;	9	unshift @INC, $perllibdir;
10	}	10	}
11		11
12	@@ -42,8 +42,9 @@	12	@@ -44,6 +44,7 @@
13	$PACKAGE = '@PACKAGE@';
14	# Note that this isn't pkgdatadir, but a separate directory.
15	# Note also that the versioned directory is handled later.	13	# Note also that the versioned directory is handled later.
16	-$acdir = '@datadir@/aclocal';	14	$acdir = '@datadir@/aclocal';
17	+$acdir = '@datadir@/aclocal@APIPVERSION@';
18	$default_acdir = $acdir;	15	$default_acdir = $acdir;
19	+$acdir_x11 = '%%X11BASE%%/share/aclocal';	16	+$acdir_x11 = '@X11BASE@/share/aclocal';
20	# contains a list of directories, one per line, to be added	17	# contains a list of directories, one per line, to be added
21	# to the dirlist in addition to $acdir, as if -I had been	18	# to the dirlist in addition to $acdir, as if -I had been
22	# added to the command line. If acdir has been redirected,	19	# added to the command line. If acdir has been redirected,
23	@@ -188,11 +189,7 @@	20	@@ -191,9 +192,14 @@
24	$default_dirlist="$acdir/dirlist"	21	# Search the versioned directory near the end, and then the
25	if $acdir ne $default_acdir;	22	# unversioned directory last. Only do this if the user didn't
26		23	# override acdir.
27	- # Search the versioned directory near the end, and then the
28	- # unversioned directory last. Only do this if the user didn't
29	- # override acdir.
30	- push (@dirlist, "$acdir-$APIVERSION")	24	- push (@dirlist, "$acdir-$APIVERSION")
31	- if $acdir eq $default_acdir;	25	+ push (@dirlist, "${acdir}@APIPVERSION@")
32	+ unshift @dirlist, $acdir_x11 if -d "$acdir_x11/.";	26	if $acdir eq $default_acdir;
33		27
		28	+ # Search X11 directory. Only do this if the user didn't override
		29	+ # acdir.
		30	+ push (@dirlist, $acdir_x11)
		31	+ unless $acdir eq $default_acdir && ! -d $acdir_x11;
		32	+
34	# By default $(datadir)/aclocal doesn't exist. We don't want to	33	# By default $(datadir)/aclocal doesn't exist. We don't want to
35	# get an error in the case where we are searching the default	34	# get an error in the case where we are searching the default
36	@@ -290,12 +287,13 @@	35	# directory and it hasn't been created.
		36	@@ -290,12 +296,13 @@
37	$file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4');	37	$file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4');
38	}	38	}
39		39
Lines 48-54 Link Here
48	foreach $file (sort grep (! /^\./, readdir (DIR)))	48	foreach $file (sort grep (! /^\./, readdir (DIR)))
49	{	49	{
50	# Only examine .m4 files.	50	# Only examine .m4 files.
51	@@ -305,6 +303,12 @@	51	@@ -305,6 +312,12 @@
52	next if $file eq 'aclocal.m4';	52	next if $file eq 'aclocal.m4';
53		53
54	$fullfile = $m4dir . '/' . $file;	54	$fullfile = $m4dir . '/' . $file;