4 files changed, 59 insertions, 65 deletions

diff --git a/net-im/imcom/Makefile b/net-im/imcom/Makefile
index 4fbbd0c79f90..430a9d7ce6e0 100644
--- a/net-im/imcom/Makefile
+++ b/net-im/imcom/Makefile
@@ -5,10 +5,9 @@
 # $FreeBSD$
 
 PORTNAME=	imcom
-PORTVERSION=	1.30.b8
+PORTVERSION=	1.31
 CATEGORIES=	net
-MASTER_SITES=	http://nafai.dyndns.org/files/imcom-betas/
-DISTNAME=	${PORTNAME}-1.30beta8
+MASTER_SITES=	http://nafai.dyndns.org/files/
 
 MAINTAINER=	martijn@pacno.net
 COMMENT=	IMCom is a command-line Jabber client written in Python
@@ -20,9 +19,4 @@ USE_PYTHON=	yes
 
 MAN1=		imcom.1
 
-pre-install:
-	@cd ${WRKSRC} ; \
-	${RM} -rf docs/CVS; \
-	${RM} -rf docs/*~
-
 .include <bsd.port.mk>
diff --git a/net-im/imcom/distinfo b/net-im/imcom/distinfo
index c86a643290b1..85b30c96e927 100644
--- a/net-im/imcom/distinfo
+++ b/net-im/imcom/distinfo
@@ -1 +1 @@
-MD5 (imcom-1.30beta8.tar.gz) = 5b04cf52449a1ecd8a9dc38c4560061f
+MD5 (imcom-1.31.tar.gz) = 39e910c77d696ea3b607ec34f113b93b
diff --git a/net-im/imcom/files/patch-Makefile.in b/net-im/imcom/files/patch-Makefile.in
index 5af8848c8ab1..df15ce4564ed 100644
--- a/net-im/imcom/files/patch-Makefile.in
+++ b/net-im/imcom/files/patch-Makefile.in
@@ -1,40 +1,41 @@
---- Makefile.in.orig	Thu Apr 10 11:11:05 2003
-+++ Makefile.in	Thu Apr 10 11:18:55 2003
-@@ -2,21 +2,29 @@
+--- Makefile.in.orig	Mon Jul 21 15:34:31 2003
++++ Makefile.in	Mon Jul 21 15:39:57 2003
+@@ -2,7 +2,7 @@
  exec_prefix = @exec_prefix@
  bindir = @bindir@
  datadir = @datadir@
-+docdir = @datadir@/doc
+-docdir = @datadir@/imcom/docs
++docdir = @datadir@/doc/imcom
  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
+@@ -13,21 +13,23 @@
  
- 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}/
+ install-bin: install-modules
+ 	install -d -m 0755 ${bindir}
+-	install -m 0755 imcom ${bindir}
++	${BSD_INSTALL_SCRIPT} imcom ${bindir}
+ 
+ install-modules:
+ 	install -d -m 0755 ${datadir}/imcom
+ 	install -d -m 0755 ${datadir}/imcom/modules
+ 	install -m 0644 *.py ${datadir}/imcom
+ 	install -m 0644 modules/*.py ${datadir}/imcom/modules
+-	install -m 0755 CLI.py LogHandler.py AccountCreator.py ${datadir}/imcom
++	${BSD_INSTALL_SCRIPT} CLI.py LogHandler.py AccountCreator.py ${datadir}/imcom
+ 
+ install-doc:
+-	install -d -m 0755 ${docdir}
+ 	install -d -m 0755 ${mandir}/man1
+-	install -m 0755 docs/*.html ${docdir}
+-	install -m 0755 CONTRIBUTORS LICENSE README README.autostatus TODO WHATSNEW ${docdir}
+-	install -m 0755 docs/imcom.1 ${mandir}/man1/imcom.1
++	${BSD_INSTALL_MAN} docs/imcom.1 ${mandir}/man1/imcom.1
 +.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
++	install -d -m 0755 ${docdir}
++	${BSD_INSTALL_DATA} docs/*.html ${docdir}
++	${BSD_INSTALL_DATA} CONTRIBUTORS LICENSE README README.autostatus TODO WHATSNEW ${docdir}
 +.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
  
+ uninstall:
diff --git a/net-im/imcom/pkg-plist b/net-im/imcom/pkg-plist
index fea7046a719d..b6b9905a7894 100644
--- a/net-im/imcom/pkg-plist
+++ b/net-im/imcom/pkg-plist
@@ -1,10 +1,22 @@
 bin/imcom
-%%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
+share/imcom/modules/__init__.py
+share/imcom/modules/awaylogmodule.py
+share/imcom/modules/conferencecolorsmodule.py
+share/imcom/modules/examplemodule.py
+share/imcom/modules/testmodule.py
+share/imcom/AccountCreator.py
+share/imcom/AutoStatus.py
+share/imcom/CICommands.py
+share/imcom/CLI.py
+share/imcom/Colors.py
+share/imcom/IHTTPServer.py
+share/imcom/IMCom.py
+share/imcom/JabberHandler.py
+share/imcom/JabberTags.py
+share/imcom/LogHandler.py
+share/imcom/Preferences.py
+share/imcom/SocketWrapper.py
+share/imcom/VCardTags.py
 %%PORTDOCS%%share/doc/imcom/advanced.html
 %%PORTDOCS%%share/doc/imcom/commands.html
 %%PORTDOCS%%share/doc/imcom/download.html
@@ -12,25 +24,12 @@ bin/imcom
 %%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
-share/imcom/LogHandler.py
-share/imcom/JabberTags.py
-share/imcom/JabberHandler.py
-share/imcom/IMCom.py
-share/imcom/IHTTPServer.py
-share/imcom/Colors.py
-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
+%%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
+@dirrm share/imcom/modules
 @dirrm share/imcom
+%%PORTDOCS%%@dirrm share/doc/imcom