ports/161598: Update port: graphics/togl

[KATO Tsuguru]

>Number:         161598
>Category:       ports
>Synopsis:       Update port: graphics/togl
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Oct 14 18:50:08 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 7.4-RELEASE-p3 i386
>Organization:
>Environment:
>Description:
- Support USE_TK
- Support PORTDOCS/PORTEXAMPLES/PLIST_FILES

Remove file:
pkg-plist

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/graphics/togl/Makefile graphics/togl/Makefile
--- /usr/ports/graphics/togl/Makefile	2011-09-24 13:48:29.000000000 +0900
+++ graphics/togl/Makefile	2011-10-14 18:51:19.000000000 +0900
@@ -7,7 +7,7 @@
 
 PORTNAME=	togl
 PORTVERSION=	1.7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics tk
 MASTER_SITES=	SF/${PORTNAME}/Togl/${PORTVERSION}
 DISTNAME=	Togl-${PORTVERSION}
@@ -15,52 +15,66 @@
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	A Tk OpenGL widget
 
-LIB_DEPENDS=	tk84.1:${PORTSDIR}/x11-toolkits/tk84 \
-		tcl84.1:${PORTSDIR}/lang/tcl84
-
+USE_XORG=	x11 xt xmu
+USE_GL=		gl
+USE_TCL_BUILD=	84+
+USE_TCL=	84+
+USE_TK_BUILD=	84+
+USE_TK=		84+
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_GL=		yes
-USE_XORG=	x11 xt xmu
+CONFIGURE_ARGS=	--with-tk=${TK_LIBDIR} \
+		--with-tcl=${TCL_LIBDIR} \
+		--with-tclinclude=${TCL_INCLUDEDIR}
 MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
-LDFLAGS+=	-L${LOCALBASE}/lib/tk8.4
-CFLAGS+=	-I${LOCALBASE}/include/tk8.4
-CONFIGURE_ARGS=	--with-tk=${LOCALBASE}/lib/tk8.4 \
-		--with-tcl=${LOCALBASE}/lib/tcl8.4 \
-		--with-tclinclude=${LOCALBASE}/include/tcl8.4 \
 USE_LDCONFIG=	yes
 
-TOGL_INSTDIR=	${PREFIX}/lib/tk8.4/${DISTNAME}
-PLIST_SUB=	TOGL_INSTDIR=${TOGL_INSTDIR:S,^${PREFIX}/,,}
+TOGL_INSTDIR=	${PREFIX}/lib/tk${TK_VER}/${DISTNAME}
+PLIST_SUB=	TOGL_INSTDIR="${TOGL_INSTDIR:S,^${PREFIX}/,,}"
+
+CPPFLAGS+=	-I${TK_INCLUDEDIR}
+LDFLAGS+=	-L${TK_LIBDIR}
 
-.if !defined(NOPORTDOCS)
 PORTDOCS=	*
-.endif
+PORTEXAMPLES=	*
+PLIST_FILES=	lib/libtogl.so \
+		lib/libtogl.so.1 \
+		%%TOGL_INSTDIR%%/libTogl1.7.so \
+		%%TOGL_INSTDIR%%/libtogl.so.1 \
+		%%TOGL_INSTDIR%%/pkgIndex.tcl \
+		%%TOGL_INSTDIR%%/togl.h \
+		%%TOGL_INSTDIR%%/togl_ws.h
+PLIST_DIRS=	%%TOGL_INSTDIR%%
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|wish |wish8.4 |' ${WRKSRC}/*.tcl
+	@${REINPLACE_CMD} -e 's|wish |${WISH:T} |' ${WRKSRC}/*.tcl
 
 do-install:
 	@${MKDIR} ${TOGL_INSTDIR}
-	${INSTALL_DATA} ${WRKSRC}/libTogl1.7.so ${TOGL_INSTDIR}/libTogl1.7.so
+.for i in togl.h togl_ws.h libTogl1.7.so pkgIndex.tcl
+	${INSTALL_DATA} ${WRKSRC}/${i} ${TOGL_INSTDIR}
+.endfor
 	${LN} -s ${TOGL_INSTDIR}/libTogl1.7.so  ${TOGL_INSTDIR}/libtogl.so.1
-	${LN} -s ${TOGL_INSTDIR}/libTogl1.7.so  ${PREFIX}/lib/libtogl.so.1
 	${LN} -s ${TOGL_INSTDIR}/libTogl1.7.so  ${PREFIX}/lib/libtogl.so
-	${INSTALL_DATA} ${WRKSRC}/togl.h ${WRKSRC}/togl_ws.h ${WRKSRC}/pkgIndex.tcl ${TOGL_INSTDIR}
+	${LN} -s ${TOGL_INSTDIR}/libTogl1.7.so  ${PREFIX}/lib/libtogl.so.1
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/Togl.html ${DOCSDIR}
+.endif
+.if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/Makefile ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/togl.c ${WRKSRC}/togl.h ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/ben.rgb ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/double.c ${WRKSRC}/double.tcl ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/gears.c ${WRKSRC}/gears.tcl ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/image.c ${WRKSRC}/image.h ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/index.c ${WRKSRC}/index.tcl ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/overlay.c ${WRKSRC}/overlay.tcl ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/stereo.c ${WRKSRC}/stereo.tcl ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/texture.c ${WRKSRC}/texture.tcl ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/image.c ${WRKSRC}/image.h ${WRKSRC}/ben.rgb ${WRKSRC}/tree2.rgba ${EXAMPLESDIR}
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/Togl.html ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/togl.c ${WRKSRC}/togl.h ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/tree2.rgba ${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>
diff -urN /usr/ports/graphics/togl/pkg-plist graphics/togl/pkg-plist
--- /usr/ports/graphics/togl/pkg-plist	2010-06-07 03:55:57.000000000 +0900
+++ graphics/togl/pkg-plist	1970-01-01 09:00:00.000000000 +0900
@@ -1,28 +0,0 @@
-%%TOGL_INSTDIR%%/libTogl1.7.so
-%%TOGL_INSTDIR%%/libtogl.so.1
-lib/libtogl.so.1
-lib/libtogl.so
-%%TOGL_INSTDIR%%/togl.h
-%%TOGL_INSTDIR%%/togl_ws.h
-%%TOGL_INSTDIR%%/pkgIndex.tcl
- at dirrm %%TOGL_INSTDIR%%
-%%EXAMPLESDIR%%/Makefile
-%%EXAMPLESDIR%%/togl.c
-%%EXAMPLESDIR%%/togl.h
-%%EXAMPLESDIR%%/image.h
-%%EXAMPLESDIR%%/image.c
-%%EXAMPLESDIR%%/ben.rgb
-%%EXAMPLESDIR%%/tree2.rgba
-%%EXAMPLESDIR%%/double.tcl
-%%EXAMPLESDIR%%/double.c
-%%EXAMPLESDIR%%/gears.tcl
-%%EXAMPLESDIR%%/gears.c
-%%EXAMPLESDIR%%/index.tcl
-%%EXAMPLESDIR%%/index.c
-%%EXAMPLESDIR%%/overlay.tcl
-%%EXAMPLESDIR%%/overlay.c
-%%EXAMPLESDIR%%/stereo.tcl
-%%EXAMPLESDIR%%/stereo.c
-%%EXAMPLESDIR%%/texture.tcl
-%%EXAMPLESDIR%%/texture.c
- at dirrm %%EXAMPLESDIR%%
>Release-Note:
>Audit-Trail:
>Unformatted: