- this needs bash (for now)

- unfuck the gconftool-2 calls in PLIST by moving them where they belong
- fix WANTLIB and regen PLIST while here

ok jasper@
This commit is contained in:
ajacoutot 2008-11-19 17:35:52 +00:00
parent 4b8d0cb2f8
commit 81c229d4c8
4 changed files with 20 additions and 50 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.3 2008/11/19 16:24:54 jasper Exp $
# $OpenBSD: Makefile,v 1.4 2008/11/19 17:35:52 ajacoutot Exp $
COMMENT= desktop note-taking application written in C\#
GNOME_PROJECT= tomboy
GNOME_VERSION= 0.12.1
PKGNAME= ${DISTNAME}p1
PKGNAME= ${DISTNAME}p2
CATEGORIES= x11
# LGPLv2.1
@ -13,7 +13,9 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MODULES= x11/gnome lang/mono devel/gettext
MODULES= x11/gnome \
lang/mono \
devel/gettext
USE_X11= Yes
DESKTOP_FILES= Yes
@ -25,7 +27,7 @@ WANTLIB= ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
gdk_pixbuf-2.0 glib-2.0 glitz gmodule-2.0 gnomecanvas-2 \
gnomeprint-2-2 gnomeprintui-2-2 gobject-2.0 gtk-x11-2.0 \
m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 \
png xml2 z
png xml2 z gio-2.0
BUILD_DEPENDS= ${RUN_DEPENDS}
RUN_DEPENDS= ::lang/mono \
@ -34,7 +36,10 @@ RUN_DEPENDS= ::lang/mono \
::x11/gnome/mono-gnome \
:shared-mime-info->=0.21:misc/shared-mime-info \
:scrollkeeper-*:textproc/scrollkeeper \
:gnome-icon-theme->=2.18.0:x11/gnome/icon-theme
: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
@ -46,4 +51,7 @@ 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.1.1.1 2008/10/17 07:16:15 robert Exp $
$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
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
+#!${LOCALBASE}/bin/bash
export LD_LIBRARY_PATH="@pkglibdir@${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}"
export MONO_PATH=$MONO_PATH:@pkglibdir@:@pkglibdir@/addins

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-Tomboy_tomboy_in,v 1.1.1.1 2008/10/17 07:16:15 robert Exp $
$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
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
+#!${LOCALBASE}/bin/bash
if [ "x$PWD" = "x@srcdir@" ] ; then
echo "*** Running uninstalled @target@ ***"

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2008/10/17 07:16:15 robert Exp $
@comment $OpenBSD: PLIST,v 1.2 2008/11/19 17:35:52 ajacoutot Exp $
bin/tomboy
bin/tomboy-panel
lib/bonobo/
@ -44,8 +44,6 @@ share/applications/tomboy.desktop
share/dbus-1/
share/dbus-1/services/
share/dbus-1/services/org.gnome.Tomboy.service
share/gnome/
share/gnome/help/
share/gnome/help/tomboy/
share/gnome/help/tomboy/C/
share/gnome/help/tomboy/C/figures/
@ -320,7 +318,6 @@ share/gnome/help/tomboy/uk/figures/tomboy-preferences-synchronization.png
share/gnome/help/tomboy/uk/figures/tomboy-tools.png
share/gnome/help/tomboy/uk/legal.xml
share/gnome/help/tomboy/uk/tomboy.xml
share/icons/hicolor/
share/icons/hicolor/16x16/
share/icons/hicolor/16x16/apps/
share/icons/hicolor/16x16/apps/tomboy.png
@ -339,8 +336,6 @@ share/icons/hicolor/48x48/apps/tomboy.png
share/icons/hicolor/scalable/
share/icons/hicolor/scalable/apps/
share/icons/hicolor/scalable/apps/tomboy.svg
share/locale/ar/
share/locale/ar/LC_MESSAGES/
share/locale/ar/LC_MESSAGES/tomboy.mo
share/locale/as/
share/locale/as/LC_MESSAGES/
@ -348,22 +343,14 @@ share/locale/as/LC_MESSAGES/tomboy.mo
share/locale/be/LC_MESSAGES/tomboy.mo
share/locale/be@latin/LC_MESSAGES/tomboy.mo
share/locale/bg/LC_MESSAGES/tomboy.mo
share/locale/bn/
share/locale/bn/LC_MESSAGES/
share/locale/bn/LC_MESSAGES/tomboy.mo
share/locale/bn_IN/
share/locale/bn_IN/LC_MESSAGES/
share/locale/bn_IN/LC_MESSAGES/tomboy.mo
share/locale/ca/LC_MESSAGES/tomboy.mo
share/locale/cs/LC_MESSAGES/tomboy.mo
share/locale/da/LC_MESSAGES/tomboy.mo
share/locale/de/LC_MESSAGES/tomboy.mo
share/locale/dz/
share/locale/dz/LC_MESSAGES/
share/locale/dz/LC_MESSAGES/tomboy.mo
share/locale/el/LC_MESSAGES/tomboy.mo
share/locale/en_CA/
share/locale/en_CA/LC_MESSAGES/
share/locale/en_CA/LC_MESSAGES/tomboy.mo
share/locale/en_GB/LC_MESSAGES/tomboy.mo
share/locale/es/LC_MESSAGES/tomboy.mo
@ -372,52 +359,32 @@ share/locale/eu/LC_MESSAGES/tomboy.mo
share/locale/fi/LC_MESSAGES/tomboy.mo
share/locale/fr/LC_MESSAGES/tomboy.mo
share/locale/gl/LC_MESSAGES/tomboy.mo
share/locale/gu/
share/locale/gu/LC_MESSAGES/
share/locale/gu/LC_MESSAGES/tomboy.mo
share/locale/he/LC_MESSAGES/tomboy.mo
share/locale/hi/
share/locale/hi/LC_MESSAGES/
share/locale/hi/LC_MESSAGES/tomboy.mo
share/locale/hu/LC_MESSAGES/tomboy.mo
share/locale/is/
share/locale/is/LC_MESSAGES/
share/locale/is/LC_MESSAGES/tomboy.mo
share/locale/it/LC_MESSAGES/tomboy.mo
share/locale/ja/LC_MESSAGES/tomboy.mo
share/locale/kn/LC_MESSAGES/tomboy.mo
share/locale/ko/LC_MESSAGES/tomboy.mo
share/locale/ku/
share/locale/ku/LC_MESSAGES/
share/locale/ku/LC_MESSAGES/tomboy.mo
share/locale/lt/LC_MESSAGES/tomboy.mo
share/locale/lv/LC_MESSAGES/tomboy.mo
share/locale/mai/
share/locale/mai/LC_MESSAGES/
share/locale/mai/LC_MESSAGES/tomboy.mo
share/locale/mk/
share/locale/mk/LC_MESSAGES/
share/locale/mk/LC_MESSAGES/tomboy.mo
share/locale/ml/
share/locale/ml/LC_MESSAGES/
share/locale/ml/LC_MESSAGES/tomboy.mo
share/locale/mr/
share/locale/mr/LC_MESSAGES/
share/locale/mr/LC_MESSAGES/tomboy.mo
share/locale/nb/LC_MESSAGES/tomboy.mo
share/locale/ne/
share/locale/ne/LC_MESSAGES/
share/locale/ne/LC_MESSAGES/tomboy.mo
share/locale/nl/LC_MESSAGES/tomboy.mo
share/locale/nn/LC_MESSAGES/tomboy.mo
share/locale/oc/
share/locale/oc/LC_MESSAGES/
share/locale/oc/LC_MESSAGES/tomboy.mo
share/locale/or/
share/locale/or/LC_MESSAGES/
share/locale/or/LC_MESSAGES/tomboy.mo
share/locale/pa/
share/locale/pa/LC_MESSAGES/
share/locale/pa/LC_MESSAGES/tomboy.mo
share/locale/pl/LC_MESSAGES/tomboy.mo
share/locale/pt/LC_MESSAGES/tomboy.mo
@ -436,14 +403,10 @@ share/locale/sr@latin/
share/locale/sr@latin/LC_MESSAGES/
share/locale/sr@latin/LC_MESSAGES/tomboy.mo
share/locale/sv/LC_MESSAGES/tomboy.mo
share/locale/ta/
share/locale/ta/LC_MESSAGES/
share/locale/ta/LC_MESSAGES/tomboy.mo
share/locale/te/
share/locale/te/LC_MESSAGES/
share/locale/te/LC_MESSAGES/tomboy.mo
share/locale/th/
share/locale/th/LC_MESSAGES/
share/locale/th/LC_MESSAGES/tomboy.mo
share/locale/tr/LC_MESSAGES/tomboy.mo
share/locale/uk/LC_MESSAGES/tomboy.mo
@ -465,9 +428,10 @@ share/omf/tomboy/tomboy-pt_BR.omf
share/omf/tomboy/tomboy-ru.omf
share/omf/tomboy/tomboy-sv.omf
share/omf/tomboy/tomboy-uk.omf
share/schemas/
@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/share/schemas/tomboy/*.schemas > /dev/null
share/schemas/tomboy/
share/schemas/tomboy/tomboy.schemas
@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/share/schemas/tomboy/*.schemas > /dev/null
share/tomboy/
share/tomboy/icons/
share/tomboy/icons/hicolor/
@ -506,8 +470,6 @@ share/tomboy/icons/hicolor/48x48/actions/notebook-new.png
share/tomboy/icons/hicolor/scalable/
share/tomboy/icons/hicolor/scalable/actions/
share/tomboy/icons/hicolor/scalable/actions/notebook-new.svg
@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/share/schemas/tomboy/*.schemas > /dev/null
@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/share/schemas/tomboy/*.schemas > /dev/null
@exec %D/bin/scrollkeeper-update -q
@unexec %D/bin/scrollkeeper-update -q
@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor