Attachment #151908 for bug #196938

Lines 57-64 _USES_POST+= autoreconf Link Here

(-)Mk/Uses/autoreconf.mk (-2 / +2 lines)
57	BUILD_DEPENDS+= autoconf-2.69:${PORTSDIR}/devel/autoconf \	57	BUILD_DEPENDS+= autoconf-2.69:${PORTSDIR}/devel/autoconf \
58	autoheader-2.69:${PORTSDIR}/devel/autoconf \	58	autoheader-2.69:${PORTSDIR}/devel/autoconf \
59	autoreconf-2.69:${PORTSDIR}/devel/autoconf \	59	autoreconf-2.69:${PORTSDIR}/devel/autoconf \
60	aclocal-1.14:${PORTSDIR}/devel/automake \	60	aclocal-1.15:${PORTSDIR}/devel/automake \
61	automake-1.14:${PORTSDIR}/devel/automake	61	automake-1.15:${PORTSDIR}/devel/automake
62		62
63	.if defined(libtool_ARGS) && empty(libtool_ARGS:Mbuild)	63	.if defined(libtool_ARGS) && empty(libtool_ARGS:Mbuild)
64	BUILD_DEPENDS+= libtoolize:${PORTSDIR}/devel/libtool	64	BUILD_DEPENDS+= libtoolize:${PORTSDIR}/devel/libtool

Lines 57-63 patch-libtool: Link Here

(-)Mk/Uses/libtool.mk (-1 / +1 lines)
57	-e '/if.prog.linkmode.relink !=.mode/s/if.*;/if :;/'\	57	-e '/if.prog.linkmode.relink !=.mode/s/if.*;/if :;/'\
58	-e '/if.linkmode.prog.mode. = relink/s/\|\|.*;/;/' \	58	-e '/if.linkmode.prog.mode. = relink/s/\|\|.*;/;/' \
59	-e '/if.prog.linkmode.relink = .mode/s/\|\|.*;/;/' \	59	-e '/if.prog.linkmode.relink = .mode/s/\|\|.*;/;/' \
60	-e 's/\|-p\|-pg\|/\|-B*\|-p\|-pg\|/'	60	-e 's/\|-p\|-pg\|/\|-B\|-fstack-protector\|-p\|-pg\|/'
61		61
62	patch-lafiles:	62	patch-lafiles:
63	.if ${libtool_ARGS:Mkeepla}	63	.if ${libtool_ARGS:Mkeepla}

Lines 104-111 GNU_CONFIGURE= yes Link Here

(-)Mk/bsd.autotools.mk (-2 / +2 lines)
104	.endif	104	.endif
105		105
106	.if defined(_AUTOTOOL_automake)	106	.if defined(_AUTOTOOL_automake)
107	AUTOMAKE_VERSION= 1.14	107	AUTOMAKE_VERSION= 1.15
108	AUTOMAKE_APIVER= 1.14	108	AUTOMAKE_APIVER= 1.15
109	AUTOMAKE_PORT= devel/automake	109	AUTOMAKE_PORT= devel/automake
110		110
111	. if ${_AUTOTOOL_automake} == "yes"	111	. if ${_AUTOTOOL_automake} == "yes"




# $FreeBSD$

PORTNAME=	automake
PORTVERSION=	1.15
PORTREVISION=	1
CATEGORIES=	devel
MASTER_SITES=	GNU
MASTER_SITE_SUBDIR=	automake
DISTNAME=	automake-${PORTVERSION}

MAINTAINER=	autotools@FreeBSD.org
COMMENT=	GNU Standards-compliant Makefile generator

RUN_DEPENDS=	autoconf-2.69:${PORTSDIR}/devel/autoconf \
		automake-wrapper:${PORTSDIR}/devel/automake-wrapper

BUILD_VERSION=	1.15
BUILD_VERSION=	1.14
PLIST_SUB=	BUILD_VERSION=${BUILD_VERSION}
USES=		makeinfo perl5 tar:xz
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--program-suffix=-${BUILD_VERSION}
MAKE_ENV+=	MAKEINFOFLAGS=--no-split
INFO=		automake

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)devel/automake/distinfo (-2 / +2 lines)
1	SHA256 (automake-1.14.tar.xz) = e1188f5d074374cf06946cabb2b9e70bee141637a8fd1fab9a660c8930fe8059	1	SHA256 (automake-1.15.tar.xz) = 9908c75aabd49d13661d6dcb1bc382252d22cc77bf733a2d55e87f2aa2db8636
2	SIZE (automake-1.14.tar.xz) = 1485516	2	SIZE (automake-1.15.tar.xz) = 1496708

