After maintainer timeout, here is an update to graphics/tkimg.
I'm guessing the maintainer is no longer interested in TkImg
so I'll gladly take maintanership of the port.
I tried it quickly with Coccinella (the only consumer) and
I don't see any difference than with the older version of TkImg.
There were enough changes to the Makefile that I also did
a complete cleanup and reorganization.
I decided to not use the Makefile patch and instead
let TkImg perform the install as it wants.
With the right options in CONFIGURE_ARGS and some
other Makefile vars, this gives a nice result, with all the lib
files in one place and without a lot of directories and pkgIndex.tcl
files.
The include files are now in /usr/local/include/tkimg
instead of /usr/local/include, and all the *Config.sh files
are in /usr/local/lib/tcl/tkimg instead of in /usr/local/lib.
Man pages are also now installed.
Tests can be run without the package installing itself.
No need for SHARED_LIBS.
OK?
Stu
(patch attached in case of mailer mangling)
(port also attached in case patch is too hard to read)
diff -u -rNp /usr/ports/graphics/tkimg/Makefile ./Makefile
--- /usr/ports/graphics/tkimg/Makefile Fri Mar 11 14:23:28 2022
+++ ./Makefile Wed Aug 24 21:27:20 2022
@@ -1,55 +1,39 @@
-COMMENT = image extension for Tcl/Tk
+COMMENT = image extension for Tcl/Tk
-V = 1.4.2
-DISTNAME = tkimg$V
-PKGNAME = tkimg-$V
-SHLIB_VERSION = 0.0
-.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
-REVISION = 0
+V = 1.4.13
-CATEGORIES = graphics
+DISTNAME = Img-${V}-Source
+PKGNAME = tkimg-${V}
+CATEGORIES = graphics
+HOMEPAGE = http://tkimg.sourceforge.net/
+MAINTAINER = Stuart Cassoff <stwo@users.sourceforge.net>
-HOMEPAGE = http://tkimg.sourceforge.net/
-
-MAINTAINER = Sebastian Reitenbach <sebastia@openbsd.org>
-
# BSD
-PERMIT_PACKAGE = Yes
-
-WANTLIB += X11 Xext Xft Xss fontconfig m
-
+PERMIT_PACKAGE = Yes
+WANTLIB = X11 Xext Xft Xss fontconfig m
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=tkimg/}
-
MODULES = x11/tk
+
BUILD_DEPENDS = ${MODTK_BUILD_DEPENDS} \
devel/tcllib
+
RUN_DEPENDS = ${MODTK_RUN_DEPENDS}
-TEST_DEPENDS = ${PKGPATH}
+FAKE_FLAGS = INSTALL_ROOT=${DESTDIR} \
+ LIB_RUNTIME_DIR=${MODTCL_TCLDIR}/tkimg
+
+TEST_FLAGS = libdir=${WRKBUILD}
SEPARATE_BUILD = Yes
CONFIGURE_STYLE = gnu
-CONFIGURE_ARGS= --libdir=${MODTCL_TCLDIR} \
- --with-tcl=${MODTCL_LIBDIR} \
- --with-tclinclude=$(MODTCL_INCDIR) \
- --with-tk=${MODTK_LIBDIR} \
- --with-tkinclude=${MODTK_INCDIR} \
- --with-x \
- --x-includes=${X11BASE}/include
-WRKDIST = ${WRKDIR}/tkimg1.4
-TEST_IS_INTERACTIVE = X11
-TEST_TARGET = test
-INSTALL_TARGET = collate
-FAKE_FLAGS = INSTALL_ROOT=${DESTDIR}
LIB_RUNTIME_DIR=${MODTCL_TCLDIR}/tkimg
-CONFIGURE_ENV = SHLIB_VERSION=${SHLIB_VERSION}
-post-install:
- echo 'set auto_path [concat $$auto_path $$dir]' > \
- ${DESTDIR}${MODTCL_TCLDIR}/tkimg/pkgIndex.tcl
+CONFIGURE_ARGS = --libdir=${MODTCL_TCLDIR}/tkimg \
+ --includedir=${PREFIX}/include/tkimg \
+ --with-tcl=${MODTCL_LIBDIR} \
+ --with-tk=${MODTK_LIBDIR} \
+ --with-x
+
+TEST_IS_INTERACTIVE = X11
+WRKDIST = ${WRKDIR}/Img-${V}
+TEST_TARGET = test
.include <bsd.port.mk>
diff -u -rNp /usr/ports/graphics/tkimg/distinfo ./distinfo
--- /usr/ports/graphics/tkimg/distinfo Mon Nov 10 12:39:00 2014
+++ ./distinfo Sun Aug 7 06:36:48 2022
@@ -1,2 +1,2 @@
-SHA256 (tkimg1.4.2.tar.gz) =
ONLBNB8zHgcT0Od3QXgpC+xQq1gmipjrJ31mMJMidZ4=
-SIZE (tkimg1.4.2.tar.gz) = 7257064
+SHA256 (Img-1.4.13-Source.tar.gz) =
8IaMHK2XUtzxI0+B8AxBfTShHA8N1Jm6Rp3ynxxA0WM=
+SIZE (Img-1.4.13-Source.tar.gz) = 8366556
diff -u -rNp /usr/ports/graphics/tkimg/patches/patch-Makefile_in
./patches/patch-Makefile_in
--- /usr/ports/graphics/tkimg/patches/patch-Makefile_in Fri Mar 11
14:23:28 2022
+++ ./patches/patch-Makefile_in Wed Dec 31 19:00:00 1969
@@ -1,35 +0,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 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 \
-- exec_prefix=$$here/Img/exec_prefix \
-- prefix=$$here/Img/prefix \
-- pkglibdir=$$here/Img/exec_prefix/lib/Img \
-- libdir=$$here/Img/exec_prefix/lib \
-- includedir=$$here/Img/prefix/include \
-- DESTDIR= \
-+ exec_prefix=$(prefix)/ \
-+ prefix=$(prefix)/ \
-+ pkglibdir=$(LIB_RUNTIME_DIR)/$${sub} \
-+ 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 ; \
-- 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#' \
- $$p > $$p.1 && mv -f $$p.1 $$p ; \
- done
diff -u -rNp /usr/ports/graphics/tkimg/pkg/PLIST ./pkg/PLIST
--- /usr/ports/graphics/tkimg/pkg/PLIST Fri Mar 11 14:23:28 2022
+++ ./pkg/PLIST Wed Aug 24 16:54:14 2022
@@ -1,91 +1,66 @@
-include/jpegtcl.h
-include/jpegtclDecls.h
-include/pngtcl.h
-include/pngtclDecls.h
-include/tifftcl.h
-include/tifftclDecls.h
-include/tkimg.h
-include/tkimgDecls.h
-include/zlibtcl.h
-include/zlibtclDecls.h
-lib/jpegtclConfig.sh
-lib/pngtclConfig.sh
+include/tkimg/
+include/tkimg/jpegtcl.h
+include/tkimg/jpegtclDecls.h
+include/tkimg/pngtcl.h
+include/tkimg/pngtclDecls.h
+include/tkimg/tifftcl.h
+include/tkimg/tifftclDecls.h
+include/tkimg/tkimg.h
+include/tkimg/tkimgDecls.h
+include/tkimg/zlibtcl.h
+include/tkimg/zlibtclDecls.h
lib/tcl/tkimg/
-lib/tcl/tkimg/base/
-@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/libtkimgbmp142.so.${LIBtkimgbmp142_VERSION}
-lib/tcl/tkimg/bmp/pkgIndex.tcl
-lib/tcl/tkimg/dted/
-@lib lib/tcl/tkimg/dted/libtkimgdted142.so.${LIBtkimgdted142_VERSION}
-lib/tcl/tkimg/dted/pkgIndex.tcl
-lib/tcl/tkimg/gif/
-@lib lib/tcl/tkimg/gif/libtkimggif142.so.${LIBtkimggif142_VERSION}
-lib/tcl/tkimg/gif/pkgIndex.tcl
-lib/tcl/tkimg/ico/
-@lib lib/tcl/tkimg/ico/libtkimgico142.so.${LIBtkimgico142_VERSION}
-lib/tcl/tkimg/ico/pkgIndex.tcl
-lib/tcl/tkimg/jpeg/
-@lib lib/tcl/tkimg/jpeg/libtkimgjpeg142.so.${LIBtkimgjpeg142_VERSION}
-lib/tcl/tkimg/jpeg/pkgIndex.tcl
-lib/tcl/tkimg/libjpeg/
-@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/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/libtkimgpcx142.so.${LIBtkimgpcx142_VERSION}
-lib/tcl/tkimg/pcx/pkgIndex.tcl
-lib/tcl/tkimg/pixmap/
-@lib
lib/tcl/tkimg/pixmap/libtkimgpixmap142.so.${LIBtkimgpixmap142_VERSION}
-lib/tcl/tkimg/pixmap/pkgIndex.tcl
+lib/tcl/tkimg/jpegtclConfig.sh
+@so lib/tcl/tkimg/libjpegtcl940.so
+@static-lib lib/tcl/tkimg/libjpegtclstub940.a
+@so lib/tcl/tkimg/libpngtcl1637.so
+@static-lib lib/tcl/tkimg/libpngtclstub1637.a
+@so lib/tcl/tkimg/libtifftcl410.so
+@static-lib lib/tcl/tkimg/libtifftclstub410.a
+@so lib/tcl/tkimg/libtkimg1413.so
+@so lib/tcl/tkimg/libtkimgbmp1413.so
+@so lib/tcl/tkimg/libtkimgdted1413.so
+@so lib/tcl/tkimg/libtkimgflir1413.so
+@so lib/tcl/tkimg/libtkimggif1413.so
+@so lib/tcl/tkimg/libtkimgico1413.so
+@so lib/tcl/tkimg/libtkimgjpeg1413.so
+@so lib/tcl/tkimg/libtkimgpcx1413.so
+@so lib/tcl/tkimg/libtkimgpixmap1413.so
+@so lib/tcl/tkimg/libtkimgpng1413.so
+@so lib/tcl/tkimg/libtkimgppm1413.so
+@so lib/tcl/tkimg/libtkimgps1413.so
+@so lib/tcl/tkimg/libtkimgraw1413.so
+@so lib/tcl/tkimg/libtkimgsgi1413.so
+@static-lib lib/tcl/tkimg/libtkimgstub1413.a
+@so lib/tcl/tkimg/libtkimgsun1413.so
+@so lib/tcl/tkimg/libtkimgtga1413.so
+@so lib/tcl/tkimg/libtkimgtiff1413.so
+@so lib/tcl/tkimg/libtkimgwindow1413.so
+@so lib/tcl/tkimg/libtkimgxbm1413.so
+@so lib/tcl/tkimg/libtkimgxpm1413.so
+@so lib/tcl/tkimg/libzlibtcl1211.so
+@static-lib lib/tcl/tkimg/libzlibtclstub1211.a
lib/tcl/tkimg/pkgIndex.tcl
-lib/tcl/tkimg/png/
-@lib lib/tcl/tkimg/png/libtkimgpng142.so.${LIBtkimgpng142_VERSION}
-lib/tcl/tkimg/png/pkgIndex.tcl
-lib/tcl/tkimg/ppm/
-@lib lib/tcl/tkimg/ppm/libtkimgppm142.so.${LIBtkimgppm142_VERSION}
-lib/tcl/tkimg/ppm/pkgIndex.tcl
-lib/tcl/tkimg/ps/
-@lib lib/tcl/tkimg/ps/libtkimgps142.so.${LIBtkimgps142_VERSION}
-lib/tcl/tkimg/ps/pkgIndex.tcl
-lib/tcl/tkimg/raw/
-@lib lib/tcl/tkimg/raw/libtkimgraw142.so.${LIBtkimgraw142_VERSION}
-lib/tcl/tkimg/raw/pkgIndex.tcl
-lib/tcl/tkimg/sgi/
-@lib lib/tcl/tkimg/sgi/libtkimgsgi142.so.${LIBtkimgsgi142_VERSION}
-lib/tcl/tkimg/sgi/pkgIndex.tcl
-lib/tcl/tkimg/sun/
-@lib lib/tcl/tkimg/sun/libtkimgsun142.so.${LIBtkimgsun142_VERSION}
-lib/tcl/tkimg/sun/pkgIndex.tcl
-lib/tcl/tkimg/tga/
-@lib lib/tcl/tkimg/tga/libtkimgtga142.so.${LIBtkimgtga142_VERSION}
-lib/tcl/tkimg/tga/pkgIndex.tcl
-lib/tcl/tkimg/tiff/
-@lib lib/tcl/tkimg/tiff/libtkimgtiff142.so.${LIBtkimgtiff142_VERSION}
-lib/tcl/tkimg/tiff/pkgIndex.tcl
-lib/tcl/tkimg/window/
-@lib
lib/tcl/tkimg/window/libtkimgwindow142.so.${LIBtkimgwindow142_VERSION}
-lib/tcl/tkimg/window/pkgIndex.tcl
-lib/tcl/tkimg/xbm/
-@lib lib/tcl/tkimg/xbm/libtkimgxbm142.so.${LIBtkimgxbm142_VERSION}
-lib/tcl/tkimg/xbm/pkgIndex.tcl
-lib/tcl/tkimg/xpm/
-@lib lib/tcl/tkimg/xpm/libtkimgxpm142.so.${LIBtkimgxpm142_VERSION}
-lib/tcl/tkimg/xpm/pkgIndex.tcl
-lib/tcl/tkimg/zlib/
-@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
-lib/zlibtclConfig.sh
+lib/tcl/tkimg/pngtclConfig.sh
+lib/tcl/tkimg/tifftclConfig.sh
+lib/tcl/tkimg/tkimgConfig.sh
+lib/tcl/tkimg/zlibtclConfig.sh
+@man man/mann/img-bmp.n
+@man man/mann/img-dted.n
+@man man/mann/img-gif.n
+@man man/mann/img-ico.n
+@man man/mann/img-jpeg.n
+@man man/mann/img-pcx.n
+@man man/mann/img-pixmap.n
+@man man/mann/img-png.n
+@man man/mann/img-ppm.n
+@man man/mann/img-ps.n
+@man man/mann/img-raw.n
+@man man/mann/img-sgi.n
+@man man/mann/img-sun.n
+@man man/mann/img-tga.n
+@man man/mann/img-tiff.n
+@man man/mann/img-window.n
+@man man/mann/img-xbm.n
+@man man/mann/img-xpm.n
+@man man/mann/img.n
No comments:
Post a Comment