On Sun, Apr 28, 2013 at 11:05:52AM -0300, Gonzalo L. R. wrote: > I'm gonna commit this tomorrow morning if no one objects
Iirc the order of the @exec/@unexec for gconf around the schema file stuff has an importance. Make sure it doesnt change, then its ok for me. Landry > From: "Gonzalo L. R." <gonz...@x61.com.ar> > To: ports@openbsd.org > Date: Mon, 15 Apr 2013 17:07:25 -0300 > Subject: Re: UPDATE: Comix-4.0.4 > > err, a better diff. > > On Mon, Apr 15, 2013 at 05:00:45PM -0300, Gonzalo L. R. wrote: > ; Hi, > ; > ; Update for Comix to 4.0.4: > ; > ; * Applied a workaround for a bug that caused the "Open" dialog to > ; crash when trying to open a file when the file type filter had been > ; reset to blank. This bug seems to only appear on some systems, > ; probably depending on the installed GTK+ version. > ; * Fixed a bug that caused the error message for unfulfilled > ; dependencies to not be printed properly. > ; * The rar/unrar program is now invoked in such a way as to keep > ; broken or incomplete files extracted from RAR archives, since Comix > ; might be able to display parts of these files anyway. > ; > ; Ok? Comments? > ; > ; Cheers.- > ; > ; -- > ; Sending from my iFart... > > ; Index: Makefile > ; =================================================================== > ; RCS file: /cvs/ports/graphics/comix/Makefile,v > ; retrieving revision 1.31 > ; diff -u -p -r1.31 Makefile > ; --- Makefile 2 Apr 2013 17:26:34 -0000 1.31 > ; +++ Makefile 15 Apr 2013 19:56:43 -0000 > ; @@ -2,8 +2,7 @@ > ; > ; COMMENT= gtk2 comic book viewer > ; > ; -DISTNAME= comix-4.0.3 > ; -REVISION= 13 > ; +DISTNAME= comix-4.0.4 > ; > ; CATEGORIES= graphics > ; > ; Index: distinfo > ; =================================================================== > ; RCS file: /cvs/ports/graphics/comix/distinfo,v > ; retrieving revision 1.5 > ; diff -u -p -r1.5 distinfo > ; --- distinfo 15 Apr 2009 08:26:28 -0000 1.5 > ; +++ distinfo 15 Apr 2013 19:56:43 -0000 > ; @@ -1,5 +1,2 @@ > ; -MD5 (comix-4.0.3.tar.gz) = 5b16zv45UML9r4eF7dJ7fg== > ; -RMD160 (comix-4.0.3.tar.gz) = EYRlAiF2LgG/j/3ngY1Sj+956bY= > ; -SHA1 (comix-4.0.3.tar.gz) = I0PFkS5P+AdLA7zvlndQuxp58qQ= > ; -SHA256 (comix-4.0.3.tar.gz) = XEaKlUUuDBBnUIvJyntX/InIG2CslH0NQoxxTorMQvo= > ; -SIZE (comix-4.0.3.tar.gz) = 468112 > ; +SHA256 (comix-4.0.4.tar.gz) = k1IWnehWlXoW3naGf719xxFkjt+6x852GRtV5fbNVGo= > ; +SIZE (comix-4.0.4.tar.gz) = 481687 > ; Index: patches/patch-src_comix_py > ; =================================================================== > ; RCS file: /cvs/ports/graphics/comix/patches/patch-src_comix_py,v > ; retrieving revision 1.2 > ; diff -u -p -r1.2 patch-src_comix_py > ; --- patches/patch-src_comix_py 15 Apr 2009 08:26:28 -0000 1.2 > ; +++ patches/patch-src_comix_py 15 Apr 2013 19:56:43 -0000 > ; @@ -2,8 +2,8 @@ $OpenBSD: patch-src_comix_py,v 1.2 2009/ > ; > ; point python to where comix modules are installed > ; > ; ---- src/comix.py.orig Sun Feb 22 16:50:40 2009 > ; -+++ src/comix.py Tue Apr 7 20:35:05 2009 > ; +--- src/comix.py.orig Fri Mar 6 14:54:01 2009 > ; ++++ src/comix.py Mon Apr 15 16:27:28 2013 > ; @@ -1,4 +1,4 @@ > ; -#!/usr/bin/env python > ; +#!${MODPY_BIN} > ; @@ -18,5 +18,5 @@ point python to where comix modules are > ; +# add path for comix python modules > ; +sys.path.insert(0, '${PREFIX}/share/comix/src') > ; > ; - import constants > ; - import deprecated > ; + #Check for PyGTK and PIL dependencies. > ; + try: > ; Index: pkg/PLIST > ; =================================================================== > ; RCS file: /cvs/ports/graphics/comix/pkg/PLIST,v > ; retrieving revision 1.13 > ; diff -u -p -r1.13 PLIST > ; --- pkg/PLIST 6 Feb 2013 14:23:06 -0000 1.13 > ; +++ pkg/PLIST 15 Apr 2013 19:56:43 -0000 > ; @@ -133,9 +133,9 @@ share/locale/sv/LC_MESSAGES/comix.mo > ; share/locale/zh_CN/LC_MESSAGES/comix.mo > ; share/locale/zh_TW/LC_MESSAGES/comix.mo > ; share/mime/packages/comix.xml > ; -@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` > %D/bin/gconftool-2 --makefile-uninstall-rule %D/${SCHEMAS_INSTDIR}/*.schemas > >/dev/null 2>&1 > ; ${SCHEMAS_INSTDIR}/ > ; ${SCHEMAS_INSTDIR}/comicbook.schemas > ; +@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` > %D/bin/gconftool-2 --makefile-uninstall-rule %D/${SCHEMAS_INSTDIR}/*.schemas > >/dev/null 2>&1 > ; @exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` > %D/bin/gconftool-2 --makefile-install-rule %D/share/schemas/comix/*.schemas > >/dev/null 2>&1 > ; @exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor > ; @unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor > > > -- > Sending from my iFart... > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/graphics/comix/Makefile,v > retrieving revision 1.31 > diff -u -p -r1.31 Makefile > --- Makefile 2 Apr 2013 17:26:34 -0000 1.31 > +++ Makefile 15 Apr 2013 20:06:43 -0000 > @@ -2,10 +2,11 @@ > > COMMENT= gtk2 comic book viewer > > -DISTNAME= comix-4.0.3 > -REVISION= 13 > +DISTNAME= comix-4.0.4 > > CATEGORIES= graphics > + > +HOMEPAGE= http://comix.sourceforge.net/ > > # GPLv2 > PERMIT_PACKAGE_CDROM= Yes > Index: distinfo > =================================================================== > RCS file: /cvs/ports/graphics/comix/distinfo,v > retrieving revision 1.5 > diff -u -p -r1.5 distinfo > --- distinfo 15 Apr 2009 08:26:28 -0000 1.5 > +++ distinfo 15 Apr 2013 20:06:43 -0000 > @@ -1,5 +1,2 @@ > -MD5 (comix-4.0.3.tar.gz) = 5b16zv45UML9r4eF7dJ7fg== > -RMD160 (comix-4.0.3.tar.gz) = EYRlAiF2LgG/j/3ngY1Sj+956bY= > -SHA1 (comix-4.0.3.tar.gz) = I0PFkS5P+AdLA7zvlndQuxp58qQ= > -SHA256 (comix-4.0.3.tar.gz) = XEaKlUUuDBBnUIvJyntX/InIG2CslH0NQoxxTorMQvo= > -SIZE (comix-4.0.3.tar.gz) = 468112 > +SHA256 (comix-4.0.4.tar.gz) = k1IWnehWlXoW3naGf719xxFkjt+6x852GRtV5fbNVGo= > +SIZE (comix-4.0.4.tar.gz) = 481687 > Index: patches/patch-src_comix_py > =================================================================== > RCS file: /cvs/ports/graphics/comix/patches/patch-src_comix_py,v > retrieving revision 1.2 > diff -u -p -r1.2 patch-src_comix_py > --- patches/patch-src_comix_py 15 Apr 2009 08:26:28 -0000 1.2 > +++ patches/patch-src_comix_py 15 Apr 2013 20:06:43 -0000 > @@ -2,8 +2,8 @@ $OpenBSD: patch-src_comix_py,v 1.2 2009/ > > point python to where comix modules are installed > > ---- src/comix.py.orig Sun Feb 22 16:50:40 2009 > -+++ src/comix.py Tue Apr 7 20:35:05 2009 > +--- src/comix.py.orig Fri Mar 6 14:54:01 2009 > ++++ src/comix.py Mon Apr 15 16:27:28 2013 > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python > +#!${MODPY_BIN} > @@ -18,5 +18,5 @@ point python to where comix modules are > +# add path for comix python modules > +sys.path.insert(0, '${PREFIX}/share/comix/src') > > - import constants > - import deprecated > + #Check for PyGTK and PIL dependencies. > + try: > > > ----- End forwarded message ----- > > -- > Sending from my iFart... >