4 files changed, 54 insertions, 9 deletions

diff --git a/www/roundup/Makefile b/www/roundup/Makefile
index 443fbc8a1369..277623da68de 100644
--- a/www/roundup/Makefile
+++ b/www/roundup/Makefile
@@ -6,17 +6,15 @@
 #
 
 PORTNAME=	roundup
-PORTVERSION=	1.4.6
+PORTVERSION=	1.4.8
 CATEGORIES=	www python
-MASTER_SITES=	${MASTER_SITE_CHEESESHOP} \
-		http://dryice.name/computer/FreeBSD/distfiles/
-MASTER_SITE_SUBDIR=	source/r/${PORTNAME}
+MASTER_SITES=	CHEESESHOP
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sbrabez@gmail.com
 COMMENT=	An Issue-Tracking System for Knowledge Workers
 
 USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
+USE_PYDISTUTILS=yes
 USE_GETTEXT=	yes
 
 OPTIONS=	SQLITE	"Support Sqlite as backend" on
@@ -41,7 +39,19 @@ RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/psycopgmodule.so:${PORTSDIR}/databases/py-psy
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/MySQLdb/__init__.py:${PORTSDIR}/databases/py-MySQLdb
 .endif
 
+.if !defined(NO_INSTALL_MANPAGES)
 MAN1=		roundup-admin.1 roundup-demo.1 roundup-mailgw.1 \
 		roundup-server.1
+MANCOMPRESSED=	no
+.endif
+
+SCRIPTS=	roundup-admin roundup-demo roundup-gettext roundup-mailgw \
+		roundup-server roundup-xmlrpc-server
+
+post-install:
+	@${INSTALL_SCRIPT} ${SCRIPTS:S,^,${WRKSRC}/build/scripts-2.5/,} ${PREFIX}/bin
+.if !defined(NO_INSTALL_MANPAGES)
+	@${INSTALL_MAN} ${MAN1:S,^,${WRKSRC}/share/man/man1/,} ${MAN1PREFIX}/man/man1
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/www/roundup/distinfo b/www/roundup/distinfo
index a9175eac4365..91e6ca82d239 100644
--- a/www/roundup/distinfo
+++ b/www/roundup/distinfo
@@ -1,3 +1,3 @@
-MD5 (roundup-1.4.6.tar.gz) = e364bb8026761829752ffec76e33065f
-SHA256 (roundup-1.4.6.tar.gz) = 210209035ca2161c48117eeeedfc61194292920f1b8ac511342d369836b5b2f5
-SIZE (roundup-1.4.6.tar.gz) = 1370687
+MD5 (roundup-1.4.8.tar.gz) = a35e85dc3328d8c7ff774672f5f8a2e8
+SHA256 (roundup-1.4.8.tar.gz) = 5dcc79732a6cf017f56445ced2eb0481df78df60cbed18344f23af1eda145235
+SIZE (roundup-1.4.8.tar.gz) = 1240197
diff --git a/www/roundup/files/patch-setup.py b/www/roundup/files/patch-setup.py
new file mode 100644
index 000000000000..f080424bd82f
--- /dev/null
+++ b/www/roundup/files/patch-setup.py
@@ -0,0 +1,22 @@
+--- ./setup.py.orig	2009-03-18 04:35:22.000000000 +0100
++++ ./setup.py	2009-05-14 22:29:50.000000000 +0200
+@@ -71,9 +71,6 @@
+     data_files = [
+         ('share/roundup/cgi-bin', ['frontends/roundup.cgi']),
+     ]
+-    # install man pages on POSIX platforms
+-    if os.name == 'posix':
+-        data_files.append(include('share/man/man1', '*'))
+ 
+     # add the templates to the data files lists
+     from roundup.init import listTemplates
+@@ -88,9 +85,6 @@
+         data_files.append((os.path.dirname(_mo_file),
+                            [os.path.join("build", _mo_file)]))
+ 
+-    # add docs
+-    data_files.append(include('share/doc/roundup/html', '*'))
+-
+     # perform the setup action
+     from roundup import __version__
+ 
diff --git a/www/roundup/pkg-plist b/www/roundup/pkg-plist
index e71854a832eb..049335b7634e 100644
--- a/www/roundup/pkg-plist
+++ b/www/roundup/pkg-plist
@@ -10,6 +10,15 @@ bin/roundup-xmlrpc-server
 %%PYTHON_SITELIBDIR%%/roundup/admin.py
 %%PYTHON_SITELIBDIR%%/roundup/admin.pyc
 %%PYTHON_SITELIBDIR%%/roundup/admin.pyo
+%%PYTHON_SITELIBDIR%%/roundup/anypy/__init__.py
+%%PYTHON_SITELIBDIR%%/roundup/anypy/__init__.pyc
+%%PYTHON_SITELIBDIR%%/roundup/anypy/__init__.pyo
+%%PYTHON_SITELIBDIR%%/roundup/anypy/hashlib_.py
+%%PYTHON_SITELIBDIR%%/roundup/anypy/hashlib_.pyc
+%%PYTHON_SITELIBDIR%%/roundup/anypy/hashlib_.pyo
+%%PYTHON_SITELIBDIR%%/roundup/anypy/sets_.py
+%%PYTHON_SITELIBDIR%%/roundup/anypy/sets_.pyc
+%%PYTHON_SITELIBDIR%%/roundup/anypy/sets_.pyo
 %%PYTHON_SITELIBDIR%%/roundup/backends/__init__.py
 %%PYTHON_SITELIBDIR%%/roundup/backends/__init__.pyc
 %%PYTHON_SITELIBDIR%%/roundup/backends/__init__.pyo
@@ -172,6 +181,9 @@ bin/roundup-xmlrpc-server
 %%PYTHON_SITELIBDIR%%/roundup/configuration.py
 %%PYTHON_SITELIBDIR%%/roundup/configuration.pyc
 %%PYTHON_SITELIBDIR%%/roundup/configuration.pyo
+%%PYTHON_SITELIBDIR%%/roundup/actions.py
+%%PYTHON_SITELIBDIR%%/roundup/actions.pyc
+%%PYTHON_SITELIBDIR%%/roundup/actions.pyo
 %%PYTHON_SITELIBDIR%%/roundup/date.py
 %%PYTHON_SITELIBDIR%%/roundup/date.pyc
 %%PYTHON_SITELIBDIR%%/roundup/date.pyo
@@ -340,6 +352,7 @@ share/locale/zh_TW/LC_MESSAGES/roundup.mo
 @dirrm %%PYTHON_SITELIBDIR%%/roundup/cgi/PageTemplates
 @dirrm %%PYTHON_SITELIBDIR%%/roundup/cgi
 @dirrm %%PYTHON_SITELIBDIR%%/roundup/backends
+@dirrm %%PYTHON_SITELIBDIR%%/roundup/anypy
 @dirrm %%PYTHON_SITELIBDIR%%/roundup
 @dirrmtry share/locale/es_AR/LC_MESSAGES
 @dirrmtry share/locale/es_AR