Upgrade to 1.1b3 and unbreak.

4 files changed, 16 insertions, 24 deletions

diff --git a/x11-toolkits/py-fltk/Makefile b/x11-toolkits/py-fltk/Makefile
index a2484727d5ef..2abf4061afc4 100644
--- a/x11-toolkits/py-fltk/Makefile
+++ b/x11-toolkits/py-fltk/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fltk
-PORTVERSION=	1.1.b2
+PORTVERSION=	1.1.b3
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	pyfltk
@@ -23,25 +23,17 @@ USE_PYDISTUTILS=	yes
 USE_XLIB=	yes
 USE_REINPLACE=	yes
 
-#WRKSRC=		${WRKDIR}/${DISTNAME}
 MAKE_ENV+=	FLTK_HOME=${X11BASE}/include OPENGL_HOME=${X11BASE}/include
 DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
 EXAMPLESDIR=	${PREFIX}/share/examples/py-${PORTNAME}
 XTRADOCS=	CHANGES README TODO
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 600000
-BROKEN=		"Broken pkg-plist on FreeBSD >= 6.x"
-.endif
-
 post-build:
 	${REINPLACE_CMD} -e "s|\.\./docs|${DOCSDIR}/html|g" ${WRKSRC}/test/help.py
 
 do-install:
 	@(cd ${INSTALL_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} install ${PYDISTUTILS_INSTALLARGS})
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
 	${MKDIR} ${DOCSDIR}/html
 	${INSTALL_DATA} ${WRKSRC}/docs/*.html ${DOCSDIR}/html
 	${MKDIR} ${EXAMPLESDIR}
@@ -52,4 +44,4 @@ do-install:
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/py-fltk/distinfo b/x11-toolkits/py-fltk/distinfo
index 7260e0b40228..4c81f3fbbbae 100644
--- a/x11-toolkits/py-fltk/distinfo
+++ b/x11-toolkits/py-fltk/distinfo
@@ -1,2 +1,2 @@
-MD5 (pyFltk-1.1b2.tar.gz) = 92db2917295057520466c8a30fb620ae
-SIZE (pyFltk-1.1b2.tar.gz) = 232052
+MD5 (pyFltk-1.1b3.tar.gz) = bd32fdb6f86a6ce395bd3d9dd2e35006
+SIZE (pyFltk-1.1b3.tar.gz) = 240373
diff --git a/x11-toolkits/py-fltk/files/patch-setup.py b/x11-toolkits/py-fltk/files/patch-setup.py
index 2be68cbbd466..4f7729c12af6 100644
--- a/x11-toolkits/py-fltk/files/patch-setup.py
+++ b/x11-toolkits/py-fltk/files/patch-setup.py
@@ -1,14 +1,11 @@
---- setup.py.orig	Tue Nov 11 21:53:44 2003
-+++ setup.py	Tue Apr  6 19:31:33 2004
-@@ -32,6 +32,11 @@
+--- 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']:
-+    def_list = [('UNIX', '1')]
-+    lib_dir_list = [fltk_lib_dir,'/usr/X11R6/lib','/usr/local/lib']
-+    lib_list = ["fltk", "fltk_images", "fltk_forms",
-+		    "fltk_gl", "GL", "jpeg", "png", "z"]
- else:
-     print "Platform not officially supported!"
-     print "You can try to edit the platform specific settings in the file setup.py by creating an entry for the following platform: ", sys.platform
+-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 --git a/x11-toolkits/py-fltk/pkg-plist b/x11-toolkits/py-fltk/pkg-plist
index 981b2f25fdae..6ba2e9f4a25c 100644
--- a/x11-toolkits/py-fltk/pkg-plist
+++ b/x11-toolkits/py-fltk/pkg-plist
@@ -16,6 +16,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/pyFltk.html
 %%PORTDOCS%%%%DOCSDIR%%/html/setMenus.html
 %%PORTDOCS%%%%EXAMPLESDIR%%/HelpDialog.html
+%%PORTDOCS%%%%EXAMPLESDIR%%/TextEditor.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/adjuster.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/arc.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/ask.py
@@ -37,6 +38,7 @@
 %%PORTDOCS%%%%EXAMPLESDIR%%/demos.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/dials.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/doublebuffer.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/draw.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/file_chooser.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/formsbitmap.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/group.py
@@ -46,6 +48,7 @@
 %%PORTDOCS%%%%EXAMPLESDIR%%/iconize.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/idle.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/image.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/image_array.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/listSelect.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/menu.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/menubar.py
@@ -63,8 +66,8 @@
 %%PORTDOCS%%%%EXAMPLESDIR%%/tabs.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/testWrapper.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/testhelp.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/tile.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/timeout.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/tree_demo.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/valuators.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/widgets.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/window.py