audio/sonata update
- update to 1.4.2 (request and diff by Simon Kuhnle)
- remove py-ElementTree dependency
- remove MAINTAINER (no MX record)
ok?
Index: Makefile
===
RCS file: /cvs/ports/audio/sonata/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- Makefile19 Feb 2008 16:14:13 - 1.7
+++ Makefile19 Mar 2008 15:11:32 -
@@ -2,11 +2,10 @@
COMMENT= elegant music player for MPD
-DISTNAME= sonata-1.4.1
+DISTNAME= sonata-1.4.2
CATEGORIES=audio
HOMEPAGE= http://sonata.berlios.de/
-MAINTAINER=Dmitri Alenitchev <[EMAIL PROTECTED]>
# GPL
PERMIT_PACKAGE_CDROM= Yes
@@ -27,7 +26,6 @@
BUILD_DEPENDS= ::x11/py-gtk2
RUN_DEPENDS= ::devel/desktop-file-utils \
::devel/py-SOAPpy \
- ::textproc/py-ElementTree \
::x11/py-gtk2
USE_X11= Yes
Index: distinfo
===
RCS file: /cvs/ports/audio/sonata/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo19 Feb 2008 16:14:13 - 1.5
+++ distinfo19 Mar 2008 15:11:32 -
@@ -1,5 +1,5 @@
-MD5 (sonata-1.4.1.tar.gz) = vM5KhnbPXWjJbI2Y/m4kCw==
-RMD160 (sonata-1.4.1.tar.gz) = fBIfz5p43przXJ++kfAqPkw+sFU=
-SHA1 (sonata-1.4.1.tar.gz) = nKym3xgqs+cfIEd67xFAbwYSN/s=
-SHA256 (sonata-1.4.1.tar.gz) = iHTOOgy2EaCEhHVy9UtSTvyEbjqvSkvOJbmL+xOtpuA=
-SIZE (sonata-1.4.1.tar.gz) = 398976
+MD5 (sonata-1.4.2.tar.gz) = A1Pl2MzEgVjjsSf259gmmQ==
+RMD160 (sonata-1.4.2.tar.gz) = pWRX5JNvHJePz9fB4L4u0JullLE=
+SHA1 (sonata-1.4.2.tar.gz) = ReJXcfjG3VwFDDIOzmmXH740eHU=
+SHA256 (sonata-1.4.2.tar.gz) = H56rHpFEVEo2c2O4cVraKt7BKQKHHgVAH2qSdNe+zIE=
+SIZE (sonata-1.4.2.tar.gz) = 400015
Index: pkg/PLIST
===
RCS file: /cvs/ports/audio/sonata/pkg/PLIST,v
retrieving revision 1.4
diff -u -r1.4 PLIST
--- pkg/PLIST 19 Feb 2008 16:14:13 - 1.4
+++ pkg/PLIST 19 Mar 2008 15:11:32 -
@@ -1,6 +1,6 @@
@comment $OpenBSD: PLIST,v 1.4 2008/02/19 16:14:13 merdely Exp $
bin/sonata
-lib/python${MODPY_VERSION}/site-packages/Sonata-1.4.1-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/Sonata-1.4.2-py${MODPY_VERSION}.egg-info
lib/python${MODPY_VERSION}/site-packages/audioscrobbler.py
lib/python${MODPY_VERSION}/site-packages/audioscrobbler.pyc
lib/python${MODPY_VERSION}/site-packages/mmkeys.so
Re: py-ElementTree
py-ElementTree is included in python2.5, so build it only for python2.4
this changes depend on pending changes in sonata and py-turbogears
Index: py-ElementTree/Makefile
===
RCS file: /cvs/ports/textproc/py-ElementTree/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- py-ElementTree/Makefile 10 Dec 2007 21:07:51 - 1.7
+++ py-ElementTree/Makefile 19 Mar 2008 09:53:58 -
@@ -3,7 +3,7 @@
COMMENT= pure-Python implementation of the ElementTree API
DISTNAME= elementtree-1.2.6-20050316
-PKGNAME= py-ElementTree-1.2.6p2
+PKGNAME= py-ElementTree-1.2.6p3
CATEGORIES=textproc devel
HOMEPAGE= http://effbot.org/zone/element-index.htm
@@ -16,6 +16,8 @@
MASTER_SITES= http://effbot.org/downloads/
MODULES= lang/python
+MODPY_VERSION= 2.4
+
RUN_DEPENDS= ${MODPY_EXPAT_DEPENDS}
REGRESS_DEPENDS=${RUN_DEPENDS}
Index: py-cElementTree/Makefile
===
RCS file: /cvs/ports/textproc/py-cElementTree/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- py-cElementTree/Makefile10 Dec 2007 21:07:51 - 1.10
+++ py-cElementTree/Makefile19 Mar 2008 09:53:58 -
@@ -5,7 +5,7 @@
COMMENT= C implementation of the ElementTree API
DISTNAME= cElementTree-1.0.5-20051216
-PKGNAME= py-cElementTree-1.0.5p2
+PKGNAME= py-cElementTree-1.0.5p3
CATEGORIES=textproc devel
HOMEPAGE= http://effbot.org/zone/celementtree.htm
@@ -19,6 +19,8 @@
MASTER_SITES= http://effbot.org/downloads/
MODULES= lang/python
+MODPY_VERSION= 2.4
+
RUN_DEPENDS= ::textproc/py-ElementTree
REGRESS_DEPENDS=${RUN_DEPENDS}
www/py-formencode update
Hi,
Is that ok for you? All 74 regression test are ok.
Marc
Index: Makefile
===
RCS file: /cvs/ports/www/py-formencode/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Makefile13 Jan 2008 17:16:49 - 1.6
+++ Makefile19 Mar 2008 09:15:18 -
@@ -2,7 +2,7 @@
COMMENT= HTML form validation, generation, and conversion
-VERSION= 0.9
+VERSION= 1.0
DISTNAME= FormEncode-${VERSION}
PKGNAME= py-formencode-${VERSION}
@@ -20,18 +20,20 @@
MASTER_SITES=
http://cheeseshop.python.org/packages/source/F/FormEncode/
-MODULES= devel/gettext lang/python
-RUN_DEPENDS= ::textproc/py-ElementTree \
- ::devel/py-ruledispatch
-REGRESS_DEPENDS= ::textproc/py-ElementTree \
- ::devel/py-py \
- ::devel/py-ruledispatch
+MODULES= devel/gettext \
+ lang/python
+
+RUN_DEPENDS= ::devel/py-ruledispatch
+REGRESS_DEPENDS= ::devel/py-py \
+ ::devel/py-ruledispatch \
+ ::devel/py-nose
SUBST_VARS=VERSION
MODPY_SETUPTOOLS= Yes
post-install:
+ rm -f ${WRKSRC}/docs/test_docs.py{.orig,c}
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/py-formencode
${INSTALL_DATA} ${WRKSRC}/docs/* ${PREFIX}/share/doc/py-formencode/
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/py-formencode
@@ -41,6 +43,5 @@
do-regress:
cd ${WRKSRC} && py.test .
- rm -f ${WRKSRC}/docs/test_docs.py{.orig,c}
.include
Index: distinfo
===
RCS file: /cvs/ports/www/py-formencode/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo13 Jan 2008 17:16:49 - 1.2
+++ distinfo19 Mar 2008 09:15:18 -
@@ -1,5 +1,5 @@
-MD5 (FormEncode-0.9.tar.gz) = rcymQwiPbSrEnZA5Ac8RDQ==
-RMD160 (FormEncode-0.9.tar.gz) = IdpSfXSGeDAyLDzzzU3UV8Phlgo=
-SHA1 (FormEncode-0.9.tar.gz) = 2sr9N0xSUpzgaUKSc6SuwtV+HSM=
-SHA256 (FormEncode-0.9.tar.gz) = Uc0TXFO3iIUWF6sSEhHet8FTZpiZ+ocOwa7qPMdi4Ho=
-SIZE (FormEncode-0.9.tar.gz) = 160219
+MD5 (FormEncode-1.0.tar.gz) = 3kXDgumiZaX6CJT/ZcQCjg==
+RMD160 (FormEncode-1.0.tar.gz) = Mjx3YiTBHwX/UGX8tdNJU2dRFTE=
+SHA1 (FormEncode-1.0.tar.gz) = EDP8qWjgO+NcNNiXZdw9OVCFko0=
+SHA256 (FormEncode-1.0.tar.gz) = oDqaG5FC+zRgRY8xSgeWAciQfvEJuVu+nh9QnxvBUQk=
+SIZE (FormEncode-1.0.tar.gz) = 172579
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/py-formencode/pkg/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- pkg/PLIST 13 Jan 2008 17:16:49 - 1.2
+++ pkg/PLIST 19 Mar 2008 09:15:18 -
@@ -3,7 +3,6 @@
lib/python${MODPY_VERSION}/site-packages/FormEncode-${VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/FormEncode-${VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/FormEncode-${VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/FormEncode-${VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
lib/python${MODPY_VERSION}/site-packages/FormEncode-${VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/formencode/
lib/python${MODPY_VERSION}/site-packages/formencode/__init__.py
@@ -56,12 +55,24 @@
lib/python${MODPY_VERSION}/site-packages/formencode/i18n/es/LC_MESSAGES/
lib/python${MODPY_VERSION}/site-packages/formencode/i18n/es/LC_MESSAGES/FormEncode.mo
lib/python${MODPY_VERSION}/site-packages/formencode/i18n/es/LC_MESSAGES/FormEncode.po
+lib/python${MODPY_VERSION}/site-packages/formencode/i18n/fi/
+lib/python${MODPY_VERSION}/site-packages/formencode/i18n/fi/LC_MESSAGES/
+lib/python${MODPY_VERSION}/site-packages/formencode/i18n/fi/LC_MESSAGES/FormEncode.mo
+lib/python${MODPY_VERSION}/site-packages/formencode/i18n/fi/LC_MESSAGES/FormEncode.po
lib/python${MODPY_VERSION}/site-packages/formencode/i18n/fr/
lib/python${MODPY_VERSION}/site-packages/formencode/i18n/fr/LC_MESSAGES/
lib/python${MODPY_VERSION}/site-packages/formencode/i18n/fr/LC_MESSAGES/FormEncode.mo
lib/python${MODPY_VERSION}/site-packages/formencode/i18n/fr/LC_MESSAGES/FormEncode.po
+lib/python${MODPY_VERSION}/site-packages/formencode/i18n/it/
+lib/python${MODPY_VERSION}/site-packages/formencode/i18n/it/LC_MESSAGES/
+lib/python${MODPY_VERSION}/site-packages/formencode/i18n/it/LC_MESSAGES/FormEncode.mo
+lib/python${MODPY_VERSION}/site-packages/formencode/i18n/it/LC_MESSAGES/FormEncode.po
lib/python${MODPY_VERSION}/site-packages/formencode/i18n/msgfmt.py
lib/python${MODPY_VERSION}/site-packages/formencode/i18n/msgfmt.pyc
+lib/python${MODPY_VERSION}/site-packages/formencode/i18n/nb_NO/
+lib/python${MODPY_VERSION}/site-packages/formencode/i18
audio/sonata, remove py-ElemeneTree dependency
Remove py-ElemeneTree dependency, because python2.5 has it onboard.
ok?
Index: Makefile
===
RCS file: /cvs/ports/audio/sonata/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- Makefile19 Feb 2008 16:14:13 - 1.7
+++ Makefile19 Mar 2008 08:19:24 -
@@ -3,6 +3,7 @@
COMMENT= elegant music player for MPD
DISTNAME= sonata-1.4.1
+PKGNAME= ${DISTNAME}p0
CATEGORIES=audio
HOMEPAGE= http://sonata.berlios.de/
@@ -27,7 +28,6 @@
BUILD_DEPENDS= ::x11/py-gtk2
RUN_DEPENDS= ::devel/desktop-file-utils \
::devel/py-SOAPpy \
- ::textproc/py-ElementTree \
::x11/py-gtk2
USE_X11= Yes
Re: py-ElementTree
Will Maier wrote: On Tue, Mar 18, 2008 at 04:30:16PM +0100, Marc Winiger wrote: Adding python2.4 and python2.5 flavours. This is needed for an upcoming plone 3.0 port. ElementTree is available in Python 2.5 by default (see xml.etree.ElementTree). Instead of providing 2.5 and 2.4 flavors, could we instead make the package 2.4-only? If so, the explicit *DEPENDS on c?ElementTree can probably go away in most cases. Thanks for the hint. I'll do that.
py-ElementTree
Adding python2.4 and python2.5 flavours. This is needed for an upcoming
plone 3.0 port.
Testing and ok welcome.
Marc
diff -urNx CVS py-ElementTree.orig/Makefile py-ElementTree/Makefile
--- py-ElementTree.orig/MakefileTue Mar 18 15:11:12 2008
+++ py-ElementTree/Makefile Tue Mar 18 13:56:01 2008
@@ -1,12 +1,15 @@
# $OpenBSD: Makefile,v 1.7 2007/12/10 21:07:51 martynas Exp $
-COMMENT= pure-Python implementation of the ElementTree API
+COMMENT-main= pure-Python implementation of the ElementTree API
+COMMENT-docs= pure-Python implementation of the ElementTree API docs
-DISTNAME= elementtree-1.2.6-20050316
-PKGNAME= py-ElementTree-1.2.6p2
-CATEGORIES=textproc devel
+VERSION= 1.2.6
+DISTNAME= elementtree-${VERSION}-20050316
+PKGNAME-main= py-ElementTree-${VERSION}p3
+FULLPKGNAME-docs= py-ElementTree-docs-${VERSION}
+CATEGORIES=textproc devel
-HOMEPAGE= http://effbot.org/zone/element-index.htm
+HOMEPAGE= http://effbot.org/zone/element-index.htm
# MIT
PERMIT_PACKAGE_CDROM= Yes
@@ -15,15 +18,30 @@
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= http://effbot.org/downloads/
+
MODULES= lang/python
+MODPY_VERSION= ${FLAVOR:S/python//}
+
+FLAVORS= python2.4 python2.5
+FLAVOR?= python2.5
+
RUN_DEPENDS= ${MODPY_EXPAT_DEPENDS}
REGRESS_DEPENDS=${RUN_DEPENDS}
+.if ${FLAVOR:L:Mpython2.4} && !${FLAVOR:L:Npython2.4}
+MULTI_PACKAGES= -main
+.elif ${FLAVOR:L:Mpython2.5} && !${FLAVOR:L:Npython2.5}
+MULTI_PACKAGES= -main -docs
+.else
+ERRORS+= "Fatal: You must select one version: ${FLAVORS}"
+.endif
+
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/py-ElementTree
${INSTALL_DATA} ${WRKSRC}/docs/* ${PREFIX}/share/doc/py-ElementTree/
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/py-ElementTree
${INSTALL_DATA} ${WRKSRC}/samples/*
${PREFIX}/share/examples/py-ElementTree/
+ find ${WRKINST} -name \*.egg-info -exec rm {} \;
do-regress: fake
@cd ${WRKSRC} && ${SETENV} PYTHONPATH=${WRKINST}${MODPY_SITEPKG} \
diff -urNx CVS py-ElementTree.orig/pkg/DESCR py-ElementTree/pkg/DESCR
--- py-ElementTree.orig/pkg/DESCR Sat Jan 22 03:33:43 2005
+++ py-ElementTree/pkg/DESCRThu Jan 1 01:00:00 1970
@@ -1,4 +0,0 @@
-The ElementTree type is a simple but flexible container object, designed
-to store hierarchical data structures, such as simplified XML infosets,
-in memory. The element type can be described as a cross between a Python
-list and a Python dictionary.
diff -urNx CVS py-ElementTree.orig/pkg/DESCR-docs py-ElementTree/pkg/DESCR-docs
--- py-ElementTree.orig/pkg/DESCR-docs Thu Jan 1 01:00:00 1970
+++ py-ElementTree/pkg/DESCR-docs Tue Mar 18 13:55:37 2008
@@ -0,0 +1 @@
+ElementTree documentation and examples.
diff -urNx CVS py-ElementTree.orig/pkg/DESCR-main py-ElementTree/pkg/DESCR-main
--- py-ElementTree.orig/pkg/DESCR-main Thu Jan 1 01:00:00 1970
+++ py-ElementTree/pkg/DESCR-main Tue Mar 18 13:21:00 2008
@@ -0,0 +1,4 @@
+The ElementTree type is a simple but flexible container object, designed
+to store hierarchical data structures, such as simplified XML infosets,
+in memory. The element type can be described as a cross between a Python
+list and a Python dictionary.
diff -urNx CVS py-ElementTree.orig/pkg/PLIST py-ElementTree/pkg/PLIST
--- py-ElementTree.orig/pkg/PLIST Tue May 22 17:40:19 2007
+++ py-ElementTree/pkg/PLISTThu Jan 1 01:00:00 1970
@@ -1,39 +0,0 @@
[EMAIL PROTECTED] $OpenBSD: PLIST,v 1.2 2007/05/22 15:40:19 martynas Exp $
-lib/python${MODPY_VERSION}/site-packages/elementtree/
-lib/python${MODPY_VERSION}/site-packages/elementtree/ElementInclude.py
-lib/python${MODPY_VERSION}/site-packages/elementtree/ElementInclude.pyc
-lib/python${MODPY_VERSION}/site-packages/elementtree/ElementPath.py
-lib/python${MODPY_VERSION}/site-packages/elementtree/ElementPath.pyc
-lib/python${MODPY_VERSION}/site-packages/elementtree/ElementTree.py
-lib/python${MODPY_VERSION}/site-packages/elementtree/ElementTree.pyc
-lib/python${MODPY_VERSION}/site-packages/elementtree/HTMLTreeBuilder.py
-lib/python${MODPY_VERSION}/site-packages/elementtree/HTMLTreeBuilder.pyc
-lib/python${MODPY_VERSION}/site-packages/elementtree/SgmlopXMLTreeBuilder.py
-lib/python${MODPY_VERSION}/site-packages/elementtree/SgmlopXMLTreeBuilder.pyc
-lib/python${MODPY_VERSION}/site-packages/elementtree/SimpleXMLTreeBuilder.py
-lib/python${MODPY_VERSION}/site-packages/elementtree/SimpleXMLTreeBuilder.pyc
-lib/python${MODPY_VERSION}/site-packages/elementtree/SimpleXMLWriter.py
-lib/python${MODPY_VERSION}/site-packages/elementtree/SimpleXMLWriter.pyc
-lib/python${MODPY_VERSION}/site-packages/elementtree/TidyHTMLTreeBuilder.py
-lib/python${MODPY_VERSION}/site-packages/elementtree/TidyHTMLTreeBuilder.pyc
-lib/python${MODPY_VERSION}/site-packages/elementtree/TidyTools.py
-lib/python${MODPY_VERSION}/site-packages/elementtree/TidyTools.pyc
-lib/python${MODPY_VE
Re: samba shows empty directories
Holger von Rhein wrote: On Tue 2007-12-11 09:46, Marc Winiger wrote: we have problems to share non-ffs filesystems with samba. it makes no difference if the share points to such a filesystem or the filesystem is mounted as a subdirectory of the share. this happens on 4.2 and -current anybody can confirm? any ideas what the problem is? I can confirm but I have no ideas: Yesterday I updated from 4.1 to 4.2 and directly set my cvs to OPENBSD_4_2 and compiled and installed the kernel+objects: # uname -a OpenBSD boromir.zuhause.lan 4.2 GENERIC#22 i386 We have fixed that in 4.2-current some month ago. Marc
Re: split www/zope and www/plone into multiple versions
Marc Balmer wrote: Nikolay Sturm wrote: * Marc Winiger [2008-02-08]: The versions of zope and plone in the -current cvs tree are broken. They don't work togheter. So we decided to split the ports into multiple versions, that the user can choose the version he needs. Why would it make sense to have multiple versions of both in-tree? It not only makes sense, it is almost a requirement, for two reasons: 1) Plone usually relies on older Zope Versions, much like Zope usually relies on older Python Versions. If you want plain Zope, you want the current version, if you want to run Plone, you usually need an older one. 2) Updating Plone is very hard and sometimes not even possible (Plone 2.0 to Plone 2.1 was such a nightmare). Plone releases are not compatible. This is one of the cases where upgrading is really, really painful. So we do not force users of Plone to upgrade every 6 months. The Plone/Zope combination that currently is in the tree does not work together. It requires Zope 2.9. And a good Plone would we 2.5, not 2.1. So this is the final step of Zope/Plone cleanup (adding the python2.4/python2.5 flavours to many python ports has been part of this cleanup). Nikolay, do you see the problem we have? Do you have any objections to the way we solved it? Is there anybody else interested in working zope/plone version? Any testing happend? We have running plone 2.5 instances on zope 2.9, built with this splitted port. A new bulk-build is running at the moment. Marc
Re: zope / python issue: py-${product} changes
The attached diffs are reworked and tested by simon and me.
any comments? ok?
Index: databases/py-ldap/Makefile
===
RCS file: /cvs/ports/databases/py-ldap/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- databases/py-ldap/Makefile 8 Oct 2007 08:22:39 - 1.15
+++ databases/py-ldap/Makefile 8 Jan 2008 12:00:51 -
@@ -1,17 +1,20 @@
# $OpenBSD: Makefile,v 1.15 2007/10/08 08:22:39 steven Exp $
-SHARED_ONLY= Yes
+SHARED_ONLY= Yes
-COMMENT= LDAP client API for Python
+COMMENT-main= LDAP client API for Python
+COMMENT-examples= example programs for the LDAP client API for Python
-V= 2.2.0
-DISTNAME= python-ldap-${V}
-PKGNAME= py-ldap-${V}p0
-CATEGORIES=databases
+V= 2.2.0
+DISTNAME= python-ldap-${V}
+PKGNAME-main= py-ldap-${V}p2
+FULLPKGNAME-examples= py-ldap-examples-${V}
-HOMEPAGE= http://python-ldap.sourceforge.net/
+CATEGORIES=databases
-MAINTAINER=Marc Balmer <[EMAIL PROTECTED]>
+HOMEPAGE= http://python-ldap.sourceforge.net/
+
+MAINTAINER=Marc Balmer <[EMAIL PROTECTED]>
# Python
PERMIT_PACKAGE_FTP=Yes
@@ -19,20 +22,32 @@
PERMIT_DISTFILES_FTP= Yes
PERMIT_DISTFILES_CDROM=Yes
-WANTLIB= crypto ssl
+WANTLIB-main= crypto ssl
+
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=python-ldap/}
+
+LIB_DEPENDS-main= ldap_r.>=7,lber.>=7::databases/openldap \
+ sasl2.>=2::security/cyrus-sasl2
+
+FLAVORS= python2.4 python2.5
+FLAVOR?= python2.5
+
+.if !${FLAVOR} || ${FLAVOR:L:Npython?.?}
+ERRORS+= "Fatal: You must select one version: ${FLAVORS}"
+.endif
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=python-ldap/}
+MULTI_PACKAGES=-main -examples
-LIB_DEPENDS= ldap_r.>=7,lber.>=7::databases/openldap \
- sasl2.>=2::security/cyrus-sasl2
+MODPY_VERSION= ${FLAVOR:S/python//}
-MODULES= lang/python
+MODULES= lang/python
-EXAMPLESDIR= ${PREFIX}/share/examples/py-ldap
+EXAMPLESDIR= ${PREFIX}/share/examples/py-ldap
post-install:
${INSTALL_DATA_DIR} ${EXAMPLESDIR}
cd ${WRKSRC}; tar cf - Demo | tar xf - -C ${EXAMPLESDIR}
+ find ${WRKINST} -name \*.egg-info -exec rm {} \;
do-regress: fake
@cd ${WRKSRC}/Tests/Lib && ${MAKE_ENV} \
Index: databases/py-ldap/pkg/DESCR
===
RCS file: databases/py-ldap/pkg/DESCR
diff -N databases/py-ldap/pkg/DESCR
--- databases/py-ldap/pkg/DESCR 18 Dec 2004 14:28:35 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-python-ldap provides an object-oriented API to access LDAP
-directory servers from Python programs. Mainly it wraps the
-OpenLDAP 2.x libs for that purpose.
-
-Additionally the package contains modules for other LDAP-related
-stuff (e.g. processing LDIF, LDAPURLs, LDAPv3 sub-schema, etc.).
-
-Not included: Direct BER support
-
-Quick usage example:
-import ldap
-l = ldap.open("my_ldap_server.my_domain")
-l.simple_bind_s("","")
-l.search_s("o=My Organisation, c=AU", ldap.SCOPE_SUBTREE, "objectclass=*")
Index: databases/py-ldap/pkg/DESCR-examples
===
RCS file: databases/py-ldap/pkg/DESCR-examples
diff -N databases/py-ldap/pkg/DESCR-examples
--- /dev/null 1 Jan 1970 00:00:00 -
+++ databases/py-ldap/pkg/DESCR-examples8 Jan 2008 12:00:51 -
@@ -0,0 +1,2 @@
+Example programs for the python-ldap API to access LDAP directory servers
+from Python programs.
Index: databases/py-ldap/pkg/DESCR-main
===
RCS file: databases/py-ldap/pkg/DESCR-main
diff -N databases/py-ldap/pkg/DESCR-main
--- /dev/null 1 Jan 1970 00:00:00 -
+++ databases/py-ldap/pkg/DESCR-main8 Jan 2008 12:00:51 -
@@ -0,0 +1,14 @@
+python-ldap provides an object-oriented API to access LDAP
+directory servers from Python programs. Mainly it wraps the
+OpenLDAP 2.x libs for that purpose.
+
+Additionally the package contains modules for other LDAP-related
+stuff (e.g. processing LDIF, LDAPURLs, LDAPv3 sub-schema, etc.).
+
+Not included: Direct BER support
+
+Quick usage example:
+import ldap
+l = ldap.open("my_ldap_server.my_domain")
+l.simple_bind_s("","")
+l.search_s("o=My Organisation, c=AU", ldap.SCOPE_SUBTREE, "objectclass=*")
Index: databases/py-ldap/pkg/PLIST
===
RCS file: databases/py-ldap/pkg/PLIST
diff -N databases/py-ldap/pkg/PLIST
--- databases/py-ldap/pkg/PLIST 16 Nov 2006 10:09:56 - 1.8
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,76 +0,0 @@
[EMAIL PROTECTED] $OpenBSD: PLIST,v 1.8 2006/11/16 10:09:56 mbalmer Exp $
-lib/python${MODPY_VE
UPDATE: www/zope-placelesstranslationservice
The versions of zope and zope-placelesstranslationservice in the tree
don't work together for me. So I updated pts from 1.2-rc1 version to 1.2.7
ok?
Marc
Index: www/zope-placelesstranslationservice/Makefile
===
RCS file: /cvs/ports/www/zope-placelesstranslationservice/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- www/zope-placelesstranslationservice/Makefile 15 Sep 2007 20:38:27
- 1.5
+++ www/zope-placelesstranslationservice/Makefile 8 Jan 2008 13:13:58
-
@@ -2,9 +2,11 @@
COMMENT= translation service based on potfiles for Zope
-DISTNAME= PlacelessTranslationService-1.2-rc1
-PKGNAME= zope-${DISTNAME:L:S/-rc/rc/}
+VERSION= 1.2.7
+DISTNAME= PlacelessTranslationService-${VERSION}
+PKGNAME= zope-${DISTNAME:L}
CATEGORIES=www
+HOMEPAGE= http://plone.org/products/pts/
# GPL
PERMIT_PACKAGE_CDROM= Yes
@@ -12,7 +14,7 @@
PERMIT_DISTFILES_CDROM=Yes
PERMIT_DISTFILES_FTP= Yes
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=collective/}
+MASTER_SITES= ${HOMEPAGE}/releases/${VERSION}/
MODULES= www/zope
Index: www/zope-placelesstranslationservice/distinfo
===
RCS file: /cvs/ports/www/zope-placelesstranslationservice/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- www/zope-placelesstranslationservice/distinfo 5 Apr 2007 17:26:26
- 1.3
+++ www/zope-placelesstranslationservice/distinfo 8 Jan 2008 13:13:58
-
@@ -1,5 +1,5 @@
-MD5 (PlacelessTranslationService-1.2-rc1.tar.gz) = U44f5gzXxf4e+vT5LeQE3Q==
-RMD160 (PlacelessTranslationService-1.2-rc1.tar.gz) =
vFyLkjwoQik8rpp8JXzJpSz6pE0=
-SHA1 (PlacelessTranslationService-1.2-rc1.tar.gz) =
gvJM0zOFC99oaY4c3odrFcnJOCQ=
-SHA256 (PlacelessTranslationService-1.2-rc1.tar.gz) =
y1y9cdPdtTmRxhE5czlauYZG89WHw4vUQhCD2rw83lk=
-SIZE (PlacelessTranslationService-1.2-rc1.tar.gz) = 51905
+MD5 (PlacelessTranslationService-1.2.7.tar.gz) = 5EqjfODCNbKBrvHP2dqY6g==
+RMD160 (PlacelessTranslationService-1.2.7.tar.gz) =
0xQElkgP4dOqHraJeX8a0mzGmSU=
+SHA1 (PlacelessTranslationService-1.2.7.tar.gz) = d60e0Jmv0xQTbNfDfEkEN9+cqv8=
+SHA256 (PlacelessTranslationService-1.2.7.tar.gz) =
1Abmkb0Ke9jsB3eopc2RfP4129ix5M4W5sHFMmsnbVM=
+SIZE (PlacelessTranslationService-1.2.7.tar.gz) = 51888
Index: www/zope-placelesstranslationservice/pkg/PLIST
===
RCS file: /cvs/ports/www/zope-placelesstranslationservice/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- www/zope-placelesstranslationservice/pkg/PLIST 6 Oct 2004 08:51:49
- 1.1.1.1
+++ www/zope-placelesstranslationservice/pkg/PLIST 8 Jan 2008 13:13:58
-
@@ -7,8 +7,7 @@
lib/zope/lib/python/Products/PlacelessTranslationService/FasterStringIO.pyc
lib/zope/lib/python/Products/PlacelessTranslationService/GettextMessageCatalog.py
lib/zope/lib/python/Products/PlacelessTranslationService/GettextMessageCatalog.pyc
-lib/zope/lib/python/Products/PlacelessTranslationService/MessageID.py
-lib/zope/lib/python/Products/PlacelessTranslationService/MessageID.pyc
+lib/zope/lib/python/Products/PlacelessTranslationService/HISTORY.txt
lib/zope/lib/python/Products/PlacelessTranslationService/Negotiator.py
lib/zope/lib/python/Products/PlacelessTranslationService/Negotiator.pyc
lib/zope/lib/python/Products/PlacelessTranslationService/PatchStringIO.py
@@ -21,41 +20,37 @@
lib/zope/lib/python/Products/PlacelessTranslationService/TranslateTags.pyc
lib/zope/lib/python/Products/PlacelessTranslationService/__init__.py
lib/zope/lib/python/Products/PlacelessTranslationService/__init__.pyc
-lib/zope/lib/python/Products/PlacelessTranslationService/debian/
-lib/zope/lib/python/Products/PlacelessTranslationService/debian/README.Debian
-lib/zope/lib/python/Products/PlacelessTranslationService/debian/changelog
-lib/zope/lib/python/Products/PlacelessTranslationService/debian/compat
-lib/zope/lib/python/Products/PlacelessTranslationService/debian/config
-lib/zope/lib/python/Products/PlacelessTranslationService/debian/control
-lib/zope/lib/python/Products/PlacelessTranslationService/debian/copyright
-lib/zope/lib/python/Products/PlacelessTranslationService/debian/postinst
-lib/zope/lib/python/Products/PlacelessTranslationService/debian/prerm
-lib/zope/lib/python/Products/PlacelessTranslationService/debian/rules
-lib/zope/lib/python/Products/PlacelessTranslationService/debian/templates
+lib/zope/lib/python/Products/PlacelessTranslationService/bin/
+lib/zope/lib/python/Products/PlacelessTranslationService/bin/convertToLocales.py
+lib/zope/lib/python/Products/PlacelessTranslationService/bin/convertToLocales.pyc
lib/zope/lib/python/Products/PlacelessTranslationService/doc/
lib/zope/lib/python/Products/PlacelessTranslationService/doc/changelog
-lib/zope/lib/python/Products/PlacelessTranslationService/doc/c
zope / python issue: py-${product} changes
Hi
Attached you find four patches for python products, that need to be
built for python2.4 and python2.5. It is a must that this products can
be installed for two versions in parallel to make zope working with them.
Please review and comment.
A remaining problem:
In py-psycopg we should only build -zope MULTI_PACKAGE for
MODZOPE_PYTHON_VERSION. I tried stuff like
.if ${FLAVOR:L:Mpython${MODZOPE_PYTHON_VERSION}}
or
.if ${FLAVOR:L:S,python,,} == "${MODZOPE_PYTHON_VERSION}"
But without success. Any ideas how to compare ${FLAVOR} and
${MODZOPE_PYTHON_VERSION} ?
Marc
Index: databases/py-ldap/Makefile
===
RCS file: /cvs/ports/databases/py-ldap/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- databases/py-ldap/Makefile 8 Oct 2007 08:22:39 - 1.15
+++ databases/py-ldap/Makefile 21 Dec 2007 13:27:31 -
@@ -1,17 +1,20 @@
# $OpenBSD: Makefile,v 1.15 2007/10/08 08:22:39 steven Exp $
-SHARED_ONLY= Yes
+SHARED_ONLY= Yes
-COMMENT= LDAP client API for Python
+COMMENT-main= LDAP client API for Python
+COMMENT-examples= example programs for the LDAP client API for Python
-V= 2.2.0
-DISTNAME= python-ldap-${V}
-PKGNAME= py-ldap-${V}p0
-CATEGORIES=databases
+V= 2.2.0
+DISTNAME= python-ldap-${V}
+PKGNAME-main= py-ldap-${V}p2
+FULLPKGNAME-examples= py-ldap-examples-${V}
-HOMEPAGE= http://python-ldap.sourceforge.net/
+CATEGORIES=databases
-MAINTAINER=Marc Balmer <[EMAIL PROTECTED]>
+HOMEPAGE= http://python-ldap.sourceforge.net/
+
+MAINTAINER=Marc Balmer <[EMAIL PROTECTED]>
# Python
PERMIT_PACKAGE_FTP=Yes
@@ -19,16 +22,23 @@
PERMIT_DISTFILES_FTP= Yes
PERMIT_DISTFILES_CDROM=Yes
-WANTLIB= crypto ssl
+WANTLIB-main= crypto ssl
+
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=python-ldap/}
+
+LIB_DEPENDS-main= ldap_r.>=7,lber.>=7::databases/openldap \
+ sasl2.>=2::security/cyrus-sasl2
+
+FLAVORS= python2.4 python2.5
+FLAVOR?= python2.5
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=python-ldap/}
+MULTI_PACKAGES=-main -examples
-LIB_DEPENDS= ldap_r.>=7,lber.>=7::databases/openldap \
- sasl2.>=2::security/cyrus-sasl2
+MODPY_VERSION= ${FLAVOR:S/python//}
-MODULES= lang/python
+MODULES= lang/python
-EXAMPLESDIR= ${PREFIX}/share/examples/py-ldap
+EXAMPLESDIR= ${PREFIX}/share/examples/py-ldap
post-install:
${INSTALL_DATA_DIR} ${EXAMPLESDIR}
Index: databases/py-ldap/pkg/DESCR
===
RCS file: databases/py-ldap/pkg/DESCR
diff -N databases/py-ldap/pkg/DESCR
--- databases/py-ldap/pkg/DESCR 18 Dec 2004 14:28:35 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-python-ldap provides an object-oriented API to access LDAP
-directory servers from Python programs. Mainly it wraps the
-OpenLDAP 2.x libs for that purpose.
-
-Additionally the package contains modules for other LDAP-related
-stuff (e.g. processing LDIF, LDAPURLs, LDAPv3 sub-schema, etc.).
-
-Not included: Direct BER support
-
-Quick usage example:
-import ldap
-l = ldap.open("my_ldap_server.my_domain")
-l.simple_bind_s("","")
-l.search_s("o=My Organisation, c=AU", ldap.SCOPE_SUBTREE, "objectclass=*")
Index: databases/py-ldap/pkg/DESCR-examples
===
RCS file: databases/py-ldap/pkg/DESCR-examples
diff -N databases/py-ldap/pkg/DESCR-examples
--- /dev/null 1 Jan 1970 00:00:00 -
+++ databases/py-ldap/pkg/DESCR-examples21 Dec 2007 13:27:31 -
@@ -0,0 +1,2 @@
+Example programs for the python-ldap API to access LDAP directory servers
+from Python programs.
Index: databases/py-ldap/pkg/DESCR-main
===
RCS file: databases/py-ldap/pkg/DESCR-main
diff -N databases/py-ldap/pkg/DESCR-main
--- /dev/null 1 Jan 1970 00:00:00 -
+++ databases/py-ldap/pkg/DESCR-main21 Dec 2007 13:27:31 -
@@ -0,0 +1,14 @@
+python-ldap provides an object-oriented API to access LDAP
+directory servers from Python programs. Mainly it wraps the
+OpenLDAP 2.x libs for that purpose.
+
+Additionally the package contains modules for other LDAP-related
+stuff (e.g. processing LDIF, LDAPURLs, LDAPv3 sub-schema, etc.).
+
+Not included: Direct BER support
+
+Quick usage example:
+import ldap
+l = ldap.open("my_ldap_server.my_domain")
+l.simple_bind_s("","")
+l.search_s("o=My Organisation, c=AU", ldap.SCOPE_SUBTREE, "objectclass=*")
Index: databases/py-ldap/pkg/PLIST
===
RCS file: databases/py-ldap/pkg/PLIST
diff -N databases/py-ldap/pkg/PLIST
--- databases/py-ldap
sysutils/usbutil fix
Some USB devices fail if a string is requested with language id 0. So
read the langid from string descriptor 0 first.
comments? ok?
Index: Makefile
===
RCS file: /cvs/ports/sysutils/usbutil/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- Makefile15 Sep 2007 21:14:03 - 1.15
+++ Makefile15 Dec 2007 00:01:14 -
@@ -3,6 +3,7 @@
COMMENT= USB developer utilities
DISTNAME= usbutil-0.5
+PKGNAME= ${DISTNAME}p0
CATEGORIES=sysutils
MASTER_SITES= ftp://ftp.augustsson.net/pub/netbsd/
Index: patches/patch-usbctl_c
===
RCS file: patches/patch-usbctl_c
diff -N patches/patch-usbctl_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-usbctl_c 15 Dec 2007 00:01:14 -
@@ -0,0 +1,47 @@
+$OpenBSD$
+--- usbctl.c.orig Mon Feb 25 01:50:55 2002
usbctl.c Sat Dec 15 00:55:00 2007
+@@ -65,12 +65,33 @@
+
+ int num = 0;
+
+-static int usbf, usbaddr;
++static int usbf, usbaddr, langid;
+ void
+ setupstrings(int f, int addr)
+ {
++ struct usb_ctl_request req;
++ int r;
++ usb_string_descriptor_t us;
++
+ usbf = f;
+ usbaddr = addr;
++
++ req.ucr_addr = usbaddr;
++ req.ucr_request.bmRequestType = UT_READ_DEVICE;
++ req.ucr_request.bRequest = UR_GET_DESCRIPTOR;
++ req.ucr_data = &us;
++ USETW2(req.ucr_request.wValue, UDESC_STRING, 0);
++ USETW(req.ucr_request.wIndex, 0);
++ USETW(req.ucr_request.wLength, 4);
++ req.ucr_flags = 0;
++
++ r = ioctl(usbf, USB_REQUEST, &req);
++ if (r < 0) {
++ fprintf(stderr, "get langid failed (error=%d)\n", errno);
++ langid = 0;
++ } else {
++ langid = UGETW(us.bString[0]);
++ }
+ }
+
+ void
+@@ -90,7 +111,7 @@ getstring(int si, char *s)
+ req.ucr_request.bRequest = UR_GET_DESCRIPTOR;
+ req.ucr_data = &us;
+ USETW2(req.ucr_request.wValue, UDESC_STRING, si);
+- USETW(req.ucr_request.wIndex, 0);
++ USETW(req.ucr_request.wIndex, langid);
+ #ifdef NSTRINGS
+ USETW(req.ucr_request.wLength, sizeof(usb_string_descriptor_t));
+ req.ucr_flags = USBD_SHORT_XFER_OK;
samba / non-ffs shares
we have problems to share non-ffs filesystems with samba. it makes no difference if the share points to such a filesystem or the filesystem is mounted as a subdirectory of the share. this happens on 4.2 and -current anybody can confirm? any ideas what the problem is? clientside: <[EMAIL PROTECTED]:1>$ smbclient //malaclypse/testcd Password: Domain=[MALACLYPSE] OS=[Unix] Server=[Samba 3.0.25b] smb: \> ls Receiving SMB: Server stopped responding Call returned zero bytes (EOF) listing \* Error in dskattr: Call returned zero bytes (EOF) smb: \> serverside logfile shows: [2007/12/11 09:27:59, 5] /usr/ports/net/samba/w-samba-3.0.25b/samba-3.0.25b/source/smbd/trans2.c:get_lanman2_dir_entry(1255) get_lanman2_dir_entry found ./PLAYWIN fname=PLAYWIN [2007/12/11 09:27:59, 8] /usr/ports/net/samba/w-samba-3.0.25b/samba-3.0.25b/source/smbd/trans2.c:get_lanman2_dir_entry(1161) get_lanman2_dir_entry:readdir on dirptr 0x82ef4080 now at offset 132 [2007/12/11 09:27:59, 8] /usr/ports/net/samba/w-samba-3.0.25b/samba-3.0.25b/source/smbd/dosmode.c:dos_mode(371) dos_mode: ./START.EXE [2007/12/11 09:27:59, 8] /usr/ports/net/samba/w-samba-3.0.25b/samba-3.0.25b/source/smbd/dosmode.c:dos_mode_from_sbuf(188) dos_mode_from_sbuf returning r [2007/12/11 09:27:59, 8] /usr/ports/net/samba/w-samba-3.0.25b/samba-3.0.25b/source/smbd/dosmode.c:dos_mode(409) dos_mode returning r [2007/12/11 09:27:59, 5] /usr/ports/net/samba/w-samba-3.0.25b/samba-3.0.25b/source/smbd/trans2.c:get_lanman2_dir_entry(1255) get_lanman2_dir_entry found ./START.EXE fname=START.EXE [2007/12/11 09:27:59, 8] /usr/ports/net/samba/w-samba-3.0.25b/samba-3.0.25b/source/smbd/trans2.c:get_lanman2_dir_entry(1161) get_lanman2_dir_entry:readdir on dirptr 0x82ef4080 now at offset 152 [2007/12/11 09:27:59, 8] /usr/ports/net/samba/w-samba-3.0.25b/samba-3.0.25b/source/smbd/dosmode.c:dos_mode(371) dos_mode: ./Sepp.flc [2007/12/11 09:27:59, 8] /usr/ports/net/samba/w-samba-3.0.25b/samba-3.0.25b/source/smbd/dosmode.c:dos_mode_from_sbuf(188) dos_mode_from_sbuf returning r [2007/12/11 09:27:59, 8] /usr/ports/net/samba/w-samba-3.0.25b/samba-3.0.25b/source/smbd/dosmode.c:dos_mode(409) dos_mode returning r[sparse] [2007/12/11 09:27:59, 5] /usr/ports/net/samba/w-samba-3.0.25b/samba-3.0.25b/source/smbd/trans2.c:get_lanman2_dir_entry(1255) get_lanman2_dir_entry found ./Sepp.flc fname=Sepp.flc [2007/12/11 09:27:59, 8] /usr/ports/net/samba/w-samba-3.0.25b/samba-3.0.25b/source/smbd/trans2.c:get_lanman2_dir_entry(1161) get_lanman2_dir_entry:readdir on dirptr 0x82ef4080 now at offset 172 [2007/12/11 09:27:59, 8] /usr/ports/net/samba/w-samba-3.0.25b/samba-3.0.25b/source/smbd/dosmode.c:dos_mode(371) dos_mode: ./Sepp_Hi.avi [2007/12/11 09:27:59, 8] /usr/ports/net/samba/w-samba-3.0.25b/samba-3.0.25b/source/smbd/dosmode.c:dos_mode_from_sbuf(188) dos_mode_from_sbuf returning r [2007/12/11 09:27:59, 8] /usr/ports/net/samba/w-samba-3.0.25b/samba-3.0.25b/source/smbd/dosmode.c:dos_mode(409) dos_mode returning r[sparse] [2007/12/11 09:27:59, 5] /usr/ports/net/samba/w-samba-3.0.25b/samba-3.0.25b/source/smbd/trans2.c:get_lanman2_dir_entry(1255) get_lanman2_dir_entry found ./Sepp_Hi.avi fname=Sepp_Hi.avi [2007/12/11 09:27:59, 0] /usr/ports/net/samba/w-samba-3.0.25b/samba-3.0.25b/source/lib/fault.c:fault_report(41) === [2007/12/11 09:27:59, 0] /usr/ports/net/samba/w-samba-3.0.25b/samba-3.0.25b/source/lib/fault.c:fault_report(42) INTERNAL ERROR: Signal 6 in pid 927 (3.0.25b) Please read the Trouble-Shooting section of the Samba3-HOWTO [2007/12/11 09:27:59, 0] /usr/ports/net/samba/w-samba-3.0.25b/samba-3.0.25b/source/lib/fault.c:fault_report(44) From: http://www.samba.org/samba/docs/Samba3-HOWTO.pdf [2007/12/11 09:27:59, 0] /usr/ports/net/samba/w-samba-3.0.25b/samba-3.0.25b/source/lib/fault.c:fault_report(45) === [2007/12/11 09:27:59, 0] /usr/ports/net/samba/w-samba-3.0.25b/samba-3.0.25b/source/lib/util.c:smb_panic(1632) PANIC (pid 927): internal error
Re: Python versions, Zope and, Python modules
Marc Balmer wrote: Everyone interested in Zope (and Plone), please take a look at this. I am totally open for better solutions. IMO everyone using python should be interessted. Why is python maintained in different versions, while site-packages can only be used with one version? Python can co-exist in different versions at the same time. Why should that not be possible for site-packages with our ports tree? Marc
SECURITY: www/wordpress-mu
This is a sync of WordPress 2.3.1 which includes native tagging support as well as many bug and security fixes. Index: wordpress-mu/Makefile === RCS file: /cvs/ports/www/wordpress-mu/Makefile,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 Makefile --- wordpress-mu/Makefile 29 Oct 2007 07:46:33 - 1.1.1.1 +++ wordpress-mu/Makefile 7 Nov 2007 16:20:55 - @@ -2,7 +2,7 @@ COMMENT= multi user weblog -DISTNAME= wordpress-mu-1.2.5a +DISTNAME= wordpress-mu-1.3 CATEGORIES=www HOMEPAGE= http://mu.wordpress.org/ Index: wordpress-mu/distinfo === RCS file: /cvs/ports/www/wordpress-mu/distinfo,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 distinfo --- wordpress-mu/distinfo 29 Oct 2007 07:46:33 - 1.1.1.1 +++ wordpress-mu/distinfo 7 Nov 2007 16:20:55 - @@ -1,5 +1,5 @@ -MD5 (wordpress-mu-1.2.5a.tar.gz) = 8wki2nPej8QxU+wKwgHfBQ== -RMD160 (wordpress-mu-1.2.5a.tar.gz) = sAO5ZUhQTvCoPYRYJkJEyjC8LIk= -SHA1 (wordpress-mu-1.2.5a.tar.gz) = Q6ZuV0LD+FbG410B8H5Yry4P0+U= -SHA256 (wordpress-mu-1.2.5a.tar.gz) = FVdH1ph78BKiskOdmwzDgnjazO2SYVqLRXeasO4XS7g= -SIZE (wordpress-mu-1.2.5a.tar.gz) = 910985 +MD5 (wordpress-mu-1.3.tar.gz) = qcBHluGZVDXL52czlecpAA== +RMD160 (wordpress-mu-1.3.tar.gz) = gqvGzwIthRBT1RdKnnFZf/w3G6c= +SHA1 (wordpress-mu-1.3.tar.gz) = ttzAUhOlI46jqiFbf42KxwXMdYk= +SHA256 (wordpress-mu-1.3.tar.gz) = uDRrBNx4K0hhCfNNkSslTZ0ldgrq8S/qMuJmVPJNDJw= +SIZE (wordpress-mu-1.3.tar.gz) = 971909 Index: wordpress-mu/pkg/PLIST === RCS file: /cvs/ports/www/wordpress-mu/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 PLIST --- wordpress-mu/pkg/PLIST 29 Oct 2007 07:46:33 - 1.1.1.1 +++ wordpress-mu/pkg/PLIST 7 Nov 2007 16:20:56 - @@ -15,28 +15,32 @@ wordpress-mu/wp-activate.php wordpress-mu/wp-admin/ wordpress-mu/wp-admin/admin-ajax.php -wordpress-mu/wp-admin/admin-db.php wordpress-mu/wp-admin/admin-footer.php wordpress-mu/wp-admin/admin-functions.php wordpress-mu/wp-admin/admin-header.php wordpress-mu/wp-admin/admin.php wordpress-mu/wp-admin/bookmarklet.php -wordpress-mu/wp-admin/cat.js -wordpress-mu/wp-admin/categories.js wordpress-mu/wp-admin/categories.php wordpress-mu/wp-admin/comment.php -wordpress-mu/wp-admin/custom-fields.js +wordpress-mu/wp-admin/css/ +wordpress-mu/wp-admin/css/install-rtl.css +wordpress-mu/wp-admin/css/install.css +wordpress-mu/wp-admin/css/upload-rtl.css +wordpress-mu/wp-admin/css/upload.css +wordpress-mu/wp-admin/css/widgets-rtl.css +wordpress-mu/wp-admin/css/widgets.css wordpress-mu/wp-admin/custom-header.php -wordpress-mu/wp-admin/dbx-admin-key.js wordpress-mu/wp-admin/edit-category-form.php -wordpress-mu/wp-admin/edit-comments.js wordpress-mu/wp-admin/edit-comments.php wordpress-mu/wp-admin/edit-form-advanced.php wordpress-mu/wp-admin/edit-form-comment.php wordpress-mu/wp-admin/edit-form.php +wordpress-mu/wp-admin/edit-link-categories.php +wordpress-mu/wp-admin/edit-link-category-form.php wordpress-mu/wp-admin/edit-link-form.php wordpress-mu/wp-admin/edit-page-form.php wordpress-mu/wp-admin/edit-pages.php +wordpress-mu/wp-admin/edit-post-rows.php wordpress-mu/wp-admin/edit.php wordpress-mu/wp-admin/export.php wordpress-mu/wp-admin/images/ @@ -54,6 +58,7 @@ wordpress-mu/wp-admin/images/heading-bg.gif wordpress-mu/wp-admin/images/login-bkg-bottom.gif wordpress-mu/wp-admin/images/login-bkg-tile.gif +wordpress-mu/wp-admin/images/logo-ghost.png wordpress-mu/wp-admin/images/notice.gif wordpress-mu/wp-admin/images/toggle.gif wordpress-mu/wp-admin/images/wordpress-logo.png @@ -61,19 +66,52 @@ wordpress-mu/wp-admin/import.php wordpress-mu/wp-admin/import/blogger.php wordpress-mu/wp-admin/import/blogware.php +wordpress-mu/wp-admin/import/btt.php wordpress-mu/wp-admin/import/dotclear.php wordpress-mu/wp-admin/import/greymatter.php +wordpress-mu/wp-admin/import/jkw.php wordpress-mu/wp-admin/import/livejournal.php wordpress-mu/wp-admin/import/mt.php wordpress-mu/wp-admin/import/rss.php +wordpress-mu/wp-admin/import/stp.php wordpress-mu/wp-admin/import/textpattern.php +wordpress-mu/wp-admin/import/utw.php wordpress-mu/wp-admin/import/wordpress.php +wordpress-mu/wp-admin/import/wp-cat2tag.php +wordpress-mu/wp-admin/includes/ +wordpress-mu/wp-admin/includes/admin.php +wordpress-mu/wp-admin/includes/bookmark.php +wordpress-mu/wp-admin/includes/comment.php +wordpress-mu/wp-admin/includes/file.php +wordpress-mu/wp-admin/includes/image.php +wordpress-mu/wp-admin/includes/import.php +wordpress-mu/wp-admin/includes/misc.php +wordpress-mu/wp-admin/includes/mu.php +wordpress-mu/wp-admin/includes/plugin.php +wordpress-mu/wp-admin/includes/post.php +wordpress-mu/wp-admin/includes/schema.php +wordpress-mu/wp-admin/includes/taxonomy.php +wordpress-mu/wp-admin/includes/template.php +wordpr
NEW: www/wordpress-mu
This is a multi-user version of wordpress. Further information on http://mu.wordpress.org Please test and comment, or even an ok? Marc wordpress-mu.tgz Description: Binary data
www/wordpress-mu
This is a multi-user version of wordpress. Further information on http://mu.wordpress.org Please test and comment or even an ok? Marc wordpress-mu.tar.gz Description: application/gzip
Re: Diffing added files with anoncvs
Hi
Stefan Sperling wrote:
How do you 'nicely' diff files you've added?
The only way I know is either manually hacking the CVS/Entries
file or using a tool that does this such as cvsdo ("cvsdo add ")
from cvsutils. Then cvs diff will pick them up.
Do you have another way?
You could do something like that:
# cvs diff -u > a.diff
and add for each new file
# diff -u /dev/null patches/patch-a_b >> a.diff
Marc
x11/sisctrl
Hi This is a gtk+2 gui to change screens, resolution, brightness, contrast, overlay, etc. of a running X-Server with a SiS graphics card. comments? OKs? Marc sisctrl.tgz Description: Binary data
NEW: www/syweb
Hi I worked on the syweb-0.53 port of Willem Dijkstra and updated it to syweb-0.55 Any comments? Marc syweb.tgz Description: Binary data
FIX: sysutils/usbutil
usbctl works fine for devices connected to an ehci usb controller. but if it tries to read string descriptors on uhci controllers the connected device get STALLED. by removing the following define, usbctl reads the string in two steps. first it gets one byte to read the length of the string descriptor and then it reads the descriptor with its real length. --- /dev/null Sun Jul 22 23:17:19 2007 +++ patches/patch-usbctl_c Sun Jul 22 23:02:21 2007 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- usbctl.c.orig Mon Feb 25 01:50:55 2002 usbctl.c Sun Jul 22 23:02:08 2007 +@@ -61,8 +61,6 @@ + #define UE_DIR_OUT0x00 + #endif + +-#define NSTRINGS +- + int num = 0; + + static int usbf, usbaddr;
NEW: wordpressmu 1.2.3
WordPress MU is a multi user version of WordPress. This port is derived from Kevin Lo's wordpress port. Please test and comment wordpressmu.tgz Description: Binary data
Re: FIX/UPDATE: comms/hylafax-4.2.5
Marc Winiger wrote: Please test and comment. Also fixes the following issues: - Send fax as Mail did not work, because the binaries were not found - FILETYPE=pdf needs dependency to mail/metamail Marc
UPDATE: comms/hylafax-4.2.5
Please test and comment.
Marc
diff -urNx CVS /usr/ports/comms/hylafax/Makefile comms/hylafax/Makefile
--- /usr/ports/comms/hylafax/Makefile Sat Jan 14 21:33:40 2006
+++ comms/hylafax/Makefile Fri Feb 17 14:20:55 2006
@@ -1,14 +1,16 @@
# $OpenBSD: Makefile,v 1.47 2006/01/14 12:05:34 steven Exp $
COMMENT= "send/receive faxes and share modems"
-DISTNAME= hylafax-4.1.5
-PKGNAME= ${DISTNAME}p4
+DISTNAME= hylafax-4.2.5
+PKGNAME= ${DISTNAME}
CATEGORIES=comms
FLAVORS= a4
FLAVOR?=
HOMEPAGE= http://www.HylaFAX.org/
+MAINTAINER= Marc Winiger <[EMAIL PROTECTED]>
+
MASTER_SITES= ftp://ftp.hylafax.org/source/
# License: BSD
@@ -19,7 +21,8 @@
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c m stdc++ util z
-RUN_DEPENDS= :ghostscript-*:print/ghostscript/gnu
+RUN_DEPENDS= :ghostscript-*:print/ghostscript/gnu \
+ :metamail-*:mail/metamail
LIB_DEPENDS= tiff::graphics/tiff \
jpeg::graphics/jpeg
@@ -52,7 +55,6 @@
@chown uucp:dialer ${SUID_EXES}
@chmod a=rx,u+s ${SUID_EXES}
${INSTALL_DATA} ${FILESDIR}/hylafax.sh.sample ${PREFIX}/lib/fax
- @ln -sf ${TRUEPREFIX}/libdata/hylafax ${WRKINST}/var/spool/hylafax
@chown -R uucp:dialer ${PREFIX}/libdata/hylafax
.include
diff -urNx CVS /usr/ports/comms/hylafax/distinfo comms/hylafax/distinfo
--- /usr/ports/comms/hylafax/distinfo Wed Jan 5 16:58:29 2005
+++ comms/hylafax/distinfo Fri Feb 17 13:07:08 2006
@@ -1,4 +1,4 @@
-MD5 (hylafax-4.1.5.tar.gz) = 67135ae721f7a927e0f9a96644694617
-RMD160 (hylafax-4.1.5.tar.gz) = caae931300e2025b7672ee2a516c4101d870f930
-SHA1 (hylafax-4.1.5.tar.gz) = fa60a8a51921d42aa36732b5c9ee62d5b0f18dab
-SIZE (hylafax-4.1.5.tar.gz) = 1276511
+MD5 (hylafax-4.2.5.tar.gz) = 5989c2638f79b178cbe935882cd58f3e
+RMD160 (hylafax-4.2.5.tar.gz) = aef5e7a8ff32bafa43b5efc431b9fd8c334ddb3a
+SHA1 (hylafax-4.2.5.tar.gz) = b3bfd492dcb85e8aa1ddff9e6dcec3c31e00fccc
+SIZE (hylafax-4.2.5.tar.gz) = 1450958
diff -urNx CVS /usr/ports/comms/hylafax/patches/patch-config_site
comms/hylafax/patches/patch-config_site
--- /usr/ports/comms/hylafax/patches/patch-config_site Thu Jan 1 01:00:00 1970
+++ comms/hylafax/patches/patch-config_site Fri Feb 17 13:21:21 2006
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- config.site.orig Fri Feb 17 13:11:38 2006
config.siteFri Feb 17 13:11:14 2006
+@@ -141,7 +141,7 @@
+ #LIBSUN="auto"# yes|no|auto configure -lsun
use
+ #LLDOPTS="" # extra link line options
+ #MACHDEPLIBS="" # extra libraries for linking
+-#OPTIMIZER="-O" # optimizer flags
++OPTIMIZER="" # optimizer flags
+ #PORTFUNCS="" # non-standard functions to emulate
+ #PROTOTYPES="-prototypes" # C compiler options for checking
function prototypes
+ #RANLIB=":" # pathname of suitable ranlib program
diff -urNx CVS /usr/ports/comms/hylafax/patches/patch-configure
comms/hylafax/patches/patch-configure
--- /usr/ports/comms/hylafax/patches/patch-configureSat Jun 18 20:48:12 2005
+++ comms/hylafax/patches/patch-configure Fri Feb 17 13:21:21 2006
@@ -1,6 +1,6 @@
$OpenBSD: patch-configure,v 1.4 2005/06/18 18:48:12 naddy Exp $
configure.orig Tue Oct 1 16:05:55 2002
-+++ configure Sat Jun 18 19:23:37 2005
+--- configure.orig Fri Dec 16 23:40:30 2005
configure Fri Feb 17 13:14:24 2006
@@ -37,10 +37,10 @@
#
# Setup general configuration parameters.
@@ -16,10 +16,10 @@
DIR_LIBEXEC=$DIR_SBIN
DIR_SPOOL=/var/spool/hylafax
DIR_HTML=/var/httpd/htdocs/hylafax
-@@ -72,8 +72,8 @@ DPS=no
- GS=no
+@@ -73,8 +73,8 @@ GS=no
IMP=no
UTMP=auto
+ OPTIMIZER="-O"
-LIBTIFF="-L/usr/local/lib -ltiff"
-TIFFINC=/usr/local/include
+LIBTIFF="-L${LOCALBASE}/lib -ltiff -ljpeg -lz"
@@ -27,7 +27,7 @@
TIFFBIN=
LIBZ=
ZLIBINC=
-@@ -81,8 +81,8 @@ REGEX=yes
+@@ -82,8 +82,8 @@ REGEX=yes
LIBREGEX='-L${DEPTH}/regex -lregex'
REGEXINC='${DEPTH}/${TOPSRCDIR}/regex'
DBLIB=no
@@ -38,33 +38,3 @@
FAXD=
LIBFAXSERVER='libfaxserver.${DSO}'
LIBUTIL='${UTIL}/libfaxutil.${DSO}'
-@@ -2312,11 +2312,10 @@ EOF
- Note " Found tiffio.h version ${header_ver}"
- Note " Found libtiff version ${lib_ver}"
- if [ ${header_ver} -ge 19960307 ]; then
-- if [ "${lib_ver}" = "3.4" ]; then
-- tiff_runlen_t="uint16"
-- elif [ "${lib_ver}" = "3.5" ]; then
-- tiff_runlen_t="uint32"
-- fi
-+ case ${l
