5 files changed, 69 insertions, 47 deletions

diff --git a/net-im/imcom/Makefile b/net-im/imcom/Makefile
index c5d4b2f9f106..4fbbd0c79f90 100644
--- a/net-im/imcom/Makefile
+++ b/net-im/imcom/Makefile
@@ -5,15 +5,21 @@
 # $FreeBSD$
 
 PORTNAME=	imcom
-PORTVERSION=	0.93
+PORTVERSION=	1.30.b8
 CATEGORIES=	net
-MASTER_SITES=	http://imcom.floobin.cx/files/
+MASTER_SITES=	http://nafai.dyndns.org/files/imcom-betas/
+DISTNAME=	${PORTNAME}-1.30beta8
 
 MAINTAINER=	martijn@pacno.net
 COMMENT=	IMCom is a command-line Jabber client written in Python
 
+RUN_DEPENDS=	${LOCALBASE}/lib/python2.2/xml/parsers/expat.py:${PORTSDIR}/textproc/py-expat
+
+GNU_CONFIGURE=	yes
 USE_PYTHON=	yes
 
+MAN1=		imcom.1
+
 pre-install:
 	@cd ${WRKSRC} ; \
 	${RM} -rf docs/CVS; \
diff --git a/net-im/imcom/distinfo b/net-im/imcom/distinfo
index 2790cbe5aa0f..c86a643290b1 100644
--- a/net-im/imcom/distinfo
+++ b/net-im/imcom/distinfo
@@ -1 +1 @@
-MD5 (imcom-0.93.tar.gz) = 0e63d044c48490cb84a326a64b2760c9
+MD5 (imcom-1.30beta8.tar.gz) = 5b04cf52449a1ecd8a9dc38c4560061f
diff --git a/net-im/imcom/files/patch-Makefile.in b/net-im/imcom/files/patch-Makefile.in
new file mode 100644
index 000000000000..5af8848c8ab1
--- /dev/null
+++ b/net-im/imcom/files/patch-Makefile.in
@@ -0,0 +1,40 @@
+--- Makefile.in.orig	Thu Apr 10 11:11:05 2003
++++ Makefile.in	Thu Apr 10 11:18:55 2003
+@@ -2,21 +2,29 @@
+ exec_prefix = @exec_prefix@
+ bindir = @bindir@
+ datadir = @datadir@
++docdir = @datadir@/doc
+ mandir = @mandir@
+ 
++pythonprograms=	CLI.py LogHandler.py AccountCreator.py
++pythondata=	AutoStatus.py CICommands.py Colors.py DTCPSocketManager.py \
++		GUI.py GUI2.py GUIbackend.py IHTTPServer.py IMCom.py JIDLink.py \
++		JabberHandler.py JabberTags.py Preferences.py SocketWrapper.py \
++		VCardTags.py test.py testuni.py 
++
+ all:
+-	chmod +x imcom CLI.py LogHandler.py AccountCreator.py
+ 
+ install: all
+ 	mkdir -p ${datadir}/imcom
+-	mkdir -p ${datadir}/imcom/docs
+-	cp *.py ${datadir}/imcom
+-	mkdir -p ${bindir}
+-	cp imcom ${bindir}
+-	cp docs/*.html ${datadir}/imcom/docs
+-	cp CONTRIBUTORS LICENSE README README.autostatus TODO WHATSNEW ${datadir}/imcom/docs
++	${BSD_INSTALL_DATA} ${pythondata} ${datadir}/imcom
++	${BSD_INSTALL_SCRIPT} ${pythonprograms} ${datadir}/imcom
++	${BSD_INSTALL_SCRIPT} imcom ${bindir}/
++.if !defined(NOPORTDOCS)
++	mkdir -p ${docdir}/imcom/
++	${BSD_INSTALL_DATA} docs/*.html ${docdir}/imcom/
++	${BSD_INSTALL_DATA} CONTRIBUTORS LICENSE README README.autostatus TODO WHATSNEW ${docdir}/imcom
++.endif
+ 	mkdir -p ${mandir}/man1/
+-	cp docs/imcom.1 ${mandir}/man1/imcom.1
++	${BSD_INSTALL_MAN} docs/imcom.1 ${mandir}/man1/imcom.1
+ 
+ install-docs: install
+ 
diff --git a/net-im/imcom/files/patch-aa b/net-im/imcom/files/patch-aa
deleted file mode 100644
index 7dfdf1d2cfa1..000000000000
--- a/net-im/imcom/files/patch-aa
+++ /dev/null
@@ -1,25 +0,0 @@
---- Makefile.orig	Wed May 22 02:45:56 2002
-+++ Makefile	Wed May 22 02:47:12 2002
-@@ -1,13 +1,13 @@
- all:
- 
- install:
--	mkdir -p /usr/local/share/imcom
--	mkdir -p /usr/local/share/imcom/docs
--	cp AutoStatus.API CONTRIBUTORS LICENSE README README.autostatus TODO WHATSNEW /usr/local/share/imcom/docs
--	cp docs/* /usr/local/share/imcom/docs
--	cp *.py /usr/local/share/imcom
--	cp imcom /usr/local/bin
-+	mkdir -p ${LOCALBASE}/share/imcom
-+	mkdir -p ${LOCALBASE}/share/doc/imcom
-+	${BSD_INSTALL_DATA} AutoStatus.API CONTRIBUTORS LICENSE README README.autostatus TODO WHATSNEW ${LOCALBASE}/share/doc/imcom
-+	${BSD_INSTALL_DATA} docs/* ${LOCALBASE}/share/doc/imcom
-+	${BSD_INSTALL_SCRIPT} *.py ${LOCALBASE}/share/imcom
-+	${BSD_INSTALL_SCRIPT} imcom ${LOCALBASE}/bin
- 
- uninstall:
--	rm -rf /usr/local/share/imcom
--	rm -f /usr/local/bin/imcom
-+	rm -rf ${LOCALBASE}/share/imcom
-+	rm -rf ${LOCALBASE}/share/doc/imcom
-+	rm -f ${LOCALBASE}/bin/imcom
diff --git a/net-im/imcom/pkg-plist b/net-im/imcom/pkg-plist
index e59db2f703b7..fea7046a719d 100644
--- a/net-im/imcom/pkg-plist
+++ b/net-im/imcom/pkg-plist
@@ -1,23 +1,17 @@
 bin/imcom
-share/doc/imcom/AutoStatus.API
-share/doc/imcom/CONTRIBUTORS
-share/doc/imcom/LICENSE
-share/doc/imcom/README
-share/doc/imcom/README.autostatus
-share/doc/imcom/TODO
-share/doc/imcom/WHATSNEW
-share/doc/imcom/CHANGELOG
-share/doc/imcom/advanced.html
-share/doc/imcom/commands.html
-share/doc/imcom/download.html
-share/doc/imcom/imcomrc.html
-share/doc/imcom/index.html
-share/doc/imcom/news.html
-share/doc/imcom/rosterlist.jpg
-share/doc/imcom/statuschange.jpg
-share/doc/imcom/style.css
-share/doc/imcom/template.html
-share/doc/imcom/whatis.html
+%%PORTDOCS%%share/doc/imcom/CONTRIBUTORS
+%%PORTDOCS%%share/doc/imcom/LICENSE
+%%PORTDOCS%%share/doc/imcom/README
+%%PORTDOCS%%share/doc/imcom/README.autostatus
+%%PORTDOCS%%share/doc/imcom/TODO
+%%PORTDOCS%%share/doc/imcom/WHATSNEW
+%%PORTDOCS%%share/doc/imcom/advanced.html
+%%PORTDOCS%%share/doc/imcom/commands.html
+%%PORTDOCS%%share/doc/imcom/download.html
+%%PORTDOCS%%share/doc/imcom/imcomrc.html
+%%PORTDOCS%%share/doc/imcom/news.html
+%%PORTDOCS%%share/doc/imcom/template.html
+%%PORTDOCS%%share/doc/imcom/whatis.html
 share/imcom/AccountCreator.py
 share/imcom/SocketWrapper.py
 share/imcom/Preferences.py
@@ -31,5 +25,12 @@ share/imcom/CLI.py
 share/imcom/CICommands.py
 share/imcom/AutoStatus.py
 share/imcom/VCardTags.py
+share/imcom/DTCPSocketManager.py
+share/imcom/GUI.py
+share/imcom/GUI2.py
+share/imcom/GUIbackend.py
+share/imcom/JIDLink.py
+share/imcom/test.py
+share/imcom/testuni.py
 @dirrm share/doc/imcom
 @dirrm share/imcom