7 files changed, 102 insertions, 26 deletions

diff --git a/x11-toolkits/py-wxPython/Makefile b/x11-toolkits/py-wxPython/Makefile
index 46dfb8695785..20d692f8d508 100644
--- a/x11-toolkits/py-wxPython/Makefile
+++ b/x11-toolkits/py-wxPython/Makefile
@@ -7,37 +7,37 @@
 
 PORTNAME=	py-wxPython
 PORTVERSION=	2.2.1
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= wxpython
+MASTER_SITE_SUBDIR=	wxpython
 DISTNAME=	wxPython-${PORTVERSION}
 
 MAINTAINER=	nectar@FreeBSD.ORG
 
-BUILD_DEPENDS=	wx-config:${PORTSDIR}/x11-toolkits/wxgtk
 LIB_DEPENDS=	wx_gtk.2:${PORTSDIR}/x11-toolkits/wxgtk
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
-
 USE_GMAKE=	yes
 USE_NEWGCC=	yes
 USE_PYTHON=	yes
 USE_GTK=	yes
-MAKE_ENV=	"LN_S=${LN} -s" "INSTALL_DATA=${INSTALL_DATA}"
+INSTALLS_SHLIB=	yes
+MAKE_ENV=	LN_S="${LN} -s" \
+		CXX="${CXX}" \
+		SYSCFLAGS="`${GTK_CONFIG} --cflags`" \
+		SYSLFLAGS="`${GTK_CONFIG} --libs` -L${WRKSRC}/src" \
+		_TARGETDIR="${PYTHON_SITELIBDIR}/wxPython" \
+		_HELPERLIBDIR="${PREFIX}/lib" \
+		WRKSRC="${WRKSRC}"
 ALL_TARGET=	default
 INSTALL_TARGET=	install-freebsd
 
-TARGETDIR=	${PREFIX}/lib/python1.5/site-packages/wxPython
-TARGETDIR=	${PYTHON_SITELIBDIR}/wxPython
-HELPERLIBDIR=	${PREFIX}/lib
-
 do-configure:
-	${SED} 	-e "s:%CFLAGS%:${CFLAGS} `${GTK_CONFIG} --cflags`:"   \
-		-e "s:%LFLAGS%:`${GTK_CONFIG} --libs` -L${WRKSRC}:"   \
-		-e "s:%TARGETDIR%:${TARGETDIR}:"		     \
-		-e "s:%HELPERLIBDIR%:${HELPERLIBDIR}:"		     \
-		-e "s:%CXX%:${CXX}:" -e "s:%WRKSRC%:${WRKSRC}:"      \
-		${FILESDIR}/build.local > ${WRKSRC}/../build.local
-	cd ${WRKSRC} && ../distrib/build.py
+	${CP} ${FILESDIR}/build.local ${WRKSRC}/src/build.local
+	${CP} ${FILESDIR}/build.local.stc ${WRKSRC}/contrib/stc/build.local
+	${CP} ${FILESDIR}/build.local.ogl ${WRKSRC}/contrib/ogl/build.local
+	cd ${WRKSRC}/src && ../distrib/build.py
+	cd ${WRKSRC}/contrib/stc && ../../distrib/build.py
+	cd ${WRKSRC}/contrib/ogl && ../../distrib/build.py
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/py-wxPython/files/build.local b/x11-toolkits/py-wxPython/files/build.local
index fee3ead46473..365298bfb7b7 100644
--- a/x11-toolkits/py-wxPython/files/build.local
+++ b/x11-toolkits/py-wxPython/files/build.local
@@ -1,15 +1,15 @@
-WXPSRCDIR   = "%WRKSRC%"
-CCC         = "%CXX%"
-OTHERCFLAGS = "%CFLAGS%"
-OTHERLFLAGS = "%LFLAGS%"
-TARGETDIR   = "%TARGETDIR%"
-HELPERLIBDIR= "%HELPERLIBDIR%"
-OTHERLIBS   = "-lgcc"
+WXPSRCDIR   = "$(WRKSRC)/src"
+CCC         = "$(CXX)"
+OTHERCFLAGS = "$(SYSCFLAGS)"
+OTHERLFLAGS = "$(SYSLFLAGS)"
+TARGETDIR   = "$(_TARGETDIR)"
+HELPERLIBDIR= "$(_HELPERLIBDIR)"
+OTHERLIBS   = "-lgcc_r"
 OTHERRULES  = OTHERRULES + r"""
 
 install-freebsd: $(TARGETDIR) $(TARGETDIR)/$(TARGET) pycfiles \
 	installLib installDemo lib$(HELPERLIB)$(SO)
-	$(INSTALL_DATA) lib$(HELPERLIB)$(SO) \
+	$(BSD_INSTALL_DATA) lib$(HELPERLIB)$(SO) \
 		$(HELPERLIBDIR)/lib$(HELPERLIB)$(SO).1
 	cd $(HELPERLIBDIR) && rm -f lib$(HELPERLIB)$(SO)
 	cd $(HELPERLIBDIR) && ${LN_S} lib$(HELPERLIB)$(SO).1 \
diff --git a/x11-toolkits/py-wxPython/files/build.local.ogl b/x11-toolkits/py-wxPython/files/build.local.ogl
new file mode 100644
index 000000000000..f214c56b9b20
--- /dev/null
+++ b/x11-toolkits/py-wxPython/files/build.local.ogl
@@ -0,0 +1,11 @@
+WXPSRCDIR   = "$(WRKSRC)/src"
+CCC         = "$(CXX)"
+OTHERLFLAGS = "$(SYSLFLAGS)"
+TARGETDIR   = "$(_TARGETDIR)"
+OTHERLIBS   = "-lgcc_r"
+OTHERRULES  = OTHERRULES + r"""
+
+install-freebsd: default $(TARGETDIR) $(TARGETDIR)/$(TARGET) pycfiles
+	$(BSD_INSTALL_PROGRAM) $(TARGET) $(TARGETDIR)
+
+"""
diff --git a/x11-toolkits/py-wxPython/files/build.local.stc b/x11-toolkits/py-wxPython/files/build.local.stc
new file mode 100644
index 000000000000..086d6c6d3c9a
--- /dev/null
+++ b/x11-toolkits/py-wxPython/files/build.local.stc
@@ -0,0 +1,17 @@
+WXPSRCDIR   = "$(WRKSRC)/src"
+CCC         = "$(CXX)"
+OTHERCFLAGS = '-D__WX__ -DSCI_LEXER ' + \
+              '-I$(STCLOC)/contrib/src/stc/scintilla/include ' + \
+              '-I$(STCLOC)/contrib/include ' + \
+              '-I$(STCLOC)/contrib/src/stc/scintilla/src ' + \
+              '-I$(WXPSRCDIR) ' + \
+              '$(SYSCFLAGS)'
+OTHERLFLAGS = "$(SYSLFLAGS)"
+TARGETDIR   = "$(_TARGETDIR)"
+OTHERLIBS   = "-lgcc_r"
+OTHERRULES  = OTHERRULES + r"""
+
+install-freebsd: default $(TARGETDIR) $(TARGETDIR)/$(TARGET) pycfiles
+	$(BSD_INSTALL_PROGRAM) $(TARGET) $(TARGETDIR)
+
+"""
diff --git a/x11-toolkits/py-wxPython/files/patch-aa b/x11-toolkits/py-wxPython/files/patch-aa
new file mode 100644
index 000000000000..e077be34f491
--- /dev/null
+++ b/x11-toolkits/py-wxPython/files/patch-aa
@@ -0,0 +1,10 @@
+--- contrib/stc/contrib/src/stc/ScintillaWX.h	2000/12/08 13:24:39	1.1
++++ contrib/stc/contrib/src/stc/ScintillaWX.h	2000/12/08 13:25:18
+@@ -41,6 +41,7 @@
+ #include "Document.h"
+ #include "Editor.h"
+ #include "ScintillaBase.h"
++#include "WinDefs.h"
+ 
+ #include <wx/wx.h>
+ #include <wx/dataobj.h>
diff --git a/x11-toolkits/py-wxPython/files/patch-ab b/x11-toolkits/py-wxPython/files/patch-ab
new file mode 100644
index 000000000000..91d04cbfe00a
--- /dev/null
+++ b/x11-toolkits/py-wxPython/files/patch-ab
@@ -0,0 +1,15 @@
+--- Makefile.orig	Fri Dec  8 16:07:15 2000
++++ Makefile	Fri Dec  8 16:48:34 2000
+@@ -0,0 +1,12 @@
++SUBDIRS=	src contrib/stc contrib/ogl
++
++default:
++	@for dir in $(SUBDIRS); do \
++		$(MAKE) -C $${dir} default || exit 1; \
++	done
++
++install-freebsd:
++	@for dir in $(SUBDIRS); do \
++		$(MAKE) -C $${dir} install-freebsd || exit 1; \
++	done
++	
diff --git a/x11-toolkits/py-wxPython/pkg-plist b/x11-toolkits/py-wxPython/pkg-plist
index ba5ccfce517f..1f970dee108d 100644
--- a/x11-toolkits/py-wxPython/pkg-plist
+++ b/x11-toolkits/py-wxPython/pkg-plist
@@ -1,5 +1,3 @@
-lib/libwxPyHelpers.so
-lib/libwxPyHelpers.so.1
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/__init__.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/__init__.pyo
@@ -450,6 +448,22 @@ lib/%%PYTHON_VERSION%%/site-packages/wxPython/misc.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/misc2.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/misc2.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/misc2.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/ogl.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/ogl.pyc
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/ogl.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglbasic.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglbasic.pyc
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglbasic.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglcanvas.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglcanvas.pyc
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglcanvas.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglcmodule.so
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglshapes.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglshapes.pyc
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglshapes.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglshapes2.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglshapes2.pyc
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/oglshapes2.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/printfw.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/printfw.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/printfw.pyo
@@ -459,6 +473,13 @@ lib/%%PYTHON_VERSION%%/site-packages/wxPython/sizers.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/stattool.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/stattool.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/stattool.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/stc.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/stc.pyc
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/stc.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/stc_.py
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/stc_.pyc
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/stc_.pyo
+lib/%%PYTHON_VERSION%%/site-packages/wxPython/stc_cmodule.so
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/utils.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/utils.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/utils.pyo
@@ -475,6 +496,8 @@ lib/%%PYTHON_VERSION%%/site-packages/wxPython/wx.py
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/wx.pyc
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/wx.pyo
 lib/%%PYTHON_VERSION%%/site-packages/wxPython/wxcmodule.so
+lib/libwxPyHelpers.so
+lib/libwxPyHelpers.so.1
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/bitmaps
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo/data
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/wxPython/demo