Lines 9-12 program. aclocal is a program to generat Link Here

(-)devel/automake/pkg-descr (-1 / +1 lines)
9	contents of 'configure.in'. It is useful as an extensible, maintainable	9	contents of 'configure.in'. It is useful as an extensible, maintainable
10	mechanism for augmenting autoconf.	10	mechanism for augmenting autoconf.
11		11
12	WWW: http://www.gnu.org/software/automake/	12	WWW: https://www.gnu.org/software/automake/




bin/aclocal-%%BUILD_VERSION%%
bin/automake-%%BUILD_VERSION%%
man/man1/aclocal-%%BUILD_VERSION%%-%%BUILD_VERSION%%.1.gz
man/man1/aclocal-%%BUILD_VERSION%%.1.gz
man/man1/automake-%%BUILD_VERSION%%-%%BUILD_VERSION%%.1.gz
man/man1/automake-%%BUILD_VERSION%%.1.gz
share/aclocal-%%BUILD_VERSION%%/amversion.m4
share/aclocal-%%BUILD_VERSION%%/ar-lib.m4
share/aclocal-%%BUILD_VERSION%%/as.m4

share/automake-%%BUILD_VERSION%%/missing
share/automake-%%BUILD_VERSION%%/mkinstalldirs
share/automake-%%BUILD_VERSION%%/py-compile
share/automake-%%BUILD_VERSION%%/tap-driver.pl
share/automake-%%BUILD_VERSION%%/tap-driver.sh
share/automake-%%BUILD_VERSION%%/test-driver
share/automake-%%BUILD_VERSION%%/texinfo.tex

Lines 4-10 Link Here

(-)devel/gettext/Makefile.common (-1 / +1 lines)
4	# experimental ports run. Untested commits may be backed out at portmgr's	4	# experimental ports run. Untested commits may be backed out at portmgr's
5	# discretion.	5	# discretion.
6		6
7	PORTVERSION= 0.19.3	7	PORTVERSION= 0.19.4
8	PORTREVISION?= 0 # Leave this zero. Set in Makefile instead.	8	PORTREVISION?= 0 # Leave this zero. Set in Makefile instead.
9	CATEGORIES= devel	9	CATEGORIES= devel
10	MASTER_SITES= GNU/gettext	10	MASTER_SITES= GNU/gettext

Lines 1-2 Link Here

(-)devel/gettext/distinfo (-2 / +2 lines)
1	SHA256 (gettext-0.19.3.tar.xz) = f6fdb29c9ee8ce85c7e574f60ff64fa91cf0f4f018437dfe800227d15595db46	1	SHA256 (gettext-0.19.4.tar.xz) = 719adadb8bf3e36bac52c243a01c0add18d23506a3a40437e6f5899ceab18d20
2	SIZE (gettext-0.19.3.tar.xz) = 6628460	2	SIZE (gettext-0.19.4.tar.xz) = 6656168

Lines 11-17 lib/libasprintf.so.0.0.0 Link Here

(-)devel/gettext-runtime/pkg-plist (-1 / +1 lines)
11	lib/libintl.a	11	lib/libintl.a
12	lib/libintl.so	12	lib/libintl.so
13	lib/libintl.so.8	13	lib/libintl.so.8
14	lib/libintl.so.8.1.2	14	lib/libintl.so.8.1.3
15	lib/libintl.so.9	15	lib/libintl.so.9
16	man/man1/envsubst.1.gz	16	man/man1/envsubst.1.gz
17	man/man1/gettext.1.gz	17	man/man1/gettext.1.gz




bin/recode-sr-latin
bin/xgettext
include/gettext-po.h
lib/libgettextlib-0.19.4.so
lib/libgettextlib.so
lib/libgettextpo.a
lib/libgettextpo.so
lib/libgettextpo.so.0
lib/libgettextpo.so.0.5.3
lib/libgettextsrc-0.19.4.so
lib/libgettextsrc.so
lib/gettext/hostname
lib/gettext/project-id

Lines 23-30 INFO= libtool Link Here

(-)devel/libtool/Makefile (-3 lines)
23		23
24	post-patch:	24	post-patch:
25	@${RM} -f ${WRKSRC}/doc/.info	25	@${RM} -f ${WRKSRC}/doc/.info
26	.for f in build-aux/ltmain.sh configure libtoolize.in m4/libtool.m4
27	@${TOUCH} -mr ${WRKSRC}/${f}.orig ${WRKSRC}/${f}
28	.endfor
29		26
30	.include <bsd.port.mk>	27	.include <bsd.port.mk>

