Attachment #19006 for bug #33916




# $FreeBSD: ports/devel/libtool/Makefile,v 1.15 2001/05/22 09:21:05 reg Exp $
#

PORTNAME=	libtool13
PORTVERSION=	1.3.4
PORTREVISION=	2
CATEGORIES=	devel
MASTER_SITES=	${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR=	libtool
DISTNAME=	libtool-${PORTVERSION}

#MAINTAINER=	reg@FreeBSD.org
MAINTAINER=	portmgr@FreeBSD.org

# This port has not been upgraded to 1.4 because it is used by about 30% of
# the ports collection, and more testing is needed.  If someone can supply a
# working patch then it will be upgraded.

INSTALLS_SHLIB=	yes
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--disable-ltdl-install
CONFIGURE_ENV=	PREFIX=${PREFIX}

post-extract:
	@${MV} -f ${WRKSRC}/libtool.m4 ${WRKSRC}/libtool13.m4
	@${MV} -f ${WRKSRC}/libtoolize.in ${WRKSRC}/libtoolize13.in

.include <bsd.port.mk>




@comment $FreeBSD$
bin/libtool13
bin/libtoolize13
@unexec install-info --delete %D/info/libtool.info %D/info/dir
info/libtool.info
@exec install-info %D/info/libtool.info %D/info/dir
share/aclocal/libtool13.m4
share/libtool13/config.guess
share/libtool13/config.sub
share/libtool13/libltdl/COPYING.LIB
share/libtool13/libltdl/Makefile.am
share/libtool13/libltdl/Makefile.in
share/libtool13/libltdl/README
share/libtool13/libltdl/acconfig.h
share/libtool13/libltdl/acinclude.m4
share/libtool13/libltdl/aclocal.m4
share/libtool13/libltdl/config.h.in
share/libtool13/libltdl/configure
share/libtool13/libltdl/configure.in
share/libtool13/libltdl/ltdl.c
share/libtool13/libltdl/ltdl.h
share/libtool13/libltdl/stamp-h.in
share/libtool13/ltconfig
share/libtool13/ltmain.sh
@dirrm share/libtool13/libltdl
@dirrm share/libtool13
share/libtool/ltmain.sh
@dirrm share/libtool/libltdl
@dirrm share/libtool





$FreeBSD$

--- Makefile.in.orig	Tue Dec  7 15:55:45 1999
+++ Makefile.in	Mon Jan 14 16:53:17 2002
@@ -92,11 +92,11 @@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 
-aclocal_macros = libtool.m4
+aclocal_macros = libtool13.m4
 
-EXTRA_DIST = $(aclocal_macros) libtoolize.in ltconfig.in ltmain.in 	mkstamp ChangeLog.0
+EXTRA_DIST = $(aclocal_macros) libtoolize13.in ltconfig.in ltmain.in 	mkstamp ChangeLog.0
 
-CLEANFILES = libtool libtoolize ltconfig.T ltmain.shT
+CLEANFILES = libtool13 libtoolize13 ltconfig.T ltmain.shT
 
 # These are required by libtoolize.
 pkgdata_SCRIPTS = config.guess config.sub ltconfig
@@ -106,11 +106,11 @@
 aclocal_DATA = $(aclocal_macros)
 
 # The standalone libtool script, and the libtool distributor.
-bin_SCRIPTS = libtool libtoolize
+bin_SCRIPTS = libtool13 libtoolize13
 
 # TSDEPS will be defined to TSDEPS_DIST at `make dist' time
 TSDEPS = 
-TSDEPS_DIST = ChangeLog libtool.m4
+TSDEPS_DIST = ChangeLog libtool13.m4
 CVS = cvs # set it to `:' to avoid CVS operations
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -451,7 +451,7 @@
 maintainer-clean
 
 
-libtool: $(srcdir)/ltmain.sh $(srcdir)/ltconfig
+libtool13: $(srcdir)/ltmain.sh $(srcdir)/ltconfig
 	CC="$(CC)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
 	LD="$(LD)" LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)" \
 	LN_S="$(LN_S)" NM="$(NM)" RANLIB="$(RANLIB)" \
@@ -468,9 +468,9 @@
 	$(SHELL) $(srcdir)/ltconfig $(LIBTOOL_FLAGS) --srcdir=$(srcdir) \
 	  --output=$@ $(srcdir)/ltmain.c
 
