cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update tkimg to 1.4

Browse Source 
Now supporting new format: DTED, RAW.
indexing TIFF images is now possible
and lots of other updates/fixes.

OK landry@, jasper@
This commit is contained in:
sebastia 2010-09-21 08:27:32 +00:00
parent a4a944c820
commit 15b04968d8
26 changed files with 72 additions and 405 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
graphics/tkimg/Makefile
View File

@ -1,18 +1,18 @@
# $OpenBSD: Makefile,v 1.2 2010/07/30 16:41:09 sebastia Exp $
# $OpenBSD: Makefile,v 1.3 2010/09/21 08:27:32 sebastia Exp $
SHARED_ONLY = Yes
COMMENT = image extension for Tcl/Tk
V = 1.3
V = 1.4
DISTNAME = tkimg$V
PKGNAME = tkimg-$V
SHLIB_VERSION = 0.0
.for _lib in tkimgbmp13 tkimg13 tkimggif13 tkimgico13 tkimgjpeg13 \
tkimgpcx13 tkimgpixmap13 tkimgpng13 tkimgppm13 tkimgps13 \
tkimgsgi13 tkimgsun13 tkimgtga13 tkimgtiff13 tkimgwindow13 \
tkimgxbm13 tkimgxpm13 zlibtcl121 jpegtcl10 pngtcl126 \
tifftcl361
.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
SHARED_LIBS += ${_lib} ${SHLIB_VERSION}
.endfor
@ -33,14 +33,14 @@ WANTLIB += freetype m z pthread-stubs xcb
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=tkimg/}
MODULES = x11/tk
BUILD_DEPENDS = ${MODTK_BUILD_DEPENDS}
BUILD_DEPENDS = ${MODTK_BUILD_DEPENDS} \
::devel/tcllib
RUN_DEPENDS = ${MODTK_RUN_DEPENDS}
REGRESS_DEPENDS = ::${PKGPATH}
SEPARATE_BUILD = simple
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS= --prefix=${PREFIX} \
--with-tcl=${MODTCL_LIBDIR} \
CONFIGURE_ARGS= --with-tcl=${MODTCL_LIBDIR} \
--with-tclinclude=$(MODTCL_INCDIR) \
--with-tk=${MODTK_LIBDIR} \
--with-tkinclude=${MODTK_INCDIR} \
@ -48,16 +48,8 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \
--x-includes=${X11BASE}/include
REGRESS_IS_INTERACTIVE = X11
REGRESS_TARGET = test
IMGLIBDIR = Img${V}
INSTALL_TARGET = collate
FAKE_FLAGS = INSTALL_ROOT=${DESTDIR}
CONFIGURE_ENV = SHLIB_VERSION=${SHLIB_VERSION} IMGLIBDIR=${IMGLIBDIR}
post-install:
# disable img::png when requiring package Img
# regressions are still segfaulting when testing img::png, at least other
# tcl/tk apps requiring package Img are prevented from segfaulting
perl -pi -e s,' package require img::png','',g \
${PREFIX}/lib/Img1.3/pkgIndex.tcl
FAKE_FLAGS+= INSTALL_ROOT=${DESTDIR}
CONFIGURE_ENV = SHLIB_VERSION=${SHLIB_VERSION}
.include <bsd.port.mk>

10
graphics/tkimg/distinfo
View File

@ -1,5 +1,5 @@
MD5 (tkimg1.3.tar.gz) = lkppLbihINxe2HeVIacLyA==
RMD160 (tkimg1.3.tar.gz) = qHw4EhOYCTHDil72gh6cBOP/1IY=
SHA1 (tkimg1.3.tar.gz) = qiTNjZVydLy+SmJDxusqpMMmAWw=
SHA256 (tkimg1.3.tar.gz) = /lqbHDVihsr/Ev/hIGT+204DYm4UXYXnz9Ixz+b6YFA=
SIZE (tkimg1.3.tar.gz) = 3969630
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

40
graphics/tkimg/patches/patch-Makefile_in
View File

