diff options
-rw-r--r-- | graphics/togl/Makefile | 53 | ||||
-rw-r--r-- | graphics/togl/pkg-plist | 39 |
2 files changed, 49 insertions, 43 deletions
diff --git a/graphics/togl/Makefile b/graphics/togl/Makefile index 970457333933..52c03edfe6e5 100644 --- a/graphics/togl/Makefile +++ b/graphics/togl/Makefile @@ -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,55 @@ DISTNAME= Togl-${PORTVERSION} 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}/,,}" -.if !defined(NOPORTDOCS) -PORTDOCS= * -.endif +CPPFLAGS+= -I${TK_INCLUDEDIR} +LDFLAGS+= -L${TK_LIBDIR} 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 --git a/graphics/togl/pkg-plist b/graphics/togl/pkg-plist index d018dcbebfba..0138d1f000f3 100644 --- a/graphics/togl/pkg-plist +++ b/graphics/togl/pkg-plist @@ -1,28 +1,31 @@ -%%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%% +lib/libtogl.so.1 +lib/tk8.5/Togl-1.7/togl.h +lib/tk8.5/Togl-1.7/togl_ws.h +lib/tk8.5/Togl-1.7/libTogl1.7.so +lib/tk8.5/Togl-1.7/pkgIndex.tcl +lib/tk8.5/Togl-1.7/libtogl.so.1 +%%PORTDOCS%%%%DOCSDIR%%/Togl.html %%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%%/double.tcl %%EXAMPLESDIR%%/gears.c -%%EXAMPLESDIR%%/index.tcl +%%EXAMPLESDIR%%/gears.tcl +%%EXAMPLESDIR%%/image.c +%%EXAMPLESDIR%%/image.h %%EXAMPLESDIR%%/index.c -%%EXAMPLESDIR%%/overlay.tcl +%%EXAMPLESDIR%%/index.tcl %%EXAMPLESDIR%%/overlay.c -%%EXAMPLESDIR%%/stereo.tcl +%%EXAMPLESDIR%%/overlay.tcl %%EXAMPLESDIR%%/stereo.c -%%EXAMPLESDIR%%/texture.tcl +%%EXAMPLESDIR%%/stereo.tcl %%EXAMPLESDIR%%/texture.c +%%EXAMPLESDIR%%/texture.tcl +%%EXAMPLESDIR%%/togl.c +%%EXAMPLESDIR%%/togl.h +%%EXAMPLESDIR%%/tree2.rgba @dirrm %%EXAMPLESDIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%% +@dirrm lib/tk8.5/Togl-1.7 +@dirrmtry lib/tk8.5 |