Attachment #194069 for bug #228809

Lines 10265-10267 science/orthanc\|\|2018-06-07\|Has expired: Broken for mo Link Here

(-)MOVED (+1 lines)
10265	science/orthanc-dicomweb\|\|2018-06-07\|Removed, depends on expired science/orthanc	10265	science/orthanc-dicomweb\|\|2018-06-07\|Removed, depends on expired science/orthanc
10266	science/orthanc-postgresql\|\|2018-06-07\|Removed, depends on expired science/orthanc	10266	science/orthanc-postgresql\|\|2018-06-07\|Removed, depends on expired science/orthanc
10267	science/orthanc-webviewer\|\|2018-06-07\|Removed, depends on expired science/orthanc	10267	science/orthanc-webviewer\|\|2018-06-07\|Removed, depends on expired science/orthanc
		10268	devel/automake-wrapper\|devel/automake\|2018-06-07\|No longer needed

Lines 54-64 Link Here

(-)Mk/Uses/autoreconf.mk (-5 / +2 lines)
54	_INCLUDE_USES_AUTORECONF_MK= yes	54	_INCLUDE_USES_AUTORECONF_MK= yes
55	_USES_POST+= autoreconf	55	_USES_POST+= autoreconf
56		56
57	BUILD_DEPENDS+= autoconf-2.69:devel/autoconf \	57	BUILD_DEPENDS+= autoconf>=2.69:devel/autoconf \
58	autoheader-2.69:devel/autoconf \	58	automake>=1.16.1:devel/automake
59	autoreconf-2.69:devel/autoconf \
60	aclocal-1.15:devel/automake \
61	automake-1.15:devel/automake
62		59
63	.if defined(libtool_ARGS) && empty(libtool_ARGS:Mbuild)	60	.if defined(libtool_ARGS) && empty(libtool_ARGS:Mbuild)
64	BUILD_DEPENDS+= libtoolize:devel/libtool	61	BUILD_DEPENDS+= libtoolize:devel/libtool

Lines 166-172 Link Here

(-)devel/Makefile (-1 lines)
166	SUBDIR += autodist	166	SUBDIR += autodist
167	SUBDIR += autogen	167	SUBDIR += autogen
168	SUBDIR += automake	168	SUBDIR += automake
169	SUBDIR += automake-wrapper
170	SUBDIR += automoc4	169	SUBDIR += automoc4
171	SUBDIR += autotools	170	SUBDIR += autotools
172	SUBDIR += avalon-framework	171	SUBDIR += avalon-framework




# $FreeBSD$

PORTNAME=	automake
PORTVERSION=	1.16.1
CATEGORIES=	devel
MASTER_SITES=	GNU


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_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 automake-history
CPE_VENDOR=	gnu

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)devel/automake/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1497951299	1	TIMESTAMP = 1528387628
2	SHA256 (automake-1.15.1.tar.xz) = af6ba39142220687c500f79b4aa2f181d9b24e4f8d8ec497cea4ba26c64bedaf	2	SHA256 (automake-1.16.1.tar.xz) = 5d05bb38a23fd3312b10aea93840feec685bdf4a41146e78882848165d3ae921
3	SIZE (automake-1.15.1.tar.xz) = 1509496	3	SIZE (automake-1.16.1.tar.xz) = 1534936




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




--- 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}




bin/aclocal
bin/aclocal-%%BUILD_VERSION%%
bin/automake
bin/automake-%%BUILD_VERSION%%
man/man1/aclocal.1.gz
man/man1/aclocal-%%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

share/automake-%%BUILD_VERSION%%/test-driver
share/automake-%%BUILD_VERSION%%/texinfo.tex
share/automake-%%BUILD_VERSION%%/ylwrap
%%PORTDOCS%%%%DOCSDIR%%/amhello-1.0.tar.gz




# $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"

Lines 1-3 Link Here

(-)devel/automake-wrapper/pkg-descr (-3 lines)
1	This port installs a wrapper script for automake, with symlinks to the
2	unversioned name of each tool included with automake. This allows the
3	correct version to be selected depending on the user's requirements.

