[44472] trunk/dports/devel/libtool1
jmr at macports.org
jmr at macports.org
Sun Dec 28 22:23:27 PST 2008
Revision: 44472
http://trac.macports.org/changeset/44472
Author: jmr at macports.org
Date: 2008-12-28 22:23:26 -0800 (Sun, 28 Dec 2008)
Log Message:
-----------
libtool1: fix changing locations of ${prefix}/share files
Modified Paths:
--------------
trunk/dports/devel/libtool1/Portfile
trunk/dports/devel/libtool1/files/patch-configure.diff
Added Paths:
-----------
trunk/dports/devel/libtool1/files/patch-Makefile.am.diff
trunk/dports/devel/libtool1/files/patch-Makefile.in.diff
trunk/dports/devel/libtool1/files/patch-bootstrap.diff
trunk/dports/devel/libtool1/files/patch-configure.ac.diff
trunk/dports/devel/libtool1/files/patch-libtoolize.in.diff
Modified: trunk/dports/devel/libtool1/Portfile
===================================================================
--- trunk/dports/devel/libtool1/Portfile 2008-12-29 05:15:16 UTC (rev 44471)
+++ trunk/dports/devel/libtool1/Portfile 2008-12-29 06:23:26 UTC (rev 44472)
@@ -32,19 +32,23 @@
--libdir=${prefix}/lib/${name}
patchfiles patch-libtool.m4.diff \
- patch-configure.diff
+ patch-configure.diff \
+ patch-configure.ac.diff \
+ patch-Makefile.am.diff \
+ patch-Makefile.in.diff \
+ patch-libtoolize.in.diff \
+ patch-bootstrap.diff
+post-patch {
+ move ${worksrcpath}/libtool.m4 ${worksrcpath}/libtool1.m4
+ move ${worksrcpath}/ltdl.m4 ${worksrcpath}/ltdl1.m4
+}
+
post-destroot {
set docdir ${prefix}/share/doc/${name}-${version}
xinstall -d ${destroot}${docdir}
xinstall -m 0644 -W ${worksrcpath} AUTHORS COPYING ChangeLog NEWS README THANKS \
TODO ${destroot}${docdir}
- move ${destroot}${prefix}/share/libtool \
- ${destroot}${prefix}/share/${name}
- move ${destroot}${prefix}/share/aclocal/libtool.m4 \
- ${destroot}${prefix}/share/aclocal/libtool1.m4
- move ${destroot}${prefix}/share/aclocal/ltdl.m4 \
- ${destroot}${prefix}/share/aclocal/ltdl1.m4
move ${destroot}${prefix}/share/info/libtool.info \
${destroot}${prefix}/share/info/libtool1.info
}
Added: trunk/dports/devel/libtool1/files/patch-Makefile.am.diff
===================================================================
--- trunk/dports/devel/libtool1/files/patch-Makefile.am.diff (rev 0)
+++ trunk/dports/devel/libtool1/files/patch-Makefile.am.diff 2008-12-29 06:23:26 UTC (rev 44472)
@@ -0,0 +1,39 @@
+--- Makefile.am.orig 2008-02-02 03:11:59.000000000 +1100
++++ Makefile.am 2008-12-29 16:46:18.000000000 +1100
+@@ -15,7 +15,7 @@
+ FFLAGS = @FFLAGS@
+ FLIBS = @FLIBS@
+
+-aclocal_macros = libtool.m4 ltdl.m4
++aclocal_macros = libtool1.m4 ltdl1.m4
+
+ EXTRA_DIST = $(aclocal_macros) bootstrap libtoolize.in ltmain.in \
+ mkstamp ChangeLog.0 ChangeLog.1
+@@ -75,14 +75,14 @@
+ # All our rules should depend on these demo files.
+ all-recursive: $(srcdir)/libltdl/acinclude.m4 $(ACINCLUDE_M4_LIST)
+
+- at srcdir@/libltdl/acinclude.m4: $(srcdir)/libtool.m4 $(srcdir)/ltdl.m4
++ at srcdir@/libltdl/acinclude.m4: $(srcdir)/libtool1.m4 $(srcdir)/ltdl1.m4
+ -rm -f $@ $@T
+- cat $(srcdir)/libtool.m4 $(srcdir)/ltdl.m4 > $@T
++ cat $(srcdir)/libtool1.m4 $(srcdir)/ltdl1.m4 > $@T
+ mv $@T $@
+
+- at ACINCLUDE_M4_LIST@: $(srcdir)/libtool.m4
++ at ACINCLUDE_M4_LIST@: $(srcdir)/libtool1.m4
+ -rm -f $@ $@T
+- cat $(srcdir)/libtool.m4 > $@T
++ cat $(srcdir)/libtool1.m4 > $@T
+ mv $@T $@
+
+ .PHONY: configure-subdirs
+@@ -150,7 +150,7 @@
+
+ # TSDEPS will be defined to TSDEPS_DIST at `make dist' time
+ TSDEPS =
+-TSDEPS_DIST = ChangeLog libtool.m4
++TSDEPS_DIST = ChangeLog libtool1.m4
+ CVS = cvs # set it to `:' to avoid CVS operations
+
+ .PHONY: timestamps update-timestamps
Added: trunk/dports/devel/libtool1/files/patch-Makefile.in.diff
===================================================================
--- trunk/dports/devel/libtool1/files/patch-Makefile.in.diff (rev 0)
+++ trunk/dports/devel/libtool1/files/patch-Makefile.in.diff 2008-12-29 06:23:26 UTC (rev 44472)
@@ -0,0 +1,39 @@
+--- Makefile.in.orig 2008-02-02 03:38:41.000000000 +1100
++++ Makefile.in 2008-12-29 16:59:33.000000000 +1100
+@@ -215,7 +215,7 @@
+ DIST_SUBDIRS = $(BUILD_SUBDIRS) $(CONF_SUBDIRS)
+ CPPLAGS = @CPPFLAGS@
+ FLIBS = @FLIBS@
+-aclocal_macros = libtool.m4 ltdl.m4
++aclocal_macros = libtool1.m4 ltdl1.m4
+ EXTRA_DIST = $(aclocal_macros) bootstrap libtoolize.in ltmain.in \
+ mkstamp ChangeLog.0 ChangeLog.1
+
+@@ -253,7 +253,7 @@
+
+ # TSDEPS will be defined to TSDEPS_DIST at `make dist' time
+ TSDEPS =
+-TSDEPS_DIST = ChangeLog libtool.m4
++TSDEPS_DIST = ChangeLog libtool1.m4
+ CVS = cvs # set it to `:' to avoid CVS operations
+ WGET = wget
+ WGETSGO = $(WGET) 'http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~'
+@@ -805,14 +805,14 @@
+ # All our rules should depend on these demo files.
+ all-recursive: $(srcdir)/libltdl/acinclude.m4 $(ACINCLUDE_M4_LIST)
+
+- at srcdir@/libltdl/acinclude.m4: $(srcdir)/libtool.m4 $(srcdir)/ltdl.m4
++ at srcdir@/libltdl/acinclude.m4: $(srcdir)/libtool1.m4 $(srcdir)/ltdl1.m4
+ -rm -f $@ $@T
+- cat $(srcdir)/libtool.m4 $(srcdir)/ltdl.m4 > $@T
++ cat $(srcdir)/libtool1.m4 $(srcdir)/ltdl1.m4 > $@T
+ mv $@T $@
+
+- at ACINCLUDE_M4_LIST@: $(srcdir)/libtool.m4
++ at ACINCLUDE_M4_LIST@: $(srcdir)/libtool1.m4
+ -rm -f $@ $@T
+- cat $(srcdir)/libtool.m4 > $@T
++ cat $(srcdir)/libtool1.m4 > $@T
+ mv $@T $@
+
+ .PHONY: configure-subdirs
Added: trunk/dports/devel/libtool1/files/patch-bootstrap.diff
===================================================================
--- trunk/dports/devel/libtool1/files/patch-bootstrap.diff (rev 0)
+++ trunk/dports/devel/libtool1/files/patch-bootstrap.diff 2008-12-29 06:23:26 UTC (rev 44472)
@@ -0,0 +1,23 @@
+--- bootstrap.orig 2008-02-02 03:11:59.000000000 +1100
++++ bootstrap 2008-12-29 16:52:24.000000000 +1100
+@@ -22,17 +22,17 @@
+ case $sub in
+ .)
+ top_srcdir=.
+- acfiles="$top_srcdir/libtool.m4"
++ acfiles="$top_srcdir/libtool1.m4"
+ AUTOMAKE_FLAGS="--gnu --add-missing --copy"
+ ;;
+ libltdl)
+ top_srcdir=..
+- acfiles="$top_srcdir/libtool.m4 $top_srcdir/ltdl.m4"
++ acfiles="$top_srcdir/libtool1.m4 $top_srcdir/ltdl1.m4"
+ AUTOMAKE_FLAGS="--gnits --add-missing --copy"
+ ;;
+ *)
+ top_srcdir=..
+- acfiles="$top_srcdir/libtool.m4"
++ acfiles="$top_srcdir/libtool1.m4"
+ AUTOMAKE_FLAGS="--gnits --add-missing"
+ ;;
+ esac
Added: trunk/dports/devel/libtool1/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/devel/libtool1/files/patch-configure.ac.diff (rev 0)
+++ trunk/dports/devel/libtool1/files/patch-configure.ac.diff 2008-12-29 06:23:26 UTC (rev 44472)
@@ -0,0 +1,11 @@
+--- configure.ac.orig 2008-02-02 03:26:13.000000000 +1100
++++ configure.ac 2008-12-29 17:18:29.000000000 +1100
+@@ -25,7 +25,7 @@
+ ## ------------------------ ##
+ ## Autoconf initialisation. ##
+ ## ------------------------ ##
+-AC_INIT([libtool], [1.5.26], [bug-libtool at gnu.org])
++AC_INIT([libtool1], [1.5.26], [bug-libtool at gnu.org])
+ AC_CONFIG_SRCDIR([ltmain.in])
+
+
Modified: trunk/dports/devel/libtool1/files/patch-configure.diff
===================================================================
--- trunk/dports/devel/libtool1/files/patch-configure.diff 2008-12-29 05:15:16 UTC (rev 44471)
+++ trunk/dports/devel/libtool1/files/patch-configure.diff 2008-12-29 06:23:26 UTC (rev 44472)
@@ -1,6 +1,6 @@
---- configure.orig 2008-12-03 02:02:36.000000000 +1100
-+++ configure 2008-12-03 02:09:15.000000000 +1100
-@@ -750,7 +750,7 @@
+--- configure.orig 2008-02-02 03:38:42.000000000 +1100
++++ configure 2008-12-29 17:07:30.000000000 +1100
+@@ -728,7 +728,7 @@
SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
@@ -9,3 +9,12 @@
PACKAGE_TARNAME='libtool'
PACKAGE_VERSION='1.5.26'
PACKAGE_STRING='libtool 1.5.26'
+@@ -2322,7 +2322,7 @@
+
+
+ # Define the identity of the package.
+- PACKAGE=libtool
++ PACKAGE=libtool1
+ VERSION=1.5.26
+
+
Added: trunk/dports/devel/libtool1/files/patch-libtoolize.in.diff
===================================================================
--- trunk/dports/devel/libtool1/files/patch-libtoolize.in.diff (rev 0)
+++ trunk/dports/devel/libtool1/files/patch-libtoolize.in.diff 2008-12-29 06:23:26 UTC (rev 44472)
@@ -0,0 +1,13 @@
+--- libtoolize.in.orig 2008-02-02 03:12:00.000000000 +1100
++++ libtoolize.in 2008-12-29 16:50:27.000000000 +1100
+@@ -39,8 +39,8 @@
+ pkgdatadir=@pkgdatadir@
+ aclocaldir=@aclocaldir@
+
+-libtool_m4="$aclocaldir/libtool.m4"
+-ltdl_m4="$aclocaldir/ltdl.m4"
++libtool_m4="$aclocaldir/libtool1.m4"
++ltdl_m4="$aclocaldir/ltdl1.m4"
+
+ dry_run=no
+ help="Try \`$progname --help' for more information."
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081228/d34cb5c7/attachment.html>
More information about the macports-changes
mailing list