- Update to 0.4.3

- Use PYTHON_SITELIBDIR and DATADIR in pkg-plist
- Respect PREFIX

PR:		59142
Submitted by:	Clement Laforet <sheepkiller@cultdeadsheep.org>

3 files changed, 188 insertions, 85 deletions

diff --git a/ftp/ftpcube/Makefile b/ftp/ftpcube/Makefile
index 61c2e9a..1f11f16 100644
--- a/ftp/ftpcube/Makefile
+++ b/ftp/ftpcube/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	ftpcube
-PORTVERSION=	0.3.2
+PORTVERSION=	0.4.3
 CATEGORIES=	ftp python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,9 +15,13 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A graphical FTP Client
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-1.2/gtk.py:${PORTSDIR}/x11-toolkits/py-gtk
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/wx/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython
 
+USE_REINPLACE=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 
+post-patch:
+	@${REINPLACE_CMD} 's,/usr/local,${PREFIX},' ${WRKSRC}/setup.cfg
+	
 .include <bsd.port.mk>
diff --git a/ftp/ftpcube/distinfo b/ftp/ftpcube/distinfo
index ffd3483..0f46b15 100644
--- a/ftp/ftpcube/distinfo
+++ b/ftp/ftpcube/distinfo
@@ -1 +1 @@
-MD5 (ftpcube-0.3.2.tar.gz) = 0786b2466030dc4f63e9619d5b7c0566
+MD5 (ftpcube-0.4.3.tar.gz) = 574d207377a24caf6315866d52326672
diff --git a/ftp/ftpcube/pkg-plist b/ftp/ftpcube/pkg-plist
index 3d19a1b..429da3bb 100644
--- a/ftp/ftpcube/pkg-plist
+++ b/ftp/ftpcube/pkg-plist
@@ -1,83 +1,182 @@
+@comment $FreeBSD$
 bin/ftpcube
