cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix icons installation and add missing gtk-update-icon-cache goo.

Browse Source 
Fix CONFIGURE_ARGS.

Bring some patches from FreeBSD:
* use gmake
* use exuberant ctags
Fix depends accordinly.
This commit is contained in:
ajacoutot 2010-03-29 07:44:28 +00:00
parent 37121aebbb
commit 76641108a5
6 changed files with 121 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
devel/monodevelop/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.2 2010/03/22 22:38:25 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.3 2010/03/29 07:44:28 ajacoutot Exp $
COMMENT= IDE for the .NET platform
DISTNAME= monodevelop-2.2.2
PKGNAME= ${DISTNAME}p0
PKGNAME= ${DISTNAME}p1
CATEGORIES= devel lang
MASTER_SITES= http://ftp.novell.com/pub/mono/sources/monodevelop/
EXTRACT_SUFX= .tar.bz2
@ -23,12 +23,17 @@ RUN_DEPENDS= :desktop-file-utils-*:devel/desktop-file-utils \
:shared-mime-info->=0.21:misc/shared-mime-info \
::devel/mono-addins \
::shells/bash \
::x11/gnome/mono-gnome
::x11/gnome/mono-gnome \
::devel/ectags
# see patches/patch-src_addins_MonoDevelop_Autotools_SolutionDeployer_cs
RUN_DEPENDS+= ::devel/gmake
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS= --disable-update-mimedb \
--enable-aspnet \
--enable-aspnetedit
--disable-update-desktopdb \
--enable-subversion \
--enable-gnomeplatform
DLLMAP_FILES= src/core/Mono.Texteditor/Mono.TextEditor.PopupWindow/TooltipWindow.cs \
src/core/MonoDevelop.Projects/MonoDevelop.Projects.dll.config \
@ -48,5 +53,6 @@ pre-configure:
for i in ${BASH_SCRIPTS}; do \
perl -pi -e 's,/bin/bash,${LOCALBASE}/bin/bash,' ${WRKSRC}/$${i}; \
done
${SUBST_CMD} ${WRKSRC}/theme-icons/icon-theme-installer
.include <bsd.port.mk>

