Updating to 1.18.

PR:		ports/113311

4 files changed, 48 insertions, 32 deletions

diff --git a/x11-toolkits/py-wmdockapps/Makefile b/x11-toolkits/py-wmdockapps/Makefile
index ac86714bd9ef..643e3805f372 100644
--- a/x11-toolkits/py-wmdockapps/Makefile
+++ b/x11-toolkits/py-wmdockapps/Makefile
@@ -1,21 +1,20 @@
-# ex:ts=8
-# Ports collection makefile for:	pywmgeneral
-# Date created:			Jan 5, 2004
-# Whom:				ijliao
+# New ports collection makefile for:	pywmdockapps
+# Date created:		2007-05-09
+# Whom:			David Thiel <lx@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	wmgeneral
-PORTVERSION=	0.1
-PORTREVISION=	1
+PORTNAME=	wmdockapps
+PORTVERSION=	1.18
 CATEGORIES=	x11-toolkits python windowmaker
-MASTER_SITES=	http://errl.info/pywmdockapps/downloads/current/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	pywmdockapps
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	py${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A library that makes it possible to write WindowMaker dockapps in Python
+MAINTAINER=	lx@FreeBSD.org
+COMMENT=	Tools for making dockapps in Python
 
 USE_XLIB=	yes
 USE_PYTHON=	yes
diff --git a/x11-toolkits/py-wmdockapps/distinfo b/x11-toolkits/py-wmdockapps/distinfo
index e80d5d1055d4..8cccb2c90d96 100644
--- a/x11-toolkits/py-wmdockapps/distinfo
+++ b/x11-toolkits/py-wmdockapps/distinfo
@@ -1,3 +1,3 @@
-MD5 (pywmgeneral-0.1.tar.gz) = a393198a17f0c3f14920525cffc82669
-SHA256 (pywmgeneral-0.1.tar.gz) = 748f32a282b91b1ec3dbd9e1c523ed8f4618f65faf7980ac440d9f9ec33f375e
-SIZE (pywmgeneral-0.1.tar.gz) = 9374
+MD5 (pywmdockapps-1.18.tar.gz) = 3d7989e98adf347f91c613ae884fe770
+SHA256 (pywmdockapps-1.18.tar.gz) = f6d37100254d9e1ccf384ceeb8506ce8d9011d31f0c840e7311cceaf6f20eedb
+SIZE (pywmdockapps-1.18.tar.gz) = 49770
diff --git a/x11-toolkits/py-wmdockapps/pkg-descr b/x11-toolkits/py-wmdockapps/pkg-descr
index 6e25ae5ebbfe..896a947639b5 100644
--- a/x11-toolkits/py-wmdockapps/pkg-descr
+++ b/x11-toolkits/py-wmdockapps/pkg-descr
@@ -1,16 +1,4 @@
-Pywmgeneral is a python module that will help you develope WindowMaker
-dockapps in python. It is mostly a wrapper around the functions from the
-popular wmgeneral.c, but some new functions are added too.
+Pywmdockapps is a set of python bindings for WindowMaker dockapps, with
+some usable example dockapps.
 
-It also contains the Python written module pywmhelpers.py which contains
-functions to aid the development of wm dockapps. This module contains python
-functions that wrap up the functions which the extension module provides. They
-ease up argument passing and give nicer return values. Some additional
-functions, like help for handling a simple configuration file is also
-available. This module is better documented than the pywmgeneral. It is
-adviced to only use pywmhelpers and not touch the pywmgeneral module directly
-at all. For information about how to use the module, see the documentation in
-pywmhelpers.py. It is also possible to import it in the interactive interpreter
-and issue 'help(pywmhelpers)'.
-
-WWW: http://foo.unix.se/pywmdockapps/ 
+WWW:	http://pywmdockapps.sourceforge.net/
diff --git a/x11-toolkits/py-wmdockapps/pkg-plist b/x11-toolkits/py-wmdockapps/pkg-plist
index d092e4f645bc..17dbc24206cc 100644
--- a/x11-toolkits/py-wmdockapps/pkg-plist
+++ b/x11-toolkits/py-wmdockapps/pkg-plist
@@ -1,4 +1,33 @@
-%%PYTHON_SITELIBDIR%%/pywmgeneral.so
-%%PYTHON_SITELIBDIR%%/pywmhelpers.py
-%%PYTHON_SITELIBDIR%%/pywmhelpers.pyc
-%%PYTHON_SITELIBDIR%%/pywmhelpers.pyo
+bin/pywmdatetime.py
+bin/pywmhdmon.py
+bin/pywmseti.py
+bin/pywmsysmon.py
+bin/pywmPhoto.py
+bin/pywmgeneric.py
+%%PYTHON_SITELIBDIR%%/wmdocklib/__init__.py
+%%PYTHON_SITELIBDIR%%/wmdocklib/pywmhelpers.py
+%%PYTHON_SITELIBDIR%%/wmdocklib/3x5.xpm
+%%PYTHON_SITELIBDIR%%/wmdocklib/4x6.xpm
+%%PYTHON_SITELIBDIR%%/wmdocklib/4x7.xpm
+%%PYTHON_SITELIBDIR%%/wmdocklib/5x7-aa.xpm
+%%PYTHON_SITELIBDIR%%/wmdocklib/5x7.xpm
+%%PYTHON_SITELIBDIR%%/wmdocklib/5x8.xpm
+%%PYTHON_SITELIBDIR%%/wmdocklib/5x9.xpm
+%%PYTHON_SITELIBDIR%%/wmdocklib/6(3)x8-7seg.xpm
+%%PYTHON_SITELIBDIR%%/wmdocklib/6x12.xpm
+%%PYTHON_SITELIBDIR%%/wmdocklib/6x8-7seg.xpm
+%%PYTHON_SITELIBDIR%%/wmdocklib/6x8.xpm
+%%PYTHON_SITELIBDIR%%/wmdocklib/6x8orig.xpm
+%%PYTHON_SITELIBDIR%%/wmdocklib/6x8slant.xpm
+%%PYTHON_SITELIBDIR%%/wmdocklib/7x12-41c.xpm
+%%PYTHON_SITELIBDIR%%/wmdocklib/7x8zx.xpm
+%%PYTHON_SITELIBDIR%%/wmdocklib/8x12-41c.xpm
+%%PYTHON_SITELIBDIR%%/wmdocklib/8x8-cholo.xpm
+%%PYTHON_SITELIBDIR%%/wmdocklib/8x8.xpm
+%%PYTHON_SITELIBDIR%%/wmdocklib/8x8zx.xpm
+%%PYTHON_SITELIBDIR%%/wmdocklib/pywmgeneral.so
+%%PYTHON_SITELIBDIR%%/wmdocklib/__init__.pyc
+%%PYTHON_SITELIBDIR%%/wmdocklib/pywmhelpers.pyc
+%%PYTHON_SITELIBDIR%%/wmdocklib/__init__.pyo
+%%PYTHON_SITELIBDIR%%/wmdocklib/pywmhelpers.pyo
+@dirrmtry %%PYTHON_SITELIBDIR%%/wmdocklib