Hi,
patch below updates tkimg to latest version.
changes:
- Will build correctly on more platforms (TEA upgraded
to latest version 3.9)
- upgrade to zlib 1.2.8, libjpeg-8d
- Added format option "-alpha" to PNG reader to be compatible with Tk 8.6.
- Bug fixes in various parsers to avoid core dumps when specifying a
wrong format option.
- upgrade to zlib 1.2.7, libpng-1.4.12, libtiff-3.9.4, libjpeg-8c
tested on amd64, passing all tests, and with the only consumer net/coccinella.
OK?
Sebastian
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/tkimg/Makefile,v
retrieving revision 1.9
diff -u -p -u -r1.9 Makefile
--- Makefile 11 Mar 2013 11:10:56 -0000 1.9
+++ Makefile 4 Nov 2014 10:13:04 -0000
@@ -4,16 +4,15 @@ SHARED_ONLY = Yes
COMMENT = image extension for Tcl/Tk
-V = 1.4
-REVISION = 1
+V = 1.4.2
DISTNAME = tkimg$V
PKGNAME = tkimg-$V
SHLIB_VERSION = 0.0
-.for _lib in tkimgbmp14 tkimg14 tkimggif14 tkimgico14 tkimgjpeg14 \
- tkimgpcx14 tkimgpixmap14 tkimgpng14 tkimgppm14 tkimgps14 \
- tkimgsgi14 tkimgsun14 tkimgtga14 tkimgtiff14 tkimgwindow14 \
- tkimgxbm14 tkimgxpm14 tkimgraw14 tkimgdted14 zlibtcl125 \
- jpegtcl82 pngtcl143 tifftcl394
+.for _lib in tkimgbmp142 tkimg142 tkimggif142 tkimgico142 tkimgjpeg142 \
+ tkimgpcx142 tkimgpixmap142 tkimgpng142 tkimgppm142 tkimgps142 \
+ tkimgsgi142 tkimgsun142 tkimgtga142 tkimgtiff142 tkimgwindow142 \
+ tkimgxbm142 tkimgxpm142 tkimgraw142 tkimgdted142 zlibtcl128 \
+ jpegtcl84 pngtcl1412 tifftcl394
SHARED_LIBS += ${_lib} ${SHLIB_VERSION}
.endfor
@@ -45,6 +44,7 @@ CONFIGURE_ARGS= --libdir=${MODTCL_TCLDIR
--with-tkinclude=${MODTK_INCDIR} \
--with-x \
--x-includes=${X11BASE}/include
+WRKDIST = ${WRKDIR}/tkimg1.4
TEST_IS_INTERACTIVE = X11
TEST_TARGET = test
INSTALL_TARGET = collate
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/tkimg/distinfo,v
retrieving revision 1.2
diff -u -p -u -r1.2 distinfo
--- distinfo 21 Sep 2010 08:27:32 -0000 1.2
+++ distinfo 4 Nov 2014 10:13:04 -0000
@@ -1,5 +1,2 @@
-MD5 (tkimg1.4.tar.gz) = wSJUDdbWw0Ht+dNg+jQ4lA==
-RMD160 (tkimg1.4.tar.gz) = rqQEjMWFiJwCjQi2YxeLH4usNtg=
-SHA1 (tkimg1.4.tar.gz) = JNK4kkKvWLXbkwTbr/2JXO8wBxc=
-SHA256 (tkimg1.4.tar.gz) = cfD72gwSKQorcLrWK90mdgRNdzYW2/BBqNkWx6JffyQ=
-SIZE (tkimg1.4.tar.gz) = 6578303
+SHA256 (tkimg1.4.2.tar.gz) = ONLBNB8zHgcT0Od3QXgpC+xQq1gmipjrJ31mMJMidZ4=
+SIZE (tkimg1.4.2.tar.gz) = 7257064
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/graphics/tkimg/patches/patch-Makefile_in,v
retrieving revision 1.3
diff -u -p -u -r1.3 patch-Makefile_in
--- patches/patch-Makefile_in 5 Jan 2011 18:33:14 -0000 1.3
+++ patches/patch-Makefile_in 4 Nov 2014 10:13:04 -0000
@@ -3,9 +3,9 @@ $OpenBSD: patch-Makefile_in,v 1.3 2011/0
Do not use the two-stages install here, just patch the first step (collate)
and make use of the INSTALL_TARGET in the ports Makefile
---- Makefile.in.orig Mon May 3 17:32:03 2010
-+++ Makefile.in Sun Dec 19 12:12:54 2010
-@@ -128,20 +128,15 @@ collate: all
+--- Makefile.in.orig Thu Nov 21 23:03:12 2013
++++ Makefile.in Tue Nov 4 10:41:35 2014
+@@ -129,22 +129,15 @@ collate: all
here=`pwd` && \
cd $$sub && \
$(MAKE) install \
@@ -27,7 +27,9 @@ and make use of the INSTALL_TARGET in th
- fi ; \
+ cd $$here ; \
done
+- chmod ugo+w Img/exec_prefix/lib/Img/pkgIndex.tcl
- mv pkgIndex.tcl Img/exec_prefix/lib/Img/pkgIndex.tcl
+- chmod ugo+w Img/exec_prefix/lib/Img/pkgIndex.tcl
- for p in Img/exec_prefix/lib/*.sh ; do \
+ for p in $(INSTALL_ROOT)/$(prefix)/lib/*.sh ; do \
sed -e 's#$(libdir)/[^/ ]*\([/ ]\)#$(LIB_RUNTIME_DIR)\1#' \
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/tkimg/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -u -r1.4 PLIST
--- pkg/PLIST 5 Jan 2011 18:33:14 -0000 1.4
+++ pkg/PLIST 4 Nov 2014 10:13:04 -0000
@@ -13,79 +13,79 @@ lib/jpegtclConfig.sh
lib/pngtclConfig.sh
lib/tcl/tkimg/
lib/tcl/tkimg/base/
-@lib lib/tcl/tkimg/base/libtkimg14.so.${LIBtkimg14_VERSION}
-lib/tcl/tkimg/base/libtkimgstub14.a
+@lib lib/tcl/tkimg/base/libtkimg142.so.${LIBtkimg142_VERSION}
+lib/tcl/tkimg/base/libtkimgstub142.a
lib/tcl/tkimg/base/pkgIndex.tcl
lib/tcl/tkimg/bmp/
-@lib lib/tcl/tkimg/bmp/libtkimgbmp14.so.${LIBtkimgbmp14_VERSION}
+@lib lib/tcl/tkimg/bmp/libtkimgbmp142.so.${LIBtkimgbmp142_VERSION}
lib/tcl/tkimg/bmp/pkgIndex.tcl
lib/tcl/tkimg/dted/
-@lib lib/tcl/tkimg/dted/libtkimgdted14.so.${LIBtkimgdted14_VERSION}
+@lib lib/tcl/tkimg/dted/libtkimgdted142.so.${LIBtkimgdted142_VERSION}
lib/tcl/tkimg/dted/pkgIndex.tcl
lib/tcl/tkimg/gif/
-@lib lib/tcl/tkimg/gif/libtkimggif14.so.${LIBtkimggif14_VERSION}
+@lib lib/tcl/tkimg/gif/libtkimggif142.so.${LIBtkimggif142_VERSION}
lib/tcl/tkimg/gif/pkgIndex.tcl
lib/tcl/tkimg/ico/
-@lib lib/tcl/tkimg/ico/libtkimgico14.so.${LIBtkimgico14_VERSION}
+@lib lib/tcl/tkimg/ico/libtkimgico142.so.${LIBtkimgico142_VERSION}
lib/tcl/tkimg/ico/pkgIndex.tcl
lib/tcl/tkimg/jpeg/
-@lib lib/tcl/tkimg/jpeg/libtkimgjpeg14.so.${LIBtkimgjpeg14_VERSION}
+@lib lib/tcl/tkimg/jpeg/libtkimgjpeg142.so.${LIBtkimgjpeg142_VERSION}
lib/tcl/tkimg/jpeg/pkgIndex.tcl
lib/tcl/tkimg/libjpeg/
-@lib lib/tcl/tkimg/libjpeg/libjpegtcl82.so.${LIBjpegtcl82_VERSION}
-lib/tcl/tkimg/libjpeg/libjpegtclstub82.a
+@lib lib/tcl/tkimg/libjpeg/libjpegtcl84.so.${LIBjpegtcl84_VERSION}
+lib/tcl/tkimg/libjpeg/libjpegtclstub84.a
lib/tcl/tkimg/libjpeg/pkgIndex.tcl
lib/tcl/tkimg/libpng/
-@lib lib/tcl/tkimg/libpng/libpngtcl143.so.${LIBpngtcl143_VERSION}
-lib/tcl/tkimg/libpng/libpngtclstub143.a
+@lib lib/tcl/tkimg/libpng/libpngtcl1412.so.${LIBpngtcl1412_VERSION}
+lib/tcl/tkimg/libpng/libpngtclstub1412.a
lib/tcl/tkimg/libpng/pkgIndex.tcl
lib/tcl/tkimg/libtiff/
@lib lib/tcl/tkimg/libtiff/libtifftcl394.so.${LIBtifftcl394_VERSION}
lib/tcl/tkimg/libtiff/libtifftclstub394.a
lib/tcl/tkimg/libtiff/pkgIndex.tcl
lib/tcl/tkimg/pcx/
-@lib lib/tcl/tkimg/pcx/libtkimgpcx14.so.${LIBtkimgpcx14_VERSION}
+@lib lib/tcl/tkimg/pcx/libtkimgpcx142.so.${LIBtkimgpcx142_VERSION}
lib/tcl/tkimg/pcx/pkgIndex.tcl
lib/tcl/tkimg/pixmap/
-@lib lib/tcl/tkimg/pixmap/libtkimgpixmap14.so.${LIBtkimgpixmap14_VERSION}
+@lib lib/tcl/tkimg/pixmap/libtkimgpixmap142.so.${LIBtkimgpixmap142_VERSION}
lib/tcl/tkimg/pixmap/pkgIndex.tcl
lib/tcl/tkimg/pkgIndex.tcl
lib/tcl/tkimg/png/
-@lib lib/tcl/tkimg/png/libtkimgpng14.so.${LIBtkimgpng14_VERSION}
+@lib lib/tcl/tkimg/png/libtkimgpng142.so.${LIBtkimgpng142_VERSION}
lib/tcl/tkimg/png/pkgIndex.tcl
lib/tcl/tkimg/ppm/
-@lib lib/tcl/tkimg/ppm/libtkimgppm14.so.${LIBtkimgppm14_VERSION}
+@lib lib/tcl/tkimg/ppm/libtkimgppm142.so.${LIBtkimgppm142_VERSION}
lib/tcl/tkimg/ppm/pkgIndex.tcl
lib/tcl/tkimg/ps/
-@lib lib/tcl/tkimg/ps/libtkimgps14.so.${LIBtkimgps14_VERSION}
+@lib lib/tcl/tkimg/ps/libtkimgps142.so.${LIBtkimgps142_VERSION}
lib/tcl/tkimg/ps/pkgIndex.tcl
lib/tcl/tkimg/raw/
-@lib lib/tcl/tkimg/raw/libtkimgraw14.so.${LIBtkimgraw14_VERSION}
+@lib lib/tcl/tkimg/raw/libtkimgraw142.so.${LIBtkimgraw142_VERSION}
lib/tcl/tkimg/raw/pkgIndex.tcl
lib/tcl/tkimg/sgi/
-@lib lib/tcl/tkimg/sgi/libtkimgsgi14.so.${LIBtkimgsgi14_VERSION}
+@lib lib/tcl/tkimg/sgi/libtkimgsgi142.so.${LIBtkimgsgi142_VERSION}
lib/tcl/tkimg/sgi/pkgIndex.tcl
lib/tcl/tkimg/sun/
-@lib lib/tcl/tkimg/sun/libtkimgsun14.so.${LIBtkimgsun14_VERSION}
+@lib lib/tcl/tkimg/sun/libtkimgsun142.so.${LIBtkimgsun142_VERSION}
lib/tcl/tkimg/sun/pkgIndex.tcl
lib/tcl/tkimg/tga/
-@lib lib/tcl/tkimg/tga/libtkimgtga14.so.${LIBtkimgtga14_VERSION}
+@lib lib/tcl/tkimg/tga/libtkimgtga142.so.${LIBtkimgtga142_VERSION}
lib/tcl/tkimg/tga/pkgIndex.tcl
lib/tcl/tkimg/tiff/
-@lib lib/tcl/tkimg/tiff/libtkimgtiff14.so.${LIBtkimgtiff14_VERSION}
+@lib lib/tcl/tkimg/tiff/libtkimgtiff142.so.${LIBtkimgtiff142_VERSION}
lib/tcl/tkimg/tiff/pkgIndex.tcl
lib/tcl/tkimg/window/
-@lib lib/tcl/tkimg/window/libtkimgwindow14.so.${LIBtkimgwindow14_VERSION}
+@lib lib/tcl/tkimg/window/libtkimgwindow142.so.${LIBtkimgwindow142_VERSION}
lib/tcl/tkimg/window/pkgIndex.tcl
lib/tcl/tkimg/xbm/
-@lib lib/tcl/tkimg/xbm/libtkimgxbm14.so.${LIBtkimgxbm14_VERSION}
+@lib lib/tcl/tkimg/xbm/libtkimgxbm142.so.${LIBtkimgxbm142_VERSION}
lib/tcl/tkimg/xbm/pkgIndex.tcl
lib/tcl/tkimg/xpm/
-@lib lib/tcl/tkimg/xpm/libtkimgxpm14.so.${LIBtkimgxpm14_VERSION}
+@lib lib/tcl/tkimg/xpm/libtkimgxpm142.so.${LIBtkimgxpm142_VERSION}
lib/tcl/tkimg/xpm/pkgIndex.tcl
lib/tcl/tkimg/zlib/
-@lib lib/tcl/tkimg/zlib/libzlibtcl125.so.${LIBzlibtcl125_VERSION}
-lib/tcl/tkimg/zlib/libzlibtclstub125.a
+@lib lib/tcl/tkimg/zlib/libzlibtcl128.so.${LIBzlibtcl128_VERSION}
+lib/tcl/tkimg/zlib/libzlibtclstub128.a
lib/tcl/tkimg/zlib/pkgIndex.tcl
lib/tifftclConfig.sh
lib/tkimgConfig.sh
