Re: NEW: security/jailkit chroot jail utilities

[Sebastian Reitenbach]

On Monday 13 September 2010 08:16:00 pm you wrote:
> On Mon, 13 Sep 2010, Sebastian Reitenbach wrote:
> > Hi,
> >
> > attached a tarball for an new port: security/jailkit:
> >
> > Jailkit is a set of utilities to limit user accounts to specific
> > files using chroot() and or specific commands. Setting up a chroot
> > shell, a shell limited to some specific command, or a daemon inside
> > a chroot jail is a lot easier and can be automated using these utilities.
> >
> > Its a fresh release containing the fixes regarding packaging I had
> > reported upstream.
> >
> > please review/comment or even OK to check in?
>
> Please consider this older port of mine and check whether there are
> things worth merging.
There is indeed a bunch of stuff worth merging.

>
> Also are jk_uchroot and jk_chrootsh usefull without the setuid bit? I
> mean if we are forced to run chmod ... to get a useful port anyway, we
> could do it in the PLIST and just add a warning to MESSAGE instead.
They are not useful without. I thought a warning might be forgotten, and 
forcing the administrator doing it manually would be a bit "more secure".
But I could also do like you suggested.

I'll update the tarball.

Sebastian

Re: NEW: security/jailkit chroot jail utilities

[Antoine Jacoutot]

On Tue, 14 Sep 2010, Sebastian Reitenbach wrote:

> > Please consider this older port of mine and check whether there are
> > things worth merging.
> There is indeed a bunch of stuff worth merging.
> 
> >
> > Also are jk_uchroot and jk_chrootsh usefull without the setuid bit? I
> > mean if we are forced to run chmod ... to get a useful port anyway, we
> > could do it in the PLIST and just add a warning to MESSAGE instead.
> They are not useful without. I thought a warning might be forgotten, and 
> forcing the administrator doing it manually would be a bit "more secure".
> But I could also do like you suggested.

Well, it's not like jailkit is a dependency for something and could get 
installed without notice.
One has to specifically pkg_add this package, so for me it makes no 
sense to have to manually change the mode in this case. Especially since 
a chmod would be required each time you do an upgrade.

Cheers!

-- 
Antoine

Re: UPDATE: python 2.6.6

[David Coppa]

On Sat, Sep 11, 2010 at 4:13 PM, Federico G. Schwindt  wrote:
> On Mon, Aug 30, 2010 at 05:27:58PM +0100, Federico G. Schwindt wrote:
>>
>>   Tested on amd64. No changes in regress.
>>   Would like to see some testing on other arches.
>>   Ta.
>
>  Is anyone testing this?

Running with this since 2 weeks on my i386 desktop machine: so far so good.
ok for me.

ciao,
david

python.port.mk diff

[Federico G. Schwindt]

Hi,

  Python >= 2.6 ship with a json module and most ports using JSON have
a fallback mechanism to use simplejson if json is not present, so I'd
like to add the change below and add MODPY_JSON to the ports that
depend on simplejson iif python < 2.6.
  I have 3 ports atm that can use this: py-couchdb and buildbot update,
and py-zine but I will take a look at others.
  Alternatively we can just zap py-simplejson from those ports but
since 2.5 is still in the tree and a few ports still depend on it I
don't know.
  Comments? OKs?

  f.-

Index: python.port.mk
===
RCS file: /cvs/ports/lang/python/python.port.mk,v
retrieving revision 1.36
diff -u -r1.36 python.port.mk
--- python.port.mk  30 Aug 2010 16:35:02 -  1.36
+++ python.port.mk  14 Sep 2010 08:36:37 -
@@ -17,6 +17,12 @@
 .endif
 MODPYSPEC = python-${MODPY_VSPEC}
 
+.if ${MODPY_VERSION} < 2.6
+MODPY_JSON =   ::devel/py-simplejson
+.else
+MODPY_JSON =
+.endif
+
 MODPY_RUN_DEPENDS= :${MODPYSPEC}:lang/python/${MODPY_VERSION}
 MODPY_LIB_DEPENDS= 
python${MODPY_VERSION}:${MODPYSPEC}:lang/python/${MODPY_VERSION}
 _MODPY_BUILD_DEPENDS=  :${MODPYSPEC}:lang/python/${MODPY_VERSION}

[UPDATE] offlineimap

[Björn Ketelaars]

Included a small patch which updates offlineimap to 6.2.0.2. This
update fixes the ssl socket wrap deprecation warning (due to python
changes in -current).



# cvs diff -u offlineimap
cvs server: Diffing offlineimap
Index: offlineimap/Makefile
===
RCS file: /cvs/ports/mail/offlineimap/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- offlineimap/Makefile30 Aug 2010 17:46:57 -  1.15
+++ offlineimap/Makefile14 Sep 2010 09:04:53 -
@@ -2,10 +2,10 @@

 COMMENT=   powerful IMAP/Maildir synchronization and reader support

-V= 6.2.0
-DISTNAME=  offlineimap_${V}
+V= 6.2.0.2
+DISTNAME=  offlineimap_${V}.orig
 CATEGORIES=mail