Return to bug 228809

Lines 2-8 Link Here

(-)devel/automake/Makefile (-7 / +5 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= automake	4	PORTNAME= automake
5	PORTVERSION= 1.15.1	5	PORTVERSION= 1.16.1
6	CATEGORIES= devel	6	CATEGORIES= devel
7	MASTER_SITES= GNU	7	MASTER_SITES= GNU
8		8
Lines 14-30 LICENSE_COMB= multi Link Here
14	LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING	14	LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING
15	LICENSE_FILE_GFDL= ${WRKSRC}/doc/fdl.texi	15	LICENSE_FILE_GFDL= ${WRKSRC}/doc/fdl.texi
16		16
17	BUILD_DEPENDS= autoconf-2.69:devel/autoconf	17	BUILD_DEPENDS= autoconf>=2.69:devel/autoconf
18	RUN_DEPENDS= autoconf-2.69:devel/autoconf \	18	RUN_DEPENDS= autoconf>=2.69:devel/autoconf
19	automake-wrapper:devel/automake-wrapper
20		19
21	BUILD_VERSION= 1.15	20	BUILD_VERSION= 1.16
22	PLIST_SUB= BUILD_VERSION=${BUILD_VERSION}	21	PLIST_SUB= BUILD_VERSION=${BUILD_VERSION}
23	USES= cpe makeinfo perl5 tar:xz	22	USES= cpe makeinfo perl5 tar:xz
24	GNU_CONFIGURE= yes	23	GNU_CONFIGURE= yes
25	CONFIGURE_ARGS= --program-suffix=-${BUILD_VERSION}
26	MAKE_ENV+= MAKEINFOFLAGS=--no-split	24	MAKE_ENV+= MAKEINFOFLAGS=--no-split
27	INFO= automake	25	INFO= automake automake-history
28	CPE_VENDOR= gnu	26	CPE_VENDOR= gnu
29		27
30	.include <bsd.port.mk>	28	.include <bsd.port.mk>

Lines 1-47 Link Here

(-)devel/automake/files/patch-Makefile.in (-47 lines)
1	--- Makefile.in.orig 2017-06-18 17:35:04 UTC
2	+++ Makefile.in
3	@@ -211,8 +211,7 @@ am__v_texidevnull_ = $(am__v_texidevnull
4	am__v_texidevnull_0 = > /dev/null
5	am__v_texidevnull_1 =
6	am__dirstamp = $(am__leading_dot)dirstamp
7	-INFO_DEPS = $(srcdir)/doc/automake.info \
8	- $(srcdir)/doc/automake-history.info
9	+INFO_DEPS = $(srcdir)/doc/automake.info
10	TEXINFO_TEX = $(top_srcdir)/lib/texinfo.tex
11	am__TEXINFO_TEX_DIR = $(top_srcdir)/lib
12	DVIS = doc/automake.dvi doc/automake-history.dvi
13	@@ -697,7 +696,7 @@ aclocal_in = $(srcdir)/bin/aclocal.in
14	automake_script = bin/automake
15	aclocal_script = bin/aclocal
16	AUTOMAKESOURCES = $(automake_in) $(aclocal_in)
17	-info_TEXINFOS = doc/automake.texi doc/automake-history.texi
18	+info_TEXINFOS = doc/automake.texi
19	doc_automake_TEXINFOS = doc/fdl.texi
20	doc_automake_history_TEXINFOS = doc/fdl.texi
21	man1_MANS = \
22	@@ -730,7 +729,7 @@ amhello_configury = \
23	missing \
24	src/Makefile.in
25
26	-dist_doc_DATA = $(srcdir)/doc/amhello-1.0.tar.gz
27	+dist_doc_DATA =
28	setup_autotools_paths = { \
29	$(extend_PATH) \
30	&& ACLOCAL=aclocal-$(APIVERSION) && export ACLOCAL \
31	@@ -866,7 +865,7 @@ dist_automake_ac_DATA = \
32	m4/upc.m4 \
33	m4/vala.m4
34
35	-dist_system_ac_DATA = m4/acdir/README
36	+dist_system_ac_DATA =
37	automake_internal_acdir = $(automake_acdir)/internal
38	dist_automake_internal_ac_DATA = m4/internal/ac-config-macro-dirs.m4
39
40	@@ -3456,7 +3455,6 @@ install-dvi-am: $(DVIS)
41	done
42	install-exec-am: install-binSCRIPTS
43	@$(NORMAL_INSTALL)
44	- $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
45	install-html: install-html-am
46
47	install-html-am: $(HTMLS)

Lines 1-21 Link Here

(-)devel/automake/files/patch-doc__automake.texi (-21 lines)
1	--- doc/automake.texi.orig 2017-06-17 01:28:31 UTC
2	+++ doc/automake.texi
3	@@ -38,17 +38,11 @@ section entitled ``GNU Free Documentatio
4	@end quotation
5	@end copying
6
7	-@dircategory Software development
8	+@dircategory Programming & development toolS
9	@direntry
10	* Automake: (automake). Making GNU standards-compliant Makefiles.
11	@end direntry
12
13	-@dircategory Individual utilities
14	-@direntry
15	-* aclocal-invocation: (automake)aclocal Invocation. Generating aclocal.m4.
16	-* automake-invocation: (automake)automake Invocation. Generating Makefile.in.
17	-@end direntry
18	-
19	@titlepage
20	@title GNU Automake
21	@subtitle For version @value{VERSION}, @value{UPDATED}

Lines 1-9 Link Here

(-)devel/automake/pkg-plist (-3 / +6 lines)
		1	bin/aclocal
1	bin/aclocal-%%BUILD_VERSION%%	2	bin/aclocal-%%BUILD_VERSION%%
		3	bin/automake
2	bin/automake-%%BUILD_VERSION%%	4	bin/automake-%%BUILD_VERSION%%
3	man/man1/aclocal-%%BUILD_VERSION%%-%%BUILD_VERSION%%.1.gz	5	man/man1/aclocal.1.gz
4	man/man1/aclocal-%%BUILD_VERSION%%.1.gz	6	man/man1/aclocal-%%BUILD_VERSION%%.1.gz
5	man/man1/automake-%%BUILD_VERSION%%-%%BUILD_VERSION%%.1.gz	7	man/man1/automake.1.gz
6	man/man1/automake-%%BUILD_VERSION%%.1.gz	8	man/man1/automake-%%BUILD_VERSION%%.1.gz
		9	share/aclocal/README
7	share/aclocal-%%BUILD_VERSION%%/amversion.m4	10	share/aclocal-%%BUILD_VERSION%%/amversion.m4
8	share/aclocal-%%BUILD_VERSION%%/ar-lib.m4	11	share/aclocal-%%BUILD_VERSION%%/ar-lib.m4
9	share/aclocal-%%BUILD_VERSION%%/as.m4	12	share/aclocal-%%BUILD_VERSION%%/as.m4
Lines 113-116 share/automake-%%BUILD_VERSION%%/tap-driver.sh Link Here
113	share/automake-%%BUILD_VERSION%%/test-driver	116	share/automake-%%BUILD_VERSION%%/test-driver
114	share/automake-%%BUILD_VERSION%%/texinfo.tex	117	share/automake-%%BUILD_VERSION%%/texinfo.tex
115	share/automake-%%BUILD_VERSION%%/ylwrap	118	share/automake-%%BUILD_VERSION%%/ylwrap
116	@dir share/aclocal	119	%%PORTDOCS%%%%DOCSDIR%%/amhello-1.0.tar.gz

Lines 1-13 Link Here

(-)devel/automake-wrapper/Makefile (-13 lines)
1	# $FreeBSD$
2
3	PORTNAME= automake-wrapper
4
5	COMMENT= Wrapper script for GNU automake
6
7	MASTERDIR= ${.CURDIR}/../../devel/autoconf-wrapper
8	PKGDIR= ${.CURDIR}
9
10	TOOL= AUTOMAKE
11	WRAPPED_TOOLS= aclocal automake
12
13	.include "${MASTERDIR}/Makefile"