....and get rid of the bashism by using echo(1) and cut(1)

also add a missing build dependency (from mr. frog aka ajacoutot)

ok ajacoutot@
This commit is contained in:
jasper 2008-11-19 22:22:14 +00:00
parent 1dcee94da4
commit 18a7a89331
3 changed files with 34 additions and 17 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.4 2008/11/19 17:35:52 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.5 2008/11/19 22:22:14 jasper Exp $
COMMENT= desktop note-taking application written in C\#
GNOME_PROJECT= tomboy
GNOME_VERSION= 0.12.1
PKGNAME= ${DISTNAME}p2
PKGNAME= ${DISTNAME}p3
CATEGORIES= x11
# LGPLv2.1
@ -29,7 +29,8 @@ WANTLIB= ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 \
png xml2 z gio-2.0
BUILD_DEPENDS= ${RUN_DEPENDS}
BUILD_DEPENDS= ::x11/gnome/doc-utils
${RUN_DEPENDS}
RUN_DEPENDS= ::lang/mono \
::devel/mono-addins \
::sysutils/ndesk-dbus-glib \
@ -38,9 +39,6 @@ RUN_DEPENDS= ::lang/mono \
:scrollkeeper-*:textproc/scrollkeeper \
:gnome-icon-theme->=2.18.0:x11/gnome/icon-theme \
# XXX `tomboy --search` fails with bad substitution when using /bin/sh
RUN_DEPENDS+= ::shells/bash
CONFIGURE_ARGS= --disable-schemas-install \
--with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/tomboy
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
@ -51,7 +49,4 @@ DLLMAP_FILES= Tomboy/Tomboy.exe.config
post-patch:
@ln -s /usr/bin/true ${WRKDIR}/bin/scrollkeeper-update
pre-configure:
${SUBST_CMD} ${WRKSRC}/Tomboy/{tomboy-panel.in,tomboy.in}
.include <bsd.port.mk>

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-Tomboy_tomboy-panel_in,v 1.2 2008/11/19 17:35:52 ajacoutot Exp $
--- Tomboy/tomboy-panel.in.orig Fri Oct 17 08:28:52 2008
+++ Tomboy/tomboy-panel.in Fri Oct 17 08:29:18 2008
$OpenBSD: patch-Tomboy_tomboy-panel_in,v 1.3 2008/11/19 22:22:14 jasper Exp $
--- Tomboy/tomboy-panel.in.orig Wed Nov 19 19:24:51 2008
+++ Tomboy/tomboy-panel.in Wed Nov 19 19:25:30 2008
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!${LOCALBASE}/bin/bash
+#!/bin/sh
export LD_LIBRARY_PATH="@pkglibdir@${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}"
export MONO_PATH=$MONO_PATH:@pkglibdir@:@pkglibdir@/addins

View File

@ -1,9 +1,31 @@
$OpenBSD: patch-Tomboy_tomboy_in,v 1.2 2008/11/19 17:35:52 ajacoutot Exp $
--- Tomboy/tomboy.in.orig Fri Oct 17 08:28:46 2008
+++ Tomboy/tomboy.in Fri Oct 17 08:29:02 2008
$OpenBSD: patch-Tomboy_tomboy_in,v 1.3 2008/11/19 22:22:14 jasper Exp $
Remove bashism.
--- Tomboy/tomboy.in.orig Wed Nov 19 19:23:03 2008
+++ Tomboy/tomboy.in Wed Nov 19 19:23:44 2008
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!${LOCALBASE}/bin/bash
+#!/bin/sh
if [ "x$PWD" = "x@srcdir@" ] ; then
echo "*** Running uninstalled @target@ ***"
@@ -20,15 +20,15 @@ else
[ -n "$TOMBOY_PROFILE" ] && TOMBOY_PROFILE="--profile=$TOMBOY_PROFILE"
for arg in $*; do
- case "x--debug" in ("x$arg")
+ case "x--debug" in ("x`echo $arg`")
TOMBOY_DEBUG=$arg
esac
- case "x--trace=" in ("x${arg:0:8}")
+ case "x--trace=" in ("x`echo $arg | cut -c1-8`")
TOMBOY_TRACE=$arg
esac
- case "x--profile=" in ("x${arg:0:10}")
+ case "x--profile=" in ("x`echo $arg | cut -c1-10`")
TOMBOY_PROFILE=$arg
esac
done