[126680] trunk/dports/gnome/oregano
devans at macports.org
devans at macports.org
Mon Oct 13 10:35:30 PDT 2014
Revision: 126680
https://trac.macports.org/changeset/126680
Author: devans at macports.org
Date: 2014-10-13 10:35:30 -0700 (Mon, 13 Oct 2014)
Log Message:
-----------
oregano: update to version 0.82, now uses gtk3, update dependencies, patch files, configuration, post-activate processing.
Modified Paths:
--------------
trunk/dports/gnome/oregano/Portfile
trunk/dports/gnome/oregano/files/patch-autogen.sh.diff
trunk/dports/gnome/oregano/files/patch-configure.ac.diff
Added Paths:
-----------
trunk/dports/gnome/oregano/files/patch-allow-deprecated.diff
trunk/dports/gnome/oregano/files/patch-src-netlist-editor.c.diff
Removed Paths:
-------------
trunk/dports/gnome/oregano/files/patch-glib-2.32.diff
Modified: trunk/dports/gnome/oregano/Portfile
===================================================================
--- trunk/dports/gnome/oregano/Portfile 2014-10-13 17:21:06 UTC (rev 126679)
+++ trunk/dports/gnome/oregano/Portfile 2014-10-13 17:35:30 UTC (rev 126680)
@@ -4,8 +4,7 @@
PortSystem 1.0
PortGroup github 1.0
-github.setup marc-lorber oregano 0.73 v
-revision 1
+github.setup marc-lorber oregano 0.82 v
categories gnome science
maintainers nomaintainer
license GPL-2+
@@ -15,8 +14,8 @@
platforms darwin
-checksums rmd160 ff758dea4a5c5e37c594d474a5af263c6c172949 \
- sha256 7d7a6da253bf5e19de553c6e113fd444a5e8eb3aad3055c83d7df08736362d19
+checksums rmd160 4b68fe79161e0b5034cd401eddec52c1478653de \
+ sha256 b68cdd0c80421b0571bf520d3f8b0d1793808fee1ac7ac28dcf8ebaff2cb1a2d
depends_build port:autoconf \
port:automake \
@@ -24,33 +23,29 @@
port:libtool \
port:pkgconfig
-depends_lib port:gtksourceview2 \
- port:libgnomecanvas \
- port:libgnomeui \
+depends_lib port:gtk3 \
+ port:gtksourceview3 \
+ port:goocanvas2 \
port:rarian \
port:desktop-file-utils \
port:shared-mime-info
depends_run port:yelp
-post-extract {
- move ${worksrcpath}/configure.in ${worksrcpath}/configure.ac
- file mkdir ${worksrcpath}/m4
-}
-
patchfiles patch-autogen.sh.diff \
patch-configure.ac.diff \
- patch-glib-2.32.diff
+ patch-allow-deprecated.diff \
+ patch-src-netlist-editor.c.diff
-use_autoreconf yes
-autoreconf.cmd ./autogen.sh
+configure.cmd ./autogen.sh
configure.args --disable-silent-rules \
- --disable-update-mimedb \
- --disable-update-mime
+ --disable-schemas-compile \
+ --disable-update-mimedb
post-activate {
system "${prefix}/bin/scrollkeeper-update"
system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
system "${prefix}/bin/update-mime-database ${prefix}/share/mime"
+ system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
}
Added: trunk/dports/gnome/oregano/files/patch-allow-deprecated.diff
===================================================================
--- trunk/dports/gnome/oregano/files/patch-allow-deprecated.diff (rev 0)
+++ trunk/dports/gnome/oregano/files/patch-allow-deprecated.diff 2014-10-13 17:35:30 UTC (rev 126680)
@@ -0,0 +1,68 @@
+diff -ur src.orig/Makefile.am src/Makefile.am
+--- src.orig/Makefile.am 2012-05-08 09:58:54.000000000 -0700
++++ src/Makefile.am 2014-10-13 08:50:09.000000000 -0700
+@@ -6,9 +6,8 @@
+ stock \
+ pixmaps
+
+-AM_CFLAGS = -Wall -DG_DISABLE_DEPRECATED -DGSEAL_ENABLE \
++AM_CFLAGS = -Wall -DGSEAL_ENABLE \
+ -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED \
+- -DGTK_DISABLE_DEPRECATED \
+ -DG_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES \
+ -DGTK_DISABLE_SINGLE_INCLUDES
+
+diff -ur src.orig/engines/Makefile.am src/engines/Makefile.am
+--- src.orig/engines/Makefile.am 2012-05-08 09:58:54.000000000 -0700
++++ src/engines/Makefile.am 2014-10-13 08:55:18.000000000 -0700
+@@ -1,8 +1,7 @@
+ oreganodir = $(datadir)/oregano
+
+-AM_CFLAGS = -g -Wall -DG_DISABLE_DEPRECATED -DGSEAL_ENABLE \
++AM_CFLAGS = -g -Wall -DGSEAL_ENABLE \
+ -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED \
+- -DGTK_DISABLE_DEPRECATED \
+ -DG_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES \
+ -DGTK_DISABLE_SINGLE_INCLUDES
+
+diff -ur src.orig/gplot/Makefile.am src/gplot/Makefile.am
+--- src.orig/gplot/Makefile.am 2012-05-08 09:58:54.000000000 -0700
++++ src/gplot/Makefile.am 2014-10-13 08:56:11.000000000 -0700
+@@ -1,8 +1,8 @@
+ oreganodir = $(datadir)/oregano
+
+-AM_CFLAGS = -Wall -DG_DISABLE_DEPRECATED -DGSEAL_ENABLE \
++AM_CFLAGS = -Wall -DGSEAL_ENABLE \
+ -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED \
+- -DGTK_DISABLE_DEPRECATED -DGTK_DISABLE_SINGLE_INCLUDES \
++ -DGTK_DISABLE_SINGLE_INCLUDES \
+ -DG_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES
+
+ INCLUDES = \
+diff -ur src.orig/model/Makefile.am src/model/Makefile.am
+--- src.orig/model/Makefile.am 2012-05-08 09:58:54.000000000 -0700
++++ src/model/Makefile.am 2014-10-13 08:56:34.000000000 -0700
+@@ -1,8 +1,7 @@
+ oreganodir = $(datadir)/oregano
+
+-AM_CFLAGS = -Wall -DG_DISABLE_DEPRECATED -DGSEAL_ENABLE \
++AM_CFLAGS = -Wall -DGSEAL_ENABLE \
+ -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED \
+- -DGTK_DISABLE_DEPRECATED \
+ -DG_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES \
+ -DGTK_DISABLE_SINGLE_INCLUDES
+
+diff -ur src.orig/sheet/Makefile.am src/sheet/Makefile.am
+--- src.orig/sheet/Makefile.am 2012-05-08 09:58:54.000000000 -0700
++++ src/sheet/Makefile.am 2014-10-13 08:49:40.000000000 -0700
+@@ -1,8 +1,8 @@
+ oreganodir = $(datadir)/oregano
+
+-AM_CFLAGS = -Wall -DG_DISABLE_DEPRECATED -DGSEAL_ENABLE \
++AM_CFLAGS = -Wall -DGSEAL_ENABLE \
+ -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED \
+- -DGTK_DISABLE_DEPRECATED -DG_DISABLE_SINGLE_INCLUDES \
++ -DG_DISABLE_SINGLE_INCLUDES \
+ -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES
+
+ INCLUDES = \
Modified: trunk/dports/gnome/oregano/files/patch-autogen.sh.diff
===================================================================
--- trunk/dports/gnome/oregano/files/patch-autogen.sh.diff 2014-10-13 17:21:06 UTC (rev 126679)
+++ trunk/dports/gnome/oregano/files/patch-autogen.sh.diff 2014-10-13 17:35:30 UTC (rev 126680)
@@ -1,13 +1,34 @@
---- autogen.sh.orig 2012-01-08 03:24:22.000000000 -0600
-+++ autogen.sh 2012-05-11 10:40:03.000000000 -0500
-@@ -15,8 +15,8 @@
+--- autogen.sh.orig 2014-10-13 01:25:24.000000000 -0700
++++ autogen.sh 2014-10-13 01:26:23.000000000 -0700
+@@ -317,20 +317,23 @@
- # Refresh GNU autotools toolchain.
- echo Cleaning autotools files...
--find -type d -name autom4te.cache -print0 | xargs -0 rm -rf \;
--find -type f \( -name missing -o -name install-sh -o -name mkinstalldirs \
-+find . -type d -name autom4te.cache -print0 | xargs -0 rm -rf \;
-+find . -type f \( -name missing -o -name install-sh -o -name mkinstalldirs \
- -o -name depcomp -o -name ltmain.sh -o -name configure \
- -o -name config.sub -o -name config.guess \
- -o -name Makefile.in \) -print0 | xargs -0 rm -f
+ case $REQUIRED_AUTOMAKE_VERSION in
+ 1.4*) automake_progs="automake-1.4" ;;
+- 1.5*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;;
+- 1.6*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;;
+- 1.7*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;;
+- 1.8*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;;
+- 1.9*) automake_progs="automake-1.11 automake-1.10 automake-1.9" ;;
+- 1.10*) automake_progs="automake-1.11 automake-1.10" ;;
+- 1.11*) automake_progs="automake-1.11" ;;
++ 1.5*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;;
++ 1.6*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;;
++ 1.7*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;;
++ 1.8*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;;
++ 1.9*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9" ;;
++ 1.10*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10" ;;
++ 1.11*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11" ;;
++ 1.12*) automake_progs="automake-1.14 automake-1.13 automake-1.12" ;;
++ 1.13*) automake_progs="automake-1.14 automake-1.13" ;;
++ 1.14*) automake_progs="automake-1.14" ;;
+ esac
+ version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \
+ "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz"
+ ACLOCAL=`echo $AUTOMAKE | sed s/automake/aclocal/`
+
+ if $want_libtool; then
+- version_check libtool LIBTOOLIZE libtoolize $REQUIRED_LIBTOOL_VERSION \
++ version_check libtool LIBTOOLIZE glibtoolize $REQUIRED_LIBTOOL_VERSION \
+ "http://ftp.gnu.org/pub/gnu/libtool/libtool-$REQUIRED_LIBTOOL_VERSION.tar.gz"
+ require_m4macro libtool.m4
+ fi
Modified: trunk/dports/gnome/oregano/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/gnome/oregano/files/patch-configure.ac.diff 2014-10-13 17:21:06 UTC (rev 126679)
+++ trunk/dports/gnome/oregano/files/patch-configure.ac.diff 2014-10-13 17:35:30 UTC (rev 126680)
@@ -1,8 +1,8 @@
---- configure.ac.orig 2012-01-14 03:36:27.000000000 -0600
-+++ configure.ac 2013-05-23 05:14:53.000000000 -0500
+--- configure.ac.orig 2012-05-08 09:58:54.000000000 -0700
++++ configure.ac 2014-10-13 01:10:41.000000000 -0700
@@ -1,12 +1,12 @@
- AC_INIT(oregano-0.73, 0.73)
- AM_INIT_AUTOMAKE(oregano, 0.73)
+ AC_INIT(AUTHORS)
+ AM_INIT_AUTOMAKE(oregano, 0.81)
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
Deleted: trunk/dports/gnome/oregano/files/patch-glib-2.32.diff
===================================================================
--- trunk/dports/gnome/oregano/files/patch-glib-2.32.diff 2014-10-13 17:21:06 UTC (rev 126679)
+++ trunk/dports/gnome/oregano/files/patch-glib-2.32.diff 2014-10-13 17:35:30 UTC (rev 126680)
@@ -1,51 +0,0 @@
---- src/Makefile.am.orig 2012-01-14 03:36:27.000000000 -0600
-+++ src/Makefile.am 2012-06-06 18:04:54.000000000 -0500
-@@ -6,7 +6,7 @@
- stock \
- pixmaps
-
--AM_CFLAGS = -Wall -DG_DISABLE_DEPRECATED -DGSEAL_ENABLE \
-+AM_CFLAGS = -Wall -DGSEAL_ENABLE \
- -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED \
- -DGTK_DISABLE_DEPRECATED \
- -DG_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES \
---- src/engines/Makefile.am.orig 2012-01-14 03:36:27.000000000 -0600
-+++ src/engines/Makefile.am 2012-06-06 18:04:58.000000000 -0500
-@@ -1,6 +1,6 @@
- oreganodir = $(datadir)/oregano
-
--AM_CFLAGS = -g -Wall -DG_DISABLE_DEPRECATED -DGSEAL_ENABLE \
-+AM_CFLAGS = -g -Wall -DGSEAL_ENABLE \
- -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED \
- -DGTK_DISABLE_DEPRECATED \
- -DG_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES \
---- src/gplot/Makefile.am.orig 2012-01-14 03:36:27.000000000 -0600
-+++ src/gplot/Makefile.am 2012-06-06 18:04:56.000000000 -0500
-@@ -1,6 +1,6 @@
- oreganodir = $(datadir)/oregano
-
--AM_CFLAGS = -Wall -DG_DISABLE_DEPRECATED -DGSEAL_ENABLE \
-+AM_CFLAGS = -Wall -DGSEAL_ENABLE \
- -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED \
- -DGTK_DISABLE_DEPRECATED -DGTK_DISABLE_SINGLE_INCLUDES \
- -DG_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES
---- src/model/Makefile.am.orig 2012-01-14 03:36:27.000000000 -0600
-+++ src/model/Makefile.am 2012-06-06 18:04:53.000000000 -0500
-@@ -1,6 +1,6 @@
- oreganodir = $(datadir)/oregano
-
--AM_CFLAGS = -Wall -DG_DISABLE_DEPRECATED -DGSEAL_ENABLE \
-+AM_CFLAGS = -Wall -DGSEAL_ENABLE \
- -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED \
- -DGTK_DISABLE_DEPRECATED \
- -DG_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES \
---- src/sheet/Makefile.am.orig 2012-01-14 03:36:27.000000000 -0600
-+++ src/sheet/Makefile.am 2012-06-06 18:04:51.000000000 -0500
-@@ -1,6 +1,6 @@
- oreganodir = $(datadir)/oregano
-
--AM_CFLAGS = -Wall -DG_DISABLE_DEPRECATED -DGSEAL_ENABLE \
-+AM_CFLAGS = -Wall -DGSEAL_ENABLE \
- -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED \
- -DGTK_DISABLE_DEPRECATED -DG_DISABLE_SINGLE_INCLUDES \
- -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES
Added: trunk/dports/gnome/oregano/files/patch-src-netlist-editor.c.diff
===================================================================
--- trunk/dports/gnome/oregano/files/patch-src-netlist-editor.c.diff (rev 0)
+++ trunk/dports/gnome/oregano/files/patch-src-netlist-editor.c.diff 2014-10-13 17:35:30 UTC (rev 126680)
@@ -0,0 +1,11 @@
+--- src/netlist-editor.c.orig 2014-10-13 09:33:25.000000000 -0700
++++ src/netlist-editor.c 2014-10-13 09:34:44.000000000 -0700
+@@ -30,7 +30,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <glib/gi18n.h>
+-#include <gtksourceview/gtksourcelanguagemanager.h>
++#include <gtksourceview/gtksource.h>
+
+ #include "netlist-editor.h"
+ #include "netlist-helper.h"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141013/a81f9d8c/attachment-0001.html>
More information about the macports-changes
mailing list