-PKGNAME=   ${DISTNAME:S/_/-/}
+PKGNAME=   ${DISTNAME:S/_/-/:S/.orig//}
 REVISION = 0

 HOMEPAGE=  http://software.complete.org/offlineimap/
@@ -27,10 +27,9 @@

 BUILD_DEPENDS= ::textproc/docbook-to-man

-WRKDIST=   ${WRKDIR}/offlineimap
+WRKDIST=   ${WRKDIR}/${PKGNAME}

 EXAMPLESDIR=   ${PREFIX}/share/examples/offlineimap
-SUBST_VARS=V

 post-build:
cd ${WRKSRC} && ${LOCALBASE}/bin/docbook-to-man offlineimap.sgml \
Index: offlineimap/distinfo
===
RCS file: /cvs/ports/mail/offlineimap/distinfo,v
retrieving revision 1.11
diff -u -r1.11 distinfo
--- offlineimap/distinfo9 Nov 2009 17:12:17 -   1.11
+++ offlineimap/distinfo14 Sep 2010 09:04:53 -
@@ -1,5 +1,5 @@
-MD5 (offlineimap_6.2.0.tar.gz) = oj2rI6wI3gY+Mw/ibQjpuQ==
-RMD160 (offlineimap_6.2.0.tar.gz) = ATfUsv6CesaTW405QsUdG/R0x5I=
-SHA1 (offlineimap_6.2.0.tar.gz) = +0GU0JEdBkxYEMTx/BR/5xkSW04=
-SHA256 (offlineimap_6.2.0.tar.gz) =
JLZVrj1TEO947R6vdZ4+Y4SBnuu/8ezlvK2GJMRn9xQ=
-SIZE (offlineimap_6.2.0.tar.gz) = 100157
+MD5 (offlineimap_6.2.0.2.orig.tar.gz) = jZwko7HU/42eEhF1+3Te2w==
+RMD160 (offlineimap_6.2.0.2.orig.tar.gz) = ZY/Mw9o1C2e4HDfV+tm3sUT9IeU=
+SHA1 (offlineimap_6.2.0.2.orig.tar.gz) = 4dwgIiyJoE9/95v+pB3e9OZ/Qu4=
+SHA256 (offlineimap_6.2.0.2.orig.tar.gz) =
7OxjdHO6TaTfSSN3aZmmEo9fJkUGNIbmKPWM2sLGyfA=
+SIZE (offlineimap_6.2.0.2.orig.tar.gz) = 103489
cvs server: Diffing offlineimap/pkg
Index: offlineimap/pkg/PLIST
===
RCS file: /cvs/ports/mail/offlineimap/pkg/PLIST,v
retrieving revision 1.7
diff -u -r1.7 PLIST
--- offlineimap/pkg/PLIST   2 Sep 2008 21:51:42 -   1.7
+++ offlineimap/pkg/PLIST   14 Sep 2010 09:04:53 -
@@ -1,7 +1,7 @@
 @comment $OpenBSD: PLIST,v 1.7 2008/09/02 21:51:42 bernd Exp $
 bin/offlineimap
 lib/python${MODPY_VERSION}/site-packages/offlineimap/
-lib/python${MODPY_VERSION}/site-packages/offlineimap-${V}-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/offlineimap-6.2.0-py${MODPY_VERSION}.egg-info
 lib/python${MODPY_VERSION}/site-packages/offlineimap/CustomConfig.py
 lib/python${MODPY_VERSION}/site-packages/offlineimap/CustomConfig.pyc
 lib/python${MODPY_VERSION}/site-packages/offlineimap/__init__.py

Re: net/libnice update. 0.0.9 -> 0.0.13

[Tom Murphy]

OK here's the final diff with REVISION removed as per convention.
Please test on all platforms and commit to tree when satisfied.

Thanks!

Tom


Index: Makefile
===
RCS file: /cvs/ports/net/libnice/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile12 Jul 2010 22:07:39 -  1.5
+++ Makefile14 Sep 2010 09:08:03 -
@@ -4,8 +4,7 @@ SHARED_ONLY =   Yes
 
 COMMENT =  GLib ICE implementation
 
-DISTNAME = libnice-0.0.9
-REVISION = 2
+DISTNAME = libnice-0.0.13
 SHARED_LIBS +=  nice 0.0  # .5.0
 CATEGORIES =   net
 
Index: distinfo
===
RCS file: /cvs/ports/net/libnice/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo20 Aug 2009 17:09:00 -  1.1.1.1
+++ distinfo14 Sep 2010 09:08:03 -
@@ -1,5 +1,5 @@
-MD5 (libnice-0.0.9.tar.gz) = GawlZe50h8HzJIe5SBELGQ==
-RMD160 (libnice-0.0.9.tar.gz) = S49+f3Lf+lry1LolGhj4qwItTUg=
-SHA1 (libnice-0.0.9.tar.gz) = ghy+65codIVXJNipz7qqMIb2KIE=
-SHA256 (libnice-0.0.9.tar.gz) = +oZSxCK/i0bu2zSe1P3FVF3OEE+b1sJhpo6tban/KKE=
-SIZE (libnice-0.0.9.tar.gz) = 627674
+MD5 (libnice-0.0.13.tar.gz) = 5bn3maV8uTnqJljsNSU6uQ==
+RMD160 (libnice-0.0.13.tar.gz) = CiDQPE7Q+xZ3FJstlZWmER6VihU=
+SHA1 (libnice-0.0.13.tar.gz) = cDsD+7INppPAV9P+UHSxgqF8c2Q=
+SHA256 (libnice-0.0.13.tar.gz) = 2N0mDEhqRwpgUqUyOSCHighORKGd8JsVcouFyePW7fA=
+SIZE (libnice-0.0.13.tar.gz) = 635783
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/net/libnice/patches/patch-Makefile_in,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-Makefile_in
--- patches/patch-Makefile_in   20 Aug 2009 17:09:00 -  1.1.1.1
+++ patches/patch-Makefile_in   14 Sep 2010 09:08:03 -
@@ -1,15 +1,15 @@
-$OpenBSD: patch-Makefile_in,v 1.1.1.1 2009/08/20 17:09:00 jasper Exp $
 Makefile.in.orig   Wed Aug 19 11:42:27 2009
-+++ Makefile.inWed Aug 19 11:55:06 2009
-@@ -208,7 +208,6 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
+$OpenBSD$
+--- Makefile.in.orig   Mon Sep 13 10:59:09 2010
 Makefile.inMon Sep 13 10:59:22 2010
+@@ -244,7 +244,6 @@ top_srcdir = @top_srcdir@
  ERROR_CFLAGS = \
$(LIBNICE_CFLAGS) \
+   -fno-strict-aliasing \
 -  -Wextra \
-Wundef \
-Wnested-externs \
-Wwrite-strings \
-@@ -218,8 +217,7 @@ ERROR_CFLAGS = \
+@@ -254,8 +253,7 @@ ERROR_CFLAGS = \
-Wmissing-prototypes \
-Wstrict-prototypes \
-Wredundant-decls \
Index: patches/patch-agent_Makefile_in
===
RCS file: /cvs/ports/net/libnice/patches/patch-agent_Makefile_in,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-agent_Makefile_in
--- patches/patch-agent_Makefile_in 20 Aug 2009 17:09:00 -  1.1.1.1
+++ patches/patch-agent_Makefile_in 14 Sep 2010 09:08:03 -
@@ -1,15 +1,15 @@
-$OpenBSD: patch-agent_Makefile_in,v 1.1.1.1 2009/08/20 17:09:00 jasper Exp $
 agent/Makefile.in.orig Wed Aug 19 11:39:52 2009
-+++ agent/Makefile.in  Wed Aug 19 12:19:29 2009
-@@ -214,7 +214,6 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
+$OpenBSD$
+--- agent/Makefile.in.orig Mon Sep 13 11:01:37 2010
 agent/Makefile.in  Mon Sep 13 11:01:46 2010
+@@ -237,7 +237,6 @@ top_srcdir = @top_srcdir@
  ERROR_CFLAGS = \
$(LIBNICE_CFLAGS) \
+   -fno-strict-aliasing \
 -  -Wextra \
-Wundef \
-Wnested-externs \
-Wwrite-strings \
-@@ -224,8 +223,7 @@ ERROR_CFLAGS = \
+@@ -247,8 +246,7 @@ ERROR_CFLAGS = \
-Wmissing-prototypes \
-Wstrict-prototypes \
-Wredundant-decls \
@@ -19,14 +19,3 @@ $OpenBSD: patch-agent_Makefile_in,v 1.1.
  
  # -Wold-style-definition -Winline -Wunreachable-code
  CLEANFILES = *.gcno *.gcda $(BUILT_SOURCES)
-@@ -580,8 +578,8 @@ agent-signals-marshal.h: agent-signals-marshal.list
- 
- agent-signals-marshal.c: agent-signals-marshal.list Makefile.am
-   glib-genmarshal --body --prefix=agent_marshal $< > $@
--  sed -i "1i#include \"agent-signals-marshal.h\"" $@
--  sed -i -e 's/^}$$/(void)return_value;(void)invocation_hint;}/' $@
-+  gsed -i "1i#include \"agent-signals-marshal.h\"" $@
-+  gsed -i -e 's/^}$$/(void)return_value;(void)invocation_hint;}/' $@
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
Index: patches/patch-agent_interfaces_c
===
RCS file: /cvs/ports/net/libnice/patches/patch-agent_interfaces_c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-agent_interfaces_c
--- patches/patch-agent_interfaces_c20 Aug 2009 17:09:00 -  1.1.1.1
+++ patches/patch-agent_interfaces_c14 Sep 2010

Re: net/libnice update. 0.0.9 -> 0.0.13

[Tom Murphy]

Sorry for all the diffs. This is my first time updating the port.
Had to bump the SHARED_LIB to 1.0 as some of the functionality has
changed. (Thanks sthen!)

Tom


Index: Makefile
===
RCS file: /cvs/ports/net/libnice/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile12 Jul 2010 22:07:39 -  1.5
+++ Makefile14 Sep 2010 10:56:21 -
@@ -4,9 +4,8 @@ SHARED_ONLY =   Yes
 
 COMMENT =  GLib ICE implementation
 
-DISTNAME = libnice-0.0.9
-REVISION = 2
-SHARED_LIBS +=  nice 0.0  # .5.0
+DISTNAME = libnice-0.0.13
+SHARED_LIBS +=  nice 1.0
 CATEGORIES =   net
 
 HOMEPAGE = http://nice.freedesktop.org/
Index: distinfo
===
RCS file: /cvs/ports/net/libnice/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo20 Aug 2009 17:09:00 -  1.1.1.1
+++ distinfo14 Sep 2010 10:56:21 -
@@ -1,5 +1,5 @@
-MD5 (libnice-0.0.9.tar.gz) = GawlZe50h8HzJIe5SBELGQ==
-RMD160 (libnice-0.0.9.tar.gz) = S49+f3Lf+lry1LolGhj4qwItTUg=
-SHA1 (libnice-0.0.9.tar.gz) = ghy+65codIVXJNipz7qqMIb2KIE=
-SHA256 (libnice-0.0.9.tar.gz) = +oZSxCK/i0bu2zSe1P3FVF3OEE+b1sJhpo6tban/KKE=
-SIZE (libnice-0.0.9.tar.gz) = 627674
+MD5 (libnice-0.0.13.tar.gz) = 5bn3maV8uTnqJljsNSU6uQ==
+RMD160 (libnice-0.0.13.tar.gz) = CiDQPE7Q+xZ3FJstlZWmER6VihU=
+SHA1 (libnice-0.0.13.tar.gz) = cDsD+7INppPAV9P+UHSxgqF8c2Q=
+SHA256 (libnice-0.0.13.tar.gz) = 2N0mDEhqRwpgUqUyOSCHighORKGd8JsVcouFyePW7fA=
+SIZE (libnice-0.0.13.tar.gz) = 635783
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/net/libnice/patches/patch-Makefile_in,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-Makefile_in
--- patches/patch-Makefile_in   20 Aug 2009 17:09:00 -  1.1.1.1
+++ patches/patch-Makefile_in   14 Sep 2010 10:56:21 -
@@ -1,15 +1,15 @@
-$OpenBSD: patch-Makefile_in,v 1.1.1.1 2009/08/20 17:09:00 jasper Exp $
 Makefile.in.orig   Wed Aug 19 11:42:27 2009
-+++ Makefile.inWed Aug 19 11:55:06 2009
-@@ -208,7 +208,6 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
+$OpenBSD$
+--- Makefile.in.orig   Mon Sep 13 10:59:09 2010
 Makefile.inMon Sep 13 10:59:22 2010
+@@ -244,7 +244,6 @@ top_srcdir = @top_srcdir@
  ERROR_CFLAGS = \
$(LIBNICE_CFLAGS) \
+   -fno-strict-aliasing \
 -  -Wextra \
-Wundef \
-Wnested-externs \
-Wwrite-strings \
-@@ -218,8 +217,7 @@ ERROR_CFLAGS = \
+@@ -254,8 +253,7 @@ ERROR_CFLAGS = \
-Wmissing-prototypes \
-Wstrict-prototypes \
-Wredundant-decls \
Index: patches/patch-agent_Makefile_in
===
RCS file: /cvs/ports/net/libnice/patches/patch-agent_Makefile_in,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-agent_Makefile_in
--- patches/patch-agent_Makefile_in 20 Aug 2009 17:09:00 -  1.1.1.1
+++ patches/patch-agent_Makefile_in 14 Sep 2010 10:56:21 -
@@ -1,15 +1,15 @@
-$OpenBSD: patch-agent_Makefile_in,v 1.1.1.1 2009/08/20 17:09:00 jasper Exp $
 agent/Makefile.in.orig Wed Aug 19 11:39:52 2009
-+++ agent/Makefile.in  Wed Aug 19 12:19:29 2009
-@@ -214,7 +214,6 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
+$OpenBSD$
+--- agent/Makefile.in.orig Mon Sep 13 11:01:37 2010
 agent/Makefile.in  Mon Sep 13 11:01:46 2010
+@@ -237,7 +237,6 @@ top_srcdir = @top_srcdir@
  ERROR_CFLAGS = \
$(LIBNICE_CFLAGS) \
+   -fno-strict-aliasing \
 -  -Wextra \
-Wundef \
-Wnested-externs \
-Wwrite-strings \
-@@ -224,8 +223,7 @@ ERROR_CFLAGS = \
+@@ -247,8 +246,7 @@ ERROR_CFLAGS = \
-Wmissing-prototypes \
-Wstrict-prototypes \
-Wredundant-decls \
@@ -19,14 +19,3 @@ $OpenBSD: patch-agent_Makefile_in,v 1.1.
  
  # -Wold-style-definition -Winline -Wunreachable-code
  CLEANFILES = *.gcno *.gcda $(BUILT_SOURCES)
-@@ -580,8 +578,8 @@ agent-signals-marshal.h: agent-signals-marshal.list
- 
- agent-signals-marshal.c: agent-signals-marshal.list Makefile.am
-   glib-genmarshal --body --prefix=agent_marshal $< > $@
--  sed -i "1i#include \"agent-signals-marshal.h\"" $@
--  sed -i -e 's/^}$$/(void)return_value;(void)invocation_hint;}/' $@
-+  gsed -i "1i#include \"agent-signals-marshal.h\"" $@
-+  gsed -i -e 's/^}$$/(void)return_value;(void)invocation_hint;}/' $@
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
Index: patches/patch-agent_interfaces_c
===
RCS file: /cvs/ports/net/libnice/patches/patch-agent_interfaces_c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-agent_interfaces_c
--- patches/patch-agent_i

Re: python and ncursesw,panelw (Was Re: UPDATE: python 2.6.6)

[Stuart Henderson]

On 2010/09/14 13:43, David Coppa wrote:
> On Sat, 11 Sep 2010, Federico G. Schwindt wrote:
> 
> > On Mon, Aug 30, 2010 at 05:27:58PM +0100, Federico G. Schwindt wrote:
> > > 
> > >   Tested on amd64. No changes in regress.
> > >   Would like to see some testing on other arches.
> > >   Ta.
> 
> Hi, 
> I think the following diff is needed after addition of wide character 
> support in ncurses.

please switch these to REVISION..

> -PKG_PATCHLEVEL=  p3
> +PKG_PATCHLEVEL=  p4
..etc..

Re: python.port.mk diff

[Will Maier]

Hi Federico-

On Tue, Sep 14, 2010 at 09:43:19AM +0100, Federico G. Schwindt wrote:
> Python >= 2.6 ship with a json module and most ports using JSON have a
> fallback mechanism to use simplejson if json is not present, so I'd like to
> add the change below and add MODPY_JSON to the ports that depend on simplejson
> iif python < 2.6. I have 3 ports atm that can use this: py-couchdb and
> buildbot update, and py-zine but I will take a look at others. Alternatively
> we can just zap py-simplejson from those ports but since 2.5 is still in the
> tree and a few ports still depend on it I don't know.

Until we can move everything off 2.5, I think we should add MODPY_JSON as you
suggest (so ok wcmaier@).

Thanks!

-- 

Will Maier
http://www.lfod.us/~will/

python and ncursesw,panelw (Was Re: UPDATE: python 2.6.6)

[David Coppa]

On Sat, 11 Sep 2010, Federico G. Schwindt wrote:

> On Mon, Aug 30, 2010 at 05:27:58PM +0100, Federico G. Schwindt wrote:
> > 
> >   Tested on amd64. No changes in regress.
> >   Would like to see some testing on other arches.
> >   Ta.

Hi, 
I think the following diff is needed after addition of wide character 
support in ncurses.

cheers, 
david

Index: Makefile.inc
===
RCS file: /cvs/ports/lang/python/Makefile.inc,v
retrieving revision 1.65
diff -u -p -r1.65 Makefile.inc
--- Makefile.inc3 Sep 2010 19:20:06 -   1.65
+++ Makefile.inc14 Sep 2010 11:23:05 -
@@ -49,8 +49,8 @@ LIB_DEPENDS=
 
 LIB_DEPENDS-main=  bz2::archivers/bzip2
 RUN_DEPENDS-main=
-WANTLIB-main=  ssl panel m crypto c util z readline pthread \
-   ncurses stdc++ expat ossaudio
+WANTLIB-main=  ssl panelw m crypto c util z readline pthread \
+   ncursesw stdc++ expat ossaudio
 .if ${VERSION} == "2.5" || ${VERSION} == "2.6"
 LIB_DEPENDS-main+= sqlite3::databases/sqlite3
 .endif
Index: 2.4/Makefile
===
RCS file: /cvs/ports/lang/python/2.4/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- 2.4/Makefile15 Apr 2010 18:35:02 -  1.28
+++ 2.4/Makefile14 Sep 2010 11:23:05 -
@@ -2,7 +2,7 @@
 
 VERSION=   2.4
 PATCHLEVEL=.6
-PKG_PATCHLEVEL=p3
+PKG_PATCHLEVEL=p4
 SHARED_LIBS=   python2.4 1.0
 
 BROKEN-mips64 = Floating point exception while generating pyc objects
Index: 2.5/Makefile
===
RCS file: /cvs/ports/lang/python/2.5/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- 2.5/Makefile15 Apr 2010 18:35:02 -  1.38
+++ 2.5/Makefile14 Sep 2010 11:23:05 -
@@ -2,7 +2,7 @@
 
 VERSION=   2.5
 PATCHLEVEL=.4
-PKG_PATCHLEVEL=p5
+PKG_PATCHLEVEL=p6
 SHARED_LIBS=   python2.5 1.0
 
 BROKEN-mips64 = Floating point exception while generating pyc objects
Index: 2.6/Makefile
===
RCS file: /cvs/ports/lang/python/2.6/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- 2.6/Makefile23 Jul 2010 13:56:26 -  1.17
+++ 2.6/Makefile14 Sep 2010 11:23:05 -
@@ -2,6 +2,7 @@
 
 VERSION=   2.6
 PATCHLEVEL=.5
+PKG_PATCHLEVEL=p0
 SHARED_LIBS=   python2.6 1.0
 
 # PSUBDIR= python/${VERSION}

Re: WIP: mediatomb-0.12.1

[Jasper Lievisse Adriaanse]

On Mon, Sep 13, 2010 at 10:39:02PM +0200, Markus Bergkvist wrote:
> 
> On 09/10/10 13:43, Edd Barrett wrote:
> >>Here is an updated (unfinished) port. There is a bug in mediatomb where it
> >>ignores -c. I don't have any more time to look at this now, so a I am 
> >>posting my
> >>work thus far. This port creates a new user and prints a installation 
> >>message
> >>suitible for rc.local.
> >
> >No bug - forgot to quote su -c "...".
> >
> >Try this.. attached.
> >
> >  * picks up system-wide config
> >  * puts database in /var/db/mediatomb
> >
> 
> It still ignores any signals. Might this be related?
> http://marc.info/?l=openbsd-tech&m=128398746609607&w=2
> 
> Will this remove the database on pkg_add -u too?
> @extraunexec rm -rf /var/db/mediatomb/*
> 
> $ diff -u Makefile.orig Makefile
> 
> 
> --- Makefile.orig Mon Sep 13 22:15:54 2010
> +++ Makefile  Mon Sep 13 22:16:04 2010
> @@ -25,7 +25,6 @@
>  LIB_DEPENDS =::graphics/ffmpegthumbnailer \
>   ::net/curl \
>   ::graphics/libexif \
> - ::graphics/ffmpegthumbnailer \
>   ::lang/spidermonkey \
>   ::devel/libmagic \
>   ::databases/sqlite3 \
> 
> $ diff -u pkg/MESSAGE.orig pkg/MESSAGE
> 
> 
> --- pkg/MESSAGE.orig  Fri Sep 10 13:32:53 2010
> +++ pkg/MESSAGE   Mon Sep 13 22:11:17 2010
> @@ -1,4 +1,4 @@
> -To start mediatomb at boot time, place the following in rc.local:
> +To start mediatomb at boot time, place the following in /etc/rc.local:
> 
>  if [ -x ${TRUEPREFIX}/bin/mediatomb ] ; then
>   echo -n ' mediatomb'

Please use ${SYSCONFDIR} instead of hardcoding /etc.

-- 
Stay Hungry. Stay Foolish.

Re: [UPDATE] offlineimap

[Björn Ketelaars]

On Tue, Sep 14, 2010 at 2:40 PM, Jasper Lievisse Adriaanse
 wrote:
> On Tue, Sep 14, 2010 at 11:06:17AM +0200, Bj?rn Ketelaars wrote:
>> Included a small patch which updates offlineimap to 6.2.0.2. This
>> update fixes the ssl socket wrap deprecation warning (due to python
>> changes in -current).
>>
>>
> this is bad. what happens with PKGNAME gets bumped?
>
> also, you'll need to zap REVISION here.
>

Revised PKGNAME and WRKDIST and removed REVISION


# cvs diff -u
cvs server: Diffing .
Index: Makefile
===
RCS file: /cvs/ports/mail/offlineimap/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- Makefile30 Aug 2010 17:46:57 -  1.15
+++ Makefile14 Sep 2010 13:07:08 -
@@ -2,11 +2,10 @@

 COMMENT=   powerful IMAP/Maildir synchronization and reader support

-V= 6.2.0
-DISTNAME=  offlineimap_${V}
+V= 6.2.0.2
+DISTNAME=  offlineimap_${V}.orig
 CATEGORIES=mail
-PKGNAME=   ${DISTNAME:S/_/-/}
-REVISION = 0
+PKGNAME=   offlineimap-${V}

 HOMEPAGE=  http://software.complete.org/offlineimap/

@@ -27,10 +26,9 @@

 BUILD_DEPENDS= ::textproc/docbook-to-man

-WRKDIST=   ${WRKDIR}/offlineimap
+WRKDIST=   ${WRKDIR}/offlineimap-${V}

 EXAMPLESDIR=   ${PREFIX}/share/examples/offlineimap
-SUBST_VARS=V

 post-build:
cd ${WRKSRC} && ${LOCALBASE}/bin/docbook-to-man offlineimap.sgml \
Index: distinfo
===
RCS file: /cvs/ports/mail/offlineimap/distinfo,v
retrieving revision 1.11
diff -u -r1.11 distinfo
--- distinfo9 Nov 2009 17:12:17 -   1.11
+++ distinfo14 Sep 2010 13:07:08 -
@@ -1,5 +1,5 @@
-MD5 (offlineimap_6.2.0.tar.gz) = oj2rI6wI3gY+Mw/ibQjpuQ==
-RMD160 (offlineimap_6.2.0.tar.gz) = ATfUsv6CesaTW405QsUdG/R0x5I=
-SHA1 (offlineimap_6.2.0.tar.gz) = +0GU0JEdBkxYEMTx/BR/5xkSW04=
-SHA256 (offlineimap_6.2.0.tar.gz) =
JLZVrj1TEO947R6vdZ4+Y4SBnuu/8ezlvK2GJMRn9xQ=
-SIZE (offlineimap_6.2.0.tar.gz) = 100157
+MD5 (offlineimap_6.2.0.2.orig.tar.gz) = jZwko7HU/42eEhF1+3Te2w==
+RMD160 (offlineimap_6.2.0.2.orig.tar.gz) = ZY/Mw9o1C2e4HDfV+tm3sUT9IeU=
+SHA1 (offlineimap_6.2.0.2.orig.tar.gz) = 4dwgIiyJoE9/95v+pB3e9OZ/Qu4=
+SHA256 (offlineimap_6.2.0.2.orig.tar.gz) =
7OxjdHO6TaTfSSN3aZmmEo9fJkUGNIbmKPWM2sLGyfA=
+SIZE (offlineimap_6.2.0.2.orig.tar.gz) = 103489
cvs server: Diffing pkg
Index: pkg/PLIST
===
RCS file: /cvs/ports/mail/offlineimap/pkg/PLIST,v
retrieving revision 1.7
diff -u -r1.7 PLIST
--- pkg/PLIST   2 Sep 2008 21:51:42 -   1.7
+++ pkg/PLIST   14 Sep 2010 13:07:08 -
@@ -1,7 +1,7 @@
 @comment $OpenBSD: PLIST,v 1.7 2008/09/02 21:51:42 bernd Exp $
 bin/offlineimap
 lib/python${MODPY_VERSION}/site-packages/offlineimap/
-lib/python${MODPY_VERSION}/site-packages/offlineimap-${V}-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/offlineimap-6.2.0-py${MODPY_VERSION}.egg-info
 lib/python${MODPY_VERSION}/site-packages/offlineimap/CustomConfig.py
 lib/python${MODPY_VERSION}/site-packages/offlineimap/CustomConfig.pyc
 lib/python${MODPY_VERSION}/site-packages/offlineimap/__init__.py

Re: [UPDATE] offlineimap

[Stuart Henderson]

On 2010/09/14 15:14, Björn Ketelaars wrote:
> On Tue, Sep 14, 2010 at 2:40 PM, Jasper Lievisse Adriaanse
>  wrote:
> > On Tue, Sep 14, 2010 at 11:06:17AM +0200, Bj?rn Ketelaars wrote:
> >> Included a small patch which updates offlineimap to 6.2.0.2. This
> >> update fixes the ssl socket wrap deprecation warning (due to python
> >> changes in -current).
> >>
> >>
> > this is bad. what happens with PKGNAME gets bumped?
> >
> > also, you'll need to zap REVISION here.
> >
> 
> Revised PKGNAME and WRKDIST and removed REVISION
> 
> 
> # cvs diff -u
> cvs server: Diffing .
> Index: Makefile
> ===
> RCS file: /cvs/ports/mail/offlineimap/Makefile,v
> retrieving revision 1.15
> diff -u -r1.15 Makefile
> --- Makefile30 Aug 2010 17:46:57 -  1.15
> +++ Makefile14 Sep 2010 13:07:08 -
> @@ -2,11 +2,10 @@
> 
>  COMMENT=   powerful IMAP/Maildir synchronization and reader support
> 
> -V= 6.2.0
> -DISTNAME=  offlineimap_${V}
> +V= 6.2.0.2

nearly ok, but please change V to MODPY_EGG_VERSION and rerun 'make plist'.

webkit 1.2.4

[Landry Breuil]

Yo,

please test with your favorite consumer.. i'll put it in a bulk.

Landry
? libwebkit-1.0.so.2.1
? libwebkit-1.0.so.2.2
Index: Makefile
===
RCS file: /cvs/ports/www/webkit/Makefile,v
retrieving revision 1.32
diff -u -r1.32 Makefile
--- Makefile30 Aug 2010 13:15:49 -  1.32
+++ Makefile14 Sep 2010 13:06:27 -
@@ -2,9 +2,8 @@
 
 COMMENT =  open source web browser engine
 
-DISTNAME = webkit-1.2.3
+DISTNAME = webkit-1.2.4
 EPOCH =0
-REVISION = 0
 CATEGORIES =   www
 
 HOMEPAGE = http://webkitgtk.org/
Index: distinfo
===
RCS file: /cvs/ports/www/webkit/distinfo,v
retrieving revision 1.14
diff -u -r1.14 distinfo
--- distinfo19 Jul 2010 12:29:50 -  1.14
+++ distinfo14 Sep 2010 13:06:27 -
@@ -1,5 +1,5 @@
-MD5 (webkit-1.2.3.tar.gz) = CrXEeKb1t0oa6WvxOkVmYg==
-RMD160 (webkit-1.2.3.tar.gz) = QfoZTeKGWGfb99EVbQlip1gPInU=
-SHA1 (webkit-1.2.3.tar.gz) = iMOOvroYegYicrKqjKK70Lu4YwY=
-SHA256 (webkit-1.2.3.tar.gz) = /3CyXqje3AAx8p8uqNmqImv6ZevS8SdyOQ9OKEUwb+E=
-SIZE (webkit-1.2.3.tar.gz) = 6740030
+MD5 (webkit-1.2.4.tar.gz) = 3DqS3Q6MLnAmP7/fgJtRpQ==
+RMD160 (webkit-1.2.4.tar.gz) = eHmX9iNZEWdXJtkD/zuVSfthX+U=
+SHA1 (webkit-1.2.4.tar.gz) = 5OMebVAl2MjXrIH+bXyUeRjOR5A=
+SHA256 (webkit-1.2.4.tar.gz) = fvfSAb3Dr/qXFu7CFRGswxKDQq9wZbDWGjHD0DKtA10=
+SIZE (webkit-1.2.4.tar.gz) = 6612143
Index: patches/patch-configure
===
RCS file: /cvs/ports/www/webkit/patches/patch-configure,v
retrieving revision 1.1
diff -u -r1.1 patch-configure
--- patches/patch-configure 30 Aug 2010 13:15:49 -  1.1
+++ patches/patch-configure 14 Sep 2010 13:06:27 -
@@ -1,9 +1,9 @@
 $OpenBSD: patch-configure,v 1.1 2010/08/30 13:15:49 landry Exp $
 Don't force the use of -O2, the ports infrastructure
 takes care of that
 configure.orig Sun Aug 29 21:50:39 2010
-+++ configure  Sun Aug 29 21:52:36 2010
-@@ -19530,8 +19530,8 @@ fi
+--- configure.orig Fri Sep  3 21:30:50 2010
 configure  Tue Sep 14 09:09:55 2010
+@@ -19534,8 +19534,8 @@ fi
  
  # Add the appropriate 'O' level for optimized builds
  if test "$enable_optimizations" = "yes"; then

wrong path in audio/libao/Makefile

[David Coppa]

>$ find /usr/ports/pobj/libao-1.0.0/libao-1.0.0 -name ao_private.h
/usr/ports/pobj/libao-1.0.0/libao-1.0.0/include/ao/ao_private.h

Ok? 

Index: Makefile
===
RCS file: /cvs/ports/audio/libao/Makefile,v
retrieving revision 1.45
diff -u -p -r1.45 Makefile
--- Makefile3 Jun 2010 15:49:37 -   1.45
+++ Makefile14 Sep 2010 13:38:04 -
@@ -3,6 +3,7 @@
 COMMENT=   portable audio output library
 
 DISTNAME=  libao-1.0.0
+REVISION=  0
 CATEGORIES=audio
 HOMEPAGE=  http://www.xiph.org/ao/
 SHARED_LIBS=   ao   4.0  # .4.0
@@ -33,7 +34,7 @@ CONFIGURE_ENV=ac_cv_header_sys_audioio_
 
 pre-build:
@perl -i -pe 's:/etc/libao.conf:${SYSCONFDIR}/libao.conf:g' \
-   ${WRKDIST}/src/include/ao/ao_private.h \
+   ${WRKDIST}/include/ao/ao_private.h \
${WRKDIST}/libao.conf.5 \
${WRKDIST}/doc/config.html


Cheers, 
David

Re: [UPDATE] offlineimap

[Björn Ketelaars]

2010/9/14 Stuart Henderson :
> On 2010/09/14 15:14, Björn Ketelaars wrote:
>> On Tue, Sep 14, 2010 at 2:40 PM, Jasper Lievisse Adriaanse
>>  wrote:
>> > On Tue, Sep 14, 2010 at 11:06:17AM +0200, Bj?rn Ketelaars wrote:
>> >> Included a small patch which updates offlineimap to 6.2.0.2. This
>> >> update fixes the ssl socket wrap deprecation warning (due to python
>> >> changes in -current).
>> >>
>> >>
>> > this is bad. what happens with PKGNAME gets bumped?
>> >
>> > also, you'll need to zap REVISION here.
>> >
>>
>> Revised PKGNAME and WRKDIST and removed REVISION
>
> nearly ok, but please change V to MODPY_EGG_VERSION and rerun 'make plist'.
>

changed V -> MODPY_EGG_VERSION and updated plist.

I just noticed that version.py has not been updated to 6.2.0.2 and
thus still mentions 6.2.0. What is wise - include a patch or?



# cvs diff -u
cvs server: Diffing .
Index: Makefile
===
RCS file: /cvs/ports/mail/offlineimap/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- Makefile30 Aug 2010 17:46:57 -  1.15
+++ Makefile14 Sep 2010 13:45:57 -
@@ -2,11 +2,10 @@

 COMMENT=   powerful IMAP/Maildir synchronization and reader support

-V= 6.2.0
-DISTNAME=  offlineimap_${V}
+MODPY_EGG_VERSION= 6.2.0.2
+DISTNAME=  offlineimap_${MODPY_EGG_VERSION}.orig
 CATEGORIES=mail
-PKGNAME=   ${DISTNAME:S/_/-/}
-REVISION = 0
+PKGNAME=   offlineimap-${MODPY_EGG_VERSION}

 HOMEPAGE=  http://software.complete.org/offlineimap/

@@ -27,10 +26,9 @@

 BUILD_DEPENDS= ::textproc/docbook-to-man

-WRKDIST=   ${WRKDIR}/offlineimap
+WRKDIST=   ${WRKDIR}/offlineimap-${MODPY_EGG_VERSION}

 EXAMPLESDIR=   ${PREFIX}/share/examples/offlineimap
-SUBST_VARS=V

 post-build:
cd ${WRKSRC} && ${LOCALBASE}/bin/docbook-to-man offlineimap.sgml \
Index: distinfo
===
RCS file: /cvs/ports/mail/offlineimap/distinfo,v
retrieving revision 1.11
diff -u -r1.11 distinfo
--- distinfo9 Nov 2009 17:12:17 -   1.11
+++ distinfo14 Sep 2010 13:45:57 -
@@ -1,5 +1,5 @@
-MD5 (offlineimap_6.2.0.tar.gz) = oj2rI6wI3gY+Mw/ibQjpuQ==
-RMD160 (offlineimap_6.2.0.tar.gz) = ATfUsv6CesaTW405QsUdG/R0x5I=
-SHA1 (offlineimap_6.2.0.tar.gz) = +0GU0JEdBkxYEMTx/BR/5xkSW04=
-SHA256 (offlineimap_6.2.0.tar.gz) =
JLZVrj1TEO947R6vdZ4+Y4SBnuu/8ezlvK2GJMRn9xQ=
-SIZE (offlineimap_6.2.0.tar.gz) = 100157
+MD5 (offlineimap_6.2.0.2.orig.tar.gz) = jZwko7HU/42eEhF1+3Te2w==
+RMD160 (offlineimap_6.2.0.2.orig.tar.gz) = ZY/Mw9o1C2e4HDfV+tm3sUT9IeU=
+SHA1 (offlineimap_6.2.0.2.orig.tar.gz) = 4dwgIiyJoE9/95v+pB3e9OZ/Qu4=
+SHA256 (offlineimap_6.2.0.2.orig.tar.gz) =
7OxjdHO6TaTfSSN3aZmmEo9fJkUGNIbmKPWM2sLGyfA=
+SIZE (offlineimap_6.2.0.2.orig.tar.gz) = 103489
cvs server: Diffing pkg
Index: pkg/PLIST
===
RCS file: /cvs/ports/mail/offlineimap/pkg/PLIST,v
retrieving revision 1.7
diff -u -r1.7 PLIST
--- pkg/PLIST   2 Sep 2008 21:51:42 -   1.7
+++ pkg/PLIST   14 Sep 2010 13:45:57 -
@@ -1,7 +1,7 @@
 @comment $OpenBSD: PLIST,v 1.7 2008/09/02 21:51:42 bernd Exp $
 bin/offlineimap
 lib/python${MODPY_VERSION}/site-packages/offlineimap/
-lib/python${MODPY_VERSION}/site-packages/offlineimap-${V}-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/offlineimap-6.2.0-py${MODPY_VERSION}.egg-info
 lib/python${MODPY_VERSION}/site-packages/offlineimap/CustomConfig.py
 lib/python${MODPY_VERSION}/site-packages/offlineimap/CustomConfig.pyc
 lib/python${MODPY_VERSION}/site-packages/offlineimap/__init__.py

[UPDATE] pianobar-2010.08.21

[David Coppa]

Finally upstream has formal releases... 

Ok? 

cheers, 
david

Index: Makefile
===
RCS file: /cvs/ports/audio/pianobar/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile12 Sep 2010 16:49:09 -  1.4
+++ Makefile14 Sep 2010 14:15:44 -
@@ -2,15 +2,14 @@
 
 COMMENT =  console client for pandora
 
-VERSION =  0.20100619
-DISTNAME = PromyLOPh-pianobar-3631791
-PKGNAME =  pianobar-${VERSION}
+DISTNAME = pianobar-2010.08.21
+EXTRACT_SUFX = .tar.bz2
 CATEGORIES =   audio
 
 MAINTAINER =   David Coppa 
 
 HOMEPAGE = http://6xq.net/html/00/17.html
-MASTER_SITES = http://distfiles.nl/
+MASTER_SITES = http://6xq.net/media/00/16/
 
 SHARED_ONLY =  Yes
 
Index: distinfo
===
RCS file: /cvs/ports/audio/pianobar/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo20 Jul 2010 09:47:18 -  1.3
+++ distinfo14 Sep 2010 14:15:44 -
@@ -1,5 +1,5 @@
-MD5 (PromyLOPh-pianobar-3631791.tar.gz) = oCBlnmKimvIJG9QFWJHqrg==
-RMD160 (PromyLOPh-pianobar-3631791.tar.gz) = 6/pAbgiazKPDMZDQ54LZ3YI5tY8=
-SHA1 (PromyLOPh-pianobar-3631791.tar.gz) = qZno0ajwn9HfHYo6C0GMY07BdvE=
-SHA256 (PromyLOPh-pianobar-3631791.tar.gz) = 
LkZBUmZLh2AElb0gTXysqMDgO1CFsptvrWPVFPEtxDE=
-SIZE (PromyLOPh-pianobar-3631791.tar.gz) = 65363
+MD5 (pianobar-2010.08.21.tar.bz2) = mAASuEj/JMA5ikpWQeK3aw==
+RMD160 (pianobar-2010.08.21.tar.bz2) = SlvBJ4JkFR4xe3jkTAuE71CeRGM=
+SHA1 (pianobar-2010.08.21.tar.bz2) = nul8R2I/vM27kcSnE1JK66/Xi2g=
+SHA256 (pianobar-2010.08.21.tar.bz2) = 
GDtmHoCh8o/QctMU9Hd4biBvPtA4uDbU2iQRaRqiWUk=
+SIZE (pianobar-2010.08.21.tar.bz2) = 55974
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/audio/pianobar/patches/patch-Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 patch-Makefile
--- patches/patch-Makefile  20 Jul 2010 09:47:18 -  1.1
+++ patches/patch-Makefile  14 Sep 2010 14:15:44 -
@@ -1,6 +1,6 @@
 $OpenBSD: patch-Makefile,v 1.1 2010/07/20 09:47:18 dcoppa Exp $
 Makefile.orig  Sat Jun 19 09:36:18 2010
-+++ Makefile   Tue Jul 13 20:23:39 2010
+--- Makefile.orig  Sat Aug 21 18:49:29 2010
 Makefile   Tue Sep 14 15:53:28 2010
 @@ -4,7 +4,7 @@ PREFIX:=/usr/local
  BINDIR:=${PREFIX}/bin
  LIBDIR:=${PREFIX}/lib
@@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile,v 1.1 2010/07/2
  
  PIANOBAR_DIR=src
  PIANOBAR_SRC=\
-@@ -94,7 +94,7 @@ pianobar: ${PIANOBAR_OBJ} ${PIANOBAR_HDR} ${LIBPIANO_O
+@@ -96,7 +96,7 @@ pianobar: ${PIANOBAR_OBJ} ${PIANOBAR_HDR} ${LIBPIANO_O
  libpiano: ${LIBPIANO_RELOBJ} ${LIBPIANO_HDR} ${LIBWAITRESS_RELOBJ} \
${LIBWAITRESS_HDR} ${LIBEZXML_RELOBJ} ${LIBEZXML_HDR}
${CC} -shared ${CFLAGS} ${LIBPIANO_RELOBJ} ${LIBWAITRESS_RELOBJ} \
@@ -19,7 +19,7 @@ $OpenBSD: patch-Makefile,v 1.1 2010/07/2
  
  %.o: %.c
${CC} ${CFLAGS} -I ${LIBPIANO_INCLUDE} -I ${LIBWAITRESS_INCLUDE} \
-@@ -109,17 +109,14 @@ libpiano: ${LIBPIANO_RELOBJ} ${LIBPIANO_HDR} ${LIBWAIT
+@@ -111,17 +111,14 @@ libpiano: ${LIBPIANO_RELOBJ} ${LIBPIANO_HDR} ${LIBWAIT
  clean:
${RM} ${PIANOBAR_OBJ} ${LIBPIANO_OBJ} ${LIBWAITRESS_OBJ} 
${LIBEZXML_OBJ} \
${LIBPIANO_RELOBJ} ${LIBWAITRESS_RELOBJ} 
${LIBEZXML_RELOBJ} pianobar \

python porters take note [was Re: UPDATE: databases/py-odbc 2.1.8]

[Stuart Henderson]

On 2010/09/12 10:39, Ryan Boggs wrote:
> On Sun, Sep 12, 2010 at 2:49 AM, Stuart Henderson  
> wrote:
> > On 2010/09/11 18:20, Ryan Boggs wrote:
> >> Attached is the diff to bring py-odbc to 2.1.8 for testing and
> >> committing.  It's been working for me on i386.
> >
> > I couldn't get this one to package; egg.info changed to being a
> > directory and the file modes in the tar.gz are too lenient. Attached
> > diff fixes these (and regenerates patches) but I haven't tested
> > operation yet.
> >
> 
> Odd, my patch worked fine for me.

We've worked out what did this now; some python ports have an
optional dependency on setuptools. If absent, it creates a PLIST
like yours with .egg-info as a file. If present, it creates a PLIST
like mine with .egg-info as a directory.

If you're working on or committing python ports, please make sure
you have generated a plist with setuptools installed; if you get
.egg-info as a directory rather than a file, you need to use
MODPY_SETUPTOOLS=yes.

If modifying an existing port, changing this value requires a bump
as it adds a run dependency.

Re: python porters take note [was Re: UPDATE: databases/py-odbc 2.1.8]

[Ryan Boggs]

On Sep 14, 2010, at 8:33 AM, Stuart Henderson  wrote:

> On 2010/09/12 10:39, Ryan Boggs wrote:
>> On Sun, Sep 12, 2010 at 2:49 AM, Stuart Henderson  
>> wrote:
>>> On 2010/09/11 18:20, Ryan Boggs wrote:
 Attached is the diff to bring py-odbc to 2.1.8 for testing and
 committing.  It's been working for me on i386.
>>> 
>>> I couldn't get this one to package; egg.info changed to being a
>>> directory and the file modes in the tar.gz are too lenient. Attached
>>> diff fixes these (and regenerates patches) but I haven't tested
>>> operation yet.
>>> 
>> 
>> Odd, my patch worked fine for me.
> 
> We've worked out what did this now; some python ports have an
> optional dependency on setuptools. If absent, it creates a PLIST
> like yours with .egg-info as a file. If present, it creates a PLIST
> like mine with .egg-info as a directory.
> 
> If you're working on or committing python ports, please make sure
> you have generated a plist with setuptools installed; if you get
> .egg-info as a directory rather than a file, you need to use
> MODPY_SETUPTOOLS=yes.
> 
> If modifying an existing port, changing this value requires a bump
> as it adds a run dependency.
> 
Good to know.  Thanks Stuart.

Thanks,
Ryan

Update py-lxml to version 2.2.8

[Todd C. Miller]

Current version causes a warning due to deprecated 'import sets'.

 - todd

Index: textproc/py-lxml/Makefile
===
RCS file: /home/cvs/openbsd/ports/textproc/py-lxml/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- textproc/py-lxml/Makefile   30 Aug 2010 21:47:16 -  1.5
+++ textproc/py-lxml/Makefile   14 Sep 2010 17:45:09 -
@@ -2,10 +2,9 @@
 
 COMMENT=   Python binding for the libxml2 and libxslt libraries
 
-MODPY_EGG_VERSION= 2.0.4
+MODPY_EGG_VERSION= 2.2.8
 DISTNAME=  lxml-${MODPY_EGG_VERSION}
 PKGNAME=   py-lxml-${MODPY_EGG_VERSION}
-REVISION=  0
 CATEGORIES=textproc devel
 
 MAINTAINER=Benoit Chesneau 
Index: textproc/py-lxml/distinfo
===
RCS file: /home/cvs/openbsd/ports/textproc/py-lxml/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- textproc/py-lxml/distinfo   19 Nov 2009 13:04:23 -  1.2
+++ textproc/py-lxml/distinfo   14 Sep 2010 17:45:57 -
@@ -1,5 +1,5 @@
-MD5 (lxml-2.0.4.tgz) = OLSbr0/6HsASiG7aOnKPIQ==
-RMD160 (lxml-2.0.4.tgz) = UVWxWGoBWJ4VJmHWXMYLbA/LAA0=
-SHA1 (lxml-2.0.4.tgz) = ZBLRtascSI1ynPd4MM5mFsPIngs=
-SHA256 (lxml-2.0.4.tgz) = XiPtFoydHEl2yqxTmNu0X9jFHpxCPgE/Vxzw4Oykp1A=
-SIZE (lxml-2.0.4.tgz) = 2012053
+MD5 (lxml-2.2.8.tgz) = 1sYS1jqE15RAkSobKdO5gQ==
+RMD160 (lxml-2.2.8.tgz) = x95NNpSMQgm+VXtDh5LffVhRu+k=
+SHA1 (lxml-2.2.8.tgz) = kBKuZ2Fg0NL/+YCwdgcITibVPac=
+SHA256 (lxml-2.2.8.tgz) = ibc5JbXjKV3PRnXLlIAHog6wKf41yaFirhnsEfGrr+U=
+SIZE (lxml-2.2.8.tgz) = 2922192
Index: textproc/py-lxml/pkg/PLIST
===
RCS file: /home/cvs/openbsd/ports/textproc/py-lxml/pkg/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- textproc/py-lxml/pkg/PLIST  3 Jan 2009 21:34:01 -   1.2
+++ textproc/py-lxml/pkg/PLIST  14 Sep 2010 17:53:01 -
@@ -28,6 +28,8 @@
 lib/python${MODPY_VERSION}/site-packages/lxml/html/_dictmixin.pyc
 lib/python${MODPY_VERSION}/site-packages/lxml/html/_diffcommand.py
 lib/python${MODPY_VERSION}/site-packages/lxml/html/_diffcommand.pyc
+lib/python${MODPY_VERSION}/site-packages/lxml/html/_html5builder.py
+lib/python${MODPY_VERSION}/site-packages/lxml/html/_html5builder.pyc
 lib/python${MODPY_VERSION}/site-packages/lxml/html/_setmixin.py
 lib/python${MODPY_VERSION}/site-packages/lxml/html/_setmixin.pyc
 lib/python${MODPY_VERSION}/site-packages/lxml/html/builder.py
@@ -40,12 +42,15 @@
 lib/python${MODPY_VERSION}/site-packages/lxml/html/diff.pyc
 lib/python${MODPY_VERSION}/site-packages/lxml/html/formfill.py
 lib/python${MODPY_VERSION}/site-packages/lxml/html/formfill.pyc
+lib/python${MODPY_VERSION}/site-packages/lxml/html/html5parser.py
+lib/python${MODPY_VERSION}/site-packages/lxml/html/html5parser.pyc
 lib/python${MODPY_VERSION}/site-packages/lxml/html/soupparser.py
 lib/python${MODPY_VERSION}/site-packages/lxml/html/soupparser.pyc
 lib/python${MODPY_VERSION}/site-packages/lxml/html/usedoctest.py
 lib/python${MODPY_VERSION}/site-packages/lxml/html/usedoctest.pyc
 lib/python${MODPY_VERSION}/site-packages/lxml/objectify.so
-lib/python${MODPY_VERSION}/site-packages/lxml/pyclasslookup.so
+lib/python${MODPY_VERSION}/site-packages/lxml/pyclasslookup.py
+lib/python${MODPY_VERSION}/site-packages/lxml/pyclasslookup.pyc
 lib/python${MODPY_VERSION}/site-packages/lxml/sax.py
 lib/python${MODPY_VERSION}/site-packages/lxml/sax.pyc
 lib/python${MODPY_VERSION}/site-packages/lxml/usedoctest.py
@@ -57,6 +62,7 @@
 share/doc/py-lxml/capi.txt
 share/doc/py-lxml/compatibility.txt
 share/doc/py-lxml/cssselect.txt
+share/doc/py-lxml/docstructure.py
 share/doc/py-lxml/element_classes.txt
 share/doc/py-lxml/elementsoup.txt
 share/doc/py-lxml/extensions.txt
@@ -67,18 +73,37 @@
 share/doc/py-lxml/html/api/api-objects.txt
 share/doc/py-lxml/html/api/class-tree.html
 share/doc/py-lxml/html/api/deprecated-index.html
-share/doc/py-lxml/html/api/elementtree.ElementTree-module.html
-share/doc/py-lxml/html/api/elementtree.ElementTree-pysrc.html
-share/doc/py-lxml/html/api/elementtree.ElementTree.Element-class.html
-share/doc/py-lxml/html/api/elementtree.ElementTree.ElementTree-class.html
-share/doc/py-lxml/html/api/elementtree.ElementTree.ParseError-class.html
-share/doc/py-lxml/html/api/elementtree.ElementTree.QName-class.html
-share/doc/py-lxml/html/api/elementtree.ElementTree.TreeBuilder-class.html
-share/doc/py-lxml/html/api/elementtree.ElementTree.XMLParser-class.html
 share/doc/py-lxml/html/api/epydoc.css
 share/doc/py-lxml/html/api/exceptions.AssertionError-class.html
 share/doc/py-lxml/html/api/frames.html
 share/doc/py-lxml/html/api/help.html
+share/doc/py-lxml/html/api/identifier-index-A.html
+share/doc/py-lxml/html/api/identifier-index-B.html
+share/doc/py-lxml/html/api/identifier-index-C.html
+share/doc/py-lxml/html/api/identifier-index-D.html
+share/doc/py-lxml/html/api/identifier-index-E.html
+share/doc/py-lxml/html/api/identifi

[UPDATE] misc/py-imdb to 4.6

[Todd C. Miller]

Existing version (3.6) no longer functions due to imdb changes.
I left the scripts in bin alone this time.

 - todd

Index: misc/py-imdb/Makefile
===
RCS file: /home/cvs/openbsd/ports/misc/py-imdb/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- misc/py-imdb/Makefile   30 Aug 2010 17:11:35 -  1.18
+++ misc/py-imdb/Makefile   14 Sep 2010 18:29:58 -
@@ -1,31 +1,32 @@
 # $OpenBSD: Makefile,v 1.18 2010/08/30 17:11:35 fgsch Exp $
 
-COMMENT=   Python package to retrieve data of the IMDb movie database
+COMMENT =  python package to retrieve data of the IMDb movie database
 
-MODPY_EGG_VERSION=3.6
-DISTNAME=  IMDbPY-${MODPY_EGG_VERSION}
-PKGNAME=   py-imdb-${MODPY_EGG_VERSION}
-REVISION = 3
-CATEGORIES=misc
+MODPY_EGG_VERSION = 4.6
+DISTNAME = IMDbPY-${MODPY_EGG_VERSION}
+PKGNAME =  py-imdb-${MODPY_EGG_VERSION}
+CATEGORIES =   misc
 
-HOMEPAGE=  http://imdbpy.sourceforge.net/
+HOMEPAGE = http://imdbpy.sourceforge.net/
 
-MAINTAINER=Todd C. Miller 
+MAINTAINER =   Todd C. Miller 
 
 # GPL 
-PERMIT_PACKAGE_CDROM=  Yes
-PERMIT_PACKAGE_FTP=Yes
-PERMIT_DISTFILES_CDROM= Yes
-PERMIT_DISTFILES_FTP=  Yes
+PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE_FTP =   Yes
+PERMIT_DISTFILES_CDROM = Yes
+PERMIT_DISTFILES_FTP = Yes
 
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=imdbpy/}
+MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=imdbpy/}
 
-MODULES=   lang/python
+MODULES =  lang/python
 
-NO_REGRESS=Yes
+RUN_DEPENDS =  ::textproc/py-lxml
 
-DOCSDIR=   ${PREFIX}/share/doc/py-imdb
-EXAMPLESDIR=   ${PREFIX}/share/examples/py-imdb
+NO_REGRESS =   Yes
+
+DOCSDIR =  ${PREFIX}/share/doc/py-imdb
+EXAMPLESDIR =  ${PREFIX}/share/examples/py-imdb
 
 post-install:
${INSTALL_DATA_DIR} ${DOCSDIR}
Index: misc/py-imdb/distinfo
===
RCS file: /home/cvs/openbsd/ports/misc/py-imdb/distinfo,v
retrieving revision 1.12
diff -u -r1.12 distinfo
--- misc/py-imdb/distinfo   21 Jun 2008 19:39:04 -  1.12
+++ misc/py-imdb/distinfo   14 Sep 2010 16:56:16 -
@@ -1,5 +1,5 @@
-MD5 (IMDbPY-3.6.tar.gz) = fvx+0y1V+65ZXPoapwbLxg==
-RMD160 (IMDbPY-3.6.tar.gz) = l7Se929Pi9vPIgkT65fivuBEpzA=
-SHA1 (IMDbPY-3.6.tar.gz) = xLBZYzotzwemyW6bUphrXCbPFgU=
-SHA256 (IMDbPY-3.6.tar.gz) = 5xoiffvQmIg3HcHN0uuMAFsb62rK1a0xl3O8ZyDPBGM=
-SIZE (IMDbPY-3.6.tar.gz) = 211626
+MD5 (IMDbPY-4.6.tar.gz) = h21M0EH6I2M+NjfCK/lWIg==
+RMD160 (IMDbPY-4.6.tar.gz) = 1d77NVbvfMCYiArRCngJVWWIwbg=
+SHA1 (IMDbPY-4.6.tar.gz) = asUsmPqG1aRXlH3I4w/t9eIY/6o=
+SHA256 (IMDbPY-4.6.tar.gz) = XiKHbPIr+ZNGVPQizznZjPc2z0txt3cuK+DBfhIlrY0=
+SIZE (IMDbPY-4.6.tar.gz) = 295677
Index: misc/py-imdb/patches/patch-setup_py
===
RCS file: misc/py-imdb/patches/patch-setup_py
diff -N misc/py-imdb/patches/patch-setup_py
--- misc/py-imdb/patches/patch-setup_py 25 Mar 2005 09:22:41 -  1.4
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,13 +0,0 @@
-$OpenBSD: patch-setup_py,v 1.4 2005/03/25 09:22:41 xsa Exp $
 setup.py.orig  Thu Mar 24 17:14:44 2005
-+++ setup.py   Fri Mar 25 10:10:41 2005
-@@ -19,7 +19,8 @@ from distutils.core import setup, Extens
- # interface to the web database is always available.
- DO_LOCAL = 1
- # Install some very simple example scripts.
--DO_SCRIPTS = 1
-+#DO_SCRIPTS = 1
-+DO_SCRIPTS = 0
- 
- 
- # --- NOTHING TO CONFIGURE BELOW.
Index: misc/py-imdb/pkg/PLIST
===
RCS file: /home/cvs/openbsd/ports/misc/py-imdb/pkg/PLIST,v
retrieving revision 1.10
diff -u -r1.10 PLIST
--- misc/py-imdb/pkg/PLIST  11 Oct 2009 20:52:26 -  1.10
+++ misc/py-imdb/pkg/PLIST  14 Sep 2010 17:09:19 -
@@ -1,10 +1,83 @@
 @comment $OpenBSD: PLIST,v 1.10 2009/10/11 20:52:26 jasper Exp $
-...@comment bin/characters4local.py
-...@comment bin/companies4local.py
-...@comment bin/imdbpy2sql.py
-...@comment bin/misc-companies4local.py
-...@comment bin/mpaa4local.py
-lib/python${MODPY_VERSION}/site-packages/IMDbPY-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
+bin/get_character.py
+bin/get_company.py
+bin/get_first_character.py
+bin/get_first_company.py
+bin/get_first_movie.py
+bin/get_first_person.py
+bin/get_keyword.py
+bin/get_movie.py
+bin/get_person.py
+bin/get_top_bottom_movies.py
+bin/imdbpy2sql.py
+bin/search_character.py
+bin/search_company.py
+bin/search_keyword.py
+bin/search_movie.py
+bin/search_person.py
+doc/
+doc/AUTHOR.txt
+doc/CONTRIBUTORS.txt
+doc/CREDITS.txt
+doc/Changelog.txt
+doc/DISCLAIMER.txt
+doc/FAQS.txt
+doc/GPL.txt
+doc/INSTALL.txt
+doc/LICENSE.txt
+doc/README.adult
+doc/README.companies
+doc/README.currentRole
+doc/README.devel
+doc/README.info2xml
+doc/README.keywords
+doc/README.local
+doc/README.locale
+doc/README.logging
+doc/README.mobile
+doc/README.newparsers
+doc/README.package
+doc/README.redesign
+doc

Re: [UPDATE] misc/py-imdb to 4.6

[Landry Breuil]

On Tue, Sep 14, 2010 at 02:33:36PM -0400, Todd C. Miller wrote:
> Existing version (3.6) no longer functions due to imdb changes.
> I left the scripts in bin alone this time.
> 
> +bin/get_character.py
> +bin/get_company.py
> +bin/get_first_character.py
> +bin/get_first_company.py
> +bin/get_first_movie.py
> +bin/get_first_person.py
> +bin/get_keyword.py
> +bin/get_movie.py
> +bin/get_person.py
> +bin/get_top_bottom_movies.py
> +bin/imdbpy2sql.py
> +bin/search_character.py
> +bin/search_company.py
> +bin/search_keyword.py
> +bin/search_movie.py
> +bin/search_person.py

Those are meant to be used by end users ? otherwise, i think they should
stay in share/examples/py-imdb

> +doc/

Something is wrong here. all that should go into share/doc/py-imdb if it
needs to be installed.

> +etc/
> +etc/imdbpy.cfg

Nope, that should go to share/examples and be @sampled to go to ${SYSCONFDIR}
> +imdb/
> +imdb/locale/
> +imdb/locale/en/

locales go into share/locale/

using setuptools or so should take care of most of these issues..

Landry

Re: [UPDATE] misc/py-imdb to 4.6

[Stuart Henderson]

On 2010/09/14 20:46, Landry Breuil wrote:
> On Tue, Sep 14, 2010 at 02:33:36PM -0400, Todd C. Miller wrote:
> > Existing version (3.6) no longer functions due to imdb changes.
> > I left the scripts in bin alone this time.
> > 
> > +bin/get_character.py
> > +bin/get_company.py
> > +bin/get_first_character.py
> > +bin/get_first_company.py
> > +bin/get_first_movie.py
> > +bin/get_first_person.py
> > +bin/get_keyword.py
> > +bin/get_movie.py
> > +bin/get_person.py
> > +bin/get_top_bottom_movies.py
> > +bin/imdbpy2sql.py
> > +bin/search_character.py
> > +bin/search_company.py
> > +bin/search_keyword.py
> > +bin/search_movie.py
> > +bin/search_person.py
> 
> Those are meant to be used by end users ? otherwise, i think they should
> stay in share/examples/py-imdb

yes, they are. it doesn't make sense to have basically the same files in
both bin and share/examples/py-imdb though (though the versions in
share/examples don't have the #! line patched as the ones in bin do).

> > +doc/
> 
> Something is wrong here. all that should go into share/doc/py-imdb if it
> needs to be installed.
> 
> > +etc/
> > +etc/imdbpy.cfg
> 
> Nope, that should go to share/examples and be @sampled to go to ${SYSCONFDIR}
> > +imdb/
> > +imdb/locale/
> > +imdb/locale/en/
> 
> locales go into share/locale/
> 
> using setuptools or so should take care of most of these issues..

yes, with a few patches to setup.py.  also needs MODPY_SETUPTOOLS=Yes.

UPDATE: py-lxml 2.2.8, fixes annoying python 2.6 warnings

[Stuart Henderson]

tested with py-imdb; I tried to test with py-zine but the regression
tests there appear to be broken (including with previous py-lxml).

any comments/ok?

Index: Makefile
===
RCS file: /cvs/ports/textproc/py-lxml/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile30 Aug 2010 21:47:16 -  1.5
+++ Makefile14 Sep 2010 20:02:45 -
@@ -2,10 +2,9 @@
 
 COMMENT=   Python binding for the libxml2 and libxslt libraries
 
-MODPY_EGG_VERSION= 2.0.4
+MODPY_EGG_VERSION= 2.2.8
 DISTNAME=  lxml-${MODPY_EGG_VERSION}
 PKGNAME=   py-lxml-${MODPY_EGG_VERSION}
-REVISION=  0
 CATEGORIES=textproc devel
 
 MAINTAINER=Benoit Chesneau 
@@ -32,7 +31,5 @@ MODPY_SETUPTOOLS=Yes
 post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/py-lxml
@cp -r ${WRKSRC}/doc/* ${PREFIX}/share/doc/py-lxml/
-
-NO_REGRESS=Yes
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/textproc/py-lxml/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo19 Nov 2009 13:04:23 -  1.2
+++ distinfo14 Sep 2010 20:02:45 -
@@ -1,5 +1,5 @@
-MD5 (lxml-2.0.4.tgz) = OLSbr0/6HsASiG7aOnKPIQ==
-RMD160 (lxml-2.0.4.tgz) = UVWxWGoBWJ4VJmHWXMYLbA/LAA0=
-SHA1 (lxml-2.0.4.tgz) = ZBLRtascSI1ynPd4MM5mFsPIngs=
-SHA256 (lxml-2.0.4.tgz) = XiPtFoydHEl2yqxTmNu0X9jFHpxCPgE/Vxzw4Oykp1A=
-SIZE (lxml-2.0.4.tgz) = 2012053
+MD5 (lxml-2.2.8.tgz) = 1sYS1jqE15RAkSobKdO5gQ==
+RMD160 (lxml-2.2.8.tgz) = x95NNpSMQgm+VXtDh5LffVhRu+k=
+SHA1 (lxml-2.2.8.tgz) = kBKuZ2Fg0NL/+YCwdgcITibVPac=
+SHA256 (lxml-2.2.8.tgz) = ibc5JbXjKV3PRnXLlIAHog6wKf41yaFirhnsEfGrr+U=
+SIZE (lxml-2.2.8.tgz) = 2922192
Index: pkg/PLIST
===
RCS file: /cvs/ports/textproc/py-lxml/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST   3 Jan 2009 21:34:01 -   1.2
+++ pkg/PLIST   14 Sep 2010 20:02:45 -
@@ -28,6 +28,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/lxml/html/_dictmixin.pyc
 lib/python${MODPY_VERSION}/site-packages/lxml/html/_diffcommand.py
 lib/python${MODPY_VERSION}/site-packages/lxml/html/_diffcommand.pyc
+lib/python${MODPY_VERSION}/site-packages/lxml/html/_html5builder.py
+lib/python${MODPY_VERSION}/site-packages/lxml/html/_html5builder.pyc
 lib/python${MODPY_VERSION}/site-packages/lxml/html/_setmixin.py
 lib/python${MODPY_VERSION}/site-packages/lxml/html/_setmixin.pyc
 lib/python${MODPY_VERSION}/site-packages/lxml/html/builder.py
@@ -40,12 +42,15 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/lxml/html/diff.pyc
 lib/python${MODPY_VERSION}/site-packages/lxml/html/formfill.py
 lib/python${MODPY_VERSION}/site-packages/lxml/html/formfill.pyc
+lib/python${MODPY_VERSION}/site-packages/lxml/html/html5parser.py
+lib/python${MODPY_VERSION}/site-packages/lxml/html/html5parser.pyc
 lib/python${MODPY_VERSION}/site-packages/lxml/html/soupparser.py
 lib/python${MODPY_VERSION}/site-packages/lxml/html/soupparser.pyc
 lib/python${MODPY_VERSION}/site-packages/lxml/html/usedoctest.py
 lib/python${MODPY_VERSION}/site-packages/lxml/html/usedoctest.pyc
 lib/python${MODPY_VERSION}/site-packages/lxml/objectify.so
-lib/python${MODPY_VERSION}/site-packages/lxml/pyclasslookup.so
+lib/python${MODPY_VERSION}/site-packages/lxml/pyclasslookup.py
+lib/python${MODPY_VERSION}/site-packages/lxml/pyclasslookup.pyc
 lib/python${MODPY_VERSION}/site-packages/lxml/sax.py
 lib/python${MODPY_VERSION}/site-packages/lxml/sax.pyc
 lib/python${MODPY_VERSION}/site-packages/lxml/usedoctest.py
@@ -57,6 +62,7 @@ share/doc/py-lxml/build.txt
 share/doc/py-lxml/capi.txt
 share/doc/py-lxml/compatibility.txt
 share/doc/py-lxml/cssselect.txt
+share/doc/py-lxml/docstructure.py
 share/doc/py-lxml/element_classes.txt
 share/doc/py-lxml/elementsoup.txt
 share/doc/py-lxml/extensions.txt
@@ -67,18 +73,37 @@ share/doc/py-lxml/html/api.html
 share/doc/py-lxml/html/api/api-objects.txt
 share/doc/py-lxml/html/api/class-tree.html
 share/doc/py-lxml/html/api/deprecated-index.html
-share/doc/py-lxml/html/api/elementtree.ElementTree-module.html
-share/doc/py-lxml/html/api/elementtree.ElementTree-pysrc.html
-share/doc/py-lxml/html/api/elementtree.ElementTree.Element-class.html
-share/doc/py-lxml/html/api/elementtree.ElementTree.ElementTree-class.html
-share/doc/py-lxml/html/api/elementtree.ElementTree.ParseError-class.html
-share/doc/py-lxml/html/api/elementtree.ElementTree.QName-class.html
-share/doc/py-lxml/html/api/elementtree.ElementTree.TreeBuilder-class.html
-share/doc/py-lxml/html/api/elementtree.ElementTree.XMLParser-class.html
 share/doc/py-lxml/html/api/epydoc.css
 share/doc/py-lxml/html/api/exceptions.AssertionError-class.html
 share/doc/py-lxml/html/api/frames.html
 share/doc/py-lxml/html/api/help.html
+share/doc/py-lxml/html/api/identifier-index-A.

Re: WIP: mediatomb-0.12.1

[Edd Barrett]

On Mon, Sep 13, 2010 at 10:39:02PM +0200, Markus Bergkvist wrote:
> It still ignores any signals. Might this be related?
> http://marc.info/?l=openbsd-tech&m=128398746609607&w=2

Maybe, unsure. Maybe someone >me knows?
 
> Will this remove the database on pkg_add -u too?
> @extraunexec rm -rf /var/db/mediatomb/*

Only if you use pkg_delete -c.
 
> $ diff -u Makefile.orig Makefile
> 

New tarball attached. Also adds SYSCONFDIR to message as jasper said.

-- 
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk


mediatomb-again.tgz
Description: application/tar-gz

Re: devel/mico 2.3.13 [was: any mico users?]

[Antoine Jacoutot]

On Tue, 14 Sep 2010, Landry Breuil wrote:

> On Mon, Sep 13, 2010 at 09:03:13PM +0200, Landry Breuil wrote:
> > On Mon, Sep 13, 2010 at 08:16:44PM +0200, Antoine Jacoutot wrote:
> > > On Mon, 13 Sep 2010, Jasper Lievisse Adriaanse wrote:
> > > 
> > > > hi,
> > > > 
> > > > are there any users of the devel/mico port? as it's been broken with
> > > > gcc4 for quite a while now, with nobody stepping up to fix it i think
> > > > there's not much interest in this.
> > > 
> > > An ice cream for the one who fixes mico.
> > 
> > Darn. Will give it a go then.
> 
> So here is a wip... bringing this corba stuff to 2010.
> some remarks :
> - fails to build with USE_SYSTRACE. idl tries to access dns-server:53,
>   and i didnt find how to tell systrace.filter to allow that, nor digged
> to see how this could be disabled. to be fixed.
> - regress tests can now be run. Some will fail, and one at least (./ir)
>   goes into an infinite loop here @amd64.
> - i removed all the useless commented out flavors
> - this needs of course testing on gcc3 archs where the previous version
>   still built (alpha, mips64el ?)
> - huge diffs, shitload of patches added/removed.
> 
> this will at least unbreak it...

I think you need some @pkgpath marker since you removed the ssl FLAVOR.

-- 
Antoine

Re: WIP: mediatomb-0.12.1

[Antoine Jacoutot]

On Tue, 14 Sep 2010, Edd Barrett wrote:

> On Mon, Sep 13, 2010 at 10:39:02PM +0200, Markus Bergkvist wrote:
> > It still ignores any signals. Might this be related?
> > http://marc.info/?l=openbsd-tech&m=128398746609607&w=2
> 
> Maybe, unsure. Maybe someone >me knows?
>  
> > Will this remove the database on pkg_add -u too?
> > @extraunexec rm -rf /var/db/mediatomb/*
> 
> Only if you use pkg_delete -c.
>  
> > $ diff -u Makefile.orig Makefile
> > 
> 
> New tarball attached. Also adds SYSCONFDIR to message as jasper said.

This is wrong:
To start mediatomb at boot time, place the following in 
${SYSCONFDIR}/rc.local:

rc.local will always be under /etc whatever value SYSCONFDIR is set to.

-- 
Antoine

Re: WIP: mediatomb-0.12.1

[Stuart Henderson]

On 2010/09/14 22:39, Edd Barrett wrote:
> On Mon, Sep 13, 2010 at 10:39:02PM +0200, Markus Bergkvist wrote:
> > It still ignores any signals. Might this be related?
> > http://marc.info/?l=openbsd-tech&m=128398746609607&w=2
> 
> Maybe, unsure. Maybe someone >me knows?
>  
> > Will this remove the database on pkg_add -u too?
> > @extraunexec rm -rf /var/db/mediatomb/*
> 
> Only if you use pkg_delete -c.
>  
> > $ diff -u Makefile.orig Makefile
> > 
> 
> New tarball attached. Also adds SYSCONFDIR to message as jasper said.

> # GPL

which version?

> ..files.xml..

some other /usr/local needs patching to ${TRUEPREFIX} in here

> To start mediatomb at boot time, place the following in
> ${SYSCONFDIR}/rc.local:

this should be /etc/rc.local, it's a system file (SYSCONFDIR is just
for files from ports)

> if [ -x ${TRUEPREFIX}/bin/mediatomb ] ; then
> echo -n ' mediatomb'
> su _mediatomb -c "${TRUEPREFIX}/bin/mediatomb \
> -c ${SYSCONFDIR}/mediatomb/config.xml -d"

and this is of course correct as SYSCONFDIR

> @newgroup _mediatomb:654
> @newuser _mediatomb:654:_mediatomb:daemon:Mediatomb 
> Account:/var/db/mediatomb:/bin/sh

656 now; go and reserve it in infra/db/user.list now and update it in
your tree so you don't need to fiddle with it again :-)

Re: WIP: mediatomb-0.12.1

[Robert Bronsdon]

Should rc.local check for an active network connection? Can it?

It's just mediatomb will fail to start unless it can bind itself to an  
address/port.


--
Robert Bronsdon

As-Salamu alaikum

[madame Chiwe Conte]

 Bonjour Je suis madame Chiwe Conte réfugie ivoirienne exilée depuis 2006
en Grande Bretagne. C’est après mainte recherche sur d’éventuels
partenaires dans un pays Stable politiquement, que je vous envoie ce
message. Très cher je suis très intéressée par la réalisation de certains
Projets au votre pays raison pour laquelle je vous envois ce message afin
De solliciter votre partenariat. Je voudrais si vous êtes toute fois
intéresse par une franche Collaboration me faire parvenir votre numéro de
téléphone direct et Votre affiliation afin que je puisse dans un premier
temps faire venir Mes enfants au dans votre pays pour que vous discutez
ensemble de la faisabilité De certains projets et nous informer sur tout
ce qu’il faut pour Investir dans votre pays. Merci de votre bonne
compréhensi chukwunyeree: Madame Conte

New python.port.mk diff

[Federico G. Schwindt]

  Widening the audience with updated diff:

  The first bit (posted earlier) is meant to replace ::devel/py-simplejson on
ports that use json (python >= 2.6) and fallback to simplejson otherwise, like
py-zine, py-couchdb and the upcoming py-buildbot update.
  The second bit, as the comment says, try to detect the situation when a
port will build regardless of setuptools but the plist will be different if
setuptools is present as seen in po...@.
  Comments? Suggestions? OKs?

  f.-

Index: python.port.mk
===
RCS file: /cvs/ports/lang/python/python.port.mk,v
retrieving revision 1.36
diff -u -r1.36 python.port.mk
--- python.port.mk  30 Aug 2010 16:35:02 -  1.36
+++ python.port.mk  14 Sep 2010 23:01:14 -
@@ -17,6 +17,12 @@
 .endif
 MODPYSPEC = python-${MODPY_VSPEC}
 
+.if ${MODPY_VERSION} < 2.6
+MODPY_JSON =   ::devel/py-simplejson
+.else
+MODPY_JSON =
+.endif
+
 MODPY_RUN_DEPENDS= :${MODPYSPEC}:lang/python/${MODPY_VERSION}
 MODPY_LIB_DEPENDS= 
python${MODPY_VERSION}:${MODPYSPEC}:lang/python/${MODPY_VERSION}
 _MODPY_BUILD_DEPENDS=  :${MODPYSPEC}:lang/python/${MODPY_VERSION}
@@ -31,6 +37,7 @@
 RUN_DEPENDS+=  ${MODPY_RUN_DEPENDS}
 .endif
 
+MODPY_FAKE_SETUPTOOLS = @:
 .if defined(MODPY_SETUPTOOLS) && ${MODPY_SETUPTOOLS:U} == YES
 # The setuptools module provides a package locator (site.py) that is
 # required at runtime for the pkg_resources stuff to work
@@ -39,6 +46,17 @@
 BUILD_DEPENDS+=${MODPY_SETUPUTILS_DEPEND}
 # The setuptools uses test target
 REGRESS_TARGET?=   test
+PYTHONUSERBASE =
+.else
+# Try to detect the case where a port will build regardless of setuptools
+# but the final plist will be different if it's present.
+MODPY_SETUPTOOLS_FAKE =\
+   ${WRKINST}/lib/python${MODPY_VERSION}/site-packages/setuptools
+MODPY_FAKE_SETUPTOOLS += \
+   ;mkdir -p ${MODPY_SETUPTOOLS_FAKE} \
+   ;echo "raise Exception('MODPY_SETUPTOOLS = Yes is required')" > \
+   ${MODPY_SETUPTOOLS_FAKE}/__init__.py
+PYTHONUSERBASE =   ${WRKINST}
 .endif
 
 .if !defined(NO_SHARED_LIBS) || ${NO_SHARED_LIBS:U} != YES
@@ -75,7 +93,7 @@
--root=${DESTDIR}
 .endif
 
-MAKE_ENV+= CC=${CC}
+MAKE_ENV+= CC=${CC} PYTHONUSERBASE=${PYTHONUSERBASE}
 CONFIGURE_ENV+=PYTHON="${MODPY_BIN}"
 
 _MODPY_CMD=@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
@@ -87,6 +105,7 @@
 .if empty(CONFIGURE_STYLE)
 .  if !target(do-build)
 do-build:
+   ${MODPY_FAKE_SETUPTOOLS}
${_MODPY_CMD} ${MODPY_DISTUTILS_BUILD} ${MODPY_DISTUTILS_BUILDARGS}
${MODPY_POST_BUILD_BAD_EGGS}
 .  endif

Re: New python.port.mk diff

[Federico G. Schwindt]

On Wed, Sep 15, 2010 at 12:08:56AM +0100, Federico G. Schwindt wrote:
> 
>   Widening the audience with updated diff:
> 
>   The first bit (posted earlier) is meant to replace ::devel/py-simplejson on
> ports that use json (python >= 2.6) and fallback to simplejson otherwise, like
> py-zine, py-couchdb and the upcoming py-buildbot update.
>   The second bit, as the comment says, try to detect the situation when a
> port will build regardless of setuptools but the plist will be different if
> setuptools is present as seen in po...@.
>   Comments? Suggestions? OKs?

  New version that should work better. I've renamed a few variables
for clarity as well and prefixed the message with 'OpenBSD ports:'
as suggested by st...@.

  f.-

Index: python.port.mk
===
RCS file: /cvs/ports/lang/python/python.port.mk,v
retrieving revision 1.36
diff -u -r1.36 python.port.mk
--- python.port.mk  30 Aug 2010 16:35:02 -  1.36
+++ python.port.mk  15 Sep 2010 00:11:19 -
@@ -17,6 +17,12 @@
 .endif
 MODPYSPEC = python-${MODPY_VSPEC}
 
+.if ${MODPY_VERSION} < 2.6
+MODPY_JSON =   ::devel/py-simplejson
+.else
+MODPY_JSON =
+.endif
+
 MODPY_RUN_DEPENDS= :${MODPYSPEC}:lang/python/${MODPY_VERSION}
 MODPY_LIB_DEPENDS= 
python${MODPY_VERSION}:${MODPYSPEC}:lang/python/${MODPY_VERSION}
 _MODPY_BUILD_DEPENDS=  :${MODPYSPEC}:lang/python/${MODPY_VERSION}
@@ -31,6 +37,7 @@
 RUN_DEPENDS+=  ${MODPY_RUN_DEPENDS}
 .endif
 
+MODPY_FAKE_SETUPTOOLS = @:
 .if defined(MODPY_SETUPTOOLS) && ${MODPY_SETUPTOOLS:U} == YES
 # The setuptools module provides a package locator (site.py) that is
 # required at runtime for the pkg_resources stuff to work
@@ -39,6 +46,17 @@
 BUILD_DEPENDS+=${MODPY_SETUPUTILS_DEPEND}
 # The setuptools uses test target
 REGRESS_TARGET?=   test
+_MODPY_USERBASE =
+.else
+# Try to detect the case where a port will build regardless of setuptools
+# but the final plist will be different if it's present.
+_MODPY_SETUPTOOLS_FAKE_DIR =   \
+   ${WRKINST}/lib/python${MODPY_VERSION}/site-packages/setuptools
+MODPY_FAKE_SETUPTOOLS +=   \
+   ;mkdir -p ${_MODPY_SETUPTOOLS_FAKE_DIR} \
+   ;echo "def setup(*args, **kwargs): raise Exception('OpenBSD ports: 
MODPY_SETUPTOOLS = Yes is required')\nExtension = setup" > \
+   ${_MODPY_SETUPTOOLS_FAKE_DIR}/__init__.py
+_MODPY_USERBASE =  ${WRKINST}
 .endif
 
 .if !defined(NO_SHARED_LIBS) || ${NO_SHARED_LIBS:U} != YES
@@ -75,7 +93,7 @@
--root=${DESTDIR}
 .endif
 
-MAKE_ENV+= CC=${CC}
+MAKE_ENV+= CC=${CC} PYTHONUSERBASE=${_MODPY_USERBASE}
 CONFIGURE_ENV+=PYTHON="${MODPY_BIN}"
 
 _MODPY_CMD=@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
@@ -87,6 +105,7 @@
 .if empty(CONFIGURE_STYLE)
 .  if !target(do-build)
 do-build:
+   ${MODPY_FAKE_SETUPTOOLS}
${_MODPY_CMD} ${MODPY_DISTUTILS_BUILD} ${MODPY_DISTUTILS_BUILDARGS}
${MODPY_POST_BUILD_BAD_EGGS}
 .  endif

Re: New python.port.mk diff

[Federico G. Schwindt]

On Wed, Sep 15, 2010 at 01:17:08AM +0100, Federico G. Schwindt wrote:
> On Wed, Sep 15, 2010 at 12:08:56AM +0100, Federico G. Schwindt wrote:
> > 
> >   Widening the audience with updated diff:
> > 
> >   The first bit (posted earlier) is meant to replace ::devel/py-simplejson 
> > on
> > ports that use json (python >= 2.6) and fallback to simplejson otherwise, 
> > like
> > py-zine, py-couchdb and the upcoming py-buildbot update.
> >   The second bit, as the comment says, try to detect the situation when a
> > port will build regardless of setuptools but the plist will be different if
> > setuptools is present as seen in po...@.
> >   Comments? Suggestions? OKs?
> 
>   New version that should work better. I've renamed a few variables
> for clarity as well and prefixed the message with 'OpenBSD ports:'
> as suggested by st...@.

  And hopefully the final version that covers more stuff I found. Sorry for
the spam.  If there is anything else to fake we can add it in the tree.

  f.-

Index: python.port.mk
===
RCS file: /cvs/ports/lang/python/python.port.mk,v
retrieving revision 1.36
diff -u -r1.36 python.port.mk
--- python.port.mk  30 Aug 2010 16:35:02 -  1.36
+++ python.port.mk  15 Sep 2010 00:58:04 -
@@ -17,6 +17,12 @@
 .endif
 MODPYSPEC = python-${MODPY_VSPEC}
 
+.if ${MODPY_VERSION} < 2.6
+MODPY_JSON =   ::devel/py-simplejson
+.else
+MODPY_JSON =
+.endif
+
 MODPY_RUN_DEPENDS= :${MODPYSPEC}:lang/python/${MODPY_VERSION}
 MODPY_LIB_DEPENDS= 
python${MODPY_VERSION}:${MODPYSPEC}:lang/python/${MODPY_VERSION}
 _MODPY_BUILD_DEPENDS=  :${MODPYSPEC}:lang/python/${MODPY_VERSION}
@@ -31,6 +37,7 @@
 RUN_DEPENDS+=  ${MODPY_RUN_DEPENDS}
 .endif
 
+MODPY_FAKE_SETUPTOOLS = @:
 .if defined(MODPY_SETUPTOOLS) && ${MODPY_SETUPTOOLS:U} == YES
 # The setuptools module provides a package locator (site.py) that is
 # required at runtime for the pkg_resources stuff to work
@@ -39,6 +46,20 @@
 BUILD_DEPENDS+=${MODPY_SETUPUTILS_DEPEND}
 # The setuptools uses test target
 REGRESS_TARGET?=   test
+_MODPY_USERBASE =
+.else
+# Try to detect the case where a port will build regardless of setuptools
+# but the final plist will be different if it's present.
+_MODPY_SETUPTOOLS_FAKE_DIR =   \
+   ${WRKINST}/lib/python${MODPY_VERSION}/site-packages/setuptools
+MODPY_FAKE_SETUPTOOLS +=   \
+   ;mkdir -p ${_MODPY_SETUPTOOLS_FAKE_DIR} \
+   ;exec >${_MODPY_SETUPTOOLS_FAKE_DIR}/__init__.py \
+   ;echo 'def setup(*args, **kwargs):' \
+   ;echo 'msg = "OpenBSD ports: MODPY_SETUPTOOLS = Yes is required"' \
+   ;echo 'raise Exception(msg)' \
+   ;echo 'Extension = Feature = find_packages = setup'
+_MODPY_USERBASE =  ${WRKINST}
 .endif
 
 .if !defined(NO_SHARED_LIBS) || ${NO_SHARED_LIBS:U} != YES
@@ -75,7 +96,7 @@
--root=${DESTDIR}
 .endif
 
-MAKE_ENV+= CC=${CC}
+MAKE_ENV+= CC=${CC} PYTHONUSERBASE=${_MODPY_USERBASE}
 CONFIGURE_ENV+=PYTHON="${MODPY_BIN}"
 
 _MODPY_CMD=@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
@@ -87,6 +108,7 @@
 .if empty(CONFIGURE_STYLE)
 .  if !target(do-build)
 do-build:
+   ${MODPY_FAKE_SETUPTOOLS}
${_MODPY_CMD} ${MODPY_DISTUTILS_BUILD} ${MODPY_DISTUTILS_BUILDARGS}
${MODPY_POST_BUILD_BAD_EGGS}
 .  endif

Re: UPDATE: py-lxml 2.2.8, fixes annoying python 2.6 warnings

[Ryan Boggs]

It builds fine but when I try to run a sample test, it errors out:

File "/usr/local/lib/python2.6/site-packages/lxml/html/soupparser.py" line 7,
in 
from BeautifulSoup import \
Import Error: No module named BeautifulSoup

Error can be recreated by entering
python -c "import lxml.html.soupparser"
at the command line.

I am not seeing the file in the tar ball either.

Thanks,
Ryan

On Tue, Sep 14, 2010 at 1:04 PM, Stuart Henderson  wrote:
> tested with py-imdb; I tried to test with py-zine but the regression
> tests there appear to be broken (including with previous py-lxml).
>
> any comments/ok?
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/textproc/py-lxml/Makefile,v
> retrieving revision 1.5
> diff -u -p -r1.5 Makefile
> --- Makefile    30 Aug 2010 21:47:16 -      1.5
> +++ Makefile    14 Sep 2010 20:02:45 -
> @@ -2,10 +2,9 @@
>
>  COMMENT=       Python binding for the libxml2 and libxslt libraries
>
> -MODPY_EGG_VERSION=     2.0.4
> +MODPY_EGG_VERSION=     2.2.8
>  DISTNAME=      lxml-${MODPY_EGG_VERSION}
>  PKGNAME=       py-lxml-${MODPY_EGG_VERSION}
> -REVISION=      0
>  CATEGORIES=    textproc devel
>
>  MAINTAINER=    Benoit Chesneau 
> @@ -32,7 +31,5 @@ MODPY_SETUPTOOLS=Yes
>  post-install:
>        ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/py-lxml
>       �...@cp -r ${WRKSRC}/doc/* ${PREFIX}/share/doc/py-lxml/
> -
> -NO_REGRESS=    Yes
>
>  .include 
> Index: distinfo
> ===
> RCS file: /cvs/ports/textproc/py-lxml/distinfo,v
> retrieving revision 1.2
> diff -u -p -r1.2 distinfo
> --- distinfo    19 Nov 2009 13:04:23 -      1.2
> +++ distinfo    14 Sep 2010 20:02:45 -
> @@ -1,5 +1,5 @@
> -MD5 (lxml-2.0.4.tgz) = OLSbr0/6HsASiG7aOnKPIQ==
> -RMD160 (lxml-2.0.4.tgz) = UVWxWGoBWJ4VJmHWXMYLbA/LAA0=
> -SHA1 (lxml-2.0.4.tgz) = ZBLRtascSI1ynPd4MM5mFsPIngs=
> -SHA256 (lxml-2.0.4.tgz) = XiPtFoydHEl2yqxTmNu0X9jFHpxCPgE/Vxzw4Oykp1A=
> -SIZE (lxml-2.0.4.tgz) = 2012053
> +MD5 (lxml-2.2.8.tgz) = 1sYS1jqE15RAkSobKdO5gQ==
> +RMD160 (lxml-2.2.8.tgz) = x95NNpSMQgm+VXtDh5LffVhRu+k=
> +SHA1 (lxml-2.2.8.tgz) = kBKuZ2Fg0NL/+YCwdgcITibVPac=
> +SHA256 (lxml-2.2.8.tgz) = ibc5JbXjKV3PRnXLlIAHog6wKf41yaFirhnsEfGrr+U=
> +SIZE (lxml-2.2.8.tgz) = 2922192
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/textproc/py-lxml/pkg/PLIST,v
> retrieving revision 1.2
> diff -u -p -r1.2 PLIST
> --- pkg/PLIST   3 Jan 2009 21:34:01 -       1.2
> +++ pkg/PLIST   14 Sep 2010 20:02:45 -
> @@ -28,6 +28,8 @@ lib/python${MODPY_VERSION}/site-packages
>  lib/python${MODPY_VERSION}/site-packages/lxml/html/_dictmixin.pyc
>  lib/python${MODPY_VERSION}/site-packages/lxml/html/_diffcommand.py
>  lib/python${MODPY_VERSION}/site-packages/lxml/html/_diffcommand.pyc
> +lib/python${MODPY_VERSION}/site-packages/lxml/html/_html5builder.py
> +lib/python${MODPY_VERSION}/site-packages/lxml/html/_html5builder.pyc
>  lib/python${MODPY_VERSION}/site-packages/lxml/html/_setmixin.py
>  lib/python${MODPY_VERSION}/site-packages/lxml/html/_setmixin.pyc
>  lib/python${MODPY_VERSION}/site-packages/lxml/html/builder.py
> @@ -40,12 +42,15 @@ lib/python${MODPY_VERSION}/site-packages
>  lib/python${MODPY_VERSION}/site-packages/lxml/html/diff.pyc
>  lib/python${MODPY_VERSION}/site-packages/lxml/html/formfill.py
>  lib/python${MODPY_VERSION}/site-packages/lxml/html/formfill.pyc
> +lib/python${MODPY_VERSION}/site-packages/lxml/html/html5parser.py
> +lib/python${MODPY_VERSION}/site-packages/lxml/html/html5parser.pyc
>  lib/python${MODPY_VERSION}/site-packages/lxml/html/soupparser.py
>  lib/python${MODPY_VERSION}/site-packages/lxml/html/soupparser.pyc
>  lib/python${MODPY_VERSION}/site-packages/lxml/html/usedoctest.py
>  lib/python${MODPY_VERSION}/site-packages/lxml/html/usedoctest.pyc
>  lib/python${MODPY_VERSION}/site-packages/lxml/objectify.so
> -lib/python${MODPY_VERSION}/site-packages/lxml/pyclasslookup.so
> +lib/python${MODPY_VERSION}/site-packages/lxml/pyclasslookup.py
> +lib/python${MODPY_VERSION}/site-packages/lxml/pyclasslookup.pyc
>  lib/python${MODPY_VERSION}/site-packages/lxml/sax.py
>  lib/python${MODPY_VERSION}/site-packages/lxml/sax.pyc
>  lib/python${MODPY_VERSION}/site-packages/lxml/usedoctest.py
> @@ -57,6 +62,7 @@ share/doc/py-lxml/build.txt
>  share/doc/py-lxml/capi.txt
>  share/doc/py-lxml/compatibility.txt
>  share/doc/py-lxml/cssselect.txt
> +share/doc/py-lxml/docstructure.py
>  share/doc/py-lxml/element_classes.txt
>  share/doc/py-lxml/elementsoup.txt
>  share/doc/py-lxml/extensions.txt
> @@ -67,18 +73,37 @@ share/doc/py-lxml/html/api.html
>  share/doc/py-lxml/html/api/api-objects.txt
>  share/doc/py-lxml/html/api/class-tree.html
>  share/doc/py-lxml/html/api/deprecated-index.html
> -share/doc/py-lxml/html/api/elementtree.ElementTree-module.html
> -share/doc/py-lxml/html/api/elementtree.ElementTree-pysrc.html
> -share/doc/py-lxml/html/api/elementtr

UPDATE: www/py-django 1.2.3

[Ryan Boggs]

Hi,

Attached is the diff to bring py-django to 1.2.3.  Tested on i386.

Please note, during my tests, I have been seeing an error message pop
up when shutting down the development server.  It doesn't seem to have
any impact on django since it happens during teardown but I thought I
should bring it up, just in case.  A trouble ticket has been opened at
Django as well.

Please test it out.

Thanks,
Ryan


django-123.diff
Description: Binary data

Nikah Masalarımızla Hizmetinizdeyiz

[ÖZ-GER MOBİLYA]

Ana Sayfa








  


  


Ana Sayfa 


Nikah Masası İmalatı 


Tüm Ürünler 


Haberler 


Anketler 


İletişim 
  


 
  

  

Davet ve 
Organizasyon Firmalarına, Düğün Salonlarına, Belediyelere, Çiçekçilik ve 
Düğün 
Organize işi yapan Şahıs,Firma ve kurumlara 
MÜJDE ! 
  

  
   Öncelikle 
Hayırlı Günler, işlerinizde Başarılar dileriz.

   Gelin Damat Sandalyesi, Nikah Masası, Nikah Memuru Koltuğu, ve 
Şahitler için Puf imalatı yapıyoruz.

   PTT KARGO ile adresinize teslim edilir.

   İki sefer kiralama ücretine kendi malınız olacak kadar ekonomik 
fiyata ürünlerimize sahip olabilirsiniz

   Siparişten 3 ila 7 gün içinde Ürünlerimiz Adresinize 
gönderilmektedir.

   Başarı ve Mutluluklar diliyoruz. 
  

  


  







1507 -TRABZON FOTO FON A İMALATI YAPILAN GELİN DAMAT SANDALYESİ NİKAH 
MASASI



  







25.06.2009

1508 - BURSA ELNUR SÜSLEME YE İMALATI YAPILAN GELİN DAMAT SANDALYE Sİ 
NİKAH MASASI VE ARKA FON  


  







1506 - ERZURUM YAKUTİYE BELEDİYE SİNE İMALATI YAPILAN GELİN DAMAT 
SANDALYESİ NİKAH MASASI ŞAHİTLER İÇİN PUF VE NİKAH MEMURU İÇİN JOZEFİN 
KOLTUK 







1503 - VAN DA FOTO KLAS A İMALATI YAPILAN SÜNNET TAHTI







  







1505 - MARDİN ORGANİZE YE İMALATI YAPILAN GELİN DAMAT SANDALYESİ NİKAH 
MASASI VE ARKA FON  




  
  

  







1498 - HOLLANDA SELİN ERTAŞ A YAPILAN SÜNNET TAHTI İMALATI

  











1486 - 
GELİBOLU ÖZ-GER MOBİLYA DA SÜNNET TAHTI İMALATI

  











1457 - 
ANKARA DA TASARIM ORGANİZASYONA İMALATI YAPILAN NİKAH MASASI GELİN 
DAMAT 
SANDALYESİ   











1432 - 
GELİBOLU ÖZ-GER MOBİLYA DA YAPILAN GELİN DAMAT SANDALYESİ MODELLERİ
 

  







1414 - GELİBOLU ÖZ-GER DÖŞEME DE ALMANYA YA YAPILAN GELİN-DAMAT 
SANDALYESİ NİKAH MASASI İMALATI 
  

  





27.06.2009


NİKAH MASASI İMALATI.GELİBOLU ÖZ-GER DÖŞEME DE SERCAN ORGANİZASYON 
BABAESKİ YE YAPILAN NİKAH MASASI İMALATI 





25.06.2009


GELİBOLU ÖZ-GER DÖŞEME DE ANTALYA CANSIN ORGANİZASYON A YAPILAN 
GELİN-DAMAT SANDALYESİ İMALATI 





24.06.2009


GELİBOLU ÖZ-GER DÖŞEME DE MANİSA GÖRKEM ORGANİZASYON A YAPILAN NİKAH 
MASASI TAKIMI İMALATI 





24.06.2009


GELİBOLU ÖZ-GER DÖŞEME DE MALATYA TUMRA ORGANİZASYON A YAPILAN NİKAH 
MASASI İMALATI 





24.06.2009


GELİBOLU OZ-GER DÖŞEME DE ANKARA KUTLUAY ORGANİZASYON A YAPILAN NİKAH 
MASASI İMALATI 
  

  





24.06.2009


GELİBOLU ÖZ-GER DÖŞEME DE İZMİR DENİZ ORGANİZASYON A YAPILAN NİKAH 
MASASI İMALATI 





24.06.2009


GELİBOLU ÖZ-GER DÖŞEME DE ESKİŞEHİR KAHRAMAN ORGANİZASYON A YAPILAN 
NİKAH MASASI İMALATI 





01.06.2009


GELİBOLU OZ-GER DÖŞEME DE HOLLANDA ZALENCENTRUM DEN HAAG ORGANİZASYON 
GÜLHAN BEY E YAPILAN NİKAH MASASI TAKIMI 





16.05.2009


GELİBOLU OZ-GER DÖŞEME DE BABAESKİ SERCAN ORGANİZASYONA YAPILAN NİKAH 
MASASI TAKIMI 





08.05.2009


GELİBOLU OZ-GER DÖŞEME DE KESAN GÜNAY ORGANİZASYON A YAPILAN NİKAH 
MASASI İMALATI 
  

  





04.05.2009


GELİBOLU ÖZ-GER DÖŞEME DE BURSA MUDANİYE ORGANİZASYON A YAPILAN NİKAH 
MASASI İMALATI 




29.04.2009

GELİBOLU OZ-GER DÖŞEME DE SÜLEYMAN YILDIZ A YAPILAN KOLTUK TAKIMI 





02.05.2009


GELİBOLU OZ-GER DÖŞEME DE İSTANBUL OZAN ORGANİZASYON A YAPILAN NİKAH