Attachment 194069 Details for Bug 228809 – patch

[patch] patch

automake.patch (text/plain), 8.99 KB, created by Tijl Coosemans on 2018-06-07 16:33:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tijl Coosemans

Created: 2018-06-07 16:33:24 UTC

Size: 8.99 KB

patch

obsolete

>Index: MOVED
>===================================================================
>--- MOVED	(revision 471909)
>+++ MOVED	(working copy)
>@@ -10265,3 +10265,4 @@ science/orthanc||2018-06-07|Has expired: Broken for mo
> science/orthanc-dicomweb||2018-06-07|Removed, depends on expired science/orthanc
> science/orthanc-postgresql||2018-06-07|Removed, depends on expired science/orthanc
> science/orthanc-webviewer||2018-06-07|Removed, depends on expired science/orthanc
>+devel/automake-wrapper|devel/automake|2018-06-07|No longer needed
>Index: Mk/Uses/autoreconf.mk
>===================================================================
>--- Mk/Uses/autoreconf.mk	(revision 471909)
>+++ Mk/Uses/autoreconf.mk	(working copy)
>@@ -54,11 +54,8 @@
> _INCLUDE_USES_AUTORECONF_MK=	yes
> _USES_POST+=	autoreconf
> 
>-BUILD_DEPENDS+=	autoconf-2.69:devel/autoconf \
>-		autoheader-2.69:devel/autoconf \
>-		autoreconf-2.69:devel/autoconf \
>-		aclocal-1.15:devel/automake \
>-		automake-1.15:devel/automake
>+BUILD_DEPENDS+=	autoconf>=2.69:devel/autoconf \
>+		automake>=1.16.1:devel/automake
> 
> .if defined(libtool_ARGS) && empty(libtool_ARGS:Mbuild)
> BUILD_DEPENDS+=	libtoolize:devel/libtool
>Index: devel/Makefile
>===================================================================
>--- devel/Makefile	(revision 471909)
>+++ devel/Makefile	(working copy)
>@@ -166,7 +166,6 @@
>     SUBDIR += autodist
>     SUBDIR += autogen
>     SUBDIR += automake
>-    SUBDIR += automake-wrapper
>     SUBDIR += automoc4
>     SUBDIR += autotools
>     SUBDIR += avalon-framework
>Index: devel/automake/Makefile
>===================================================================
>--- devel/automake/Makefile	(revision 471909)
>+++ devel/automake/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	automake
>-PORTVERSION=	1.15.1
>+PORTVERSION=	1.16.1
> CATEGORIES=	devel
> MASTER_SITES=	GNU
> 
>@@ -14,17 +14,15 @@ LICENSE_COMB=	multi
> LICENSE_FILE_GPLv2+ =	${WRKSRC}/COPYING
> LICENSE_FILE_GFDL=	${WRKSRC}/doc/fdl.texi
> 
>-BUILD_DEPENDS=	autoconf-2.69:devel/autoconf
>-RUN_DEPENDS=	autoconf-2.69:devel/autoconf \
>-		automake-wrapper:devel/automake-wrapper
>+BUILD_DEPENDS=	autoconf>=2.69:devel/autoconf
>+RUN_DEPENDS=	autoconf>=2.69:devel/autoconf
> 
>-BUILD_VERSION=	1.15
>+BUILD_VERSION=	1.16
> PLIST_SUB=	BUILD_VERSION=${BUILD_VERSION}
> USES=		cpe makeinfo perl5 tar:xz
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--program-suffix=-${BUILD_VERSION}
> MAKE_ENV+=	MAKEINFOFLAGS=--no-split
>-INFO=		automake
>+INFO=		automake automake-history
> CPE_VENDOR=	gnu
> 
> .include <bsd.port.mk>
>Index: devel/automake/distinfo
>===================================================================
>--- devel/automake/distinfo	(revision 471909)
>+++ devel/automake/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1497951299
>-SHA256 (automake-1.15.1.tar.xz) = af6ba39142220687c500f79b4aa2f181d9b24e4f8d8ec497cea4ba26c64bedaf
>-SIZE (automake-1.15.1.tar.xz) = 1509496
>+TIMESTAMP = 1528387628
>+SHA256 (automake-1.16.1.tar.xz) = 5d05bb38a23fd3312b10aea93840feec685bdf4a41146e78882848165d3ae921
>+SIZE (automake-1.16.1.tar.xz) = 1534936
>Index: devel/automake/files/patch-Makefile.in
>===================================================================
>--- devel/automake/files/patch-Makefile.in	(revision 471909)
>+++ devel/automake/files/patch-Makefile.in	(nonexistent)
>@@ -1,47 +0,0 @@
>---- Makefile.in.orig	2017-06-18 17:35:04 UTC
>-+++ Makefile.in
>-@@ -211,8 +211,7 @@ am__v_texidevnull_ = $(am__v_texidevnull
>- am__v_texidevnull_0 = > /dev/null
>- am__v_texidevnull_1 = 
>- am__dirstamp = $(am__leading_dot)dirstamp
>--INFO_DEPS = $(srcdir)/doc/automake.info \
>--	$(srcdir)/doc/automake-history.info
>-+INFO_DEPS = $(srcdir)/doc/automake.info
>- TEXINFO_TEX = $(top_srcdir)/lib/texinfo.tex
>- am__TEXINFO_TEX_DIR = $(top_srcdir)/lib
>- DVIS = doc/automake.dvi doc/automake-history.dvi
>-@@ -697,7 +696,7 @@ aclocal_in = $(srcdir)/bin/aclocal.in
>- automake_script = bin/automake
>- aclocal_script = bin/aclocal
>- AUTOMAKESOURCES = $(automake_in) $(aclocal_in)
>--info_TEXINFOS = doc/automake.texi doc/automake-history.texi
>-+info_TEXINFOS = doc/automake.texi
>- doc_automake_TEXINFOS = doc/fdl.texi
>- doc_automake_history_TEXINFOS = doc/fdl.texi
>- man1_MANS = \
>-@@ -730,7 +729,7 @@ amhello_configury = \
>-   missing \
>-   src/Makefile.in
>- 
>--dist_doc_DATA = $(srcdir)/doc/amhello-1.0.tar.gz
>-+dist_doc_DATA = 
>- setup_autotools_paths = { \
>-   $(extend_PATH) \
>-     && ACLOCAL=aclocal-$(APIVERSION) && export ACLOCAL \
>-@@ -866,7 +865,7 @@ dist_automake_ac_DATA = \
>-   m4/upc.m4 \
>-   m4/vala.m4
>- 
>--dist_system_ac_DATA = m4/acdir/README
>-+dist_system_ac_DATA = 
>- automake_internal_acdir = $(automake_acdir)/internal
>- dist_automake_internal_ac_DATA = m4/internal/ac-config-macro-dirs.m4
>- 
>-@@ -3456,7 +3455,6 @@ install-dvi-am: $(DVIS)
>- 	done
>- install-exec-am: install-binSCRIPTS
>- 	@$(NORMAL_INSTALL)
>--	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
>- install-html: install-html-am
>- 
>- install-html-am: $(HTMLS)
>
>Property changes on: devel/automake/files/patch-Makefile.in
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: devel/automake/files/patch-doc__automake.texi
>===================================================================
>--- devel/automake/files/patch-doc__automake.texi	(revision 471909)
>+++ devel/automake/files/patch-doc__automake.texi	(nonexistent)
>@@ -1,21 +0,0 @@
>---- doc/automake.texi.orig	2017-06-17 01:28:31 UTC
>-+++ doc/automake.texi
>-@@ -38,17 +38,11 @@ section entitled ``GNU Free Documentatio
>- @end quotation
>- @end copying
>- 
>--@dircategory Software development
>-+@dircategory Programming & development toolS
>- @direntry
>- * Automake: (automake).         Making GNU standards-compliant Makefiles.
>- @end direntry
>- 
>--@dircategory Individual utilities
>--@direntry
>--* aclocal-invocation: (automake)aclocal Invocation.   Generating aclocal.m4.
>--* automake-invocation: (automake)automake Invocation. Generating Makefile.in.
>--@end direntry
>--
>- @titlepage
>- @title GNU Automake
>- @subtitle For version @value{VERSION}, @value{UPDATED}
>
>Property changes on: devel/automake/files/patch-doc__automake.texi
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: devel/automake/pkg-plist
>===================================================================
>--- devel/automake/pkg-plist	(revision 471909)
>+++ devel/automake/pkg-plist	(working copy)
>@@ -1,9 +1,12 @@
>+bin/aclocal
> bin/aclocal-%%BUILD_VERSION%%
>+bin/automake
> bin/automake-%%BUILD_VERSION%%
>-man/man1/aclocal-%%BUILD_VERSION%%-%%BUILD_VERSION%%.1.gz
>+man/man1/aclocal.1.gz
> man/man1/aclocal-%%BUILD_VERSION%%.1.gz
>-man/man1/automake-%%BUILD_VERSION%%-%%BUILD_VERSION%%.1.gz
>+man/man1/automake.1.gz
> man/man1/automake-%%BUILD_VERSION%%.1.gz
>+share/aclocal/README
> share/aclocal-%%BUILD_VERSION%%/amversion.m4
> share/aclocal-%%BUILD_VERSION%%/ar-lib.m4
> share/aclocal-%%BUILD_VERSION%%/as.m4
>@@ -113,4 +116,4 @@ share/automake-%%BUILD_VERSION%%/tap-driver.sh
> share/automake-%%BUILD_VERSION%%/test-driver
> share/automake-%%BUILD_VERSION%%/texinfo.tex
> share/automake-%%BUILD_VERSION%%/ylwrap
>-@dir share/aclocal
>+%%PORTDOCS%%%%DOCSDIR%%/amhello-1.0.tar.gz
>Index: devel/automake-wrapper/Makefile
>===================================================================
>--- devel/automake-wrapper/Makefile	(revision 471909)
>+++ devel/automake-wrapper/Makefile	(nonexistent)
>@@ -1,13 +0,0 @@
>-# $FreeBSD$
>-
>-PORTNAME=	automake-wrapper
>-
>-COMMENT=	Wrapper script for GNU automake
>-
>-MASTERDIR=	${.CURDIR}/../../devel/autoconf-wrapper
>-PKGDIR=		${.CURDIR}
>-
>-TOOL=		AUTOMAKE
>-WRAPPED_TOOLS=	aclocal automake
>-
>-.include "${MASTERDIR}/Makefile"
>
>Property changes on: devel/automake-wrapper/Makefile
>___________________________________________________________________
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:keywords
>## -1 +0,0 ##
>-FreeBSD=%H
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: devel/automake-wrapper/pkg-descr
>===================================================================
>--- devel/automake-wrapper/pkg-descr	(revision 471909)
>+++ devel/automake-wrapper/pkg-descr	(nonexistent)
>@@ -1,3 +0,0 @@
>-This port installs a wrapper script for automake, with symlinks to the
>-unversioned name of each tool included with automake.  This allows the
>-correct version to be selected depending on the user's requirements.
>
>Property changes on: devel/automake-wrapper/pkg-descr
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 228809: 194069 | 194128 | 194157