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

Drop patches and use substs instead.

Browse Source
This commit is contained in:
ajacoutot 2014-03-09 21:44:09 +00:00
parent 04a3d2b581
commit fe01861a90
6 changed files with 14 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
x11/gnome/anjuta/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.105 2013/11/15 21:32:16 jasper Exp $
# $OpenBSD: Makefile,v 1.106 2014/03/09 21:44:09 ajacoutot Exp $
SHARED_ONLY= Yes
@ -6,6 +6,7 @@ COMMENT= versatile IDE for GNOME
GNOME_PROJECT= anjuta
GNOME_VERSION= 3.10.2
REVISION= 0
SHARED_LIBS += anjuta-3 0.0 # 0.0
@ -80,12 +81,15 @@ CONFIGURE_ARGS+= --disable-static \
--disable-neon
pre-configure:
${SUBST_CMD} ${WRKSRC}/plugins/project-wizard/templates/pygtk.wiz.in \
${WRKSRC}/plugins/project-wizard/templates/python.wiz.in \
perl -pi -e "s,/usr/bin/python,${MODPY_BIN},g" \
${WRKSRC}/plugins/project-wizard/templates/pygtk/src/main.py \
${WRKSRC}/plugins/project-wizard/templates/python/src/main.py \
${WRKSRC}/plugins/language-support-python/org.gnome.anjuta.plugins.python.gschema.xml.in
perl -pi -e "s,>python<,>python${MODPY_VERSION}<,g" \
${WRKSRC}/plugins/project-wizard/templates/pygtk.wiz.in \
${WRKSRC}/plugins/project-wizard/templates/python.wiz.in
post-install:
rm ${PREFIX}/lib/anjuta/*.la

9
x11/gnome/anjuta/patches/patch-configure_ac
View File

@ -1,5 +1,10 @@
$OpenBSD: patch-configure_ac,v 1.12 2013/10/10 09:55:24 stsp Exp $
https://bugzilla.gnome.org/show_bug.cgi?id=709752
$OpenBSD: patch-configure_ac,v 1.13 2014/03/09 21:44:09 ajacoutot Exp $
From 5574b7c841d81bc9be6b5695a487babdfb94d789 Mon Sep 17 00:00:00 2001
From: Stefan Sperling <stsp@tigris.org>
Date: Thu, 10 Oct 2013 20:31:54 +0000
Subject: bgo #709752 - Don't require neon library for Subversion 1.8
--- configure.ac.orig Mon Sep 16 03:23:08 2013
+++ configure.ac Wed Oct 9 18:48:40 2013
@@ -58,6 +58,7 @@ GI_REQUIRED=0.9.5

12
x11/gnome/anjuta/patches/patch-plugins_project-wizard_templates_pygtk_src_main_py
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-plugins_project-wizard_templates_pygtk_src_main_py,v 1.4 2013/09/27 14:09:57 jasper Exp $
--- plugins/project-wizard/templates/pygtk/src/main.py.orig Fri Aug 9 02:30:18 2013
+++ plugins/project-wizard/templates/pygtk/src/main.py Fri Sep 27 15:09:45 2013
@@ -1,7 +1,7 @@
[+ autogen5 template +]
[+INCLUDE (string-append "licenses/" (get "License") ".tpl") \+]
[+INCLUDE (string-append "indent.tpl") \+]
-#!/usr/bin/python
+#!${MODPY_BIN}
# [+INVOKE EMACS-MODELINE MODE="Python; coding: utf-8" +]
[+INVOKE START-INDENT\+]
#

16
x11/gnome/anjuta/patches/patch-plugins_project-wizard_templates_pygtk_wiz_in
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-plugins_project-wizard_templates_pygtk_wiz_in,v 1.2 2011/10/04 11:24:41 jasper Exp $
Prevent an error saying that python isn't installed by adjusting
the python binary name.
--- plugins/project-wizard/templates/pygtk.wiz.in.orig Tue Oct 4 13:09:50 2011
+++ plugins/project-wizard/templates/pygtk.wiz.in Tue Oct 4 13:10:05 2011
@@ -8,7 +8,7 @@
<required-program>automake</required-program>
<required-program>autoconf</required-program>
<required-program>make</required-program>
- <required-program>python</required-program>
+ <required-program>${MODPY_BIN}</required-program>
<required-package>gtk+-3.0</required-package>
<!-- Not working: <required-package>python-gtk2</required-package>-->
</project-wizard>

12
x11/gnome/anjuta/patches/patch-plugins_project-wizard_templates_python_src_main_py
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-plugins_project-wizard_templates_python_src_main_py,v 1.4 2013/09/27 14:09:57 jasper Exp $
--- plugins/project-wizard/templates/python/src/main.py.orig Fri Aug 9 02:30:18 2013
+++ plugins/project-wizard/templates/python/src/main.py Fri Sep 27 15:09:33 2013
@@ -1,7 +1,7 @@
[+ autogen5 template +]
[+INCLUDE (string-append "licenses/" (get "License") ".tpl") \+]
[+INCLUDE (string-append "indent.tpl") \+]
-#!/usr/bin/python
+#!${MODPY_BIN}
# [+INVOKE EMACS-MODELINE MODE="Python; coding: utf-8" +]
[+INVOKE START-INDENT\+]
#

16
x11/gnome/anjuta/patches/patch-plugins_project-wizard_templates_python_wiz_in
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-plugins_project-wizard_templates_python_wiz_in,v 1.1 2011/09/12 07:26:20 ajacoutot Exp $
Prevent an error saying that python isn't installed by adjusting
the python binary name.
--- plugins/project-wizard/templates/python.wiz.in.orig Fri Jun 10 11:06:26 2011
+++ plugins/project-wizard/templates/python.wiz.in Tue Jul 12 11:51:07 2011
@@ -8,7 +8,7 @@
<required-program>automake</required-program>
<required-program>autoconf</required-program>
<required-program>make</required-program>
- <required-program>python</required-program>
+ <required-program>${MODPY_BIN}</required-program>
</project-wizard>
<page name="basic" _label="Basic information" _description="General Project Information">