summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--devel/libpeas/Makefile30
-rw-r--r--devel/libpeas/distinfo4
-rw-r--r--devel/libpeas/pkg-plist24
3 files changed, 22 insertions, 36 deletions
diff --git a/devel/libpeas/Makefile b/devel/libpeas/Makefile
index 0c23289c6..edbf86a3e 100644
--- a/devel/libpeas/Makefile
+++ b/devel/libpeas/Makefile
@@ -3,7 +3,7 @@
# $MCom$
PORTNAME= libpeas
-PORTVERSION= 1.10.0
+PORTVERSION= 1.10.1
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -22,30 +22,16 @@ GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
-CONFIGURE_ARGS+=--disable-glade-catalog
+CONFIGURE_ARGS+=--disable-glade-catalog \
+ --disable-python2
+OPTIONS_SUB= yes
OPTIONS_DEFINE= PYTHON SEED
OPTIONS_DEFAULT=PYTHON SEED
SEED_DESC= JavaScript support based on webkit-gtk3
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MSEED}
-CONFIGURE_ARGS+=--enable-seed=yes
-LIB_DEPENDS= libseed-gtk3.so:${PORTSDIR}/devel/seed
-PLIST_SUB+= SEED=""
-.else
-CONFIGURE_ARGS+=--enable-seed=no
-PLIST_SUB+= SEED="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MPYTHON}
-CONFIGURE_ARGS+=--disable-python2 --enable-python3
-USE_GNOME+= py3gobject3
-PLIST_SUB+= PYTHONS=""
-.else
-CONFIGURE_ARGS+=--disable-python2 --disable-python3
-PLIST_SUB+= PYTHONS="@comment "
-.endif
+SEED_LIB_DEPENDS= libseed-gtk3.so:${PORTSDIR}/devel/seed
+SEED_CONFIGURE_ENABLE= seed
+PYTHON_USE= GNOME=py3gobject3
+PYTHON_CONFIGURE_ENABLE= python3
.include <bsd.port.mk>
diff --git a/devel/libpeas/distinfo b/devel/libpeas/distinfo
index c5b9e0de1..a1f2460be 100644
--- a/devel/libpeas/distinfo
+++ b/devel/libpeas/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/libpeas-1.10.0.tar.xz) = 4695bc40e4885a903dbc5ce6a3704392feae63af51fd4da7a3888bb88ca78c47
-SIZE (gnome3/libpeas-1.10.0.tar.xz) = 507084
+SHA256 (gnome3/libpeas-1.10.1.tar.xz) = ba9fb1ff0b1bf6921b10fcd9d89d3995713e11a3e373f6852278699d03d2571d
+SIZE (gnome3/libpeas-1.10.1.tar.xz) = 512052
diff --git a/devel/libpeas/pkg-plist b/devel/libpeas/pkg-plist
index 8d3e4aecb..e2306a16d 100644
--- a/devel/libpeas/pkg-plist
+++ b/devel/libpeas/pkg-plist
@@ -16,22 +16,22 @@ lib/girepository-1.0/PeasGtk-1.0.typelib
lib/libpeas-1.0.la
lib/libpeas-1.0.so
lib/libpeas-1.0.so.0
-lib/libpeas-1.0.so.0.1000.0
-%%PYTHONS%%lib/libpeas-1.0/loaders/libpython3loader.la
-%%PYTHONS%%lib/libpeas-1.0/loaders/libpython3loader.so
+lib/libpeas-1.0.so.0.1001.0
+%%PYTHON%%lib/libpeas-1.0/loaders/libpython3loader.la
+%%PYTHON%%lib/libpeas-1.0/loaders/libpython3loader.so
%%SEED%%lib/libpeas-1.0/loaders/libseedloader.la
%%SEED%%lib/libpeas-1.0/loaders/libseedloader.so
lib/libpeas-gtk-1.0.la
lib/libpeas-gtk-1.0.so
lib/libpeas-gtk-1.0.so.0
-lib/libpeas-gtk-1.0.so.0.1000.0
+lib/libpeas-gtk-1.0.so.0.1001.0
lib/peas-demo/plugins/helloworld/helloworld.plugin
lib/peas-demo/plugins/helloworld/libhelloworld.la
lib/peas-demo/plugins/helloworld/libhelloworld.so
-%%PYTHONS%%lib/peas-demo/plugins/pythonhello/__pycache__/pythonhello.cpython-33.pyc
-%%PYTHONS%%lib/peas-demo/plugins/pythonhello/__pycache__/pythonhello.cpython-33.pyo
-%%PYTHONS%%lib/peas-demo/plugins/pythonhello/pythonhello.plugin
-%%PYTHONS%%lib/peas-demo/plugins/pythonhello/pythonhello.py
+%%PYTHON%%lib/peas-demo/plugins/pythonhello/__pycache__/pythonhello.cpython-33.pyc
+%%PYTHON%%lib/peas-demo/plugins/pythonhello/__pycache__/pythonhello.cpython-33.pyo
+%%PYTHON%%lib/peas-demo/plugins/pythonhello/pythonhello.plugin
+%%PYTHON%%lib/peas-demo/plugins/pythonhello/pythonhello.py
lib/peas-demo/plugins/secondtime/libsecondtime.la
lib/peas-demo/plugins/secondtime/libsecondtime.so
lib/peas-demo/plugins/secondtime/secondtime.plugin
@@ -161,14 +161,14 @@ share/locale/zh_TW/LC_MESSAGES/libpeas.mo
@dirrmtry share/locale/an
@dirrm share/gtk-doc/html/libpeas
%%SEED%%@dirrm lib/peas-demo/plugins/seedhello
-@dirrm lib/peas-demo/plugins/pythonhello/__pycache__
-@dirrm lib/peas-demo/plugins/pythonhello
+%%PYTHON%%@dirrm lib/peas-demo/plugins/pythonhello/__pycache__
+%%PYTHON%%@dirrm lib/peas-demo/plugins/pythonhello
@dirrm lib/peas-demo/plugins/secondtime
@dirrm lib/peas-demo/plugins/helloworld
@dirrm lib/peas-demo/plugins
@dirrm lib/peas-demo
-@dirrm lib/libpeas-1.0/loaders
-@dirrm lib/libpeas-1.0
+%%PYTHON%%@dirrm lib/libpeas-1.0/loaders
+%%PYTHON%%@dirrm lib/libpeas-1.0
@dirrm include/libpeas-1.0/libpeas-gtk
@dirrm include/libpeas-1.0/libpeas
@dirrm include/libpeas-1.0