UPDATE www/bluefish-2.2.11

classic Classic list List threaded Threaded
7 messages Options
Reply | Threaded
Open this post in threaded view
|

UPDATE www/bluefish-2.2.11

Björn Ketelaars
Diff below brings bluefish to 2.2.11, which is a minor maintenance
release and minor feature release. Although this release supports
python3 the enclosed plugins only work on python2. As such, do not
switch to python3...for now.

Changes to the port:
- Follow Makefile.template
- Sync WANTLIB and PLIST
- Add textproc/libxml as LDEP
- Bytecompile python plugins in post-install phase

Run tested on amd64. Everything, including the plugins, seem to work.

Comments/OK?


diff --git www/bluefish/Makefile www/bluefish/Makefile
index 2d6e9ab0570..72c0dec94ac 100644
--- www/bluefish/Makefile
+++ www/bluefish/Makefile
@@ -2,27 +2,27 @@
 
 COMMENT= HTML editor for experienced web designers
 
-DISTNAME = bluefish-2.2.10
+DISTNAME= bluefish-2.2.11
+
 CATEGORIES= www editors
-HOMEPAGE= http://bluefish.openoffice.nl/
-REVISION = 6
 
-MASTER_SITES= http://www.bennewitz.com/bluefish/stable/source/
+HOMEPAGE= http://bluefish.openoffice.nl/
 
 # GPLv3
 PERMIT_PACKAGE= Yes
 
-WANTLIB += ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
-WANTLIB += Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0 atspi
-WANTLIB += c cairo cairo-gobject dbus-1 enchant epoxy expat ffi
-WANTLIB += fontconfig freetype gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
-WANTLIB += gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 gtk-3
+WANTLIB += ${COMPILER_LIBCXX} ${MODPY_WANTLIB} X11 Xcomposite Xcursor
+WANTLIB += Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0
+WANTLIB += atk-bridge-2.0 c cairo cairo-gobject enchant epoxy expat ffi
+WANTLIB += fontconfig freetype fribidi gdk-3 gdk_pixbuf-2.0 gio-2.0
+WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 gtk-3
 WANTLIB += gucharmap_2_90 harfbuzz iconv intl lzma m pango-1.0
-WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread
-WANTLIB += ${MODPY_WANTLIB} ${COMPILER_LIBCXX} util xcb xcb-render
-WANTLIB += xcb-shm xml2 z fribidi
+WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png util xcb
+WANTLIB += xcb-render xcb-shm xml2 z
 
-COMPILER = base-clang ports-gcc base-gcc
+MASTER_SITES= https://www.bennewitz.com/bluefish/stable/source/
+
+COMPILER= base-clang ports-gcc base-gcc
 
 MODULES= lang/python \
  textproc/intltool
@@ -30,14 +30,13 @@ MODULES= lang/python \
 RUN_DEPENDS= devel/desktop-file-utils \
  misc/shared-mime-info \
  x11/gtk+3,-guic
-
 LIB_DEPENDS= textproc/enchant \
+ textproc/libxml \
  x11/gnome/gucharmap
 
 CONFIGURE_STYLE= gnu
 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
  LDFLAGS="-L${LOCALBASE}/lib"
-
 CONFIGURE_ARGS= --with-freedesktop_org-menu='${PREFIX}/share/applications/' \
  --disable-update-databases
 