Lines 1-9 Link Here

(-)devel/libtool/Makefile.common (-2 / +2 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTVERSION= 2.4.2.418	3	PORTVERSION= 2.4.5
4	PORTREVISION?= 0 # Leave this zero. Set in Makefile instead.	4	PORTREVISION?= 0 # Leave this zero. Set in Makefile instead.
5	CATEGORIES= devel	5	CATEGORIES= devel
6	MASTER_SITES= GNU_ALPHA/libtool	6	MASTER_SITES= GNU/libtool
7	DISTNAME= libtool-${PORTVERSION}	7	DISTNAME= libtool-${PORTVERSION}
8		8
9	MAINTAINER= autotools@FreeBSD.org	9	MAINTAINER= autotools@FreeBSD.org

Lines 1-2 Link Here

(-)devel/libtool/distinfo (-2 / +2 lines)
1	SHA256 (libtool-2.4.2.418.tar.xz) = 6465c7e6ebb7c9083aa610d510498aadf7be0c6dc5f2f4e57008686879d27d8c	1	SHA256 (libtool-2.4.5.tar.xz) = 84aac136513b009278896ffa255e4d685bcdb0cb0e5363be36adad64c986177e
2	SIZE (libtool-2.4.2.418.tar.xz) = 941808	2	SIZE (libtool-2.4.5.tar.xz) = 971620




--- build-aux/ltmain.sh.orig	2013-10-26 22:53:58 UTC
+++ build-aux/ltmain.sh
@@ -8598,13 +8598,13 @@ func_mode_link ()
 	  #
 	  case $version_type in
 	  # correct linux to gnu/linux during the next big refactor
-	  darwin|linux|osf|windows|none)
+	  darwin|freebsd-elf|linux|osf|windows|none)
 	    func_arith $number_major + $number_minor
 	    current=$func_arith_result
 	    age=$number_minor
 	    revision=$number_revision
 	    ;;
-	  freebsd-aout|freebsd-elf|qnx|sunos)
+	  freebsd-aout|qnx|sunos)
 	    current=$number_major
 	    revision=$number_minor
 	    age=0
@@ -8690,8 +8690,9 @@ func_mode_link ()
 	  ;;
 
 	freebsd-elf)
-	  major=.$current
-	  versuffix=.$current
+	  func_arith $current - $age
+	  major=.$func_arith_result
+	  versuffix=$major.$age.$revision
 	  ;;
 
 	irix | nonstopux)




--- configure.orig	2013-10-26 22:53:35 UTC
+++ configure
@@ -11582,7 +11582,8 @@ freebsd* | dragonfly*)
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
-      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      soname_spec='$libname$release$shared_ext$major'
       need_version=no
       need_lib_prefix=no
       ;;
@@ -16739,7 +16740,8 @@ freebsd* | dragonfly*)
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
-      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      soname_spec='$libname$release$shared_ext$major'
       need_version=no
       need_lib_prefix=no
       ;;
@@ -19695,7 +19697,8 @@ freebsd* | dragonfly*)
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
-      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      soname_spec='$libname$release$shared_ext$major'
       need_version=no
       need_lib_prefix=no
       ;;
@@ -22786,7 +22789,8 @@ freebsd* | dragonfly*)
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
-      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      soname_spec='$libname$release$shared_ext$major'
       need_version=no
       need_lib_prefix=no
       ;;