12
devel/monodevelop/patches/patch-src_addins_CBinding_Navigation_ProjectNodeBuilderExtension_cs Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_addins_CBinding_Navigation_ProjectNodeBuilderExtension_cs,v 1.1 2010/03/29 07:44:28 ajacoutot Exp $
--- src/addins/CBinding/Navigation/ProjectNodeBuilderExtension.cs.orig Thu Nov 5 19:12:15 2009
+++ src/addins/CBinding/Navigation/ProjectNodeBuilderExtension.cs Mon Mar 29 09:08:19 2010
@@ -97,7 +97,7 @@ namespace CBinding.Navigation
check_ctags = true;
try {
- ProcessWrapper p = Runtime.ProcessService.StartProcess ("ctags", "--version", null, null);
+ ProcessWrapper p = Runtime.ProcessService.StartProcess ("exctags", "--version", null, null);
p.WaitForOutput ();
have_ctags = true;
} catch {

30
devel/monodevelop/patches/patch-src_addins_CBinding_Parser_TagDatabaseManager_cs Normal file
View File

@ -0,0 +1,30 @@
$OpenBSD: patch-src_addins_CBinding_Parser_TagDatabaseManager_cs,v 1.1 2010/03/29 07:44:28 ajacoutot Exp $
--- src/addins/CBinding/Parser/TagDatabaseManager.cs.orig Tue Jan 12 12:48:32 2010
+++ src/addins/CBinding/Parser/TagDatabaseManager.cs Mon Mar 29 09:09:41 2010
@@ -86,7 +86,7 @@ namespace CBinding.Parser
return false;
}
try {
- Runtime.ProcessService.StartProcess ("ctags", "--version", null, null).WaitForOutput ();
+ Runtime.ProcessService.StartProcess ("exctags", "--version", null, null).WaitForOutput ();
} catch {
LoggingService.LogWarning ("Cannot update C/C++ tags database because exuberant ctags is not installed.");
return false;
@@ -288,7 +288,7 @@ namespace CBinding.Parser
try {
output = new System.IO.StringWriter ();
- p = Runtime.ProcessService.StartProcess ("ctags", ctags_options, null, null, output, null);
+ p = Runtime.ProcessService.StartProcess ("exctags", ctags_options, null, null, output, null);
p.WaitForOutput (10000);
if (p.ExitCode != 0 || !File.Exists (tagFullFileName)) {
LoggingService.LogError ("Ctags did not successfully populate the tags database '{0}' within ten seconds.\nOutput: {1}", tagFullFileName, output.ToString ());
@@ -395,7 +395,7 @@ namespace CBinding.Parser
output = new System.IO.StringWriter ();
error = new System.IO.StringWriter ();
- p = Runtime.ProcessService.StartProcess ("ctags", ctags_kinds.ToString (), project.BaseDirectory, output, error, null);
+ p = Runtime.ProcessService.StartProcess ("exctags", ctags_kinds.ToString (), project.BaseDirectory, output, error, null);
p.WaitForOutput (10000);
if (p.ExitCode != 0) {
LoggingService.LogError ("Ctags did not successfully populate the tags database from '{0}' within ten seconds.\nError output: {1}", filename, error.ToString ());

21
devel/monodevelop/patches/patch-src_addins_MonoDevelop_Autotools_SolutionDeployer_cs Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-src_addins_MonoDevelop_Autotools_SolutionDeployer_cs,v 1.1 2010/03/29 07:44:28 ajacoutot Exp $
--- src/addins/MonoDevelop.Autotools/SolutionDeployer.cs.orig Thu Nov 5 19:12:13 2009
+++ src/addins/MonoDevelop.Autotools/SolutionDeployer.cs Mon Mar 29 08:59:41 2010
@@ -180,7 +180,7 @@ namespace MonoDevelop.Autotools
chainedOutput.ChainWriter (monitor.Log);
chainedOutput.ChainWriter (sw);
- ProcessWrapper process = Runtime.ProcessService.StartProcess ( "make",
+ ProcessWrapper process = Runtime.ProcessService.StartProcess ( "gmake",
"dist",
baseDir,
chainedOutput,
@@ -189,7 +189,7 @@ namespace MonoDevelop.Autotools
process.WaitForOutput ();
if ( process.ExitCode > 0 )
- throw new Exception ( GettextCatalog.GetString ("An unspecified error occurred while running '{0}'", "make dist") );
+ throw new Exception ( GettextCatalog.GetString ("An unspecified error occurred while running '{0}'", "gmake dist") );
monitor.Step ( 1 );

24
devel/monodevelop/patches/patch-theme-icons_icon-theme-installer Normal file
View File

@ -0,0 +1,24 @@
$OpenBSD: patch-theme-icons_icon-theme-installer,v 1.1 2010/03/29 07:44:28 ajacoutot Exp $
--- theme-icons/icon-theme-installer.orig Thu Nov 5 19:12:21 2009
+++ theme-icons/icon-theme-installer Mon Mar 29 08:59:39 2010
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!${LOCALBASE}/bin/bash
# icon-theme-installer
# Copyright (C) 2006 Novell, Inc.
@@ -101,12 +101,12 @@ if test -z "$INSTALL_BASE_DIR"; then
exit 1
fi
-if test ! -x $(echo "$MKINSTALLDIRS_EXEC" | cut -f1 -d' '); then
+if ! which $(echo "$MKINSTALLDIRS_EXEC" | cut -f1 -d' '); then
echo "Cannot find '$MKINSTALLDIRS_EXEC'; You probably want to pass -m \$(mkinstalldirs)"
exit 1
fi
-if test ! -x $(echo "$INSTALL_DATA_EXEC" | cut -f1 -d' '); then
+if ! which $(echo "$INSTALL_DATA_EXEC" | cut -f1 -d' '); then
echo "Cannot find '$INSTALL_DATA_EXEC'; You probably want to pass -x \$(INSTALL_DATA)"
exit 1
fi

24
devel/monodevelop/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2010/03/22 22:38:25 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.3 2010/03/29 07:44:28 ajacoutot Exp $
bin/mdtool
bin/monodevelop
lib/monodevelop/
@ -232,6 +232,26 @@ lib/pkgconfig/monodevelop.pc
@man man/man1/mdtool.1
@man man/man1/monodevelop.1
share/applications/monodevelop.desktop
share/icons/
share/icons/hicolor/
share/icons/hicolor/16x16/
share/icons/hicolor/16x16/apps/
share/icons/hicolor/16x16/apps/monodevelop.png
share/icons/hicolor/22x22/
share/icons/hicolor/22x22/apps/
share/icons/hicolor/22x22/apps/monodevelop.png
share/icons/hicolor/24x24/
share/icons/hicolor/24x24/apps/
share/icons/hicolor/24x24/apps/monodevelop.png
share/icons/hicolor/32x32/
share/icons/hicolor/32x32/apps/
share/icons/hicolor/32x32/apps/monodevelop.png
share/icons/hicolor/48x48/
share/icons/hicolor/48x48/apps/
share/icons/hicolor/48x48/apps/monodevelop.png
share/icons/hicolor/scalable/
share/icons/hicolor/scalable/apps/
share/icons/hicolor/scalable/apps/monodevelop.svg
share/locale/ca/LC_MESSAGES/monodevelop.mo
share/locale/cs/LC_MESSAGES/monodevelop.mo
share/locale/da/LC_MESSAGES/monodevelop.mo
@ -254,6 +274,8 @@ share/locale/tr/LC_MESSAGES/monodevelop.mo
share/locale/zh_CN/LC_MESSAGES/monodevelop.mo
share/locale/zh_TW/LC_MESSAGES/monodevelop.mo
share/mime/packages/monodevelop.xml
@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
@unexec-delete %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
@exec %D/bin/update-mime-database %D/share/mime
@unexec-delete %D/bin/update-mime-database %D/share/mime
@exec %D/bin/update-desktop-database