On archs where webkit doesn't run (say, sparc64), give gmpc-plugins a

chance to build by disabling wikipedia plugin from the build.
While here, patch configure to fix a bunch of typos, already fixed in
upcoming 0.19.
This commit is contained in:
landry 2009-09-08 21:56:34 +00:00
parent a546d0987e
commit 8da9512ab5
2 changed files with 40 additions and 3 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.7 2009/08/10 06:29:52 kili Exp $
# $OpenBSD: Makefile,v 1.8 2009/09/08 21:56:34 landry Exp $
SHARED_ONLY = Yes
@ -7,7 +7,7 @@ COMMENT-wikipedia = wikipedia plugin for gmpc
VERSION = 0.18.0
DISTNAME = gmpc-plugins-${VERSION}
PKGNAME-main = ${DISTNAME}p3
PKGNAME-main = ${DISTNAME}p4
PKGNAME-wikipedia = gmpc-wikipedia-${VERSION}p1
CATEGORIES = audio
@ -29,6 +29,8 @@ MULTI_PACKAGES = -main
${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "amd64"
# XXX give it a chance to build on systems where webkit is not built
MULTI_PACKAGES+= -wikipedia
.else
CONFIGURE_ARGS+= --disable-wikipedia
.endif
MODULES = devel/gettext
@ -64,7 +66,7 @@ USE_X11 = Yes
USE_GMAKE = Yes
CONFIGURE_STYLE =gnu
CONFIGURE_ARGS =--disable-mserver \
CONFIGURE_ARGS+=--disable-mserver \
--disable-libnotify \
--disable-lirc

View File

@ -0,0 +1,35 @@
$OpenBSD: patch-configure,v 1.1 2009/09/08 21:56:34 landry Exp $
--- configure.orig Tue Sep 8 23:23:48 2009
+++ configure Tue Sep 8 23:25:32 2009
@@ -3926,11 +3926,11 @@ fi
if test "$enable_tagedit" = yes; then
- WIKIPEDIA_OPT_TRUE=
- WIKIPEDIA_OPT_FALSE='#'
+ TAGEDIT_OPT_TRUE=
+ TAGEDIT_OPT_FALSE='#'
else
- WIKIPEDIA_OPT_TRUE='#'
- WIKIPEDIA_OPT_FALSE=
+ TAGEDIT_OPT_TRUE='#'
+ TAGEDIT_OPT_FALSE=
fi
if test x${enable_tagedit} = xyes; then
@@ -3959,11 +3959,11 @@ fi
if test "$enable_wikipedia" = yes; then
- TAGEDIT_OPT_TRUE=
- TAGEDIT_OPT_FALSE='#'
+ WIKIPEDIA_OPT_TRUE=
+ WIKIPEDIA_OPT_FALSE='#'
else
- TAGEDIT_OPT_TRUE='#'
- TAGEDIT_OPT_FALSE=
+ WIKIPEDIA_OPT_TRUE='#'
+ WIKIPEDIA_OPT_FALSE=
fi
if test x${enable_wikipedia} = xyes; then