-libtoolize: $(srcdir)/libtoolize.in $(top_builddir)/config.status
-	CONFIG_FILES=libtoolize CONFIG_HEADERS= $(top_builddir)/config.status
-	chmod +x libtoolize
+libtoolize13: $(srcdir)/libtoolize13.in $(top_builddir)/config.status
+	CONFIG_FILES=libtoolize13 CONFIG_HEADERS= $(top_builddir)/config.status
+	chmod +x libtoolize13
 
 .PHONY: timestamps update-timestamps
 timestamps distdir: update-timestamps
@@ -505,9 +505,9 @@
 # All our rules should depend on these demo files.
 all-recursive: $(ACINCLUDE_M4_LIST)
 
-@ACINCLUDE_M4_LIST@: $(srcdir)/libtool.m4
+@ACINCLUDE_M4_LIST@: $(srcdir)/libtool13.m4
 	rm -f $@
-	cp $(srcdir)/libtool.m4 $@
+	cp $(srcdir)/libtool13.m4 $@
 
 .PHONY: configure-subdirs
 configure-subdirs distdir: $(DIST_MAKEFILE_LIST)





$FreeBSD$

--- configure.orig	Tue Dec  7 15:22:41 1999
+++ configure	Mon Jan 14 16:21:53 2002
@@ -702,7 +702,7 @@
 fi
 
 
-PACKAGE=libtool
+PACKAGE=libtool13
 
 VERSION=1.3.4
 
@@ -1859,10 +1859,6 @@
       *) # Relative path.
         ac_sub_cache_file="$ac_dots$cache_file" ;;
       esac

Lines 1-5 Link Here

(-)files/patch-af (-2 / +26 lines)
1	--- libltdl/Makefile.in.orig Tue Dec 7 13:03:38 1999	1
2	+++ libltdl/Makefile.in Mon Jan 17 16:35:34 2000	2	$FreeBSD$
		3
		4	--- libltdl/Makefile.in.orig Tue Dec 7 15:03:38 1999
		5	+++ libltdl/Makefile.in Mon Jan 14 17:05:36 2002
3	@@ -326,17 +326,16 @@	6	@@ -326,17 +326,16 @@
4	distdir: $(DISTFILES)	7	distdir: $(DISTFILES)
5	-rm -rf $(distdir)	8	-rm -rf $(distdir)
Lines 22-24 Link Here
22	info-am:	25	info-am:
23	info: info-am	26	info: info-am
24	dvi-am:	27	dvi-am:
		28	@@ -435,15 +434,15 @@
		29	$(SHELL) ./config.status --recheck
		30
		31	local-install-files: $(DISTFILES)
		32	- -rm -rf $(DESTDIR)$(datadir)/libtool/libltdl
		33	- $(mkinstalldirs) $(DESTDIR)$(datadir)/libtool/libltdl
		34	+ -rm -rf $(DESTDIR)$(datadir)/libtool13/libltdl
		35	+ $(mkinstalldirs) $(DESTDIR)$(datadir)/libtool13/libltdl
		36	@for file in $(DISTFILES); do \
		37	d=$(srcdir); \
		38	if test -d $$d/$$file; then \
		39	- cp -r $$d/$$file $(DESTDIR)$(datadir)/libtool/libltdl/$$file; \
		40	+ cp -r $$d/$$file $(DESTDIR)$(datadir)/libtool13/libltdl/$$file; \
		41	else \
		42	- test -f $(DESTDIR)$(datadir)/libtool/libltdl/$$file \
		43	- \|\| cp $$d/$$file $(DESTDIR)$(datadir)/libtool/libltdl/$$file \|\| :; \
		44	+ test -f $(DESTDIR)$(datadir)/libtool13/libltdl/$$file \
		45	+ \|\| cp $$d/$$file $(DESTDIR)$(datadir)/libtool13/libltdl/$$file \|\| :; \
		46	fi; \
		47	done
		48