--- libtoolize.in.orig	2013-08-23 05:06:01 UTC
+++ libtoolize.in
@@ -393,7 +393,7 @@ func_copy ()
     # Filters always take priority.
     if test -n "$my_filter"; then
       if $opt_dry_run || {
-          ( umask 0
+          (
             $SED -e "$my_filter" "$my_srcfile" > "$my_destfile"
           ) >/dev/null 2>&1
         }
@@ -423,7 +423,7 @@ func_copy ()
     $opt_verbose && my_copy_msg="$my_copycmd $my_srcfile $my_destdir"
 
     if $opt_dry_run || {
-        ( umask 0
+        (
           $my_copycmd "$my_srcfile" "$my_destfile"
         ) >/dev/null 2>&1
       }
@@ -1894,9 +1894,10 @@ func_require_seen_libtool ()
   # Lists of all files libtoolize has ever installed.  These are removed
   # before installing the latest files when --force was passed to help
   # ensure a clean upgrade.
-  # Do not remove config.guess nor config.sub, we don't install them
-  # without --install, and the project may not be using Automake.
-  all_pkgaux_files="compile install-sh depcomp missing ltmain.sh snippet/_Noreturn.h snippet/arg-nonnull.h snippet/c++defs.h snippet/warn-on-use.h"
+  # Do not remove config.guess, config.sub or install-sh, we don't
+  # install them without --install, and the project may not be using
+  # Automake.
+  all_pkgaux_files="compile depcomp missing ltmain.sh snippet/_Noreturn.h snippet/arg-nonnull.h snippet/c++defs.h snippet/warn-on-use.h"
   all_pkgmacro_files="argz.m4 libtool.m4 ltdl.m4 ltoptions.m4 ltsugar.m4 ltversion.in ltversion.m4 lt~obsolete.m4"
   all_pkgltdl_files="COPYING.LIB Makefile Makefile.in Makefile.inc Makefile.am README acinclude.m4 aclocal.m4 argz_.h argz.c config.h.in config-h.in configure configure.ac configure.in libltdl/lt__alloc.h libltdl/lt__dirent.h libltdl/lt__glibc.h libltdl/lt__private.h libltdl/lt__strl.h libltdl/lt_dlloader.h libltdl/lt_error.h libltdl/lt_system.h libltdl/slist.h loaders/dld_link.c loaders/dlopen.c loaders/dyld.c loaders/load_add_on.c loaders/loadlibrary.c loaders/preopen.c loaders/shl_load.c lt__alloc.c lt__dirent.c lt__strl.c lt_dlloader.c lt_error.c ltdl.c ltdl.h ltdl.mk slist.c"
 




--- m4/libtool.m4.orig	2013-10-25 23:37:46 UTC
+++ m4/libtool.m4
@@ -2547,7 +2547,8 @@ freebsd* | dragonfly*)
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
-      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      soname_spec='$libname$release$shared_ext$major'
       need_version=no
       need_lib_prefix=no
       ;;

Lines 5-8 interface. Link Here

(-)devel/libtool/pkg-descr (-1 / +1 lines)
5	To use libtool, add the new generic library building commands to your	5	To use libtool, add the new generic library building commands to your
6	Makefile, Makefile.in, or Makefile.am.	6	Makefile, Makefile.in, or Makefile.am.
7		7
8	WWW: http://www.gnu.org/software/libtool/	8	WWW: https://www.gnu.org/software/libtool/




bin/libtoolize
man/man1/libtool.1.gz
man/man1/libtoolize.1.gz
share/aclocal/argz.m4
share/aclocal/libtool.m4
share/aclocal/ltargz.m4
share/aclocal/ltdl.m4
share/aclocal/ltoptions.m4
share/aclocal/ltsugar.m4

%%DATADIR%%/Makefile.in
%%DATADIR%%/README
%%DATADIR%%/aclocal.m4
%%DATADIR%%/argz.c
%%DATADIR%%/argz_.h
%%DATADIR%%/build-aux/compile
%%DATADIR%%/build-aux/config.guess
%%DATADIR%%/build-aux/config.sub

%%DATADIR%%/configure
%%DATADIR%%/configure.ac
%%DATADIR%%/libltdl/lt__alloc.h
%%DATADIR%%/libltdl/lt__argz_.h
%%DATADIR%%/libltdl/lt__dirent.h
%%DATADIR%%/libltdl/lt__glibc.h
%%DATADIR%%/libltdl/lt__private.h

%%DATADIR%%/loaders/preopen.c
%%DATADIR%%/loaders/shl_load.c
%%DATADIR%%/lt__alloc.c
%%DATADIR%%/lt__argz.c
%%DATADIR%%/lt__dirent.c
%%DATADIR%%/lt__strl.c
%%DATADIR%%/lt_dlloader.c

Lines 7-9 It supports the following dlopen interfa Link Here

(-)devel/libltdl/pkg-descr (+2 lines)
7	* load_add_on (BeOS)	7	* load_add_on (BeOS)
8	* GNU DLD (emulates dynamic linking for static libraries)	8	* GNU DLD (emulates dynamic linking for static libraries)
9	* libtool's dlpreopen	9	* libtool's dlpreopen
		10
		11	WWW: https://www.gnu.org/software/libtool/

Lines 17-23 RUN_DEPENDS= libtoolize:${PORTSDIR}/deve Link Here

(-)devel/autotools/Makefile (-1 / +1 lines)
17	autoconf-2.13:${PORTSDIR}/devel/autoconf213 \	17	autoconf-2.13:${PORTSDIR}/devel/autoconf213 \
18	autoconf-2.69:${PORTSDIR}/devel/autoconf \	18	autoconf-2.69:${PORTSDIR}/devel/autoconf \
19	automake-1.4:${PORTSDIR}/devel/automake14 \	19	automake-1.4:${PORTSDIR}/devel/automake14 \
20	automake-1.14:${PORTSDIR}/devel/automake	20	automake-1.15:${PORTSDIR}/devel/automake
21		21
22	PLIST_FILES= share/${PORTNAME}	22	PLIST_FILES= share/${PORTNAME}
23	NO_BUILD= yes	23	NO_BUILD= yes

Lines 13-19 MAINTAINER= knu@FreeBSD.org Link Here

(-)devel/git-merge-changelog/Makefile (-1 / +1 lines)
13	COMMENT= Git "merge" driver for GNU style ChangeLog files	13	COMMENT= Git "merge" driver for GNU style ChangeLog files
14		14
15	EXTRACT_DEPENDS= ${GNULIB_DIR}/lib/${PORTNAME}.c:${GNULIB_PORTDIR} \	15	EXTRACT_DEPENDS= ${GNULIB_DIR}/lib/${PORTNAME}.c:${GNULIB_PORTDIR} \
16	automake-1.14:${PORTSDIR}/devel/automake \	16	automake-1.15:${PORTSDIR}/devel/automake \
17	autoconf-2.69:${PORTSDIR}/devel/autoconf	17	autoconf-2.69:${PORTSDIR}/devel/autoconf
18		18
19	GNU_CONFIGURE= yes	19	GNU_CONFIGURE= yes

Lines 3-8 Link Here

(-)devel/xfce4-dev-tools/Makefile (-1 / +4 lines)
3		3
4	PORTNAME= xfce4-dev-tools	4	PORTNAME= xfce4-dev-tools
5	PORTVERSION= 4.10.0	5	PORTVERSION= 4.10.0
		6	PORTREVISION= 1
6	CATEGORIES= devel xfce	7	CATEGORIES= devel xfce
7	MASTER_SITES= ${MASTER_SITE_XFCE}	8	MASTER_SITES= ${MASTER_SITE_XFCE}
8	DIST_SUBDIR= xfce4	9	DIST_SUBDIR= xfce4
Lines 10-16 DIST_SUBDIR= xfce4 Link Here
10	MAINTAINER= xfce@FreeBSD.org	11	MAINTAINER= xfce@FreeBSD.org
11	COMMENT= Xfce 4 development tools	12	COMMENT= Xfce 4 development tools
12		13
13	RUN_DEPENDS= ${LOCALBASE}/share/autotools:${PORTSDIR}/devel/autotools	14	RUN_DEPENDS= autoconf-2.69:${PORTSDIR}/devel/autoconf \
		15	automake-1.15:${PORTSDIR}/devel/automake \
		16	libtoolize:${PORTSDIR}/devel/libtool
14		17
15	GNU_CONFIGURE= yes	18	GNU_CONFIGURE= yes
16	USE_XFCE= configenv # to get MASTER_SITE_SUBDIR something has to be defined	19	USE_XFCE= configenv # to get MASTER_SITE_SUBDIR something has to be defined

Return to bug 196938

Lines 2-27 Link Here

(-)devel/automake/Makefile (-9 / +5 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= automake	4	PORTNAME= automake
5	PORTVERSION= 1.14	5	PORTVERSION= 1.15
6	PORTREVISION= 1
7	CATEGORIES= devel	6	CATEGORIES= devel
8	MASTER_SITES= ${MASTER_SITE_GNU}	7	MASTER_SITES= GNU
9	MASTER_SITE_SUBDIR= automake
10	DISTNAME= automake-${PORTVERSION}
11		8
12	MAINTAINER= autotools@FreeBSD.org	9	MAINTAINER= autotools@FreeBSD.org
13	COMMENT= GNU Standards-compliant Makefile generator	10	COMMENT= GNU Standards-compliant Makefile generator
14		11
15	RUN_DEPENDS= ${AUTOCONF_DEPENDS} \	12	RUN_DEPENDS= autoconf-2.69:${PORTSDIR}/devel/autoconf \
16	automake-wrapper:${PORTSDIR}/devel/automake-wrapper	13	automake-wrapper:${PORTSDIR}/devel/automake-wrapper
17		14
18	USE_AUTOTOOLS= autoconf:env	15	BUILD_VERSION= 1.15
19	BUILD_VERSION= 1.14
20	PLIST_SUB= BUILD_VERSION=${BUILD_VERSION}	16	PLIST_SUB= BUILD_VERSION=${BUILD_VERSION}
21	USES= makeinfo perl5 tar:xz	17	USES= makeinfo perl5 tar:xz
22	GNU_CONFIGURE= yes	18	GNU_CONFIGURE= yes
23	CONFIGURE_ARGS= --program-suffix=-${BUILD_VERSION}	19	CONFIGURE_ARGS= --program-suffix=-${BUILD_VERSION}
24	CONFIGURE_ENV+= MAKEINFO="makeinfo --no-split"	20	MAKE_ENV+= MAKEINFOFLAGS=--no-split
25	INFO= automake	21	INFO= automake
26		22
27	.include <bsd.port.mk>	23	.include <bsd.port.mk>

Lines 1-9 Link Here

(-)devel/automake/pkg-plist (-5 / +4 lines)
1	bin/aclocal-%%BUILD_VERSION%%	1	bin/aclocal-%%BUILD_VERSION%%
2	bin/automake-%%BUILD_VERSION%%	2	bin/automake-%%BUILD_VERSION%%
3	man/man1/aclocal-1.14-1.14.1.gz	3	man/man1/aclocal-%%BUILD_VERSION%%-%%BUILD_VERSION%%.1.gz
4	man/man1/aclocal-1.14.1.gz	4	man/man1/aclocal-%%BUILD_VERSION%%.1.gz
5	man/man1/automake-1.14-1.14.1.gz	5	man/man1/automake-%%BUILD_VERSION%%-%%BUILD_VERSION%%.1.gz
6	man/man1/automake-1.14.1.gz	6	man/man1/automake-%%BUILD_VERSION%%.1.gz
7	share/aclocal-%%BUILD_VERSION%%/amversion.m4	7	share/aclocal-%%BUILD_VERSION%%/amversion.m4
8	share/aclocal-%%BUILD_VERSION%%/ar-lib.m4	8	share/aclocal-%%BUILD_VERSION%%/ar-lib.m4
9	share/aclocal-%%BUILD_VERSION%%/as.m4	9	share/aclocal-%%BUILD_VERSION%%/as.m4
Lines 109-115 share/automake-%%BUILD_VERSION%%/mdate-s Link Here
109	share/automake-%%BUILD_VERSION%%/missing	109	share/automake-%%BUILD_VERSION%%/missing
110	share/automake-%%BUILD_VERSION%%/mkinstalldirs	110	share/automake-%%BUILD_VERSION%%/mkinstalldirs
111	share/automake-%%BUILD_VERSION%%/py-compile	111	share/automake-%%BUILD_VERSION%%/py-compile
112	share/automake-%%BUILD_VERSION%%/tap-driver.pl
113	share/automake-%%BUILD_VERSION%%/tap-driver.sh	112	share/automake-%%BUILD_VERSION%%/tap-driver.sh
114	share/automake-%%BUILD_VERSION%%/test-driver	113	share/automake-%%BUILD_VERSION%%/test-driver
115	share/automake-%%BUILD_VERSION%%/texinfo.tex	114	share/automake-%%BUILD_VERSION%%/texinfo.tex

Lines 17-29 bin/msguniq Link Here

(-)devel/gettext-tools/pkg-plist (-3 / +3 lines)
17	bin/recode-sr-latin	17	bin/recode-sr-latin
18	bin/xgettext	18	bin/xgettext
19	include/gettext-po.h	19	include/gettext-po.h
20	lib/libgettextlib-0.19.3.so	20	lib/libgettextlib-0.19.4.so
21	lib/libgettextlib.so	21	lib/libgettextlib.so
22	lib/libgettextpo.a	22	lib/libgettextpo.a
23	lib/libgettextpo.so	23	lib/libgettextpo.so
24	lib/libgettextpo.so.0	24	lib/libgettextpo.so.0
25	lib/libgettextpo.so.0.5.2	25	lib/libgettextpo.so.0.5.3
26	lib/libgettextsrc-0.19.3.so	26	lib/libgettextsrc-0.19.4.so
27	lib/libgettextsrc.so	27	lib/libgettextsrc.so
28	lib/gettext/hostname	28	lib/gettext/hostname
29	lib/gettext/project-id	29	lib/gettext/project-id

Lines 1-30 Link Here

(-)devel/libtool/files/patch-build-aux_ltmain.sh (-30 lines)
1	--- build-aux/ltmain.sh.orig 2013-10-26 22:53:58 UTC
2	+++ build-aux/ltmain.sh
3	@@ -8598,13 +8598,13 @@ func_mode_link ()
4	#
5	case $version_type in
6	# correct linux to gnu/linux during the next big refactor
7	- darwin\|linux\|osf\|windows\|none)
8	+ darwin\|freebsd-elf\|linux\|osf\|windows\|none)
9	func_arith $number_major + $number_minor
10	current=$func_arith_result
11	age=$number_minor
12	revision=$number_revision
13	;;
14	- freebsd-aout\|freebsd-elf\|qnx\|sunos)
15	+ freebsd-aout\|qnx\|sunos)
16	current=$number_major
17	revision=$number_minor
18	age=0
19	@@ -8690,8 +8690,9 @@ func_mode_link ()
20	;;
21
22	freebsd-elf)
23	- major=.$current
24	- versuffix=.$current
25	+ func_arith $current - $age
26	+ major=.$func_arith_result
27	+ versuffix=$major.$age.$revision
28	;;
29
30	irix \| nonstopux)

Lines 1-42 Link Here

(-)devel/libtool/files/patch-configure (-42 lines)
1	--- configure.orig 2013-10-26 22:53:35 UTC
2	+++ configure
3	@@ -11582,7 +11582,8 @@ freebsd* \| dragonfly*)
4	version_type=freebsd-$objformat
5	case $version_type in
6	freebsd-elf*)
7	- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
8	+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
9	+ soname_spec='$libname$release$shared_ext$major'
10	need_version=no
11	need_lib_prefix=no
12	;;
13	@@ -16739,7 +16740,8 @@ freebsd* \| dragonfly*)
14	version_type=freebsd-$objformat
15	case $version_type in
16	freebsd-elf*)
17	- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
18	+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
19	+ soname_spec='$libname$release$shared_ext$major'
20	need_version=no
21	need_lib_prefix=no
22	;;
23	@@ -19695,7 +19697,8 @@ freebsd* \| dragonfly*)
24	version_type=freebsd-$objformat
25	case $version_type in
26	freebsd-elf*)
27	- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
28	+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
29	+ soname_spec='$libname$release$shared_ext$major'
30	need_version=no
31	need_lib_prefix=no
32	;;
33	@@ -22786,7 +22789,8 @@ freebsd* \| dragonfly*)
34	version_type=freebsd-$objformat
35	case $version_type in
36	freebsd-elf*)
37	- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
38	+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
39	+ soname_spec='$libname$release$shared_ext$major'
40	need_version=no
41	need_lib_prefix=no
42	;;

