Date: Thu, 18 Nov 1999 16:38:10 -0600 (CST) From: gjohnson@nola.srrc.usda.gov To: FreeBSD-gnats-submit@freebsd.org Subject: ports/14985: Update of libimg from 1.1.4 to 1.2.2 Message-ID: <199911182238.QAA35063@symbion.srrc.usda.gov>
next in thread | raw e-mail | index | archive | help
>Number: 14985
>Category: ports
>Synopsis: Update the libimg port from 1.1.4 to 1.2.2
>Confidential: yes
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Nov 18 15:00:01 PST 1999
>Closed-Date:
>Last-Modified:
>Originator: Glenn Johnson
>Release: FreeBSD 3.3-STABLE i386
>Organization:
>Environment:
>Description:
The attached diff will update $PORTS/graphics/libimg from
version 1.1.4 to version 1.2.2.
>How-To-Repeat:
>Fix:
Apply the following diff to $PORTS/graphics/libimg
diff -ruN libimg.old/Makefile libimg/Makefile
--- libimg.old/Makefile Thu Nov 18 09:23:55 1999
+++ libimg/Makefile Thu Nov 18 10:00:54 1999
@@ -1,33 +1,33 @@
# New ports collection makefile for: img
-# Version required: 1.1
+# Version required: 1.2
# Date Created: 20 February 1999
# Whom: Glenn Johnson
#
# $FreeBSD: ports/graphics/libimg/Makefile,v 1.3 1999/09/07 10:45:26 steve Exp $
#
-DISTNAME= img1.1.4
-PKGNAME= libimg-1.1.4
+DISTNAME= img1.2.2
+PKGNAME= libimg-1.2.2
CATEGORIES= graphics tk80
-MASTER_SITES= ftp://ftp.neosoft.com/pub/tcl/sorted/packages-8.0/graphics/Img/1.1.4/
+MASTER_SITES= ftp://ftp.neosoft.com/pub/tcl/sorted/packages-8.0/graphics/Img/1.2/
-MAINTAINER= gljohns@bellsouth.net
+MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80 \
png.3:${PORTSDIR}/graphics/png \
jpeg.9:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff
-WRKSRC= ${WRKDIR}/img1.1
+WRKSRC= ${WRKDIR}/img1.2.2
ALL_TARGET= default
-INSTALL_TARGET= install-base
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-tcl=${PREFIX}/lib/tcl8.0 --with-tk=${PREFIX}/lib/tk8.0
+CONFIGURE_ARGS= --with-tcl=${PREFIX}/lib/tcl8.0 --with-tk=${PREFIX}/lib/tk8.0 \
+ --disable-stubs
post-install:
- ${LN} -sf ${PREFIX}/lib/Img1.1/libimg1.1.so.1 ${PREFIX}/lib/libimg.so.1
+ ${LN} -sf ${PREFIX}/lib/Img1.2/libimg1.2.so.1 ${PREFIX}/lib/libimg.so.1
${LN} -sf ${PREFIX}/lib/libimg.so.1 ${PREFIX}/lib/libimg.so
.include <bsd.port.mk>
diff -ruN libimg.old/files/md5 libimg/files/md5
--- libimg.old/files/md5 Thu Nov 18 09:23:55 1999
+++ libimg/files/md5 Thu Nov 18 09:38:15 1999
@@ -1 +1 @@
-MD5 (img1.1.4.tar.gz) = 11ab17a90f9f8e745f8fe4f07abc3cd7
+MD5 (img1.2.2.tar.gz) = 8c9150eda70edb9fc695f560c780bc34
diff -ruN libimg.old/patches/patch-aa libimg/patches/patch-aa
--- libimg.old/patches/patch-aa Thu Nov 18 09:23:55 1999
+++ libimg/patches/patch-aa Thu Nov 18 16:13:33 1999
@@ -1,6 +1,6 @@
---- configure.orig Thu Nov 19 03:50:52 1998
-+++ configure Sun Feb 21 00:53:23 1999
-@@ -978,8 +978,8 @@
+--- configure.orig Tue Oct 26 16:57:43 1999
++++ configure Thu Nov 18 16:13:16 1999
+@@ -1715,8 +1715,8 @@
TCL_INC_DIR=${TCL_TOP_DIR}/include
elif test -d ${TCL_EXEC_PREFIX}/include -a -f ${TCL_EXEC_PREFIX}/include/tcl.h; then
TCL_INC_DIR=${TCL_EXEC_PREFIX}/include
@@ -11,7 +11,7 @@
else
TCL_INC_DIR=$prefix/include
fi
-@@ -1091,8 +1091,8 @@
+@@ -1832,8 +1832,8 @@
TK_INC_DIR=${TK_TOP_DIR}/include
elif test -d ${TK_EXEC_PREFIX}/include -a -f ${TK_EXEC_PREFIX}/include/tk.h; then
TK_INC_DIR=${TK_EXEC_PREFIX}/include
@@ -22,3 +22,22 @@
else
TK_INC_DIR=$prefix/include
fi
+@@ -1936,12 +1936,12 @@
+ if test "x$ok" = "xyes" -a "x${SHLIB_SUFFIX}" != "x"; then
+ IMG_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
+ if test "x$SHLIB_SUFFIX" = "x.so"; then
+- Z_LIB_FILE="libz${SHLIB_SUFFIX}.1.1.3"
+- PNG_LIB_FILE="libpng${SHLIB_SUFFIX}.2.1.0"
+- JPEG_LIB_FILE="libjpeg${SHLIB_SUFFIX}.62.0.0"
+- TIFF_LIB_FILE="libtiff${SHLIB_SUFFIX}.3.5.2"
+- TTF_LIB_FILE="libttf${SHLIB_SUFFIX}.2.0.1"
+- GIF_LIB_FILE="libungif${SHLIB_SUFFIX}.3.1.0"
++ Z_LIB_FILE="libz${SHLIB_SUFFIX}.2"
++ PNG_LIB_FILE="libpng${SHLIB_SUFFIX}.3"
++ JPEG_LIB_FILE="libjpeg${SHLIB_SUFFIX}.9"
++ TIFF_LIB_FILE="libtiff${SHLIB_SUFFIX}.4"
++ TTF_LIB_FILE="libttf${SHLIB_SUFFIX}.3"
++ GIF_LIB_FILE="libungif${SHLIB_SUFFIX}.5"
+ else
+ Z_LIB_FILE="libz${SHLIB_SUFFIX}"
+ PNG_LIB_FILE="libpng${SHLIB_SUFFIX}"
diff -ruN libimg.old/patches/patch-ab libimg/patches/patch-ab
--- libimg.old/patches/patch-ab Wed Dec 31 18:00:00 1969
+++ libimg/patches/patch-ab Thu Nov 18 10:15:10 1999
@@ -0,0 +1,11 @@
+--- Makefile.in.orig Tue Oct 26 14:29:30 1999
++++ Makefile.in Thu Nov 18 10:11:53 1999
+@@ -87,7 +87,7 @@
+ TK_XLIBSW = @TK_XLIBSW@
+
+ # Libraries to be included with libimg$(VERSION).so
+-TCL_SHARED_LIBS = @TCL_SHARED_LIBS@
++TCL_SHARED_LIBS =
+
+ # Default top-level directories in which to install architecture-
+ # specific files (exec_prefix) and machine-independent files such
diff -ruN libimg.old/pkg/DESCR libimg/pkg/DESCR
--- libimg.old/pkg/DESCR Thu Nov 18 09:23:55 1999
+++ libimg/pkg/DESCR Thu Nov 18 16:18:45 1999
@@ -5,3 +5,5 @@
Using this library with Tcl/Tk applications allows one to work with
photos and images in the application.
+
+WWW: http://members1.chello.nl/~j.nijtmans/img.html
diff -ruN libimg.old/pkg/PLIST libimg/pkg/PLIST
--- libimg.old/pkg/PLIST Thu Nov 18 09:23:55 1999
+++ libimg/pkg/PLIST Thu Nov 18 10:03:15 1999
@@ -1,10 +1,6 @@
-lib/Img1.1/tests/all
-lib/Img1.1/pkgIndex.tcl
-lib/Img1.1/demo.tcl
-lib/Img1.1/tkv.tcl
-lib/Img1.1/libimg1.1.so.1
+lib/Img1.2/pkgIndex.tcl
+lib/Img1.2/libimg1.2.so.1
lib/libimg.so.1
lib/libimg.so
-@dirrm lib/Img1.1/tests
-@dirrm lib/Img1.1
+@dirrm lib/Img1.2
@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199911182238.QAA35063>