diff options
| author | Hye-Shik Chang <perky@FreeBSD.org> | 2003-08-20 10:32:03 +0000 |
|---|---|---|
| committer | Hye-Shik Chang <perky@FreeBSD.org> | 2003-08-20 10:32:03 +0000 |
| commit | 823930ec9df3f539f6e830a0fbdbba3d65b7df82 (patch) | |
| tree | d4365b3027fcc68147cf2dd0822540a5e130d333 /graphics | |
| parent | Update to 20030817. (diff) | |
Fix build on tcl8.4 (which current py-tkinter is based on)
Notes
Notes:
svn path=/head/; revision=87366
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/py-opengl/Makefile | 3 | ||||
| -rw-r--r-- | graphics/py-opengl/files/patch-ad | 6 | ||||
| -rw-r--r-- | graphics/py-opengl/files/patch-src::Togl-1.5::togl.c | 11 | ||||
| -rw-r--r-- | graphics/py-opengl/pkg-plist | 6 |
4 files changed, 19 insertions, 7 deletions
diff --git a/graphics/py-opengl/Makefile b/graphics/py-opengl/Makefile index af86f9b4a909..446c8e249ba5 100644 --- a/graphics/py-opengl/Makefile +++ b/graphics/py-opengl/Makefile @@ -36,12 +36,13 @@ PLIST_SUB+= OSMAJOR=${OSMAJOR} \ pre-patch: @${FIND} ${WRKSRC} -name '*.[ch]' | ${XARGS} ${REINPLACE_CMD} -e \ 's|malloc[.]h|stdlib.h|g' + @${CP} ${WRKSRC}/src/Togl-1.5/tkInt8.3.h ${WRKSRC}/src/Togl-1.5/tkInt8.4.h do-configure: @${PERL} -pi -e 's|%%LOCALBASE%%|${LOCALBASE}|g ; s|%%X11BASE%%|${X11BASE}|g' \ ${WRKSRC}/config/freebsd.cfg ${WRKSRC}/Tkinter.py post-install: - ${LOCALBASE}/bin/tclsh8.3 ${WRKSRC}/register.tcl + ${LOCALBASE}/bin/tclsh8.4 ${WRKSRC}/register.tcl .include <bsd.port.mk> diff --git a/graphics/py-opengl/files/patch-ad b/graphics/py-opengl/files/patch-ad index aaf341f715a6..b26948c4567a 100644 --- a/graphics/py-opengl/files/patch-ad +++ b/graphics/py-opengl/files/patch-ad @@ -20,9 +20,9 @@ $FreeBSD$ + pass + def getvar(self, varname): + if varname == 'tk_version' or varname == 'tcl_version': -+ return '8.3' ++ return '8.4' + if varname == 'tcl_library': -+ return '%%LOCALBASE%%/lib/tcl8.3' ++ return '%%LOCALBASE%%/lib/tcl8.4' + if varname == 'tk_library': -+ return '%%LOCALBASE%%/lib/tk8.3' ++ return '%%LOCALBASE%%/lib/tk8.4' + return '' diff --git a/graphics/py-opengl/files/patch-src::Togl-1.5::togl.c b/graphics/py-opengl/files/patch-src::Togl-1.5::togl.c new file mode 100644 index 000000000000..86dfe52dad05 --- /dev/null +++ b/graphics/py-opengl/files/patch-src::Togl-1.5::togl.c @@ -0,0 +1,11 @@ +--- src/Togl-1.5/togl.c.bak Tue May 15 07:55:19 2001 ++++ src/Togl-1.5/togl.c Wed Aug 20 19:21:01 2003 +@@ -137,6 +137,8 @@ + # include "tkInt8.0p2.h" + #elif TK_MAJOR_VERSION==8 && TK_MINOR_VERSION==3 + # include "tkInt8.3.h" ++#elif TK_MAJOR_VERSION==8 && TK_MINOR_VERSION==4 ++# include "tkInt8.4.h" + #else + #error Sorry, you will have to edit togl.c to include the right tkInt.h file + #endif diff --git a/graphics/py-opengl/pkg-plist b/graphics/py-opengl/pkg-plist index 47ef0f6401ae..156219793a55 100644 --- a/graphics/py-opengl/pkg-plist +++ b/graphics/py-opengl/pkg-plist @@ -627,8 +627,8 @@ %%PYTHON_SITELIBDIR%%/OpenGL/Tk/__init__.py %%PYTHON_SITELIBDIR%%/OpenGL/Tk/__init__.pyc %%PYTHON_SITELIBDIR%%/OpenGL/Tk/__init__.pyo -%%PYTHON_SITELIBDIR%%/OpenGL/Tk/freebsd%%OSMAJOR%%-tk8.3/Togl.so -%%PYTHON_SITELIBDIR%%/OpenGL/Tk/freebsd%%OSMAJOR%%-tk8.3/pkgIndex.tcl +%%PYTHON_SITELIBDIR%%/OpenGL/Tk/freebsd%%OSMAJOR%%-tk8.4/Togl.so +%%PYTHON_SITELIBDIR%%/OpenGL/Tk/freebsd%%OSMAJOR%%-tk8.4/pkgIndex.tcl %%PYTHON_SITELIBDIR%%/OpenGL/__init__.py %%PYTHON_SITELIBDIR%%/OpenGL/__init__.pyc %%PYTHON_SITELIBDIR%%/OpenGL/__init__.pyo @@ -675,7 +675,7 @@ @dirrm %%PYTHON_SITELIBDIR%%/OpenGL/scripts @dirrm %%PYTHON_SITELIBDIR%%/OpenGL/doc/html @dirrm %%PYTHON_SITELIBDIR%%/OpenGL/doc -@dirrm %%PYTHON_SITELIBDIR%%/OpenGL/Tk/freebsd%%OSMAJOR%%-tk8.3 +@dirrm %%PYTHON_SITELIBDIR%%/OpenGL/Tk/freebsd%%OSMAJOR%%-tk8.4 @dirrm %%PYTHON_SITELIBDIR%%/OpenGL/Tk @dirrm %%PYTHON_SITELIBDIR%%/OpenGL/GLX/_3DFX @dirrm %%PYTHON_SITELIBDIR%%/OpenGL/GLX/SGIS |