$FreeBSD: ports/devel/libtool/files/patch-ag,v 1.1 2001/02/05 08:21:54 reg Exp $

--- libltdl/configure	2001/01/31 10:58:38	1.1
+++ libltdl/configure	2001/01/31 10:59:14
@@ -1455,7 +1455,7 @@
 esac
 
 # Check for any special flags to pass to ltconfig.
-libtool_flags="--cache-file=$cache_file"
+libtool_flags="--cache-file=$cache_file --disable-ltlibs"
 test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
 test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
 test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"





$FreeBSD$

--- libtoolize13.in.orig	Tue Mar 30 13:25:27 1999
+++ libtoolize13.in	Mon Jan 14 16:26:55 2002
@@ -37,7 +37,7 @@
 pkgdatadir=@pkgdatadir@
 aclocaldir=@aclocaldir@
 
-libtool_m4="$aclocaldir/libtool.m4"
+libtool_m4="$aclocaldir/libtool13.m4"
 
 dry_run=no
 help="Try \`$progname --help' for more information."

Return to bug 33916

Lines 5-26 Link Here

(-)Makefile (-6 / +7 lines)
5	# $FreeBSD: ports/devel/libtool/Makefile,v 1.15 2001/05/22 09:21:05 reg Exp $	5	# $FreeBSD: ports/devel/libtool/Makefile,v 1.15 2001/05/22 09:21:05 reg Exp $
6	#	6	#
7		7
8	PORTNAME= libtool	8	PORTNAME= libtool13
9	PORTVERSION= 1.3.4	9	PORTVERSION= 1.3.4
10	PORTREVISION= 2	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= libtool	13	MASTER_SITE_SUBDIR= libtool
		14	DISTNAME= libtool-${PORTVERSION}
14		15
15	#MAINTAINER= reg@FreeBSD.org	16	#MAINTAINER= reg@FreeBSD.org
16	MAINTAINER= portmgr@FreeBSD.org	17	MAINTAINER= portmgr@FreeBSD.org
17		18
18	# This port has not been upgraded to 1.4 because it is used by about 30% of
19	# the ports collection, and more testing is needed. If someone can supply a
20	# working patch then it will be upgraded.
21
22	INSTALLS_SHLIB= yes
23	GNU_CONFIGURE= yes	19	GNU_CONFIGURE= yes
		20	CONFIGURE_ARGS= --disable-ltdl-install
24	CONFIGURE_ENV= PREFIX=${PREFIX}	21	CONFIGURE_ENV= PREFIX=${PREFIX}
		22
		23	post-extract:
		24	@${MV} -f ${WRKSRC}/libtool.m4 ${WRKSRC}/libtool13.m4
		25	@${MV} -f ${WRKSRC}/libtoolize.in ${WRKSRC}/libtoolize13.in
25		26
26	.include <bsd.port.mk>	27	.include <bsd.port.mk>

Lines 1-29 Link Here

