aboutsummaryrefslogtreecommitdiff
path: root/x11/metisse
diff options
context:
space:
mode:
authorPav Lucistnik <pav@FreeBSD.org>2009-02-10 18:50:51 +0000
committerPav Lucistnik <pav@FreeBSD.org>2009-02-10 18:50:51 +0000
commit13d064e1edee109e9f272aed891dc9f4205f049d (patch)
tree5c5cbf7d73b3fc04344ea568adfd3e7b32bb6658 /x11/metisse
parent18b6e288bcee442cb25fe8ffde2bd473f54eee53 (diff)
downloadports-13d064e1edee109e9f272aed891dc9f4205f049d.tar.gz
ports-13d064e1edee109e9f272aed891dc9f4205f049d.zip
Notes
Diffstat (limited to 'x11/metisse')
-rw-r--r--x11/metisse/Makefile14
-rw-r--r--x11/metisse/pkg-plist12
2 files changed, 8 insertions, 18 deletions
diff --git a/x11/metisse/Makefile b/x11/metisse/Makefile
index f8e7ceba6f3d..c6054118bc75 100644
--- a/x11/metisse/Makefile
+++ b/x11/metisse/Makefile
@@ -7,7 +7,7 @@
PORTNAME= metisse
DISTVERSION= 0.4.0-rc4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MASTER_SITES= http://insitu.lri.fr/metisse/download/latest/ \
http://freebsd.nsu.ru/distfiles/metisse/
@@ -29,13 +29,13 @@ CONFIGURE_ARGS= --with-fontdir=${LOCALBASE}/lib/X11/fonts
MAKE_ARGS= METISSE_DOC_DIR="${DOCSDIR}"
USE_GETTEXT= yes
USE_LDCONFIG= yes
+USE_PYTHON= yes
USE_XORG= xrender
WANT_GNOME= yes
OPTIONS= MMX "Enable MMX optimizations" on \
GLX "Enable GLX extension" on \
GLX_X86 "GLX with x86 optimizations" on \
- PYTHON "Build with Python bits and pieces" off \
SPI "Enable widget tracking support" off \
STROKE "Enable support for mouse gestures" off \
RPLAY "Enable RPlay support in FvwmEvent" off \
@@ -58,16 +58,6 @@ CONFIGURE_ARGS+= --enable-glx
CONFIGURE_ARGS+= --enable-glx-x86
.endif
-.if defined(WITH_PYTHON)
-USE_PYTHON= yes
-# Since USE_PYTHON is defined after including <bsd.port.pre.mk>,
-# get required python-related framework bits manually.
-.include "${PORTSDIR}/Mk/bsd.python.mk"
-PLIST_SUB+= PYTHON=""
-.else
-PLIST_SUB+= PYTHON="@comment "
-.endif
-
.if defined(WITH_SPI)
USE_GNOME= atspi
.endif
diff --git a/x11/metisse/pkg-plist b/x11/metisse/pkg-plist
index 26a5a84a9947..05dfe7c7f30e 100644
--- a/x11/metisse/pkg-plist
+++ b/x11/metisse/pkg-plist
@@ -13,9 +13,9 @@ bin/fvwm-perllib
bin/fvwm-root
bin/fvwmi
bin/fvwmi-config
-%%PYTHON%%bin/metisse-combo2radio
-%%PYTHON%%bin/metisse-combo2radio-edit
-%%PYTHON%%bin/metisse-demo-address-app
+bin/metisse-combo2radio
+bin/metisse-combo2radio-edit
+bin/metisse-demo-address-app
bin/metisse-dummy-win
bin/metisse-start-fvwm
bin/metisse-xlib
@@ -23,9 +23,9 @@ bin/opale-start-fvwmi
include/libmetisse/auth.h
include/libmetisse/proto.h
@dirrm include/libmetisse
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/facade_setup.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/facade_setup.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/facade_setup.pyo
+%%PYTHON_SITELIBDIR%%/facade_setup.py
+%%PYTHON_SITELIBDIR%%/facade_setup.pyc
+%%PYTHON_SITELIBDIR%%/facade_setup.pyo
lib/libmetisse.a
lib/libmetisse.la
%%FBSD6%%lib/libmetisse.so