GraphicsMagick: TclMagick: generate generic/pkgIndex.tcl automat...

changeset 9239a158ed86 in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=9239a158ed86
summary: TclMagick: generate generic/pkgIndex.tcl automatically and change pkgIndex.tcl

diffstat:

 ChangeLog                         |  5 +++++
 TclMagick/configure.ac            |  1 +
 TclMagick/generic/Makefile.am     |  2 ++
 TclMagick/generic/pkgIndex.tcl.in |  7 +++++++
 TclMagick/pkgIndex.tcl            |  3 ---
 www/Changelog.html                |  4 ++++
 6 files changed, 19 insertions(+), 3 deletions(-)

diffs (70 lines):

diff -r e97b16eaa9ff -r 9239a158ed86 ChangeLog
--- a/ChangeLog	Sat Jul 01 09:06:00 2023 -0500
+++ b/ChangeLog	Sat Jul 01 09:15:28 2023 -0500
@@ -1,5 +1,10 @@
 2023-07-01  Bob Friesenhahn  <[email protected]>
 
+	* TclMagick/{configure.ac, generic/Makefile.am,
+	generic/pkgIndex.tcl.in, pkgIndex.tcl}: SourceForge patch #74
+	"TclMagick: generate generic/pkgIndex.tcl automatically and change
+	pkgIndex.tcl".
+
 	* TclMagick/generic/Makefile.am: SourceForge patch #73 "TclMagick:
 	remove lib prefix from library files".
 
diff -r e97b16eaa9ff -r 9239a158ed86 TclMagick/configure.ac
--- a/TclMagick/configure.ac	Sat Jul 01 09:06:00 2023 -0500
+++ b/TclMagick/configure.ac	Sat Jul 01 09:15:28 2023 -0500
@@ -117,4 +117,5 @@
 AC_OUTPUT([
 Makefile
 generic/Makefile
+generic/pkgIndex.tcl
 ])
diff -r e97b16eaa9ff -r 9239a158ed86 TclMagick/generic/Makefile.am
--- a/TclMagick/generic/Makefile.am	Sat Jul 01 09:06:00 2023 -0500
+++ b/TclMagick/generic/Makefile.am	Sat Jul 01 09:15:28 2023 -0500
@@ -23,3 +23,5 @@
 TkMagick_la_LDFLAGS = @GM_LDFLAGS@ -L$(lib_magickdir) -no-undefined -module
 TkMagick_la_LIBADD = @TCL_STUB_LIB_SPEC@ @TK_STUB_LIB_SPEC@ @TCL_LIBS@ @TK_LIBS@ @GM_LIBS@ libttkcommon.la
 TkMagick_la_CPPFLAGS = @TCL_INCLUDES@ @GM_CPPFLAGS@ @TK_INCLUDES@ @TK_XINCLUDES@
+
+CLEANFILES = pkgIndex.tcl
diff -r e97b16eaa9ff -r 9239a158ed86 TclMagick/generic/pkgIndex.tcl.in
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/TclMagick/generic/pkgIndex.tcl.in	Sat Jul 01 09:15:28 2023 -0500
@@ -0,0 +1,7 @@
+package ifneeded @PACKAGE_NAME@ @PACKAGE_VERSION@ "
+[list load [file join $dir @PACKAGE_NAME@[info sharedlibextension]]]"
+
+package ifneeded TkMagick @PACKAGE_VERSION@ "
+package require Tk
+package require @PACKAGE_NAME@
+[list load [file join $dir TkMagick[info sharedlibextension]]]"
diff -r e97b16eaa9ff -r 9239a158ed86 TclMagick/pkgIndex.tcl
--- a/TclMagick/pkgIndex.tcl	Sat Jul 01 09:06:00 2023 -0500
+++ b/TclMagick/pkgIndex.tcl	Sat Jul 01 09:15:28 2023 -0500
@@ -1,9 +1,6 @@
 # Hand-written package index file.
 
 package ifneeded TclMagick 0.46 "
-if { ! [info exists ::env(MAGICK_CONFIGURE_PATH)] } {
-[list set ::env(MAGICK_CONFIGURE_PATH) [file join $dir config]]
-}
 [list load [file join $dir TclMagick[info sharedlibextension]]]"
 
 package ifneeded TkMagick 0.46 "
diff -r e97b16eaa9ff -r 9239a158ed86 www/Changelog.html
--- a/www/Changelog.html	Sat Jul 01 09:06:00 2023 -0500
+++ b/www/Changelog.html	Sat Jul 01 09:15:28 2023 -0500
@@ -40,6 +40,10 @@
 <p>2023-07-01  Bob Friesenhahn  &lt;<a class="reference external" href="mailto:bfriesen&#37;&#52;&#48;simple&#46;dallas&#46;tx&#46;us">bfriesen<span>&#64;</span>simple<span>&#46;</span>dallas<span>&#46;</span>tx<span>&#46;</span>us</a>&gt;</p>
 <blockquote>
 <ul class="simple">
+<li><p>TclMagick/{configure.ac, generic/Makefile.am,
+generic/pkgIndex.tcl.in, pkgIndex.tcl}: SourceForge patch #74
+&quot;TclMagick: generate generic/pkgIndex.tcl automatically and change
+pkgIndex.tcl&quot;.</p></li>
 <li><p>TclMagick/generic/Makefile.am: SourceForge patch #73 &quot;TclMagick:
 remove lib prefix from library files&quot;.</p></li>
 <li><p>TclMagick/unix/m4/tcl.m4: SourceForge patch #72 &quot;TclMagick: fix