From ab2da640e4dca06f37030f2ff521fdbd101e3f07 Mon Sep 17 00:00:00 2001 From: Alan Eldridge Date: Mon, 16 Sep 2002 10:28:33 +0000 Subject: 1. Fixed bug in autoscan. Thanks to Joe Marcus Clarke who worked with me and beyond to track this down. 2. Support the emacs autoconf/autotest modes now, for both emacs21 and xemacs21. Other (x)emacsen may work, depends on where they put things. --- devel/autoconf/Makefile | 13 +++++++++++-- devel/autoconf/files/patch-bin-autoscan.in | 15 +++++++++++++++ devel/autoconf/pkg-plist | 7 +++++++ devel/autoconf253/Makefile | 13 +++++++++++-- devel/autoconf253/files/patch-bin-autoscan.in | 15 +++++++++++++++ devel/autoconf253/pkg-plist | 7 +++++++ devel/autoconf254/Makefile | 13 +++++++++++-- devel/autoconf254/files/patch-bin-autoscan.in | 15 +++++++++++++++ devel/autoconf254/pkg-plist | 7 +++++++ devel/autoconf257/Makefile | 13 +++++++++++-- devel/autoconf257/files/patch-bin-autoscan.in | 15 +++++++++++++++ devel/autoconf257/pkg-plist | 7 +++++++ devel/autoconf259/Makefile | 13 +++++++++++-- devel/autoconf259/files/patch-bin-autoscan.in | 15 +++++++++++++++ devel/autoconf259/pkg-plist | 7 +++++++ devel/autoconf26/Makefile | 13 +++++++++++-- devel/autoconf26/files/patch-bin-autoscan.in | 15 +++++++++++++++ devel/autoconf26/pkg-plist | 7 +++++++ devel/autoconf261/Makefile | 13 +++++++++++-- devel/autoconf261/files/patch-bin-autoscan.in | 15 +++++++++++++++ devel/autoconf261/pkg-plist | 7 +++++++ devel/autoconf262/Makefile | 13 +++++++++++-- devel/autoconf262/files/patch-bin-autoscan.in | 15 +++++++++++++++ devel/autoconf262/pkg-plist | 7 +++++++ devel/autoconf267/Makefile | 13 +++++++++++-- devel/autoconf267/files/patch-bin-autoscan.in | 15 +++++++++++++++ devel/autoconf267/pkg-plist | 7 +++++++ devel/autoconf268/Makefile | 13 +++++++++++-- devel/autoconf268/files/patch-bin-autoscan.in | 15 +++++++++++++++ devel/autoconf268/pkg-plist | 7 +++++++ devel/gnu-autoconf/Makefile | 13 +++++++++++-- devel/gnu-autoconf/files/patch-bin-autoscan.in | 15 +++++++++++++++ devel/gnu-autoconf/pkg-plist | 7 +++++++ 33 files changed, 363 insertions(+), 22 deletions(-) create mode 100644 devel/autoconf/files/patch-bin-autoscan.in create mode 100644 devel/autoconf253/files/patch-bin-autoscan.in create mode 100644 devel/autoconf254/files/patch-bin-autoscan.in create mode 100644 devel/autoconf257/files/patch-bin-autoscan.in create mode 100644 devel/autoconf259/files/patch-bin-autoscan.in create mode 100644 devel/autoconf26/files/patch-bin-autoscan.in create mode 100644 devel/autoconf261/files/patch-bin-autoscan.in create mode 100644 devel/autoconf262/files/patch-bin-autoscan.in create mode 100644 devel/autoconf267/files/patch-bin-autoscan.in create mode 100644 devel/autoconf268/files/patch-bin-autoscan.in create mode 100644 devel/gnu-autoconf/files/patch-bin-autoscan.in diff --git a/devel/autoconf/Makefile b/devel/autoconf/Makefile index 29b1d3796059..dab922308e62 100644 --- a/devel/autoconf/Makefile +++ b/devel/autoconf/Makefile @@ -7,20 +7,29 @@ PORTNAME= autoconf PORTVERSION= 2.53 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= autoconf MAINTAINER= ports@geeksrus.net -BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 +BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \ + help2man:${PORTSDIR}/misc/help2man RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 USE_BZIP2= yes GNU_CONFIGURE= yes CONFIGURE_ENV= M4=${LOCALBASE}/bin/gm4 -CONFIGURE_ARGS= --without-lispdir + +.if exists(${LOCALBASE}/bin/emacs) +PLIST_SUB+= EMACS="" EMACSDIR=share/emacs +.elif exists(${LOCALBASE}/bin/xemacs) +PLIST_SUB+= EMACS="" EMACSDIR=lib/xemacs +.else +PLIST_SUB+= EMACS="@comment " EMACSDIR="" +.endif GENERIC_TOOLS= config.guess \ config.sub \ diff --git a/devel/autoconf/files/patch-bin-autoscan.in b/devel/autoconf/files/patch-bin-autoscan.in new file mode 100644 index 000000000000..68836ffb60bc --- /dev/null +++ b/devel/autoconf/files/patch-bin-autoscan.in @@ -0,0 +1,15 @@ +--- bin/autoscan.in.orig Fri Mar 8 06:52:41 2002 ++++ bin/autoscan.in Mon Sep 16 03:56:50 2002 +@@ -192,7 +192,11 @@ + sub used ($$;$) + { + my ($kind, $word, $where) = @_; +- $where ||= "$File::Find::name:$."; ++ my $lineno = 0; ++ if (defined($.)) { ++ $lineno = $.; ++ } ++ $where ||= "$File::Find::name:$lineno"; + push (@{$used{$kind}{$word}}, $where); + } + diff --git a/devel/autoconf/pkg-plist b/devel/autoconf/pkg-plist index fe71c6bd11e8..e9c549f71932 100644 --- a/devel/autoconf/pkg-plist +++ b/devel/autoconf/pkg-plist @@ -48,6 +48,13 @@ share/autoconf/m4sugar/version.m4 share/autoconf/mdate-sh share/autoconf/missing share/autoconf/mkinstalldirs +%%EMACS%%%%EMACSDIR%%/site-lisp/autoconf-mode.el +%%EMACS%%%%EMACSDIR%%/site-lisp/autoconf-mode.elc +%%EMACS%%%%EMACSDIR%%/site-lisp/autotest-mode.el +%%EMACS%%%%EMACSDIR%%/site-lisp/autotest-mode.elc +@comment directories +%%EMACS%%@dirrm %%EMACSDIR%%/site-lisp +%%EMACS%%@dirrm %%EMACSDIR%% @dirrm share/autoconf/m4sugar @dirrm share/autoconf/autotest @dirrm share/autoconf/autoscan diff --git a/devel/autoconf253/Makefile b/devel/autoconf253/Makefile index 29b1d3796059..dab922308e62 100644 --- a/devel/autoconf253/Makefile +++ b/devel/autoconf253/Makefile @@ -7,20 +7,29 @@ PORTNAME= autoconf PORTVERSION= 2.53 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= autoconf MAINTAINER= ports@geeksrus.net -BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 +BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \ + help2man:${PORTSDIR}/misc/help2man RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 USE_BZIP2= yes GNU_CONFIGURE= yes CONFIGURE_ENV= M4=${LOCALBASE}/bin/gm4 -CONFIGURE_ARGS= --without-lispdir + +.if exists(${LOCALBASE}/bin/emacs) +PLIST_SUB+= EMACS="" EMACSDIR=share/emacs +.elif exists(${LOCALBASE}/bin/xemacs) +PLIST_SUB+= EMACS="" EMACSDIR=lib/xemacs +.else +PLIST_SUB+= EMACS="@comment " EMACSDIR="" +.endif GENERIC_TOOLS= config.guess \ config.sub \ diff --git a/devel/autoconf253/files/patch-bin-autoscan.in b/devel/autoconf253/files/patch-bin-autoscan.in new file mode 100644 index 000000000000..68836ffb60bc --- /dev/null +++ b/devel/autoconf253/files/patch-bin-autoscan.in @@ -0,0 +1,15 @@ +--- bin/autoscan.in.orig Fri Mar 8 06:52:41 2002 ++++ bin/autoscan.in Mon Sep 16 03:56:50 2002 +@@ -192,7 +192,11 @@ + sub used ($$;$) + { + my ($kind, $word, $where) = @_; +- $where ||= "$File::Find::name:$."; ++ my $lineno = 0; ++ if (defined($.)) { ++ $lineno = $.; ++ } ++ $where ||= "$File::Find::name:$lineno"; + push (@{$used{$kind}{$word}}, $where); + } + diff --git a/devel/autoconf253/pkg-plist b/devel/autoconf253/pkg-plist index fe71c6bd11e8..e9c549f71932 100644 --- a/devel/autoconf253/pkg-plist +++ b/devel/autoconf253/pkg-plist @@ -48,6 +48,13 @@ share/autoconf/m4sugar/version.m4 share/autoconf/mdate-sh share/autoconf/missing share/autoconf/mkinstalldirs +%%EMACS%%%%EMACSDIR%%/site-lisp/autoconf-mode.el +%%EMACS%%%%EMACSDIR%%/site-lisp/autoconf-mode.elc +%%EMACS%%%%EMACSDIR%%/site-lisp/autotest-mode.el +%%EMACS%%%%EMACSDIR%%/site-lisp/autotest-mode.elc +@comment directories +%%EMACS%%@dirrm %%EMACSDIR%%/site-lisp +%%EMACS%%@dirrm %%EMACSDIR%% @dirrm share/autoconf/m4sugar @dirrm share/autoconf/autotest @dirrm share/autoconf/autoscan diff --git a/devel/autoconf254/Makefile b/devel/autoconf254/Makefile index 29b1d3796059..dab922308e62 100644 --- a/devel/autoconf254/Makefile +++ b/devel/autoconf254/Makefile @@ -7,20 +7,29 @@ PORTNAME= autoconf PORTVERSION= 2.53 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= autoconf MAINTAINER= ports@geeksrus.net -BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 +BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \ + help2man:${PORTSDIR}/misc/help2man RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 USE_BZIP2= yes GNU_CONFIGURE= yes CONFIGURE_ENV= M4=${LOCALBASE}/bin/gm4 -CONFIGURE_ARGS= --without-lispdir + +.if exists(${LOCALBASE}/bin/emacs) +PLIST_SUB+= EMACS="" EMACSDIR=share/emacs +.elif exists(${LOCALBASE}/bin/xemacs) +PLIST_SUB+= EMACS="" EMACSDIR=lib/xemacs +.else +PLIST_SUB+= EMACS="@comment " EMACSDIR="" +.endif GENERIC_TOOLS= config.guess \ config.sub \ diff --git a/devel/autoconf254/files/patch-bin-autoscan.in b/devel/autoconf254/files/patch-bin-autoscan.in new file mode 100644 index 000000000000..68836ffb60bc --- /dev/null +++ b/devel/autoconf254/files/patch-bin-autoscan.in @@ -0,0 +1,15 @@ +--- bin/autoscan.in.orig Fri Mar 8 06:52:41 2002 ++++ bin/autoscan.in Mon Sep 16 03:56:50 2002 +@@ -192,7 +192,11 @@ + sub used ($$;$) + { + my ($kind, $word, $where) = @_; +- $where ||= "$File::Find::name:$."; ++ my $lineno = 0; ++ if (defined($.)) { ++ $lineno = $.; ++ } ++ $where ||= "$File::Find::name:$lineno"; + push (@{$used{$kind}{$word}}, $where); + } + diff --git a/devel/autoconf254/pkg-plist b/devel/autoconf254/pkg-plist index fe71c6bd11e8..e9c549f71932 100644 --- a/devel/autoconf254/pkg-plist +++ b/devel/autoconf254/pkg-plist @@ -48,6 +48,13 @@ share/autoconf/m4sugar/version.m4 share/autoconf/mdate-sh share/autoconf/missing share/autoconf/mkinstalldirs +%%EMACS%%%%EMACSDIR%%/site-lisp/autoconf-mode.el +%%EMACS%%%%EMACSDIR%%/site-lisp/autoconf-mode.elc +%%EMACS%%%%EMACSDIR%%/site-lisp/autotest-mode.el +%%EMACS%%%%EMACSDIR%%/site-lisp/autotest-mode.elc +@comment directories +%%EMACS%%@dirrm %%EMACSDIR%%/site-lisp +%%EMACS%%@dirrm %%EMACSDIR%% @dirrm share/autoconf/m4sugar @dirrm share/autoconf/autotest @dirrm share/autoconf/autoscan diff --git a/devel/autoconf257/Makefile b/devel/autoconf257/Makefile index 29b1d3796059..dab922308e62 100644 --- a/devel/autoconf257/Makefile +++ b/devel/autoconf257/Makefile @@ -7,20 +7,29 @@ PORTNAME= autoconf PORTVERSION= 2.53 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= autoconf MAINTAINER= ports@geeksrus.net -BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 +BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \ + help2man:${PORTSDIR}/misc/help2man RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 USE_BZIP2= yes GNU_CONFIGURE= yes CONFIGURE_ENV= M4=${LOCALBASE}/bin/gm4 -CONFIGURE_ARGS= --without-lispdir + +.if exists(${LOCALBASE}/bin/emacs) +PLIST_SUB+= EMACS="" EMACSDIR=share/emacs +.elif exists(${LOCALBASE}/bin/xemacs) +PLIST_SUB+= EMACS="" EMACSDIR=lib/xemacs +.else +PLIST_SUB+= EMACS="@comment " EMACSDIR="" +.endif GENERIC_TOOLS= config.guess \ config.sub \ diff --git a/devel/autoconf257/files/patch-bin-autoscan.in b/devel/autoconf257/files/patch-bin-autoscan.in new file mode 100644 index 000000000000..68836ffb60bc --- /dev/null +++ b/devel/autoconf257/files/patch-bin-autoscan.in @@ -0,0 +1,15 @@ +--- bin/autoscan.in.orig Fri Mar 8 06:52:41 2002 ++++ bin/autoscan.in Mon Sep 16 03:56:50 2002 +@@ -192,7 +192,11 @@ + sub used ($$;$) + { + my ($kind, $word, $where) = @_; +- $where ||= "$File::Find::name:$."; ++ my $lineno = 0; ++ if (defined($.)) { ++ $lineno = $.; ++ } ++ $where ||= "$File::Find::name:$lineno"; + push (@{$used{$kind}{$word}}, $where); + } + diff --git a/devel/autoconf257/pkg-plist b/devel/autoconf257/pkg-plist index fe71c6bd11e8..e9c549f71932 100644 --- a/devel/autoconf257/pkg-plist +++ b/devel/autoconf257/pkg-plist @@ -48,6 +48,13 @@ share/autoconf/m4sugar/version.m4 share/autoconf/mdate-sh share/autoconf/missing share/autoconf/mkinstalldirs +%%EMACS%%%%EMACSDIR%%/site-lisp/autoconf-mode.el +%%EMACS%%%%EMACSDIR%%/site-lisp/autoconf-mode.elc +%%EMACS%%%%EMACSDIR%%/site-lisp/autotest-mode.el +%%EMACS%%%%EMACSDIR%%/site-lisp/autotest-mode.elc +@comment directories +%%EMACS%%@dirrm %%EMACSDIR%%/site-lisp +%%EMACS%%@dirrm %%EMACSDIR%% @dirrm share/autoconf/m4sugar @dirrm share/autoconf/autotest @dirrm share/autoconf/autoscan diff --git a/devel/autoconf259/Makefile b/devel/autoconf259/Makefile index 29b1d3796059..dab922308e62 100644 --- a/devel/autoconf259/Makefile +++ b/devel/autoconf259/Makefile @@ -7,20 +7,29 @@ PORTNAME= autoconf PORTVERSION= 2.53 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= autoconf MAINTAINER= ports@geeksrus.net -BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 +BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \ + help2man:${PORTSDIR}/misc/help2man RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 USE_BZIP2= yes GNU_CONFIGURE= yes CONFIGURE_ENV= M4=${LOCALBASE}/bin/gm4 -CONFIGURE_ARGS= --without-lispdir + +.if exists(${LOCALBASE}/bin/emacs) +PLIST_SUB+= EMACS="" EMACSDIR=share/emacs +.elif exists(${LOCALBASE}/bin/xemacs) +PLIST_SUB+= EMACS="" EMACSDIR=lib/xemacs +.else +PLIST_SUB+= EMACS="@comment " EMACSDIR="" +.endif GENERIC_TOOLS= config.guess \ config.sub \ diff --git a/devel/autoconf259/files/patch-bin-autoscan.in b/devel/autoconf259/files/patch-bin-autoscan.in new file mode 100644 index 000000000000..68836ffb60bc --- /dev/null +++ b/devel/autoconf259/files/patch-bin-autoscan.in @@ -0,0 +1,15 @@ +--- bin/autoscan.in.orig Fri Mar 8 06:52:41 2002 ++++ bin/autoscan.in Mon Sep 16 03:56:50 2002 +@@ -192,7 +192,11 @@ + sub used ($$;$) + { + my ($kind, $word, $where) = @_; +- $where ||= "$File::Find::name:$."; ++ my $lineno = 0; ++ if (defined($.)) { ++ $lineno = $.; ++ } ++ $where ||= "$File::Find::name:$lineno"; + push (@{$used{$kind}{$word}}, $where); + } + diff --git a/devel/autoconf259/pkg-plist b/devel/autoconf259/pkg-plist index fe71c6bd11e8..e9c549f71932 100644 --- a/devel/autoconf259/pkg-plist +++ b/devel/autoconf259/pkg-plist @@ -48,6 +48,13 @@ share/autoconf/m4sugar/version.m4 share/autoconf/mdate-sh share/autoconf/missing share/autoconf/mkinstalldirs +%%EMACS%%%%EMACSDIR%%/site-lisp/autoconf-mode.el +%%EMACS%%%%EMACSDIR%%/site-lisp/autoconf-mode.elc +%%EMACS%%%%EMACSDIR%%/site-lisp/autotest-mode.el +%%EMACS%%%%EMACSDIR%%/site-lisp/autotest-mode.elc +@comment directories +%%EMACS%%@dirrm %%EMACSDIR%%/site-lisp +%%EMACS%%@dirrm %%EMACSDIR%% @dirrm share/autoconf/m4sugar @dirrm share/autoconf/autotest @dirrm share/autoconf/autoscan diff --git a/devel/autoconf26/Makefile b/devel/autoconf26/Makefile index 29b1d3796059..dab922308e62 100644 --- a/devel/autoconf26/Makefile +++ b/devel/autoconf26/Makefile @@ -7,20 +7,29 @@ PORTNAME= autoconf PORTVERSION= 2.53 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= autoconf MAINTAINER= ports@geeksrus.net -BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 +BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \ + help2man:${PORTSDIR}/misc/help2man RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 USE_BZIP2= yes GNU_CONFIGURE= yes CONFIGURE_ENV= M4=${LOCALBASE}/bin/gm4 -CONFIGURE_ARGS= --without-lispdir + +.if exists(${LOCALBASE}/bin/emacs) +PLIST_SUB+= EMACS="" EMACSDIR=share/emacs +.elif exists(${LOCALBASE}/bin/xemacs) +PLIST_SUB+= EMACS="" EMACSDIR=lib/xemacs +.else +PLIST_SUB+= EMACS="@comment " EMACSDIR="" +.endif GENERIC_TOOLS= config.guess \ config.sub \ diff --git a/devel/autoconf26/files/patch-bin-autoscan.in b/devel/autoconf26/files/patch-bin-autoscan.in new file mode 100644 index 000000000000..68836ffb60bc --- /dev/null +++ b/devel/autoconf26/files/patch-bin-autoscan.in @@ -0,0 +1,15 @@ +--- bin/autoscan.in.orig Fri Mar 8 06:52:41 2002 ++++ bin/autoscan.in Mon Sep 16 03:56:50 2002 +@@ -192,7 +192,11 @@ + sub used ($$;$) + { + my ($kind, $word, $where) = @_; +- $where ||= "$File::Find::name:$."; ++ my $lineno = 0; ++ if (defined($.)) { ++ $lineno = $.; ++ } ++ $where ||= "$File::Find::name:$lineno"; + push (@{$used{$kind}{$word}}, $where); + } + diff --git a/devel/autoconf26/pkg-plist b/devel/autoconf26/pkg-plist index fe71c6bd11e8..e9c549f71932 100644 --- a/devel/autoconf26/pkg-plist +++ b/devel/autoconf26/pkg-plist @@ -48,6 +48,13 @@ share/autoconf/m4sugar/version.m4 share/autoconf/mdate-sh share/autoconf/missing share/autoconf/mkinstalldirs +%%EMACS%%%%EMACSDIR%%/site-lisp/autoconf-mode.el +%%EMACS%%%%EMACSDIR%%/site-lisp/autoconf-mode.elc +%%EMACS%%%%EMACSDIR%%/site-lisp/autotest-mode.el +%%EMACS%%%%EMACSDIR%%/site-lisp/autotest-mode.elc +@comment directories +%%EMACS%%@dirrm %%EMACSDIR%%/site-lisp +%%EMACS%%@dirrm %%EMACSDIR%% @dirrm share/autoconf/m4sugar @dirrm share/autoconf/autotest @dirrm share/autoconf/autoscan diff --git a/devel/autoconf261/Makefile b/devel/autoconf261/Makefile index 29b1d3796059..dab922308e62 100644 --- a/devel/autoconf261/Makefile +++ b/devel/autoconf261/Makefile @@ -7,20 +7,29 @@ PORTNAME= autoconf PORTVERSION= 2.53 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= autoconf MAINTAINER= ports@geeksrus.net -BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 +BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \ + help2man:${PORTSDIR}/misc/help2man RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 USE_BZIP2= yes GNU_CONFIGURE= yes CONFIGURE_ENV= M4=${LOCALBASE}/bin/gm4 -CONFIGURE_ARGS= --without-lispdir + +.if exists(${LOCALBASE}/bin/emacs) +PLIST_SUB+= EMACS="" EMACSDIR=share/emacs +.elif exists(${LOCALBASE}/bin/xemacs) +PLIST_SUB+= EMACS="" EMACSDIR=lib/xemacs +.else +PLIST_SUB+= EMACS="@comment " EMACSDIR="" +.endif GENERIC_TOOLS= config.guess \ config.sub \ diff --git a/devel/autoconf261/files/patch-bin-autoscan.in b/devel/autoconf261/files/patch-bin-autoscan.in new file mode 100644 index 000000000000..68836ffb60bc --- /dev/null +++ b/devel/autoconf261/files/patch-bin-autoscan.in @@ -0,0 +1,15 @@ +--- bin/autoscan.in.orig Fri Mar 8 06:52:41 2002 ++++ bin/autoscan.in Mon Sep 16 03:56:50 2002 +@@ -192,7 +192,11 @@ + sub used ($$;$) + { + my ($kind, $word, $where) = @_; +- $where ||= "$File::Find::name:$."; ++ my $lineno = 0; ++ if (defined($.)) { ++ $lineno = $.; ++ } ++ $where ||= "$File::Find::name:$lineno"; + push (@{$used{$kind}{$word}}, $where); + } + diff --git a/devel/autoconf261/pkg-plist b/devel/autoconf261/pkg-plist index fe71c6bd11e8..e9c549f71932 100644 --- a/devel/autoconf261/pkg-plist +++ b/devel/autoconf261/pkg-plist @@ -48,6 +48,13 @@ share/autoconf/m4sugar/version.m4 share/autoconf/mdate-sh share/autoconf/missing share/autoconf/mkinstalldirs +%%EMACS%%%%EMACSDIR%%/site-lisp/autoconf-mode.el +%%EMACS%%%%EMACSDIR%%/site-lisp/autoconf-mode.elc +%%EMACS%%%%EMACSDIR%%/site-lisp/autotest-mode.el +%%EMACS%%%%EMACSDIR%%/site-lisp/autotest-mode.elc +@comment directories +%%EMACS%%@dirrm %%EMACSDIR%%/site-lisp +%%EMACS%%@dirrm %%EMACSDIR%% @dirrm share/autoconf/m4sugar @dirrm share/autoconf/autotest @dirrm share/autoconf/autoscan diff --git a/devel/autoconf262/Makefile b/devel/autoconf262/Makefile index 29b1d3796059..dab922308e62 100644 --- a/devel/autoconf262/Makefile +++ b/devel/autoconf262/Makefile @@ -7,20 +7,29 @@ PORTNAME= autoconf PORTVERSION= 2.53 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= autoconf MAINTAINER= ports@geeksrus.net -BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 +BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \ + help2man:${PORTSDIR}/misc/help2man RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 USE_BZIP2= yes GNU_CONFIGURE= yes CONFIGURE_ENV= M4=${LOCALBASE}/bin/gm4 -CONFIGURE_ARGS= --without-lispdir + +.if exists(${LOCALBASE}/bin/emacs) +PLIST_SUB+= EMACS="" EMACSDIR=share/emacs +.elif exists(${LOCALBASE}/bin/xemacs) +PLIST_SUB+= EMACS="" EMACSDIR=lib/xemacs +.else +PLIST_SUB+= EMACS="@comment " EMACSDIR="" +.endif GENERIC_TOOLS= config.guess \ config.sub \ diff --git a/devel/autoconf262/files/patch-bin-autoscan.in b/devel/autoconf262/files/patch-bin-autoscan.in new file mode 100644 index 000000000000..68836ffb60bc --- /dev/null +++ b/devel/autoconf262/files/patch-bin-autoscan.in @@ -0,0 +1,15 @@ +--- bin/autoscan.in.orig Fri Mar 8 06:52:41 2002 ++++ bin/autoscan.in Mon Sep 16 03:56:50 2002 +@@ -192,7 +192,11 @@ + sub used ($$;$) + { + my ($kind, $word, $where) = @_; +- $where ||= "$File::Find::name:$."; ++ my $lineno = 0; ++ if (defined($.)) { ++ $lineno = $.; ++ } ++ $where ||= "$File::Find::name:$lineno"; + push (@{$used{$kind}{$word}}, $where); + } + diff --git a/devel/autoconf262/pkg-plist b/devel/autoconf262/pkg-plist index fe71c6bd11e8..e9c549f71932 100644 --- a/devel/autoconf262/pkg-plist +++ b/devel/autoconf262/pkg-plist @@ -48,6 +48,13 @@ share/autoconf/m4sugar/version.m4 share/autoconf/mdate-sh share/autoconf/missing share/autoconf/mkinstalldirs +%%EMACS%%%%EMACSDIR%%/site-lisp/autoconf-mode.el +%%EMACS%%%%EMACSDIR%%/site-lisp/autoconf-mode.elc +%%EMACS%%%%EMACSDIR%%/site-lisp/autotest-mode.el +%%EMACS%%%%EMACSDIR%%/site-lisp/autotest-mode.elc +@comment directories +%%EMACS%%@dirrm %%EMACSDIR%%/site-lisp +%%EMACS%%@dirrm %%EMACSDIR%% @dirrm share/autoconf/m4sugar @dirrm share/autoconf/autotest @dirrm share/autoconf/autoscan diff --git a/devel/autoconf267/Makefile b/devel/autoconf267/Makefile index 29b1d3796059..dab922308e62 100644 --- a/devel/autoconf267/Makefile +++ b/devel/autoconf267/Makefile @@ -7,20 +7,29 @@ PORTNAME= autoconf PORTVERSION= 2.53 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= autoconf MAINTAINER= ports@geeksrus.net -BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 +BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \ + help2man:${PORTSDIR}/misc/help2man RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 USE_BZIP2= yes GNU_CONFIGURE= yes CONFIGURE_ENV= M4=${LOCALBASE}/bin/gm4 -CONFIGURE_ARGS= --without-lispdir + +.if exists(${LOCALBASE}/bin/emacs) +PLIST_SUB+= EMACS="" EMACSDIR=share/emacs +.elif exists(${LOCALBASE}/bin/xemacs) +PLIST_SUB+= EMACS="" EMACSDIR=lib/xemacs +.else +PLIST_SUB+= EMACS="@comment " EMACSDIR="" +.endif GENERIC_TOOLS= config.guess \ config.sub \ diff --git a/devel/autoconf267/files/patch-bin-autoscan.in b/devel/autoconf267/files/patch-bin-autoscan.in new file mode 100644 index 000000000000..68836ffb60bc --- /dev/null +++ b/devel/autoconf267/files/patch-bin-autoscan.in @@ -0,0 +1,15 @@ +--- bin/autoscan.in.orig Fri Mar 8 06:52:41 2002 ++++ bin/autoscan.in Mon Sep 16 03:56:50 2002 +@@ -192,7 +192,11 @@ + sub used ($$;$) + { + my ($kind, $word, $where) = @_; +- $where ||= "$File::Find::name:$."; ++ my $lineno = 0; ++ if (defined($.)) { ++ $lineno = $.; ++ } ++ $where ||= "$File::Find::name:$lineno"; + push (@{$used{$kind}{$word}}, $where); + } + diff --git a/devel/autoconf267/pkg-plist b/devel/autoconf267/pkg-plist index fe71c6bd11e8..e9c549f71932 100644 --- a/devel/autoconf267/pkg-plist +++ b/devel/autoconf267/pkg-plist @@ -48,6 +48,13 @@ share/autoconf/m4sugar/version.m4 share/autoconf/mdate-sh share/autoconf/missing share/autoconf/mkinstalldirs +%%EMACS%%%%EMACSDIR%%/site-lisp/autoconf-mode.el +%%EMACS%%%%EMACSDIR%%/site-lisp/autoconf-mode.elc +%%EMACS%%%%EMACSDIR%%/site-lisp/autotest-mode.el +%%EMACS%%%%EMACSDIR%%/site-lisp/autotest-mode.elc +@comment directories +%%EMACS%%@dirrm %%EMACSDIR%%/site-lisp +%%EMACS%%@dirrm %%EMACSDIR%% @dirrm share/autoconf/m4sugar @dirrm share/autoconf/autotest @dirrm share/autoconf/autoscan diff --git a/devel/autoconf268/Makefile b/devel/autoconf268/Makefile index 29b1d3796059..dab922308e62 100644 --- a/devel/autoconf268/Makefile +++ b/devel/autoconf268/Makefile @@ -7,20 +7,29 @@ PORTNAME= autoconf PORTVERSION= 2.53 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= autoconf MAINTAINER= ports@geeksrus.net -BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 +BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \ + help2man:${PORTSDIR}/misc/help2man RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 USE_BZIP2= yes GNU_CONFIGURE= yes CONFIGURE_ENV= M4=${LOCALBASE}/bin/gm4 -CONFIGURE_ARGS= --without-lispdir + +.if exists(${LOCALBASE}/bin/emacs) +PLIST_SUB+= EMACS="" EMACSDIR=share/emacs +.elif exists(${LOCALBASE}/bin/xemacs) +PLIST_SUB+= EMACS="" EMACSDIR=lib/xemacs +.else +PLIST_SUB+= EMACS="@comment " EMACSDIR="" +.endif GENERIC_TOOLS= config.guess \ config.sub \ diff --git a/devel/autoconf268/files/patch-bin-autoscan.in b/devel/autoconf268/files/patch-bin-autoscan.in new file mode 100644 index 000000000000..68836ffb60bc --- /dev/null +++ b/devel/autoconf268/files/patch-bin-autoscan.in @@ -0,0 +1,15 @@ +--- bin/autoscan.in.orig Fri Mar 8 06:52:41 2002 ++++ bin/autoscan.in Mon Sep 16 03:56:50 2002 +@@ -192,7 +192,11 @@ + sub used ($$;$) + { + my ($kind, $word, $where) = @_; +- $where ||= "$File::Find::name:$."; ++ my $lineno = 0; ++ if (defined($.)) { ++ $lineno = $.; ++ } ++ $where ||= "$File::Find::name:$lineno"; + push (@{$used{$kind}{$word}}, $where); + } + diff --git a/devel/autoconf268/pkg-plist b/devel/autoconf268/pkg-plist index fe71c6bd11e8..e9c549f71932 100644 --- a/devel/autoconf268/pkg-plist +++ b/devel/autoconf268/pkg-plist @@ -48,6 +48,13 @@ share/autoconf/m4sugar/version.m4 share/autoconf/mdate-sh share/autoconf/missing share/autoconf/mkinstalldirs +%%EMACS%%%%EMACSDIR%%/site-lisp/autoconf-mode.el +%%EMACS%%%%EMACSDIR%%/site-lisp/autoconf-mode.elc +%%EMACS%%%%EMACSDIR%%/site-lisp/autotest-mode.el +%%EMACS%%%%EMACSDIR%%/site-lisp/autotest-mode.elc +@comment directories +%%EMACS%%@dirrm %%EMACSDIR%%/site-lisp +%%EMACS%%@dirrm %%EMACSDIR%% @dirrm share/autoconf/m4sugar @dirrm share/autoconf/autotest @dirrm share/autoconf/autoscan diff --git a/devel/gnu-autoconf/Makefile b/devel/gnu-autoconf/Makefile index 29b1d3796059..dab922308e62 100644 --- a/devel/gnu-autoconf/Makefile +++ b/devel/gnu-autoconf/Makefile @@ -7,20 +7,29 @@ PORTNAME= autoconf PORTVERSION= 2.53 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= autoconf MAINTAINER= ports@geeksrus.net -BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 +BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \ + help2man:${PORTSDIR}/misc/help2man RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 USE_BZIP2= yes GNU_CONFIGURE= yes CONFIGURE_ENV= M4=${LOCALBASE}/bin/gm4 -CONFIGURE_ARGS= --without-lispdir + +.if exists(${LOCALBASE}/bin/emacs) +PLIST_SUB+= EMACS="" EMACSDIR=share/emacs +.elif exists(${LOCALBASE}/bin/xemacs) +PLIST_SUB+= EMACS="" EMACSDIR=lib/xemacs +.else +PLIST_SUB+= EMACS="@comment " EMACSDIR="" +.endif GENERIC_TOOLS= config.guess \ config.sub \ diff --git a/devel/gnu-autoconf/files/patch-bin-autoscan.in b/devel/gnu-autoconf/files/patch-bin-autoscan.in new file mode 100644 index 000000000000..68836ffb60bc --- /dev/null +++ b/devel/gnu-autoconf/files/patch-bin-autoscan.in @@ -0,0 +1,15 @@ +--- bin/autoscan.in.orig Fri Mar 8 06:52:41 2002 ++++ bin/autoscan.in Mon Sep 16 03:56:50 2002 +@@ -192,7 +192,11 @@ + sub used ($$;$) + { + my ($kind, $word, $where) = @_; +- $where ||= "$File::Find::name:$."; ++ my $lineno = 0; ++ if (defined($.)) { ++ $lineno = $.; ++ } ++ $where ||= "$File::Find::name:$lineno"; + push (@{$used{$kind}{$word}}, $where); + } + diff --git a/devel/gnu-autoconf/pkg-plist b/devel/gnu-autoconf/pkg-plist index fe71c6bd11e8..e9c549f71932 100644 --- a/devel/gnu-autoconf/pkg-plist +++ b/devel/gnu-autoconf/pkg-plist @@ -48,6 +48,13 @@ share/autoconf/m4sugar/version.m4 share/autoconf/mdate-sh share/autoconf/missing share/autoconf/mkinstalldirs +%%EMACS%%%%EMACSDIR%%/site-lisp/autoconf-mode.el +%%EMACS%%%%EMACSDIR%%/site-lisp/autoconf-mode.elc +%%EMACS%%%%EMACSDIR%%/site-lisp/autotest-mode.el +%%EMACS%%%%EMACSDIR%%/site-lisp/autotest-mode.elc +@comment directories +%%EMACS%%@dirrm %%EMACSDIR%%/site-lisp +%%EMACS%%@dirrm %%EMACSDIR%% @dirrm share/autoconf/m4sugar @dirrm share/autoconf/autotest @dirrm share/autoconf/autoscan -- cgit v1.2.3