Lines 1-34 Link Here

(-)devel/libtool/files/patch-libtoolize.in (-34 lines)
1	--- libtoolize.in.orig 2013-08-23 05:06:01 UTC
2	+++ libtoolize.in
3	@@ -393,7 +393,7 @@ func_copy ()
4	# Filters always take priority.
5	if test -n "$my_filter"; then
6	if $opt_dry_run \|\| {
7	- ( umask 0
8	+ (
9	$SED -e "$my_filter" "$my_srcfile" > "$my_destfile"
10	) >/dev/null 2>&1
11	}
12	@@ -423,7 +423,7 @@ func_copy ()
13	$opt_verbose && my_copy_msg="$my_copycmd $my_srcfile $my_destdir"
14
15	if $opt_dry_run \|\| {
16	- ( umask 0
17	+ (
18	$my_copycmd "$my_srcfile" "$my_destfile"
19	) >/dev/null 2>&1
20	}
21	@@ -1894,9 +1894,10 @@ func_require_seen_libtool ()
22	# Lists of all files libtoolize has ever installed. These are removed
23	# before installing the latest files when --force was passed to help
24	# ensure a clean upgrade.
25	- # Do not remove config.guess nor config.sub, we don't install them
26	- # without --install, and the project may not be using Automake.
27	- all_pkgaux_files="compile install-sh depcomp missing ltmain.sh snippet/_Noreturn.h snippet/arg-nonnull.h snippet/c++defs.h snippet/warn-on-use.h"
28	+ # Do not remove config.guess, config.sub or install-sh, we don't
29	+ # install them without --install, and the project may not be using
30	+ # Automake.
31	+ all_pkgaux_files="compile depcomp missing ltmain.sh snippet/_Noreturn.h snippet/arg-nonnull.h snippet/c++defs.h snippet/warn-on-use.h"
32	all_pkgmacro_files="argz.m4 libtool.m4 ltdl.m4 ltoptions.m4 ltsugar.m4 ltversion.in ltversion.m4 lt~obsolete.m4"
33	all_pkgltdl_files="COPYING.LIB Makefile Makefile.in Makefile.inc Makefile.am README acinclude.m4 aclocal.m4 argz_.h argz.c config.h.in config-h.in configure configure.ac configure.in libltdl/lt__alloc.h libltdl/lt__dirent.h libltdl/lt__glibc.h libltdl/lt__private.h libltdl/lt__strl.h libltdl/lt_dlloader.h libltdl/lt_error.h libltdl/lt_system.h libltdl/slist.h loaders/dld_link.c loaders/dlopen.c loaders/dyld.c loaders/load_add_on.c loaders/loadlibrary.c loaders/preopen.c loaders/shl_load.c lt__alloc.c lt__dirent.c lt__strl.c lt_dlloader.c lt_error.c ltdl.c ltdl.h ltdl.mk slist.c"
34

Lines 1-12 Link Here

(-)devel/libtool/files/patch-m4_libtool.m4 (-12 lines)
1	--- m4/libtool.m4.orig 2013-10-25 23:37:46 UTC
2	+++ m4/libtool.m4
3	@@ -2547,7 +2547,8 @@ freebsd* \| dragonfly*)
4	version_type=freebsd-$objformat
5	case $version_type in
6	freebsd-elf*)
7	- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
8	+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
9	+ soname_spec='$libname$release$shared_ext$major'
10	need_version=no
11	need_lib_prefix=no
12	;;