@ -1,27 +1,35 @@
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2010/07/28 17:04:55 sebastia Exp $
$OpenBSD: patch-Makefile_in,v 1.2 2010/09/21 08:27:32 sebastia Exp $
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 Wed Aug 18 19:10:38 2004
+++ Makefile.in Tue Jul 20 15:52:14 2010
@@ -117,14 +117,14 @@ collate: all
here=`pwd` ; \
cd $$sub ; \
--- Makefile.in.orig Mon May 3 17:32:03 2010
+++ Makefile.in Mon Sep 20 16:14:42 2010
@@ -128,20 +128,15 @@ collate: all
here=`pwd` && \
cd $$sub && \
$(MAKE) install \
- exec_prefix=$$here/Img/exec_prefix \
- prefix=$$here/Img/prefix \
- pkglibdir=$$here/Img/exec_prefix/lib/Img \
+ exec_prefix=$(prefix)/ \
+ prefix=$(prefix)/ \
+ pkglibdir=$(LIB_RUNTIME_DIR)/ \
; \
cd $$here ; \
- libdir=$$here/Img/exec_prefix/lib \
- includedir=$$here/Img/prefix/include \
- DESTDIR= \
+ exec_prefix=$(prefix)/ \
+ prefix=$(prefix)/ \
+ pkglibdir=$(LIB_RUNTIME_DIR)/ \
+ libdir=$(prefix)/lib/ \
+ includedir=$(prefix)/include/ \
|| exit $$? && \
- cd $$here && \
- if test "x$(SHARED_BUILD)" = "x1"; then \
- cat Img/exec_prefix/lib/Img/pkgIndex.tcl >> pkgIndex.tcl ; \
+ cat $$sub/pkgIndex.tcl >> pkgIndex.tcl ; \
- fi ; \
+ cd $$here ; \
done
- mv pkgIndex.tcl Img/exec_prefix/lib/Img/pkgIndex.tcl
+ mv pkgIndex.tcl $(INSTALL_ROOT)/$(LIB_RUNTIME_DIR)/pkgIndex.tcl
install: collate
mkdir -p $(INSTALL_ROOT)$(LIB_RUNTIME_DIR)
- 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#' \
$$p > $$p.1 && mv -f $$p.1 $$p ; \
done

24
graphics/tkimg/patches/patch-base_configure
View File

@ -1,24 +0,0 @@
$OpenBSD: patch-base_configure,v 1.1.1.1 2010/07/28 17:04:55 sebastia Exp $
IMGLIBDIR to set correct paths in tkimgConfig.sh
--- base/configure.orig Wed Aug 18 19:10:38 2004
+++ base/configure Tue Jul 20 17:08:58 2010
@@ -4709,7 +4709,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "yes" >/dev/null 2>&1; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.${SHLIB_VERSION}'
else
rm -rf conftest*
echo "$ac_t""no" 1>&6
@@ -5913,7 +5913,7 @@ fi
#--------------------------------------------------------------------
# pkglibdir must be a fully qualified path and (not ${exec_prefix}/lib)
- eval pkglibdir="${libdir}/tkimg${VERSION}"
+ eval pkglibdir="${libdir}/${IMGLIBDIR}"
if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
eval tkimg_LIB_FLAG="-ltkimg${VERSION}${DBGX}"
else

15
graphics/tkimg/patches/patch-base_tkimg_h
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-base_tkimg_h,v 1.1.1.1 2010/07/28 17:04:55 sebastia Exp $
fix implicit function declarations
--- base/tkimg.h.orig Wed Aug 18 19:10:38 2004
+++ base/tkimg.h Sun Jul 18 18:35:07 2010
@@ -22,6 +22,8 @@
#define __TKIMG_H__
#include <stdio.h> /* stdout, and other definitions */
+#include <stdlib.h> /* malloc and friends */
+#include <string.h> /* memcpy, memset, strlen and friends */
#include "tk.h"
/*

12
graphics/tkimg/patches/patch-bmp_configure
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-bmp_configure,v 1.1.1.1 2010/07/28 17:04:55 sebastia Exp $
--- bmp/configure.orig Wed Aug 18 19:10:38 2004
+++ bmp/configure Sun Jul 18 16:57:36 2010
@@ -4865,7 +4865,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "yes" >/dev/null 2>&1; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.${SHLIB_VERSION}'
else
rm -rf conftest*
echo "$ac_t""no" 1>&6

12
graphics/tkimg/patches/patch-gif_configure
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gif_configure,v 1.1.1.1 2010/07/28 17:04:55 sebastia Exp $
--- gif/configure.orig Sun Jul 18 17:07:07 2010
+++ gif/configure Sun Jul 18 17:07:27 2010
@@ -4864,7 +4864,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "yes" >/dev/null 2>&1; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.${SHLIB_VERSION}'
else
rm -rf conftest*
echo "$ac_t""no" 1>&6

12
graphics/tkimg/patches/patch-ico_configure
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-ico_configure,v 1.1.1.1 2010/07/28 17:04:55 sebastia Exp $
--- ico/configure.orig Sun Jul 18 17:08:01 2010
+++ ico/configure Sun Jul 18 17:08:31 2010
@@ -4864,7 +4864,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "yes" >/dev/null 2>&1; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.${SHLIB_VERSION}'
else
rm -rf conftest*
echo "$ac_t""no" 1>&6

12
graphics/tkimg/patches/patch-jpeg_configure
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-jpeg_configure,v 1.1.1.1 2010/07/28 17:04:55 sebastia Exp $
--- jpeg/configure.orig Sun Jul 18 17:08:42 2010
+++ jpeg/configure Sun Jul 18 17:09:04 2010
@@ -5013,7 +5013,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "yes" >/dev/null 2>&1; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.${SHLIB_VERSION}'
else
rm -rf conftest*
echo "$ac_t""no" 1>&6

24
graphics/tkimg/patches/patch-libjpeg_tcl_configure
View File

@ -1,24 +0,0 @@
$OpenBSD: patch-libjpeg_tcl_configure,v 1.1.1.1 2010/07/28 17:04:55 sebastia Exp $
IMGLIBDIR to correctly set paths for jpegtclConfig.sh
--- libjpeg/tcl/configure.orig Wed Aug 18 19:10:40 2004
+++ libjpeg/tcl/configure Tue Jul 20 17:03:53 2010
@@ -4497,7 +4497,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "yes" >/dev/null 2>&1; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.${SHLIB_VERSION}'
else
rm -rf conftest*
echo "$ac_t""no" 1>&6
@@ -5279,7 +5279,7 @@ fi
#--------------------------------------------------------------------
# pkglibdir must be a fully qualified path and (not ${exec_prefix}/lib)
- eval pkglibdir="${libdir}/jpegtcl${VERSION}"
+ eval pkglibdir="${libdir}/${IMGLIBDIR}"
if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
eval jpegtcl_LIB_FLAG="-ljpegtcl${VERSION}${DBGX}"
else

24
graphics/tkimg/patches/patch-libpng_tcl_configure
View File

@ -1,24 +0,0 @@
$OpenBSD: patch-libpng_tcl_configure,v 1.1.1.1 2010/07/28 17:04:55 sebastia Exp $
IMGLIBDIR to correctly set paths for pngtclConfig.sh
--- libpng/tcl/configure.orig Wed Aug 18 19:10:43 2004
+++ libpng/tcl/configure Tue Jul 20 17:04:21 2010
@@ -4640,7 +4640,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "yes" >/dev/null 2>&1; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.${SHLIB_VERSION}'
else
rm -rf conftest*
echo "$ac_t""no" 1>&6
@@ -5432,7 +5432,7 @@ fi
#--------------------------------------------------------------------
# pkglibdir must be a fully qualified path and (not ${exec_prefix}/lib)
- eval pkglibdir="${libdir}/pngtcl${VERSION}"
+ eval pkglibdir="${libdir}/${IMGLIBDIR}"
if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
eval pngtcl_LIB_FLAG="-lpngtcl${VERSION}${DBGX}"
else

24
graphics/tkimg/patches/patch-libtiff_tcl_configure
View File

@ -1,24 +0,0 @@
$OpenBSD: patch-libtiff_tcl_configure,v 1.1.1.1 2010/07/28 17:04:55 sebastia Exp $
IMGLIBDIR to correctly set paths for tifftclConfig.sh
--- libtiff/tcl/configure.orig Wed Aug 18 19:10:47 2004
+++ libtiff/tcl/configure Tue Jul 20 17:04:52 2010
@@ -4605,7 +4605,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "yes" >/dev/null 2>&1; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.${SHLIB_VERSION}'
else
rm -rf conftest*
echo "$ac_t""no" 1>&6
@@ -5387,7 +5387,7 @@ fi
#--------------------------------------------------------------------
# pkglibdir must be a fully qualified path and (not ${exec_prefix}/lib)
- eval pkglibdir="${libdir}/tifftcl${VERSION}"
+ eval pkglibdir="${libdir}/${IMGLIBDIR}"
if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
eval tifftcl_LIB_FLAG="-ltifftcl${VERSION}${DBGX}"
else

24
graphics/tkimg/patches/patch-libz_tcl_configure
View File

@ -1,24 +0,0 @@
$OpenBSD: patch-libz_tcl_configure,v 1.1.1.1 2010/07/28 17:04:55 sebastia Exp $
IMGLIBDIR to correctly set paths for zlibtclConfig.sh
--- libz/tcl/configure.orig Wed Aug 18 19:10:49 2004
+++ libz/tcl/configure Tue Jul 20 17:05:23 2010
@@ -4495,7 +4495,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "yes" >/dev/null 2>&1; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.${SHLIB_VERSION}'
else
rm -rf conftest*
echo "$ac_t""no" 1>&6
@@ -5277,7 +5277,7 @@ fi
#--------------------------------------------------------------------
# pkglibdir must be a fully qualified path and (not ${exec_prefix}/lib)
- eval pkglibdir="${libdir}/zlibtcl${VERSION}"
+ eval pkglibdir="${libdir}/${IMGLIBDIR}"
if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
eval zlibtcl_LIB_FLAG="-lzlibtcl${VERSION}${DBGX}"
else

12
graphics/tkimg/patches/patch-pcx_configure
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-pcx_configure,v 1.1.1.1 2010/07/28 17:04:55 sebastia Exp $
--- pcx/configure.orig Sun Jul 18 17:10:04 2010
+++ pcx/configure Sun Jul 18 17:10:27 2010
@@ -4864,7 +4864,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "yes" >/dev/null 2>&1; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.${SHLIB_VERSION}'
else
rm -rf conftest*
echo "$ac_t""no" 1>&6

12
graphics/tkimg/patches/patch-pixmap_configure
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-pixmap_configure,v 1.1.1.1 2010/07/28 17:04:55 sebastia Exp $
--- pixmap/configure.orig Sun Jul 18 17:11:04 2010
+++ pixmap/configure Sun Jul 18 17:11:39 2010
@@ -4939,7 +4939,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "yes" >/dev/null 2>&1; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.${SHLIB_VERSION}'
else
rm -rf conftest*
echo "$ac_t""no" 1>&6

12
graphics/tkimg/patches/patch-png_configure
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-png_configure,v 1.1.1.1 2010/07/28 17:04:55 sebastia Exp $
--- png/configure.orig Sun Jul 18 17:11:47 2010
+++ png/configure Sun Jul 18 17:12:13 2010
@@ -5161,7 +5161,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "yes" >/dev/null 2>&1; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.${SHLIB_VERSION}'
else
rm -rf conftest*
echo "$ac_t""no" 1>&6

12
graphics/tkimg/patches/patch-ppm_configure
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-ppm_configure,v 1.1.1.1 2010/07/28 17:04:55 sebastia Exp $
--- ppm/configure.orig Sun Jul 18 17:12:37 2010
+++ ppm/configure Sun Jul 18 17:13:15 2010
@@ -4864,7 +4864,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "yes" >/dev/null 2>&1; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.${SHLIB_VERSION}'
else
rm -rf conftest*
echo "$ac_t""no" 1>&6

12
graphics/tkimg/patches/patch-ps_configure
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-ps_configure,v 1.1.1.1 2010/07/28 17:04:55 sebastia Exp $
--- ps/configure.orig Sun Jul 18 17:14:25 2010
+++ ps/configure Sun Jul 18 17:14:56 2010
@@ -4866,7 +4866,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "yes" >/dev/null 2>&1; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.${SHLIB_VERSION}'
else
rm -rf conftest*
echo "$ac_t""no" 1>&6

12
graphics/tkimg/patches/patch-sgi_configure
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-sgi_configure,v 1.1.1.1 2010/07/28 17:04:55 sebastia Exp $
--- sgi/configure.orig Sun Jul 18 17:15:16 2010
+++ sgi/configure Sun Jul 18 17:15:30 2010
@@ -4864,7 +4864,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "yes" >/dev/null 2>&1; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.${SHLIB_VERSION}'
else
rm -rf conftest*
echo "$ac_t""no" 1>&6

12
graphics/tkimg/patches/patch-sun_configure
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-sun_configure,v 1.1.1.1 2010/07/28 17:04:55 sebastia Exp $
--- sun/configure.orig Sun Jul 18 17:15:53 2010
+++ sun/configure Sun Jul 18 17:16:16 2010
@@ -4864,7 +4864,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "yes" >/dev/null 2>&1; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.${SHLIB_VERSION}'
else
rm -rf conftest*
echo "$ac_t""no" 1>&6

12
graphics/tkimg/patches/patch-tga_configure
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-tga_configure,v 1.1.1.1 2010/07/28 17:04:55 sebastia Exp $
--- tga/configure.orig Sun Jul 18 17:16:43 2010
+++ tga/configure Sun Jul 18 17:17:00 2010
@@ -4864,7 +4864,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "yes" >/dev/null 2>&1; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.${SHLIB_VERSION}'
else
rm -rf conftest*
echo "$ac_t""no" 1>&6

12
graphics/tkimg/patches/patch-tiff_configure
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-tiff_configure,v 1.1.1.1 2010/07/28 17:04:55 sebastia Exp $
--- tiff/configure.orig Sun Jul 18 17:17:25 2010
+++ tiff/configure Sun Jul 18 17:17:48 2010
@@ -5309,7 +5309,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "yes" >/dev/null 2>&1; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.${SHLIB_VERSION}'
else
rm -rf conftest*
echo "$ac_t""no" 1>&6

12
graphics/tkimg/patches/patch-window_configure
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-window_configure,v 1.1.1.1 2010/07/28 17:04:55 sebastia Exp $
--- window/configure.orig Sun Jul 18 17:18:31 2010
+++ window/configure Sun Jul 18 17:18:59 2010
@@ -4939,7 +4939,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "yes" >/dev/null 2>&1; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.${SHLIB_VERSION}'
else
rm -rf conftest*
echo "$ac_t""no" 1>&6

12
graphics/tkimg/patches/patch-xbm_configure
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-xbm_configure,v 1.1.1.1 2010/07/28 17:04:55 sebastia Exp $
--- xbm/configure.orig Sun Jul 18 17:19:18 2010
+++ xbm/configure Sun Jul 18 17:19:38 2010
@@ -4864,7 +4864,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "yes" >/dev/null 2>&1; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.${SHLIB_VERSION}'
else
rm -rf conftest*
echo "$ac_t""no" 1>&6

12
graphics/tkimg/patches/patch-xpm_configure
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-xpm_configure,v 1.1.1.1 2010/07/28 17:04:55 sebastia Exp $
--- xpm/configure.orig Sun Jul 18 17:20:05 2010
+++ xpm/configure Sun Jul 18 17:20:28 2010
@@ -4864,7 +4864,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "yes" >/dev/null 2>&1; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.${SHLIB_VERSION}'
else
rm -rf conftest*
echo "$ac_t""no" 1>&6

68
graphics/tkimg/pkg/PLIST
View File

@ -1,50 +1,44 @@
@comment $OpenBSD: PLIST,v 1.2 2010/07/30 16:41:09 sebastia Exp $
@comment $OpenBSD: PLIST,v 1.3 2010/09/21 08:27:32 sebastia Exp $
include/jpegtcl.h
include/jpegtclDecls.h
include/jpegtclDeclsMask.h
include/jpegtclDeclsUnmask.h
include/pngtcl.h
include/pngtclDecls.h
include/pngtclDeclsMask.h
include/pngtclDeclsUnmask.h
include/tifftcl.h
include/tifftclDecls.h
include/tifftclDeclsMask.h
include/tifftclDeclsUnmask.h
include/tkimg.h
include/tkimgDecls.h
include/zlibtcl.h
include/zlibtclDecls.h
include/zlibtclDeclsMask.h
include/zlibtclDeclsUnmask.h
lib/Img1.3/
@lib lib/Img1.3/libjpegtcl10.so.${LIBjpegtcl10_VERSION}
lib/Img1.3/libjpegtclstub10.a
@lib lib/Img1.3/libpngtcl126.so.${LIBpngtcl126_VERSION}
lib/Img1.3/libpngtclstub126.a
@lib lib/Img1.3/libtifftcl361.so.${LIBtifftcl361_VERSION}
lib/Img1.3/libtifftclstub361.a
@lib lib/Img1.3/libtkimg13.so.${LIBtkimg13_VERSION}
@lib lib/Img1.3/libtkimgbmp13.so.${LIBtkimgbmp13_VERSION}
@lib lib/Img1.3/libtkimggif13.so.${LIBtkimggif13_VERSION}
@lib lib/Img1.3/libtkimgico13.so.${LIBtkimgico13_VERSION}
@lib lib/Img1.3/libtkimgjpeg13.so.${LIBtkimgjpeg13_VERSION}
@lib lib/Img1.3/libtkimgpcx13.so.${LIBtkimgpcx13_VERSION}
@lib lib/Img1.3/libtkimgpixmap13.so.${LIBtkimgpixmap13_VERSION}
@lib lib/Img1.3/libtkimgpng13.so.${LIBtkimgpng13_VERSION}
@lib lib/Img1.3/libtkimgppm13.so.${LIBtkimgppm13_VERSION}
@lib lib/Img1.3/libtkimgps13.so.${LIBtkimgps13_VERSION}
@lib lib/Img1.3/libtkimgsgi13.so.${LIBtkimgsgi13_VERSION}
lib/Img1.3/libtkimgstub13.a
@lib lib/Img1.3/libtkimgsun13.so.${LIBtkimgsun13_VERSION}
@lib lib/Img1.3/libtkimgtga13.so.${LIBtkimgtga13_VERSION}
@lib lib/Img1.3/libtkimgtiff13.so.${LIBtkimgtiff13_VERSION}
@lib lib/Img1.3/libtkimgwindow13.so.${LIBtkimgwindow13_VERSION}
@lib lib/Img1.3/libtkimgxbm13.so.${LIBtkimgxbm13_VERSION}
@lib lib/Img1.3/libtkimgxpm13.so.${LIBtkimgxpm13_VERSION}
@lib lib/Img1.3/libzlibtcl121.so.${LIBzlibtcl121_VERSION}
lib/Img1.3/libzlibtclstub121.a
lib/Img1.3/pkgIndex.tcl
lib/Img1.4/
@lib lib/Img1.4/libjpegtcl82.so.${LIBjpegtcl82_VERSION}
lib/Img1.4/libjpegtclstub82.a
@lib lib/Img1.4/libpngtcl143.so.${LIBpngtcl143_VERSION}
lib/Img1.4/libpngtclstub143.a
@lib lib/Img1.4/libtifftcl394.so.${LIBtifftcl394_VERSION}
lib/Img1.4/libtifftclstub394.a
@lib lib/Img1.4/libtkimg14.so.${LIBtkimg14_VERSION}
@lib lib/Img1.4/libtkimgbmp14.so.${LIBtkimgbmp14_VERSION}
@lib lib/Img1.4/libtkimgdted14.so.${LIBtkimgdted14_VERSION}
@lib lib/Img1.4/libtkimggif14.so.${LIBtkimggif14_VERSION}
@lib lib/Img1.4/libtkimgico14.so.${LIBtkimgico14_VERSION}
@lib lib/Img1.4/libtkimgjpeg14.so.${LIBtkimgjpeg14_VERSION}
@lib lib/Img1.4/libtkimgpcx14.so.${LIBtkimgpcx14_VERSION}
@lib lib/Img1.4/libtkimgpixmap14.so.${LIBtkimgpixmap14_VERSION}
@lib lib/Img1.4/libtkimgpng14.so.${LIBtkimgpng14_VERSION}
@lib lib/Img1.4/libtkimgppm14.so.${LIBtkimgppm14_VERSION}
@lib lib/Img1.4/libtkimgps14.so.${LIBtkimgps14_VERSION}
@lib lib/Img1.4/libtkimgraw14.so.${LIBtkimgraw14_VERSION}
@lib lib/Img1.4/libtkimgsgi14.so.${LIBtkimgsgi14_VERSION}
lib/Img1.4/libtkimgstub14.a
@lib lib/Img1.4/libtkimgsun14.so.${LIBtkimgsun14_VERSION}
@lib lib/Img1.4/libtkimgtga14.so.${LIBtkimgtga14_VERSION}
@lib lib/Img1.4/libtkimgtiff14.so.${LIBtkimgtiff14_VERSION}
@lib lib/Img1.4/libtkimgwindow14.so.${LIBtkimgwindow14_VERSION}
@lib lib/Img1.4/libtkimgxbm14.so.${LIBtkimgxbm14_VERSION}
@lib lib/Img1.4/libtkimgxpm14.so.${LIBtkimgxpm14_VERSION}
@lib lib/Img1.4/libzlibtcl125.so.${LIBzlibtcl125_VERSION}
lib/Img1.4/libzlibtclstub125.a
lib/Img1.4/pkgIndex.tcl
lib/jpegtclConfig.sh
lib/pngtclConfig.sh
lib/tifftclConfig.sh