- Add gtk2 to BUILD_DEPENDS to fix build on a clean box (spotted by

jasper@)
- Add xfdesktop to REGRESS_DEPENDS & the corresponding blurb regarding
interactive regress tests.
- Add a patch to make regress tests correctly link with -pthread.
- Backport a fix to libxfce4menu-0.1.pc from svn to correct reality.
ok jasper@
This commit is contained in:
landry 2009-04-09 07:44:37 +00:00
parent 57bf19f15a
commit fe4e303d22
3 changed files with 48 additions and 1 deletions

View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.1.1.1 2009/03/08 17:05:33 landry Exp $
# $OpenBSD: Makefile,v 1.2 2009/04/09 07:44:37 landry Exp $
COMMENT= freedesktop.org compliant menu implementation for Xfce4
XFCE_PROJECT= libxfce4menu
PKGNAME= ${DISTNAME}p0
SHARED_LIBS += xfce4menu-0.1 0.0
@ -19,4 +20,15 @@ MODULES = x11/xfce4
LIB_DEPENDS = xfce4util::x11/xfce4/libxfce4util
WANTLIB = glib-2.0 gobject-2.0 gthread-2.0 pcre
BUILD_DEPENDS = ::x11/gtk+2
# regress tests needs the menu file provided by xfdesktop
REGRESS_DEPENDS = ::x11/xfce4/xfdesktop
# The regression tests require a running instance of X.
# You will also need to set the XAUTHORITY environment variable to point
# to the appropriate .Xauthority file.
REGRESS_IS_INTERACTIVE = Yes
REGRESS_FLAGS = DISPLAY=${DISPLAY} XAUTHORITY=${XAUTHORITY}
.include <bsd.port.mk>

View File

@ -0,0 +1,23 @@
$OpenBSD: patch-configure,v 1.1 2009/04/09 07:44:37 landry Exp $
--- configure.orig Wed Apr 8 12:04:27 2009
+++ configure Wed Apr 8 12:04:49 2009
@@ -17499,19 +17499,6 @@ echo "${ECHO_T}$enable_debug" >&6; }
fi
fi
-{ echo "$as_me:$LINENO: checking whether $LD accepts --as-needed" >&5
-echo $ECHO_N "checking whether $LD accepts --as-needed... $ECHO_C" >&6; }
-case `$LD --as-needed -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
- LDFLAGS="$LDFLAGS -Wl,--as-needed"
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
- ;;
-*)
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- ;;
-esac
{ echo "$as_me:$LINENO: checking whether $LD accepts -O1" >&5
echo $ECHO_N "checking whether $LD accepts -O1... $ECHO_C" >&6; }
case `$LD -O1 -v 2>&1 </dev/null` in

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-libxfce4menu_libxfce4menu-0_1_pc_in,v 1.1 2009/04/09 07:44:37 landry Exp $
--- libxfce4menu/libxfce4menu-0.1.pc.in.orig Thu Apr 9 09:09:33 2009
+++ libxfce4menu/libxfce4menu-0.1.pc.in Thu Apr 9 09:10:26 2009
@@ -7,7 +7,7 @@ libxfce4menu_api_version=@LIBXFCE4MENU_VERSION_API@
Name: @PACKAGE_TARNAME@
Description: Freedesktop.org compliant menu library
-Requires: gtk+-2.0 libxfce4util-1.0
+Requires: glib-2.0 gthread-2.0 libxfce4util-1.0
Version: @PACKAGE_VERSION@
Libs: -L${libdir} -lxfce4menu-${libxfce4menu_api_version}
Cflags: -I${includedir}/xfce4/libxfce4menu-${libxfce4menu_api_version}