- Ready for incoming slaves ports.

- Pass maintainership to submitter
- Respect DOC's
- Add graphics/tiff as dependency
- Bump PORTREVISION

PR:             110221
Submitted by:   Martin Matuska <martin@matuska.org>

7 files changed, 142 insertions, 20 deletions

diff --git a/graphics/libimg/Makefile b/graphics/libimg/Makefile
index aabe39217d4f..cc7ae05aac24 100644
--- a/graphics/libimg/Makefile
+++ b/graphics/libimg/Makefile
@@ -7,8 +7,8 @@
 
 PORTNAME=	libimg
 PORTVERSION=	1.2.4
-PORTREVISION=	2
-CATEGORIES=	graphics tk84
+PORTREVISION=	3
+CATEGORIES?=	graphics tk84
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tkimg
 DISTNAME=	img${PORTVERSION}
@@ -16,11 +16,43 @@ DISTNAME=	img${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A library of image format handlers for Tk4.1 and later
 
-LIB_DEPENDS=	tk84:${PORTSDIR}/x11-toolkits/tk84 \
-		png:${PORTSDIR}/graphics/png \
+LIB_DEPENDS=	png:${PORTSDIR}/graphics/png \
 		jpeg:${PORTSDIR}/graphics/jpeg \
 		tiff:${PORTSDIR}/graphics/tiff
 
+.if defined(USE_TKSTEP80)
+PKGNAMESUFFIX=	-tkstep80
+MAKEFILE=	${FILESDIR}/Makefile.tkstep80
+MAKE_ENV+=	TCL_VER=8.0
+EXTRA_PATCHES=	${FILESDIR}/pre-tk84-warnings
+BUILD_DEPENDS+=	${LOCALBASE}/lib/tkstep8.0/tkstep.tcl:${PORTSDIR}/x11-toolkits/tkstep80
+RUN_DEPENDS+=	${BUILD_DEPENDS}
+CONFLICTS=	libimg-1.* libimg-tk83-1.*
+.elif defined(USE_TK) && ${USE_TK} == 83
+PKGNAMESUFFIX=	-tk83
+USE_TK=		83
+USE_TK_BUILD=	83
+MAKEFILE=	${FILESDIR}/Makefile.bsd
+MAKE_ENV+=	TCL_VER=8.3
+PATCHDIR=
+EXTRA_PATCHES=	${FILESDIR}/pre-tk84-warnings
+CONFLICTS=	libimg-1.* libimg-tkstep-1.*
+.else
+USE_TK=		84
+USE_TK_BUILD=	84
+MAKEFILE=	${FILESDIR}/Makefile.bsd
+EXTRA_PATCHES=	${FILESDIR}/tk84-Tk_PhotoPutBlock ${FILESDIR}/tk84-warnings
+CONFLICTS=	libimg-tk83-1.* libimg-tkstep-1.*
+.endif
+
+DIR=		lib/Img1.2
+
+SHLIB_NAME=	libimg.so.1
+SHLIB_LINK=	${SHLIB_NAME:R}
+
+PLIST_SUB+=	DIR="${DIR}" SHLIB_NAME="${SHLIB_NAME}" \
+		SHLIB_LINK="${SHLIB_LINK}"
+
 WRKSRC=		${WRKDIR}/img${PORTVERSION}
 
 # We don't need the bundled libraries:
@@ -28,20 +60,17 @@ EXTRACT_AFTER_ARGS=	| ${TAR} -xf - --exclude '*/libz/*' \
 		--exclude '*/compat/*' --exclude '*/libtiff/*' \
 		--exclude '*/libjpeg/*' --exclude '*/libpng/*'
 
-MAKEFILE=	${FILESDIR}/Makefile.bsd
-
 MAKE_ARGS=	PORTVERSION="${PORTVERSION}" LOCALBASE="${LOCALBASE}" \
-		MKDIR="${MKDIR}" INSTALL_DATA="${INSTALL_DATA}"
+		MKDIR="${MKDIR}" INSTALL_DATA="${INSTALL_DATA}" \
+		X11BASE="${X11BASE}" SHLIB_NAME="${SHLIB_NAME}" \
+		DIR="${DIR}"
 
 USE_LDCONFIG=	yes
 
 .if !defined(NOPORTDOCS)
 post-install:
-	${MKDIR} ${LOCALBASE}/share/doc/Img1.2
-	${INSTALL_DATA} ${WRKSRC}/doc/* ${LOCALBASE}/share/doc/Img1.2
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
-
-PLIST_SUBP!=	${SETENV} TCL_VER=${TCL_VER} ${MAKE} -f ${MAKEFILE} environ
-PLIST_SUB+=	${PLIST_SUBP}
diff --git a/graphics/libimg/Makefile.tkstep80 b/graphics/libimg/Makefile.tkstep80
new file mode 100644
index 000000000000..a7bfdb7f30e8
--- /dev/null
+++ b/graphics/libimg/Makefile.tkstep80
@@ -0,0 +1,55 @@
+SHLIB_NAME?=	libimg.so.1
+
+PORTVERSION?=	1.2.4
+LOCALBASE?=	/usr/local
+X11BASE?=	/usr/X11R6
+TCL_VER?=	8.0
+
+LDADD=		-lm -lz -L${LOCALBASE}/lib -lpng -ljpeg -ltiff \
+		-L${X11BASE}/lib -lX11
+
+CFLAGS+=	-I${LOCALBASE}/include/tcl${TCL_VER}
+CFLAGS+=	-I${LOCALBASE}/include/tcl${TCL_VER}/generic
+CFLAGS+=	-D__X11__ -I${X11BASE}/include -DALLOW_B64
+CFLAGS+=	-I${LOCALBASE}/include/tkstep${TCL_VER}
+CFLAGS+=	-DNDEBUG -Wall -I.
+CFLAGS+=	-DVERSION=\"${PORTVERSION}\" -I${LOCALBASE}/include
+CFLAGS+=	-DHAVE_JPEGLIB_H -DHAVE_TIFF_H -DHAVE_DLFCN_H -DHAVE_IMG_H
+
+all: pkgIndex.tcl
+
+pkgIndex.tcl: pkgIndex.tcl.in
+	sed -e 's,@IMG_PATCH_LEVEL@,${PORTVERSION},g' \
+		-e 's,@IMG_SHARED_LIB_FILE@,../${SHLIB_NAME},g' \
+		< pkgIndex.tcl.in > pkgIndex.tcl
+
+DIR?		= lib/Img1.2
+INSTDIR		= ${LOCALBASE}/${DIR}
+LIBDIR		= ${LOCALBASE}/lib
+
+${INSTDIR} ${INSTDIR}/msgs:
+	${MKDIR} $@
+
+beforeinstall: ${INSTDIR} ${INSTDIR}/msgs
+	${INSTALL_DATA} pkgIndex.tcl ${.CURDIR}/demo.tcl ${.CURDIR}/tkv.tcl \
+		${.CURDIR}/imgmsg.tcl ${INSTDIR}
+	${INSTALL_DATA} ${.CURDIR}/msgs/* ${INSTDIR}/msgs/
+
+environ:
+	@${ECHO} SHLIB_NAME=${SHLIB_NAME} SHLIB_LINK=${SHLIB_LINK} DIR=${DIR}
+
+#		fundamentals of this library
+SRCS	=	imgInit.c imgObj.c imgUtil.c imgPmap.c imgUnixPmap.c \
+		imgBMP.c imgGIF.c imgJPEG.c imgPNG.c imgPS.c \
+		imgTIFF.c \
+		imgWindow.c imgXBM.c imgXPM.c
+
+test:	$(SHLIB_NAME)
+	PATH=${TK_BIN_DIR}:${PATH}; export PATH; \
+	TCLLIBPATH=`pwd`; export TCLLIBPATH; \
+	export SHLIB_PATH; \
+	LD_LIBRARY_PATH=`pwd`; \
+	export LD_LIBRARY_PATH; \
+	wish${TCL_VER} demo.tcl
+
+.include <bsd.lib.mk>
diff --git a/graphics/libimg/files/Makefile.bsd b/graphics/libimg/files/Makefile.bsd
index cfc6bc1f3164..54d2aa2df294 100644
--- a/graphics/libimg/files/Makefile.bsd
+++ b/graphics/libimg/files/Makefile.bsd
@@ -1,4 +1,4 @@
-SHLIB_NAME=	libimg.so.1
+SHLIB_NAME?=	libimg.so.1
 
 PORTVERSION?=	1.2.4
 LOCALBASE?=	/usr/local
@@ -37,7 +37,7 @@ pkgIndex.tcl: pkgIndex.tcl.in
 		-e 's,@IMG_SHARED_LIB_FILE@,../${SHLIB_NAME},g' \
 		< pkgIndex.tcl.in > pkgIndex.tcl
 
-DIR		= lib/Img1.2
+DIR?		= lib/Img1.2
 INSTDIR		= ${LOCALBASE}/${DIR}
 LIBDIR		= ${LOCALBASE}/lib
 
diff --git a/graphics/libimg/files/pre-tk84-warnings b/graphics/libimg/files/pre-tk84-warnings
new file mode 100644
index 000000000000..3e152814887c
--- /dev/null
+++ b/graphics/libimg/files/pre-tk84-warnings
@@ -0,0 +1,38 @@
+--- imgXPM.c	Tue Jan 15 16:00:08 2002
++++ imgXPM.c	Thu Jun  9 20:33:32 2005
+@@ -287,6 +287,6 @@
+     char buffer[MAX_BUFFER];
+     int i, isMono;
+-    int color1;
+-    unsigned int data;
++    intptr_t color1;
++    uintptr_t data;
+     Tcl_HashEntry *hPtr;
+ 
+@@ -466,5 +466,5 @@
+ 	
+ 	for (i = 0; i < width; ) {
+-	    unsigned int col;
++	    uintptr_t col;
+ 
+ 	    memcpy((char *) &color1, p, byteSize);
+@@ -476,7 +476,7 @@
+ 	     */
+ 	    if (hPtr != (Tcl_HashEntry *)NULL) 
+-	        col = (int)Tcl_GetHashValue(hPtr);
++	        col = (uintptr_t)Tcl_GetHashValue(hPtr);
+ 	    else 
+-	        col = (int)0;
++	        col = 0;
+ 	    
+ 	    /*
+@@ -500,7 +500,7 @@
+ 			hPtr = Tcl_FindHashEntry(&colorTable, (char *) color1);
+ 			if (hPtr != (Tcl_HashEntry *)NULL) 
+-			    col = (int)Tcl_GetHashValue(hPtr);
++			    col = (uintptr_t)Tcl_GetHashValue(hPtr);
+ 			else 
+-			    col = (int)0;
++			    col = 0;
+ 		    }
+ 		} while ((i < width) && col);
diff --git a/graphics/libimg/files/patch-tk84_Tk_PhotoPutBlock b/graphics/libimg/files/tk84-Tk_PhotoPutBlock
index 7b4be394f46c..7b4be394f46c 100644
--- a/graphics/libimg/files/patch-tk84_Tk_PhotoPutBlock
+++ b/graphics/libimg/files/tk84-Tk_PhotoPutBlock
diff --git a/graphics/libimg/files/patch-warnings b/graphics/libimg/files/tk84-warnings
index 91aaaf017842..91aaaf017842 100644
--- a/graphics/libimg/files/patch-warnings
+++ b/graphics/libimg/files/tk84-warnings
diff --git a/graphics/libimg/pkg-plist b/graphics/libimg/pkg-plist
index bd83db04dd1c..89b3a55b5059 100644
--- a/graphics/libimg/pkg-plist
+++ b/graphics/libimg/pkg-plist
@@ -13,9 +13,9 @@ lib/%%SHLIB_LINK%%
 %%DIR%%/msgs/nl.msg
 @dirrm %%DIR%%/msgs
 @dirrm %%DIR%%
-%%PORTDOCS%%share/doc/Img1.2/default.css
-%%PORTDOCS%%share/doc/Img1.2/formats.htm
-%%PORTDOCS%%share/doc/Img1.2/index.htm
-%%PORTDOCS%%share/doc/Img1.2/install.htm
-%%PORTDOCS%%share/doc/Img1.2/library.htm
-%%PORTDOCS%%@dirrm share/doc/Img1.2
+%%PORTDOCS%%%%DOCSDIR%%/default.css
+%%PORTDOCS%%%%DOCSDIR%%/formats.htm
+%%PORTDOCS%%%%DOCSDIR%%/index.htm
+%%PORTDOCS%%%%DOCSDIR%%/install.htm
+%%PORTDOCS%%%%DOCSDIR%%/library.htm
+%%PORTDOCS%%@dirrm %%DOCSDIR%%