4 files changed, 45 insertions, 98 deletions

diff --git a/net-im/fugu/Makefile b/net-im/fugu/Makefile
index 0daee57b39a3..07084b26b851 100644
--- a/net-im/fugu/Makefile
+++ b/net-im/fugu/Makefile
@@ -6,25 +6,17 @@
 #
 
 PORTNAME=	fugu
-PORTVERSION=	1.1.8
-PORTREVISION=	4
+PORTVERSION=	1.2.3
 CATEGORIES=	net-im python
-MASTER_SITES=	http://fugu.gale.org/dist/old/
+MASTER_SITES=	http://fugu.gale.org/dist/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	5u623l20@gmail.com
 COMMENT=	A graphical client for the Gale instant messaging system
 
-RUN_DEPENDS+= 	${PYTHON_SITELIBDIR}/Pmw:${PORTSDIR}/x11-toolkits/py-Pmw
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/Pmw:${PORTSDIR}/x11-toolkits/py-Pmw
 
 USE_OPENSSL=	yes
 USE_PYTHON=	yes
-USE_AUTOTOOLS=	autoconf213
-GNU_CONFIGURE=	yes
-
-CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
-CPPFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
-LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	INSTALL=""
-PLIST_SUB+=	PORTVERSION=${PORTVERSION}
+USE_PYDISTUTILS=	yes
 
 .include <bsd.port.mk>
diff --git a/net-im/fugu/distinfo b/net-im/fugu/distinfo
index c19297359afc..335c666b80a1 100644
--- a/net-im/fugu/distinfo
+++ b/net-im/fugu/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fugu-1.1.8.tar.gz) = 5ff7b9bf1b69b2c5dc24de5216014c60686db5a1a7bf335f71a9b858bfe467fb
-SIZE (fugu-1.1.8.tar.gz) = 240212
+SHA256 (fugu-1.2.3.tar.gz) = c8624d0a499696727cda906dc2865aa1f00d791dfaf38be5e09fdfc9c73493e6
+SIZE (fugu-1.2.3.tar.gz) = 105969
diff --git a/net-im/fugu/files/patch-configure b/net-im/fugu/files/patch-configure
deleted file mode 100644
index f6a0686bfdcc..000000000000
--- a/net-im/fugu/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig	Thu Mar 14 12:52:32 2002
-+++ configure.in	Thu Mar 14 12:52:39 2002
-@@ -46,7 +46,7 @@
- 
- 	 dnl -- and whether the build system is installed
-       AC_MSG_CHECKING(whether Python development environment is installed)
--	 if test ! -f "${PYTHONDIR}/Makefile.pre.in"; then
-+	 if test ! -f "${PYTHONDIR}/Makefile"; then
- 	 	AC_MSG_RESULT(not found)
- 		AC_MSG_ERROR(Perhaps you need to install the Python development tools?)
-       else
diff --git a/net-im/fugu/pkg-plist b/net-im/fugu/pkg-plist
index df7277ba3954..439f53db3dbf 100644
--- a/net-im/fugu/pkg-plist
+++ b/net-im/fugu/pkg-plist
@@ -1,73 +1,39 @@
+bin/fugu-config
 bin/fugu
