summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www/py-moin/Makefile15
-rw-r--r--www/py-moin/PLIST157
-rw-r--r--www/py-moin/distinfo8
3 files changed, 166 insertions, 14 deletions
diff --git a/www/py-moin/Makefile b/www/py-moin/Makefile
index 0aaf4b29d5a..cb79eb05ec8 100644
--- a/www/py-moin/Makefile
+++ b/www/py-moin/Makefile
@@ -1,11 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2013/05/31 12:42:54 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.25 2014/01/20 20:17:05 wiz Exp $
-VER= 1.9.6
+VER= 1.9.7
DISTNAME= moin-${VER}
PKGNAME= ${PYPKGPREFIX}-moin-${VER}
-#PKGREVISION= 1
-PKGREVISION= 1
CATEGORIES= www python
MASTER_SITES= http://static.moinmo.in/files/
@@ -16,6 +13,8 @@ LICENSE= gnu-gpl-v2
USE_LANGUAGES= # none
+PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.9.7
+
REPLACE_PYTHON= jabberbot/bot.py \
MoinMoin/version.py \
MoinMoin/filter/EXIF.py \
@@ -38,9 +37,9 @@ REPLACE_PYTHON= jabberbot/bot.py \
wiki/server/moin* \
wiki/server/test.wsgi
-REPLACE_PERL= MoinMoin/web/static/htdocs/applets/FCKeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl \
- MoinMoin/web/static/htdocs/applets/FCKeditor/editor/filemanager/connectors/perl/connector.cgi \
- MoinMoin/web/static/htdocs/applets/FCKeditor/editor/filemanager/connectors/perl/upload.cgi
+REPLACE_PERL= MoinMoin/web/static/htdocs/applets/FCKeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl
+REPLACE_PERL+= MoinMoin/web/static/htdocs/applets/FCKeditor/editor/filemanager/connectors/perl/connector.cgi
+REPLACE_PERL+= MoinMoin/web/static/htdocs/applets/FCKeditor/editor/filemanager/connectors/perl/upload.cgi
PYTHON_SELF_CONFLICT= yes
diff --git a/www/py-moin/PLIST b/www/py-moin/PLIST
index 478b2cf77b1..26fa460bace 100644
--- a/www/py-moin/PLIST
+++ b/www/py-moin/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.11 2013/01/03 18:54:38 gls Exp $
+@comment $NetBSD: PLIST,v 1.12 2014/01/20 20:17:05 wiz Exp $
bin/moin
+${PYSITELIB}/${EGG_FILE}
${PYSITELIB}/MoinMoin/Page.py
${PYSITELIB}/MoinMoin/Page.pyc
${PYSITELIB}/MoinMoin/Page.pyo
@@ -686,6 +687,9 @@ ${PYSITELIB}/MoinMoin/script/account/disable.pyo
${PYSITELIB}/MoinMoin/script/account/homepage.py
${PYSITELIB}/MoinMoin/script/account/homepage.pyc
${PYSITELIB}/MoinMoin/script/account/homepage.pyo
+${PYSITELIB}/MoinMoin/script/account/inactive.py
+${PYSITELIB}/MoinMoin/script/account/inactive.pyc
+${PYSITELIB}/MoinMoin/script/account/inactive.pyo
${PYSITELIB}/MoinMoin/script/account/resetpw.py
${PYSITELIB}/MoinMoin/script/account/resetpw.pyc
${PYSITELIB}/MoinMoin/script/account/resetpw.pyo
@@ -875,6 +879,9 @@ ${PYSITELIB}/MoinMoin/script/migration/1090500.pyo
${PYSITELIB}/MoinMoin/script/migration/1090600.py
${PYSITELIB}/MoinMoin/script/migration/1090600.pyc
${PYSITELIB}/MoinMoin/script/migration/1090600.pyo
+${PYSITELIB}/MoinMoin/script/migration/1090700.py
+${PYSITELIB}/MoinMoin/script/migration/1090700.pyc
+${PYSITELIB}/MoinMoin/script/migration/1090700.pyo
${PYSITELIB}/MoinMoin/script/migration/__init__.py
${PYSITELIB}/MoinMoin/script/migration/__init__.pyc
${PYSITELIB}/MoinMoin/script/migration/__init__.pyo
@@ -1133,6 +1140,153 @@ ${PYSITELIB}/MoinMoin/support/parsedatetime/parsedatetime.pyo
${PYSITELIB}/MoinMoin/support/parsedatetime/parsedatetime_consts.py
${PYSITELIB}/MoinMoin/support/parsedatetime/parsedatetime_consts.pyc
${PYSITELIB}/MoinMoin/support/parsedatetime/parsedatetime_consts.pyo
+${PYSITELIB}/MoinMoin/support/passlib/__init__.py
+${PYSITELIB}/MoinMoin/support/passlib/__init__.pyc
+${PYSITELIB}/MoinMoin/support/passlib/__init__.pyo
+${PYSITELIB}/MoinMoin/support/passlib/_setup/__init__.py
+${PYSITELIB}/MoinMoin/support/passlib/_setup/__init__.pyc
+${PYSITELIB}/MoinMoin/support/passlib/_setup/__init__.pyo
+${PYSITELIB}/MoinMoin/support/passlib/_setup/docdist.py
+${PYSITELIB}/MoinMoin/support/passlib/_setup/docdist.pyc
+${PYSITELIB}/MoinMoin/support/passlib/_setup/docdist.pyo
+${PYSITELIB}/MoinMoin/support/passlib/_setup/stamp.py
+${PYSITELIB}/MoinMoin/support/passlib/_setup/stamp.pyc
+${PYSITELIB}/MoinMoin/support/passlib/_setup/stamp.pyo
+${PYSITELIB}/MoinMoin/support/passlib/apache.py
+${PYSITELIB}/MoinMoin/support/passlib/apache.pyc
+${PYSITELIB}/MoinMoin/support/passlib/apache.pyo
+${PYSITELIB}/MoinMoin/support/passlib/apps.py
+${PYSITELIB}/MoinMoin/support/passlib/apps.pyc
+${PYSITELIB}/MoinMoin/support/passlib/apps.pyo
+${PYSITELIB}/MoinMoin/support/passlib/context.py
+${PYSITELIB}/MoinMoin/support/passlib/context.pyc
+${PYSITELIB}/MoinMoin/support/passlib/context.pyo
+${PYSITELIB}/MoinMoin/support/passlib/exc.py
+${PYSITELIB}/MoinMoin/support/passlib/exc.pyc
+${PYSITELIB}/MoinMoin/support/passlib/exc.pyo
+${PYSITELIB}/MoinMoin/support/passlib/ext/__init__.py
+${PYSITELIB}/MoinMoin/support/passlib/ext/__init__.pyc
+${PYSITELIB}/MoinMoin/support/passlib/ext/__init__.pyo
+${PYSITELIB}/MoinMoin/support/passlib/ext/django/__init__.py
+${PYSITELIB}/MoinMoin/support/passlib/ext/django/__init__.pyc
+${PYSITELIB}/MoinMoin/support/passlib/ext/django/__init__.pyo
+${PYSITELIB}/MoinMoin/support/passlib/ext/django/models.py
+${PYSITELIB}/MoinMoin/support/passlib/ext/django/models.pyc
+${PYSITELIB}/MoinMoin/support/passlib/ext/django/models.pyo
+${PYSITELIB}/MoinMoin/support/passlib/ext/django/utils.py
+${PYSITELIB}/MoinMoin/support/passlib/ext/django/utils.pyc
+${PYSITELIB}/MoinMoin/support/passlib/ext/django/utils.pyo
+${PYSITELIB}/MoinMoin/support/passlib/handlers/__init__.py
+${PYSITELIB}/MoinMoin/support/passlib/handlers/__init__.pyc
+${PYSITELIB}/MoinMoin/support/passlib/handlers/__init__.pyo
+${PYSITELIB}/MoinMoin/support/passlib/handlers/bcrypt.py
+${PYSITELIB}/MoinMoin/support/passlib/handlers/bcrypt.pyc
+${PYSITELIB}/MoinMoin/support/passlib/handlers/bcrypt.pyo
+${PYSITELIB}/MoinMoin/support/passlib/handlers/cisco.py
+${PYSITELIB}/MoinMoin/support/passlib/handlers/cisco.pyc
+${PYSITELIB}/MoinMoin/support/passlib/handlers/cisco.pyo
+${PYSITELIB}/MoinMoin/support/passlib/handlers/des_crypt.py
+${PYSITELIB}/MoinMoin/support/passlib/handlers/des_crypt.pyc
+${PYSITELIB}/MoinMoin/support/passlib/handlers/des_crypt.pyo
+${PYSITELIB}/MoinMoin/support/passlib/handlers/digests.py
+${PYSITELIB}/MoinMoin/support/passlib/handlers/digests.pyc
+${PYSITELIB}/MoinMoin/support/passlib/handlers/digests.pyo
+${PYSITELIB}/MoinMoin/support/passlib/handlers/django.py
+${PYSITELIB}/MoinMoin/support/passlib/handlers/django.pyc
+${PYSITELIB}/MoinMoin/support/passlib/handlers/django.pyo
+${PYSITELIB}/MoinMoin/support/passlib/handlers/fshp.py
+${PYSITELIB}/MoinMoin/support/passlib/handlers/fshp.pyc
+${PYSITELIB}/MoinMoin/support/passlib/handlers/fshp.pyo
+${PYSITELIB}/MoinMoin/support/passlib/handlers/ldap_digests.py
+${PYSITELIB}/MoinMoin/support/passlib/handlers/ldap_digests.pyc
+${PYSITELIB}/MoinMoin/support/passlib/handlers/ldap_digests.pyo
+${PYSITELIB}/MoinMoin/support/passlib/handlers/md5_crypt.py
+${PYSITELIB}/MoinMoin/support/passlib/handlers/md5_crypt.pyc
+${PYSITELIB}/MoinMoin/support/passlib/handlers/md5_crypt.pyo
+${PYSITELIB}/MoinMoin/support/passlib/handlers/misc.py
+${PYSITELIB}/MoinMoin/support/passlib/handlers/misc.pyc
+${PYSITELIB}/MoinMoin/support/passlib/handlers/misc.pyo
+${PYSITELIB}/MoinMoin/support/passlib/handlers/mssql.py
+${PYSITELIB}/MoinMoin/support/passlib/handlers/mssql.pyc
+${PYSITELIB}/MoinMoin/support/passlib/handlers/mssql.pyo
+${PYSITELIB}/MoinMoin/support/passlib/handlers/mysql.py
+${PYSITELIB}/MoinMoin/support/passlib/handlers/mysql.pyc
+${PYSITELIB}/MoinMoin/support/passlib/handlers/mysql.pyo
+${PYSITELIB}/MoinMoin/support/passlib/handlers/oracle.py
+${PYSITELIB}/MoinMoin/support/passlib/handlers/oracle.pyc
+${PYSITELIB}/MoinMoin/support/passlib/handlers/oracle.pyo
+${PYSITELIB}/MoinMoin/support/passlib/handlers/pbkdf2.py
+${PYSITELIB}/MoinMoin/support/passlib/handlers/pbkdf2.pyc
+${PYSITELIB}/MoinMoin/support/passlib/handlers/pbkdf2.pyo
+${PYSITELIB}/MoinMoin/support/passlib/handlers/phpass.py
+${PYSITELIB}/MoinMoin/support/passlib/handlers/phpass.pyc
+${PYSITELIB}/MoinMoin/support/passlib/handlers/phpass.pyo
+${PYSITELIB}/MoinMoin/support/passlib/handlers/postgres.py
+${PYSITELIB}/MoinMoin/support/passlib/handlers/postgres.pyc
+${PYSITELIB}/MoinMoin/support/passlib/handlers/postgres.pyo
+${PYSITELIB}/MoinMoin/support/passlib/handlers/roundup.py
+${PYSITELIB}/MoinMoin/support/passlib/handlers/roundup.pyc
+${PYSITELIB}/MoinMoin/support/passlib/handlers/roundup.pyo
+${PYSITELIB}/MoinMoin/support/passlib/handlers/scram.py
+${PYSITELIB}/MoinMoin/support/passlib/handlers/scram.pyc
+${PYSITELIB}/MoinMoin/support/passlib/handlers/scram.pyo
+${PYSITELIB}/MoinMoin/support/passlib/handlers/sha1_crypt.py
+${PYSITELIB}/MoinMoin/support/passlib/handlers/sha1_crypt.pyc
+${PYSITELIB}/MoinMoin/support/passlib/handlers/sha1_crypt.pyo
+${PYSITELIB}/MoinMoin/support/passlib/handlers/sha2_crypt.py
+${PYSITELIB}/MoinMoin/support/passlib/handlers/sha2_crypt.pyc
+${PYSITELIB}/MoinMoin/support/passlib/handlers/sha2_crypt.pyo
+${PYSITELIB}/MoinMoin/support/passlib/handlers/sun_md5_crypt.py
+${PYSITELIB}/MoinMoin/support/passlib/handlers/sun_md5_crypt.pyc
+${PYSITELIB}/MoinMoin/support/passlib/handlers/sun_md5_crypt.pyo
+${PYSITELIB}/MoinMoin/support/passlib/handlers/windows.py
+${PYSITELIB}/MoinMoin/support/passlib/handlers/windows.pyc
+${PYSITELIB}/MoinMoin/support/passlib/handlers/windows.pyo
+${PYSITELIB}/MoinMoin/support/passlib/hash.py
+${PYSITELIB}/MoinMoin/support/passlib/hash.pyc
+${PYSITELIB}/MoinMoin/support/passlib/hash.pyo
+${PYSITELIB}/MoinMoin/support/passlib/hosts.py
+${PYSITELIB}/MoinMoin/support/passlib/hosts.pyc
+${PYSITELIB}/MoinMoin/support/passlib/hosts.pyo
+${PYSITELIB}/MoinMoin/support/passlib/ifc.py
+${PYSITELIB}/MoinMoin/support/passlib/ifc.pyc
+${PYSITELIB}/MoinMoin/support/passlib/ifc.pyo
+${PYSITELIB}/MoinMoin/support/passlib/registry.py
+${PYSITELIB}/MoinMoin/support/passlib/registry.pyc
+${PYSITELIB}/MoinMoin/support/passlib/registry.pyo
+${PYSITELIB}/MoinMoin/support/passlib/utils/__init__.py
+${PYSITELIB}/MoinMoin/support/passlib/utils/__init__.pyc
+${PYSITELIB}/MoinMoin/support/passlib/utils/__init__.pyo
+${PYSITELIB}/MoinMoin/support/passlib/utils/_blowfish/__init__.py
+${PYSITELIB}/MoinMoin/support/passlib/utils/_blowfish/__init__.pyc
+${PYSITELIB}/MoinMoin/support/passlib/utils/_blowfish/__init__.pyo
+${PYSITELIB}/MoinMoin/support/passlib/utils/_blowfish/_gen_files.py
+${PYSITELIB}/MoinMoin/support/passlib/utils/_blowfish/_gen_files.pyc
+${PYSITELIB}/MoinMoin/support/passlib/utils/_blowfish/_gen_files.pyo
+${PYSITELIB}/MoinMoin/support/passlib/utils/_blowfish/base.py
+${PYSITELIB}/MoinMoin/support/passlib/utils/_blowfish/base.pyc
+${PYSITELIB}/MoinMoin/support/passlib/utils/_blowfish/base.pyo
+${PYSITELIB}/MoinMoin/support/passlib/utils/_blowfish/unrolled.py
+${PYSITELIB}/MoinMoin/support/passlib/utils/_blowfish/unrolled.pyc
+${PYSITELIB}/MoinMoin/support/passlib/utils/_blowfish/unrolled.pyo
+${PYSITELIB}/MoinMoin/support/passlib/utils/compat.py
+${PYSITELIB}/MoinMoin/support/passlib/utils/compat.pyc
+${PYSITELIB}/MoinMoin/support/passlib/utils/compat.pyo
+${PYSITELIB}/MoinMoin/support/passlib/utils/des.py
+${PYSITELIB}/MoinMoin/support/passlib/utils/des.pyc
+${PYSITELIB}/MoinMoin/support/passlib/utils/des.pyo
+${PYSITELIB}/MoinMoin/support/passlib/utils/handlers.py
+${PYSITELIB}/MoinMoin/support/passlib/utils/handlers.pyc
+${PYSITELIB}/MoinMoin/support/passlib/utils/handlers.pyo
+${PYSITELIB}/MoinMoin/support/passlib/utils/md4.py
+${PYSITELIB}/MoinMoin/support/passlib/utils/md4.pyc
+${PYSITELIB}/MoinMoin/support/passlib/utils/md4.pyo
+${PYSITELIB}/MoinMoin/support/passlib/utils/pbkdf2.py
+${PYSITELIB}/MoinMoin/support/passlib/utils/pbkdf2.pyc
+${PYSITELIB}/MoinMoin/support/passlib/utils/pbkdf2.pyo
+${PYSITELIB}/MoinMoin/support/passlib/win32.py
+${PYSITELIB}/MoinMoin/support/passlib/win32.pyc
+${PYSITELIB}/MoinMoin/support/passlib/win32.pyo
${PYSITELIB}/MoinMoin/support/pygments/__init__.py
${PYSITELIB}/MoinMoin/support/pygments/__init__.pyc
${PYSITELIB}/MoinMoin/support/pygments/__init__.pyo
@@ -2532,7 +2686,6 @@ ${PYSITELIB}/jabberbot/xmlrpcbot.pyo
${PYSITELIB}/jabberbot/xmppbot.py
${PYSITELIB}/jabberbot/xmppbot.pyc
${PYSITELIB}/jabberbot/xmppbot.pyo
-${PYSITELIB}/${EGG_FILE}
share/moin/config/logging/README
share/moin/config/logging/logfile
share/moin/config/logging/logfile_debug_auth
diff --git a/www/py-moin/distinfo b/www/py-moin/distinfo
index d309f89ae74..ca447f360ca 100644
--- a/www/py-moin/distinfo
+++ b/www/py-moin/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.10 2013/01/03 18:54:38 gls Exp $
+$NetBSD: distinfo,v 1.11 2014/01/20 20:17:05 wiz Exp $
-SHA1 (moin-1.9.6.tar.gz) = 9dd10fb5a095c1783f0d3e6c04568e9910380608
-RMD160 (moin-1.9.6.tar.gz) = 83512fabf9cd47dca9da33babf365e336fdb5106
-Size (moin-1.9.6.tar.gz) = 36754215 bytes
+SHA1 (moin-1.9.7.tar.gz) = f07ce421a1dc5ff87b6fa7afd2728e2e133ad8c7
+RMD160 (moin-1.9.7.tar.gz) = e5a0a57df8a6fe366a904c7a7f8caebab54e7e97
+Size (moin-1.9.7.tar.gz) = 36911772 bytes