-lib/%%PYTHON_VERSION%%/site-packages/libftpcube/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/libftpcube/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/libftpcube/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/libftpcube/aboutwin.py
-lib/%%PYTHON_VERSION%%/site-packages/libftpcube/aboutwin.pyc
-lib/%%PYTHON_VERSION%%/site-packages/libftpcube/aboutwin.pyo
-lib/%%PYTHON_VERSION%%/site-packages/libftpcube/app.py
-lib/%%PYTHON_VERSION%%/site-packages/libftpcube/app.pyc
-lib/%%PYTHON_VERSION%%/site-packages/libftpcube/app.pyo
-lib/%%PYTHON_VERSION%%/site-packages/libftpcube/bookmarkwin.py
-lib/%%PYTHON_VERSION%%/site-packages/libftpcube/bookmarkwin.pyc
-lib/%%PYTHON_VERSION%%/site-packages/libftpcube/bookmarkwin.pyo
-lib/%%PYTHON_VERSION%%/site-packages/libftpcube/browsewin.py
-lib/%%PYTHON_VERSION%%/site-packages/libftpcube/browsewin.pyc
-lib/%%PYTHON_VERSION%%/site-packages/libftpcube/browsewin.pyo
-lib/%%PYTHON_VERSION%%/site-packages/libftpcube/cache.py
-lib/%%PYTHON_VERSION%%/site-packages/libftpcube/cache.pyc
-lib/%%PYTHON_VERSION%%/site-packages/libftpcube/cache.pyo
-lib/%%PYTHON_VERSION%%/site-packages/libftpcube/cmdwin.py
-lib/%%PYTHON_VERSION%%/site-packages/libftpcube/cmdwin.pyc
-lib/%%PYTHON_VERSION%%/site-packages/libftpcube/cmdwin.pyo
-lib/%%PYTHON_VERSION%%/site-packages/libftpcube/connectwin.py
-lib/%%PYTHON_VERSION%%/site-packages/libftpcube/connectwin.pyc
-lib/%%PYTHON_VERSION%%/site-packages/libftpcube/connectwin.pyo
-lib/%%PYTHON_VERSION%%/site-packages/libftpcube/ctrlwin.py
-lib/%%PYTHON_VERSION%%/site-packages/libftpcube/ctrlwin.pyc
-lib/%%PYTHON_VERSION%%/site-packages/libftpcube/ctrlwin.pyo
-lib/%%PYTHON_VERSION%%/site-packages/libftpcube/defaults.py
-lib/%%PYTHON_VERSION%%/site-packages/libftpcube/defaults.pyc
-lib/%%PYTHON_VERSION%%/site-packages/libftpcube/defaults.pyo
-lib/%%PYTHON_VERSION%%/site-packages/libftpcube/filewin.py
-lib/%%PYTHON_VERSION%%/site-packages/libftpcube/filewin.pyc
-lib/%%PYTHON_VERSION%%/site-packages/libftpcube/filewin.pyo
-lib/%%PYTHON_VERSION%%/site-packages/libftpcube/ftp.py
-lib/%%PYTHON_VERSION%%/site-packages/libftpcube/ftp.pyc
-lib/%%PYTHON_VERSION%%/site-packages/libftpcube/ftp.pyo
-lib/%%PYTHON_VERSION%%/site-packages/libftpcube/intl.py
-lib/%%PYTHON_VERSION%%/site-packages/libftpcube/intl.pyc
-lib/%%PYTHON_VERSION%%/site-packages/libftpcube/intl.pyo
-lib/%%PYTHON_VERSION%%/site-packages/libftpcube/logging.py
-lib/%%PYTHON_VERSION%%/site-packages/libftpcube/logging.pyc
-lib/%%PYTHON_VERSION%%/site-packages/libftpcube/logging.pyo
-lib/%%PYTHON_VERSION%%/site-packages/libftpcube/main.py
-lib/%%PYTHON_VERSION%%/site-packages/libftpcube/main.pyc
-lib/%%PYTHON_VERSION%%/site-packages/libftpcube/main.pyo
-lib/%%PYTHON_VERSION%%/site-packages/libftpcube/optionwin.py
-lib/%%PYTHON_VERSION%%/site-packages/libftpcube/optionwin.pyc
-lib/%%PYTHON_VERSION%%/site-packages/libftpcube/optionwin.pyo
-lib/%%PYTHON_VERSION%%/site-packages/libftpcube/threads.py
-lib/%%PYTHON_VERSION%%/site-packages/libftpcube/threads.pyc
-lib/%%PYTHON_VERSION%%/site-packages/libftpcube/threads.pyo
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/libftpcube
-share/ftpcube/icons/abort.xpm
-share/ftpcube/icons/add_bookmark.xpm
-share/ftpcube/icons/add_folder.xpm
-share/ftpcube/icons/bookmark.xpm
-share/ftpcube/icons/check_archive.xpm
-share/ftpcube/icons/clear.xpm
-share/ftpcube/icons/connect.xpm
-share/ftpcube/icons/disconnect.xpm
-share/ftpcube/icons/edit_bookmark.xpm
-share/ftpcube/icons/enable.xpm
-share/ftpcube/icons/exit.xpm
-share/ftpcube/icons/file.xpm
-share/ftpcube/icons/folder.xpm
-share/ftpcube/icons/ftpcube.xpm
-share/ftpcube/icons/link.xpm
-share/ftpcube/icons/load_queue.xpm
-share/ftpcube/icons/main_thread.xpm
-share/ftpcube/icons/quick_connect.xpm
-share/ftpcube/icons/refresh.xpm
-share/ftpcube/icons/resubmit_job.xpm
-share/ftpcube/icons/save_queue.xpm
-share/ftpcube/icons/test.xpm
-share/ftpcube/icons/thread_abort.xpm
-share/ftpcube/icons/thread_action.xpm
-share/ftpcube/icons/thread_connect.xpm
-share/ftpcube/icons/thread_download.xpm
-share/ftpcube/icons/thread_idle.xpm
-share/ftpcube/icons/thread_listing.xpm
-@dirrm share/ftpcube/icons
-@dirrm share/ftpcube
+%%PYTHON_SITELIBDIR%%/libftpcube/__init__.py
+%%PYTHON_SITELIBDIR%%/libftpcube/aboutwin.py
+%%PYTHON_SITELIBDIR%%/libftpcube/archiver.py
+%%PYTHON_SITELIBDIR%%/libftpcube/bookmark.py
+%%PYTHON_SITELIBDIR%%/libftpcube/bookmarkwin.py
+%%PYTHON_SITELIBDIR%%/libftpcube/browser.py
+%%PYTHON_SITELIBDIR%%/libftpcube/browsewin.py
+%%PYTHON_SITELIBDIR%%/libftpcube/cache.py
+%%PYTHON_SITELIBDIR%%/libftpcube/config.py
+%%PYTHON_SITELIBDIR%%/libftpcube/connectwin.py
+%%PYTHON_SITELIBDIR%%/libftpcube/consolewin.py
+%%PYTHON_SITELIBDIR%%/libftpcube/chmodwin.py
+%%PYTHON_SITELIBDIR%%/libftpcube/ctrlwin.py
+%%PYTHON_SITELIBDIR%%/libftpcube/defaults.py
+%%PYTHON_SITELIBDIR%%/libftpcube/dialog.py
+%%PYTHON_SITELIBDIR%%/libftpcube/dispatcher.py
+%%PYTHON_SITELIBDIR%%/libftpcube/events.py
+%%PYTHON_SITELIBDIR%%/libftpcube/ftp.py
+%%PYTHON_SITELIBDIR%%/libftpcube/logger.py
+%%PYTHON_SITELIBDIR%%/libftpcube/main.py
+%%PYTHON_SITELIBDIR%%/libftpcube/mainwin.py
+%%PYTHON_SITELIBDIR%%/libftpcube/messages.py
+%%PYTHON_SITELIBDIR%%/libftpcube/optionwin.py
+%%PYTHON_SITELIBDIR%%/libftpcube/protocol.py
+%%PYTHON_SITELIBDIR%%/libftpcube/threads.py
+%%PYTHON_SITELIBDIR%%/libftpcube/util.py
+%%PYTHON_SITELIBDIR%%/libftpcube/txtwrapper.py
+%%PYTHON_SITELIBDIR%%/libftpcube/archtypes/__init__.py
+%%PYTHON_SITELIBDIR%%/libftpcube/archtypes/archhandler.py
+%%PYTHON_SITELIBDIR%%/libftpcube/archtypes/ziphandler.py
+%%PYTHON_SITELIBDIR%%/libftpcube/archtypes/__init__.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/archtypes/archhandler.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/archtypes/ziphandler.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/archtypes/__init__.pyo
+%%PYTHON_SITELIBDIR%%/libftpcube/archtypes/archhandler.pyo
+%%PYTHON_SITELIBDIR%%/libftpcube/archtypes/ziphandler.pyo
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/__init__.py
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/abort.py
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/add_bookmark.py
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/add_folder.py
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/bookmark.py
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/check_archive.py
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/clear.py
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/connect.py
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/disconnect.py
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/edit_bookmark.py
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/enable.py
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/exit.py
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/file.py
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/folder.py
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/ftpcube.py
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/link.py
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/load_queue.py
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/main_thread.py
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/quick_connect.py
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/refresh.py
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/resubmit_job.py
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/save_queue.py
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/thread_abort.py
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/thread_action.py
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/thread_connect.py
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/thread_download.py
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/thread_idle.py
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/thread_listing.py
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/__init__.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/abort.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/add_bookmark.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/add_folder.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/bookmark.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/check_archive.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/clear.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/connect.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/disconnect.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/edit_bookmark.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/enable.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/exit.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/file.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/folder.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/ftpcube.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/link.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/load_queue.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/main_thread.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/quick_connect.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/refresh.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/resubmit_job.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/save_queue.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/thread_abort.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/thread_action.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/thread_connect.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/thread_download.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/thread_idle.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/thread_listing.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/__init__.pyo
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/abort.pyo
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/add_bookmark.pyo
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/add_folder.pyo
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/bookmark.pyo
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/check_archive.pyo
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/clear.pyo
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/connect.pyo
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/disconnect.pyo
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/edit_bookmark.pyo
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/enable.pyo
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/exit.pyo
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/file.pyo
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/folder.pyo
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/ftpcube.pyo
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/link.pyo
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/load_queue.pyo
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/main_thread.pyo
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/quick_connect.pyo
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/refresh.pyo
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/resubmit_job.pyo
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/save_queue.pyo
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/thread_abort.pyo
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/thread_action.pyo
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/thread_connect.pyo
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/thread_download.pyo
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/thread_idle.pyo
+%%PYTHON_SITELIBDIR%%/libftpcube/icons/thread_listing.pyo
+%%PYTHON_SITELIBDIR%%/libftpcube/__init__.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/aboutwin.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/archiver.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/bookmark.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/bookmarkwin.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/browser.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/browsewin.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/cache.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/config.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/connectwin.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/consolewin.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/chmodwin.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/ctrlwin.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/defaults.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/dialog.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/dispatcher.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/events.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/ftp.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/logger.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/main.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/mainwin.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/messages.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/optionwin.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/protocol.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/threads.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/util.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/txtwrapper.pyc
+%%PYTHON_SITELIBDIR%%/libftpcube/__init__.pyo
+%%PYTHON_SITELIBDIR%%/libftpcube/aboutwin.pyo
+%%PYTHON_SITELIBDIR%%/libftpcube/archiver.pyo
+%%PYTHON_SITELIBDIR%%/libftpcube/bookmark.pyo
+%%PYTHON_SITELIBDIR%%/libftpcube/bookmarkwin.pyo
+%%PYTHON_SITELIBDIR%%/libftpcube/browser.pyo
+%%PYTHON_SITELIBDIR%%/libftpcube/browsewin.pyo
+%%PYTHON_SITELIBDIR%%/libftpcube/cache.pyo
+%%PYTHON_SITELIBDIR%%/libftpcube/config.pyo
+%%PYTHON_SITELIBDIR%%/libftpcube/connectwin.pyo
+%%PYTHON_SITELIBDIR%%/libftpcube/consolewin.pyo
+%%PYTHON_SITELIBDIR%%/libftpcube/chmodwin.pyo
+%%PYTHON_SITELIBDIR%%/libftpcube/ctrlwin.pyo
+%%PYTHON_SITELIBDIR%%/libftpcube/defaults.pyo
+%%PYTHON_SITELIBDIR%%/libftpcube/dialog.pyo
+%%PYTHON_SITELIBDIR%%/libftpcube/dispatcher.pyo
+%%PYTHON_SITELIBDIR%%/libftpcube/events.pyo
+%%PYTHON_SITELIBDIR%%/libftpcube/ftp.pyo
+%%PYTHON_SITELIBDIR%%/libftpcube/logger.pyo
+%%PYTHON_SITELIBDIR%%/libftpcube/main.pyo
+%%PYTHON_SITELIBDIR%%/libftpcube/mainwin.pyo
+%%PYTHON_SITELIBDIR%%/libftpcube/messages.pyo
+%%PYTHON_SITELIBDIR%%/libftpcube/optionwin.pyo
+%%PYTHON_SITELIBDIR%%/libftpcube/protocol.pyo
+%%PYTHON_SITELIBDIR%%/libftpcube/threads.pyo
+%%PYTHON_SITELIBDIR%%/libftpcube/util.pyo
+%%PYTHON_SITELIBDIR%%/libftpcube/txtwrapper.pyo
+%%DATADIR%%/icons/ftpcube.xpm
+@dirrm %%PYTHON_SITELIBDIR%%/libftpcube/archtypes
+@dirrm %%PYTHON_SITELIBDIR%%/libftpcube/icons
+@dirrm %%PYTHON_SITELIBDIR%%/libftpcube
+@dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%