-bin/pygale-config
-lib/fugu-%%PORTVERSION%%/DefaultConfig.py
-lib/fugu-%%PORTVERSION%%/DefaultConfig.pyc
-lib/fugu-%%PORTVERSION%%/HistoryCombo.py
-lib/fugu-%%PORTVERSION%%/HistoryCombo.pyc
-lib/fugu-%%PORTVERSION%%/ScrolledText.py
-lib/fugu-%%PORTVERSION%%/ScrolledText.pyc
-lib/fugu-%%PORTVERSION%%/buttonbar.py
-lib/fugu-%%PORTVERSION%%/buttonbar.pyc
-lib/fugu-%%PORTVERSION%%/config.py
-lib/fugu-%%PORTVERSION%%/config.pyc
-lib/fugu-%%PORTVERSION%%/connection.py
-lib/fugu-%%PORTVERSION%%/connection.pyc
-lib/fugu-%%PORTVERSION%%/fugu-icon.xbm
-lib/fugu-%%PORTVERSION%%/openssl/__init__.py
-lib/fugu-%%PORTVERSION%%/openssl/__init__.pyc
-lib/fugu-%%PORTVERSION%%/openssl/bn.py
-lib/fugu-%%PORTVERSION%%/openssl/bn.pyc
-lib/fugu-%%PORTVERSION%%/openssl/err.py
-lib/fugu-%%PORTVERSION%%/openssl/err.pyc
-lib/fugu-%%PORTVERSION%%/openssl/evp.py
-lib/fugu-%%PORTVERSION%%/openssl/evp.pyc
-lib/fugu-%%PORTVERSION%%/openssl/log.py
-lib/fugu-%%PORTVERSION%%/openssl/log.pyc
-lib/fugu-%%PORTVERSION%%/openssl/opensslc.so
-lib/fugu-%%PORTVERSION%%/openssl/rand.py
-lib/fugu-%%PORTVERSION%%/openssl/rand.pyc
-lib/fugu-%%PORTVERSION%%/openssl/rsa.py
-lib/fugu-%%PORTVERSION%%/openssl/rsa.pyc
-lib/fugu-%%PORTVERSION%%/openssl/wrap.py
-lib/fugu-%%PORTVERSION%%/openssl/wrap.pyc
-lib/fugu-%%PORTVERSION%%/puffdisp.py
-lib/fugu-%%PORTVERSION%%/puffdisp.pyc
-lib/fugu-%%PORTVERSION%%/pygale/ROOT.py
-lib/fugu-%%PORTVERSION%%/pygale/ROOT.pyc
-lib/fugu-%%PORTVERSION%%/pygale/__init__.py
-lib/fugu-%%PORTVERSION%%/pygale/__init__.pyc
-lib/fugu-%%PORTVERSION%%/pygale/asyncurl.py
-lib/fugu-%%PORTVERSION%%/pygale/asyncurl.pyc
-lib/fugu-%%PORTVERSION%%/pygale/authcache.py
-lib/fugu-%%PORTVERSION%%/pygale/authcache.pyc
-lib/fugu-%%PORTVERSION%%/pygale/engine.py
-lib/fugu-%%PORTVERSION%%/pygale/engine.pyc
-lib/fugu-%%PORTVERSION%%/pygale/gale_const.py
-lib/fugu-%%PORTVERSION%%/pygale/gale_const.pyc
-lib/fugu-%%PORTVERSION%%/pygale/gale_env.py
-lib/fugu-%%PORTVERSION%%/pygale/gale_env.pyc
-lib/fugu-%%PORTVERSION%%/pygale/gale_pack.py
-lib/fugu-%%PORTVERSION%%/pygale/gale_pack.pyc
-lib/fugu-%%PORTVERSION%%/pygale/prettypuff.py
-lib/fugu-%%PORTVERSION%%/pygale/prettypuff.pyc
-lib/fugu-%%PORTVERSION%%/pygale/pygale.py
-lib/fugu-%%PORTVERSION%%/pygale/pygale.pyc
-lib/fugu-%%PORTVERSION%%/pygale/sign.py
-lib/fugu-%%PORTVERSION%%/pygale/sign.pyc
-lib/fugu-%%PORTVERSION%%/pygale/unicode.py
-lib/fugu-%%PORTVERSION%%/pygale/unicode.pyc
-lib/fugu-%%PORTVERSION%%/pygale/userinfo.py
-lib/fugu-%%PORTVERSION%%/pygale/userinfo.pyc
-lib/fugu-%%PORTVERSION%%/pygale/version.py
-lib/fugu-%%PORTVERSION%%/pygale/version.pyc
-lib/fugu-%%PORTVERSION%%/pygalesetup.py
-lib/fugu-%%PORTVERSION%%/pygalesetup.pyc
-lib/fugu-%%PORTVERSION%%/search.py
-lib/fugu-%%PORTVERSION%%/search.pyc
-lib/fugu-%%PORTVERSION%%/thumbcache.py
-lib/fugu-%%PORTVERSION%%/thumbcache.pyc
-lib/fugu-%%PORTVERSION%%/ui.py
-lib/fugu-%%PORTVERSION%%/ui.pyc
-@dirrm lib/fugu-%%PORTVERSION%%/openssl
-@dirrm lib/fugu-%%PORTVERSION%%/pygale
-@dirrm lib/fugu-%%PORTVERSION%%
+%%PYTHON_SITELIBDIR%%/fugulib/puffdisp.pyo
+%%PYTHON_SITELIBDIR%%/fugulib/ui.pyo
+%%PYTHON_SITELIBDIR%%/fugulib/search.pyc
+%%PYTHON_SITELIBDIR%%/fugulib/__init__.pyc
+%%PYTHON_SITELIBDIR%%/fugulib/config.pyc
+%%PYTHON_SITELIBDIR%%/fugulib/__init__.py
+%%PYTHON_SITELIBDIR%%/fugulib/HistoryCombo.py
+%%PYTHON_SITELIBDIR%%/fugulib/connection.py
+%%PYTHON_SITELIBDIR%%/fugulib/thumbcache.pyo
+%%PYTHON_SITELIBDIR%%/fugulib/DefaultConfig.pyc
+%%PYTHON_SITELIBDIR%%/fugulib/ScrolledText.py
+%%PYTHON_SITELIBDIR%%/fugulib/connection.pyo
+%%PYTHON_SITELIBDIR%%/fugulib/config.py
+%%PYTHON_SITELIBDIR%%/fugulib/DefaultConfig.py
+%%PYTHON_SITELIBDIR%%/fugulib/buttonbar.py
+%%PYTHON_SITELIBDIR%%/fugulib/buttonbar.pyo
+%%PYTHON_SITELIBDIR%%/fugulib/ui.py
+%%PYTHON_SITELIBDIR%%/fugulib/ScrolledText.pyo
+%%PYTHON_SITELIBDIR%%/fugulib/HistoryCombo.pyc
+%%PYTHON_SITELIBDIR%%/fugulib/PmwLocal.pyo
+%%PYTHON_SITELIBDIR%%/fugulib/search.pyo
+%%PYTHON_SITELIBDIR%%/fugulib/ui.pyc
+%%PYTHON_SITELIBDIR%%/fugulib/puffdisp.pyc
+%%PYTHON_SITELIBDIR%%/fugulib/search.py
+%%PYTHON_SITELIBDIR%%/fugulib/PmwLocal.py
+%%PYTHON_SITELIBDIR%%/fugulib/config.pyo
+%%PYTHON_SITELIBDIR%%/fugulib/__init__.pyo
+%%PYTHON_SITELIBDIR%%/fugulib/puffdisp.py
+%%PYTHON_SITELIBDIR%%/fugulib/thumbcache.pyc
+%%PYTHON_SITELIBDIR%%/fugulib/DefaultConfig.pyo
+%%PYTHON_SITELIBDIR%%/fugulib/buttonbar.pyc
+%%PYTHON_SITELIBDIR%%/fugulib/connection.pyc
+%%PYTHON_SITELIBDIR%%/fugulib/ScrolledText.pyc
+%%PYTHON_SITELIBDIR%%/fugulib/thumbcache.py
+%%PYTHON_SITELIBDIR%%/fugulib/PmwLocal.pyc
+%%PYTHON_SITELIBDIR%%/fugulib/HistoryCombo.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/fugulib