Lines 2-9 bin/libtool Link Here

(-)devel/libtool/pkg-plist (-3 / +3 lines)
2	bin/libtoolize	2	bin/libtoolize
3	man/man1/libtool.1.gz	3	man/man1/libtool.1.gz
4	man/man1/libtoolize.1.gz	4	man/man1/libtoolize.1.gz
5	share/aclocal/argz.m4
6	share/aclocal/libtool.m4	5	share/aclocal/libtool.m4
		6	share/aclocal/ltargz.m4
7	share/aclocal/ltdl.m4	7	share/aclocal/ltdl.m4
8	share/aclocal/ltoptions.m4	8	share/aclocal/ltoptions.m4
9	share/aclocal/ltsugar.m4	9	share/aclocal/ltsugar.m4
Lines 14-21 share/aclocal/lt~obsolete.m4 Link Here
14	%%DATADIR%%/Makefile.in	14	%%DATADIR%%/Makefile.in
15	%%DATADIR%%/README	15	%%DATADIR%%/README
16	%%DATADIR%%/aclocal.m4	16	%%DATADIR%%/aclocal.m4
17	%%DATADIR%%/argz.c
18	%%DATADIR%%/argz_.h
19	%%DATADIR%%/build-aux/compile	17	%%DATADIR%%/build-aux/compile
20	%%DATADIR%%/build-aux/config.guess	18	%%DATADIR%%/build-aux/config.guess
21	%%DATADIR%%/build-aux/config.sub	19	%%DATADIR%%/build-aux/config.sub
Lines 27-32 share/aclocal/lt~obsolete.m4 Link Here
27	%%DATADIR%%/configure	25	%%DATADIR%%/configure
28	%%DATADIR%%/configure.ac	26	%%DATADIR%%/configure.ac
29	%%DATADIR%%/libltdl/lt__alloc.h	27	%%DATADIR%%/libltdl/lt__alloc.h
		28	%%DATADIR%%/libltdl/lt__argz_.h
30	%%DATADIR%%/libltdl/lt__dirent.h	29	%%DATADIR%%/libltdl/lt__dirent.h
31	%%DATADIR%%/libltdl/lt__glibc.h	30	%%DATADIR%%/libltdl/lt__glibc.h
32	%%DATADIR%%/libltdl/lt__private.h	31	%%DATADIR%%/libltdl/lt__private.h
Lines 43-48 share/aclocal/lt~obsolete.m4 Link Here
43	%%DATADIR%%/loaders/preopen.c	42	%%DATADIR%%/loaders/preopen.c
44	%%DATADIR%%/loaders/shl_load.c	43	%%DATADIR%%/loaders/shl_load.c
45	%%DATADIR%%/lt__alloc.c	44	%%DATADIR%%/lt__alloc.c
		45	%%DATADIR%%/lt__argz.c
46	%%DATADIR%%/lt__dirent.c	46	%%DATADIR%%/lt__dirent.c
47	%%DATADIR%%/lt__strl.c	47	%%DATADIR%%/lt__strl.c
48	%%DATADIR%%/lt_dlloader.c	48	%%DATADIR%%/lt_dlloader.c