Attachment 19006 Details for Bug 33916 – file.diff

[patch] file.diff

file.diff (text/plain), 9.09 KB, created by Jeremy Norris on 2002-01-15 12:00:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Norris

Created: 2002-01-15 12:00:09 UTC

Size: 9.09 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/devel/libtool/Makefile,v
>retrieving revision 1.15
>diff -u -r1.15 Makefile
>--- Makefile	22 May 2001 09:21:05 -0000	1.15
>+++ Makefile	14 Jan 2002 22:43:15 -0000
>@@ -5,22 +5,23 @@
> # $FreeBSD: ports/devel/libtool/Makefile,v 1.15 2001/05/22 09:21:05 reg Exp $
> #
> 
>-PORTNAME=	libtool
>+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>
>Index: pkg-plist
>===================================================================
>RCS file: /home/ncvs/ports/devel/libtool/pkg-plist,v
>retrieving revision 1.5
>diff -u -r1.5 pkg-plist
>--- pkg-plist	5 Feb 2001 08:21:50 -0000	1.5
>+++ pkg-plist	14 Jan 2002 23:23:39 -0000
>@@ -1,29 +1,26 @@
>-bin/libtool
>-bin/libtoolize
>-include/ltdl.h
>+@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
>-lib/libltdl.a
>-lib/libltdl.so
>-lib/libltdl.so.1
>-share/aclocal/libtool.m4
>-share/libtool/config.guess
>-share/libtool/config.sub
>-share/libtool/libltdl/COPYING.LIB
>-share/libtool/libltdl/Makefile.am
>-share/libtool/libltdl/Makefile.in
>-share/libtool/libltdl/README
>-share/libtool/libltdl/acconfig.h
>-share/libtool/libltdl/acinclude.m4
>-share/libtool/libltdl/aclocal.m4
>-share/libtool/libltdl/config.h.in
>-share/libtool/libltdl/configure
>-share/libtool/libltdl/configure.in
>-share/libtool/libltdl/ltdl.c
>-share/libtool/libltdl/ltdl.h
>-share/libtool/libltdl/stamp-h.in
>-share/libtool/ltconfig
>-share/libtool/ltmain.sh
>-@dirrm share/libtool/libltdl
>-@dirrm share/libtool
>+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
>Index: files/patch-Makefile.in
>===================================================================
>RCS file: files/patch-Makefile.in
>diff -N files/patch-Makefile.in
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-Makefile.in	14 Jan 2002 23:21:57 -0000
>@@ -0,0 +1,68 @@
>+
>+$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)
>Index: files/patch-ae
>===================================================================
>RCS file: /home/ncvs/ports/devel/libtool/files/patch-ae,v
>retrieving revision 1.2
>diff -u -r1.2 patch-ae
>--- files/patch-ae	11 Sep 1999 01:04:52 -0000	1.2
>+++ files/patch-ae	14 Jan 2002 23:23:02 -0000
>@@ -1,6 +1,18 @@
>---- configure.orig	Fri Jul  2 09:01:56 1999
>-+++ configure	Tue Aug 31 23:45:29 1999
>-@@ -1853,10 +1853,6 @@
>+
>+$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
>Index: files/patch-af
>===================================================================
>RCS file: /home/ncvs/ports/devel/libtool/files/patch-af,v
>retrieving revision 1.2
>diff -u -r1.2 patch-af
>--- files/patch-af	2 Apr 2000 08:26:22 -0000	1.2
>+++ files/patch-af	14 Jan 2002 23:23:10 -0000
>@@ -1,5 +1,8 @@
>---- libltdl/Makefile.in.orig	Tue Dec  7 13:03:38 1999
>-+++ libltdl/Makefile.in	Mon Jan 17 16:35:34 2000
>+
>+$FreeBSD$
>+
>+--- libltdl/Makefile.in.orig	Tue Dec  7 15:03:38 1999
>++++ libltdl/Makefile.in	Mon Jan 14 17:05:36 2002
> @@ -326,17 +326,16 @@
>  distdir: $(DISTFILES)
>  	-rm -rf $(distdir)
>@@ -22,3 +25,24 @@
>  info-am:
>  info: info-am
>  dvi-am:
>+@@ -435,15 +434,15 @@
>+ 	$(SHELL) ./config.status --recheck
>+ 
>+ local-install-files: $(DISTFILES)
>+-	-rm -rf $(DESTDIR)$(datadir)/libtool/libltdl
>+-	$(mkinstalldirs) $(DESTDIR)$(datadir)/libtool/libltdl
>++	-rm -rf $(DESTDIR)$(datadir)/libtool13/libltdl
>++	$(mkinstalldirs) $(DESTDIR)$(datadir)/libtool13/libltdl
>+ 	@for file in $(DISTFILES); do \
>+ 	  d=$(srcdir); \
>+ 	  if test -d $$d/$$file; then \
>+-	    cp -r $$d/$$file $(DESTDIR)$(datadir)/libtool/libltdl/$$file; \
>++	    cp -r $$d/$$file $(DESTDIR)$(datadir)/libtool13/libltdl/$$file; \
>+ 	  else \
>+-	    test -f $(DESTDIR)$(datadir)/libtool/libltdl/$$file \
>+-	    || cp $$d/$$file $(DESTDIR)$(datadir)/libtool/libltdl/$$file || :; \
>++	    test -f $(DESTDIR)$(datadir)/libtool13/libltdl/$$file \
>++	    || cp $$d/$$file $(DESTDIR)$(datadir)/libtool13/libltdl/$$file || :; \
>+ 	  fi; \
>+ 	done
>+ 
>Index: files/patch-ag
>===================================================================
>RCS file: files/patch-ag
>diff -N files/patch-ag
>--- files/patch-ag	5 Feb 2001 08:21:54 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,14 +0,0 @@
>-
>-$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"
>Index: files/patch-libtoolize13.in
>===================================================================
>RCS file: files/patch-libtoolize13.in
>diff -N files/patch-libtoolize13.in
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-libtoolize13.in	14 Jan 2002 23:22:05 -0000
>@@ -0,0 +1,14 @@
>+
>+$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."

Actions: View | Diff

Attachments on bug 33916: 19005 | 19006 | 19007