(-)pkg-plist (-26 / +23 lines)
1	bin/libtool	1	@comment $FreeBSD$
2	bin/libtoolize	2	bin/libtool13
3	include/ltdl.h	3	bin/libtoolize13
4	@unexec install-info --delete %D/info/libtool.info %D/info/dir	4	@unexec install-info --delete %D/info/libtool.info %D/info/dir
5	info/libtool.info	5	info/libtool.info
6	@exec install-info %D/info/libtool.info %D/info/dir	6	@exec install-info %D/info/libtool.info %D/info/dir
7	lib/libltdl.a	7	share/aclocal/libtool13.m4
8	lib/libltdl.so	8	share/libtool13/config.guess
9	lib/libltdl.so.1	9	share/libtool13/config.sub
10	share/aclocal/libtool.m4	10	share/libtool13/libltdl/COPYING.LIB
11	share/libtool/config.guess	11	share/libtool13/libltdl/Makefile.am
12	share/libtool/config.sub	12	share/libtool13/libltdl/Makefile.in
13	share/libtool/libltdl/COPYING.LIB	13	share/libtool13/libltdl/README
14	share/libtool/libltdl/Makefile.am	14	share/libtool13/libltdl/acconfig.h
15	share/libtool/libltdl/Makefile.in	15	share/libtool13/libltdl/acinclude.m4
16	share/libtool/libltdl/README	16	share/libtool13/libltdl/aclocal.m4
17	share/libtool/libltdl/acconfig.h	17	share/libtool13/libltdl/config.h.in
18	share/libtool/libltdl/acinclude.m4	18	share/libtool13/libltdl/configure
19	share/libtool/libltdl/aclocal.m4	19	share/libtool13/libltdl/configure.in
20	share/libtool/libltdl/config.h.in	20	share/libtool13/libltdl/ltdl.c
21	share/libtool/libltdl/configure	21	share/libtool13/libltdl/ltdl.h
22	share/libtool/libltdl/configure.in	22	share/libtool13/libltdl/stamp-h.in
23	share/libtool/libltdl/ltdl.c	23	share/libtool13/ltconfig
24	share/libtool/libltdl/ltdl.h	24	share/libtool13/ltmain.sh
25	share/libtool/libltdl/stamp-h.in	25	@dirrm share/libtool13/libltdl
26	share/libtool/ltconfig	26	@dirrm share/libtool13
27	share/libtool/ltmain.sh
28	@dirrm share/libtool/libltdl
29	@dirrm share/libtool

Added Link Here

(-)files/patch-Makefile.in (+68 lines)
1
2	$FreeBSD$
3
4	--- Makefile.in.orig Tue Dec 7 15:55:45 1999
5	+++ Makefile.in Mon Jan 14 16:53:17 2002
6	@@ -92,11 +92,11 @@
7	LDFLAGS = @LDFLAGS@
8	LIBS = @LIBS@
9
10	-aclocal_macros = libtool.m4
11	+aclocal_macros = libtool13.m4
12
13	-EXTRA_DIST = $(aclocal_macros) libtoolize.in ltconfig.in ltmain.in mkstamp ChangeLog.0
14	+EXTRA_DIST = $(aclocal_macros) libtoolize13.in ltconfig.in ltmain.in mkstamp ChangeLog.0
15
16	-CLEANFILES = libtool libtoolize ltconfig.T ltmain.shT
17	+CLEANFILES = libtool13 libtoolize13 ltconfig.T ltmain.shT
18
19	# These are required by libtoolize.
20	pkgdata_SCRIPTS = config.guess config.sub ltconfig
21	@@ -106,11 +106,11 @@
22	aclocal_DATA = $(aclocal_macros)
23
24	# The standalone libtool script, and the libtool distributor.
25	-bin_SCRIPTS = libtool libtoolize
26	+bin_SCRIPTS = libtool13 libtoolize13
27
28	# TSDEPS will be defined to TSDEPS_DIST at `make dist' time
29	TSDEPS =
30	-TSDEPS_DIST = ChangeLog libtool.m4
31	+TSDEPS_DIST = ChangeLog libtool13.m4
32	CVS = cvs # set it to `:' to avoid CVS operations
33	ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
34	mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
35	@@ -451,7 +451,7 @@
36	maintainer-clean
37
38
39	-libtool: $(srcdir)/ltmain.sh $(srcdir)/ltconfig
40	+libtool13: $(srcdir)/ltmain.sh $(srcdir)/ltconfig
41	CC="$(CC)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
42	LD="$(LD)" LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)" \
43	LN_S="$(LN_S)" NM="$(NM)" RANLIB="$(RANLIB)" \
44	@@ -468,9 +468,9 @@
45	$(SHELL) $(srcdir)/ltconfig $(LIBTOOL_FLAGS) --srcdir=$(srcdir) \
46	--output=$@ $(srcdir)/ltmain.c
47
48	-libtoolize: $(srcdir)/libtoolize.in $(top_builddir)/config.status
49	- CONFIG_FILES=libtoolize CONFIG_HEADERS= $(top_builddir)/config.status
50	- chmod +x libtoolize
51	+libtoolize13: $(srcdir)/libtoolize13.in $(top_builddir)/config.status
52	+ CONFIG_FILES=libtoolize13 CONFIG_HEADERS= $(top_builddir)/config.status
53	+ chmod +x libtoolize13
54
55	.PHONY: timestamps update-timestamps
56	timestamps distdir: update-timestamps
57	@@ -505,9 +505,9 @@
58	# All our rules should depend on these demo files.
59	all-recursive: $(ACINCLUDE_M4_LIST)
60
61	-@ACINCLUDE_M4_LIST@: $(srcdir)/libtool.m4
62	+@ACINCLUDE_M4_LIST@: $(srcdir)/libtool13.m4
63	rm -f $@
64	- cp $(srcdir)/libtool.m4 $@
65	+ cp $(srcdir)/libtool13.m4 $@
66
67	.PHONY: configure-subdirs
68	configure-subdirs distdir: $(DIST_MAKEFILE_LIST)

Lines 1-6 Link Here

(-)files/patch-ae (-3 / +15 lines)
1	--- configure.orig Fri Jul 2 09:01:56 1999	1
2	+++ configure Tue Aug 31 23:45:29 1999	2	$FreeBSD$
3	@@ -1853,10 +1853,6 @@	3
		4	--- configure.orig Tue Dec 7 15:22:41 1999
		5	+++ configure Mon Jan 14 16:21:53 2002
		6	@@ -702,7 +702,7 @@
		7	fi
		8
		9
		10	-PACKAGE=libtool
		11	+PACKAGE=libtool13
		12
		13	VERSION=1.3.4
		14
		15	@@ -1859,10 +1859,6 @@
4	*) # Relative path.	16	*) # Relative path.
5	ac_sub_cache_file="$ac_dots$cache_file" ;;	17	ac_sub_cache_file="$ac_dots$cache_file" ;;
6	esac	18	esac

Removed Link Here

(-)files/patch-ag (-14 lines)
1
2	$FreeBSD: ports/devel/libtool/files/patch-ag,v 1.1 2001/02/05 08:21:54 reg Exp $
3
4	--- libltdl/configure 2001/01/31 10:58:38 1.1
5	+++ libltdl/configure 2001/01/31 10:59:14
6	@@ -1455,7 +1455,7 @@
7	esac
8
9	# Check for any special flags to pass to ltconfig.
10	-libtool_flags="--cache-file=$cache_file"
11	+libtool_flags="--cache-file=$cache_file --disable-ltlibs"
12	test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
13	test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
14	test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"

Added Link Here

(-)files/patch-libtoolize13.in (+14 lines)
1
2	$FreeBSD$
3
4	--- libtoolize13.in.orig Tue Mar 30 13:25:27 1999
5	+++ libtoolize13.in Mon Jan 14 16:26:55 2002
6	@@ -37,7 +37,7 @@
7	pkgdatadir=@pkgdatadir@
8	aclocaldir=@aclocaldir@
9
10	-libtool_m4="$aclocaldir/libtool.m4"
11	+libtool_m4="$aclocaldir/libtool13.m4"
12
13	dry_run=no
14	help="Try \`$progname --help' for more information."