@@ -45,5 +44,6 @@ USE_GMAKE= Yes
 
 post-install:
  rm ${PREFIX}/lib/bluefish/*.{a,la}
+ ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py ${PREFIX}/share/bluefish
 
 .include <bsd.port.mk>
diff --git www/bluefish/distinfo www/bluefish/distinfo
index 6f1f81f2b63..7fcabbcfa41 100644
--- www/bluefish/distinfo
+++ www/bluefish/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bluefish-2.2.10.tar.gz) = BAdG2L/ZNz4nHQepaZ1kigLHcJXW7l8xPecuerSChMs=
-SIZE (bluefish-2.2.10.tar.gz) = 5522381
+SHA256 (bluefish-2.2.11.tar.gz) = XUwmNliA3r54csITmnVe5ORa10x6yhfJVUIygtFx8yg=
+SIZE (bluefish-2.2.11.tar.gz) = 5556158
diff --git www/bluefish/pkg/PLIST www/bluefish/pkg/PLIST
index 9c38dcd2382..9a0d4b538f5 100644
--- www/bluefish/pkg/PLIST
+++ www/bluefish/pkg/PLIST
@@ -1,13 +1,13 @@
 @comment $OpenBSD: PLIST,v 1.30 2018/07/01 18:33:38 espie Exp $
 @bin bin/bluefish
 lib/bluefish/
-lib/bluefish/about.so
-lib/bluefish/charmap.so
-lib/bluefish/entities.so
-lib/bluefish/htmlbar.so
-lib/bluefish/infbrowser.so
-lib/bluefish/snippets.so
-lib/bluefish/zencoding.so
+@so lib/bluefish/about.so
+@so lib/bluefish/charmap.so
+@so lib/bluefish/entities.so
+@so lib/bluefish/htmlbar.so
+@so lib/bluefish/infbrowser.so
+@so lib/bluefish/snippets.so
+@so lib/bluefish/zencoding.so
 @man man/man1/bluefish.1
 share/appdata/
 share/appdata/bluefish.appdata.xml
@@ -94,22 +94,33 @@ share/bluefish/colorprofiles/Dark_theme
 share/bluefish/colorprofiles/Light_theme
 share/bluefish/css_decompressor
 share/bluefish/cssmin.py
+share/bluefish/cssmin.pyc
 share/bluefish/default_accelmap
 share/bluefish/encodings
 share/bluefish/jsbeautifier/
 share/bluefish/jsbeautifier/__init__.py
+share/bluefish/jsbeautifier/__init__.pyc
 share/bluefish/jsbeautifier/__version__.py
+share/bluefish/jsbeautifier/__version__.pyc
 share/bluefish/jsbeautifier/unpackers/
 share/bluefish/jsbeautifier/unpackers/__init__.py
+share/bluefish/jsbeautifier/unpackers/__init__.pyc
 share/bluefish/jsbeautifier/unpackers/evalbased.py
+share/bluefish/jsbeautifier/unpackers/evalbased.pyc
 share/bluefish/jsbeautifier/unpackers/javascriptobfuscator.py
+share/bluefish/jsbeautifier/unpackers/javascriptobfuscator.pyc
 share/bluefish/jsbeautifier/unpackers/myobfuscate.py
+share/bluefish/jsbeautifier/unpackers/myobfuscate.pyc
 share/bluefish/jsbeautifier/unpackers/packer.py
+share/bluefish/jsbeautifier/unpackers/packer.pyc
 share/bluefish/jsbeautifier/unpackers/urlencode.py
+share/bluefish/jsbeautifier/unpackers/urlencode.pyc
 share/bluefish/jsbeautify
 share/bluefish/jsmin.py
+share/bluefish/jsmin.pyc
 share/bluefish/lipsum/
 share/bluefish/lipsum/__init__.py
+share/bluefish/lipsum/__init__.pyc
 share/bluefish/lipsum/data/
 share/bluefish/lipsum/data/dictionary.txt
 share/bluefish/lipsum/data/lipsum.xml
@@ -121,37 +132,65 @@ share/bluefish/plugins/htmlbar/ui/
 share/bluefish/plugins/htmlbar/ui/htmlbar_menu_ui.xml
 share/bluefish/plugins/zencoding/
 share/bluefish/plugins/zencoding/__init__.py
+share/bluefish/plugins/zencoding/__init__.pyc
 share/bluefish/plugins/zencoding/actions/
 share/bluefish/plugins/zencoding/actions/__init__.py
+share/bluefish/plugins/zencoding/actions/__init__.pyc
 share/bluefish/plugins/zencoding/actions/basic.py
+share/bluefish/plugins/zencoding/actions/basic.pyc
 share/bluefish/plugins/zencoding/actions/token.py
+share/bluefish/plugins/zencoding/actions/token.pyc
 share/bluefish/plugins/zencoding/actions/traverse.py
+share/bluefish/plugins/zencoding/actions/traverse.pyc
 share/bluefish/plugins/zencoding/filters/
 share/bluefish/plugins/zencoding/filters/__init__.py
+share/bluefish/plugins/zencoding/filters/__init__.pyc
 share/bluefish/plugins/zencoding/filters/comment.py
+share/bluefish/plugins/zencoding/filters/comment.pyc
 share/bluefish/plugins/zencoding/filters/css.py
+share/bluefish/plugins/zencoding/filters/css.pyc
 share/bluefish/plugins/zencoding/filters/escape.py
+share/bluefish/plugins/zencoding/filters/escape.pyc
 share/bluefish/plugins/zencoding/filters/format-css.py
+share/bluefish/plugins/zencoding/filters/format-css.pyc
 share/bluefish/plugins/zencoding/filters/format.py
+share/bluefish/plugins/zencoding/filters/format.pyc
 share/bluefish/plugins/zencoding/filters/haml.py
+share/bluefish/plugins/zencoding/filters/haml.pyc
 share/bluefish/plugins/zencoding/filters/html.py
+share/bluefish/plugins/zencoding/filters/html.pyc
 share/bluefish/plugins/zencoding/filters/single-line.py
+share/bluefish/plugins/zencoding/filters/single-line.pyc
 share/bluefish/plugins/zencoding/filters/trim.py
+share/bluefish/plugins/zencoding/filters/trim.pyc
 share/bluefish/plugins/zencoding/filters/xsl.py
+share/bluefish/plugins/zencoding/filters/xsl.pyc
 share/bluefish/plugins/zencoding/html_matcher.py
+share/bluefish/plugins/zencoding/html_matcher.pyc
 share/bluefish/plugins/zencoding/interface/
 share/bluefish/plugins/zencoding/interface/__init__.py
+share/bluefish/plugins/zencoding/interface/__init__.pyc
 share/bluefish/plugins/zencoding/interface/editor.py
+share/bluefish/plugins/zencoding/interface/editor.pyc
 share/bluefish/plugins/zencoding/interface/file.py
+share/bluefish/plugins/zencoding/interface/file.pyc
 share/bluefish/plugins/zencoding/parser/
 share/bluefish/plugins/zencoding/parser/__init__.py
+share/bluefish/plugins/zencoding/parser/__init__.pyc
 share/bluefish/plugins/zencoding/parser/abbreviation.py
+share/bluefish/plugins/zencoding/parser/abbreviation.pyc
 share/bluefish/plugins/zencoding/parser/css.py
+share/bluefish/plugins/zencoding/parser/css.pyc
 share/bluefish/plugins/zencoding/parser/utils.py
+share/bluefish/plugins/zencoding/parser/utils.pyc
 share/bluefish/plugins/zencoding/parser/xml.py
+share/bluefish/plugins/zencoding/parser/xml.pyc
 share/bluefish/plugins/zencoding/resources.py
+share/bluefish/plugins/zencoding/resources.pyc
 share/bluefish/plugins/zencoding/utils.py
+share/bluefish/plugins/zencoding/utils.pyc
 share/bluefish/plugins/zencoding/zen_settings.py
+share/bluefish/plugins/zencoding/zen_settings.pyc
 share/bluefish/snippets
 share/bluefish/templates/
 share/bluefish/templates/C_header

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE www/bluefish-2.2.11

Antoine Jacoutot-7
On Sun, Feb 16, 2020 at 12:36:29AM +0100, Björn Ketelaars wrote:

> Diff below brings bluefish to 2.2.11, which is a minor maintenance
> release and minor feature release. Although this release supports
> python3 the enclosed plugins only work on python2. As such, do not
> switch to python3...for now.
>
> Changes to the port:
> - Follow Makefile.template
> - Sync WANTLIB and PLIST
> - Add textproc/libxml as LDEP
> - Bytecompile python plugins in post-install phase
>
> Run tested on amd64. Everything, including the plugins, seem to work.
>
> Comments/OK?
>
>
> diff --git www/bluefish/Makefile www/bluefish/Makefile
> index 2d6e9ab0570..72c0dec94ac 100644
> --- www/bluefish/Makefile
> +++ www/bluefish/Makefile
> @@ -2,27 +2,27 @@
>  
>  COMMENT= HTML editor for experienced web designers
>  
> -DISTNAME = bluefish-2.2.10
> +DISTNAME= bluefish-2.2.11
> +
>  CATEGORIES= www editors
> -HOMEPAGE= http://bluefish.openoffice.nl/
> -REVISION = 6
>  
> -MASTER_SITES= http://www.bennewitz.com/bluefish/stable/source/
> +HOMEPAGE= http://bluefish.openoffice.nl/
>  
>  # GPLv3
>  PERMIT_PACKAGE= Yes
>  
> -WANTLIB += ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
> -WANTLIB += Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0 atspi
> -WANTLIB += c cairo cairo-gobject dbus-1 enchant epoxy expat ffi
> -WANTLIB += fontconfig freetype gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
> -WANTLIB += gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 gtk-3
> +WANTLIB += ${COMPILER_LIBCXX} ${MODPY_WANTLIB} X11 Xcomposite Xcursor
> +WANTLIB += Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0
> +WANTLIB += atk-bridge-2.0 c cairo cairo-gobject enchant epoxy expat ffi
> +WANTLIB += fontconfig freetype fribidi gdk-3 gdk_pixbuf-2.0 gio-2.0
> +WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 gtk-3
>  WANTLIB += gucharmap_2_90 harfbuzz iconv intl lzma m pango-1.0
> -WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread
> -WANTLIB += ${MODPY_WANTLIB} ${COMPILER_LIBCXX} util xcb xcb-render
> -WANTLIB += xcb-shm xml2 z fribidi
> +WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png util xcb
> +WANTLIB += xcb-render xcb-shm xml2 z
>  
> -COMPILER = base-clang ports-gcc base-gcc
> +MASTER_SITES= https://www.bennewitz.com/bluefish/stable/source/
> +
> +COMPILER= base-clang ports-gcc base-gcc
>  
>  MODULES= lang/python \
>   textproc/intltool
> @@ -30,14 +30,13 @@ MODULES= lang/python \
>  RUN_DEPENDS= devel/desktop-file-utils \
>   misc/shared-mime-info \
>   x11/gtk+3,-guic
> -
>  LIB_DEPENDS= textproc/enchant \
> + textproc/libxml \
>   x11/gnome/gucharmap

Why this change in LIB_DEPENDS?

>  
>  CONFIGURE_STYLE= gnu
>  CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
>   LDFLAGS="-L${LOCALBASE}/lib"
> -
>  CONFIGURE_ARGS= --with-freedesktop_org-menu='${PREFIX}/share/applications/' \
>   --disable-update-databases
>  
> @@ -45,5 +44,6 @@ USE_GMAKE= Yes
>  
>  post-install:
>   rm ${PREFIX}/lib/bluefish/*.{a,la}
> + ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py ${PREFIX}/share/bluefish
>  
>  .include <bsd.port.mk>
> diff --git www/bluefish/distinfo www/bluefish/distinfo
> index 6f1f81f2b63..7fcabbcfa41 100644
> --- www/bluefish/distinfo
> +++ www/bluefish/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (bluefish-2.2.10.tar.gz) = BAdG2L/ZNz4nHQepaZ1kigLHcJXW7l8xPecuerSChMs=
> -SIZE (bluefish-2.2.10.tar.gz) = 5522381
> +SHA256 (bluefish-2.2.11.tar.gz) = XUwmNliA3r54csITmnVe5ORa10x6yhfJVUIygtFx8yg=
> +SIZE (bluefish-2.2.11.tar.gz) = 5556158
> diff --git www/bluefish/pkg/PLIST www/bluefish/pkg/PLIST
> index 9c38dcd2382..9a0d4b538f5 100644
> --- www/bluefish/pkg/PLIST
> +++ www/bluefish/pkg/PLIST
> @@ -1,13 +1,13 @@
>  @comment $OpenBSD: PLIST,v 1.30 2018/07/01 18:33:38 espie Exp $
>  @bin bin/bluefish
>  lib/bluefish/
> -lib/bluefish/about.so
> -lib/bluefish/charmap.so
> -lib/bluefish/entities.so
> -lib/bluefish/htmlbar.so
> -lib/bluefish/infbrowser.so
> -lib/bluefish/snippets.so
> -lib/bluefish/zencoding.so
> +@so lib/bluefish/about.so
> +@so lib/bluefish/charmap.so
> +@so lib/bluefish/entities.so
> +@so lib/bluefish/htmlbar.so
> +@so lib/bluefish/infbrowser.so
> +@so lib/bluefish/snippets.so
> +@so lib/bluefish/zencoding.so
>  @man man/man1/bluefish.1
>  share/appdata/
>  share/appdata/bluefish.appdata.xml
> @@ -94,22 +94,33 @@ share/bluefish/colorprofiles/Dark_theme
>  share/bluefish/colorprofiles/Light_theme
>  share/bluefish/css_decompressor
>  share/bluefish/cssmin.py
> +share/bluefish/cssmin.pyc
>  share/bluefish/default_accelmap
>  share/bluefish/encodings
>  share/bluefish/jsbeautifier/
>  share/bluefish/jsbeautifier/__init__.py
> +share/bluefish/jsbeautifier/__init__.pyc
>  share/bluefish/jsbeautifier/__version__.py
> +share/bluefish/jsbeautifier/__version__.pyc
>  share/bluefish/jsbeautifier/unpackers/
>  share/bluefish/jsbeautifier/unpackers/__init__.py
> +share/bluefish/jsbeautifier/unpackers/__init__.pyc
>  share/bluefish/jsbeautifier/unpackers/evalbased.py
> +share/bluefish/jsbeautifier/unpackers/evalbased.pyc
>  share/bluefish/jsbeautifier/unpackers/javascriptobfuscator.py
> +share/bluefish/jsbeautifier/unpackers/javascriptobfuscator.pyc
>  share/bluefish/jsbeautifier/unpackers/myobfuscate.py
> +share/bluefish/jsbeautifier/unpackers/myobfuscate.pyc
>  share/bluefish/jsbeautifier/unpackers/packer.py
> +share/bluefish/jsbeautifier/unpackers/packer.pyc
>  share/bluefish/jsbeautifier/unpackers/urlencode.py
> +share/bluefish/jsbeautifier/unpackers/urlencode.pyc
>  share/bluefish/jsbeautify
>  share/bluefish/jsmin.py
> +share/bluefish/jsmin.pyc
>  share/bluefish/lipsum/
>  share/bluefish/lipsum/__init__.py
> +share/bluefish/lipsum/__init__.pyc
>  share/bluefish/lipsum/data/
>  share/bluefish/lipsum/data/dictionary.txt
>  share/bluefish/lipsum/data/lipsum.xml
> @@ -121,37 +132,65 @@ share/bluefish/plugins/htmlbar/ui/
>  share/bluefish/plugins/htmlbar/ui/htmlbar_menu_ui.xml
>  share/bluefish/plugins/zencoding/
>  share/bluefish/plugins/zencoding/__init__.py
> +share/bluefish/plugins/zencoding/__init__.pyc
>  share/bluefish/plugins/zencoding/actions/
>  share/bluefish/plugins/zencoding/actions/__init__.py
> +share/bluefish/plugins/zencoding/actions/__init__.pyc
>  share/bluefish/plugins/zencoding/actions/basic.py
> +share/bluefish/plugins/zencoding/actions/basic.pyc
>  share/bluefish/plugins/zencoding/actions/token.py
> +share/bluefish/plugins/zencoding/actions/token.pyc
>  share/bluefish/plugins/zencoding/actions/traverse.py
> +share/bluefish/plugins/zencoding/actions/traverse.pyc
>  share/bluefish/plugins/zencoding/filters/
>  share/bluefish/plugins/zencoding/filters/__init__.py
> +share/bluefish/plugins/zencoding/filters/__init__.pyc
>  share/bluefish/plugins/zencoding/filters/comment.py
> +share/bluefish/plugins/zencoding/filters/comment.pyc
>  share/bluefish/plugins/zencoding/filters/css.py
> +share/bluefish/plugins/zencoding/filters/css.pyc
>  share/bluefish/plugins/zencoding/filters/escape.py
> +share/bluefish/plugins/zencoding/filters/escape.pyc
>  share/bluefish/plugins/zencoding/filters/format-css.py
> +share/bluefish/plugins/zencoding/filters/format-css.pyc
>  share/bluefish/plugins/zencoding/filters/format.py
> +share/bluefish/plugins/zencoding/filters/format.pyc
>  share/bluefish/plugins/zencoding/filters/haml.py
> +share/bluefish/plugins/zencoding/filters/haml.pyc
>  share/bluefish/plugins/zencoding/filters/html.py
> +share/bluefish/plugins/zencoding/filters/html.pyc
>  share/bluefish/plugins/zencoding/filters/single-line.py
> +share/bluefish/plugins/zencoding/filters/single-line.pyc
>  share/bluefish/plugins/zencoding/filters/trim.py
> +share/bluefish/plugins/zencoding/filters/trim.pyc
>  share/bluefish/plugins/zencoding/filters/xsl.py
> +share/bluefish/plugins/zencoding/filters/xsl.pyc
>  share/bluefish/plugins/zencoding/html_matcher.py
> +share/bluefish/plugins/zencoding/html_matcher.pyc
>  share/bluefish/plugins/zencoding/interface/
>  share/bluefish/plugins/zencoding/interface/__init__.py
> +share/bluefish/plugins/zencoding/interface/__init__.pyc
>  share/bluefish/plugins/zencoding/interface/editor.py
> +share/bluefish/plugins/zencoding/interface/editor.pyc
>  share/bluefish/plugins/zencoding/interface/file.py
> +share/bluefish/plugins/zencoding/interface/file.pyc
>  share/bluefish/plugins/zencoding/parser/
>  share/bluefish/plugins/zencoding/parser/__init__.py
> +share/bluefish/plugins/zencoding/parser/__init__.pyc
>  share/bluefish/plugins/zencoding/parser/abbreviation.py
> +share/bluefish/plugins/zencoding/parser/abbreviation.pyc
>  share/bluefish/plugins/zencoding/parser/css.py
> +share/bluefish/plugins/zencoding/parser/css.pyc
>  share/bluefish/plugins/zencoding/parser/utils.py
> +share/bluefish/plugins/zencoding/parser/utils.pyc
>  share/bluefish/plugins/zencoding/parser/xml.py
> +share/bluefish/plugins/zencoding/parser/xml.pyc
>  share/bluefish/plugins/zencoding/resources.py
> +share/bluefish/plugins/zencoding/resources.pyc
>  share/bluefish/plugins/zencoding/utils.py
> +share/bluefish/plugins/zencoding/utils.pyc
>  share/bluefish/plugins/zencoding/zen_settings.py
> +share/bluefish/plugins/zencoding/zen_settings.pyc
>  share/bluefish/snippets
>  share/bluefish/templates/
>  share/bluefish/templates/C_header
>

--
Antoine

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE www/bluefish-2.2.11

Björn Ketelaars
On Sun 16/02/2020 11:23, Antoine Jacoutot wrote:

> On Sun, Feb 16, 2020 at 12:36:29AM +0100, Björn Ketelaars wrote:
> > Diff below brings bluefish to 2.2.11, which is a minor maintenance
> > release and minor feature release. Although this release supports
> > python3 the enclosed plugins only work on python2. As such, do not
> > switch to python3...for now.
> >
> > Changes to the port:
> > - Follow Makefile.template
> > - Sync WANTLIB and PLIST
> > - Add textproc/libxml as LDEP
> > - Bytecompile python plugins in post-install phase
> >
> > Run tested on amd64. Everything, including the plugins, seem to work.
> >
> > Comments/OK?
> >
> >
> > diff --git www/bluefish/Makefile www/bluefish/Makefile
> > index 2d6e9ab0570..72c0dec94ac 100644
> > --- www/bluefish/Makefile
> > +++ www/bluefish/Makefile
> > @@ -2,27 +2,27 @@
> >  
> >  COMMENT= HTML editor for experienced web designers
> >  
> > -DISTNAME = bluefish-2.2.10
> > +DISTNAME= bluefish-2.2.11
> > +
> >  CATEGORIES= www editors
> > -HOMEPAGE= http://bluefish.openoffice.nl/
> > -REVISION = 6
> >  
> > -MASTER_SITES= http://www.bennewitz.com/bluefish/stable/source/
> > +HOMEPAGE= http://bluefish.openoffice.nl/
> >  
> >  # GPLv3
> >  PERMIT_PACKAGE= Yes
> >  
> > -WANTLIB += ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
> > -WANTLIB += Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0 atspi
> > -WANTLIB += c cairo cairo-gobject dbus-1 enchant epoxy expat ffi
> > -WANTLIB += fontconfig freetype gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
> > -WANTLIB += gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 gtk-3
> > +WANTLIB += ${COMPILER_LIBCXX} ${MODPY_WANTLIB} X11 Xcomposite Xcursor
> > +WANTLIB += Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0
> > +WANTLIB += atk-bridge-2.0 c cairo cairo-gobject enchant epoxy expat ffi
> > +WANTLIB += fontconfig freetype fribidi gdk-3 gdk_pixbuf-2.0 gio-2.0
> > +WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 gtk-3
> >  WANTLIB += gucharmap_2_90 harfbuzz iconv intl lzma m pango-1.0
> > -WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread
> > -WANTLIB += ${MODPY_WANTLIB} ${COMPILER_LIBCXX} util xcb xcb-render
> > -WANTLIB += xcb-shm xml2 z fribidi
> > +WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png util xcb
> > +WANTLIB += xcb-render xcb-shm xml2 z
> >  
> > -COMPILER = base-clang ports-gcc base-gcc
> > +MASTER_SITES= https://www.bennewitz.com/bluefish/stable/source/
> > +
> > +COMPILER= base-clang ports-gcc base-gcc
> >  
> >  MODULES= lang/python \
> >   textproc/intltool
> > @@ -30,14 +30,13 @@ MODULES= lang/python \
> >  RUN_DEPENDS= devel/desktop-file-utils \
> >   misc/shared-mime-info \
> >   x11/gtk+3,-guic
> > -
> >  LIB_DEPENDS= textproc/enchant \
> > + textproc/libxml \
> >   x11/gnome/gucharmap
>
> Why this change in LIB_DEPENDS?

From ${WRKSRC}/INSTALL:

1) Compilation needs the following software packages - usually the headers and
   libraries (search for packages with a -dev or -devel suffix and/or prefix
   lib, e.g. libgtk2.0-dev)

     - Gtk 2 (2.20 or newer) or 3 (3.2.2) or newer
     - libxml2
     - libenchant (optional for spell checking)
     - libgucharmap (optional for character map plugin. Version 2.x is recommended)
     - python-dev (optional)

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE www/bluefish-2.2.11

Antoine Jacoutot-7
On Sun, Feb 16, 2020 at 02:19:22PM +0100, Björn Ketelaars wrote:

> On Sun 16/02/2020 11:23, Antoine Jacoutot wrote:
> > On Sun, Feb 16, 2020 at 12:36:29AM +0100, Björn Ketelaars wrote:
> > > Diff below brings bluefish to 2.2.11, which is a minor maintenance
> > > release and minor feature release. Although this release supports
> > > python3 the enclosed plugins only work on python2. As such, do not
> > > switch to python3...for now.
> > >
> > > Changes to the port:
> > > - Follow Makefile.template
> > > - Sync WANTLIB and PLIST
> > > - Add textproc/libxml as LDEP
> > > - Bytecompile python plugins in post-install phase
> > >
> > > Run tested on amd64. Everything, including the plugins, seem to work.
> > >
> > > Comments/OK?
> > >
> > >
> > > diff --git www/bluefish/Makefile www/bluefish/Makefile
> > > index 2d6e9ab0570..72c0dec94ac 100644
> > > --- www/bluefish/Makefile
> > > +++ www/bluefish/Makefile
> > > @@ -2,27 +2,27 @@
> > >  
> > >  COMMENT= HTML editor for experienced web designers
> > >  
> > > -DISTNAME = bluefish-2.2.10
> > > +DISTNAME= bluefish-2.2.11
> > > +
> > >  CATEGORIES= www editors
> > > -HOMEPAGE= http://bluefish.openoffice.nl/
> > > -REVISION = 6
> > >  
> > > -MASTER_SITES= http://www.bennewitz.com/bluefish/stable/source/
> > > +HOMEPAGE= http://bluefish.openoffice.nl/
> > >  
> > >  # GPLv3
> > >  PERMIT_PACKAGE= Yes
> > >  
> > > -WANTLIB += ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
> > > -WANTLIB += Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0 atspi
> > > -WANTLIB += c cairo cairo-gobject dbus-1 enchant epoxy expat ffi
> > > -WANTLIB += fontconfig freetype gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
> > > -WANTLIB += gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 gtk-3
> > > +WANTLIB += ${COMPILER_LIBCXX} ${MODPY_WANTLIB} X11 Xcomposite Xcursor
> > > +WANTLIB += Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0
> > > +WANTLIB += atk-bridge-2.0 c cairo cairo-gobject enchant epoxy expat ffi
> > > +WANTLIB += fontconfig freetype fribidi gdk-3 gdk_pixbuf-2.0 gio-2.0
> > > +WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 gtk-3
> > >  WANTLIB += gucharmap_2_90 harfbuzz iconv intl lzma m pango-1.0
> > > -WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread
> > > -WANTLIB += ${MODPY_WANTLIB} ${COMPILER_LIBCXX} util xcb xcb-render
> > > -WANTLIB += xcb-shm xml2 z fribidi
> > > +WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png util xcb
> > > +WANTLIB += xcb-render xcb-shm xml2 z
> > >  
> > > -COMPILER = base-clang ports-gcc base-gcc
> > > +MASTER_SITES= https://www.bennewitz.com/bluefish/stable/source/
> > > +
> > > +COMPILER= base-clang ports-gcc base-gcc
> > >  
> > >  MODULES= lang/python \
> > >   textproc/intltool
> > > @@ -30,14 +30,13 @@ MODULES= lang/python \
> > >  RUN_DEPENDS= devel/desktop-file-utils \
> > >   misc/shared-mime-info \
> > >   x11/gtk+3,-guic
> > > -
> > >  LIB_DEPENDS= textproc/enchant \
> > > + textproc/libxml \
> > >   x11/gnome/gucharmap
> >
> > Why this change in LIB_DEPENDS?
>
> From ${WRKSRC}/INSTALL:
>
> 1) Compilation needs the following software packages - usually the headers and
>    libraries (search for packages with a -dev or -devel suffix and/or prefix
>    lib, e.g. libgtk2.0-dev)
>
>      - Gtk 2 (2.20 or newer) or 3 (3.2.2) or newer
>      - libxml2
>      - libenchant (optional for spell checking)
>      - libgucharmap (optional for character map plugin. Version 2.x is recommended)
>      - python-dev (optional)

Yes but that is already satisfied by the dependency chain.
Look at WANTLIB.

If you want to explicitely set all direct depends then you are missing python
and gtk at least. And I don't recommend doing this, it makes ports work more
painful.


--
Antoine

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE www/bluefish-2.2.11

Björn Ketelaars
On Sun 16/02/2020 15:18, Antoine Jacoutot wrote:

> On Sun, Feb 16, 2020 at 02:19:22PM +0100, Björn Ketelaars wrote:
> > On Sun 16/02/2020 11:23, Antoine Jacoutot wrote:
> > > On Sun, Feb 16, 2020 at 12:36:29AM +0100, Björn Ketelaars wrote:
> > > > Diff below brings bluefish to 2.2.11, which is a minor maintenance
> > > > release and minor feature release. Although this release supports
> > > > python3 the enclosed plugins only work on python2. As such, do not
> > > > switch to python3...for now.
> > > >
> > > > Changes to the port:
> > > > - Follow Makefile.template
> > > > - Sync WANTLIB and PLIST
> > > > - Add textproc/libxml as LDEP
> > > > - Bytecompile python plugins in post-install phase
> > > >
> > > > Run tested on amd64. Everything, including the plugins, seem to work.
> > > >
> > > > Comments/OK?
> > > >
> > > >
> > > > diff --git www/bluefish/Makefile www/bluefish/Makefile
> > > > index 2d6e9ab0570..72c0dec94ac 100644
> > > > --- www/bluefish/Makefile
> > > > +++ www/bluefish/Makefile
> > > > @@ -2,27 +2,27 @@
> > > >  
> > > >  COMMENT= HTML editor for experienced web designers
> > > >  
> > > > -DISTNAME = bluefish-2.2.10
> > > > +DISTNAME= bluefish-2.2.11
> > > > +
> > > >  CATEGORIES= www editors
> > > > -HOMEPAGE= http://bluefish.openoffice.nl/
> > > > -REVISION = 6
> > > >  
> > > > -MASTER_SITES= http://www.bennewitz.com/bluefish/stable/source/
> > > > +HOMEPAGE= http://bluefish.openoffice.nl/
> > > >  
> > > >  # GPLv3
> > > >  PERMIT_PACKAGE= Yes
> > > >  
> > > > -WANTLIB += ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
> > > > -WANTLIB += Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0 atspi
> > > > -WANTLIB += c cairo cairo-gobject dbus-1 enchant epoxy expat ffi
> > > > -WANTLIB += fontconfig freetype gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
> > > > -WANTLIB += gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 gtk-3
> > > > +WANTLIB += ${COMPILER_LIBCXX} ${MODPY_WANTLIB} X11 Xcomposite Xcursor
> > > > +WANTLIB += Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0
> > > > +WANTLIB += atk-bridge-2.0 c cairo cairo-gobject enchant epoxy expat ffi
> > > > +WANTLIB += fontconfig freetype fribidi gdk-3 gdk_pixbuf-2.0 gio-2.0
> > > > +WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 gtk-3
> > > >  WANTLIB += gucharmap_2_90 harfbuzz iconv intl lzma m pango-1.0
> > > > -WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread
> > > > -WANTLIB += ${MODPY_WANTLIB} ${COMPILER_LIBCXX} util xcb xcb-render
> > > > -WANTLIB += xcb-shm xml2 z fribidi
> > > > +WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png util xcb
> > > > +WANTLIB += xcb-render xcb-shm xml2 z
> > > >  
> > > > -COMPILER = base-clang ports-gcc base-gcc
> > > > +MASTER_SITES= https://www.bennewitz.com/bluefish/stable/source/
> > > > +
> > > > +COMPILER= base-clang ports-gcc base-gcc
> > > >  
> > > >  MODULES= lang/python \
> > > >   textproc/intltool
> > > > @@ -30,14 +30,13 @@ MODULES= lang/python \
> > > >  RUN_DEPENDS= devel/desktop-file-utils \
> > > >   misc/shared-mime-info \
> > > >   x11/gtk+3,-guic
> > > > -
> > > >  LIB_DEPENDS= textproc/enchant \
> > > > + textproc/libxml \
> > > >   x11/gnome/gucharmap
> > >
> > > Why this change in LIB_DEPENDS?
> >
> > From ${WRKSRC}/INSTALL:
> >
> > 1) Compilation needs the following software packages - usually the headers and
> >    libraries (search for packages with a -dev or -devel suffix and/or prefix
> >    lib, e.g. libgtk2.0-dev)
> >
> >      - Gtk 2 (2.20 or newer) or 3 (3.2.2) or newer
> >      - libxml2
> >      - libenchant (optional for spell checking)
> >      - libgucharmap (optional for character map plugin. Version 2.x is recommended)
> >      - python-dev (optional)
>
> Yes but that is already satisfied by the dependency chain.
> Look at WANTLIB.
>
> If you want to explicitely set all direct depends then you are missing python
> and gtk at least. And I don't recommend doing this, it makes ports work more
> painful.

Yes, you are right. New diff (no additions to LDEP):


diff --git Makefile Makefile
index 2d6e9ab0570..fbab0e2cc62 100644
--- Makefile
+++ Makefile
@@ -2,27 +2,27 @@
 
 COMMENT= HTML editor for experienced web designers
 
-DISTNAME = bluefish-2.2.10
+DISTNAME= bluefish-2.2.11
+
 CATEGORIES= www editors
-HOMEPAGE= http://bluefish.openoffice.nl/
-REVISION = 6
 
-MASTER_SITES= http://www.bennewitz.com/bluefish/stable/source/
+HOMEPAGE= http://bluefish.openoffice.nl/
 
 # GPLv3
 PERMIT_PACKAGE= Yes
 
-WANTLIB += ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
-WANTLIB += Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0 atspi
-WANTLIB += c cairo cairo-gobject dbus-1 enchant epoxy expat ffi
-WANTLIB += fontconfig freetype gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
-WANTLIB += gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 gtk-3
+WANTLIB += ${COMPILER_LIBCXX} ${MODPY_WANTLIB} X11 Xcomposite Xcursor
+WANTLIB += Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0
+WANTLIB += atk-bridge-2.0 c cairo cairo-gobject enchant epoxy expat ffi
+WANTLIB += fontconfig freetype fribidi gdk-3 gdk_pixbuf-2.0 gio-2.0
+WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 gtk-3
 WANTLIB += gucharmap_2_90 harfbuzz iconv intl lzma m pango-1.0
-WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread
-WANTLIB += ${MODPY_WANTLIB} ${COMPILER_LIBCXX} util xcb xcb-render
-WANTLIB += xcb-shm xml2 z fribidi
+WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png util xcb
+WANTLIB += xcb-render xcb-shm xml2 z
 
-COMPILER = base-clang ports-gcc base-gcc
+MASTER_SITES= https://www.bennewitz.com/bluefish/stable/source/
+
+COMPILER= base-clang ports-gcc base-gcc
 
 MODULES= lang/python \
  textproc/intltool
@@ -30,14 +30,12 @@ MODULES= lang/python \
 RUN_DEPENDS= devel/desktop-file-utils \
  misc/shared-mime-info \
  x11/gtk+3,-guic
-
 LIB_DEPENDS= textproc/enchant \
  x11/gnome/gucharmap
 
 CONFIGURE_STYLE= gnu
 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
  LDFLAGS="-L${LOCALBASE}/lib"
-
 CONFIGURE_ARGS= --with-freedesktop_org-menu='${PREFIX}/share/applications/' \
  --disable-update-databases
 
@@ -45,5 +43,6 @@ USE_GMAKE= Yes
 
 post-install:
  rm ${PREFIX}/lib/bluefish/*.{a,la}
+ ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py ${PREFIX}/share/bluefish
 
 .include <bsd.port.mk>
diff --git distinfo distinfo
index 6f1f81f2b63..7fcabbcfa41 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (bluefish-2.2.10.tar.gz) = BAdG2L/ZNz4nHQepaZ1kigLHcJXW7l8xPecuerSChMs=
-SIZE (bluefish-2.2.10.tar.gz) = 5522381
+SHA256 (bluefish-2.2.11.tar.gz) = XUwmNliA3r54csITmnVe5ORa10x6yhfJVUIygtFx8yg=
+SIZE (bluefish-2.2.11.tar.gz) = 5556158
diff --git pkg/PLIST pkg/PLIST
index 9c38dcd2382..9a0d4b538f5 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -1,13 +1,13 @@
 @comment $OpenBSD: PLIST,v 1.30 2018/07/01 18:33:38 espie Exp $
 @bin bin/bluefish
 lib/bluefish/
-lib/bluefish/about.so
-lib/bluefish/charmap.so
-lib/bluefish/entities.so
-lib/bluefish/htmlbar.so
-lib/bluefish/infbrowser.so
-lib/bluefish/snippets.so
-lib/bluefish/zencoding.so
+@so lib/bluefish/about.so
+@so lib/bluefish/charmap.so
+@so lib/bluefish/entities.so
+@so lib/bluefish/htmlbar.so
+@so lib/bluefish/infbrowser.so
+@so lib/bluefish/snippets.so
+@so lib/bluefish/zencoding.so
 @man man/man1/bluefish.1
 share/appdata/
 share/appdata/bluefish.appdata.xml
@@ -94,22 +94,33 @@ share/bluefish/colorprofiles/Dark_theme
 share/bluefish/colorprofiles/Light_theme
 share/bluefish/css_decompressor
 share/bluefish/cssmin.py
+share/bluefish/cssmin.pyc
 share/bluefish/default_accelmap
 share/bluefish/encodings
 share/bluefish/jsbeautifier/
 share/bluefish/jsbeautifier/__init__.py
+share/bluefish/jsbeautifier/__init__.pyc
 share/bluefish/jsbeautifier/__version__.py
+share/bluefish/jsbeautifier/__version__.pyc
 share/bluefish/jsbeautifier/unpackers/
 share/bluefish/jsbeautifier/unpackers/__init__.py
+share/bluefish/jsbeautifier/unpackers/__init__.pyc
 share/bluefish/jsbeautifier/unpackers/evalbased.py
+share/bluefish/jsbeautifier/unpackers/evalbased.pyc
 share/bluefish/jsbeautifier/unpackers/javascriptobfuscator.py
+share/bluefish/jsbeautifier/unpackers/javascriptobfuscator.pyc
 share/bluefish/jsbeautifier/unpackers/myobfuscate.py
+share/bluefish/jsbeautifier/unpackers/myobfuscate.pyc
 share/bluefish/jsbeautifier/unpackers/packer.py
+share/bluefish/jsbeautifier/unpackers/packer.pyc
 share/bluefish/jsbeautifier/unpackers/urlencode.py
+share/bluefish/jsbeautifier/unpackers/urlencode.pyc
 share/bluefish/jsbeautify
 share/bluefish/jsmin.py
+share/bluefish/jsmin.pyc
 share/bluefish/lipsum/
 share/bluefish/lipsum/__init__.py
+share/bluefish/lipsum/__init__.pyc
 share/bluefish/lipsum/data/
 share/bluefish/lipsum/data/dictionary.txt
 share/bluefish/lipsum/data/lipsum.xml
@@ -121,37 +132,65 @@ share/bluefish/plugins/htmlbar/ui/
 share/bluefish/plugins/htmlbar/ui/htmlbar_menu_ui.xml
 share/bluefish/plugins/zencoding/
 share/bluefish/plugins/zencoding/__init__.py
+share/bluefish/plugins/zencoding/__init__.pyc
 share/bluefish/plugins/zencoding/actions/
 share/bluefish/plugins/zencoding/actions/__init__.py
+share/bluefish/plugins/zencoding/actions/__init__.pyc
 share/bluefish/plugins/zencoding/actions/basic.py
+share/bluefish/plugins/zencoding/actions/basic.pyc
 share/bluefish/plugins/zencoding/actions/token.py
+share/bluefish/plugins/zencoding/actions/token.pyc
 share/bluefish/plugins/zencoding/actions/traverse.py
+share/bluefish/plugins/zencoding/actions/traverse.pyc
 share/bluefish/plugins/zencoding/filters/
 share/bluefish/plugins/zencoding/filters/__init__.py
+share/bluefish/plugins/zencoding/filters/__init__.pyc
 share/bluefish/plugins/zencoding/filters/comment.py
+share/bluefish/plugins/zencoding/filters/comment.pyc
 share/bluefish/plugins/zencoding/filters/css.py
+share/bluefish/plugins/zencoding/filters/css.pyc
 share/bluefish/plugins/zencoding/filters/escape.py
+share/bluefish/plugins/zencoding/filters/escape.pyc
 share/bluefish/plugins/zencoding/filters/format-css.py
+share/bluefish/plugins/zencoding/filters/format-css.pyc
 share/bluefish/plugins/zencoding/filters/format.py
+share/bluefish/plugins/zencoding/filters/format.pyc
 share/bluefish/plugins/zencoding/filters/haml.py
+share/bluefish/plugins/zencoding/filters/haml.pyc
 share/bluefish/plugins/zencoding/filters/html.py
+share/bluefish/plugins/zencoding/filters/html.pyc
 share/bluefish/plugins/zencoding/filters/single-line.py
+share/bluefish/plugins/zencoding/filters/single-line.pyc
 share/bluefish/plugins/zencoding/filters/trim.py
+share/bluefish/plugins/zencoding/filters/trim.pyc
 share/bluefish/plugins/zencoding/filters/xsl.py
+share/bluefish/plugins/zencoding/filters/xsl.pyc
 share/bluefish/plugins/zencoding/html_matcher.py
+share/bluefish/plugins/zencoding/html_matcher.pyc
 share/bluefish/plugins/zencoding/interface/
 share/bluefish/plugins/zencoding/interface/__init__.py
+share/bluefish/plugins/zencoding/interface/__init__.pyc
 share/bluefish/plugins/zencoding/interface/editor.py
+share/bluefish/plugins/zencoding/interface/editor.pyc
 share/bluefish/plugins/zencoding/interface/file.py
+share/bluefish/plugins/zencoding/interface/file.pyc
 share/bluefish/plugins/zencoding/parser/
 share/bluefish/plugins/zencoding/parser/__init__.py
+share/bluefish/plugins/zencoding/parser/__init__.pyc
 share/bluefish/plugins/zencoding/parser/abbreviation.py
+share/bluefish/plugins/zencoding/parser/abbreviation.pyc
 share/bluefish/plugins/zencoding/parser/css.py
+share/bluefish/plugins/zencoding/parser/css.pyc
 share/bluefish/plugins/zencoding/parser/utils.py
+share/bluefish/plugins/zencoding/parser/utils.pyc
 share/bluefish/plugins/zencoding/parser/xml.py
+share/bluefish/plugins/zencoding/parser/xml.pyc
 share/bluefish/plugins/zencoding/resources.py
+share/bluefish/plugins/zencoding/resources.pyc
 share/bluefish/plugins/zencoding/utils.py
+share/bluefish/plugins/zencoding/utils.pyc
 share/bluefish/plugins/zencoding/zen_settings.py
+share/bluefish/plugins/zencoding/zen_settings.pyc
 share/bluefish/snippets
 share/bluefish/templates/
 share/bluefish/templates/C_header

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE www/bluefish-2.2.11

Björn Ketelaars
In reply to this post by Björn Ketelaars
On Sun 16/02/2020 00:36, Björn Ketelaars wrote:

> Diff below brings bluefish to 2.2.11, which is a minor maintenance
> release and minor feature release. Although this release supports
> python3 the enclosed plugins only work on python2. As such, do not
> switch to python3...for now.
>
> Changes to the port:
> - Follow Makefile.template
> - Sync WANTLIB and PLIST
> - Add textproc/libxml as LDEP
> - Bytecompile python plugins in post-install phase
>
> Run tested on amd64. Everything, including the plugins, seem to work.
>
> Comments/OK?

Diff (including feedback from ajacoutot@) enclosed for your convenience.


diff --git Makefile Makefile
index 2d6e9ab0570..fbab0e2cc62 100644
--- Makefile
+++ Makefile
@@ -2,27 +2,27 @@
 
 COMMENT= HTML editor for experienced web designers
 
-DISTNAME = bluefish-2.2.10
+DISTNAME= bluefish-2.2.11
+
 CATEGORIES= www editors
-HOMEPAGE= http://bluefish.openoffice.nl/
-REVISION = 6
 
-MASTER_SITES= http://www.bennewitz.com/bluefish/stable/source/
+HOMEPAGE= http://bluefish.openoffice.nl/
 
 # GPLv3
 PERMIT_PACKAGE= Yes
 
-WANTLIB += ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
-WANTLIB += Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0 atspi
-WANTLIB += c cairo cairo-gobject dbus-1 enchant epoxy expat ffi
-WANTLIB += fontconfig freetype gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
-WANTLIB += gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 gtk-3
+WANTLIB += ${COMPILER_LIBCXX} ${MODPY_WANTLIB} X11 Xcomposite Xcursor
+WANTLIB += Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0
+WANTLIB += atk-bridge-2.0 c cairo cairo-gobject enchant epoxy expat ffi
+WANTLIB += fontconfig freetype fribidi gdk-3 gdk_pixbuf-2.0 gio-2.0
+WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 gtk-3
 WANTLIB += gucharmap_2_90 harfbuzz iconv intl lzma m pango-1.0
-WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread
-WANTLIB += ${MODPY_WANTLIB} ${COMPILER_LIBCXX} util xcb xcb-render
-WANTLIB += xcb-shm xml2 z fribidi
+WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png util xcb
+WANTLIB += xcb-render xcb-shm xml2 z
 
-COMPILER = base-clang ports-gcc base-gcc
+MASTER_SITES= https://www.bennewitz.com/bluefish/stable/source/
+
+COMPILER= base-clang ports-gcc base-gcc
 
 MODULES= lang/python \
  textproc/intltool
@@ -30,14 +30,12 @@ MODULES= lang/python \
 RUN_DEPENDS= devel/desktop-file-utils \
  misc/shared-mime-info \
  x11/gtk+3,-guic
-
 LIB_DEPENDS= textproc/enchant \
  x11/gnome/gucharmap
 
 CONFIGURE_STYLE= gnu
 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
  LDFLAGS="-L${LOCALBASE}/lib"
-
 CONFIGURE_ARGS= --with-freedesktop_org-menu='${PREFIX}/share/applications/' \
  --disable-update-databases
 
@@ -45,5 +43,6 @@ USE_GMAKE= Yes
 
 post-install:
  rm ${PREFIX}/lib/bluefish/*.{a,la}
+ ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py ${PREFIX}/share/bluefish
 
 .include <bsd.port.mk>
diff --git distinfo distinfo
index 6f1f81f2b63..7fcabbcfa41 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (bluefish-2.2.10.tar.gz) = BAdG2L/ZNz4nHQepaZ1kigLHcJXW7l8xPecuerSChMs=
-SIZE (bluefish-2.2.10.tar.gz) = 5522381
+SHA256 (bluefish-2.2.11.tar.gz) = XUwmNliA3r54csITmnVe5ORa10x6yhfJVUIygtFx8yg=
+SIZE (bluefish-2.2.11.tar.gz) = 5556158
diff --git pkg/PLIST pkg/PLIST
index 9c38dcd2382..9a0d4b538f5 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -1,13 +1,13 @@
 @comment $OpenBSD: PLIST,v 1.30 2018/07/01 18:33:38 espie Exp $
 @bin bin/bluefish
 lib/bluefish/
-lib/bluefish/about.so
-lib/bluefish/charmap.so
-lib/bluefish/entities.so
-lib/bluefish/htmlbar.so
-lib/bluefish/infbrowser.so
-lib/bluefish/snippets.so
-lib/bluefish/zencoding.so
+@so lib/bluefish/about.so
+@so lib/bluefish/charmap.so
+@so lib/bluefish/entities.so
+@so lib/bluefish/htmlbar.so
+@so lib/bluefish/infbrowser.so
+@so lib/bluefish/snippets.so
+@so lib/bluefish/zencoding.so
 @man man/man1/bluefish.1
 share/appdata/
 share/appdata/bluefish.appdata.xml
@@ -94,22 +94,33 @@ share/bluefish/colorprofiles/Dark_theme
 share/bluefish/colorprofiles/Light_theme
 share/bluefish/css_decompressor
 share/bluefish/cssmin.py
+share/bluefish/cssmin.pyc
 share/bluefish/default_accelmap
 share/bluefish/encodings
 share/bluefish/jsbeautifier/
 share/bluefish/jsbeautifier/__init__.py
+share/bluefish/jsbeautifier/__init__.pyc
 share/bluefish/jsbeautifier/__version__.py
+share/bluefish/jsbeautifier/__version__.pyc
 share/bluefish/jsbeautifier/unpackers/
 share/bluefish/jsbeautifier/unpackers/__init__.py
+share/bluefish/jsbeautifier/unpackers/__init__.pyc
 share/bluefish/jsbeautifier/unpackers/evalbased.py
+share/bluefish/jsbeautifier/unpackers/evalbased.pyc
 share/bluefish/jsbeautifier/unpackers/javascriptobfuscator.py
+share/bluefish/jsbeautifier/unpackers/javascriptobfuscator.pyc
 share/bluefish/jsbeautifier/unpackers/myobfuscate.py
+share/bluefish/jsbeautifier/unpackers/myobfuscate.pyc
 share/bluefish/jsbeautifier/unpackers/packer.py
+share/bluefish/jsbeautifier/unpackers/packer.pyc
 share/bluefish/jsbeautifier/unpackers/urlencode.py
+share/bluefish/jsbeautifier/unpackers/urlencode.pyc
 share/bluefish/jsbeautify
 share/bluefish/jsmin.py
+share/bluefish/jsmin.pyc
 share/bluefish/lipsum/
 share/bluefish/lipsum/__init__.py
+share/bluefish/lipsum/__init__.pyc
 share/bluefish/lipsum/data/
 share/bluefish/lipsum/data/dictionary.txt
 share/bluefish/lipsum/data/lipsum.xml
@@ -121,37 +132,65 @@ share/bluefish/plugins/htmlbar/ui/
 share/bluefish/plugins/htmlbar/ui/htmlbar_menu_ui.xml
 share/bluefish/plugins/zencoding/
 share/bluefish/plugins/zencoding/__init__.py
+share/bluefish/plugins/zencoding/__init__.pyc
 share/bluefish/plugins/zencoding/actions/
 share/bluefish/plugins/zencoding/actions/__init__.py
+share/bluefish/plugins/zencoding/actions/__init__.pyc
 share/bluefish/plugins/zencoding/actions/basic.py
+share/bluefish/plugins/zencoding/actions/basic.pyc
 share/bluefish/plugins/zencoding/actions/token.py
+share/bluefish/plugins/zencoding/actions/token.pyc
 share/bluefish/plugins/zencoding/actions/traverse.py
+share/bluefish/plugins/zencoding/actions/traverse.pyc
 share/bluefish/plugins/zencoding/filters/
 share/bluefish/plugins/zencoding/filters/__init__.py
+share/bluefish/plugins/zencoding/filters/__init__.pyc
 share/bluefish/plugins/zencoding/filters/comment.py
+share/bluefish/plugins/zencoding/filters/comment.pyc
 share/bluefish/plugins/zencoding/filters/css.py
+share/bluefish/plugins/zencoding/filters/css.pyc
 share/bluefish/plugins/zencoding/filters/escape.py
+share/bluefish/plugins/zencoding/filters/escape.pyc
 share/bluefish/plugins/zencoding/filters/format-css.py
+share/bluefish/plugins/zencoding/filters/format-css.pyc
 share/bluefish/plugins/zencoding/filters/format.py
+share/bluefish/plugins/zencoding/filters/format.pyc
 share/bluefish/plugins/zencoding/filters/haml.py
+share/bluefish/plugins/zencoding/filters/haml.pyc
 share/bluefish/plugins/zencoding/filters/html.py
+share/bluefish/plugins/zencoding/filters/html.pyc
 share/bluefish/plugins/zencoding/filters/single-line.py
+share/bluefish/plugins/zencoding/filters/single-line.pyc
 share/bluefish/plugins/zencoding/filters/trim.py
+share/bluefish/plugins/zencoding/filters/trim.pyc
 share/bluefish/plugins/zencoding/filters/xsl.py
+share/bluefish/plugins/zencoding/filters/xsl.pyc
 share/bluefish/plugins/zencoding/html_matcher.py
+share/bluefish/plugins/zencoding/html_matcher.pyc
 share/bluefish/plugins/zencoding/interface/
 share/bluefish/plugins/zencoding/interface/__init__.py
+share/bluefish/plugins/zencoding/interface/__init__.pyc
 share/bluefish/plugins/zencoding/interface/editor.py
+share/bluefish/plugins/zencoding/interface/editor.pyc
 share/bluefish/plugins/zencoding/interface/file.py
+share/bluefish/plugins/zencoding/interface/file.pyc
 share/bluefish/plugins/zencoding/parser/
 share/bluefish/plugins/zencoding/parser/__init__.py
+share/bluefish/plugins/zencoding/parser/__init__.pyc
 share/bluefish/plugins/zencoding/parser/abbreviation.py
+share/bluefish/plugins/zencoding/parser/abbreviation.pyc
 share/bluefish/plugins/zencoding/parser/css.py
+share/bluefish/plugins/zencoding/parser/css.pyc
 share/bluefish/plugins/zencoding/parser/utils.py
+share/bluefish/plugins/zencoding/parser/utils.pyc
 share/bluefish/plugins/zencoding/parser/xml.py
+share/bluefish/plugins/zencoding/parser/xml.pyc
 share/bluefish/plugins/zencoding/resources.py
+share/bluefish/plugins/zencoding/resources.pyc
 share/bluefish/plugins/zencoding/utils.py
+share/bluefish/plugins/zencoding/utils.pyc
 share/bluefish/plugins/zencoding/zen_settings.py
+share/bluefish/plugins/zencoding/zen_settings.pyc
 share/bluefish/snippets
 share/bluefish/templates/
 share/bluefish/templates/C_header

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE www/bluefish-2.2.11

Björn Ketelaars
On Wed 26/02/2020 12:50, Bjorn Ketelaars wrote:

> On Sun 16/02/2020 00:36, Björn Ketelaars wrote:
> > Diff below brings bluefish to 2.2.11, which is a minor maintenance
> > release and minor feature release. Although this release supports
> > python3 the enclosed plugins only work on python2. As such, do not
> > switch to python3...for now.
> >
> > Changes to the port:
> > - Follow Makefile.template
> > - Sync WANTLIB and PLIST
> > - Add textproc/libxml as LDEP
> > - Bytecompile python plugins in post-install phase
> >
> > Run tested on amd64. Everything, including the plugins, seem to work.
> >
> > Comments/OK?
>
> Ping

Ping

Diff enclosed for your convenience.


diff --git Makefile Makefile
index 2d6e9ab0570..fbab0e2cc62 100644
--- Makefile
+++ Makefile
@@ -2,27 +2,27 @@
 
 COMMENT= HTML editor for experienced web designers
 
-DISTNAME = bluefish-2.2.10
+DISTNAME= bluefish-2.2.11
+
 CATEGORIES= www editors
-HOMEPAGE= http://bluefish.openoffice.nl/
-REVISION = 6
 
-MASTER_SITES= http://www.bennewitz.com/bluefish/stable/source/
+HOMEPAGE= http://bluefish.openoffice.nl/
 
 # GPLv3
 PERMIT_PACKAGE= Yes
 
-WANTLIB += ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
-WANTLIB += Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0 atspi
-WANTLIB += c cairo cairo-gobject dbus-1 enchant epoxy expat ffi
-WANTLIB += fontconfig freetype gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
-WANTLIB += gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 gtk-3
+WANTLIB += ${COMPILER_LIBCXX} ${MODPY_WANTLIB} X11 Xcomposite Xcursor
+WANTLIB += Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0
+WANTLIB += atk-bridge-2.0 c cairo cairo-gobject enchant epoxy expat ffi
+WANTLIB += fontconfig freetype fribidi gdk-3 gdk_pixbuf-2.0 gio-2.0
+WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 gtk-3
 WANTLIB += gucharmap_2_90 harfbuzz iconv intl lzma m pango-1.0
-WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread
-WANTLIB += ${MODPY_WANTLIB} ${COMPILER_LIBCXX} util xcb xcb-render
-WANTLIB += xcb-shm xml2 z fribidi
+WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png util xcb
+WANTLIB += xcb-render xcb-shm xml2 z
 
-COMPILER = base-clang ports-gcc base-gcc
+MASTER_SITES= https://www.bennewitz.com/bluefish/stable/source/
+
+COMPILER= base-clang ports-gcc base-gcc
 
 MODULES= lang/python \
  textproc/intltool
@@ -30,14 +30,12 @@ MODULES= lang/python \
 RUN_DEPENDS= devel/desktop-file-utils \
  misc/shared-mime-info \
  x11/gtk+3,-guic
-
 LIB_DEPENDS= textproc/enchant \
  x11/gnome/gucharmap
 
 CONFIGURE_STYLE= gnu
 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
  LDFLAGS="-L${LOCALBASE}/lib"
-
 CONFIGURE_ARGS= --with-freedesktop_org-menu='${PREFIX}/share/applications/' \
  --disable-update-databases
 
@@ -45,5 +43,6 @@ USE_GMAKE= Yes
 
 post-install:
  rm ${PREFIX}/lib/bluefish/*.{a,la}
+ ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py ${PREFIX}/share/bluefish
 
 .include <bsd.port.mk>
diff --git distinfo distinfo
index 6f1f81f2b63..7fcabbcfa41 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (bluefish-2.2.10.tar.gz) = BAdG2L/ZNz4nHQepaZ1kigLHcJXW7l8xPecuerSChMs=
-SIZE (bluefish-2.2.10.tar.gz) = 5522381
+SHA256 (bluefish-2.2.11.tar.gz) = XUwmNliA3r54csITmnVe5ORa10x6yhfJVUIygtFx8yg=
+SIZE (bluefish-2.2.11.tar.gz) = 5556158
diff --git pkg/PLIST pkg/PLIST
index 9c38dcd2382..9a0d4b538f5 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -1,13 +1,13 @@
 @comment $OpenBSD: PLIST,v 1.30 2018/07/01 18:33:38 espie Exp $
 @bin bin/bluefish
 lib/bluefish/
-lib/bluefish/about.so
-lib/bluefish/charmap.so
-lib/bluefish/entities.so
-lib/bluefish/htmlbar.so
-lib/bluefish/infbrowser.so
-lib/bluefish/snippets.so
-lib/bluefish/zencoding.so
+@so lib/bluefish/about.so
+@so lib/bluefish/charmap.so
+@so lib/bluefish/entities.so
+@so lib/bluefish/htmlbar.so
+@so lib/bluefish/infbrowser.so
+@so lib/bluefish/snippets.so
+@so lib/bluefish/zencoding.so
 @man man/man1/bluefish.1
 share/appdata/
 share/appdata/bluefish.appdata.xml
@@ -94,22 +94,33 @@ share/bluefish/colorprofiles/Dark_theme
 share/bluefish/colorprofiles/Light_theme
 share/bluefish/css_decompressor
 share/bluefish/cssmin.py
+share/bluefish/cssmin.pyc
 share/bluefish/default_accelmap
 share/bluefish/encodings
 share/bluefish/jsbeautifier/
 share/bluefish/jsbeautifier/__init__.py
+share/bluefish/jsbeautifier/__init__.pyc
 share/bluefish/jsbeautifier/__version__.py
+share/bluefish/jsbeautifier/__version__.pyc
 share/bluefish/jsbeautifier/unpackers/
 share/bluefish/jsbeautifier/unpackers/__init__.py
+share/bluefish/jsbeautifier/unpackers/__init__.pyc
 share/bluefish/jsbeautifier/unpackers/evalbased.py
+share/bluefish/jsbeautifier/unpackers/evalbased.pyc
 share/bluefish/jsbeautifier/unpackers/javascriptobfuscator.py
+share/bluefish/jsbeautifier/unpackers/javascriptobfuscator.pyc
 share/bluefish/jsbeautifier/unpackers/myobfuscate.py
+share/bluefish/jsbeautifier/unpackers/myobfuscate.pyc
 share/bluefish/jsbeautifier/unpackers/packer.py
+share/bluefish/jsbeautifier/unpackers/packer.pyc
 share/bluefish/jsbeautifier/unpackers/urlencode.py
+share/bluefish/jsbeautifier/unpackers/urlencode.pyc
 share/bluefish/jsbeautify
 share/bluefish/jsmin.py
+share/bluefish/jsmin.pyc
 share/bluefish/lipsum/
 share/bluefish/lipsum/__init__.py
+share/bluefish/lipsum/__init__.pyc
 share/bluefish/lipsum/data/
 share/bluefish/lipsum/data/dictionary.txt
 share/bluefish/lipsum/data/lipsum.xml
@@ -121,37 +132,65 @@ share/bluefish/plugins/htmlbar/ui/
 share/bluefish/plugins/htmlbar/ui/htmlbar_menu_ui.xml
 share/bluefish/plugins/zencoding/
 share/bluefish/plugins/zencoding/__init__.py
+share/bluefish/plugins/zencoding/__init__.pyc
 share/bluefish/plugins/zencoding/actions/
 share/bluefish/plugins/zencoding/actions/__init__.py
+share/bluefish/plugins/zencoding/actions/__init__.pyc
 share/bluefish/plugins/zencoding/actions/basic.py
+share/bluefish/plugins/zencoding/actions/basic.pyc
 share/bluefish/plugins/zencoding/actions/token.py
+share/bluefish/plugins/zencoding/actions/token.pyc
 share/bluefish/plugins/zencoding/actions/traverse.py
+share/bluefish/plugins/zencoding/actions/traverse.pyc
 share/bluefish/plugins/zencoding/filters/
 share/bluefish/plugins/zencoding/filters/__init__.py
+share/bluefish/plugins/zencoding/filters/__init__.pyc
 share/bluefish/plugins/zencoding/filters/comment.py
+share/bluefish/plugins/zencoding/filters/comment.pyc
 share/bluefish/plugins/zencoding/filters/css.py
+share/bluefish/plugins/zencoding/filters/css.pyc
 share/bluefish/plugins/zencoding/filters/escape.py
+share/bluefish/plugins/zencoding/filters/escape.pyc
 share/bluefish/plugins/zencoding/filters/format-css.py
+share/bluefish/plugins/zencoding/filters/format-css.pyc
 share/bluefish/plugins/zencoding/filters/format.py
+share/bluefish/plugins/zencoding/filters/format.pyc
 share/bluefish/plugins/zencoding/filters/haml.py
+share/bluefish/plugins/zencoding/filters/haml.pyc
 share/bluefish/plugins/zencoding/filters/html.py
+share/bluefish/plugins/zencoding/filters/html.pyc
 share/bluefish/plugins/zencoding/filters/single-line.py
+share/bluefish/plugins/zencoding/filters/single-line.pyc
 share/bluefish/plugins/zencoding/filters/trim.py
+share/bluefish/plugins/zencoding/filters/trim.pyc
 share/bluefish/plugins/zencoding/filters/xsl.py
+share/bluefish/plugins/zencoding/filters/xsl.pyc
 share/bluefish/plugins/zencoding/html_matcher.py
+share/bluefish/plugins/zencoding/html_matcher.pyc
 share/bluefish/plugins/zencoding/interface/
 share/bluefish/plugins/zencoding/interface/__init__.py
+share/bluefish/plugins/zencoding/interface/__init__.pyc
 share/bluefish/plugins/zencoding/interface/editor.py
+share/bluefish/plugins/zencoding/interface/editor.pyc
 share/bluefish/plugins/zencoding/interface/file.py
+share/bluefish/plugins/zencoding/interface/file.pyc
 share/bluefish/plugins/zencoding/parser/
 share/bluefish/plugins/zencoding/parser/__init__.py
+share/bluefish/plugins/zencoding/parser/__init__.pyc
 share/bluefish/plugins/zencoding/parser/abbreviation.py
+share/bluefish/plugins/zencoding/parser/abbreviation.pyc
 share/bluefish/plugins/zencoding/parser/css.py
+share/bluefish/plugins/zencoding/parser/css.pyc
 share/bluefish/plugins/zencoding/parser/utils.py
+share/bluefish/plugins/zencoding/parser/utils.pyc
 share/bluefish/plugins/zencoding/parser/xml.py
+share/bluefish/plugins/zencoding/parser/xml.pyc
 share/bluefish/plugins/zencoding/resources.py
+share/bluefish/plugins/zencoding/resources.pyc
 share/bluefish/plugins/zencoding/utils.py
+share/bluefish/plugins/zencoding/utils.pyc
 share/bluefish/plugins/zencoding/zen_settings.py
+share/bluefish/plugins/zencoding/zen_settings.pyc
 share/bluefish/snippets
 share/bluefish/templates/
 share/bluefish/templates/C_header