From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Oct 14 18:50:09 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 67BDB1065670 for ; Fri, 14 Oct 2011 18:50:09 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 440DA8FC21 for ; Fri, 14 Oct 2011 18:50:09 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p9EIo9ag050998 for ; Fri, 14 Oct 2011 18:50:09 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p9EIo9tR050997; Fri, 14 Oct 2011 18:50:09 GMT (envelope-from gnats) Resent-Date: Fri, 14 Oct 2011 18:50:09 GMT Resent-Message-Id: <201110141850.p9EIo9tR050997@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, KATO Tsuguru Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 806151065676 for ; Fri, 14 Oct 2011 18:40:26 +0000 (UTC) (envelope-from tkato432@yahoo.com) Received: from msa101lp.auone-net.jp (msa101lp.auone-net.jp [222.3.140.164]) by mx1.freebsd.org (Postfix) with ESMTP id 44CA68FC0A for ; Fri, 14 Oct 2011 18:40:26 +0000 (UTC) Received: from msa101lp.auone-net.jp (MSA101lp [172.27.12.179]) by msa101lp.auone-net.jp (au one net msa) with ESMTP id AB7A72E024D for ; Sat, 15 Oct 2011 03:33:41 +0900 (JST) Received: from localhost.localdomain (ZT046175.ppp.dion.ne.jp [59.128.46.175]) by msa101lp.auone-net.jp (au one net msa) with ESMTP id 6638234034 for ; Sat, 15 Oct 2011 03:33:38 +0900 (JST) Message-Id: <20111015025823.0db2b1d9.tkato432@yahoo.com> Date: Sat, 15 Oct 2011 02:58:23 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: ports/161598: Update port: graphics/togl X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Oct 2011 18:50:09 -0000 >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@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 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 -@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 -@dirrm %%EXAMPLESDIR%% >Release-Note: >Audit-Trail: >Unformatted: