Date: Wed, 26 Dec 2007 00:40:05 +0100 (CET) From: Raaf <raaf@zen.mooo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/119019: x11-toolkits/py-fltk: Update to 1.1.2 Message-ID: <20071225234005.15F7628@zen.mooo.com> Resent-Message-ID: <200712260010.lBQ0A3JE024081@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 119019
>Category: ports
>Synopsis: x11-toolkits/py-fltk: Update to 1.1.2
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Dec 26 00:10:02 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator: Raaf
>Release: FreeBSD 7.0-BETA3 i386
>Organization:
>Environment:
System: FreeBSD zen.mooo.com 7.0-BETA3 FreeBSD 7.0-BETA3 #11: Sun Dec 2 09:52:44 CET 2007 root@zen.mooo.com:/usr/obj/usr/src/sys/RANI i386
>Description:
Update x11-toolkits/py-fltk to version 1.1.2 and take maintainership
Removed files: files/patch-setup.py
>How-To-Repeat:
>Fix:
--- patch-py-fltk begins here ---
diff -ruN /usr/ports/x11-toolkits/py-fltk.bak/Makefile /usr/ports/x11-toolkits/py-fltk/Makefile
--- /usr/ports/x11-toolkits/py-fltk.bak/Makefile 2007-12-22 02:33:53.000000000 +0100
+++ /usr/ports/x11-toolkits/py-fltk/Makefile 2007-12-22 06:00:48.000000000 +0100
@@ -6,54 +6,49 @@
#
PORTNAME= fltk
-PORTVERSION= 1.1.b3
-PORTREVISION= 1
+PORTVERSION= 1.1.2
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
MASTER_SITE_SUBDIR= pyfltk
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pyFltk-${PORTVERSION:S/.b/b/}
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= raaf@zen.mooo.com
COMMENT= Python interface to FLTK window toolkit
LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk
-USE_PYTHON= -2.4
+USE_PYTHON= 2.4+
USE_PYDISTUTILS= yes
USE_XLIB= yes
PYDISTUTILS_PKGNAME= pyFltk
-PYDISTUTILS_PKGVERSION= 1.1b3
+PYDISTUTILS_PKGVERSION= 1.1.2
-MAKE_ENV+= FLTK_HOME=${X11BASE}/include OPENGL_HOME=${X11BASE}/include
+MAKE_ENV+= FLTK_HOME=${LOCALBASE}/bin
DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME}
EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME}
XTRADOCS= CHANGES README TODO
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 700042
-BROKEN= Does not compile on GCC 4.2
-.endif
-
post-patch:
- @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/setup.py
+ @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g;s|package_data.*},||g' ${WRKSRC}/setup.py
+ @${REINPLACE_CMD} -e 's|>mininum|>minimum|g;s|>maxinum|>maximum|g' ${WRKSRC}/python/fltk_wrap.cpp
post-build:
- ${REINPLACE_CMD} -e "s|\.\./docs|${DOCSDIR}/html|g" ${WRKSRC}/test/help.py
+ ${REINPLACE_CMD} -e "s|\.\./docs|${DOCSDIR}/html|g" ${WRKSRC}/fltk/test/help.py
do-install:
@(cd ${INSTALL_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} install ${PYDISTUTILS_INSTALLARGS})
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}/html
- ${INSTALL_DATA} ${WRKSRC}/docs/*.html ${DOCSDIR}/html
+ ${INSTALL_DATA} ${WRKSRC}/fltk/docs/*.html ${DOCSDIR}/html
+ ${INSTALL_DATA} ${WRKSRC}/fltk/docs/*.jpg ${DOCSDIR}/html
${MKDIR} ${EXAMPLESDIR}
- ${INSTALL_DATA} ${WRKSRC}/test/*.py ${EXAMPLESDIR}
- ${INSTALL_DATA} ${WRKSRC}/test/*.html ${EXAMPLESDIR}
+ ${INSTALL_DATA} ${WRKSRC}/fltk/test/*.py ${EXAMPLESDIR}
+ ${INSTALL_DATA} ${WRKSRC}/fltk/test/HelpDialog.html ${EXAMPLESDIR}
.for i in ${XTRADOCS}
- ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
.endfor
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -ruN /usr/ports/x11-toolkits/py-fltk.bak/distinfo /usr/ports/x11-toolkits/py-fltk/distinfo
--- /usr/ports/x11-toolkits/py-fltk.bak/distinfo 2007-12-22 02:33:53.000000000 +0100
+++ /usr/ports/x11-toolkits/py-fltk/distinfo 2007-12-22 02:39:02.000000000 +0100
@@ -1,3 +1,3 @@
-MD5 (pyFltk-1.1b3.tar.gz) = bd32fdb6f86a6ce395bd3d9dd2e35006
-SHA256 (pyFltk-1.1b3.tar.gz) = 6695a3016c78a68d7d1dcdd3c7ac45a88a5aadfd607c94717219dd4696688a54
-SIZE (pyFltk-1.1b3.tar.gz) = 240373
+MD5 (pyFltk-1.1.2.tar.gz) = 769efe632d3f49f17f6f39383e9023bb
+SHA256 (pyFltk-1.1.2.tar.gz) = a52f78a18b1b6d5d2cff6ca836846b0ca2561dd07dc0ed9f4bf25eed632fa9ca
+SIZE (pyFltk-1.1.2.tar.gz) = 810018
diff -ruN /usr/ports/x11-toolkits/py-fltk.bak/files/patch-setup.py /usr/ports/x11-toolkits/py-fltk/files/patch-setup.py
--- /usr/ports/x11-toolkits/py-fltk.bak/files/patch-setup.py 2007-12-22 02:33:53.000000000 +0100
+++ /usr/ports/x11-toolkits/py-fltk/files/patch-setup.py 1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
---- setup.py.orig Tue Nov 9 20:59:17 2004
-+++ setup.py Sat Jul 30 21:19:17 2005
-@@ -44,7 +44,7 @@
- lib_dir_list = [fltk_lib_dir]
- lib_list = ["fltk", "fltk_images", "fltk_forms",
- "fltk_gl", "GL", "jpeg", "png", "z"]
--elif sys.platform in ['freebsd4','freebsd5']:
-+elif sys.platform in ['freebsd4','freebsd5','freebsd6','freebsd7']:
- print "Building for FreeBSD"
- def_list = [('UNIX', '1')]
- lib_dir_list = [fltk_lib_dir,'/usr/X11R6/lib','/usr/local/lib']
diff -ruN /usr/ports/x11-toolkits/py-fltk.bak/pkg-plist /usr/ports/x11-toolkits/py-fltk/pkg-plist
--- /usr/ports/x11-toolkits/py-fltk.bak/pkg-plist 2007-12-22 02:33:54.000000000 +0100
+++ /usr/ports/x11-toolkits/py-fltk/pkg-plist 2007-12-22 05:59:36.000000000 +0100
@@ -1,20 +1,32 @@
-%%PYTHON_SITELIBDIR%%/fltk.py
-%%PYTHON_SITELIBDIR%%/fltk.pyc
-%%PYTHON_SITELIBDIR%%/fltk.pyo
-%%PYTHON_SITELIBDIR%%/_fltk.so
+%%PYTHON_SITELIBDIR%%/fltk/_fltk.so
+%%PYTHON_SITELIBDIR%%/fltk/__init__.py
+%%PYTHON_SITELIBDIR%%/fltk/__init__.pyc
+%%PYTHON_SITELIBDIR%%/fltk/__init__.pyo
%%PORTDOCS%%%%DOCSDIR%%/CHANGES
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/html/Fl.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Fl_Group.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Fl_Menu_.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Fl_Table.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Fl_Table_Row.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Fl_Widget.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Fl_Window.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Polymorphisms.html
+%%PORTDOCS%%%%DOCSDIR%%/html/CH0_Preface.html
+%%PORTDOCS%%%%DOCSDIR%%/html/CH1_Intro.html
+%%PORTDOCS%%%%DOCSDIR%%/html/CH2_Basics.html
+%%PORTDOCS%%%%DOCSDIR%%/html/CH3_Common.html
+%%PORTDOCS%%%%DOCSDIR%%/html/CH4_Editor.html
+%%PORTDOCS%%%%DOCSDIR%%/html/CH5_Drawing.html
+%%PORTDOCS%%%%DOCSDIR%%/html/CH6_Events.html
+%%PORTDOCS%%%%DOCSDIR%%/html/CH7_Subclassing.html
+%%PORTDOCS%%%%DOCSDIR%%/html/CH8_Opengl.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Hello.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/HowToAddNewWidgets.html
+%%PORTDOCS%%%%DOCSDIR%%/html/boxtype.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/buttons.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/editor-replace.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/editor.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/fltk.html
%%PORTDOCS%%%%DOCSDIR%%/html/pyFltk.html
-%%PORTDOCS%%%%DOCSDIR%%/html/setMenus.html
+%%PORTDOCS%%%%DOCSDIR%%/html/symbols.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/valuators.jpg
+%%PORTDOCS%%%%EXAMPLESDIR%%/DragAndDrop.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/DraggableBox.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/GlobalHandler.py
%%PORTDOCS%%%%EXAMPLESDIR%%/HelpDialog.html
%%PORTDOCS%%%%EXAMPLESDIR%%/TextEditor.py
%%PORTDOCS%%%%EXAMPLESDIR%%/adjuster.py
@@ -39,7 +51,10 @@
%%PORTDOCS%%%%EXAMPLESDIR%%/dials.py
%%PORTDOCS%%%%EXAMPLESDIR%%/doublebuffer.py
%%PORTDOCS%%%%EXAMPLESDIR%%/draw.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/editor.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/file_browser.py
%%PORTDOCS%%%%EXAMPLESDIR%%/file_chooser.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/fltk_threads.py
%%PORTDOCS%%%%EXAMPLESDIR%%/formsbitmap.py
%%PORTDOCS%%%%EXAMPLESDIR%%/group.py
%%PORTDOCS%%%%EXAMPLESDIR%%/handle_events.py
@@ -57,10 +72,13 @@
%%PORTDOCS%%%%EXAMPLESDIR%%/pack.py
%%PORTDOCS%%%%EXAMPLESDIR%%/pixmap.py
%%PORTDOCS%%%%EXAMPLESDIR%%/postioner.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/preferences.py
%%PORTDOCS%%%%EXAMPLESDIR%%/radio.py
%%PORTDOCS%%%%EXAMPLESDIR%%/shapeGL.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/simple_table.py
%%PORTDOCS%%%%EXAMPLESDIR%%/sliders.py
%%PORTDOCS%%%%EXAMPLESDIR%%/subwindow.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/sudoku.py
%%PORTDOCS%%%%EXAMPLESDIR%%/symbols.py
%%PORTDOCS%%%%EXAMPLESDIR%%/table.py
%%PORTDOCS%%%%EXAMPLESDIR%%/tabs.py
@@ -68,9 +86,11 @@
%%PORTDOCS%%%%EXAMPLESDIR%%/testhelp.py
%%PORTDOCS%%%%EXAMPLESDIR%%/tile.py
%%PORTDOCS%%%%EXAMPLESDIR%%/timeout.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/tree.py
%%PORTDOCS%%%%EXAMPLESDIR%%/valuators.py
%%PORTDOCS%%%%EXAMPLESDIR%%/widgets.py
%%PORTDOCS%%%%EXAMPLESDIR%%/window.py
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+@dirrm %%PYTHON_SITELIBDIR%%/fltk
--- patch-py-fltk ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20071225234005.15F7628>