Update to version 1.2.2

PR:		14985
Submitted by:	maintainer

5 files changed, 38 insertions, 21 deletions

diff --git a/graphics/libimg/Makefile b/graphics/libimg/Makefile
index b25cda455666..ae11ab1dd7a8 100644
--- a/graphics/libimg/Makefile
+++ b/graphics/libimg/Makefile
@@ -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$
 #
 
-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 --git a/graphics/libimg/distinfo b/graphics/libimg/distinfo
index bd07e4a37783..951f1a46a501 100644
--- a/graphics/libimg/distinfo
+++ b/graphics/libimg/distinfo
@@ -1 +1 @@
-MD5 (img1.1.4.tar.gz) = 11ab17a90f9f8e745f8fe4f07abc3cd7
+MD5 (img1.2.2.tar.gz) = 8c9150eda70edb9fc695f560c780bc34
diff --git a/graphics/libimg/files/patch-aa b/graphics/libimg/files/patch-aa
index de72ce1ac99c..e1c91b9fab91 100644
--- a/graphics/libimg/files/patch-aa
+++ b/graphics/libimg/files/patch-aa
@@ -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 --git a/graphics/libimg/pkg-descr b/graphics/libimg/pkg-descr
index 568b1c177885..dbb84f31e117 100644
--- a/graphics/libimg/pkg-descr
+++ b/graphics/libimg/pkg-descr
@@ -5,3 +5,5 @@ bmp, gif, png, jpeg, tiff, xpm, xbm, and postscript.
 
 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 --git a/graphics/libimg/pkg-plist b/graphics/libimg/pkg-plist
index 64acb9629dd2..c33f5e299748 100644
--- a/graphics/libimg/pkg-plist
+++ b/graphics/libimg/pkg-plist
@@ -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